diff --git a/doc/languages-frameworks/qt.xml b/doc/languages-frameworks/qt.xml index 032cdd9945b..3332ce8c06e 100644 --- a/doc/languages-frameworks/qt.xml +++ b/doc/languages-frameworks/qt.xml @@ -113,6 +113,15 @@ mkDerivation { + + + wrapQtAppsHook ignores files that are non-ELF executables. + This means that scripts won't be automatically wrapped so you'll need to manually + wrap them as previously mentioned. An example of when you'd always need to do this + is with Python applications that use PyQT. + + + Libraries are built with every available version of Qt. Use the meta.broken attribute to disable the package for unsupported Qt versions: diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 42095c13e0a..fe592965656 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1599,6 +1599,16 @@ installTargets = "install-bin install-doc"; Variables controlling the fixup phase + + + dontFixup + + + + Set to true to skip the fixup phase. + + + dontStrip diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index eadaa0521b3..cf344122cf4 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -71,6 +71,15 @@ checkConfigError 'The option value .* in .* is not of type.*positive integer.*' checkConfigOutput "42" config.value ./declare-int-between-value.nix ./define-value-int-positive.nix checkConfigError 'The option value .* in .* is not of type.*between.*-21 and 43.*inclusive.*' config.value ./declare-int-between-value.nix ./define-value-int-negative.nix +# Check either types +# types.either +checkConfigOutput "42" config.value ./declare-either.nix ./define-value-int-positive.nix +checkConfigOutput "\"24\"" config.value ./declare-either.nix ./define-value-string.nix +# types.oneOf +checkConfigOutput "42" config.value ./declare-oneOf.nix ./define-value-int-positive.nix +checkConfigOutput "[ ]" config.value ./declare-oneOf.nix ./define-value-list.nix +checkConfigOutput "\"24\"" config.value ./declare-oneOf.nix ./define-value-string.nix + # Check mkForce without submodules. set -- config.enable ./declare-enable.nix ./define-enable.nix checkConfigOutput "true" "$@" diff --git a/lib/tests/modules/declare-either.nix b/lib/tests/modules/declare-either.nix new file mode 100644 index 00000000000..5a0fa978a13 --- /dev/null +++ b/lib/tests/modules/declare-either.nix @@ -0,0 +1,5 @@ +{ lib, ... }: { + options.value = lib.mkOption { + type = lib.types.either lib.types.int lib.types.str; + }; +} diff --git a/lib/tests/modules/declare-oneOf.nix b/lib/tests/modules/declare-oneOf.nix new file mode 100644 index 00000000000..df092a14f81 --- /dev/null +++ b/lib/tests/modules/declare-oneOf.nix @@ -0,0 +1,9 @@ +{ lib, ... }: { + options.value = lib.mkOption { + type = lib.types.oneOf [ + lib.types.int + (lib.types.listOf lib.types.int) + lib.types.str + ]; + }; +} diff --git a/lib/types.nix b/lib/types.nix index e22bcd326c8..9c00656ab91 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -443,6 +443,13 @@ rec { functor = (defaultFunctor name) // { wrapped = [ t1 t2 ]; }; }; + # Any of the types in the given list + oneOf = ts: + let + head' = if ts == [] then throw "types.oneOf needs to get at least one type in its argument" else head ts; + tail' = tail ts; + in foldl' either head' tail'; + # Either value of type `finalType` or `coercedType`, the latter is # converted to `finalType` using `coerceFunc`. coercedTo = coercedType: coerceFunc: finalType: diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 65095e78596..40c99970ea6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -66,14 +66,6 @@ email = "aaron@ajanse.me"; github = "aaronjanse"; name = "Aaron Janse"; - keys = [ - { longkeyid = "rsa2048/0x651BD4B37D75E234"; # Email only - fingerprint = "490F 5009 34E7 20BD 4C53 96C2 651B D4B3 7D75 E234"; - } - { longkeyid = "rsa4096/0xBE6C92145BFF4A34"; # Git, etc - fingerprint = "CED9 6DF4 63D7 B86A 1C4B 1322 BE6C 9214 5BFF 4A34"; - } - ]; }; aaronschif = { email = "aaronschif@gmail.com"; @@ -85,6 +77,15 @@ github = "baldo"; name = "Andreas Baldeau"; }; + abbe = { + email = "ashish.is@lostca.se"; + github = "wahjava"; + name = "Ashish SHUKLA"; + keys = [{ + longkeyid = "rsa4096/0xC746CFA9E74FA4B0"; + fingerprint = "F682 CDCC 39DC 0FEA E116 20B6 C746 CFA9 E74F A4B0"; + }]; + }; abbradar = { email = "ab@fmap.me"; github = "abbradar"; @@ -1518,6 +1519,11 @@ github = "liclac"; name = "embr"; }; + emily = { + email = "nixpkgs@emily.moe"; + github = "emilazy"; + name = "Emily"; + }; ederoyd46 = { email = "matt@ederoyd.co.uk"; github = "ederoyd46"; @@ -1763,6 +1769,11 @@ github = "fare"; name = "Francois-Rene Rideau"; }; + farlion = { + email = "florian.peter@gmx.at"; + github = "workflow"; + name = "Florian Peter"; + }; fdns = { email = "fdns02@gmail.com"; github = "fdns"; diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 7fc0ad702f8..f9de2db1a08 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -5,55 +5,6 @@ with pkgs; let lib = pkgs.lib; - # Remove invisible and internal options. - optionsListVisible = lib.filter (opt: opt.visible && !opt.internal) (lib.optionAttrSetToDocList options); - - # Replace functions by the string - substFunction = x: - if builtins.isAttrs x then lib.mapAttrs (name: substFunction) x - else if builtins.isList x then map substFunction x - else if lib.isFunction x then "" - else x; - - # Generate DocBook documentation for a list of packages. This is - # what `relatedPackages` option of `mkOption` from - # ../../../lib/options.nix influences. - # - # Each element of `relatedPackages` can be either - # - a string: that will be interpreted as an attribute name from `pkgs`, - # - a list: that will be interpreted as an attribute path from `pkgs`, - # - an attrset: that can specify `name`, `path`, `package`, `comment` - # (either of `name`, `path` is required, the rest are optional). - genRelatedPackages = packages: - let - unpack = p: if lib.isString p then { name = p; } - else if lib.isList p then { path = p; } - else p; - describe = args: - let - title = args.title or null; - name = args.name or (lib.concatStringsSep "." args.path); - path = args.path or [ args.name ]; - package = args.package or (lib.attrByPath path (throw "Invalid package attribute path `${toString path}'") pkgs); - in "" - + "${lib.optionalString (title != null) "${title} aka "}pkgs.${name} (${package.meta.name})" - + lib.optionalString (!package.meta.available) " [UNAVAILABLE]" - + ": ${package.meta.description or "???"}." - + lib.optionalString (args ? comment) "\n${args.comment}" - # Lots of `longDescription's break DocBook, so we just wrap them into - + lib.optionalString (package.meta ? longDescription) "\n${package.meta.longDescription}" - + ""; - in "${lib.concatStringsSep "\n" (map (p: describe (unpack p)) packages)}"; - - optionsListDesc = lib.flip map optionsListVisible (opt: opt // { - # Clean up declaration sites to not refer to the NixOS source tree. - declarations = map stripAnyPrefixes opt.declarations; - } - // lib.optionalAttrs (opt ? example) { example = substFunction opt.example; } - // lib.optionalAttrs (opt ? default) { default = substFunction opt.default; } - // lib.optionalAttrs (opt ? type) { type = substFunction opt.type; } - // lib.optionalAttrs (opt ? relatedPackages && opt.relatedPackages != []) { relatedPackages = genRelatedPackages opt.relatedPackages; }); - # We need to strip references to /nix/store/* from options, # including any `extraSources` if some modules came from elsewhere, # or else the build will fail. @@ -63,37 +14,13 @@ let prefixesToStrip = map (p: "${toString p}/") ([ ../../.. ] ++ extraSources); stripAnyPrefixes = lib.flip (lib.fold lib.removePrefix) prefixesToStrip; - # Custom "less" that pushes up all the things ending in ".enable*" - # and ".package*" - optionLess = a: b: - let - ise = lib.hasPrefix "enable"; - isp = lib.hasPrefix "package"; - cmp = lib.splitByAndCompare ise lib.compare - (lib.splitByAndCompare isp lib.compare lib.compare); - in lib.compareLists cmp a.loc b.loc < 0; - - # Customly sort option list for the man page. - optionsList = lib.sort optionLess optionsListDesc; - - # Convert the list of options into an XML file. - optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList); - - optionsDocBook = runCommand "options-db.xml" {} '' - optionsXML=${optionsXML} - if grep /nixpkgs/nixos/modules $optionsXML; then - echo "The manual appears to depend on the location of Nixpkgs, which is bad" - echo "since this prevents sharing via the NixOS channel. This is typically" - echo "caused by an option default that refers to a relative path (see above" - echo "for hints about the offending path)." - exit 1 - fi - ${buildPackages.libxslt.bin}/bin/xsltproc \ - --stringparam revision '${revision}' \ - -o intermediate.xml ${./options-to-docbook.xsl} $optionsXML - ${buildPackages.libxslt.bin}/bin/xsltproc \ - -o "$out" ${./postprocess-option-descriptions.xsl} intermediate.xml - ''; + optionsDoc = buildPackages.nixosOptionsDoc { + inherit options revision; + transformOptions = opt: opt // { + # Clean up declaration sites to not refer to the NixOS source tree. + declarations = map stripAnyPrefixes opt.declarations; + }; + }; sources = lib.sourceFilesBySuffices ./. [".xml"]; @@ -108,7 +35,7 @@ let generatedSources = runCommand "generated-docbook" {} '' mkdir $out ln -s ${modulesDoc} $out/modules.xml - ln -s ${optionsDocBook} $out/options-db.xml + ln -s ${optionsDoc.optionsDocBook} $out/options-db.xml printf "%s" "${version}" > $out/version ''; @@ -234,22 +161,7 @@ let in rec { inherit generatedSources; - # The NixOS options in JSON format. - optionsJSON = runCommand "options-json" - { meta.description = "List of NixOS options in JSON format"; - } - '' - # Export list of options in different format. - dst=$out/share/doc/nixos - mkdir -p $dst - - cp ${builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON - (builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList)))) - } $dst/options.json - - mkdir -p $out/nix-support - echo "file json $dst/options.json" >> $out/nix-support/hydra-build-products - ''; # */ + inherit (optionsDoc) optionsJSON optionsXML optionsDocBook; # Generate the NixOS manual. manualHTML = runCommand "nixos-manual-html" diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 069cc36573d..8fcbb627342 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -346,6 +346,18 @@ + + + types.oneOf [ t1 t2 ... ] + + + + Type t1 or type t2 and so forth, + e.g. with types; oneOf [ int str bool ]. Multiple definitions + cannot be merged. + + + types.coercedTo from f to diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml index f45fecd16c3..3cb16d33cd4 100755 --- a/nixos/doc/manual/development/releases.xml +++ b/nixos/doc/manual/development/releases.xml @@ -98,6 +98,16 @@ stableBranch set to false. + + + Remove attributes that we know we will not be able to support, + especially if there is a stable alternative. E.g. Check that our + Linux kernels' + + projected end-of-life are after our release projected + end-of-life + + Edit changelog at diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml index b77d71389a9..48193d986ab 100644 --- a/nixos/doc/manual/installation/changing-config.xml +++ b/nixos/doc/manual/installation/changing-config.xml @@ -14,6 +14,13 @@ to build the new configuration, make it the default configuration for booting, and try to realise the configuration in the running system (e.g., by restarting system services). + + + This command doesn't start/stop user + services automatically. nixos-rebuild only runs a + daemon-reload for each user with running user services. + + diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index 9cec83f1e28..4c20cfcdd7d 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -90,6 +90,35 @@ + + + path + + + + + + + + + + + + + number + + + + + + + + + + + + + @@ -101,7 +130,8 @@ NixOS module, you must run nixos-rebuild to make the changes take effect. It builds the new system in /nix/store, runs its activation script, and stop and - (re)starts any system services if needed. + (re)starts any system services if needed. Please note that user services need + to be started manually as they aren't detected by the activation script at the moment. This command has one required argument, which specifies the desired diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 6f049005ab6..b12858cfc96 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -33,6 +33,15 @@ PHP 7.1 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 19.09 release. + + + The binfmt module is now easier to use. Additional systems can + be added through . + For instance, boot.binfmt.emulatedSystems = [ + "wasm32-wasi" "x86_64-windows" "aarch64-linux" ]; will + set up binfmt interpreters for each of those listed systems. + + @@ -47,6 +56,13 @@ The following new services were added since the last release: + + + + ./programs/dwm-status.nix + + +
dovecot, node, postfix and varnish. + + + The ibus-qt package is not installed by default anymore when is set to ibus. + If IBus support in Qt 4.x applications is required, add the ibus-qt package to your manually. + +
diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix new file mode 100644 index 00000000000..88e052106a2 --- /dev/null +++ b/nixos/lib/make-options-doc/default.nix @@ -0,0 +1,164 @@ +/* Generate JSON, XML and DocBook documentation for given NixOS options. + + Minimal example: + + { pkgs, }: + + let + eval = import (pkgs.path + "/nixos/lib/eval-config.nix") { + baseModules = [ + ../module.nix + ]; + modules = []; + }; + in pkgs.nixosOptionsDoc { + options = eval.options; + } + +*/ +{ pkgs +, lib +, options +, transformOptions ? lib.id # function for additional tranformations of the options +, revision ? "" # Specify revision for the options +}: + +let + # Replace functions by the string + substFunction = x: + if builtins.isAttrs x then lib.mapAttrs (name: substFunction) x + else if builtins.isList x then map substFunction x + else if lib.isFunction x then "" + else x; + + optionsListDesc = lib.flip map optionsListVisible + (opt: transformOptions opt + // lib.optionalAttrs (opt ? example) { example = substFunction opt.example; } + // lib.optionalAttrs (opt ? default) { default = substFunction opt.default; } + // lib.optionalAttrs (opt ? type) { type = substFunction opt.type; } + // lib.optionalAttrs (opt ? relatedPackages && opt.relatedPackages != []) { relatedPackages = genRelatedPackages opt.relatedPackages; } + ); + + # Generate DocBook documentation for a list of packages. This is + # what `relatedPackages` option of `mkOption` from + # ../../../lib/options.nix influences. + # + # Each element of `relatedPackages` can be either + # - a string: that will be interpreted as an attribute name from `pkgs`, + # - a list: that will be interpreted as an attribute path from `pkgs`, + # - an attrset: that can specify `name`, `path`, `package`, `comment` + # (either of `name`, `path` is required, the rest are optional). + genRelatedPackages = packages: + let + unpack = p: if lib.isString p then { name = p; } + else if lib.isList p then { path = p; } + else p; + describe = args: + let + title = args.title or null; + name = args.name or (lib.concatStringsSep "." args.path); + path = args.path or [ args.name ]; + package = args.package or (lib.attrByPath path (throw "Invalid package attribute path `${toString path}'") pkgs); + in "" + + "${lib.optionalString (title != null) "${title} aka "}pkgs.${name} (${package.meta.name})" + + lib.optionalString (!package.meta.available) " [UNAVAILABLE]" + + ": ${package.meta.description or "???"}." + + lib.optionalString (args ? comment) "\n${args.comment}" + # Lots of `longDescription's break DocBook, so we just wrap them into + + lib.optionalString (package.meta ? longDescription) "\n${package.meta.longDescription}" + + ""; + in "${lib.concatStringsSep "\n" (map (p: describe (unpack p)) packages)}"; + + # Custom "less" that pushes up all the things ending in ".enable*" + # and ".package*" + optionLess = a: b: + let + ise = lib.hasPrefix "enable"; + isp = lib.hasPrefix "package"; + cmp = lib.splitByAndCompare ise lib.compare + (lib.splitByAndCompare isp lib.compare lib.compare); + in lib.compareLists cmp a.loc b.loc < 0; + + # Remove invisible and internal options. + optionsListVisible = lib.filter (opt: opt.visible && !opt.internal) (lib.optionAttrSetToDocList options); + + # Customly sort option list for the man page. + optionsList = lib.sort optionLess optionsListDesc; + + # Convert the list of options into an XML file. + optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList); + + optionsNix = builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList); + + # TODO: declarations: link to github + singleAsciiDoc = name: value: '' + == ${name} + + ${value.description} + + [discrete] + === details + + Type:: ${value.type} + ${ if lib.hasAttr "default" value + then '' + Default:: + + + ---- + ${builtins.toJSON value.default} + ---- + '' + else "No Default:: {blank}" + } + ${ if value.readOnly + then "Read Only:: {blank}" + else "" + } + ${ if lib.hasAttr "example" value + then '' + Example:: + + + ---- + ${builtins.toJSON value.example} + ---- + '' + else "No Example:: {blank}" + } + ''; + +in rec { + inherit optionsNix; + + optionsAsciiDoc = lib.concatStringsSep "\n" (lib.mapAttrsToList singleAsciiDoc optionsNix); + + optionsJSON = pkgs.runCommand "options.json" + { meta.description = "List of NixOS options in JSON format"; + } + '' + # Export list of options in different format. + dst=$out/share/doc/nixos + mkdir -p $dst + + cp ${builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON optionsNix))} $dst/options.json + + mkdir -p $out/nix-support + echo "file json $dst/options.json" >> $out/nix-support/hydra-build-products + ''; # */ + + optionsDocBook = pkgs.runCommand "options-docbook.xml" {} '' + optionsXML=${optionsXML} + if grep /nixpkgs/nixos/modules $optionsXML; then + echo "The manual appears to depend on the location of Nixpkgs, which is bad" + echo "since this prevents sharing via the NixOS channel. This is typically" + echo "caused by an option default that refers to a relative path (see above" + echo "for hints about the offending path)." + exit 1 + fi + + ${pkgs.libxslt.bin}/bin/xsltproc \ + --stringparam revision '${revision}' \ + -o intermediate.xml ${./options-to-docbook.xsl} $optionsXML + ${pkgs.libxslt.bin}/bin/xsltproc \ + -o "$out" ${./postprocess-option-descriptions.xsl} intermediate.xml + ''; +} diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixos/lib/make-options-doc/options-to-docbook.xsl similarity index 100% rename from nixos/doc/manual/options-to-docbook.xsl rename to nixos/lib/make-options-doc/options-to-docbook.xsl diff --git a/nixos/doc/manual/postprocess-option-descriptions.xsl b/nixos/lib/make-options-doc/postprocess-option-descriptions.xsl similarity index 100% rename from nixos/doc/manual/postprocess-option-descriptions.xsl rename to nixos/lib/make-options-doc/postprocess-option-descriptions.xsl diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/locale.nix similarity index 62% rename from nixos/modules/config/timezone.nix rename to nixos/modules/config/locale.nix index b15948f6e2e..6f056588187 100644 --- a/nixos/modules/config/timezone.nix +++ b/nixos/modules/config/locale.nix @@ -9,6 +9,8 @@ let timezone = types.nullOr (types.addCheck types.str nospace) // { description = "null or string without spaces"; }; + lcfg = config.location; + in { @@ -37,12 +39,45 @@ in }; }; + + location = { + + latitude = mkOption { + type = types.float; + description = '' + Your current latitude, between + -90.0 and 90.0. Must be provided + along with longitude. + ''; + }; + + longitude = mkOption { + type = types.float; + description = '' + Your current longitude, between + between -180.0 and 180.0. Must be + provided along with latitude. + ''; + }; + + provider = mkOption { + type = types.enum [ "manual" "geoclue2" ]; + default = "manual"; + description = '' + The location provider to use for determining your location. If set to + manual you must also provide latitude/longitude. + ''; + }; + + }; }; config = { environment.sessionVariables.TZDIR = "/etc/zoneinfo"; + services.geoclue2.enable = mkIf (lcfg.provider == "geoclue2") true; + # This way services are restarted when tzdata changes. systemd.globalEnvironment.TZDIR = tzdir; diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index c3f228c9bcc..25f1c67ce83 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -564,7 +564,10 @@ in { }; }) (filterAttrs (_: u: u.packages != []) cfg.users)); - environment.profiles = [ "/etc/profiles/per-user/$USER" ]; + environment.profiles = [ + "$HOME/.nix-profile" + "/etc/profiles/per-user/$USER" + ]; assertions = [ { assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique); diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix index f8e021f551e..8109ef76c40 100644 --- a/nixos/modules/i18n/input-method/ibus.nix +++ b/nixos/modules/i18n/input-method/ibus.nix @@ -55,7 +55,7 @@ in # Without dconf enabled it is impossible to use IBus environment.systemPackages = with pkgs; [ - ibus-qt gnome3.dconf ibusAutostart + gnome3.dconf ibusAutostart ]; environment.variables = { diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index c09def1fcea..cfdbdaabf5c 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -607,90 +607,7 @@ EOF } write_file($fn, <nixos-generate-config + saves to /etc/nixos/configuration.nix. + + This is an internal option. No backward compatibility is guaranteed. + Use at your own risk! + + Note that this string gets spliced into a Perl script. The perl + variable $bootLoaderConfig can be used to + splice in the boot loader configuration. + ''; + }; + config = { + system.nixos-generate-config.configuration = mkDefault '' + # Edit this configuration file to define what should be installed on + # your system. Help is available in the configuration.nix(5) man page + # and in the NixOS manual (accessible by running ‘nixos-help’). + + { config, pkgs, ... }: + + { + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + $bootLoaderConfig + # networking.hostName = "nixos"; # Define your hostname. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password\@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Select internationalisation properties. + # i18n = { + # consoleFont = "Lat2-Terminus16"; + # consoleKeyMap = "us"; + # defaultLocale = "en_US.UTF-8"; + # }; + + # Set your time zone. + # time.timeZone = "Europe/Amsterdam"; + + # List packages installed in system profile. To search, run: + # \$ nix search wget + # environment.systemPackages = with pkgs; [ + # wget vim + # ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { enable = true; enableSSHSupport = true; }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + # Enable sound. + # sound.enable = true; + # hardware.pulseaudio.enable = true; + + # Enable the X11 windowing system. + # services.xserver.enable = true; + # services.xserver.layout = "us"; + # services.xserver.xkbOptions = "eurosign:e"; + + # Enable touchpad support. + # services.xserver.libinput.enable = true; + + # Enable the KDE Desktop Environment. + # services.xserver.displayManager.sddm.enable = true; + # services.xserver.desktopManager.plasma5.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + # users.users.jane = { + # isNormalUser = true; + # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + # }; + + # This value determines the NixOS release with which your system is to be + # compatible, in order to avoid breaking some software such as database + # servers. You should change this only after NixOS release notes say you + # should. + system.stateVersion = "${config.system.nixos.release}"; # Did you read the comment? + + } + ''; + environment.systemPackages = [ nixos-build-vms nixos-install diff --git a/nixos/modules/misc/crashdump.nix b/nixos/modules/misc/crashdump.nix index 6e0b49fa9af..3c47e79d051 100644 --- a/nixos/modules/misc/crashdump.nix +++ b/nixos/modules/misc/crashdump.nix @@ -58,7 +58,6 @@ in "crashkernel=${crashdump.reservedMemory}" "nmi_watchdog=panic" "softlockup_panic=1" - "idle=poll" ]; kernelPatches = [ { name = "crashdump-config"; diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index e0c192246c0..afb74581e23 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -19,7 +19,7 @@ let lhs = optCall lhs_ { inherit pkgs; }; rhs = optCall rhs_ { inherit pkgs; }; in - lhs // rhs // + recursiveUpdate lhs rhs // optionalAttrs (lhs ? packageOverrides) { packageOverrides = pkgs: optCall lhs.packageOverrides pkgs // diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 15990177d74..3d4c41bbbdb 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -20,6 +20,7 @@ ./config/iproute2.nix ./config/krb5/default.nix ./config/ldap.nix + ./config/locale.nix ./config/malloc.nix ./config/networking.nix ./config/no-x-libs.nix @@ -33,7 +34,6 @@ ./config/system-environment.nix ./config/system-path.nix ./config/terminfo.nix - ./config/timezone.nix ./config/unix-odbc-drivers.nix ./config/users-groups.nix ./config/vpnc.nix @@ -106,9 +106,14 @@ ./programs/digitalbitbox/default.nix ./programs/dmrconfig.nix ./programs/environment.nix + ./programs/evince.nix + ./programs/file-roller.nix ./programs/firejail.nix ./programs/fish.nix ./programs/freetds.nix + ./programs/gnome-disks.nix + ./programs/gnome-documents.nix + ./programs/gpaste.nix ./programs/gnupg.nix ./programs/gphoto2.nix ./programs/iftop.nix @@ -209,6 +214,7 @@ ./services/backup/duplicity.nix ./services/backup/mysql-backup.nix ./services/backup/postgresql-backup.nix + ./services/backup/postgresql-wal-receiver.nix ./services/backup/restic.nix ./services/backup/restic-rest-server.nix ./services/backup/rsnapshot.nix @@ -280,12 +286,8 @@ ./services/desktops/pipewire.nix ./services/desktops/gnome3/at-spi2-core.nix ./services/desktops/gnome3/chrome-gnome-shell.nix - ./services/desktops/gnome3/evince.nix ./services/desktops/gnome3/evolution-data-server.nix - ./services/desktops/gnome3/file-roller.nix ./services/desktops/gnome3/glib-networking.nix - ./services/desktops/gnome3/gnome-disks.nix - ./services/desktops/gnome3/gnome-documents.nix ./services/desktops/gnome3/gnome-keyring.nix ./services/desktops/gnome3/gnome-online-accounts.nix ./services/desktops/gnome3/gnome-remote-desktop.nix @@ -293,7 +295,6 @@ ./services/desktops/gnome3/gnome-settings-daemon.nix ./services/desktops/gnome3/gnome-terminal-server.nix ./services/desktops/gnome3/gnome-user-share.nix - ./services/desktops/gnome3/gpaste.nix ./services/desktops/gnome3/gvfs.nix ./services/desktops/gnome3/rygel.nix ./services/desktops/gnome3/seahorse.nix @@ -402,6 +403,7 @@ ./services/misc/couchpotato.nix ./services/misc/devmon.nix ./services/misc/dictd.nix + ./services/misc/dwm-status.nix ./services/misc/dysnomia.nix ./services/misc/disnix.nix ./services/misc/docker-registry.nix @@ -818,6 +820,7 @@ ./services/web-servers/varnish/default.nix ./services/web-servers/zope2.nix ./services/x11/extra-layouts.nix + ./services/x11/clight.nix ./services/x11/colord.nix ./services/x11/compton.nix ./services/x11/unclutter.nix diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 3c6d356ef99..4d762314298 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -23,9 +23,8 @@ in XCURSOR_PATH = [ "$HOME/.icons" ]; }; - environment.profiles = - [ "$HOME/.nix-profile" - "/nix/var/nix/profiles/default" + environment.profiles = mkAfter + [ "/nix/var/nix/profiles/default" "/run/current-system/sw" ]; diff --git a/nixos/modules/services/desktops/gnome3/evince.nix b/nixos/modules/programs/evince.nix similarity index 53% rename from nixos/modules/services/desktops/gnome3/evince.nix rename to nixos/modules/programs/evince.nix index 5f040a16f06..473fddb09d0 100644 --- a/nixos/modules/services/desktops/gnome3/evince.nix +++ b/nixos/modules/programs/evince.nix @@ -6,14 +6,21 @@ with lib; { + # Added 2019-08-09 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "evince" "enable" ] + [ "programs" "evince" "enable" ]) + ]; + ###### interface options = { - services.gnome3.evince = { + programs.evince = { enable = mkEnableOption - "systemd and dbus services for Evince, the GNOME document viewer"; + "Evince, the GNOME document viewer"; }; @@ -22,7 +29,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.evince.enable { + config = mkIf config.programs.evince.enable { environment.systemPackages = [ pkgs.evince ]; diff --git a/nixos/modules/services/desktops/gnome3/file-roller.nix b/nixos/modules/programs/file-roller.nix similarity index 57% rename from nixos/modules/services/desktops/gnome3/file-roller.nix rename to nixos/modules/programs/file-roller.nix index 7fb558a9895..64f6a94e764 100644 --- a/nixos/modules/services/desktops/gnome3/file-roller.nix +++ b/nixos/modules/programs/file-roller.nix @@ -6,11 +6,18 @@ with lib; { + # Added 2019-08-09 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "file-roller" "enable" ] + [ "programs" "file-roller" "enable" ]) + ]; + ###### interface options = { - services.gnome3.file-roller = { + programs.file-roller = { enable = mkEnableOption "File Roller, an archive manager for GNOME"; @@ -21,7 +28,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.file-roller.enable { + config = mkIf config.programs.file-roller.enable { environment.systemPackages = [ pkgs.gnome3.file-roller ]; diff --git a/nixos/modules/services/desktops/gnome3/gnome-disks.nix b/nixos/modules/programs/gnome-disks.nix similarity index 57% rename from nixos/modules/services/desktops/gnome3/gnome-disks.nix rename to nixos/modules/programs/gnome-disks.nix index 139534cdb89..1cf839a6ddb 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-disks.nix +++ b/nixos/modules/programs/gnome-disks.nix @@ -1,4 +1,4 @@ -# GNOME Disks daemon. +# GNOME Disks. { config, pkgs, lib, ... }: @@ -6,17 +6,24 @@ with lib; { + # Added 2019-08-09 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "gnome-disks" "enable" ] + [ "programs" "gnome-disks" "enable" ]) + ]; + ###### interface options = { - services.gnome3.gnome-disks = { + programs.gnome-disks = { enable = mkOption { type = types.bool; default = false; description = '' - Whether to enable GNOME Disks daemon, a service designed to + Whether to enable GNOME Disks daemon, a program designed to be a UDisks2 graphical front-end. ''; }; @@ -28,7 +35,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.gnome-disks.enable { + config = mkIf config.programs.gnome-disks.enable { environment.systemPackages = [ pkgs.gnome3.gnome-disk-utility ]; diff --git a/nixos/modules/services/desktops/gnome3/gnome-documents.nix b/nixos/modules/programs/gnome-documents.nix similarity index 61% rename from nixos/modules/services/desktops/gnome3/gnome-documents.nix rename to nixos/modules/programs/gnome-documents.nix index f6efb668424..bfa3d409ee3 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-documents.nix +++ b/nixos/modules/programs/gnome-documents.nix @@ -1,4 +1,4 @@ -# GNOME Documents daemon. +# GNOME Documents. { config, pkgs, lib, ... }: @@ -6,17 +6,24 @@ with lib; { + # Added 2019-08-09 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "gnome-documents" "enable" ] + [ "programs" "gnome-documents" "enable" ]) + ]; + ###### interface options = { - services.gnome3.gnome-documents = { + programs.gnome-documents = { enable = mkOption { type = types.bool; default = false; description = '' - Whether to enable GNOME Documents services, a document + Whether to enable GNOME Documents, a document manager application for GNOME. ''; }; @@ -28,7 +35,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.gnome-documents.enable { + config = mkIf config.programs.gnome-documents.enable { environment.systemPackages = [ pkgs.gnome3.gnome-documents ]; diff --git a/nixos/modules/services/desktops/gnome3/gpaste.nix b/nixos/modules/programs/gpaste.nix similarity index 65% rename from nixos/modules/services/desktops/gnome3/gpaste.nix rename to nixos/modules/programs/gpaste.nix index 5a8258775e0..4f6deb77e5e 100644 --- a/nixos/modules/services/desktops/gnome3/gpaste.nix +++ b/nixos/modules/programs/gpaste.nix @@ -1,12 +1,20 @@ -# GPaste daemon. +# GPaste. { config, lib, pkgs, ... }: with lib; { + + # Added 2019-08-09 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "gpaste" "enable" ] + [ "programs" "gpaste" "enable" ]) + ]; + ###### interface options = { - services.gnome3.gpaste = { + programs.gpaste = { enable = mkOption { type = types.bool; default = false; @@ -18,10 +26,9 @@ with lib; }; ###### implementation - config = mkIf config.services.gnome3.gpaste.enable { + config = mkIf config.programs.gpaste.enable { environment.systemPackages = [ pkgs.gnome3.gpaste ]; services.dbus.packages = [ pkgs.gnome3.gpaste ]; - services.xserver.desktopManager.gnome3.sessionPath = [ pkgs.gnome3.gpaste ]; systemd.packages = [ pkgs.gnome3.gpaste ]; }; } diff --git a/nixos/modules/programs/nylas-mail.nix b/nixos/modules/programs/nylas-mail.nix deleted file mode 100644 index 08a6cd0a604..00000000000 --- a/nixos/modules/programs/nylas-mail.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.nylas-mail; -in { - ###### interface - options = { - services.nylas-mail = { - - enable = mkEnableOption '' - nylas-mail - Open-source mail client built on the modern web with Electron, React, and Flux - ''; - - gnome3-keyring = mkOption { - type = types.bool; - default = true; - description = "Enable gnome3 keyring for nylas-mail."; - }; - }; - }; - - - ###### implementation - - config = mkIf cfg.enable { - - environment.systemPackages = [ pkgs.nylas-mail-bin ]; - - services.gnome3.gnome-keyring = mkIf cfg.gnome3-keyring { - enable = true; - }; - - }; -} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index e0d64914ef4..5c08a25c128 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -51,6 +51,10 @@ with lib; (mkRemovedOptionModule [ "services" "misc" "nzbget" "openFirewall" ] "The port used by nzbget is managed through the web interface so you should adjust your firewall rules accordingly.") (mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "user" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a user setting.") (mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "group" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a group setting.") + (mkRemovedOptionModule [ "services" "prometheus2" "alertmanagerURL" ] '' + Due to incompatibility, the alertmanagerURL option has been removed, + please use 'services.prometheus2.alertmanagers' instead. + '') (mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ]) (mkRenamedOptionModule [ "services" "vmwareGuest" ] [ "virtualisation" "vmware" "guest" ]) (mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ]) @@ -258,6 +262,20 @@ with lib; (mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ]) (mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ]) + # Redshift + (mkChangedOptionModule [ "services" "redshift" "latitude" ] [ "location" "latitude" ] + (config: + let value = getAttrFromPath [ "services" "redshift" "latitude" ] config; + in if value == null then + throw "services.redshift.latitude is set to null, you can remove this" + else builtins.fromJSON value)) + (mkChangedOptionModule [ "services" "redshift" "longitude" ] [ "location" "longitude" ] + (config: + let value = getAttrFromPath [ "services" "redshift" "longitude" ] config; + in if value == null then + throw "services.redshift.longitude is set to null, you can remove this" + else builtins.fromJSON value)) + ] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter" "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter" "snmpExporter" "unifiExporter" "varnishExporter" ] diff --git a/nixos/modules/services/admin/oxidized.nix b/nixos/modules/services/admin/oxidized.nix index 687cdfb5ba5..39112c3970d 100644 --- a/nixos/modules/services/admin/oxidized.nix +++ b/nixos/modules/services/admin/oxidized.nix @@ -97,8 +97,8 @@ in preStart = '' mkdir -p ${cfg.dataDir}/.config/oxidized - cp -v ${cfg.routerDB} ${cfg.dataDir}/.config/oxidized/router.db - cp -v ${cfg.configFile} ${cfg.dataDir}/.config/oxidized/config + ln -f -s ${cfg.routerDB} ${cfg.dataDir}/.config/oxidized/router.db + ln -f -s ${cfg.configFile} ${cfg.dataDir}/.config/oxidized/config ''; serviceConfig = { diff --git a/nixos/modules/services/backup/automysqlbackup.nix b/nixos/modules/services/backup/automysqlbackup.nix index b845f370fb7..1884f3536a9 100644 --- a/nixos/modules/services/backup/automysqlbackup.nix +++ b/nixos/modules/services/backup/automysqlbackup.nix @@ -41,7 +41,7 @@ in }; config = mkOption { - type = with types; attrsOf (either (either str (either int bool)) (listOf str)); + type = with types; attrsOf (oneOf [ str int bool (listOf str) ]); default = {}; description = '' automysqlbackup configuration. Refer to diff --git a/nixos/modules/services/backup/postgresql-wal-receiver.nix b/nixos/modules/services/backup/postgresql-wal-receiver.nix new file mode 100644 index 00000000000..d9a37037992 --- /dev/null +++ b/nixos/modules/services/backup/postgresql-wal-receiver.nix @@ -0,0 +1,203 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + receiverSubmodule = { + options = { + postgresqlPackage = mkOption { + type = types.package; + example = literalExample "pkgs.postgresql_11"; + description = '' + PostgreSQL package to use. + ''; + }; + + directory = mkOption { + type = types.path; + example = literalExample "/mnt/pg_wal/main/"; + description = '' + Directory to write the output to. + ''; + }; + + statusInterval = mkOption { + type = types.int; + default = 10; + description = '' + Specifies the number of seconds between status packets sent back to the server. + This allows for easier monitoring of the progress from server. + A value of zero disables the periodic status updates completely, + although an update will still be sent when requested by the server, to avoid timeout disconnect. + ''; + }; + + slot = mkOption { + type = types.str; + default = ""; + example = "some_slot_name"; + description = '' + Require pg_receivewal to use an existing replication slot (see + Section 26.2.6 of the PostgreSQL manual). + When this option is used, pg_receivewal will report a flush position to the server, + indicating when each segment has been synchronized to disk so that the server can remove that segment if it is not otherwise needed. + + When the replication client of pg_receivewal is configured on the server as a synchronous standby, + then using a replication slot will report the flush position to the server, but only when a WAL file is closed. + Therefore, that configuration will cause transactions on the primary to wait for a long time and effectively not work satisfactorily. + The option must be specified in addition to make this work correctly. + ''; + }; + + synchronous = mkOption { + type = types.bool; + default = false; + description = '' + Flush the WAL data to disk immediately after it has been received. + Also send a status packet back to the server immediately after flushing, regardless of . + + This option should be specified if the replication client of pg_receivewal is configured on the server as a synchronous standby, + to ensure that timely feedback is sent to the server. + ''; + }; + + compress = mkOption { + type = types.ints.between 0 9; + default = 0; + description = '' + Enables gzip compression of write-ahead logs, and specifies the compression level + (0 through 9, 0 being no compression and 9 being best compression). + The suffix .gz will automatically be added to all filenames. + + This option requires PostgreSQL >= 10. + ''; + }; + + connection = mkOption { + type = types.str; + example = "postgresql://user@somehost"; + description = '' + Specifies parameters used to connect to the server, as a connection string. + See Section 34.1.1 of the PostgreSQL manual for more information. + + Because pg_receivewal doesn't connect to any particular database in the cluster, + database name in the connection string will be ignored. + ''; + }; + + extraArgs = mkOption { + type = with types; listOf str; + default = [ ]; + example = literalExample '' + [ + "--no-sync" + ] + ''; + description = '' + A list of extra arguments to pass to the pg_receivewal command. + ''; + }; + + environment = mkOption { + type = with types; attrsOf str; + default = { }; + example = literalExample '' + { + PGPASSFILE = "/private/passfile"; + PGSSLMODE = "require"; + } + ''; + description = '' + Environment variables passed to the service. + Usable parameters are listed in Section 34.14 of the PostgreSQL manual. + ''; + }; + }; + }; + +in { + options = { + services.postgresqlWalReceiver = { + receivers = mkOption { + type = with types; attrsOf (submodule receiverSubmodule); + default = { }; + example = literalExample '' + { + main = { + postgresqlPackage = pkgs.postgresql_11; + directory = /mnt/pg_wal/main/; + slot = "main_wal_receiver"; + connection = "postgresql://user@somehost"; + }; + } + ''; + description = '' + PostgreSQL WAL receivers. + Stream write-ahead logs from a PostgreSQL server using pg_receivewal (formerly pg_receivexlog). + See the man page for more information. + ''; + }; + }; + }; + + config = let + receivers = config.services.postgresqlWalReceiver.receivers; + in mkIf (receivers != { }) { + users = { + users.postgres = { + uid = config.ids.uids.postgres; + group = "postgres"; + description = "PostgreSQL server user"; + }; + + groups.postgres = { + gid = config.ids.gids.postgres; + }; + }; + + assertions = concatLists (attrsets.mapAttrsToList (name: config: [ + { + assertion = config.compress > 0 -> versionAtLeast config.postgresqlPackage.version "10"; + message = "Invalid configuration for WAL receiver \"${name}\": compress requires PostgreSQL version >= 10."; + } + ]) receivers); + + systemd.tmpfiles.rules = mapAttrsToList (name: config: '' + d ${escapeShellArg config.directory} 0750 postgres postgres - - + '') receivers; + + systemd.services = with attrsets; mapAttrs' (name: config: nameValuePair "postgresql-wal-receiver-${name}" { + description = "PostgreSQL WAL receiver (${name})"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + User = "postgres"; + Group = "postgres"; + KillSignal = "SIGINT"; + Restart = "always"; + RestartSec = 30; + }; + + inherit (config) environment; + + script = let + receiverCommand = postgresqlPackage: + if (versionAtLeast postgresqlPackage.version "10") + then "${postgresqlPackage}/bin/pg_receivewal" + else "${postgresqlPackage}/bin/pg_receivexlog"; + in '' + ${receiverCommand config.postgresqlPackage} \ + --no-password \ + --directory=${escapeShellArg config.directory} \ + --status-interval=${toString config.statusInterval} \ + --dbname=${escapeShellArg config.connection} \ + ${optionalString (config.compress > 0) "--compress=${toString config.compress}"} \ + ${optionalString (config.slot != "") "--slot=${escapeShellArg config.slot}"} \ + ${optionalString config.synchronous "--synchronous"} \ + ${concatStringsSep " " config.extraArgs} + ''; + }) receivers; + }; + + meta.maintainers = with maintainers; [ pacien ]; +} diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index 5ddf8ba4bfb..77e404116c8 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -160,7 +160,7 @@ in { systemd.tmpfiles.rules = [ "d '${dirOf cfg.uriFile}' - ${cfg.user} ${cfg.group} - -" - "d '${dirOf cfg.logFile}' - ${cfg.user} ${cfg.group} - -" + "f '${cfg.logFile}' - ${cfg.user} ${cfg.group} - -" "d '${cfg.databaseDir}' - ${cfg.user} ${cfg.group} - -" "d '${cfg.viewIndexDir}' - ${cfg.user} ${cfg.group} - -" ]; @@ -169,11 +169,9 @@ in { description = "CouchDB Server"; wantedBy = [ "multi-user.target" ]; - preStart = - '' + preStart = '' touch ${cfg.configFile} - touch -a ${cfg.logFile} - ''; + ''; environment = mkIf useVersion2 { # we are actually specifying 4 configuration files: diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix index 052ff1f308e..f9e403dfc0c 100644 --- a/nixos/modules/services/databases/memcached.nix +++ b/nixos/modules/services/databases/memcached.nix @@ -86,7 +86,25 @@ in in "${memcached}/bin/memcached ${networking} -m ${toString cfg.maxMemory} -c ${toString cfg.maxConnections} ${concatStringsSep " " cfg.extraOptions}"; User = cfg.user; + + # Filesystem access + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; RuntimeDirectory = "memcached"; + # Caps + CapabilityBoundingSet = ""; + NoNewPrivileges = true; + # Misc. + LockPersonality = true; + RestrictRealtime = true; + PrivateMounts = true; + PrivateUsers = true; + MemoryDenyWriteExecute = true; }; }; }; diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 7ff899970cc..10250bb5193 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -330,13 +330,13 @@ in fi '' + optionalString (cfg.ensureDatabases != []) '' ${concatMapStrings (database: '' - $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${database}'" | grep -q 1 || $PSQL -tAc "CREATE DATABASE ${database}" + $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${database}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${database}"' '') cfg.ensureDatabases} '' + '' ${concatMapStrings (user: '' $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc "CREATE USER ${user.name}" ${concatStringsSep "\n" (mapAttrsToList (database: permission: '' - $PSQL -tAc "GRANT ${permission} ON ${database} TO ${user.name}" + $PSQL -tAc 'GRANT ${permission} ON ${database} TO ${user.name}' '') user.ensurePermissions)} '') cfg.ensureUsers} ''; diff --git a/nixos/modules/services/games/minecraft-server.nix b/nixos/modules/services/games/minecraft-server.nix index 39a68f4b553..eb9288fca58 100644 --- a/nixos/modules/services/games/minecraft-server.nix +++ b/nixos/modules/services/games/minecraft-server.nix @@ -118,7 +118,7 @@ in { }; serverProperties = mkOption { - type = with types; attrsOf (either bool (either int str)); + type = with types; attrsOf (oneOf [ bool int str ]); default = {}; example = literalExample '' { diff --git a/nixos/modules/services/mail/davmail.nix b/nixos/modules/services/mail/davmail.nix index 5b5cc294e5c..374a3dd75c1 100644 --- a/nixos/modules/services/mail/davmail.nix +++ b/nixos/modules/services/mail/davmail.nix @@ -7,7 +7,7 @@ let cfg = config.services.davmail; configType = with types; - either (either (attrsOf configType) str) (either int bool) // { + oneOf [ (attrsOf configType) str int bool ] // { description = "davmail config type (str, int, bool or attribute set thereof)"; }; diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index dab1b29aa4b..2b08ab1e6aa 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -447,7 +447,7 @@ in }; config = mkOption { - type = with types; attrsOf (either bool (either str (listOf str))); + type = with types; attrsOf (oneOf [ bool str (listOf str) ]); description = '' The main.cf configuration file as key value set. ''; diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 5541b8b79b7..e59d5715de0 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -331,7 +331,7 @@ in }; config = mkOption { - type = with types; attrsOf (either bool (either str (listOf str))); + type = with types; attrsOf (oneOf [ bool str (listOf str) ]); description = '' Addon to postfix configuration ''; diff --git a/nixos/modules/services/mail/rss2email.nix b/nixos/modules/services/mail/rss2email.nix index a123736005a..df454abc826 100644 --- a/nixos/modules/services/mail/rss2email.nix +++ b/nixos/modules/services/mail/rss2email.nix @@ -30,7 +30,7 @@ in { }; config = mkOption { - type = with types; attrsOf (either str (either int bool)); + type = with types; attrsOf (oneOf [ str int bool ]); default = {}; description = '' The configuration to give rss2email. diff --git a/nixos/modules/services/misc/dwm-status.nix b/nixos/modules/services/misc/dwm-status.nix new file mode 100644 index 00000000000..b98a42e6a6d --- /dev/null +++ b/nixos/modules/services/misc/dwm-status.nix @@ -0,0 +1,73 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.dwm-status; + + order = concatMapStringsSep "," (feature: ''"${feature}"'') cfg.order; + + configFile = pkgs.writeText "dwm-status.toml" '' + order = [${order}] + + ${cfg.extraConfig} + ''; +in + +{ + + ###### interface + + options = { + + services.dwm-status = { + + enable = mkEnableOption "dwm-status user service"; + + package = mkOption { + type = types.package; + default = pkgs.dwm-status; + defaultText = "pkgs.dwm-status"; + example = "pkgs.dwm-status.override { enableAlsaUtils = false; }"; + description = '' + Which dwm-status package to use. + ''; + }; + + order = mkOption { + type = types.listOf (types.enum [ "audio" "backlight" "battery" "cpu_load" "network" "time" ]); + description = '' + List of enabled features in order. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra config in TOML format. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + services.upower.enable = elem "battery" cfg.order; + + systemd.user.services.dwm-status = { + description = "Highly performant and configurable DWM status service"; + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; + + serviceConfig.ExecStart = "${cfg.package}/bin/dwm-status ${configFile}"; + }; + + }; + +} diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 2f3f76d79ff..087630f2177 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -502,7 +502,7 @@ in { "d ${cfg.statePath} 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/builds 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/config 0750 ${cfg.user} ${cfg.group} -" - "d ${cfg.statePath}/config/initializers 0750 ${cfg.user} ${cfg.group} -" + "D ${cfg.statePath}/config/initializers 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/db 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/log 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/repositories 2770 ${cfg.user} ${cfg.group} -" diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index ce3d53fb2c1..7f78db74677 100644 --- a/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -42,9 +42,9 @@ let # Apply the configured extraIntegrations to the provided agent # package. See the documentation of `dd-agent/integrations-core.nix` # for detailed information on this. - datadogPkg = cfg.package.overrideAttrs(_: { - python = (pkgs.datadog-integrations-core cfg.extraIntegrations).python; - }); + datadogPkg = cfg.package.override { + pythonPackages = pkgs.datadog-integrations-core cfg.extraIntegrations; + }; in { options.services.datadog-agent = { enable = mkOption { @@ -60,7 +60,7 @@ in { defaultText = "pkgs.datadog-agent"; description = '' Which DataDog v6 agent package to use. Note that the provided - package is expected to have an overridable `python`-attribute + package is expected to have an overridable `pythonPackages`-attribute which configures the Python environment with the Datadog checks. ''; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index c2f6b585d49..bf1084eecc3 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -503,12 +503,12 @@ in { message = "Cannot set both adminPassword and adminPasswordFile"; } { - assertion = cfg.security.secretKeyFile != opt.security.secretKeyFile.default -> cfg.security.secretKeyFile == null; + assertion = cfg.security.secretKey != opt.security.secretKey.default -> cfg.security.secretKeyFile == null; message = "Cannot set both secretKey and secretKeyFile"; } { assertion = cfg.smtp.password != opt.smtp.password.default -> cfg.smtp.passwordFile == null; - message = "Cannot set both password and secretKeyFile"; + message = "Cannot set both password and passwordFile"; } ]; diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index d8384e0d35b..647d67533b8 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -79,12 +79,8 @@ let (pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg2.rules)) ]); scrape_configs = filterValidPrometheus cfg2.scrapeConfigs; - alerting = optionalAttrs (cfg2.alertmanagerURL != []) { - alertmanagers = [{ - static_configs = [{ - targets = cfg2.alertmanagerURL; - }]; - }]; + alerting = { + inherit (cfg2) alertmanagers; }; }; @@ -738,11 +734,23 @@ in { ''; }; - alertmanagerURL = mkOption { - type = types.listOf types.str; + alertmanagers = mkOption { + type = types.listOf types.attrs; + example = literalExample '' + [ { + scheme = "https"; + path_prefix = "/alertmanager"; + static_configs = [ { + targets = [ + "prometheus.domain.tld" + ]; + } ]; + } ] + ''; default = []; description = '' - List of Alertmanager URLs to send notifications to. + A list of alertmanagers to send alerts to. + See the official documentation for more information. ''; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix index f69b389760f..ca4366121e1 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix @@ -4,6 +4,13 @@ with lib; let cfg = config.services.prometheus.exporters.blackbox; + + checkConfig = file: pkgs.runCommand "checked-blackbox-exporter.conf" { + preferLocalBuild = true; + buildInputs = [ pkgs.buildPackages.prometheus-blackbox-exporter ]; } '' + ln -s ${file} $out + blackbox_exporter --config.check --config.file $out + ''; in { port = 9115; @@ -21,7 +28,7 @@ in ExecStart = '' ${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ - --config.file ${cfg.configFile} \ + --config.file ${checkConfig cfg.configFile} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; diff --git a/nixos/modules/services/networking/znc/default.nix b/nixos/modules/services/networking/znc/default.nix index 46bff6954cd..05f97bfa539 100644 --- a/nixos/modules/services/networking/znc/default.nix +++ b/nixos/modules/services/networking/znc/default.nix @@ -62,9 +62,9 @@ let concatStringsSep "\n" (toLines cfg.config); semanticTypes = with types; rec { - zncAtom = nullOr (either (either int bool) str); + zncAtom = nullOr (oneOf [ int bool str ]); zncAttr = attrsOf (nullOr zncConf); - zncAll = either (either zncAtom (listOf zncAtom)) zncAttr; + zncAll = oneOf [ zncAtom (listOf zncAtom) zncAttr ]; zncConf = attrsOf (zncAll // { # Since this is a recursive type and the description by default contains # the description of its subtypes, infinite recursion would occur without diff --git a/nixos/modules/services/security/bitwarden_rs/default.nix b/nixos/modules/services/security/bitwarden_rs/default.nix index bb036ee020f..80fd65891ff 100644 --- a/nixos/modules/services/security/bitwarden_rs/default.nix +++ b/nixos/modules/services/security/bitwarden_rs/default.nix @@ -36,7 +36,7 @@ in { }; config = mkOption { - type = attrsOf (nullOr (either (either bool int) str)); + type = attrsOf (nullOr (oneOf [ bool int str ])); default = {}; example = literalExample '' { diff --git a/nixos/modules/services/web-apps/limesurvey.nix b/nixos/modules/services/web-apps/limesurvey.nix index 5b2f3875aaa..84a94fc446e 100644 --- a/nixos/modules/services/web-apps/limesurvey.nix +++ b/nixos/modules/services/web-apps/limesurvey.nix @@ -14,7 +14,7 @@ let pkg = pkgs.limesurvey; - configType = with types; either (either (attrsOf configType) str) (either int bool) // { + configType = with types; oneOf [ (attrsOf configType) str int bool ] // { description = "limesurvey config type (str, int, bool or attribute set thereof)"; }; diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index ea9476a7c91..12200c879be 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -336,7 +336,7 @@ let ++ optional enablePerl { name = "perl"; path = "${mod_perl}/modules/mod_perl.so"; } ++ concatMap (svc: svc.extraModules) allSubservices ++ extraForeignModules; - in concatMapStrings load allModules + in concatMapStrings load (unique allModules) } AddHandler type-map var diff --git a/nixos/modules/services/x11/clight.nix b/nixos/modules/services/x11/clight.nix new file mode 100644 index 00000000000..6ec395bb05e --- /dev/null +++ b/nixos/modules/services/x11/clight.nix @@ -0,0 +1,115 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.clight; + + toConf = v: + if builtins.isFloat v then toString v + else if isInt v then toString v + else if isBool v then boolToString v + else if isString v then ''"${escape [''"''] v}"'' + else if isList v then "[ " + concatMapStringsSep ", " toConf v + " ]" + else abort "clight.toConf: unexpected type (v = ${v})"; + + clightConf = pkgs.writeText "clight.conf" + (concatStringsSep "\n" (mapAttrsToList + (name: value: "${toString name} = ${toConf value};") + (filterAttrs + (_: value: value != null) + cfg.settings))); +in { + options.services.clight = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable clight or not. + ''; + }; + + temperature = { + day = mkOption { + type = types.int; + default = 5500; + description = '' + Colour temperature to use during the day, between + 1000 and 25000 K. + ''; + }; + night = mkOption { + type = types.int; + default = 3700; + description = '' + Colour temperature to use at night, between + 1000 and 25000 K. + ''; + }; + }; + + settings = let + validConfigTypes = with types; either int (either str (either bool float)); + in mkOption { + type = with types; attrsOf (nullOr (either validConfigTypes (listOf validConfigTypes))); + default = {}; + example = { captures = 20; gamma_long_transition = true; ac_capture_timeouts = [ 120 300 60 ]; }; + description = '' + Additional configuration to extend clight.conf. See + for a + sample configuration file. + ''; + }; + }; + + config = mkIf cfg.enable { + boot.kernelModules = [ "i2c_dev" ]; + environment.systemPackages = with pkgs; [ clight clightd ]; + services.dbus.packages = with pkgs; [ clight clightd ]; + services.upower.enable = true; + + services.clight.settings = { + gamma_temp = with cfg.temperature; mkDefault [ day night ]; + } // (optionalAttrs (config.location.provider == "manual") { + latitude = mkDefault config.location.latitude; + longitude = mkDefault config.location.longitude; + }); + + services.geoclue2.appConfig."clightc" = { + isAllowed = true; + isSystem = true; + }; + + systemd.services.clightd = { + requires = [ "polkit.service" ]; + wantedBy = [ "multi-user.target" ]; + + description = "Bus service to manage various screen related properties (gamma, dpms, backlight)"; + serviceConfig = { + Type = "dbus"; + BusName = "org.clightd.clightd"; + Restart = "on-failure"; + RestartSec = 5; + ExecStart = '' + ${pkgs.clightd}/bin/clightd + ''; + }; + }; + + systemd.user.services.clight = { + after = [ "upower.service" "clightd.service" ]; + wants = [ "upower.service" "clightd.service" ]; + partOf = [ "graphical-session.target" ]; + wantedBy = [ "graphical-session.target" ]; + + description = "C daemon to adjust screen brightness to match ambient brightness, as computed capturing frames from webcam"; + serviceConfig = { + Restart = "on-failure"; + RestartSec = 5; + ExecStart = '' + ${pkgs.clight}/bin/clight --conf-file ${clightConf} + ''; + }; + }; + }; +} diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix index c02c9bfd94e..a94a76ff0c0 100644 --- a/nixos/modules/services/x11/compton.nix +++ b/nixos/modules/services/x11/compton.nix @@ -215,7 +215,7 @@ in { }; settings = let - configTypes = with types; either bool (either int (either float str)); + configTypes = with types; oneOf [ bool int float str ]; # types.loaOf converts lists to sets loaOf = t: with types; either (listOf t) (attrsOf t); in mkOption { diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index cd750242125..5e1e652a508 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -123,12 +123,8 @@ in { services.dleyna-renderer.enable = mkDefault true; services.dleyna-server.enable = mkDefault true; services.gnome3.at-spi2-core.enable = true; - services.gnome3.evince.enable = mkDefault true; services.gnome3.evolution-data-server.enable = true; - services.gnome3.file-roller.enable = mkDefault true; services.gnome3.glib-networking.enable = true; - services.gnome3.gnome-disks.enable = mkDefault true; - services.gnome3.gnome-documents.enable = mkDefault true; services.gnome3.gnome-keyring.enable = true; services.gnome3.gnome-online-accounts.enable = mkDefault true; services.gnome3.gnome-remote-desktop.enable = mkDefault true; @@ -157,6 +153,12 @@ in { xdg.portal.enable = true; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; + # Enable default programs + programs.evince.enable = mkDefault true; + programs.file-roller.enable = mkDefault true; + programs.gnome-disks.enable = mkDefault true; + programs.gnome-documents.enable = mkDefault true; + # If gnome3 is installed, build vim for gtk3 too. nixpkgs.config.vim.gui = "gtk3"; diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index 4345a334808..55f8f75021b 100644 --- a/nixos/modules/services/x11/redshift.nix +++ b/nixos/modules/services/x11/redshift.nix @@ -5,6 +5,7 @@ with lib; let cfg = config.services.redshift; + lcfg = config.location; in { @@ -18,35 +19,6 @@ in { ''; }; - latitude = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Your current latitude, between - -90.0 and 90.0. Must be provided - along with longitude. - ''; - }; - - longitude = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Your current longitude, between - between -180.0 and 180.0. Must be - provided along with latitude. - ''; - }; - - provider = mkOption { - type = types.enum [ "manual" "geoclue2" ]; - default = "manual"; - description = '' - The location provider to use for determining your location. If set to - manual you must also provide latitude/longitude. - ''; - }; - temperature = { day = mkOption { type = types.int; @@ -106,33 +78,19 @@ in { }; config = mkIf cfg.enable { - assertions = [ - { - assertion = - if cfg.provider == "manual" - then (cfg.latitude != null && cfg.longitude != null) - else (cfg.latitude == null && cfg.longitude == null); - message = "Latitude and longitude must be provided together, and with provider set to null."; - } - ]; - # needed so that .desktop files are installed, which geoclue cares about environment.systemPackages = [ cfg.package ]; - services.geoclue2 = mkIf (cfg.provider == "geoclue2") { - enable = true; - appConfig."redshift" = { - isAllowed = true; - isSystem = true; - }; + services.geoclue2.appConfig."redshift" = { + isAllowed = true; + isSystem = true; }; - systemd.user.services.redshift = + systemd.user.services.redshift = let - providerString = - if cfg.provider == "manual" - then "${cfg.latitude}:${cfg.longitude}" - else cfg.provider; + providerString = if lcfg.provider == "manual" + then "${toString lcfg.latitude}:${toString lcfg.longitude}" + else lcfg.provider; in { description = "Redshift colour temperature adjuster"; diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix index d6c0f050486..a550ffd6320 100644 --- a/nixos/modules/system/boot/binfmt.nix +++ b/nixos/modules/system/boot/binfmt.nix @@ -115,6 +115,14 @@ let magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00''; mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; }; + wasm32-wasi = { + magicOrExtension = ''\x00asm''; + mask = ''\xff\xff\xff\xff''; + }; + wasm64-wasi = { + magicOrExtension = ''\x00asm''; + mask = ''\xff\xff\xff\xff''; + }; x86_64-windows = { magicOrExtension = ".exe"; recognitionType = "extension"; @@ -226,6 +234,7 @@ in { emulatedSystems = mkOption { default = []; + example = [ "wasm32-wasi" "x86_64-windows" "aarch64-linux" ]; description = '' List of systems to emulate. Will also configure Nix to support your new systems. diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index ee4ae845a7d..c1f2c98afcd 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -226,7 +226,7 @@ in rec { environment = mkOption { default = {}; - type = with types; attrsOf (nullOr (either str (either path package))); + type = with types; attrsOf (nullOr (oneOf [ str path package ])); example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; }; description = "Environment variables passed to the service's processes."; }; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 1025a038c4b..1914827d0e5 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -524,7 +524,7 @@ in }; systemd.globalEnvironment = mkOption { - type = with types; attrsOf (nullOr (either str (either path package))); + type = with types; attrsOf (nullOr (oneOf [ str path package ])); default = {}; example = { TZ = "CET"; }; description = '' diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index b9a9515f94e..7146aebf54b 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -68,8 +68,9 @@ in rec { nixos.tests.chromium.x86_64-linux or [] (all nixos.tests.firefox) (all nixos.tests.firewall) - (except ["aarch64-linux"] nixos.tests.gnome3) - (except ["aarch64-linux"] nixos.tests.pantheon) + (all nixos.tests.gnome3-xorg) + (all nixos.tests.gnome3) + (all nixos.tests.pantheon) nixos.tests.installer.zfsroot.x86_64-linux or [] # ZFS is 64bit only (except ["aarch64-linux"] nixos.tests.installer.lvm) (except ["aarch64-linux"] nixos.tests.installer.luksroot) @@ -103,7 +104,7 @@ in rec { #(all nixos.tests.keymap.neo) #(all nixos.tests.keymap.qwertz) (all nixos.tests.plasma5) - #(all nixos.tests.lightdm) + (all nixos.tests.lightdm) (all nixos.tests.login) (all nixos.tests.misc) (all nixos.tests.mutableUsers) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index c3fa53ac544..c24c8ae61a5 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -56,7 +56,7 @@ in containers-physical_interfaces = handleTest ./containers-physical_interfaces.nix {}; containers-restart_networking = handleTest ./containers-restart_networking.nix {}; containers-tmpfs = handleTest ./containers-tmpfs.nix {}; - #couchdb = handleTest ./couchdb.nix {}; # spidermonkey-1.8.5 is marked as broken + couchdb = handleTest ./couchdb.nix {}; deluge = handleTest ./deluge.nix {}; dhparams = handleTest ./dhparams.nix {}; dnscrypt-proxy = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy.nix {}; @@ -93,8 +93,8 @@ in gitlab = handleTest ./gitlab.nix {}; gitolite = handleTest ./gitolite.nix {}; gjs = handleTest ./gjs.nix {}; - gnome3 = handleTestOn ["x86_64-linux"] ./gnome3.nix {}; # libsmbios is unsupported on aarch64 - gnome3-gdm = handleTestOn ["x86_64-linux"] ./gnome3-gdm.nix {}; # libsmbios is unsupported on aarch64 + gnome3-xorg = handleTest ./gnome3-xorg.nix {}; + gnome3 = handleTest ./gnome3.nix {}; gocd-agent = handleTest ./gocd-agent.nix {}; gocd-server = handleTest ./gocd-server.nix {}; google-oslogin = handleTest ./google-oslogin {}; @@ -139,7 +139,7 @@ in ldap = handleTest ./ldap.nix {}; leaps = handleTest ./leaps.nix {}; lidarr = handleTest ./lidarr.nix {}; - #lightdm = handleTest ./lightdm.nix {}; + lightdm = handleTest ./lightdm.nix {}; limesurvey = handleTest ./limesurvey.nix {}; login = handleTest ./login.nix {}; loki = handleTest ./loki.nix {}; @@ -183,6 +183,7 @@ in nginx = handleTest ./nginx.nix {}; nginx-sso = handleTest ./nginx-sso.nix {}; nix-ssh-serve = handleTest ./nix-ssh-serve.nix {}; + nixos-generate-config = handleTest ./nixos-generate-config.nix {}; novacomd = handleTestOn ["x86_64-linux"] ./novacomd.nix {}; nsd = handleTest ./nsd.nix {}; nzbget = handleTest ./nzbget.nix {}; @@ -209,6 +210,7 @@ in plotinus = handleTest ./plotinus.nix {}; postgis = handleTest ./postgis.nix {}; postgresql = handleTest ./postgresql.nix {}; + postgresql-wal-receiver = handleTest ./postgresql-wal-receiver.nix {}; powerdns = handleTest ./powerdns.nix {}; predictable-interface-names = handleTest ./predictable-interface-names.nix {}; printing = handleTest ./printing.nix {}; diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix deleted file mode 100644 index c2808d87d99..00000000000 --- a/nixos/tests/gnome3-gdm.nix +++ /dev/null @@ -1,63 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : { - name = "gnome3-gdm"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ lethalman ]; - }; - - machine = - { ... }: - - { imports = [ ./common/user-account.nix ]; - - services.xserver.enable = true; - - services.xserver.displayManager.gdm = { - enable = true; - autoLogin = { - enable = true; - user = "alice"; - }; - }; - services.xserver.desktopManager.gnome3.enable = true; - - virtualisation.memorySize = 1024; - }; - - testScript = let - # Keep line widths somewhat managable - bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus"; - gdbus = "${bus} gdbus"; - # Call javascript in gnome shell, returns a tuple (success, output), where - # `success` is true if the dbus call was successful and output is what the - # javascript evaluates to. - eval = "call --session -d org.gnome.Shell -o /org/gnome/Shell -m org.gnome.Shell.Eval"; - # False when startup is done - startingUp = "${gdbus} ${eval} Main.layoutManager._startingUp"; - # Hopefully gnome-terminal's wm class - wmClass = "${gdbus} ${eval} global.display.focus_window.wm_class"; - in '' - # wait for gdm to start - $machine->waitForUnit("display-manager.service"); - - # wait for alice to be logged in - $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"); - - # Wait for the wayland server - $machine->waitForFile("/run/user/1000/wayland-0"); - - # Wait for gnome shell, correct output should be "(true, 'false')" - $machine->waitUntilSucceeds("su - alice -c '${startingUp} | grep -q true,..false'"); - - # open a terminal - $machine->succeed("su - alice -c '${bus} gnome-terminal'"); - # and check it's there - $machine->waitUntilSucceeds("su - alice -c '${wmClass} | grep -q gnome-terminal-server'"); - - # wait to get a nice screenshot - $machine->sleep(20); - $machine->screenshot("screen"); - ''; -}) diff --git a/nixos/tests/gnome3-xorg.nix b/nixos/tests/gnome3-xorg.nix new file mode 100644 index 00000000000..f12361da037 --- /dev/null +++ b/nixos/tests/gnome3-xorg.nix @@ -0,0 +1,41 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "gnome3-xorg"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = pkgs.gnome3.maintainers; + }; + + machine = + { ... }: + + { imports = [ ./common/user-account.nix ]; + + services.xserver.enable = true; + + services.xserver.displayManager.gdm.enable = false; + services.xserver.displayManager.lightdm.enable = true; + services.xserver.displayManager.lightdm.autoLogin.enable = true; + services.xserver.displayManager.lightdm.autoLogin.user = "alice"; + services.xserver.desktopManager.gnome3.enable = true; + services.xserver.desktopManager.default = "gnome-xorg"; + + virtualisation.memorySize = 1024; + }; + + testScript = + '' + $machine->waitForX; + + # wait for alice to be logged in + $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("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'"); + $machine->succeed("xauth merge ~alice/.Xauthority"); + $machine->waitForWindow(qr/alice.*machine/); + $machine->succeed("timeout 900 bash -c 'while read msg; do if [[ \$msg =~ \"GNOME Shell started\" ]]; then break; fi; done < <(journalctl -f)'"); + $machine->sleep(10); + $machine->screenshot("screen"); + ''; +}) diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix index b58c9e5a0e3..b6fe602a732 100644 --- a/nixos/tests/gnome3.nix +++ b/nixos/tests/gnome3.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "gnome3"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ domenkozar eelco lethalman ]; + maintainers = pkgs.gnome3.maintainers; }; machine = @@ -11,19 +11,34 @@ import ./make-test.nix ({ pkgs, ...} : { services.xserver.enable = true; - services.xserver.displayManager.gdm.enable = false; - services.xserver.displayManager.lightdm.enable = true; - services.xserver.displayManager.lightdm.autoLogin.enable = true; - services.xserver.displayManager.lightdm.autoLogin.user = "alice"; + services.xserver.displayManager.gdm = { + enable = true; + autoLogin = { + enable = true; + user = "alice"; + }; + }; + services.xserver.desktopManager.gnome3.enable = true; - services.xserver.desktopManager.default = "gnome-xorg"; virtualisation.memorySize = 1024; }; - testScript = - '' - $machine->waitForX; + testScript = let + # Keep line widths somewhat managable + bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus"; + gdbus = "${bus} gdbus"; + # Call javascript in gnome shell, returns a tuple (success, output), where + # `success` is true if the dbus call was successful and output is what the + # javascript evaluates to. + eval = "call --session -d org.gnome.Shell -o /org/gnome/Shell -m org.gnome.Shell.Eval"; + # False when startup is done + startingUp = "${gdbus} ${eval} Main.layoutManager._startingUp"; + # Hopefully gnome-terminal's wm class + wmClass = "${gdbus} ${eval} global.display.focus_window.wm_class"; + in '' + # wait for gdm to start + $machine->waitForUnit("display-manager.service"); # wait for alice to be logged in $machine->waitForUnit("default.target","alice"); @@ -31,11 +46,19 @@ import ./make-test.nix ({ pkgs, ...} : { # Check that logging in has given the user ownership of devices. $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); - $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'"); - $machine->succeed("xauth merge ~alice/.Xauthority"); - $machine->waitForWindow(qr/alice.*machine/); - $machine->succeed("timeout 900 bash -c 'while read msg; do if [[ \$msg =~ \"GNOME Shell started\" ]]; then break; fi; done < <(journalctl -f)'"); - $machine->sleep(10); + # Wait for the wayland server + $machine->waitForFile("/run/user/1000/wayland-0"); + + # Wait for gnome shell, correct output should be "(true, 'false')" + $machine->waitUntilSucceeds("su - alice -c '${startingUp} | grep -q true,..false'"); + + # open a terminal + $machine->succeed("su - alice -c '${bus} gnome-terminal'"); + # and check it's there + $machine->waitUntilSucceeds("su - alice -c '${wmClass} | grep -q gnome-terminal-server'"); + + # wait to get a nice screenshot + $machine->sleep(20); $machine->screenshot("screen"); ''; }) diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix index 8a9a7408d29..c805f1ed9f3 100644 --- a/nixos/tests/lightdm.nix +++ b/nixos/tests/lightdm.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "lightdm"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aszlig ]; + maintainers = [ aszlig worldofpeace ]; }; machine = { ... }: { diff --git a/nixos/tests/mosquitto.nix b/nixos/tests/mosquitto.nix index 86b7f9c044d..bd5447de15f 100644 --- a/nixos/tests/mosquitto.nix +++ b/nixos/tests/mosquitto.nix @@ -49,21 +49,40 @@ in rec { testScript = let file = "/tmp/msg"; - payload = "wootWOOT"; + sub = args: + "(${cmd "sub"} -C 1 ${args} | tee ${file} &)"; in '' startAll; $server->waitForUnit("mosquitto.service"); $server->fail("test -f ${file}"); - $server->execute("(${cmd "sub"} -C 1 | tee ${file} &)"); - $client1->fail("test -f ${file}"); - $client1->execute("(${cmd "sub"} -C 1 | tee ${file} &)"); + $client2->fail("test -f ${file}"); - $client2->succeed("${cmd "pub"} -m ${payload}"); - $server->succeed("grep -q ${payload} ${file}"); + # QoS = 0, so only one subscribers should get it + $server->execute("${sub "-q 0"}"); - $client1->succeed("grep -q ${payload} ${file}"); + # we need to give the subscribers some time to connect + $client2->execute("sleep 5"); + $client2->succeed("${cmd "pub"} -m FOO -q 0"); + + $server->waitUntilSucceeds("grep -q FOO ${file}"); + $server->execute("rm ${file}"); + + + # QoS = 1, so both subscribers should get it + $server->execute("${sub "-q 1"}"); + $client1->execute("${sub "-q 1"}"); + + # we need to give the subscribers some time to connect + $client2->execute("sleep 5"); + $client2->succeed("${cmd "pub"} -m BAR -q 1"); + + $server->waitUntilSucceeds("grep -q BAR ${file}"); + $server->execute("rm ${file}"); + + $client1->waitUntilSucceeds("grep -q BAR ${file}"); + $client1->execute("rm ${file}"); ''; }) diff --git a/nixos/tests/nixos-generate-config.nix b/nixos/tests/nixos-generate-config.nix new file mode 100644 index 00000000000..15a173e024b --- /dev/null +++ b/nixos/tests/nixos-generate-config.nix @@ -0,0 +1,24 @@ +import ./make-test.nix ({ lib, ... } : { + name = "nixos-generate-config"; + meta.maintainers = with lib.maintainers; [ basvandijk ]; + machine = { + system.nixos-generate-config.configuration = '' + # OVERRIDDEN + { config, pkgs, ... }: { + imports = [ ./hardware-configuration.nix ]; + $bootLoaderConfig + } + ''; + }; + testScript = '' + startAll; + $machine->waitForUnit("multi-user.target"); + $machine->succeed("nixos-generate-config"); + + # Test if the configuration really is overridden + $machine->succeed("grep 'OVERRIDDEN' /etc/nixos/configuration.nix"); + + # Test of if the Perl variable $bootLoaderConfig is spliced correctly: + $machine->succeed("grep 'boot\\.loader\\.grub\\.enable = true;' /etc/nixos/configuration.nix"); + ''; +}) diff --git a/nixos/tests/postgresql-wal-receiver.nix b/nixos/tests/postgresql-wal-receiver.nix new file mode 100644 index 00000000000..791b041ba95 --- /dev/null +++ b/nixos/tests/postgresql-wal-receiver.nix @@ -0,0 +1,86 @@ +{ system ? builtins.currentSystem +, config ? { } +, pkgs ? import ../.. { inherit system config; } }: + +with import ../lib/testing.nix { inherit system pkgs; }; +with pkgs.lib; + +let + postgresqlDataDir = "/var/db/postgresql/test"; + replicationUser = "wal_receiver_user"; + replicationSlot = "wal_receiver_slot"; + replicationConn = "postgresql://${replicationUser}@localhost"; + baseBackupDir = "/tmp/pg_basebackup"; + walBackupDir = "/tmp/pg_wal"; + recoveryConf = pkgs.writeText "recovery.conf" '' + restore_command = 'cp ${walBackupDir}/%f %p' + ''; + + makePostgresqlWalReceiverTest = subTestName: postgresqlPackage: makeTest { + name = "postgresql-wal-receiver-${subTestName}"; + meta.maintainers = with maintainers; [ pacien ]; + + machine = { ... }: { + services.postgresql = { + package = postgresqlPackage; + enable = true; + dataDir = postgresqlDataDir; + extraConfig = '' + wal_level = archive # alias for replica on pg >= 9.6 + max_wal_senders = 10 + max_replication_slots = 10 + ''; + authentication = '' + host replication ${replicationUser} all trust + ''; + initialScript = pkgs.writeText "init.sql" '' + create user ${replicationUser} replication; + select * from pg_create_physical_replication_slot('${replicationSlot}'); + ''; + }; + + services.postgresqlWalReceiver.receivers.main = { + inherit postgresqlPackage; + connection = replicationConn; + slot = replicationSlot; + directory = walBackupDir; + }; + }; + + testScript = '' + # make an initial base backup + $machine->waitForUnit('postgresql'); + $machine->waitForUnit('postgresql-wal-receiver-main'); + # WAL receiver healthchecks PG every 5 seconds, so let's be sure they have connected each other + # required only for 9.4 + $machine->sleep(5); + $machine->succeed('${postgresqlPackage}/bin/pg_basebackup --dbname=${replicationConn} --pgdata=${baseBackupDir}'); + + # create a dummy table with 100 records + $machine->succeed('sudo -u postgres psql --command="create table dummy as select * from generate_series(1, 100) as val;"'); + + # stop postgres and destroy data + $machine->systemctl('stop postgresql'); + $machine->systemctl('stop postgresql-wal-receiver-main'); + $machine->succeed('rm -r ${postgresqlDataDir}/{base,global,pg_*}'); + + # restore the base backup + $machine->succeed('cp -r ${baseBackupDir}/* ${postgresqlDataDir} && chown postgres:postgres -R ${postgresqlDataDir}'); + + # prepare WAL and recovery + $machine->succeed('chmod a+rX -R ${walBackupDir}'); + $machine->execute('for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done'); # make use of partial segments too + $machine->succeed('cp ${recoveryConf} ${postgresqlDataDir}/recovery.conf && chmod 666 ${postgresqlDataDir}/recovery.conf'); + + # replay WAL + $machine->systemctl('start postgresql'); + $machine->waitForFile('${postgresqlDataDir}/recovery.done'); + $machine->systemctl('restart postgresql'); + $machine->waitForUnit('postgresql'); + + # check that our records have been restored + $machine->succeed('test $(sudo -u postgres psql --pset="pager=off" --tuples-only --command="select count(distinct val) from dummy;") -eq 100'); + ''; + }; + +in mapAttrs makePostgresqlWalReceiverTest (import ../../pkgs/servers/sql/postgresql pkgs) diff --git a/nixos/tests/syncthing-init.nix b/nixos/tests/syncthing-init.nix index 811a466ff94..0de76b688bd 100644 --- a/nixos/tests/syncthing-init.nix +++ b/nixos/tests/syncthing-init.nix @@ -22,9 +22,13 @@ in { }; testScript = '' + my $config; + $machine->waitForUnit("syncthing-init.service"); - $machine->succeed("cat /var/lib/syncthing/config.xml") =~ /${testId}/ or die; - $machine->succeed("cat /var/lib/syncthing/config.xml") =~ /testFolder/ or die; + $config = $machine->succeed("cat /var/lib/syncthing/.config/syncthing/config.xml"); + + $config =~ /${testId}/ or die; + $config =~ /testFolder/ or die; ''; }) diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix index 0452f401334..1332e53964b 100644 --- a/pkgs/applications/altcoins/dogecoin.nix +++ b/pkgs/applications/altcoins/dogecoin.nix @@ -2,23 +2,23 @@ , pkgconfig, autoreconfHook , db5, openssl, boost, zlib, miniupnpc , protobuf, utillinux, qt4, qrencode -, withGui }: +, withGui, libevent }: with stdenv.lib; stdenv.mkDerivation rec { name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.10.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "dogecoin"; repo = "dogecoin"; rev = "v${version}"; - sha256 = "04rddx20d4fps2w3h1jxa2j8iyqpjv2fh897z0z3r06qjvjzf7rr"; + sha256 = "0nmbi5gmms16baqs3fmdp2xm0yf8wawnyz80gcmca4j5ph2zka1v"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl db5 openssl utillinux - protobuf boost zlib miniupnpc ] + protobuf boost zlib miniupnpc libevent ] ++ optionals withGui [ qt4 qrencode ]; configureFlags = [ "--with-incompatible-bdb" diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 9ef348abc50..740ecfa228f 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "go-ethereum"; - version = "1.9.1"; + version = "1.9.2"; goPackagePath = "github.com/ethereum/go-ethereum"; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "05vnjdjwahdp2j7c6g81jchpdhxmdpbr20mjzpszylp9824v4cba"; + sha256 = "0lymwylh4j63fzj9jy7mcw676a2ksgpsj9mazif1r3d2q73h9m88"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix index 6c1536c0a61..d01e7879335 100644 --- a/pkgs/applications/audio/denemo/default.nix +++ b/pkgs/applications/audio/denemo/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "denemo-${version}"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { url = "https://ftp.gnu.org/gnu/denemo/denemo-${version}.tar.gz"; - sha256 = "18zcs4xmfj4vpzi15dj7k5bjzzzlr3sjf9xhrrgy4samrrdpqzfh"; + sha256 = "1blkcl3slbsq9jlhwcf2m9v9g38a0sjfhh9advgi2qr1gxri08by"; }; buildInputs = [ diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 9407a1c2688..a595bb06900 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchzip, cmake, pkgconfig +{ stdenv, mkDerivation, lib, fetchzip, cmake, pkgconfig , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis , portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools , qtwebengine, qtxmlpatterns }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "musescore-${version}"; version = "3.0.5"; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 1ecb8be09dd..04a62b5d159 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint }: +{ stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 }: let pythonPackages = python3Packages; @@ -13,7 +13,7 @@ in pythonPackages.buildPythonApplication rec { sha256 = "1armg8vpvnbpk7rrfk9q7nj5gm56rza00ni9qwdyqpxp1xaz6apj"; }; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]; propagatedBuildInputs = with pythonPackages; [ pyqt5 @@ -22,15 +22,16 @@ in pythonPackages.buildPythonApplication rec { discid ]; - installPhase = '' - python setup.py install --prefix="$out" - ''; - prePatch = '' # Pesky unicode punctuation. substituteInPlace setup.cfg --replace "‘" "'" ''; + installPhase = '' + python setup.py install --prefix="$out" + wrapQtApp $out/bin/picard + ''; + meta = with stdenv.lib; { homepage = http://musicbrainz.org/doc/MusicBrainz_Picard; description = "The official MusicBrainz tagger"; diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 7e43225eedc..ece2f567791 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20190206"; + version = "20190714"; name = "x42-plugins-${version}"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz"; - sha256 = "0rsp8lm8zr20l410whr98d61401rkphgpl8llbn5p2wsiw0q9aqd"; + sha256 = "1mifmdy9pi1lg0h4nsvyjjnnni41vhgg34lks94mrx46wq90bgx4"; }; nativeBuildInputs = [ pkgconfig ]; @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { patchPhase = '' patchShebangs ./stepseq.lv2/gridgen.sh + patchShebangs ./matrixmixer.lv2/genttl.sh #TODO: remove at next update, see https://github.com/x42/matrixmixer.lv2/issues/2 + patchShebangs ./matrixmixer.lv2/genhead.sh #TODO: remove at next update, see https://github.com/x42/matrixmixer.lv2/issues/2 sed -i 's|/usr/include/zita-convolver.h|${zita-convolver}/include/zita-convolver.h|g' ./convoLV2/Makefile ''; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 794a881090c..b3a7c2c817c 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "090rc307mfm0yw4h592l9307lq4aas8zq0ci49csn6kxhds8rsrm"; }; betaVersion = { - version = "3.5.0.19"; # "Android Studio 3.5 RC 2" - build = "191.5763348"; - sha256Hash = "0z7mjpk0cqwk4ysd3cdsahlg70ax90353qvvag9wgyzl2x2sr6d2"; + version = "3.5.0.20"; # "Android Studio 3.5 RC 3" + build = "191.5781497"; + sha256Hash = "03c5f01dqjvz55l8vyrpypjmmip96kc27p8sw0c5jky0igiyym5j"; }; latestVersion = { # canary & dev version = "3.6.0.3"; # "Android Studio 3.6 Canary 3" diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 7af3742349a..7db4d3e947b 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -1,17 +1,17 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkgconfig -, curl, freetype, giflib, harfbuzz, libjpeg, libpng, libwebp, pixman, tinyxml, zlib -, libX11, libXext, libXcursor, libXxf86vm +{ stdenv, lib, callPackage, fetchFromGitHub, fetchpatch, cmake, ninja, pkgconfig +, curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib +, harfbuzzFull, glib, fontconfig, pcre +, libX11, libXext, libXcursor, libXxf86vm, libGL , unfree ? false , cmark }: -# Unfree version is not redistributable: -# https://dev.aseprite.org/2016/09/01/new-source-code-license/ -# Consider supporting the developer: https://aseprite.org/#buy - +let + skia = callPackage ./skia.nix {}; +in stdenv.mkDerivation rec { name = "aseprite-${version}"; - version = if unfree then "1.2.9" else "1.1.7"; + version = if unfree then "1.2.11" else "1.1.7"; src = fetchFromGitHub { owner = "aseprite"; @@ -19,21 +19,27 @@ stdenv.mkDerivation rec { rev = "v${version}"; fetchSubmodules = true; sha256 = if unfree - then "0a9xk163j0984n8nn6pqf27n83gr6w7g25wkiv591zx88pa6cpbd" + then "1illr51jpg5g6nx29rav9dllyy5lzyyn7lj2fhrnpz1ysqgaq5p8" else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake pkgconfig + ] ++ lib.optionals unfree [ ninja ]; buildInputs = [ - curl freetype giflib harfbuzz libjpeg libpng libwebp pixman tinyxml zlib + curl freetype giflib libjpeg libpng libwebp pixman tinyxml zlib libX11 libXext libXcursor libXxf86vm - ] ++ lib.optionals unfree [ cmark harfbuzz ]; + ] ++ lib.optionals unfree [ + cmark + harfbuzzFull glib fontconfig pcre + skia libGL + ]; patches = lib.optionals unfree [ (fetchpatch { - url = "https://github.com/aseprite/aseprite/commit/cfb4dac6feef1f39e161c23c886055a8f9acfd0d.patch"; - sha256 = "1qhjfpngg8b1vvb9w26lhjjfamfx57ih0p31km3r5l96nm85l7f9"; + url = "https://github.com/lfont/aseprite/commit/f1ebc47012d3fed52306ed5922787b4b98cc0a7b.patch"; + sha256 = "03xg7x6b9iv7z18vzlqxhcfphmx4v3qhs9f5rgf38ppyklca5jyw"; }) (fetchpatch { url = "https://github.com/orivej/aseprite/commit/ea87e65b357ad0bd65467af5529183b5a48a8c17.patch"; @@ -67,6 +73,9 @@ stdenv.mkDerivation rec { "-DENABLE_CAT=OFF" "-DENABLE_CPIO=OFF" "-DENABLE_TAR=OFF" + # UI backend. + "-DLAF_OS_BACKEND=skia" + "-DSKIA_DIR=${skia}" ]; postInstall = '' @@ -87,6 +96,24 @@ stdenv.mkDerivation rec { homepage = https://www.aseprite.org/; description = "Animated sprite editor & pixel art tool"; license = if unfree then licenses.unfree else licenses.gpl2; + longDescription = + ''Aseprite is a program to create animated sprites. Its main features are: + + - Sprites are composed by layers & frames (as separated concepts). + - Supported color modes: RGBA, Indexed (palettes up to 256 colors), and Grayscale. + - Load/save sequence of PNG files and GIF animations (and FLC, FLI, JPG, BMP, PCX, TGA). + - Export/import animations to/from Sprite Sheets. + - Tiled drawing mode, useful to draw patterns and textures. + - Undo/Redo for every operation. + - Real-time animation preview. + - Multiple editors support. + - Pixel-art specific tools like filled Contour, Polygon, Shading mode, etc. + - Onion skinning. + '' + lib.optionalString unfree + '' + This version is not redistributable: https://dev.aseprite.org/2016/09/01/new-source-code-license/ + Consider supporting the developer: https://aseprite.org/#buy + ''; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/editors/aseprite/skia-deps.nix b/pkgs/applications/editors/aseprite/skia-deps.nix new file mode 100644 index 00000000000..e5655ca8315 --- /dev/null +++ b/pkgs/applications/editors/aseprite/skia-deps.nix @@ -0,0 +1,23 @@ +{ fetchgit }: +{ + angle2 = fetchgit { + url = "https://chromium.googlesource.com/angle/angle.git"; + rev = "956ab4d9fab36be9929e63829475d4d69b2c681c"; + sha256 = "0fcw04wwkn3ixr9l9k0d32n78r9g72p31ii9i5spsq2d0wlylr38"; + }; + dng_sdk = fetchgit { + url = "https://android.googlesource.com/platform/external/dng_sdk.git"; + rev = "96443b262250c390b0caefbf3eed8463ba35ecae"; + sha256 = "1rsr7njhj7c5p87hfznj069fdc3qqhvvnq9sa2rb8c4q849rlzx6"; + }; + piex = fetchgit { + url = "https://android.googlesource.com/platform/external/piex.git"; + rev = "bb217acdca1cc0c16b704669dd6f91a1b509c406"; + sha256 = "05ipmag6k55jmidbyvg5mkqm69zfw03gfkqhi9jnjlmlbg31y412"; + }; + sfntly = fetchgit { + url = "https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git"; + rev = "b18b09b6114b9b7fe6fc2f96d8b15e8a72f66916"; + sha256 = "0zf1h0dibmm38ldypccg4faacvskmd42vsk6zbxlfcfwjlqm6pp4"; + }; +} diff --git a/pkgs/applications/editors/aseprite/skia-make-deps.sh b/pkgs/applications/editors/aseprite/skia-make-deps.sh new file mode 100755 index 00000000000..5e12c4f5c85 --- /dev/null +++ b/pkgs/applications/editors/aseprite/skia-make-deps.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env bash + +FILTER=$1 +OUT=skia-deps.nix +REVISION=89e4ca4352d05adc892f5983b108433f29b2c0c2 +DEPS=$(curl -s https://raw.githubusercontent.com/aseprite/skia/$REVISION/DEPS) +THIRD_PARTY_DEPS=$(echo "$DEPS" | grep third_party | grep "#" -v | sed 's/"//g') + +function write_fetch_defs () +{ + while read -r DEP; do + NAME=$(echo "$DEP" | cut -d: -f1 | cut -d/ -f3 | sed 's/ //g') + URL=$(echo "$DEP" | cut -d: -f2- | cut -d@ -f1 | sed 's/ //g') + REV=$(echo "$DEP" | cut -d: -f2- | cut -d@ -f2 | sed 's/[ ,]//g') + + echo "Fetching $NAME@$REV" + PREFETCH=$(nix-prefetch-git --rev "$REV" "$URL") + +( +cat <> "$OUT" + + echo "----------" + echo + done <<< "$1" +} + +echo "{ fetchgit }:" > "$OUT" +echo "{" >> "$OUT" +write_fetch_defs "$(echo "$THIRD_PARTY_DEPS" | grep -E "$FILTER")" +echo "}" >> "$OUT" diff --git a/pkgs/applications/editors/aseprite/skia.nix b/pkgs/applications/editors/aseprite/skia.nix new file mode 100644 index 00000000000..038ff96ad3b --- /dev/null +++ b/pkgs/applications/editors/aseprite/skia.nix @@ -0,0 +1,68 @@ +{ stdenv, lib, fetchFromGitHub, fetchgit, python2, gn, ninja +, fontconfig, expat, icu58, libjpeg, libpng, libwebp, zlib +, mesa, libX11 +}: + +let + # skia-deps.nix is generated by: ./skia-make-deps.sh 'angle2|dng_sdk|piex|sfntly' + depSrcs = import ./skia-deps.nix { inherit fetchgit; }; +in +stdenv.mkDerivation rec { + name = "skia-aseprite-m71"; + + src = fetchFromGitHub { + owner = "aseprite"; + repo = "skia"; + # latest commit from aseprite-m71 branch + rev = "89e4ca4352d05adc892f5983b108433f29b2c0c2"; + sha256 = "0n3vrkswvi6rib9zv2pzi18h3j5wm7flmgkgaikcm6q7iw4l2c7x"; + }; + + nativeBuildInputs = [ python2 gn ninja ]; + + buildInputs = [ + fontconfig expat icu58 libjpeg libpng libwebp zlib + mesa libX11 + ]; + + preConfigure = with depSrcs; '' + mkdir -p third_party/externals + ln -s ${angle2} third_party/externals/angle2 + ln -s ${dng_sdk} third_party/externals/dng_sdk + ln -s ${piex} third_party/externals/piex + ln -s ${sfntly} third_party/externals/sfntly + ''; + + configurePhase = '' + runHook preConfigure + gn gen out/Release --args="is_debug=false is_official_build=true" + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + ninja -C out/Release skia + runHook postBuild + ''; + + installPhase = '' + mkdir -p $out + + # Glob will match all subdirs. + shopt -s globstar + + # All these paths are used in some way when building aseprite. + cp -r --parents -t $out/ \ + include/codec \ + include/config \ + include/core \ + include/effects \ + include/gpu \ + include/private \ + include/utils \ + out/Release/*.a \ + src/gpu/**/*.h \ + third_party/externals/angle2/include \ + third_party/skcms/**/*.h + ''; +} diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 7f0a318741f..eeb025a88c6 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -39,10 +39,10 @@ elpaBuild { pname = "ada-mode"; ename = "ada-mode"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-6.1.0.tar"; - sha256 = "1qa4kjv5xxlj50fghg5516cxn8ckv8vlyarcab2isxjnnxnb6g7s"; + url = "https://elpa.gnu.org/packages/ada-mode-6.1.1.tar"; + sha256 = "090zyspc32fmfqwr0qpzi6qclsaarvb5484b0lq0cdyzgjhimdla"; }; packageRequires = [ cl-lib emacs wisi ]; meta = { @@ -84,10 +84,10 @@ elpaBuild { pname = "adjust-parens"; ename = "adjust-parens"; - version = "3.0"; + version = "3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/adjust-parens-3.0.tar"; - sha256 = "16gmrgdfyqs7i617669f7xy5mds1svbyfv12xhdjk96rbssfngzg"; + url = "https://elpa.gnu.org/packages/adjust-parens-3.1.tar"; + sha256 = "059v0njd52vxidr5xwv2jmknm2shnwpj3101069q6lsmz1wq242a"; }; packageRequires = []; meta = { @@ -178,10 +178,10 @@ elpaBuild { pname = "arbitools"; ename = "arbitools"; - version = "0.976"; + version = "0.977"; src = fetchurl { - url = "https://elpa.gnu.org/packages/arbitools-0.976.el"; - sha256 = "08lvm921zhm22aghz17pps0b5g4f1xyyrl0qisdvd98kz1ajq7xr"; + url = "https://elpa.gnu.org/packages/arbitools-0.977.el"; + sha256 = "0nvdy14lqvy2ca4vw2qlr2kg2vv4y4sr8sa7kqrpf8cg7k9q3mbv"; }; packageRequires = [ cl-lib ]; meta = { @@ -204,7 +204,7 @@ license = lib.licenses.free; }; }) {}; - async = callPackage ({ elpaBuild, fetchurl, lib }: + async = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }: elpaBuild { pname = "async"; ename = "async"; @@ -213,7 +213,7 @@ url = "https://elpa.gnu.org/packages/async-1.9.2.tar"; sha256 = "17fnvrj7jww29sav6a6jpizclg4w2962m6h37akpii71gf0vrffw"; }; - packageRequires = []; + packageRequires = [ cl-lib nadvice ]; meta = { homepage = "https://elpa.gnu.org/packages/async.html"; license = lib.licenses.free; @@ -735,10 +735,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.18"; + version = "0.19"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.18.tar"; - sha256 = "00kich80zdg7v3v613f9prqddkpwpm1nf9sj10f0n6wh15rzwv07"; + url = "https://elpa.gnu.org/packages/debbugs-0.19.tar"; + sha256 = "0cpby8f088cqb5mpd756a2mb706x763k15cg2xdmmsxl415k3yw4"; }; packageRequires = [ cl-lib emacs soap-client ]; meta = { @@ -746,7 +746,7 @@ license = lib.licenses.free; }; }) {}; - delight = callPackage ({ elpaBuild, fetchurl, lib }: + delight = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }: elpaBuild { pname = "delight"; ename = "delight"; @@ -755,7 +755,7 @@ url = "https://elpa.gnu.org/packages/delight-1.5.el"; sha256 = "0kzlvzwmn6zj0874086q2xw0pclyi7wlkq48zh2lkd2796xm8vw7"; }; - packageRequires = []; + packageRequires = [ cl-lib nadvice ]; meta = { homepage = "https://elpa.gnu.org/packages/delight.html"; license = lib.licenses.free; @@ -780,10 +780,10 @@ elpaBuild { pname = "diff-hl"; ename = "diff-hl"; - version = "1.8.6"; + version = "1.8.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/diff-hl-1.8.6.tar"; - sha256 = "02hvi5jxv2anf62lw878bdz6xk7xjhjd5q85pqihmadbpj6i6pfq"; + url = "https://elpa.gnu.org/packages/diff-hl-1.8.7.tar"; + sha256 = "1qcwicflvm6dxcflnlg891hyzwp2q79fdkdbdwp1440a0j09riam"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -870,10 +870,10 @@ elpaBuild { pname = "djvu"; ename = "djvu"; - version = "1.0.1"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/djvu-1.0.1.el"; - sha256 = "1am4cm9csc5df3mbdby7j197j8yxv0x0maf6kfmn2ww1iwcyv8x6"; + url = "https://elpa.gnu.org/packages/djvu-1.1.el"; + sha256 = "0njgyx09q225hliacsnjk8wallg5i6xkz6bj501pb05nwqfbvfk7"; }; packageRequires = []; meta = { @@ -930,10 +930,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.6.8"; + version = "0.6.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.6.8.tar"; - sha256 = "0bcs4f2l6cdg6hx3crk0vchhljhgwd1ik8n0p001gs1mk91178jp"; + url = "https://elpa.gnu.org/packages/ebdb-0.6.10.tar"; + sha256 = "0z0q7kcwczvdh0ddd775vv233j74sjlllv8pjm446bmy9cy6pg8j"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -990,10 +990,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20190425"; + version = "20190517"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20190425.tar"; - sha256 = "0wffwdkk68hcnkggrfmx0ag3pmapdzwzq54sx8y0m68aw0by90y1"; + url = "https://elpa.gnu.org/packages/eev-20190517.tar"; + sha256 = "0hgjdax0kg2w7bf3idl6mw6m8j2wkh1253px42v2lbaxp6897m07"; }; packageRequires = [ emacs ]; meta = { @@ -1030,10 +1030,10 @@ elpaBuild { pname = "el-search"; ename = "el-search"; - version = "1.12.5"; + version = "1.12.6.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.12.5.tar"; - sha256 = "0q6fnjp2hh8p1l7wj7645szlz6qxdfy71s0xljjrmc2836i32xzc"; + url = "https://elpa.gnu.org/packages/el-search-1.12.6.1.tar"; + sha256 = "150f4rirg107hmzpv8ifa32k2mgf07smbf9z44ln5rh8n17xwqah"; }; packageRequires = [ cl-print emacs stream ]; meta = { @@ -1132,10 +1132,10 @@ elpaBuild { pname = "excorporate"; ename = "excorporate"; - version = "0.8.1"; + version = "0.8.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/excorporate-0.8.1.tar"; - sha256 = "1k89472x80wsn14y16km5bgynmmd2kbdfhylb3cc17jvdn1xr53y"; + url = "https://elpa.gnu.org/packages/excorporate-0.8.3.tar"; + sha256 = "04bsbiwgfbfd501qvwh0iwyk0xh442kjfj73b3876idwj3p8alr5"; }; packageRequires = [ emacs fsm nadvice soap-client url-http-ntlm ]; meta = { @@ -1207,10 +1207,10 @@ elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.0.6"; + version = "1.0.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/flymake-1.0.6.el"; - sha256 = "10n9vnabiz3m5gs3azc76x7y1p9qhc6aspgygw7awq9ff6hhkhbw"; + url = "https://elpa.gnu.org/packages/flymake-1.0.8.el"; + sha256 = "1hqxrqb227v4ncjjqx8im3c4mhg8w5yjbz9hpfcm5x8xnr2yd6bp"; }; packageRequires = [ emacs ]; meta = { @@ -1222,10 +1222,10 @@ elpaBuild { pname = "fountain-mode"; ename = "fountain-mode"; - version = "2.7.1"; + version = "2.7.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/fountain-mode-2.7.1.el"; - sha256 = "198ls0rvzgpb942mvjyljgbaxp05wjys1a003bfq528przv0vpaz"; + url = "https://elpa.gnu.org/packages/fountain-mode-2.7.3.el"; + sha256 = "1sz3qp3y52d05jd006zc99r4ryignpa2jgfk72rw3zfqmikzv15j"; }; packageRequires = [ emacs ]; meta = { @@ -1252,10 +1252,10 @@ elpaBuild { pname = "frog-menu"; ename = "frog-menu"; - version = "0.2.8"; + version = "0.2.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/frog-menu-0.2.8.el"; - sha256 = "18f937lvhw2dxwldahim13pr3ppndssjp0dis95iaspiwg9mwc4h"; + url = "https://elpa.gnu.org/packages/frog-menu-0.2.9.el"; + sha256 = "1gjhypsafpqybcbwi49qi1g419hcq9qv4p940ybspydg9gqk3gmp"; }; packageRequires = [ avy emacs posframe ]; meta = { @@ -1596,10 +1596,10 @@ elpaBuild { pname = "ivy"; ename = "ivy"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-0.11.0.tar"; - sha256 = "1pxapdc7jarqc8lf3a3fsn4nsi4j146dh07f89xkj087psq30v50"; + url = "https://elpa.gnu.org/packages/ivy-0.12.0.tar"; + sha256 = "14q9kh48iabrnhwcmhlvgk7sg4a0j5c3zjp0yzj1ijrz5zbdhxxz"; }; packageRequires = [ emacs ]; meta = { @@ -1746,10 +1746,10 @@ elpaBuild { pname = "let-alist"; ename = "let-alist"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/let-alist-1.0.5.el"; - sha256 = "0r7b9jni50la1m79kklml11syg8d2fmdlr83pv005sv1wh02jszw"; + url = "https://elpa.gnu.org/packages/let-alist-1.0.6.el"; + sha256 = "0szj7vnjzz4zci5fvz7xqgcpi4pzdyyf4qi2s8xar2hi7v3yaawr"; }; packageRequires = [ emacs ]; meta = { @@ -2250,10 +2250,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.2.3"; + version = "9.2.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.2.3.tar"; - sha256 = "0hqy4lns9q5p0l1ylgmlckqprn9sbasszhznanmv0rsh0gzhsbyw"; + url = "https://elpa.gnu.org/packages/org-9.2.5.tar"; + sha256 = "1pid1sykgz83i4ry5n8f270finag6sm7ckqxn5lkikyya43wlzx1"; }; packageRequires = []; meta = { @@ -2366,6 +2366,21 @@ license = lib.licenses.free; }; }) {}; + path-iterator = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "path-iterator"; + ename = "path-iterator"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/path-iterator-1.0.tar"; + sha256 = "0kgl7rhv9x23jyr6ahfy6ql447zpz9fnmfwldkpn69g7jdx6a3cc"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/path-iterator.html"; + license = lib.licenses.free; + }; + }) {}; peg = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "peg"; @@ -2381,6 +2396,36 @@ license = lib.licenses.free; }; }) {}; + persist = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "persist"; + ename = "persist"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/persist-0.4.tar"; + sha256 = "0gpxy41qawzss2526j9a7lys60vqma1lvamn4bfabwza7gfhac0q"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/persist.html"; + license = lib.licenses.free; + }; + }) {}; + phps-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "phps-mode"; + ename = "phps-mode"; + version = "0.2.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/phps-mode-0.2.3.tar"; + sha256 = "1wp04d5mi97287qwhic239kkf4r69839gl0hsn5m8qr3dbkhqxy5"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/phps-mode.html"; + license = lib.licenses.free; + }; + }) {}; pinentry = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "pinentry"; @@ -2415,10 +2460,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "0.4.3"; + version = "0.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-0.4.3.el"; - sha256 = "06q0p4qim6lha2xr9fxaspbzw01xn01ik9gxlld6hdhh19b65cmi"; + url = "https://elpa.gnu.org/packages/posframe-0.5.0.el"; + sha256 = "1fjnpwg1fj9j54nymh802vd4viggrg3qnqwh52281n7zv6xfv0qb"; }; packageRequires = [ emacs ]; meta = { @@ -2556,10 +2601,10 @@ elpaBuild { pname = "realgud"; ename = "realgud"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/realgud-1.5.0.tar"; - sha256 = "0bfshrgkfrfb1d8insnb5n25230xd0scdk6bijhgh34q2phjy2fy"; + url = "https://elpa.gnu.org/packages/realgud-1.5.1.tar"; + sha256 = "01155sydricdvxy3djk64w2zc6x0q4j669bvz8m8rd766wsmida8"; }; packageRequires = [ emacs load-relative loc-changes test-simple ]; meta = { @@ -2710,10 +2755,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "1.8"; + version = "1.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/relint-1.8.el"; - sha256 = "1bl6m2h7131acbmr0kqfnjjpv2syiv2mxfnm61g874ynnvkmmkm3"; + url = "https://elpa.gnu.org/packages/relint-1.9.el"; + sha256 = "0y386kch263199mwl93ambwib948s2vrw466kf0ly9cxv7xpv6hr"; }; packageRequires = [ xr ]; meta = { @@ -2971,10 +3016,10 @@ elpaBuild { pname = "sql-indent"; ename = "sql-indent"; - version = "1.3"; + version = "1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sql-indent-1.3.tar"; - sha256 = "0zira8my1q975bad2h76bz4yddjzf0dskvy6x865np86rmzd0c9w"; + url = "https://elpa.gnu.org/packages/sql-indent-1.4.tar"; + sha256 = "1nilxfm30nb2la1463729rgbgbma7igkf0z325k8cbapqanb1wgl"; }; packageRequires = [ cl-lib ]; meta = { @@ -3016,10 +3061,10 @@ elpaBuild { pname = "svg"; ename = "svg"; - version = "0.2"; + version = "1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/svg-0.2.el"; - sha256 = "14yfi27v3zdzh1chcjiq4l63iwh0vd99wv1z4w7agr33540jybc5"; + url = "https://elpa.gnu.org/packages/svg-1.0.el"; + sha256 = "1hh0x7sz2rqb7zdhcm2q9knr8nnwqrsbz1zfp29k8l1318li9f62"; }; packageRequires = [ emacs ]; meta = { @@ -3046,10 +3091,10 @@ elpaBuild { pname = "system-packages"; ename = "system-packages"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/system-packages-1.0.10.tar"; - sha256 = "1vwf2j0fxrsqmrgc7x5nkkg0vlhwgxppc4w7kb5is6dgrssskpb5"; + url = "https://elpa.gnu.org/packages/system-packages-1.0.11.tar"; + sha256 = "0xf2q5bslxpw0wycgi2k983lnfpw182rgdzq0f99f64kb7ifns9y"; }; packageRequires = [ emacs ]; meta = { @@ -3132,6 +3177,21 @@ license = lib.licenses.free; }; }) {}; + tramp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "tramp"; + ename = "tramp"; + version = "2.4.2.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tramp-2.4.2.1.tar"; + sha256 = "139y05b2m715zryxqw7k438cc137mziz2k5nbzrrahddfz0i3cf9"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tramp.html"; + license = lib.licenses.free; + }; + }) {}; tramp-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "tramp-theme"; @@ -3207,6 +3267,21 @@ license = lib.licenses.free; }; }) {}; + uniquify-files = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "uniquify-files"; + ename = "uniquify-files"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/uniquify-files-1.0.tar"; + sha256 = "1n1r3pmnh9b8zb7pyv158pzmvha4gqqrfrapvpjdcrcnnd2dynkm"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/uniquify-files.html"; + license = lib.licenses.free; + }; + }) {}; url-http-ntlm = callPackage ({ cl-lib ? null , elpaBuild , fetchurl @@ -3276,6 +3351,23 @@ license = lib.licenses.free; }; }) {}; + verilog-mode = callPackage ({ elpaBuild + , fetchurl + , lib }: + elpaBuild { + pname = "verilog-mode"; + ename = "verilog-mode"; + version = "2019.6.21.103209889"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/verilog-mode-2019.6.21.103209889.el"; + sha256 = "0hlcp2jhm30bzx6iabdb31aqv0dmmim30g9z5kqb0hl1bd1dnm9m"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/verilog-mode.html"; + license = lib.licenses.free; + }; + }) {}; vigenere = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "vigenere"; @@ -3358,10 +3450,10 @@ elpaBuild { pname = "wcheck-mode"; ename = "wcheck-mode"; - version = "2016.1.30"; + version = "2019.6.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wcheck-mode-2016.1.30.el"; - sha256 = "0hzrxnslfl04h083njy7wp4hhgrqpyz0cnm73v348kr1i4wx9xjq"; + url = "https://elpa.gnu.org/packages/wcheck-mode-2019.6.17.el"; + sha256 = "0579a3p9swq0j0fca9s885kzv69y9lhhnqa6m4pzdgrr6pfrirqv"; }; packageRequires = []; meta = { @@ -3418,10 +3510,10 @@ elpaBuild { pname = "websocket"; ename = "websocket"; - version = "1.9"; + version = "1.11.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/websocket-1.9.tar"; - sha256 = "00sd0dawpjcr79w6klya5ywq9r1p86d97z62vqpjij6yg5qv470f"; + url = "https://elpa.gnu.org/packages/websocket-1.11.1.tar"; + sha256 = "09s8qyi012djmm3vrj1qg1zqqy0h0cbcfzfkhybvqi4amy4jgliw"; }; packageRequires = [ cl-lib ]; meta = { @@ -3463,10 +3555,10 @@ elpaBuild { pname = "wisi"; ename = "wisi"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-2.1.0.tar"; - sha256 = "143xfdr7agyc52wz9zsx67rvvnjs4rlj7j3cbdhvs6wyl7whyg38"; + url = "https://elpa.gnu.org/packages/wisi-2.1.1.tar"; + sha256 = "0j7pnjik07j2ipj3xavhayngnmk5jdglq78azrjvwni88m12920n"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -3493,10 +3585,10 @@ elpaBuild { pname = "xclip"; ename = "xclip"; - version = "1.8"; + version = "1.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xclip-1.8.el"; - sha256 = "1ymc9dhpwbh92ad7w64p8xlrjdws5c9h90h47ckh6479h8r697xg"; + url = "https://elpa.gnu.org/packages/xclip-1.9.el"; + sha256 = "0xbs6fw0dfm5iynhdx62cwixzizjkrwrib6n0fjnsj31kajbkf3y"; }; packageRequires = []; meta = { @@ -3538,10 +3630,10 @@ elpaBuild { pname = "xr"; ename = "xr"; - version = "1.12"; + version = "1.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xr-1.12.tar"; - sha256 = "1vv87h0h8ldc1mbsn45w5z1m6jq8j2js4xz23a9ixdby06g60y3g"; + url = "https://elpa.gnu.org/packages/xr-1.13.tar"; + sha256 = "1km4x92pii8c4bcimks4xzhmwpypdf183z0zh7raj062jz4jb74r"; }; packageRequires = []; meta = { @@ -3586,10 +3678,10 @@ elpaBuild { pname = "zones"; ename = "zones"; - version = "2019.4.30"; + version = "2019.7.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/zones-2019.4.30.el"; - sha256 = "0f0ryd9wnkg7vh2jv30bqhpzzkaf0gc2ysmib6y36s3m8c2sa9b6"; + url = "https://elpa.gnu.org/packages/zones-2019.7.13.el"; + sha256 = "0qp1ba2pkqx9d35g7z8hf8qs2k455krf2a92l4rka3ipsbnmq5k1"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 24e541f2695..97ea383c0c7 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -50,6 +50,15 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # part of a larger package caml = dontConfigure super.caml; + cmake-mode = super.cmake-mode.overrideAttrs (attrs: { + buildInputs = (attrs.buildInputs or []) ++ [ + external.openssl + ]; + nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ + external.pkgconfig + ]; + }); + # Expects bash to be at /bin/bash company-rtags = markBroken super.company-rtags; @@ -215,6 +224,24 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # upstream issue: missing file header tawny-mode = markBroken super.tawny-mode; + # Telega has a server portion for it's network protocol + telega = super.telega.overrideAttrs(old: { + + buildInputs = old.buildInputs ++ [ pkgs.tdlib ]; + + postBuild = '' + cd source/server + make + cd - + ''; + + postInstall = '' + mkdir -p $out/bin + install -m755 -Dt $out/bin ./source/server/telega-server + ''; + + }); + # upstream issue: missing file header textmate = markBroken super.textmate; @@ -232,55 +259,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # upstream issue: missing file header window-numbering = markBroken super.window-numbering; - vterm = let - emacsSources = pkgs.stdenv.mkDerivation { - name = self.emacs.name + "-sources"; - src = self.emacs.src; - - dontConfigure = true; - dontBuild = true; - doCheck = false; - fixupPhase = ":"; - - installPhase = '' - mkdir -p $out - cp -a * $out - ''; - - }; - - libvterm = pkgs.libvterm-neovim.overrideAttrs(old: rec { - pname = "libvterm-neovim"; - version = "2019-04-27"; - name = pname + "-" + version; - src = pkgs.fetchFromGitHub { - owner = "neovim"; - repo = "libvterm"; - rev = "89675ffdda615ffc3f29d1c47a933f4f44183364"; - sha256 = "0l9ixbj516vl41v78fi302ws655xawl7s94gmx1kb3fmfgamqisy"; - }; - }); - - in pkgs.stdenv.mkDerivation rec { - inherit (super.vterm) name version src; - - nativeBuildInputs = [ pkgs.cmake ]; - buildInputs = [ self.emacs libvterm ]; - - cmakeFlags = [ - "-DEMACS_SOURCE=${emacsSources}" - "-DUSE_SYSTEM_LIBVTERM=True" - ]; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install ../*.el $out/share/emacs/site-lisp - install ../*.so $out/share/emacs/site-lisp - ''; - }; - # Legacy alias - emacs-libvterm = shared.vterm; - zmq = super.zmq.overrideAttrs(old: { stripDebugList = [ "share" ]; preBuild = '' @@ -443,6 +421,55 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + vterm = let + emacsSources = pkgs.stdenv.mkDerivation { + name = self.emacs.name + "-sources"; + src = self.emacs.src; + + dontConfigure = true; + dontBuild = true; + doCheck = false; + fixupPhase = ":"; + + installPhase = '' + mkdir -p $out + cp -a * $out + ''; + + }; + + libvterm = pkgs.libvterm-neovim.overrideAttrs(old: rec { + pname = "libvterm-neovim"; + version = "2019-04-27"; + name = pname + "-" + version; + src = pkgs.fetchFromGitHub { + owner = "neovim"; + repo = "libvterm"; + rev = "89675ffdda615ffc3f29d1c47a933f4f44183364"; + sha256 = "0l9ixbj516vl41v78fi302ws655xawl7s94gmx1kb3fmfgamqisy"; + }; + }); + + in pkgs.stdenv.mkDerivation rec { + inherit (super.vterm) name version src; + + nativeBuildInputs = [ pkgs.cmake ]; + buildInputs = [ self.emacs libvterm ]; + + cmakeFlags = [ + "-DEMACS_SOURCE=${emacsSources}" + "-DUSE_SYSTEM_LIBVTERM=True" + ]; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install ../*.el $out/share/emacs/site-lisp + install ../*.so $out/share/emacs/site-lisp + ''; + }; + # Legacy alias + emacs-libvterm = unstable.vterm; + w3m = super.w3m.override (args: { melpaBuild = drv: args.melpaBuild (drv // { prePatch = diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index d0f1ce982ce..00bcb16b31b 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -23,6 +23,30 @@ "sha256": "1apv5zd3zzni2llj9is7h2bzq1xxbx67kr7c07dfjd26n7l0zvfi" } }, + { + "ename": "0x0", + "commit": "a48b10b770038efc606fbbbedf79178d3b05186c", + "sha256": "1nkc5hfz77s37a1rp8m69f7zbk05jc1y1fcj0b46h9khyz6zbm01", + "fetcher": "git", + "url": "https://git.sr.ht/~zge/nullpointer-emacs", + "unstable": { + "version": [ + 20190801, + 902 + ], + "commit": "129585c4096e78f46b741c7729915f666bfee501", + "sha256": "0jplfnp4cn5vgj99g0ks0g9k2ij8yz1h24c6ghbz0hxd5bh5g889" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "129585c4096e78f46b741c7729915f666bfee501", + "sha256": "0jplfnp4cn5vgj99g0ks0g9k2ij8yz1h24c6ghbz0hxd5bh5g889" + } + }, { "ename": "0xc", "commit": "3fbb2c86a50a8df9a3967787fc10f33beab2c933", @@ -3586,8 +3610,8 @@ "repo": "jyp/attrap", "unstable": { "version": [ - 20190207, - 1410 + 20190805, + 1829 ], "deps": [ "dash", @@ -3595,8 +3619,8 @@ "flycheck", "s" ], - "commit": "3b092bb8f6755a97e6ecb7623b9d2dde58beba4a", - "sha256": "05d32980saji8ja1pcv65l0s3dq7w0n5hpikbf246hciy1x067pp" + "commit": "25d34a6c5f13ee6de5da60f3dae25d7e4961d991", + "sha256": "0bvymi8cfalv64a5zh1ln641qfgrdmqvsfd0d9c82xjrz19ffnpm" }, "stable": { "version": [ @@ -3740,11 +3764,11 @@ "repo": "DamienCassou/auth-password-store", "unstable": { "version": [ - 20190628, - 650 + 20190812, + 936 ], - "commit": "a40196e4bff7cfe1139dd744dc6a76f9404552cb", - "sha256": "19d97rphr0wcd7mh2wy74abfzi7g24iblcmhimwrycbf9qxbfgvp" + "commit": "2039468bb800d676ff02a76c8fabda168696b564", + "sha256": "07q7hjk40rz0cji1ygmybkwn6pm86m8fzkisdv920qpi6i2jhgvz" }, "stable": { "version": [ @@ -4358,14 +4382,14 @@ "repo": "ncaq/auto-sudoedit", "unstable": { "version": [ - 20180915, - 706 + 20190809, + 735 ], "deps": [ "f" ], - "commit": "6e30a349fc8865ffd99b077140611820bf3e48ef", - "sha256": "1mi158sg275ln2drlwqzm28jka96fqkhkylqhay27vgrddnnqyda" + "commit": "4d7aeeeff339683a5d4eed05de357058a11f2e02", + "sha256": "10zbillf66bnhni08x159w4nrd08x8zsagam3c7c7555p1ccf5rk" } }, { @@ -4559,8 +4583,8 @@ 20190331, 2230 ], - "commit": "d52853e93b40fc54ffd4552df9b8c07ad5446013", - "sha256": "0jdy1lqg3s01dxlpigqm0ss4kid2kzrhhyqm15rlj9s0ghdrbnby" + "commit": "ef0c6b84d92eecd05aa5cd4a35b73652f21b311a", + "sha256": "0wh0fwl2mimb48g2sf2nhmr3xxwvgkgr3566187x3kw8zxgh1nv7" } }, { @@ -6425,11 +6449,11 @@ "repo": "joodland/bm", "unstable": { "version": [ - 20190527, - 2110 + 20190807, + 1217 ], - "commit": "637dacf4cb9112fdfb949706a704dd53cbe79c7e", - "sha256": "180b3rc13asrmsdh7v405d54jkrininvaj52xhp71vw91ng51dkn" + "commit": "8129428182e1b8a647d16fceb2d08cc0a2a5f3c7", + "sha256": "048n596psrnvz5hi7i7vs0dyk6i6m9krzfh8fld95yggyyikf0iw" }, "stable": { "version": [ @@ -6656,16 +6680,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20190720, - 2129 + 20190802, + 959 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "e482b889cc652b25508c3ac0ddeff35f3140bf73", - "sha256": "12axjkmcnclpzbzvf6nfaswjdj7r68gjx3x5lkk08w9361f4yxz1" + "commit": "a1df9a6d8d01ead25583ec086de71e3d5840eba9", + "sha256": "0ak04sh49zkgz66hbgwvjmdxnxs4zsx1aw5yx79r0fd5rpxscxfi" }, "stable": { "version": [ @@ -6689,16 +6713,16 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20190717, - 1753 + 20190802, + 2023 ], "deps": [ "dash", "epkg", "magit" ], - "commit": "c177e602cc41dca7b885f0d443d3cb46577f92cd", - "sha256": "15zn7var3cjd479snw4mw0z92lsmm4k3l68nkjmnxih9y5dhhiah" + "commit": "b338e13e8de7bb2e0eef093fdb79fb763910c7e8", + "sha256": "0ydj3xs856gbm559f20zrnag5rbhy9s60qs2x5kwwdn921mdcsgj" }, "stable": { "version": [ @@ -7391,14 +7415,14 @@ "repo": "sshaw/build-status", "unstable": { "version": [ - 20171111, - 1947 + 20190807, + 1231 ], "deps": [ "cl-lib" ], - "commit": "ef44185d9dd748ea578d68398f3f729a8adb45b5", - "sha256": "00zcmmdccgzb5cp1nd9kjpiqs3zd9rh0z7aj9kmwsffaq339g55n" + "commit": "1a1d2473aa62f2fdda47d8bfeb9fe352d2579b48", + "sha256": "03mxvqiknca5dzcr5j3xdwfyjpq172rbj3dgdfjms8lbgxgm4kgw" }, "stable": { "version": [ @@ -7579,26 +7603,26 @@ "url": "https://bitbucket.org/olanilsson/buttercup-junit", "unstable": { "version": [ - 20181111, - 2058 + 20190802, + 2258 ], "deps": [ "buttercup" ], - "commit": "f95f91ac61137ed78b65642160bfe107f0ad8973", - "sha256": "1jazvil9zzc7g5hp6f43ba7k99kwriidhan20ig4nx1wgmngdzhr" + "commit": "6bc28b6b0f36fb71b0915c9e45963c840c64a8df", + "sha256": "1rayxq1va7jpikfr37p8nq2pv339mhq7zqy082kzwvj5q6qfw88s" }, "stable": { "version": [ 1, 1, - 0 + 1 ], "deps": [ "buttercup" ], - "commit": "0bae5577c7dd026b11a75dc5a565e74c9422b958", - "sha256": "0x0ndyhmria7mg0pxbpkar7sgvgv9hklsflwkhnjy6gxrc330zx1" + "commit": "6bc28b6b0f36fb71b0915c9e45963c840c64a8df", + "sha256": "1rayxq1va7jpikfr37p8nq2pv339mhq7zqy082kzwvj5q6qfw88s" } }, { @@ -8101,7 +8125,7 @@ "error": [ "exited abnormally with code 1\n", "", - "warning: unknown setting 'system-features'\nerror: unable to download 'https://github.com/ocaml/caml-mode/archive/9803cf37ac52bbfa5130fde0f228dc51c4590c2d.tar.gz': HTTP error 404 (curl error: No error)\n" + "error: unable to download 'https://github.com/ocaml/caml-mode/archive/9803cf37ac52bbfa5130fde0f228dc51c4590c2d.tar.gz': HTTP error 404\n" ] } }, @@ -8656,15 +8680,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20190729, - 1510 + 20190812, + 1915 ], "deps": [ "cl-lib", "powerline" ], - "commit": "2e033e3aacab147f730f122509088d82304302f1", - "sha256": "1nh0zzc4g80m6np4r17ghrkbvz6bmd23l0m2piysgm25iwylya4f" + "commit": "de3738c14b8e73e135c16e26ca405f18459fbb20", + "sha256": "11w5nhiaz7wrb8kgkv832xg0fmm0251wy6klxrk5gsdjh2c5qf26" } }, { @@ -8779,8 +8803,8 @@ 20171115, 2108 ], - "commit": "d00cbe3643230f71ad108d0037b9e1d72b60dc79", - "sha256": "1x3v28fs4d2r8mqfkhrmi1slrb2z8hz30ginv020bq6y20v3na6x" + "commit": "2a473e3acb297086c988a84972ab37f77fabaaa9", + "sha256": "0piak5l66al28xg9m7ypv83l12q3v9fcndvnnarqvpmh5db1alp1" }, "stable": { "version": [ @@ -9311,14 +9335,14 @@ "repo": "SavchenkoValeriy/emacs-chocolate-theme", "unstable": { "version": [ - 20190724, - 702 + 20190811, + 1414 ], "deps": [ "autothemer" ], - "commit": "7d9be4a0516d5ccab61c21af1e2a1555c4cee456", - "sha256": "01rk3ls2ji59mmr5s1ijbc92186m4hc3mv43j24sbcbci64h21k0" + "commit": "7b005d9ef522ccde84fc9488fa6ea3cc429f9c48", + "sha256": "176f7gcpzzsr74cspcm0f44bxpb8a4244zzljlqfpksfg8qpf23d" } }, { @@ -9421,8 +9445,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20190720, - 1656 + 20190811, + 1423 ], "deps": [ "clojure-mode", @@ -9433,8 +9457,8 @@ "sesman", "spinner" ], - "commit": "dd6d4c4236c6a7beb2ad755f9ef65e6243092fd8", - "sha256": "16hmgy7gwfqdcahy0q5vwjhgrsv6k8jf8mlijb30pxsn6jlrwmc9" + "commit": "31f83dfadbf0d180a6273f8b19429e12bc23ef3a", + "sha256": "0bwjg4fgn9l9xjk4q7mkn56nlvygfjg5hzfdy3hy2k6a2w4s9ka0" }, "stable": { "version": [ @@ -10319,14 +10343,14 @@ "repo": "emacscollective/closql", "unstable": { "version": [ - 20190716, - 1430 + 20190731, + 1450 ], "deps": [ "emacsql-sqlite" ], - "commit": "f2f1d7bc76153ec257cb13452075f51feb99f14e", - "sha256": "0264sg0dwlwrfflj4wjxlf9lsbhd28gahgcyi1drvhpb0nr6d82r" + "commit": "70b98dbae53611d10a461d9b4a6f71086910dcef", + "sha256": "1wvhrihg663f61yzc7f0vha2abjdnlwbk0gjcwakdfk1bhwf5ikh" }, "stable": { "version": [ @@ -10364,11 +10388,11 @@ "repo": "vallyscode/cloud-theme", "unstable": { "version": [ - 20190723, - 2316 + 20190811, + 1842 ], - "commit": "6fa1274f3f09e43c6749e658c88bb8237fc3d168", - "sha256": "0hkbajihpczagywmbf7a5jbbv2696gj86glyk58j7i28c7vw8x45" + "commit": "195ef1d55cf0e9aa25a257c93f1cff5ecf807374", + "sha256": "011f7x1qdjpz9vz76nd743fzlk2lp696286x2q3gmdhrmg7h3csc" } }, { @@ -10502,17 +10526,17 @@ 20190710, 1319 ], - "commit": "33d9a691306956750bffb10be9d0b17a47c0ec0b", - "sha256": "0hgri0dpj7km0xnfw7j0fm4g4952qqg47mv64wkx1gmd3ahbcvpb" + "commit": "7d194f7d8331a127e0b2b921dc6bc0abfe21a0f5", + "sha256": "0gqpm4cgcx176kamgx8p3vxxf9r41ckxy20gdw153fqbba2prsip" }, "stable": { "version": [ 3, 15, - 1 + 2 ], - "commit": "f43a7d76c737c5bb9b903a2b1be5186c081ec21e", - "sha256": "1335nx2nxjq3hc9nsrl86yjifgbflaz6l1v4ga6piww1qfniky70" + "commit": "40bbe50e23c06232ccf1c49589dde5dd84e1ac31", + "sha256": "006ziv2imzxpq646f3vq30ylbpp84l2hf7ki0l7s521g1ikh1dy0" } }, { @@ -10854,14 +10878,14 @@ "repo": "ankurdave/color-identifiers-mode", "unstable": { "version": [ - 20181120, - 1951 + 20190805, + 1455 ], "deps": [ "dash" ], - "commit": "4ba39f0274e1f85e50c956c507f942d950891a20", - "sha256": "102vyyal2zv8smbc7a362ibk5kl5nylplfjjx9w8r5pyapygq7mq" + "commit": "58fc8706a8f44e8df4678eec8ce15636fd4db758", + "sha256": "04splp4nvfva2cv87gwmga9ak4fk1x8z087lbz0x46qy9sj0dpz4" }, "stable": { "version": [ @@ -10997,11 +11021,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20190801, - 1755 + 20190809, + 1314 ], - "commit": "3648bb7d0e85e2d980c8a1f42ae400735c974fce", - "sha256": "0j1rllrjzpj3kvzd7sv883lnbbfd1ad3nnq6sp4j2v40n7smin8i" + "commit": "025cda606860800fe32a81e25e81e18e2d841069", + "sha256": "0c6ibf29gxnm53q1xsrnfcl8r93apqpcljgj4m9knzswizxb2mqs" }, "stable": { "version": [ @@ -11038,11 +11062,11 @@ "url": "https://git.sr.ht/~lthms/colorless-themes.el", "unstable": { "version": [ - 20190720, - 752 + 20190802, + 725 ], - "commit": "2ae9a1e5e7bd073154f1557000b8535a113eddfc", - "sha256": "0h73zgwfl8v8x75lbxz4s5z50njv97whrj0nh435cjnjm85c13b2" + "commit": "4f9d0ec5a078ab8442abdba0c35eb748728f3052", + "sha256": "1h8ggaqvrdj8cyknps9anh2xz08ar94137gydvxy8xgrmpa3jnc1" } }, { @@ -12375,15 +12399,15 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20190403, - 216 + 20190812, + 1454 ], "deps": [ "company", "phpactor" ], - "commit": "fcdbae4b12735d6d1595f76275e5a6a589a20c7a", - "sha256": "1kx9pk6a4kc3x58qfv35fvh9hkp2xgw2yxj98n065xr82yzzd6m1" + "commit": "01ced487c673e027332ecb99c444f819b05ab40b", + "sha256": "0ish3kvzn1j1arg6n1mglzsb46sc7hr7gqgnw2084kj56y5q6rjp" }, "stable": { "version": [ @@ -12805,8 +12829,8 @@ "repo": "TommyX12/company-tabnine", "unstable": { "version": [ - 20190723, - 2214 + 20190811, + 2013 ], "deps": [ "cl-lib", @@ -12815,8 +12839,8 @@ "s", "unicode-escape" ], - "commit": "8123d33951144fd3da10240dfa7f274cac0ac8ad", - "sha256": "0sfn2q2vpnjdw209n4fvaqgwq176r3aqiir3bvab5gwwk6wnqy09" + "commit": "df5e5fbfdb2ac174c031b75576a059429c6fb3a3", + "sha256": "0vxj9dm7h082i4jj8h8nh164jgdyxqr2fdavn2biwxijmdykp63p" } }, { @@ -13560,14 +13584,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20190731, - 46 + 20190809, + 1548 ], "deps": [ "swiper" ], - "commit": "4389a261b30c8fbfc6e31228b33b1764221daac7", - "sha256": "153a9nn0m6q5a4psw2vvnmqixkny56dlbrfvvw45zc9ikdd1wv2b" + "commit": "20d604c139b82d98010aabbbc00ad487438bdf8e", + "sha256": "0clg04az8v5ia3z5fxcimprqp4kbf2g1z6na3js60gmi689ks8ll" }, "stable": { "version": [ @@ -13694,28 +13718,28 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20190801, - 1416 + 20190802, + 652 ], "deps": [ "counsel", "ivy" ], - "commit": "77ac96ed2ebedd334057b4f4ef3bf5755544f7fe", - "sha256": "1r6vydmdxfs7mpqnxk6lb91hyd8w4ljqj069hnpa17b7s2rqvy3r" + "commit": "fda1f77eb8548c4451894886ef5e99815dfc1bf8", + "sha256": "0rmdl93kgyydwa96yclds9vwly41bpk8v18cbqc1x266w6v77dr9" }, "stable": { "version": [ 1, 8, - 8 + 9 ], "deps": [ "counsel", "ivy" ], - "commit": "2dbc3f24c6150ce581a55a122321c54019800211", - "sha256": "0iaa75h9phinzcawj12rj3d16dpwd8h0jgnv6d7d01wdg582dldc" + "commit": "fda1f77eb8548c4451894886ef5e99815dfc1bf8", + "sha256": "0rmdl93kgyydwa96yclds9vwly41bpk8v18cbqc1x266w6v77dr9" } }, { @@ -15039,8 +15063,8 @@ 20190111, 2150 ], - "commit": "ac1c9fe47491d01fb80cdde3ccd3e61152a973c7", - "sha256": "1b1k4f22f4kcx606gii0rmn2rslz66rh711jjvkl5s21q9amyzwr" + "commit": "8cf109c0f19ad8c36b8a5368d138912495963387", + "sha256": "07wmv5hgi7db1cx6xrjsa8r337frm3cx38l1jglr9kf5qkw917q1" }, "stable": { "version": [ @@ -15247,8 +15271,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20190722, - 1641 + 20190810, + 1131 ], "deps": [ "bui", @@ -15259,8 +15283,8 @@ "s", "tree-mode" ], - "commit": "7d22cf541d7a23d6366a36b33bc8a36d4b583d66", - "sha256": "1h7a01rjc7cm66dcsvgm2icrk3c7gach0l6xg72gg2gwv6wrcj4x" + "commit": "f01c7d2a32ce04d6643771a6e4d38fd1fb3bfbe6", + "sha256": "1nv7h16wy60rhylbc5zd79i4mf5gy76j7h6qgq0jql607pqkrjxr" }, "stable": { "version": [ @@ -15446,23 +15470,17 @@ "repo": "bradyt/dart-mode", "unstable": { "version": [ - 20190629, - 2353 + 20190808, + 2226 ], - "deps": [ - "cl-lib", - "dash", - "flycheck", - "s" - ], - "commit": "31861e81fdc21cb562942bf3a69f6c5aec2050ec", - "sha256": "1paqzicfngw9vhmjw21cv8rwnrrzw28gvgrc4zr7434h1nrs4h3n" + "commit": "9b65aae8c79132275733ee4324948446c88a6b93", + "sha256": "0149axzm52f2j80qpcafb6db2knzrmp43ln0zcx4dj1qsrmq5mbj" }, "stable": { "version": [ 1, 0, - 4 + 5 ], "deps": [ "cl-lib", @@ -15470,8 +15488,8 @@ "flycheck", "s" ], - "commit": "d78c5c796da53108a824967932cf6c773426e10f", - "sha256": "1x04vhmwg0hn54dfskwp8dnghjyyn8rha3vpfqw37qjchf3js3f0" + "commit": "d414a5faf22f7fafbb0a8208b88cecd6324704bf", + "sha256": "1qmdlwjmmqyyb65sqvfpygifai5m0llc815vp0jqwp8ldd8ls172" } }, { @@ -15910,29 +15928,29 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20190516, - 2159 + 20190807, + 2125 ], "deps": [ "dash", "s", "spinner" ], - "commit": "caeb37b8d6ab83f0eba353d6bbb29678190d4419", - "sha256": "158fqha8nilwfzmw15lcsq8b099j8wclzq303md0j4mfr2q2gfvs" + "commit": "329119c65126f7917d3910bc584f4191ba8f21ac", + "sha256": "0fxf7gq9sjfkgpdfqx10w3l3nd4rwa8kv9plyxk1fqacb3s5m6ai" }, "stable": { "version": [ 0, - 7 + 8 ], "deps": [ "dash", "s", "spinner" ], - "commit": "1d64c113f562a80147cdb6041a2dd48e5ba2da5d", - "sha256": "025xj4hc1k87wmbx2imvxb9brfnajclpd4rj7j1yg85gbk7a99v5" + "commit": "094ad453e8bc0451a2c062d06db3079f003566d2", + "sha256": "18prsg8kyngz8f0l9kjhaz23al9fna2naazy324bjj0sn9yiqgd4" } }, { @@ -16517,28 +16535,28 @@ "repo": "cqql/dictcc.el", "unstable": { "version": [ - 20190118, - 2002 + 20190807, + 1504 ], "deps": [ "cl-lib", "ivy" ], - "commit": "3244897515db954eafeed9648e7a0011b89c3ce2", - "sha256": "1nlgz3i8kynhl6d6h5rszja14z5n7ri83mm5ks90nbdhjcqwk3qd" + "commit": "33df7c64ee5bb9faf77a4b80cd123d35a15ad706", + "sha256": "1dxn41p4bmi7l8lz6kp56qhb4v2qi7x8wijyicd3715amsagl2jc" }, "stable": { "version": [ 1, 0, - 1 + 2 ], "deps": [ "cl-lib", "ivy" ], - "commit": "3244897515db954eafeed9648e7a0011b89c3ce2", - "sha256": "1nlgz3i8kynhl6d6h5rszja14z5n7ri83mm5ks90nbdhjcqwk3qd" + "commit": "33df7c64ee5bb9faf77a4b80cd123d35a15ad706", + "sha256": "1dxn41p4bmi7l8lz6kp56qhb4v2qi7x8wijyicd3715amsagl2jc" } }, { @@ -18306,8 +18324,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20190730, - 711 + 20190812, + 1155 ], "deps": [ "dash", @@ -18317,8 +18335,8 @@ "s", "tablist" ], - "commit": "df80f8010c86658f1a9ed0e8ba298f34940123bf", - "sha256": "06b45abmifrad9kk84lg5fp5ncg2jqmcfcfdjqcgzcys93ysm00z" + "commit": "55635cb15b1dc3945174de04f4bab22129e675e8", + "sha256": "0wv36b7w5cya6yr0phvg8ws3kc138ya1b4vimjf6chzhx3r6mhy7" }, "stable": { "version": [ @@ -18581,30 +18599,30 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20190801, - 1802 + 20190812, + 1448 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "ada38ab4d8ea0e234a6a242e3ae53b6c1174e620", - "sha256": "1l3bg6ihcrf48fx6mhc30wgq9csyaqri4a3fv440qa527l4wf8p0" + "commit": "a6145d435ae380dbbff4d148e3c200b89a60d010", + "sha256": "0mny8zz3l4bqgbshmfgrf5y7zn0jkgawfgzn189bw68x87i8fwp3" }, "stable": { "version": [ 2, - 4, - 1 + 5, + 0 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "6ecda37e4550e85cfa5e4957d0a05bd393e6a4b3", - "sha256": "1dlrq4p0jl30n786nxfnnm7mw4c1978kbrll7w9snsclm6crw99s" + "commit": "eb3258b50399ae7a2ed2edea797238a21352ea22", + "sha256": "1xx2zjksh93z6px89w4grycry9m8vh864m0p471q0g77r16z2prn" } }, { @@ -18615,14 +18633,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20190731, - 1645 + 20190812, + 2115 ], "deps": [ "cl-lib" ], - "commit": "7015afb483397a0fadba3c638e2af4edfb84a344", - "sha256": "1is81xnibql3g8ix8swpwrknjxyq10r341ngpad8pz7286cw487s" + "commit": "ae18b84e01496c4ebd572cad00a89516af089a94", + "sha256": "0zcsk2z5z0hh9plbig4ba1ywzbdy0mar1jfm0c5mi46vl0vb29i7" }, "stable": { "version": [ @@ -19062,8 +19080,8 @@ "repo": "dtk01/dtk", "unstable": { "version": [ - 20190722, - 1307 + 20190803, + 2120 ], "deps": [ "cl-lib", @@ -19071,8 +19089,8 @@ "s", "seq" ], - "commit": "01ae65c601be9906047ee490f52966427e3efd62", - "sha256": "177lmi4kza3lavr5zlmm5679g5ghqg93j69flkisz6jv92ynr98d" + "commit": "cc5807cc38417060725f1f5ab2efca8baf074053", + "sha256": "0vwx0s3hli1ql2rfkqcv4y7n6ln4yrp3h2a7x8vrp99h6rb6xxg0" } }, { @@ -19180,8 +19198,8 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20190801, - 1558 + 20190804, + 533 ], "deps": [ "dash", @@ -19189,8 +19207,8 @@ "popup", "s" ], - "commit": "5e3e47fce8e24c42ad65fb9e6e5f92086834b3c6", - "sha256": "1a0zs58j1027pllssb3pai2654wbvdbf2g0y3dqbg35gfqanaizp" + "commit": "7ffa63cdc8481158a2dbfe4acc6719ebe7fff056", + "sha256": "1l682xjish7v8mdkfdjqbdz464hnif15xlyrq8il6pgcq12g2hl6" }, "stable": { "version": [ @@ -19231,20 +19249,20 @@ "repo": "ocaml/dune", "unstable": { "version": [ - 20190723, - 1011 + 20190808, + 345 ], - "commit": "7d0414b4801b52eeb385908221ffcab567b853be", - "sha256": "0lj80vllx4kn6iaxg042j465lpa5ngmbkfpzx5cijcjljw0213bz" + "commit": "0f9863467c7a2dbacc41e62adc858765474c4ff0", + "sha256": "0ddhg3qbs4z6wkc680m5vmp2q6wdjs863h375rl1k114z4qdwn4z" }, "stable": { "version": [ 1, 11, - 0 + 1 ], - "commit": "bb7449b87ce9311b610c0c5f95de9ae1a4f3e365", - "sha256": "1w5g024sfh3scxm0ivc3mwldk6i2pai404ps1060lh05h94h2fsz" + "commit": "2f40f29f8eab3f7ae044f1c522f3e34036a16d9d", + "sha256": "1ax0lf7h191l772s0pr2xyy1kxpzjalm44ck265jihiga07dk0m5" } }, { @@ -20711,8 +20729,8 @@ 20190714, 236 ], - "commit": "d884df820099e5b128b553bd06904ff31d57b28f", - "sha256": "0l72rzwvlzwjdgag2cqkfrjajnsad7lp8flq957m980v9b88nqsg" + "commit": "ba135b498cfa92e60634c4318fa0073bd60ba230", + "sha256": "1fxnvrqxdyqr7d88fdvr8hiwfrc3nrxddg6zpbqjw2jc3ijmzq0p" }, "stable": { "version": [ @@ -20732,15 +20750,15 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20190718, - 1936 + 20190812, + 2013 ], "deps": [ "flymake", "jsonrpc" ], - "commit": "f45fdc6674a6cda16dc71966334f5346500e9498", - "sha256": "18n4w2cxzhc6yyr7bdggb19hmzk2h7m1d6r7nnr90ldryb05yyf0" + "commit": "6a7ce6634fcf79853a6bd89cf1c81bad2ac25540", + "sha256": "0qxkpn4mx2xjp98gwps0wric7c8c2g1ixdjy4jypya6alyc5b28x" }, "stable": { "version": [ @@ -20825,8 +20843,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20190729, - 20 + 20190812, + 1512 ], "deps": [ "auto-complete", @@ -20839,8 +20857,8 @@ "skewer-mode", "websocket" ], - "commit": "ce419a12a5149d86cec235773f4f9ecc1d88c038", - "sha256": "1v1fsj3142w548cwvxg4s52l83qg7zw4cldds2grl5y8xhhbzlhw" + "commit": "52f304d038019f3eed6e1afbccc31878e161183a", + "sha256": "0wds8xddp4v1i4rimzp5gva2v5wvhx4hdjhxl6m7lih95vlpnq6v" }, "stable": { "version": [ @@ -20913,8 +20931,8 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20190730, - 1837 + 20190812, + 2255 ], "deps": [ "auto-complete", @@ -20923,8 +20941,8 @@ "direx", "spinner" ], - "commit": "ffda6d74f7b83c338953cc33de5a520722f544d9", - "sha256": "042aba3wlaxygyzjs55r42s91mp8c2sx9y0r804a4xxx7ykp9gmv" + "commit": "524a00d23c60c4718e39f4b963086fcc497afc25", + "sha256": "0qw12rk3cw1f2i0s2fm5630w5dnn6z0f1fxif1lrkky4yjp9ybxi" }, "stable": { "version": [ @@ -21578,11 +21596,11 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20190721, - 1410 + 20190809, + 1358 ], - "commit": "40f0be457c7b9c0ff724eafd8fa07989d24eb1a2", - "sha256": "0dqmayp0aizkvvs4h83vai3wb0rdhcg2lw1gmiqijwbwhdk7yyfi" + "commit": "87433438e10d851d57d76bea4403cbde936647e9", + "sha256": "1spyrvq0zsfnhckci5kprkzy6yh4vx2fafx43dih92ccsi513hw5" }, "stable": { "version": [ @@ -21686,8 +21704,8 @@ "elfeed", "simple-httpd" ], - "commit": "40f0be457c7b9c0ff724eafd8fa07989d24eb1a2", - "sha256": "0dqmayp0aizkvvs4h83vai3wb0rdhcg2lw1gmiqijwbwhdk7yyfi" + "commit": "87433438e10d851d57d76bea4403cbde936647e9", + "sha256": "1spyrvq0zsfnhckci5kprkzy6yh4vx2fafx43dih92ccsi513hw5" }, "stable": { "version": [ @@ -22011,6 +22029,25 @@ "sha256": "0dx5h3sfccc2bp1jxnqqki95x5hp1skw8n5n4lnh703yjga5gkrz" } }, + { + "ename": "ellocate", + "commit": "fac47d8b4937c714df7b61ce4914831bfd7fcd20", + "sha256": "1i31gr3hdl1mjqwkkrfb7x1dpddyxnl1n9l7p7jiqbg3nn85gsxx", + "fetcher": "github", + "repo": "walseb/ellocate", + "unstable": { + "version": [ + 20190811, + 1123 + ], + "deps": [ + "f", + "s" + ], + "commit": "10845fc5722d833f20944ecc5586b429974e383b", + "sha256": "01wy71gdkiwglbndc96jx3hm0w6pia18cr76810hffrfkbsywgd8" + } + }, { "ename": "elm-mode", "commit": "5d1a4d786b137f61ed3a1dd4ec236d0db120e571", @@ -23415,15 +23452,15 @@ "repo": "iqbalansari/emacs-emojify", "unstable": { "version": [ - 20190613, - 607 + 20190809, + 959 ], "deps": [ "ht", "seq" ], - "commit": "a16199dcf9b4688839eba00f1e356d9beac46cfe", - "sha256": "1j5i617lps6vv4f88qzghzd4gdrngnyis8m8gabgqxbmx9z9hjd7" + "commit": "782ac307f37239e90c56810323db4263a6469219", + "sha256": "1x6ds9aj8yd5phkfw29jdlklqdxjl7g2gqwlm7ngb60nsk02vjvf" }, "stable": { "version": [ @@ -23479,8 +23516,8 @@ "repo": "Wilfred/emacs-refactor", "unstable": { "version": [ - 20190724, - 2350 + 20190810, + 2133 ], "deps": [ "cl-lib", @@ -23493,8 +23530,8 @@ "projectile", "s" ], - "commit": "eea1ea70d371de543be1c82c39bf97233c8adda5", - "sha256": "1yb7dbl321ip9pgch1krxs3manvkczq0b97797kq0hdbyiwpzi9b" + "commit": "ed430d55bd7504cb51d9f2b9e1b3c4b4ca93dafc", + "sha256": "154vzwxw3mlxxjmvi8aqxmpww6b4gvrcq6aw7w1gi3yb048pgkyy" }, "stable": { "version": [ @@ -23817,15 +23854,15 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20190717, - 1420 + 20190807, + 846 ], "deps": [ "closql", "dash" ], - "commit": "dca082baf1a99e43ec0152117d9947107c3841d5", - "sha256": "084p2fvm5ml1kbbabmm3l5kaiwc77x0prs6nm4zn6lhl60ash11j" + "commit": "80098a45909d50aa089d344c6e24cbbae1481513", + "sha256": "0r5h8wdw58maqmda2ldg5j3fmjsih95ikzg34gxfk18sw7r50rpv" }, "stable": { "version": [ @@ -24435,8 +24472,8 @@ 20190404, 928 ], - "commit": "cd7cad8d6ad6234bab004af800d9b28aa03aeff1", - "sha256": "195flsyi33pz7j6svza4l6ymxw5gcmbi2l8i9fjclij1958w5m14" + "commit": "65449e9e54fd765abdbe546590e4da044f36c2a4", + "sha256": "0yj4vfpz6vjxsraiab45c4lw313yd7c88sa10fsr974h0wfp9rnv" }, "stable": { "version": [ @@ -24456,14 +24493,14 @@ "repo": "k32/erlstack-mode", "unstable": { "version": [ - 20190722, - 952 + 20190812, + 1117 ], "deps": [ "dash" ], - "commit": "b8a2027808177fb0aa74e6767a867c0e20c57d84", - "sha256": "09bn6ldnz7mgc16h818rdbs4a5vs7a72183din5xvbw5ygfhwhjs" + "commit": "d0a67fb6f91cef02376e71b4b4669b071ebd9737", + "sha256": "10b77q2qwwlvj56g9yd6d9lkmk184mjf6x3067vvqs40xiv9bsgl" }, "stable": { "version": [ @@ -24537,26 +24574,26 @@ "url": "https://bitbucket.org/olanilsson/ert-junit", "unstable": { "version": [ - 20181118, - 2256 + 20190802, + 2232 ], "deps": [ "ert" ], - "commit": "a910ab288e108c61fa3cd035d93df91f2e19e367", - "sha256": "0k3j7nsfg88nbm546bcyh6q4yaxc027a1xh8kg8hx3nb17lxc03r" + "commit": "65f91c35b088b87943dbbbe7e1ce354bc9bc0992", + "sha256": "1srmkffzj7xf8iickhyhw1fpg4nxbkp45aiz9w784ra9p99a366y" }, "stable": { "version": [ 0, 4, - 0 + 1 ], "deps": [ "ert" ], - "commit": "b0649e94460aff5176dee5b33f28946bffb602d5", - "sha256": "0hj85hz4s1q4dalinhgahn8jn97s2pdpv41d9qqbvbdzwhhw2mrk" + "commit": "65f91c35b088b87943dbbbe7e1ce354bc9bc0992", + "sha256": "1srmkffzj7xf8iickhyhw1fpg4nxbkp45aiz9w784ra9p99a366y" } }, { @@ -25236,14 +25273,14 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20190729, - 2339 + 20190809, + 1459 ], "deps": [ "julia-mode" ], - "commit": "0786929aaabf8ce90ad48e6e90c98d19bee9aac4", - "sha256": "1h41i157hkagminm356fg6saxbjs5ccn74xgsvqvvlyhay1xh53x" + "commit": "d625e9ccdb612812b90fe427563db4b910da7159", + "sha256": "0fnfcxlngc7rwnkhs1fwir1ax7hi9qhl7zlalbl5m7yfly84dl4p" }, "stable": { "version": [ @@ -25876,15 +25913,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20190725, - 213 + 20190807, + 214 ], "deps": [ "cl-lib", "evil" ], - "commit": "f8cf811d658da2618359391436e194bb41b95ae5", - "sha256": "1yayphihwm8nsp3mryxdckaki21xmqn1vjb59z5kl8mashfsm2v2" + "commit": "d226a50061a5033846ae819472e3c86fb54cc5f1", + "sha256": "155ajm7h9wpjg9ca60a4ib5fyp1sk4i54m5825595n43laqyd5p9" }, "stable": { "version": [ @@ -26470,26 +26507,26 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20190801, - 140 + 20190808, + 1056 ], "deps": [ "evil" ], - "commit": "2143844e2bdf53ed7aac3dc599ab4bc8d6947783", - "sha256": "1vvw6rkm6301qrcf04slhbadm5mc5fiv3lr3q2dglyw1vlpb6xac" + "commit": "43be86d8c41841a20733718d177e8299d5379218", + "sha256": "04kllxd7vvziwqiff3vx60a0r6805wynsla73j8xkcz4yzk8q91r" }, "stable": { "version": [ 2, 3, - 2 + 3 ], "deps": [ "evil" ], - "commit": "2143844e2bdf53ed7aac3dc599ab4bc8d6947783", - "sha256": "1vvw6rkm6301qrcf04slhbadm5mc5fiv3lr3q2dglyw1vlpb6xac" + "commit": "43be86d8c41841a20733718d177e8299d5379218", + "sha256": "04kllxd7vvziwqiff3vx60a0r6805wynsla73j8xkcz4yzk8q91r" } }, { @@ -26889,6 +26926,24 @@ "sha256": "1xz629qv1ss1fap397k48piawcwl8lrybraq5449bw1vvn1a4d9f" } }, + { + "ename": "evil-ruby-text-objects", + "commit": "ba500b9f3df067e57e84654561091897e39623ef", + "sha256": "0icvmrcj2lslill2a26vzb71598l7c2fl2fi1971z8r1vhmckwmq", + "fetcher": "github", + "repo": "porras/evil-ruby-text-objects", + "unstable": { + "version": [ + 20190729, + 1653 + ], + "deps": [ + "evil" + ], + "commit": "781f134d9484481b0b4ad32f9cfe90dc00219902", + "sha256": "00ybb6y5lnfsk44cy6dks46n2cl1ms4010vfqqrji64i19wd1riq" + } + }, { "ename": "evil-search-highlight-persist", "commit": "f2e91974ddb219c88229782b70ade7e14f20c0b5", @@ -27308,14 +27363,14 @@ "repo": "mamapanda/evil-traces", "unstable": { "version": [ - 20190721, - 2136 + 20190810, + 2054 ], "deps": [ "evil" ], - "commit": "b41b7432b8110378c199a3d25af464083777f453", - "sha256": "0a15f2saynz9fws1h5s7py3cshsk4xs1kwgwj1m5rsin36g0j6hc" + "commit": "b1c64532ad754591c472e0615a10c9a9f8ad3df0", + "sha256": "0d7ijy067rb6wf1hzyyrk1nqh891b95fs0f39lbgawc0hkqk9bzw" } }, { @@ -27517,11 +27572,11 @@ "repo": "jjzmajic/ewal", "unstable": { "version": [ - 20190720, - 829 + 20190807, + 240 ], - "commit": "19fb4bdd0ba81ec17e36e06812e7bee7fb265b68", - "sha256": "0x08px30dcjl0dcszba6fbj1h4g1vsbn3glslwz4ya6r3c2cmhf9" + "commit": "9807c3d7bb3bab3676ef15b1b438eb9ea8c419f8", + "sha256": "10dprjijh10npgh0k3vxcmcdsxg8yx32ly5106p8rqjipfdva0ka" } }, { @@ -27532,14 +27587,14 @@ "repo": "jjzmajic/ewal", "unstable": { "version": [ - 20190720, - 829 + 20190807, + 240 ], "deps": [ "ewal" ], - "commit": "19fb4bdd0ba81ec17e36e06812e7bee7fb265b68", - "sha256": "0x08px30dcjl0dcszba6fbj1h4g1vsbn3glslwz4ya6r3c2cmhf9" + "commit": "9807c3d7bb3bab3676ef15b1b438eb9ea8c419f8", + "sha256": "10dprjijh10npgh0k3vxcmcdsxg8yx32ly5106p8rqjipfdva0ka" } }, { @@ -27557,8 +27612,8 @@ "ewal", "spacemacs-theme" ], - "commit": "19fb4bdd0ba81ec17e36e06812e7bee7fb265b68", - "sha256": "0x08px30dcjl0dcszba6fbj1h4g1vsbn3glslwz4ya6r3c2cmhf9" + "commit": "9807c3d7bb3bab3676ef15b1b438eb9ea8c419f8", + "sha256": "10dprjijh10npgh0k3vxcmcdsxg8yx32ly5106p8rqjipfdva0ka" } }, { @@ -27574,6 +27629,15 @@ ], "commit": "3d0217c4d6cdb5c308b6cb4293574f470d4faacf", "sha256": "0ilwvx0qryv3v6xf0gxqwnfm6pf96gxap8h9g3f6z6lk9ff4n1wi" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "3d0217c4d6cdb5c308b6cb4293574f470d4faacf", + "sha256": "0ilwvx0qryv3v6xf0gxqwnfm6pf96gxap8h9g3f6z6lk9ff4n1wi" } }, { @@ -27923,14 +27987,14 @@ "repo": "walseb/exwm-firefox-core", "unstable": { "version": [ - 20190608, - 2213 + 20190812, + 2110 ], "deps": [ "exwm" ], - "commit": "86acbc4b4f50f497929508e59d054f97398a5218", - "sha256": "0s54hwa2k8g6ls5d0mbcq7kgzzghpqbi5p4rvwjx75h2hdf7adrk" + "commit": "e2fe2a895e8f973307ef52f8c9976b26e701cbd0", + "sha256": "0k5jkjzx6f8nfmbkc61raj585p9pymycgzv7rr3fhv2drgkaa4yi" } }, { @@ -28257,11 +28321,11 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20190506, - 1513 + 20190711, + 1511 ], - "commit": "de12f6a11711955fbbcdf7c042459aa2206f8deb", - "sha256": "193d6s759kmkwfmwc9367grkgf46gm9ppczppcrk2h3alzr1hba6" + "commit": "49710f7bf8bebf6cd82e67f0ca3a718cff3b504d", + "sha256": "0ba1ayc1ccs1ygr66zpihm4wmnrhbvb48rrhha6lidyvmbxrxsa6" }, "stable": { "version": [ @@ -28500,11 +28564,11 @@ "repo": "cute-jumper/fcitx.el", "unstable": { "version": [ - 20170914, - 200 + 20190806, + 1923 ], - "commit": "095332fbeb994c908c533fe2ad068c0728211c3d", - "sha256": "01sm50rqajylah2hx6n5ig0xmrrhxbamzs4bg97qzxzr4nlnjcaz" + "commit": "12dc2638ddd15c8f6cfaecb20e1f428ab2bb5624", + "sha256": "0ahw2pi6i693s4mdjdkisy94yvg0wgmd3c6zi0z4yi60b6irskdn" }, "stable": { "version": [ @@ -28601,11 +28665,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20190401, - 1808 + 20190807, + 17 ], - "commit": "17678a7fc073c64cb0ec78f913154df377a42575", - "sha256": "0n2vz6vsi380gcgg3ihwjs3z2rc1hb8yh4xlzjwz01dhahj08p1x" + "commit": "7f146605feeeebdf5452450662e2f3bc1e435e6f", + "sha256": "0yr6f2gzgprkqhc22mq64mn119aljihziix712kk1vq59yx2l22f" } }, { @@ -29587,8 +29651,8 @@ 20190321, 2313 ], - "commit": "921ff298da71366eca3d1e4fc410126d405d5366", - "sha256": "0gqsr0xsxrbxsdfn3yhf76wxpqp63m1652ryvc2hwskkgj41y3nl" + "commit": "ec4b20dd5471ee20d5dd6d2e140225ad607550dc", + "sha256": "0bazkkdv3gyyxv3ci9wgwnm3mn9yzb1l8h2mjap5xzy4hm6zj627" } }, { @@ -29606,6 +29670,25 @@ "sha256": "0v20yirkg04szaw0l7abq8qpqnhqlhgpm5hg5i8dks01dlczw29h" } }, + { + "ename": "flutter-l10n-flycheck", + "commit": "6714760b205a2da8727229a4f8d4b656877890cb", + "sha256": "13symbzw16h0sl0j6q4n47vwgaifbmj9572n2ihfz0ml5iww1vyy", + "fetcher": "github", + "repo": "amake/flutter.el", + "unstable": { + "version": [ + 20190729, + 401 + ], + "deps": [ + "flutter", + "flycheck" + ], + "commit": "a5de449cd10f98e7ea4340940b7726f299a0854a", + "sha256": "0v20yirkg04szaw0l7abq8qpqnhqlhgpm5hg5i8dks01dlczw29h" + } + }, { "ename": "fluxus-mode", "commit": "a3396e0da67153ad051b8551bf34630d32f974f4", @@ -29713,8 +29796,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20190709, - 1443 + 20190807, + 813 ], "deps": [ "dash", @@ -29722,8 +29805,8 @@ "pkg-info", "seq" ], - "commit": "410103bb40db8684cb03756ab98ba813afbf214e", - "sha256": "1z2szbad80b4xx4sdp051i987mp4x4rr6v82s7ql5h510i1bv51r" + "commit": "37c1f9d65c4a16c58aff9f2fa210ccf070a97c86", + "sha256": "1yqrb7r6ykjzmflk3259xpasmz2xgxxazvvhhjcy36krhwwj825x" }, "stable": { "version": [ @@ -30667,6 +30750,24 @@ "sha256": "136mdg21a8sqxhijsjsvpli7r7sb40nmf80p6gmgb1ghwmhlm8k3" } }, + { + "ename": "flycheck-indicator", + "commit": "25d59829ca2f4fbedfee500885b45bc358faf47b", + "sha256": "1h2d7dw94agrdrks41npjdmf5m628n1jg060pv1mrjysj4xm2n45", + "fetcher": "github", + "repo": "gexplorer/flycheck-indicator", + "unstable": { + "version": [ + 20190729, + 1501 + ], + "deps": [ + "flycheck" + ], + "commit": "937f93afc0605c8e6c7cc56041a52b1312fff0fe", + "sha256": "1r7da45kmypz1qvpj07m7q9z2bjbx6ds5cx055gq5v03gzyg6n7i" + } + }, { "ename": "flycheck-ini-pyinilint", "commit": "c2a1d0b4be0dd3e238ad2e3a157b11ecc82c0639", @@ -30832,25 +30933,25 @@ "repo": "whirm/flycheck-kotlin", "unstable": { "version": [ - 20170122, - 1137 + 20190808, + 630 ], "deps": [ "flycheck" ], - "commit": "cbb9fbf70dbe8efcc3971b3606ee95c97469b1fe", - "sha256": "0bxjx7xcpscv6vv4yxll8hh43aabv2dnrvkymb47jm3yvjr9cs1c" + "commit": "5104ee9a3fdb7f0a0a3d3bcfd8dd3c45a9929310", + "sha256": "193l9amk45b0bkrqqm6cxx8y4a6jvm0mcncwq6kvhq2kj9slw7g2" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "flycheck" ], - "commit": "cbb9fbf70dbe8efcc3971b3606ee95c97469b1fe", - "sha256": "0bxjx7xcpscv6vv4yxll8hh43aabv2dnrvkymb47jm3yvjr9cs1c" + "commit": "5104ee9a3fdb7f0a0a3d3bcfd8dd3c45a9929310", + "sha256": "193l9amk45b0bkrqqm6cxx8y4a6jvm0mcncwq6kvhq2kj9slw7g2" } }, { @@ -31532,24 +31633,6 @@ "sha256": "1fh6j5w2387nh2fwwjphkhq17cgj5m2q5k0fhidvgc2w65lzbr1r" } }, - { - "ename": "flycheck-soar", - "commit": "15cae578c5ba5152be0726f046b5f2dc4719a387", - "sha256": "14xpq3pdfwacmhl9x8fdzcsanpf6zljdzh6gwclw724k720acbdl", - "fetcher": "github", - "repo": "tszg/flycheck-soar", - "unstable": { - "version": [ - 20181106, - 852 - ], - "deps": [ - "flycheck" - ], - "commit": "d2f03a0af9b625a645f3194dc24cfeee94d92760", - "sha256": "02ll2nw2x45nfmxdj1ps62jr663spy01vy8gfg1qh2rl1pjviwqw" - } - }, { "ename": "flycheck-stack", "commit": "b77f55989d11d1efacbad0fd3876dd27006f2679", @@ -32540,6 +32623,30 @@ "sha256": "0l8qpcbzfi32h3vy7iwydx3hg2w60x9l3v3rabzjx412m5d00gsh" } }, + { + "ename": "flymake-quickdef", + "commit": "8e9d6121472d6a82ac5371bef7dc2dbe5acfc63f", + "sha256": "08w8i5rr3g7rwmrr29rah1rh68mpvfbabsik81vxlzpq1c7hhqk5", + "fetcher": "github", + "repo": "karlotness/flymake-quickdef", + "unstable": { + "version": [ + 20190727, + 2028 + ], + "commit": "5b3980a7c1763171e8cdb28ebfd5f4eaad32f9f9", + "sha256": "0rhg29jcpa4314ld9shhvf81m1ar8xp2853hxm94bxpnnza5d8x7" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "53bf206f1a71b2fc12f49741832a94f6498ae6a6", + "sha256": "0wqfn068ylb30f8988knrcd9v3r3xck5yb1fj9jnrw2bs6qxxc57" + } + }, { "ename": "flymake-racket", "commit": "67f2b469ea8df6d0db6b9ece91f544c0e7dd3ab2", @@ -33350,8 +33457,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20190726, - 1558 + 20190809, + 1808 ], "deps": [ "closql", @@ -33363,8 +33470,8 @@ "markdown-mode", "transient" ], - "commit": "1b940e5ac3ec98c7bd5e9b2364a3c5b1d61d3ffd", - "sha256": "0prx5kckaiwc1h4lvjwh70g930jy0v90zl3gswkynpibcgfacii7" + "commit": "a60bd64056ec910fdbd1400dd8f583b8eec6145b", + "sha256": "1dhpsnb82mxpv3krf3apsbcirlcizw3g9gac9sfn0fad20qjwpgj" }, "stable": { "version": [ @@ -33826,16 +33933,16 @@ "repo": "waymondo/frog-jump-buffer", "unstable": { "version": [ - 20190715, - 151 + 20190810, + 1749 ], "deps": [ "avy", "dash", "frog-menu" ], - "commit": "257c5b8ffe523850904d0445a00c72213ebed2fd", - "sha256": "0xlxcw2k8c0gl2kikvqbi2ypzf1rn49vb0r94qlcbzprhymjggnn" + "commit": "2d7b342785ae27d45f5d252272df6eb773c78e20", + "sha256": "1z00by8hiss1r2lwmzrl8pnz6jykia2849dqqm4l3z5rf6lwvc0f" } }, { @@ -33953,8 +34060,8 @@ "deps": [ "cl-lib" ], - "commit": "d8c1eef9f3ab07bae25ddf2b337553ae523961ce", - "sha256": "1238b3zj2wpnpfh32g4cgwfjn74sdq52i75j5asgyqd8nacp1xq3" + "commit": "2f2cb869f19e1ab10931a2228ad02b2cfbf8fc0e", + "sha256": "1pg1i85cx1zk10k333qzmc8i9dmry7nz6h57p13ysa7pnyi6d521" }, "stable": { "version": [ @@ -34077,11 +34184,11 @@ "repo": "cosven/emacs-fuo", "unstable": { "version": [ - 20180314, - 1648 + 20190812, + 927 ], - "commit": "5318bef9d935b53031e6312652554920def69af2", - "sha256": "02f4kl1y277pry13hz1jscdh2nrbn3xp7zm1dmqyn8yfhn1s1yx2" + "commit": "0e4122f94a336a50c02bc96652d25ac3d74bedeb", + "sha256": "1cv30sgjngnl0274viaf42dw9sr0v1kdw31na7lzznqx6q8laz47" } }, { @@ -34359,11 +34466,11 @@ "repo": "koral/gcmh", "unstable": { "version": [ - 20190626, - 750 + 20190807, + 2023 ], - "commit": "1953d913b5aa8822b83db8e20e17145470e01d79", - "sha256": "1s130fypags36240qlifify6645rpxlnfhar9akf22y2zywaxfhq" + "commit": "f542908b9ae4405d70fa70f42bd62618c5de4b95", + "sha256": "0mpi6x06kg5a7dr13q69irv58j3rda62fbscm5b7d1b9vlp4vcqi" } }, { @@ -34466,11 +34573,11 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20190624, - 1807 + 20190806, + 149 ], - "commit": "fbdfbee56a03a1a0396d61fdc8f0b0af87273fc9", - "sha256": "1xzmsvw0wnq1yyyi6ya25hrn1537qq60cd556y0c1cg9i3qqm4vq" + "commit": "8f801fbf01586e33bcf0060bd1d3172d4afb48cf", + "sha256": "0cxd8zjgzkxjsgv1wfb6afc75brvs6hal7if31cj5ip7z38qzksx" }, "stable": { "version": [ @@ -34495,8 +34602,8 @@ "deps": [ "cl-lib" ], - "commit": "ff18b7b05b91c5af7a4069df618608c3c4487377", - "sha256": "1r74mb368p6ahcklz58468hzncxzvhnwdz998lbz0f0adk9cn56s" + "commit": "1907358fed4ad1ee61fb2a2e1a353b27822a3edd", + "sha256": "1v3645sgpr5i7alh08ik2dmlc3bl6idpfgdgf8763l7x8r41wa55" } }, { @@ -34844,16 +34951,16 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20190710, - 2214 + 20190806, + 959 ], "deps": [ "dash", "let-alist", "treepy" ], - "commit": "a8191c6a63dfa630af418105b58434266859d21b", - "sha256": "1y1pfqzyn28j0b6w1xrrxwx24fc022r5grw4jn6bs6qqcdh73qd7" + "commit": "7d59937d7782d0062216130a4d059b45e8396f82", + "sha256": "1ngb61nij9gznqplwg1fmr1vq1czry759hmdibzngl4wqhxpfsjq" }, "stable": { "version": [ @@ -35148,8 +35255,8 @@ "dash", "with-editor" ], - "commit": "9e2df13e5338b7bde31dceca4e64494bc0fd68a8", - "sha256": "0pxqbwd6fwhnr844m3k82yy26f74favmj5jzidypim0f1x2rmr82" + "commit": "75d0810d131e2e61ae3c683797a10a2caca96073", + "sha256": "19ynyx1648riwnpiwzk1mk36z4fw4j4bggr7mf7pinsvv9191zmq" }, "stable": { "version": [ @@ -35843,16 +35950,16 @@ "repo": "charignon/github-review", "unstable": { "version": [ - 20190327, - 732 + 20190803, + 1701 ], "deps": [ "dash", "ghub", "s" ], - "commit": "9c3ffe30fba5d02e9951e76d1a5be2ed046663da", - "sha256": "078rv6f2p3wrznhgvmkhd071bwy72007f5l2m2a0r1k2i3vbfaja" + "commit": "20b2e47f54587a39dbd8db9ec5ca33d5970dbcc1", + "sha256": "1slnggvsjzsqvdvm4nxnxba93hfjnz676bagmw79g7z6iswwz4sg" } }, { @@ -36833,8 +36940,8 @@ "cl-lib", "go-mode" ], - "commit": "3ba198280bf8d5f2a4079618abfd3db2ebe04f58", - "sha256": "01fh1zx24ns06glmcw9l1fp9mlmysx60qnr7gn5gh6r48b6bx1rv" + "commit": "fdc1545d0ca494eb533d006b42c4bb4a6fb73d6e", + "sha256": "0scmn5vg6bprshcipkf09lif93al3wrx3y8fm2v09jfpz1wghgi5" }, "stable": { "version": [ @@ -36926,11 +37033,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20190731, - 1751 + 20190808, + 2249 ], - "commit": "3ba198280bf8d5f2a4079618abfd3db2ebe04f58", - "sha256": "01fh1zx24ns06glmcw9l1fp9mlmysx60qnr7gn5gh6r48b6bx1rv" + "commit": "fdc1545d0ca494eb533d006b42c4bb4a6fb73d6e", + "sha256": "0scmn5vg6bprshcipkf09lif93al3wrx3y8fm2v09jfpz1wghgi5" }, "stable": { "version": [ @@ -37028,14 +37135,14 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20180627, - 648 + 20190805, + 2101 ], "deps": [ "go-mode" ], - "commit": "3ba198280bf8d5f2a4079618abfd3db2ebe04f58", - "sha256": "01fh1zx24ns06glmcw9l1fp9mlmysx60qnr7gn5gh6r48b6bx1rv" + "commit": "fdc1545d0ca494eb533d006b42c4bb4a6fb73d6e", + "sha256": "0scmn5vg6bprshcipkf09lif93al3wrx3y8fm2v09jfpz1wghgi5" }, "stable": { "version": [ @@ -37327,8 +37434,8 @@ 20180130, 1736 ], - "commit": "9c6b371f419b1dd33c338846e3e7c1ce7304baff", - "sha256": "0yh9dqj7xrq1why1xnldb6zypvalralxx4sgzrn2w9m5g0jqv90v" + "commit": "5beae3f4dacad9b0b86a8a4ab308459475feda0e", + "sha256": "0f1x1vjzlr0i41b7nqziw7yiawfw8sb1ssqwii7a5nfgzsv19z7w" } }, { @@ -37701,8 +37808,8 @@ "magit-popup", "s" ], - "commit": "ee35ba9e79122df9873f2dc948bcce912a9c9d7f", - "sha256": "0ab5y8dcx7krphgjd21yd1f635lr6j1y5304pq9vxx1nw0g3c0f8" + "commit": "7b40d3e162becb69c99f2b71a26e1966adb34384", + "sha256": "16yqh892rfpg6mbzqxc8isxh3z3s9h14n6chm1h2qxsa82wqrrk2" }, "stable": { "version": [ @@ -38049,11 +38156,11 @@ "repo": "davazp/graphql-mode", "unstable": { "version": [ - 20190731, - 1825 + 20190812, + 2240 ], - "commit": "e757919fe3cf6d687d5d970662964fc37115b1d6", - "sha256": "037f73giyjrr2iqxhfmw1k4qhww2f1vi4anl4fqf07rjy1k4674j" + "commit": "3581ad03e04b11c67d4882cbaa9ab6af71eaf78d", + "sha256": "0mabd677yi7phzvvil9fyic5i9z4nyp224d0ifzp5mw0jpsvfxv1" } }, { @@ -38836,14 +38943,14 @@ "repo": "hhvm/hack-mode", "unstable": { "version": [ - 20190718, - 1518 + 20190809, + 1810 ], "deps": [ "s" ], - "commit": "7f94e1fdc18b8722b56028e7532a68aa783138b5", - "sha256": "053xv6k9lplp68xnk465349khw7a4lfmff3fc4grdrxqjif11v70" + "commit": "6ccad0581775eb5a777382b37175c1ec230ae5cb", + "sha256": "0yixpz25bi7cbji7jk2azkpbnxvc56fymsg2zxvwjrb8dh6gwapk" }, "stable": { "version": [ @@ -39627,16 +39734,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20190801, - 1347 + 20190811, + 602 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "6836fdbe30d45207a1090907b290275bd37dbc84", - "sha256": "03ydgbih60jj0f5mlf9p28mczk4clx3sddmdms5j8mpv0kfladzm" + "commit": "b3ca0c03188afd173c7f8c6bb51a5aa0457e10c3", + "sha256": "1f5395949i6hb01cm932slxnqn3wlz8zrj51b1shqn0yiv0vqhvg" }, "stable": { "version": [ @@ -40449,28 +40556,28 @@ "repo": "Sodel-the-Vociferous/helm-company", "unstable": { "version": [ - 20190725, - 247 + 20190812, + 1429 ], "deps": [ "company", "helm" ], - "commit": "b8c214f92c1e4287174f51a042ca950d53c161de", - "sha256": "1x69ww7a3c91rwnxnvpjdv4dpngb0383g6wgra7ypcbgibxshc00" + "commit": "6eb5c2d730a60e394e005b47c1db018697094dde", + "sha256": "1ci37w6ahnqrfpb284gjvxmimlf61sdxb9k192yy9q983cksv2hx" }, "stable": { "version": [ 0, 2, - 3 + 5 ], "deps": [ "company", "helm" ], - "commit": "5b5c15745d92aff7280698c7619994e2481098b4", - "sha256": "1r5b24hamq8d5n418xpf80jn37s357hbc9rd5siw6gwkjn2jykx7" + "commit": "6eb5c2d730a60e394e005b47c1db018697094dde", + "sha256": "1ci37w6ahnqrfpb284gjvxmimlf61sdxb9k192yy9q983cksv2hx" } }, { @@ -40481,14 +40588,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20190801, - 708 + 20190809, + 1008 ], "deps": [ "async" ], - "commit": "6836fdbe30d45207a1090907b290275bd37dbc84", - "sha256": "03ydgbih60jj0f5mlf9p28mczk4clx3sddmdms5j8mpv0kfladzm" + "commit": "b3ca0c03188afd173c7f8c6bb51a5aa0457e10c3", + "sha256": "1f5395949i6hb01cm932slxnqn3wlz8zrj51b1shqn0yiv0vqhvg" }, "stable": { "version": [ @@ -40538,10 +40645,10 @@ }, { "ename": "helm-css-scss", - "commit": "9b985973ff12135f893e6d2742223725c2143720", - "sha256": "0iflwl0rijbkx1b7i1s7984dw7sz1wa1cb74fqij0kcn76kal7ak", + "commit": "7a4e84530b4607a277fc3b678fe7b34b1c5e3b4f", + "sha256": "14k29g4zm302r00n49k8b6p4bz115s0jcidiaf6nrhba9y40i0wz", "fetcher": "github", - "repo": "ShingoFukuyama/helm-css-scss", + "repo": "emacsorphanage/helm-css-scss", "unstable": { "version": [ 20140627, @@ -42360,6 +42467,35 @@ "sha256": "1xj5b44nkdvbxhk1bnllqm2qq393w22ccy708prrhiq8fmk53aa8" } }, + { + "ename": "helm-org", + "commit": "5c14f6b048ec9983e31fcd3e7cdea45ebe806ce8", + "sha256": "02zyc7nssl4zvbbw03fl0nbf4d6qmqxywa2hnfyiwfzn5jzxkl95", + "fetcher": "github", + "repo": "emacs-helm/helm-org", + "unstable": { + "version": [ + 20190813, + 604 + ], + "deps": [ + "helm" + ], + "commit": "7926896aa1195db7ca6394c1ce60152b98f5fca1", + "sha256": "0cxxjxh89qhxfxc5gwqm5jwvdcnmsyipzwibvmqmq800ims09fka" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "helm" + ], + "commit": "3a20d0eca0e95943cd9fdd40882cec65628f4a67", + "sha256": "0j3xz59hl84asv332fk94j5c06w3ix6b14zrkhxr8vb5ci1b2b1k" + } + }, { "ename": "helm-org-rifle", "commit": "f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615", @@ -42368,8 +42504,8 @@ "repo": "alphapapa/helm-org-rifle", "unstable": { "version": [ - 20181216, - 1129 + 20190809, + 1831 ], "deps": [ "dash", @@ -42377,14 +42513,14 @@ "helm", "s" ], - "commit": "23f4ae05f5a9d1894f4afdb9ef774c342eb7e787", - "sha256": "040jmacydgp56gd48ddfn1yk8bsdaawhdkpb0nr898q0bkk5arzj" + "commit": "dbda48031bad6fec1e130ee6e0d1a3bfea8ad8b8", + "sha256": "058zvh7cdall7dl3xay9ibcjvs13fbqp8fli3lz980pinmsds3r2" }, "stable": { "version": [ 1, - 6, - 1 + 7, + 0 ], "deps": [ "dash", @@ -42392,8 +42528,8 @@ "helm", "s" ], - "commit": "f2c7f9e203287e3f6e5647406d21454218553e5a", - "sha256": "1r38xhwvgbv6kn5x159phz3xgss7f1rc7icq27rnr4d8aj91wm6k" + "commit": "dbda48031bad6fec1e130ee6e0d1a3bfea8ad8b8", + "sha256": "058zvh7cdall7dl3xay9ibcjvs13fbqp8fli3lz980pinmsds3r2" } }, { @@ -43357,15 +43493,15 @@ "repo": "wandersoncferreira/helm-spotify-plus", "unstable": { "version": [ - 20190706, - 1409 + 20190807, + 2115 ], "deps": [ "helm", "multi" ], - "commit": "0cf321dcc766d1f451ed667d4fba7fa36a8e09f1", - "sha256": "0bhvyaj136hnjbla4jkxpih1d9qa6pbwb2h8wgdag9zl3i2c3ryv" + "commit": "e52233523917596dd3862e1151a027ce89a80a38", + "sha256": "0h4lj18rvhwcsb0k7ckp81h1aank9pf0dsa3qb578n10i9p6bb4y" } }, { @@ -43388,20 +43524,20 @@ }, { "ename": "helm-swoop", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1b3nyh4h5kcvwam539va4gzxa3rl4a0rdcriif21yq340yifjbdx", + "commit": "7a4e84530b4607a277fc3b678fe7b34b1c5e3b4f", + "sha256": "0dbn0mzzsjhpxh0dpxrrzqam9hl2sjsp1izq2qv3z11iv2hylzx4", "fetcher": "github", - "repo": "ShingoFukuyama/helm-swoop", + "repo": "emacsorphanage/helm-swoop", "unstable": { "version": [ - 20180215, - 1154 + 20190813, + 920 ], "deps": [ "helm" ], - "commit": "c66336b8245ddc51c4206f19c119f1081920985c", - "sha256": "0b23j1bkpg4pm310hqdhgnl4mxsj05gpl08b6kb2ja4fzrg6adsk" + "commit": "8ae7c47365d3cef4b81abe97af1532340821a21b", + "sha256": "06rfhd38fvfnzjxk119pwwddszv1sczxn5dn6r7qki39wwxcsqww" }, "stable": { "version": [ @@ -43424,15 +43560,15 @@ "repo": "emacs-helm/helm-system-packages", "unstable": { "version": [ - 20190731, - 1551 + 20190809, + 1508 ], "deps": [ "helm", "seq" ], - "commit": "8f8f50a1b2ef0dfb0734057a737abe7e5d77bd86", - "sha256": "18rcr4mdspbsk8wrl9rnhfxr3c7isdhmiz4qf4qm1x79db1j0km2" + "commit": "427c40d18ae1b5593df6bef72aa1d62ce89fc652", + "sha256": "0msil7niva1fy1lw5h7jwzfn398c5msml4vshplz13ry1ip33vih" }, "stable": { "version": [ @@ -43825,8 +43961,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20190723, - 2348 + 20190807, + 2141 ], "deps": [ "dash", @@ -43835,8 +43971,8 @@ "f", "s" ], - "commit": "8ac851e7c0f8345046d053d136befe28fd75dcd9", - "sha256": "17kzflrkxcmhh480csaxjxy55gszcwy62yihd0hp73mdx6pw4g4x" + "commit": "69474e9c49076ce82cea4eff237933b6cec0b5cf", + "sha256": "1jf0rj5k9aa1gbsvwwhnj5vkwpv1am5ya1xw5sxhzl3iabqz680i" }, "stable": { "version": [ @@ -44097,8 +44233,8 @@ 20190425, 842 ], - "commit": "a5bc6bf2e1bbd48cc17c508043134f24abb41944", - "sha256": "18y5xj8j07hca7qk5ygxqpiybv58qf4c85hqw52a59fkn0vvdbhg" + "commit": "a1d13c40102e833192c3bd6acf930013bdcbc819", + "sha256": "1hg3hvz11ncsh7xhsgv0id4szypj7cv2cffqnk3hphyl073dyic6" }, "stable": { "version": [ @@ -44491,14 +44627,6 @@ "sha256": "06nnqry36ncqacfzd8yvc4q59bwk3vgf9a14rkpph2hk2rfvq2m6" } }, - { - "ename": "himp", - "commit": "51b31fb1fa7052d16d659313d249eef01ca3ee88", - "sha256": "1igzlvm4g4rcnlvnwi5kn1jfvyrw2vnmp1kpvfnv7w9n6d8kflla", - "error": "Not in archive", - "fetcher": "github", - "repo": "mkcms/himp" - }, { "ename": "hindent", "commit": "9a15a17a5aa78aed72958b2a1bde53f0c0ab5be7", @@ -44792,11 +44920,11 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20190720, - 1147 + 20190807, + 1831 ], - "commit": "3010adfe09ee64cf403c2c7806581e5ea6823d05", - "sha256": "1h426q8r4xn44hr4fk0mv5mmxiskw65p58i78ngkl6cnvq80hnyv" + "commit": "be57dbc5a4667e4a60b8249b53fa176db1019c8e", + "sha256": "12swld4a723wqkh5h9jf3l4lj5rsidgmna53n8g48w8qvi2gz8l8" }, "stable": { "version": [ @@ -45086,25 +45214,6 @@ "sha256": "1zyd6350mbah7wjz7qrwyh9pr4jpk5i1v8p7cfmdlja92fpqj9rh" } }, - { - "ename": "how-many-lines-in-project", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "0rsl8f0ww2q5w87a8ddfjadw4mx4g2ahb62yb6xw7pzadmmz89f8", - "fetcher": "github", - "repo": "kaihaosw/how-many-lines-in-project", - "unstable": { - "version": [ - 20140807, - 442 - ], - "commit": "8a37ef885d004fe2ce231bfe05ed4867c6192d9b", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'system-features'\nerror: unable to download 'https://github.com/kaihaosw/how-many-lines-in-project/archive/8a37ef885d004fe2ce231bfe05ed4867c6192d9b.tar.gz': HTTP error 404 (curl error: No error)\n" - ] - } - }, { "ename": "howdoi", "commit": "d08f4d6c8bdf16f47d2474f92273fd214179cb18", @@ -45556,17 +45665,17 @@ }, { "ename": "hydandata-light-theme", - "commit": "413c617f15947782891159a240e0c9014f1f7d11", - "sha256": "0jw43m91m10ifqg335y6d52r6ri77hcmxkird8wsyrpsnk3cfb60", + "commit": "51edfd2eed17b79058bbef836bc3edff50defa6e", + "sha256": "1x4hf3ysjq3nwzr8jg0zs5lgalgxriyby4rww24w9xi3jc1bx5f1", "fetcher": "github", - "repo": "hydandata/hydandata-light-theme", + "repo": "chkhd/hydandata-light-theme", "unstable": { "version": [ - 20160816, - 418 + 20190809, + 1925 ], - "commit": "0fbc91678ef65e1f65d7ec6792ff0b2f104d16a9", - "sha256": "0bkj5cw173l829fkgigghs07mc2i84ngvs2y9g6kamrpg6zhq7g8" + "commit": "180c3797fa7ef3e4bb679baaf5b492c33bbb9b8b", + "sha256": "157s8lssp6b4sjlm84qjg5wzgvgsgzqzpdh4y6g042xpgaz8b8nw" }, "stable": { "version": [ @@ -47223,11 +47332,11 @@ "repo": "kwrooijen/indy", "unstable": { "version": [ - 20150610, - 1706 + 20190807, + 625 ], - "commit": "4604867d8111f0e186a5351e68e054a77cb14abf", - "sha256": "17xvi39v358nff4h1f6l3l3xwjlcr9hzln5v8qmk0kq9b8gkzgxa" + "commit": "abc5bee424780ad2de5520f8fefbf8e120c0d9ed", + "sha256": "1mvmd8vm9w6vhr7ablxk5pylwrga6knhjjbin9l1xlgrpdh2pglp" } }, { @@ -47329,25 +47438,6 @@ "sha256": "0a1hhvfbl6mq8rjsi77fg9fh5a91hi5scjrg9rjqc5ffbql67y0v" } }, - { - "ename": "inferior-spim", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "0p0g8diqijxpgr21890lnmzkyl74sv42ddgpfpv51b9fwnqky524", - "fetcher": "github", - "repo": "kaihaosw/inferior-spim", - "unstable": { - "version": [ - 20160826, - 1346 - ], - "commit": "fb9aa091f6058bf320793f1a608c1ed7322c1f47", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'system-features'\nerror: unable to download 'https://github.com/kaihaosw/inferior-spim/archive/fb9aa091f6058bf320793f1a608c1ed7322c1f47.tar.gz': HTTP error 404 (curl error: No error)\n" - ] - } - }, { "ename": "inflections", "commit": "392c7616d27bf12b29ef3c2ea71e42ffaea81cc6", @@ -48241,11 +48331,11 @@ "repo": "casouri/isolate", "unstable": { "version": [ - 20190206, - 329 + 20190808, + 731 ], - "commit": "3bb82f52b0df39c9b57fb68ba622b2906d0eecff", - "sha256": "00h9d6d6l8cxih8ix6kckc6dhzmq9hbfmgfmfpmf6f67c4ikcv8m" + "commit": "e93cb652f150705347480a2ee13b63fa625b1edf", + "sha256": "0fa4z1mm62s1x4fd6d4pwl6zvksx1xiv6id9fy7rdbs0vznsjgqb" }, "stable": { "version": [ @@ -48406,11 +48496,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20190801, - 1148 + 20190809, + 1551 ], - "commit": "4389a261b30c8fbfc6e31228b33b1764221daac7", - "sha256": "153a9nn0m6q5a4psw2vvnmqixkny56dlbrfvvw45zc9ikdd1wv2b" + "commit": "20d604c139b82d98010aabbbc00ad487438bdf8e", + "sha256": "0clg04az8v5ia3z5fxcimprqp4kbf2g1z6na3js60gmi689ks8ll" }, "stable": { "version": [ @@ -48658,8 +48748,8 @@ "hydra", "ivy" ], - "commit": "4389a261b30c8fbfc6e31228b33b1764221daac7", - "sha256": "153a9nn0m6q5a4psw2vvnmqixkny56dlbrfvvw45zc9ikdd1wv2b" + "commit": "20d604c139b82d98010aabbbc00ad487438bdf8e", + "sha256": "0clg04az8v5ia3z5fxcimprqp4kbf2g1z6na3js60gmi689ks8ll" }, "stable": { "version": [ @@ -50826,8 +50916,8 @@ "repo": "dzop/emacs-jupyter", "unstable": { "version": [ - 20190801, - 2126 + 20190809, + 349 ], "deps": [ "cl-lib", @@ -50835,8 +50925,8 @@ "websocket", "zmq" ], - "commit": "6b1baf1fde00ce97ac9d2f96ea6147b68f297640", - "sha256": "0dlb7nn2ifiw0b8psq2kszlkm58mklc8avlnpby4bwfh0vb1bsjc" + "commit": "c4dc513c52c57a6f67d3c25c09079365dd2b06f5", + "sha256": "1bfxv5y8w0c3n81yb59f74014sdvdqf294kw01bq68kcg0xk6bx8" }, "stable": { "version": [ @@ -51031,16 +51121,16 @@ "repo": "jmorag/kakoune.el", "unstable": { "version": [ - 20190601, - 2338 + 20190803, + 1525 ], "deps": [ "expand-region", "multiple-cursors", "ryo-modal" ], - "commit": "50488df2eeb6e8bfe72cfad4de24060819b148eb", - "sha256": "0ym3hbiwjraqsk3clcrkllr7jlj5zqsbxqq94ds2vj0x3f9i81fq" + "commit": "fe8f8a02c38538f5f7776df3402b270639281ad8", + "sha256": "15wnwjlh333c3aykk6w4xxy93ic6lzb7wmxaigxahg37a9qlp3hs" } }, { @@ -51119,15 +51209,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20190724, - 714 + 20190812, + 1835 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "0c6d0cb40fd686686dcf08a4902f871066f8717e", - "sha256": "13jzcbgcxq1xix6vkiiz5dic4dk1sj7idrh4r6aqrz3hj6cjg0kj" + "commit": "9bc8dc1b69e6d858a523b98603201f60a51825fa", + "sha256": "0jb0z1p1n3fdmqlwrv7x0ndcccijdw6025gw6sm6qdyj09a241vw" }, "stable": { "version": [ @@ -51756,8 +51846,8 @@ 20180702, 2029 ], - "commit": "68dade8a209d498721f425e1ffd7e8c4d9de532b", - "sha256": "1zffkh46gk5as18fkgmzzr5kr9x2jak5mrhrhqb3fhhvfj9dd3xs" + "commit": "3ab5fde4ba63865333766685e025aae01933dbaf", + "sha256": "1k5qnrih9y8w49cbgi6prg98qqxrrn106g7h71azgpbav1mlfyk7" }, "stable": { "version": [ @@ -51777,14 +51867,14 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20190325, - 352 + 20190811, + 1116 ], "deps": [ "cl-lib" ], - "commit": "c662f3dc5d924a4b64b7af4af28f15f27b7cea1e", - "sha256": "0i11sfnqvjqqb625cgfzibs6yszx891y4dy7fd6wzmdpclcyzr8z" + "commit": "d2ae3386b52a25c080d8502fc19207d997676cd2", + "sha256": "0fsndh8nwpmnbv505r26cxxgxx8wlvx9h8pgb95im6q6pj2g7p9x" }, "stable": { "version": [ @@ -52035,16 +52125,16 @@ "repo": "chrisbarrett/kubernetes-el", "unstable": { "version": [ - 20190605, - 134 + 20190813, + 239 ], "deps": [ "dash", "magit", "magit-popup" ], - "commit": "95d5c934f2955388bdd2f568b8e5c706ce15c21b", - "sha256": "1kahnk2cy96zpxb35vj7f9zanb1nm79p3wxgq4cwgmi6h6gj0arq" + "commit": "e0eff360c83c61d531bf0a0032efa6b963ce2b57", + "sha256": "09zqayzl05yszxh619i2ri12g3c0lbbvbh4m4isyxvancxk88igs" }, "stable": { "version": [ @@ -52075,8 +52165,8 @@ "evil", "kubernetes" ], - "commit": "95d5c934f2955388bdd2f568b8e5c706ce15c21b", - "sha256": "1kahnk2cy96zpxb35vj7f9zanb1nm79p3wxgq4cwgmi6h6gj0arq" + "commit": "e0eff360c83c61d531bf0a0032efa6b963ce2b57", + "sha256": "09zqayzl05yszxh619i2ri12g3c0lbbvbh4m4isyxvancxk88igs" }, "stable": { "version": [ @@ -52774,11 +52864,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20190709, - 548 + 20190811, + 2340 ], - "commit": "08462cdf1e9c58c45ce3d4909bed7e69a25ed52c", - "sha256": "04g305qnhj14vi54iq0w4mkw1gjbnbzvinw94kyss9w75rwm213g" + "commit": "0114525803860b18a34624339825219bb6b8943e", + "sha256": "04di2f51i0gqvwj8x2wn1f85a4iyg6gf8hkig4z244j8jv489v6d" }, "stable": { "version": [ @@ -53094,11 +53184,11 @@ "repo": "magit/libegit2", "unstable": { "version": [ - 20190728, - 701 + 20190810, + 1757 ], - "commit": "72d6b273159dd034fa2fb7bffb1ebff5e7ccba11", - "sha256": "15vs68x7lcav5ihl27y3wwxv05whabahx6l7w3jbr9g5c8w38f8g" + "commit": "60e1e7d360b376534c4b6258ddf7d5b5f0a68133", + "sha256": "18y3wdfy6pnyv0slggagdyy41mjwsprnr57ab1qmyz5dd8ryfwwn" } }, { @@ -53186,14 +53276,14 @@ "repo": "elpa-host/line-reminder", "unstable": { "version": [ - 20190716, - 715 + 20190807, + 440 ], "deps": [ "cl-lib" ], - "commit": "24b3916f7714039a704f11b450479f4e843bafe6", - "sha256": "04krsprkgl4k9cn0iywf21qphd7k8x6bg331mh4749mcbmmw8k9g" + "commit": "707dc65001778e6476085fd7c30e1a1a3f84563a", + "sha256": "07fd1gw1fwzc1ynfp59b06hm9hz93fnjhgkgxmhk464ri0nv0l60" } }, { @@ -53452,8 +53542,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20190730, - 1215 + 20190802, + 1214 ], "deps": [ "ace-window", @@ -53462,8 +53552,8 @@ "iedit", "zoutline" ], - "commit": "3d1afdd8ecca7c28ddb66268c9121a074a6752ba", - "sha256": "0w8m3x53ipyqny9b4yy34rsf588719p9q5n21dh3q1w4qidl2pjy" + "commit": "beb939a1afaf8ee39955b7bc0bc65326df817f48", + "sha256": "101hqw794a8hcrcwvjjzxydcdlwdvxxfhbablcafpiqj1dr4vn9m" }, "stable": { "version": [ @@ -53751,25 +53841,25 @@ "repo": "jingtaozf/literate-elisp", "unstable": { "version": [ - 20190609, - 840 + 20190804, + 602 ], "deps": [ "cl-lib" ], - "commit": "d00a7fe92c9e74aaa60574e9109fd38c471e606f", - "sha256": "018spl2zkm0nrm0d4f7i10jw72as29c45n61dfsl3966y0qy7kvx" + "commit": "1dd1aad8c4049423d1a7980191c25b4120681296", + "sha256": "07gp0l2y7ysl13n368jaqnj52fpqcirj0faz95rrzrysq9ap8xn8" }, "stable": { "version": [ 0, - 5 + 6 ], "deps": [ "cl-lib" ], - "commit": "d00a7fe92c9e74aaa60574e9109fd38c471e606f", - "sha256": "018spl2zkm0nrm0d4f7i10jw72as29c45n61dfsl3966y0qy7kvx" + "commit": "1dd1aad8c4049423d1a7980191c25b4120681296", + "sha256": "07gp0l2y7ysl13n368jaqnj52fpqcirj0faz95rrzrysq9ap8xn8" } }, { @@ -54081,11 +54171,11 @@ "repo": "ionrock/lodgeit-el", "unstable": { "version": [ - 20150312, - 1349 + 20190802, + 1308 ], - "commit": "ec9b8e5cbb17bcf8ac4bdddd1d361cb60e59384c", - "sha256": "1cdnm270kzixa0kpis0xw2ybkw8lqh7kykc7blxkxjrr9yjvbawl" + "commit": "442637194d48a7105b7747b8d98772f5899f9e21", + "sha256": "1lw9d6908si7rw5802vwpnfklpahqsabkl21nzg77a4pp3pgy80v" } }, { @@ -54514,8 +54604,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20190801, - 732 + 20190813, + 451 ], "deps": [ "dash", @@ -54525,8 +54615,8 @@ "markdown-mode", "spinner" ], - "commit": "720b8b6f2a11a8d7e783b905bc764573b93f5a87", - "sha256": "0548iqaq8q5jsajj08gxg9nls7iln80nzzm5wl2ff4v0ykf5w4gz" + "commit": "e4efbab6704e6b1241cccfa0992dbcc4ba08cdcb", + "sha256": "0by7frvvf1swarswa7vfv1pgq2pirvx5jl61nxdw3q2l1ak4v7mr" }, "stable": { "version": [ @@ -54618,8 +54708,8 @@ "repo": "emacs-lsp/lsp-python-ms", "unstable": { "version": [ - 20190719, - 659 + 20190809, + 640 ], "deps": [ "cl-lib", @@ -54627,8 +54717,8 @@ "lsp-mode", "python" ], - "commit": "60b663c82a55613009632ee83aad8cdc1c410a84", - "sha256": "1kcdjk9j6qf5smbirc09m31i5fqzdv9d61ww745cc35jff6qygmc" + "commit": "8b18a98ad68373aa4d7ef24ec728a250ca570a2a", + "sha256": "1mz6hy1k0g3m5x4cvyqb68811aa2iabmjw4v2qbjfwd5jbmyvy21" } }, { @@ -54699,8 +54789,8 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20190523, - 1521 + 20190809, + 1907 ], "deps": [ "dash", @@ -54708,8 +54798,8 @@ "lsp-mode", "markdown-mode" ], - "commit": "3ccc3e3386732c3ee22c151e6b5215a0e4c99173", - "sha256": "1k51lwrd3qy1d0afszg1i041cm8a3pz4qqdj7561sncy8m0szrwk" + "commit": "1cfff2135ffbf7ac52d9c2ece3f2bd157ac51167", + "sha256": "1pbqjrhdv3n73p785fj3gl11rpaim0my78gp530239w10q5i7g9z" }, "stable": { "version": [ @@ -55142,8 +55232,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20190731, - 934 + 20190812, + 1330 ], "deps": [ "async", @@ -55152,8 +55242,8 @@ "transient", "with-editor" ], - "commit": "9e2df13e5338b7bde31dceca4e64494bc0fd68a8", - "sha256": "0pxqbwd6fwhnr844m3k82yy26f74favmj5jzidypim0f1x2rmr82" + "commit": "75d0810d131e2e61ae3c683797a10a2caca96073", + "sha256": "19ynyx1648riwnpiwzk1mk36z4fw4j4bggr7mf7pinsvv9191zmq" }, "stable": { "version": [ @@ -55466,8 +55556,8 @@ "libgit", "magit" ], - "commit": "9e2df13e5338b7bde31dceca4e64494bc0fd68a8", - "sha256": "0pxqbwd6fwhnr844m3k82yy26f74favmj5jzidypim0f1x2rmr82" + "commit": "75d0810d131e2e61ae3c683797a10a2caca96073", + "sha256": "19ynyx1648riwnpiwzk1mk36z4fw4j4bggr7mf7pinsvv9191zmq" } }, { @@ -55653,14 +55743,14 @@ "repo": "magit/magit-tbdiff", "unstable": { "version": [ - 20190507, - 236 + 20190808, + 1639 ], "deps": [ "magit" ], - "commit": "fcde2e718974acb2b8905b623e0eca74c58b6b0f", - "sha256": "0ks2fyiwxg4zqhplbysb9wv82nrd72ihqi911hf7m48a72w7assx" + "commit": "49faa9b94c338c0d5aa064f41b3acd50e5943421", + "sha256": "0wznf26l8hvdp8p6nbvwbwg2v33yrms72nsw0gvyvnn5mqiw4v7b" }, "stable": { "version": [ @@ -55683,8 +55773,8 @@ "repo": "alphapapa/magit-todos", "unstable": { "version": [ - 20190709, - 954 + 20190805, + 552 ], "deps": [ "async", @@ -55695,13 +55785,13 @@ "pcre2el", "s" ], - "commit": "8f634a29cbd1f2b7cd7f3f62c96f14437327f29b", - "sha256": "0jllwfzk895hx9x0mjiwzah701lhprdxl2mvvb4vzdrsycjz255w" + "commit": "8a88171b2785acce59081d8b12649731e6cf20c0", + "sha256": "09pjb4k409gc0h51vb5az1shx02c1hx8cnvhi529n7dm4maildg5" }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "async", @@ -55712,8 +55802,8 @@ "pcre2el", "s" ], - "commit": "8faad07c26afead462b94c11873e2b6d2613966b", - "sha256": "0gfm6wn2a4v5i9lfsvvin0kwpr9n96ddm3z4yf50jd3kg2igzry1" + "commit": "8a88171b2785acce59081d8b12649731e6cf20c0", + "sha256": "09pjb4k409gc0h51vb5az1shx02c1hx8cnvhi529n7dm4maildg5" } }, { @@ -56100,10 +56190,10 @@ }, { "ename": "manage-minor-mode", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0ljdca9b08dw0kx679jmq0wc484xcpbmzwx8zkncw642pnbj9q0j", + "commit": "7a4e84530b4607a277fc3b678fe7b34b1c5e3b4f", + "sha256": "1y5a4r92b8zb2kvmsg6s3drg4q4g35jqj8nmfx4z5rrnck1r31ym", "fetcher": "github", - "repo": "ShingoFukuyama/manage-minor-mode", + "repo": "emacsorphanage/manage-minor-mode", "unstable": { "version": [ 20140310, @@ -56314,14 +56404,14 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20190305, - 319 + 20190802, + 2215 ], "deps": [ "cl-lib" ], - "commit": "115f77df9755c6a453f3e5d9623ff885d207ea82", - "sha256": "0a26gz2m5v0jkawlqb723yiqsns4sg7inalr8fk1x08khnckkzyz" + "commit": "f3c54e34cc5228001af36a5301883325319f21d4", + "sha256": "1zvpryra1sr63192j6v62kc9mvhc9wsvm7haj2maxmv2v3akhlil" }, "stable": { "version": [ @@ -56553,6 +56643,21 @@ "sha256": "017k109nfif5mzkj547py8pdnzlr4sxb74yqqsl944znflq67blr" } }, + { + "ename": "marquee-header", + "commit": "7fad3e54df480d61e5f83aab053e834e6ef72cc7", + "sha256": "09yb1ds1r54xw2hsvb1w9i33a5qm0p79vgmj5ikw18zh68pnmzza", + "fetcher": "github", + "repo": "elpa-host/marquee-header", + "unstable": { + "version": [ + 20190805, + 140 + ], + "commit": "ac33b04c5a50de95c937fce1d80001a3c3c9b26d", + "sha256": "1cq6v8wdmvi90fc3mnqpsscnv1m19cp9iv6ba1dv7y32fh1d95my" + } + }, { "ename": "marshal", "commit": "203f2061c5c7d4aefab3175de5e0538f12158ee3", @@ -57419,8 +57524,8 @@ 20190324, 1908 ], - "commit": "09ca6d11ad88f5d3ebd6d1dfffc8a6bc5f4261a8", - "sha256": "1wgcky4lq71yxw327y9qzlam9mh8xmqqixzj1gk02pgg109m3kli" + "commit": "b18648118144c0a3f7c1d74aad3e98ff16402e2e", + "sha256": "0i8gc4n691fhfn4p99k08bcd5sddn9wjh3cr5djbfh3x78gm4m32" }, "stable": { "version": [ @@ -57440,26 +57545,26 @@ "repo": "yoshinari-nomura/mhc", "unstable": { "version": [ - 20190506, - 633 + 20190807, + 513 ], "deps": [ "calfw" ], - "commit": "88b5f938e57c28e9e2db202770f952fc0ecba945", - "sha256": "13d31wz7wyh777isimxlkdimj3vbl54bh0f00p15a8xlrs2pn7f3" + "commit": "56e58bb8f22d621d271ada64b98eb6e09595e462", + "sha256": "1bz5s7y7jb00acgk140rbd2rr1i6ajnqvxbgs3yp19cxfnspbcj5" }, "stable": { "version": [ 1, 2, - 2 + 3 ], "deps": [ "calfw" ], - "commit": "88b5f938e57c28e9e2db202770f952fc0ecba945", - "sha256": "13d31wz7wyh777isimxlkdimj3vbl54bh0f00p15a8xlrs2pn7f3" + "commit": "37898db4902cd644a0d3e8d9d02426d54fb8984a", + "sha256": "0c9kshs17b8fn8la8hlzf05vf5pajf3ksx7bsjri3m78s6bd3h4z" } }, { @@ -59158,14 +59263,14 @@ "repo": "ksato9700/mu-cite", "unstable": { "version": [ - 20160130, - 1100 + 20190803, + 439 ], "deps": [ "flim" ], - "commit": "aea3c2d01eb3284d5e0124059d368e8c6b6ffddc", - "sha256": "1gxspy50gh7j4sysvr17fvvp8p417ww39ii5dy0fxncfwczdsa19" + "commit": "b2c83bbce4646d100b942f0f0de0877a8d47298c", + "sha256": "1kg4l88k4gwv7zczmbgxzpmifkbklf3yzlk849igs01z4jvh2bkc" } }, { @@ -59820,6 +59925,29 @@ "sha256": "18ml0qz3iipm9w36zvwz77cbbrg885jgvzk6z4a33xcfp524xhma" } }, + { + "ename": "myrddin-mode", + "commit": "224cd200f2f399f25865b6f5b9bf5ec8b957bf35", + "sha256": "1gz126gnwgrvkxd3n7xwqfzpk9lvcll3g8v4pa2w9hsz98crwwgl", + "fetcher": "git", + "url": "https://git.sr.ht/~jakob/myrddin-mode", + "unstable": { + "version": [ + 20190804, + 2205 + ], + "commit": "b996da5e3bae842eacba4b3e429899bb841b077e", + "sha256": "0gylwdq81s89civrlwsg4zrvyjkjw37jdp1mvsihx8xpq38w4r65" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "b996da5e3bae842eacba4b3e429899bb841b077e", + "sha256": "0gylwdq81s89civrlwsg4zrvyjkjw37jdp1mvsihx8xpq38w4r65" + } + }, { "ename": "mysql-to-org", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -60736,11 +60864,11 @@ "repo": "aaronjensen/night-owl-emacs", "unstable": { "version": [ - 20190623, - 657 + 20190808, + 2050 ], - "commit": "340ebdde6214bee0918281672ec535ba1e8f5dbe", - "sha256": "0zg5mqbmi8qlp9zdyafjnrazzffbqb27zl7j7ay2ssr9k7czhqds" + "commit": "16fdaa15593cd86daf1100852045cdbd5c242d49", + "sha256": "0w4q9ar0kn0fgp554dwwb488za8kf80mi1dl0fh748b54m70j2c4" }, "stable": { "version": [ @@ -60814,11 +60942,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20190724, - 740 + 20190810, + 1848 ], - "commit": "74614940e8e47d348d3102d767188fa6c6d879b1", - "sha256": "13n7m9jwkvcxbqvw2lp7xskmxzj6n1pisn14kb09cphlrvyg1hmj" + "commit": "0bbdedd23361ffbd7199c70481803b708fb65d59", + "sha256": "1v4cisqlqh2lqql29459lb475r4k95gz8qdvsn89hl58s27iq420" } }, { @@ -60832,8 +60960,8 @@ 20181024, 1439 ], - "commit": "e0bc2e5fd9036a31d507881e1383adde3672aaef", - "sha256": "1kcz81v09fm2fasx9wymrckgxvxb9d5y6kywcfi6mbn4mz6laww8" + "commit": "bd17f236231a58c44f1f5f09ff925aa666d672b7", + "sha256": "0xgb954shsahj8vm0mncl85cmy74xxxdqh4fp4bjv10gl8z2p8hf" }, "stable": { "version": [ @@ -61086,15 +61214,18 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20190726, - 2200 + 20190812, + 2056 ], "deps": [ + "anaphora", + "dash", "json-rpc", + "request", "virtualenvwrapper" ], - "commit": "8e901b207f717227b4fe25e6a4a5dc61b103e8b7", - "sha256": "1hdna9y6jk10s3mx45k39k6cb670s1wx79pfgaivkpjqhcdj5xx5" + "commit": "3e6c4a5cd073d3d02aad0620cb00201e1f659fa5", + "sha256": "0k85hvp88i4rmv4igwhflw1rf307wxqk7l0qipybgbccs2zca5hc" } }, { @@ -61120,14 +61251,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20190729, - 642 + 20190730, + 2037 ], "deps": [ "cl-lib" ], - "commit": "7480853e0fe7d3ddd89407122ebe8068f96ae579", - "sha256": "0nbrsyjjq6mc116hzqn9fd0lmqrqcnf9jzzwyv8mp22szk39zyvp" + "commit": "b36e1d28b97693850da258e103f24c40ec882753", + "sha256": "17y0m1n8vn6p0qykphbpbjbm3gzd2wprw6i2nwfd4g718hbsrkwi" }, "stable": { "version": [ @@ -61376,20 +61507,20 @@ }, { "ename": "nordless-theme", - "commit": "3de9da6cb8c1a75ff1d41a69e156c21be00713b6", - "sha256": "1ylvqh5hf7asdx2mn57fsaa7ncfgfzq1ss50k9665k32zvv3zksx", - "fetcher": "github", - "repo": "lthms/nordless-theme.el", + "commit": "d16babc1f37d62cb8e9e983dfd92dabb83c8b9b3", + "sha256": "0nf9pkyrv0qvbpmp2kqdqmli6cg0bvn9q815p9pdpvacmjsnfpvj", + "fetcher": "git", + "url": "https://git.sr.ht/~lthms/colorless-themes.el", "unstable": { "version": [ - 20190729, - 1556 + 20190802, + 725 ], "deps": [ "colorless-themes" ], - "commit": "30926ee9e8de50ae3ccc83956e048f68ed69736b", - "sha256": "0mqgwbjgwz3mdi6q66y816pj5sac7mv35jlzfkfv1d0kl7r7abcr" + "commit": "4f9d0ec5a078ab8442abdba0c35eb748728f3052", + "sha256": "1h8ggaqvrdj8cyknps9anh2xz08ar94137gydvxy8xgrmpa3jnc1" } }, { @@ -61947,16 +62078,16 @@ "repo": "zwild/ob-ammonite", "unstable": { "version": [ - 20190604, - 1351 + 20190813, + 59 ], "deps": [ "ammonite-term-repl", "s", "xterm-color" ], - "commit": "e9d431acc014fb064d77fab0201c626126e7922c", - "sha256": "1cmpczl9p8ig1ql85kqhshzd64rc8xjpq0qgx0jq9yk4syaayk4h" + "commit": "39937dff395e70aff76a4224fa49cf2ec6c57cca", + "sha256": "0aibvrhwj2swv9ixl6hx4b2yicbpi095mvs0fib7i1nhlg0zciqd" } }, { @@ -62960,8 +63091,8 @@ 20190726, 1452 ], - "commit": "8389c2ac0420036426337ed24ff3dab984b00cd5", - "sha256": "00l7jvzhd9cr9yx8rxadkw87rq7bimj872vsggvi7vjpxn2q0ck0" + "commit": "bdd84a71da8eac87447e35b55782ec07f0d2aead", + "sha256": "0cvfzz1i3lh9q5fl26sp98cqpv3mqjxlzlflv8hc3cdr8ascjm4g" }, "stable": { "version": [ @@ -63296,8 +63427,8 @@ "repo": "OmniSharp/omnisharp-emacs", "unstable": { "version": [ - 20190702, - 1945 + 20190809, + 341 ], "deps": [ "auto-complete", @@ -63309,8 +63440,8 @@ "popup", "s" ], - "commit": "cb05dfe213a8dae355b72c6df5bf75327dacafef", - "sha256": "0zfhax0djy8a05j9n76ggw3srgxmn5b0m31jbxp1ixbx9icymshn" + "commit": "b5afa053c8d3771d5567538bae89a03cc66e826c", + "sha256": "0vhjfig0yx2ihqbq9ah6w7vs84lbnn5zlkjlda63kfs5cwwi43vp" }, "stable": { "version": [ @@ -63917,14 +64048,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20190731, - 1217 + 20190809, + 1315 ], "deps": [ "org" ], - "commit": "6261549545af690313839b456d4c8486b39288bb", - "sha256": "01z8z78h6095lpbsi0f8y99az3nhdh04dnfmng8y0iqkmbqkqkq9" + "commit": "0f984e01a982ded563df9fab5355a29f781b2430", + "sha256": "09m4vsfmqfni5jdwxpkhfg3jzbd69d3di1z9wdc9bvbxrrd03a3a" } }, { @@ -63935,11 +64066,11 @@ "repo": "emacsorphanage/org-bullets", "unstable": { "version": [ - 20180208, - 2343 + 20190802, + 927 ], - "commit": "b56f2e3812626f2c4ac1686073d102c71f4a8513", - "sha256": "0a0dml6y49n3469vrfpgci40k4xxlk0q4kh2b27shjb440wrmv4x" + "commit": "c19b13be00df8d8dc596e4f1aef4a094b08ac801", + "sha256": "1rvhinwnz660mfz4wkr2wa51ss5cm4gzpwfvwc0s0srk14s2h66h" }, "stable": { "version": [ @@ -63959,14 +64090,14 @@ "repo": "dengste/org-caldav", "unstable": { "version": [ - 20180403, - 2036 + 20190812, + 1918 ], "deps": [ "org" ], - "commit": "8d3492c27a09f437d2d94f2736c56d7652e87aa0", - "sha256": "19q83xgbdabkidx26xvff1x7kixk2wllplnwfsy7kggdj9wqpm9l" + "commit": "1fd520490303d9a3e45187f2fe56f00ac403c214", + "sha256": "1m1ics2pd7x07ylbkmm1darbqdzrp29x3jlckr1bwizk9dwaz0r4" } }, { @@ -64022,14 +64153,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20190608, - 1559 + 20190807, + 1453 ], "deps": [ "org" ], - "commit": "8f1a1845542925e4ecafe8d68ee752b404ecc51c", - "sha256": "0r9ax5yxvb1fqiil881yhywvypwxv9bafgqgjx4sl59y4ilksx15" + "commit": "f42d75a9787f9644f03b6f9a379bbc40f6397605", + "sha256": "0ra8ky67i2f4saqv265dby0r1x9n4lv8vn607g0z7c9myff6bxnf" } }, { @@ -64569,8 +64700,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20190401, - 1741 + 20190812, + 951 ], "deps": [ "alert", @@ -64578,8 +64709,8 @@ "org", "request-deferred" ], - "commit": "3874040bd86050db60b982bb62acafb69b6a4d9b", - "sha256": "1dffrws0rvxvsg9jqjx239zxssd6sskqv3x58mm5vvhna423cm67" + "commit": "f0f9dc2ba7a5075b4f6755f96399c9dfee299ac7", + "sha256": "0s6bcyhg059409s0w191m1hpd8nfi1478jsilnby5fn1jhgdjmga" }, "stable": { "version": [ @@ -64797,16 +64928,16 @@ "repo": "gizmomogwai/org-kanban", "unstable": { "version": [ - 20190528, - 507 + 20190802, + 2107 ], "deps": [ "dash", "org", "s" ], - "commit": "dcf5e8c0a2d82bc4101c03ba21a2d38b406ea00b", - "sha256": "02n5753kqvb6ankqrynrlalik5r9g367rg4yzmf8mhx52x1h5va4" + "commit": "1f9e420fd0030049714690c3d98cc75da83255bb", + "sha256": "0m9l4xsalavwm82wvlyfphi65lb65mkyp5dvpyjf86ijc9w8crvf" }, "stable": { "version": [ @@ -65000,14 +65131,14 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20190702, - 1129 + 20190805, + 57 ], "deps": [ "cl-lib" ], - "commit": "286330fa15167add4b17eb62b0c52695f08a76e8", - "sha256": "1b6mcvhcyyf84g4yg44i0f7vpisw6dyimm5h9kqfzw8npx6gmfah" + "commit": "4bd5d55ba9bca84ffd938b477c72d701cf3736df", + "sha256": "0a9vjlg5rz3c61wvy0wsj9l5y3p6b1v8hz84ksh97xnmmzclp1nx" }, "stable": { "version": [ @@ -65159,15 +65290,15 @@ "repo": "weirdNox/org-noter", "unstable": { "version": [ - 20190502, - 1425 + 20190807, + 1809 ], "deps": [ "cl-lib", "org" ], - "commit": "920798e2a977ca74b77cf728ee40bb48450f941b", - "sha256": "1sx4pf5hwbq7r967zigzq3jhhisd3x9pf3nmp7iickyd1jcg3qbv" + "commit": "d3df267a7432ecf0fb287a645e06dee7e7b80671", + "sha256": "0hj2h88zcg6vp3h1dash91gg2k1dqw2bib2glv0cp39b0xaspcsf" }, "stable": { "version": [ @@ -65372,8 +65503,8 @@ "org", "pdf-tools" ], - "commit": "09ef4bf8ff8319c1ac78046c7e6b89f6a0beb82c", - "sha256": "15zxdq6f6w3l8pzg3b58cj37z61dx106jwslpqni71m8wczdqkz1" + "commit": "8b71f313634b95a1fac42fc701934fd796565f3b", + "sha256": "1gd4ari970vb4631f9a4czvql8gafaqh7iir75n4wxqdcnglnymw" }, "stable": { "version": [ @@ -65622,16 +65753,17 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20190726, - 2139 + 20190813, + 146 ], "deps": [ "dash", "org", - "s" + "s", + "ts" ], - "commit": "51af2a16a7944f1b902a7fcfb39ae4018da30330", - "sha256": "0bn4f9v3ii516sp6x8i6qqj3hlb7x4s24iymd7jixly5is89sby2" + "commit": "5174aca4e8fe956abae7161d15058702bc8874c1", + "sha256": "1r2a1j4cdkw7rf981r06c3qc30c2irs3gawzkwxiflslkimpav42" }, "stable": { "version": [ @@ -65723,28 +65855,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20190801, - 1848 + 20190802, + 642 ], "deps": [ "htmlize", "org" ], - "commit": "48f3880009d2e31943790eb3d78d06c875ec4c17", - "sha256": "1npd51z16ibchms4qc6c43q22nva074f65hzahi01bvz1j981d69" + "commit": "dcbfcb80a3c6fd0f5af25d1fd17d8e0c6582e791", + "sha256": "0nm87rmbljw9mjv7fc6ivpqxnwak4xs0wjc903ihwd3y9vmc36p8" }, "stable": { "version": [ 1, 1, - 8 + 10 ], "deps": [ "htmlize", "org" ], - "commit": "48f3880009d2e31943790eb3d78d06c875ec4c17", - "sha256": "1npd51z16ibchms4qc6c43q22nva074f65hzahi01bvz1j981d69" + "commit": "dcbfcb80a3c6fd0f5af25d1fd17d8e0c6582e791", + "sha256": "0nm87rmbljw9mjv7fc6ivpqxnwak4xs0wjc903ihwd3y9vmc36p8" } }, { @@ -65755,15 +65887,15 @@ "repo": "oer/org-re-reveal-ref", "unstable": { "version": [ - 20190727, - 543 + 20190804, + 846 ], "deps": [ "org-re-reveal", "org-ref" ], - "commit": "a69e5bcc38d67ff99c0677f6187da67493fda876", - "sha256": "1mbg7v2jl507zxl5n6wxkl1kwz6m6yr4av0ylwz5d95b1rbrjahj" + "commit": "094fd1d320c64ac361a57402501f0e43787b357c", + "sha256": "0r1ns3fm22yxc6zf4p5rvbk49r6966fqfl1caf0w3fyqgvwvllxi" } }, { @@ -65774,16 +65906,18 @@ "repo": "alphapapa/org-recent-headings", "unstable": { "version": [ - 20190731, - 2203 + 20190807, + 1016 ], "deps": [ "dash", + "dash-functional", "frecency", - "org" + "org", + "s" ], - "commit": "0cc5a30d11c64db5d3f0ab5c4a7739b38a763c42", - "sha256": "0dzfdlhw3dslrjwpjff96xavackabz6h1kaip5k88hlqcmj0rnsk" + "commit": "c1984fe70322c35ee48b2d8bc410dd0a13ffbbc5", + "sha256": "13kcrki9v0w594g8q6rdzfx4002xzs8sz7c5fg7rvrm03sp93dqa" }, "stable": { "version": [ @@ -65813,8 +65947,8 @@ "deps": [ "org" ], - "commit": "b121da04ac9d3f30894a60b7c7a83c5ba2f32a6a", - "sha256": "1z8g49f4wpiav4vpd7fbh4chbc7id1p3c621a3wwrkxj2xkq3xnr" + "commit": "23c3c3a85d9042dc09ed6147b274f4043cfa50f7", + "sha256": "1sw9h6543zgsyss5ns3bjviz0nblsr077hp8b15pva0ch2836vg5" } }, { @@ -65840,8 +65974,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20190706, - 2059 + 20190802, + 1327 ], "deps": [ "dash", @@ -65855,8 +65989,8 @@ "pdf-tools", "s" ], - "commit": "45152736e332e50f8257248efbb31e069a2c81c5", - "sha256": "0lhbi5wcqr1yj7pqn0va42za438dbpr2gkmxf8i0fkfg0ndmsblq" + "commit": "9ab74270c1543e4743ca0436de567d8205403b43", + "sha256": "0ma9zaxzrd1dzmk8633bkw6wrp03wrm9bjhrgsp9qp7vhm597fdq" }, "stable": { "version": [ @@ -65911,14 +66045,14 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20190706, - 203 + 20190806, + 1412 ], "deps": [ "dash" ], - "commit": "bd78e007f972642a8733696ab51b37a8228a1beb", - "sha256": "130w438g9hdsmips1ki909qy1ddhv41qjr0df7qaqvbf1yrymd9b" + "commit": "0c70a06474921638eba3c287472879ce903ee8b7", + "sha256": "0fdndpy7j8idbrqpn85hnwj8caf737hcind00blbvc5rka85vaq4" } }, { @@ -66004,11 +66138,11 @@ "repo": "lordnik22/org-shoplist", "unstable": { "version": [ - 20190730, - 2320 + 20190809, + 2156 ], - "commit": "267407c9157214fb20edb882da8f5c0064a74a8d", - "sha256": "0pvfxrxkd8hbcl1nh5w7nr9s1phcqbg2awkkbmhz53n3c4q83gfx" + "commit": "9591a4747eb2e5cab53203a120f9b854c75e629b", + "sha256": "1b721xp6dn54x2j73ysnzw9qxd9fxpvnqiy2y0issmz6xmccgzac" } }, { @@ -66068,8 +66202,8 @@ "dash", "dash-functional" ], - "commit": "02f4482f1efe840f0e720ec9764c07e72e0e76c2", - "sha256": "0nf2nh1ghg2k21z087q4q75f56h9m7xsxg50r4gv9mbvd9xklcik" + "commit": "cf99a57ec95773a765e71b764abaff974d7fa278", + "sha256": "0ipqzbc3az4mayz49kc504kw0q3pcy6izbcdg8fmqrckgv79x54y" } }, { @@ -66080,15 +66214,15 @@ "repo": "akirak/org-starter", "unstable": { "version": [ - 20190720, - 1023 + 20190812, + 215 ], "deps": [ "org-starter", "swiper" ], - "commit": "02f4482f1efe840f0e720ec9764c07e72e0e76c2", - "sha256": "0nf2nh1ghg2k21z087q4q75f56h9m7xsxg50r4gv9mbvd9xklcik" + "commit": "cf99a57ec95773a765e71b764abaff974d7fa278", + "sha256": "0ipqzbc3az4mayz49kc504kw0q3pcy6izbcdg8fmqrckgv79x54y" } }, { @@ -66153,8 +66287,8 @@ "repo": "alphapapa/org-super-agenda", "unstable": { "version": [ - 20190724, - 308 + 20190809, + 1550 ], "deps": [ "dash", @@ -66162,8 +66296,8 @@ "org", "s" ], - "commit": "375bde4ca72494ac88a2a9738754f047fe45cc4e", - "sha256": "0hrwf02fqjm0d9gj146ax67ib76093qpqh7066dcxj2gy20625yj" + "commit": "4ad333643276ba1a604e8bec4a72ab68bafb8a94", + "sha256": "1rbivi5xjpbs4rbfldhrf0lw7q1nh99nlf8yi11kxf76z6d75vik" }, "stable": { "version": [ @@ -66585,11 +66719,11 @@ "repo": "flexibeast/org-vcard", "unstable": { "version": [ - 20170929, - 1110 + 20190810, + 124 ], - "commit": "dbe266b79df4fb31f1766010322bf4e383ce1c03", - "sha256": "1rcqcgxvjshbz3n1p376h618xapj03n6m7b3cxgv9gnryviyr6ax" + "commit": "df5e2d3bc0c3970e5fd553ee9d55878c4f9a163d", + "sha256": "0x862pqya2q4pg8448qlp5267x8ycqq1zmkbvcyrzanag3983d8v" }, "stable": { "version": [ @@ -66906,16 +67040,16 @@ "repo": "elpa-host/organize-imports-java", "unstable": { "version": [ - 20190517, - 426 + 20190807, + 1218 ], "deps": [ "cl-lib", "f", "s" ], - "commit": "e1604b86673476444593906f024f541371305b67", - "sha256": "024vr43znfb2r6ab64jmk4wzifbfyacxy9468gnq8scdg6pnz5vk" + "commit": "df209ce7f8055bd9fbd93e7a03b42f1705a1933d", + "sha256": "1fx05xn22zj5dgdyxrz0ifzxwfpf1s5gcszkjyhzfg1g2r8kmf0v" } }, { @@ -66933,8 +67067,8 @@ "cl-lib", "org" ], - "commit": "609e5e37348815ec3ba53ab6d643e38b0cc4fe17", - "sha256": "0kg5ns87p8v6vsb7abgqcfnzi55fbgi7b5dj98hrvnlkv4sqz7pc" + "commit": "3982f56efd67ec016389cad82ce5a44f619b36a9", + "sha256": "1vr00ql7izfxswrnbyzq0avlhqy3p0jyw16gnjhczqhg09iln6rw" }, "stable": { "version": [ @@ -67063,11 +67197,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20180731, - 2154 + 20190812, + 604 ], - "commit": "7e87e0fb0784be9370462614ec0ffc9d9ae6ef1c", - "sha256": "1yhs2v4s690cj1xgvbjx04d42fndd8lp6kry4w9vk24ibx9fzgcn" + "commit": "1a13f7f70357f369e16bfa3038a9fb760cbffb46", + "sha256": "11qygmgvjqc53gy5f3pz0hh5zsam1li8vbyr42wflfkv6cwxypdb" } }, { @@ -67527,10 +67661,10 @@ }, { "ename": "ov", - "commit": "18d8a10ba3018cb61924af3a1682b82f543f2d98", - "sha256": "0d71mpv74cfxcnwixbrl90nr22cw4kv5sdgpny5wycvh6cgmd6qb", + "commit": "7a4e84530b4607a277fc3b678fe7b34b1c5e3b4f", + "sha256": "0brwf4xng72ybdjz253r3bld5crbi76y341rnhz4l9jg26k2b3hx", "fetcher": "github", - "repo": "ShingoFukuyama/ov.el", + "repo": "emacsorphanage/ov", "unstable": { "version": [ 20150312, @@ -67614,14 +67748,14 @@ "repo": "anticomputer/ovpn-mode", "unstable": { "version": [ - 20190615, - 48 + 20190811, + 2200 ], "deps": [ "cl-lib" ], - "commit": "c424e269bd1132182bc26d371ed0dcf818b41262", - "sha256": "0gxk20cwdyhllzkdfz3cylb8mddyrhrdpscx2ydi5phvgjknf939" + "commit": "dce04d9f35fd203afd098ba413595db6c2cbc051", + "sha256": "0ix53rlwzi1mh35msh6gahfnip67p53jc3qxkbaxji7hlxi130fb" } }, { @@ -67817,14 +67951,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20190729, - 2221 + 20190802, + 1755 ], "deps": [ "org" ], - "commit": "301e072ddd93f09c3310f6da97e8e2e7f7145d8e", - "sha256": "1isk5yjrassllh16nr2f8nyn2x4craw3fv4hjqpaa6z6dycs71wc" + "commit": "470a708152c4a17eca80c49e042d4eeb57645539", + "sha256": "0dv068ghbci85y88zcqp6w4qkc8xpgwayh1van05r1k6krms8jms" }, "stable": { "version": [ @@ -67923,6 +68057,38 @@ "sha256": "04zz6359xkn4w7jmmadxyvjd8pw21gw12mqwch1l9yxc4m9q474l" } }, + { + "ename": "ox-json", + "commit": "c648b95620bc7194e18f37fc7bb526e5578d883a", + "sha256": "0v0hn0fd6jx2009na1y18bnah7qvmng9riidng0kglkx208a04ay", + "fetcher": "github", + "repo": "jlumpe/ox-json", + "unstable": { + "version": [ + 20190802, + 350 + ], + "deps": [ + "org", + "s" + ], + "commit": "ce99a8a7cb2e2a483d23ebc2f821f3a183cf4b50", + "sha256": "0lgcrd4ckjfph4h0ias6cr83bnj903xiyak6pcvskp3wfgwg09wa" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "org", + "s" + ], + "commit": "aba3face2786d53380ee29459c04d16c999e72ac", + "sha256": "1y1l7in0fxlyrbd6fz4ixydc6kihfx42n7yh5glpjxahhbzqg9b3" + } + }, { "ename": "ox-latex-subfigure", "commit": "cf83b7597bd6a23b82b88b0927424c9aeb49a03d", @@ -68096,14 +68262,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20190728, - 1601 + 20190810, + 1655 ], "deps": [ "org" ], - "commit": "dfcf21fe4526728a3971ee27966079837db77c8d", - "sha256": "1kz3d3n94dmy2micxmwsahnsky5kbb8aicxzq05s8c181207va7n" + "commit": "4abd898da3b24530a80336327ec29d3ae6ad4ec9", + "sha256": "0ik5r99hv407yalvdwba62rppaf9g0r9qzyp4iz0i3n1mhcnv0h1" } }, { @@ -68132,14 +68298,14 @@ "repo": "msnoigrs/ox-rst", "unstable": { "version": [ - 20180315, - 13 + 20190813, + 427 ], "deps": [ "org" ], - "commit": "a74b60883b0d844c80efb364dac1560b85f2548f", - "sha256": "0smgz2q7bjj2svx1gdr187m58yxq1hs878bciz9h6jcp03a9sb61" + "commit": "25ea7a8a7ff1f57a9cd4f65b53899da3487bad8a", + "sha256": "0b7ybvpj1m48s2zdqk3xjyyzqxa9hjcaz29pgbsd9zg8q9mrnmas" } }, { @@ -68480,14 +68646,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20190727, - 1248 + 20190805, + 1628 ], "deps": [ "cl-lib" ], - "commit": "1db490a6a6a95087a56ec4c26bc482343e8e937c", - "sha256": "0kqi6h71nhj0aczzgsvsprakmhnc5y19051y866fgcsffw5gyc7s" + "commit": "64a6ac2343c791092ec2e43bab0c91293509c230", + "sha256": "0ac6kq9k6n3mznl0x5sgpalfa3v4cx9m0b7jc3s89dnyw6m4wp6h" }, "stable": { "version": [ @@ -68524,14 +68690,14 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20190707, - 1456 + 20190807, + 1837 ], "deps": [ "cl-lib" ], - "commit": "4a3ea9abda3ddfbd535a8eee7dbb776f9ccb5c27", - "sha256": "024ic4qcp2nfl8z8ff3742zk2rc7zjl3nrfg1r2mbakf0aa00dvm" + "commit": "c5ba20dead0df743a699f502f5d034d03b367f65", + "sha256": "0pshjm6swgm6pfpx8ri8zfixazc7bjhdvy7md905lf8a8byr7zk2" }, "stable": { "version": [ @@ -68559,8 +68725,8 @@ "deps": [ "package-lint" ], - "commit": "4a3ea9abda3ddfbd535a8eee7dbb776f9ccb5c27", - "sha256": "024ic4qcp2nfl8z8ff3742zk2rc7zjl3nrfg1r2mbakf0aa00dvm" + "commit": "c5ba20dead0df743a699f502f5d034d03b367f65", + "sha256": "0pshjm6swgm6pfpx8ri8zfixazc7bjhdvy7md905lf8a8byr7zk2" }, "stable": { "version": [ @@ -69507,16 +69673,16 @@ "repo": "zx2c4/password-store", "unstable": { "version": [ - 20190611, - 418 + 20190804, + 2004 ], "deps": [ "f", "s", "with-editor" ], - "commit": "c22cdbd4674a25dec71fe42ec1ef0b4829b6c7f3", - "sha256": "0czs41vz0ggl46qp87x3dwi6b84znyl0n1wczbin33x37ds5hbh5" + "commit": "e93e03705fb5b81f3af85f04c07ad0ee2190b6aa", + "sha256": "0sxwz6awr60xh27q3ng90mmgjs9dpcjkags9dyvr3kc45dmdb931" }, "stable": { "version": [ @@ -70925,14 +71091,14 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20190801, - 1149 + 20190812, + 1711 ], "deps": [ "cl-lib" ], - "commit": "3801694b299e99e753173d0dfabed8d9485a9a29", - "sha256": "1vlvz6lais1aryb17s6m3qj9algm672kr2si86qmbs3szbzc9qqv" + "commit": "6969d273992fd49c730fcc3170f17771a272b67c", + "sha256": "0p1bqabzlxp56vgvz42salqfjv7h3ffmnjv76wbzpx1jx5hx8yqd" }, "stable": { "version": [ @@ -71023,8 +71189,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20190724, - 102 + 20190812, + 1454 ], "deps": [ "cl-lib", @@ -71032,8 +71198,8 @@ "f", "php-runtime" ], - "commit": "fcdbae4b12735d6d1595f76275e5a6a589a20c7a", - "sha256": "1kx9pk6a4kc3x58qfv35fvh9hkp2xgw2yxj98n065xr82yzzd6m1" + "commit": "01ced487c673e027332ecb99c444f819b05ab40b", + "sha256": "0ish3kvzn1j1arg6n1mglzsb46sc7hr7gqgnw2084kj56y5q6rjp" }, "stable": { "version": [ @@ -71212,11 +71378,11 @@ "repo": "flexibeast/picolisp-mode", "unstable": { "version": [ - 20190801, - 1116 + 20190811, + 1431 ], - "commit": "c1f25707cb56b50c678b367bc9f452303fb4e68f", - "sha256": "060ldl4kx787bas8f0l28j744f60is4faqlxmyxjd67jiaw4phrh" + "commit": "bf358e5e75adb7cfa1b7cde24209428a88d86b56", + "sha256": "15zb3g6b3n9242p10frzcyxa9gasnbmdjplsvjibzhxrrnhapans" } }, { @@ -71659,9 +71825,9 @@ }, { "ename": "plain-theme", - "commit": "b147fb05a1b4296e1b85d31ba018d132a5bb5ed2", - "sha256": "10qq7cy6hqh6c8qi796y9lk4wyyjbhdn1pvkcw3g29cfh857x50m", - "fetcher": "gitlab", + "commit": "d4bd77883375b229e344384e42c3603ca096891c", + "sha256": "0igncivhnzzirglmz451czx69cwshjkigqvqddj0a77b1cwszfw8", + "fetcher": "github", "repo": "yegortimoshenko/plain-theme", "unstable": { "version": [ @@ -71717,23 +71883,26 @@ "repo": "skuro/plantuml-mode", "unstable": { "version": [ - 20190531, - 853 + 20190812, + 1540 ], "deps": [ "dash" ], - "commit": "e9c8e76ff25013e05ab83de9462bbcdd74e27237", - "sha256": "0y7qfn283m40r3b8gbigwli9jha5afxizqhdil91pg5z9nfgq4r7" + "commit": "1e5f8beedd940458d043832c7d972dbfe492155e", + "sha256": "1pf9jpsbxqxd90y3md1h1fyd2v9swhf10kkknfln102k6chyy1jx" }, "stable": { "version": [ 1, - 2, - 10 + 3, + 1 ], - "commit": "92c490d3fc07b4cfa8c5263c15a4bbc16d10da9e", - "sha256": "1xmhgc49jyxj7wwlzhpjrdh4nynxjf3dlwg77hgzdracgldq8sra" + "deps": [ + "dash" + ], + "commit": "648feb5b12372bbf8ea37544c44ffcde0aceba69", + "sha256": "0xpnd9r2d2pb6dj3sj1b0bvhg6rm1m6y1ksvngc9yfpynrxgrxwv" } }, { @@ -73061,11 +73230,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20190608, - 2318 + 20190805, + 956 ], - "commit": "fc90a1a558200e5c3688c65add9afdea695a2c10", - "sha256": "1fhjxj7gi2pj5rdnmf0gddiwd8iifgjgjp01c01npz1gwwixyqh3" + "commit": "bfd2e55219e0911980f4ea97b5995ce8553dce60", + "sha256": "19vvhx9x6646va4s4yy77inll9d2mhipakvz4pyz4pjw8pjcd94x" }, "stable": { "version": [ @@ -73522,6 +73691,36 @@ "sha256": "0nly5h0d6w8dc08ifb2fiqcn4cqcn9crkh2wn0jzlz4zd2x75qrb" } }, + { + "ename": "proced-narrow", + "commit": "7e1bb8de59729a6690f8423b5531380c8293bf0b", + "sha256": "1sqxp9jdhh8iy9pvgz0s9jm6p93ib12gn2gpkasxbx93b1jkdlbc", + "fetcher": "github", + "repo": "travisjeffery/proced-narrow", + "unstable": { + "version": [ + 20190810, + 420 + ], + "deps": [ + "seq" + ], + "commit": "df5cce50b3d1219b23d28e23cbf68e0c7807a15c", + "sha256": "00b2g7prijad6q2zw0vhwq1xb49kcc8ym116zfj5r8wxz9cmpzpr" + }, + "stable": { + "version": [ + 1, + 0, + 5 + ], + "deps": [ + "seq" + ], + "commit": "df5cce50b3d1219b23d28e23cbf68e0c7807a15c", + "sha256": "00b2g7prijad6q2zw0vhwq1xb49kcc8ym116zfj5r8wxz9cmpzpr" + } + }, { "ename": "processing-mode", "commit": "ba59561e8a2f259fde170a79844af5e1ef5ed34f", @@ -74042,15 +74241,15 @@ "repo": "anshulverma/projectile-speedbar", "unstable": { "version": [ - 20170517, - 243 + 20190807, + 2010 ], "deps": [ "projectile", "sr-speedbar" ], - "commit": "dcab13db72c2084edbebe808e35f1126fe0b3bcd", - "sha256": "106a4y5r1adjpbnjn734s7d910r6akhjlyjpd6bnczjhp357wyc7" + "commit": "93320e467ee78772065e599a5dba94889a77db22", + "sha256": "1byk8ylm6c922jsaa8lg8wk17qjnhh7p26lp2h0nbl7qdz928ss8" } }, { @@ -74322,11 +74521,11 @@ "repo": "ksjogo/proportional", "unstable": { "version": [ - 20171025, - 2337 + 20190806, + 1901 ], - "commit": "f671ffe8fd803e2fc462e2e1844aeeab1a13918e", - "sha256": "02sbrcb9c27djk64xv41vii6pbw83b6iljrd66w4ad9hgz2pkxzk" + "commit": "f600b7ed2ab19a3072adad3f47048a5bbdb82703", + "sha256": "03vyyi5n5rq2hcd5yz7yirsnrgs6cin2y8xhly5skqsv60zs15p1" } }, { @@ -74358,17 +74557,17 @@ 20170526, 1650 ], - "commit": "d1eeb852fcbe46b29a3bc47001e997d79358d9f8", - "sha256": "11k3vbn0nh7c3kqravcd0kv872kplbdbm4ah323gpizgibkp9f41" + "commit": "c132a4aa165d8ce2b65af62d4bde4a7ce08d07c3", + "sha256": "06cqi10q6w07pshmfkzd40k40rm5slgsrbb6n0jdskhbw97wqk6h" }, "stable": { "version": [ 3, 9, - 0 + 1 ], - "commit": "6a59a2ad1f61d9696092f79b6d74368b4d7970a3", - "sha256": "1xq2njqrbmizwg91ggi1lqr0n26cm2jdyk668ljc24ihrpk0z9bw" + "commit": "655310ca192a6e3a050e0ca0b7084a2968072260", + "sha256": "0vv85xb65dx6fa76fsnyps13kaamvwfzd8hr6ii1payr73x4zy2h" } }, { @@ -74482,15 +74681,15 @@ "repo": "thierryvolpiatto/psession", "unstable": { "version": [ - 20190502, - 1838 + 20190808, + 1626 ], "deps": [ "async", "cl-lib" ], - "commit": "2557ca67a7a81f5270fb98a0b0a92838d09343b8", - "sha256": "0wspxsis3p2zm1f0wfxmi4dpyswcip6jzx2jcan7j2mqiwld6l33" + "commit": "3e97267c92b164584e06a6c70ee7491714c7c12c", + "sha256": "15frl618393bc891d0yi3mdxzvbq790a86vfvp3dyd5riz4ddg95" }, "stable": { "version": [ @@ -75180,16 +75379,16 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20190731, - 452 + 20190812, + 222 ], "deps": [ "async", "popup", "pyim-basedict" ], - "commit": "c9941c91bb3aace2f151d120e55398061f12b8bb", - "sha256": "17ckfx4p1pm6axzaf9a0csplmpiicb7fbgb4c1kycjhvw20adkj7" + "commit": "d096fc941f3844825415e2d3a3a627babe003428", + "sha256": "10i54v0v8x8ljh5h06cw3zljfi1g8bdkiprainn59ik8mc8rhhlw" }, "stable": { "version": [ @@ -75334,8 +75533,8 @@ 20170402, 1255 ], - "commit": "41c95225fe398dd3f62f48d777080dc8827b145c", - "sha256": "17zlid67j7hgk1wbqxva19rj11kix84rxpc6ms208hc24ca0ws0c" + "commit": "a6b1e810df608430b04b65ad1ddc9ba1b8a22c89", + "sha256": "06cv6mah6wjbbwi196vn3fncf4drrhhr3gn1jndf2s14j98zpkh4" } }, { @@ -76131,14 +76330,14 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20190725, - 1732 + 20190803, + 1820 ], "deps": [ "faceup" ], - "commit": "ebf3009415d1ff19d51eee5ba4e78f1d5e63dea2", - "sha256": "1g8kjxpp049mn4wryv77v3rfa46b4k3bwm1jrk9kvjx333y1r0pc" + "commit": "5300aa004f08535c3fac99f1af78462f129aca81", + "sha256": "1gkpm4fl1ybsm9qqgrkwyjbd9znddy438x266k27fs90lkxrfray" } }, { @@ -76693,10 +76892,10 @@ }, { "ename": "readability", - "commit": "eed9bcb1aa238746c9a9f6ecba9dd61b83d8b612", - "sha256": "0kg91ma9k3p5ps467jjz2lw13rv1l8ivwc3zpg6c1rl474ds0qqv", + "commit": "7a4e84530b4607a277fc3b678fe7b34b1c5e3b4f", + "sha256": "06kykmf1yrk4jiazahk7qqf1ds34ppg9zbj9my5l52j3gjr7v9zq", "fetcher": "github", - "repo": "ShingoFukuyama/emacs-readability", + "repo": "emacsorphanage/readability", "unstable": { "version": [ 20140716, @@ -77387,8 +77586,8 @@ 20181121, 21 ], - "commit": "692892d634056c926525c4c97efc041c19e05810", - "sha256": "148vhl7hfc3yjzdnask1cvsqmw0lpaz776zx3v9alzv47xhfzf4n" + "commit": "5069c89fb0cd8fc1936ac8aa1e5dd6f4c1691db4", + "sha256": "00l3zraignzlz5vmn7cqjizin8h0gbgvpyd3jbl5vza4r9bp1l2j" } }, { @@ -77526,11 +77725,11 @@ "repo": "alvarogonzalezsotillo/region-occurrences-highlighter", "unstable": { "version": [ - 20190617, - 901 + 20190804, + 1931 ], - "commit": "b3e2eb48e342791aca6c9586ad2fe44540df0463", - "sha256": "0j73vlj1576jjhjac79b3p9cdwg75gj142is3ak28vs04frzi1x8" + "commit": "3e08d7bc123d6fbb84f7f8a5a6fc28aae4ec8c19", + "sha256": "0cwi5b89l7f21xq5cfms96vshz7swz0m2kjd5f71206f38rlcir3" } }, { @@ -78592,20 +78791,20 @@ "repo": "emacs-php/robots-txt-mode", "unstable": { "version": [ - 20180919, - 1541 + 20190812, + 1858 ], - "commit": "f8fc7ee50a3d5d7a2838772ed298fb69b9051c5c", - "sha256": "11qyzsfp2kmi6sd24m30y537mic9xg7y29npninrjihr6k9rw3a2" + "commit": "8bf67285a25a6756607354d184e36583f2847e7d", + "sha256": "07255pn80w4742sz2h9vbmfxxd8ps2kcn73p7m2bgy02kgbzw42b" }, "stable": { "version": [ 0, 0, - 3 + 9 ], - "commit": "431efda01e08426d671d51fcf1f98cfbc87f8c16", - "sha256": "1mpg62ai721aasd1lm5xwcygpkyh9kp4x5zvmd62agmp3i8s78gc" + "commit": "8bf67285a25a6756607354d184e36583f2847e7d", + "sha256": "07255pn80w4742sz2h9vbmfxxd8ps2kcn73p7m2bgy02kgbzw42b" } }, { @@ -79781,8 +79980,8 @@ 20190413, 1246 ], - "commit": "e34d129d5eb3e3e3eec76c78644d7f5e4f880700", - "sha256": "1xpicrjap52ysps5qw4m46kvfwqxn5yizgg7wxhd94j1ldwy5afp" + "commit": "fc91c81ffafe07691cec7466399b18f267964328", + "sha256": "0i7jrxdfxin6aaz1v578vy50j0g5l3j9yj2pgn5dw5v04xk42822" } }, { @@ -79876,25 +80075,6 @@ "sha256": "1by7ky8za6idam4m4xgmf0f5ss0cacd7wv53glhmjb4nslxhgl7d" } }, - { - "ename": "scheme-here", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "17r77b99nh03v79r97fzr3pyvigp4w8gr41k6zzj82xka2swhr2h", - "fetcher": "github", - "repo": "kaihaosw/scheme-here", - "unstable": { - "version": [ - 20141028, - 718 - ], - "commit": "430ba017cc530865218de23a8f7985095a58343f", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'system-features'\nerror: unable to download 'https://github.com/kaihaosw/scheme-here/archive/430ba017cc530865218de23a8f7985095a58343f.tar.gz': HTTP error 404 (curl error: No error)\n" - ] - } - }, { "ename": "schrute", "commit": "505fc4d26049d4e2973a54b24117ccaf4f2fb7e7", @@ -79919,6 +80099,21 @@ "sha256": "0l1k6wjjr569lk5k8ydwq13041kn889g20qbzf79qj1ws96rim4m" } }, + { + "ename": "scihub", + "commit": "93a89f2c198c29fa1b62839f51610eb881d1d0ed", + "sha256": "12m2yiwr1hkzwjykm400x549yzkrkqmypfip5xsarawnb87g9czy", + "fetcher": "github", + "repo": "emacs-pe/scihub.el", + "unstable": { + "version": [ + 20190801, + 920 + ], + "commit": "a32e8f47961d606c1315a972f2dab4d3a61945af", + "sha256": "06qcs7jq68ylmvw0kf1myhpgzci7i9qbb2h0hxh0g21mz8ssna3f" + } + }, { "ename": "scion", "commit": "faf180d15c3847fc6f832866338494dd99b6654d", @@ -79972,24 +80167,6 @@ "sha256": "0vbcghgapwdf3jgjnjdla17dhf5mkmwapz4a8fmlr7sw1wqvj857" } }, - { - "ename": "scp", - "commit": "62f5c9284de51373a4015cf053d66977cf00d175", - "sha256": "1q7v2cr89syw682zqxhavaggv6aqi69rl94vm8bmn745a868gliw", - "fetcher": "github", - "repo": "tszg/emacs-scp", - "unstable": { - "version": [ - 20171204, - 251 - ], - "deps": [ - "cl-lib" - ], - "commit": "447305db246d9c9240678dd9c734ed920300463a", - "sha256": "0f8dv17rjknlkw32dd4xmdxbkwby5dn8mychaqwlk8vanhm74n7w" - } - }, { "ename": "scpaste", "commit": "9007fb32097bc63731c3615dae9342fcef2558a2", @@ -81325,11 +81502,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20190731, - 733 + 20190808, + 238 ], - "commit": "216aed66e2d5517365da9c16b2d1d2aa9876c871", - "sha256": "0bkdv31di311nrlk0lqrz055n8mnwnrbjs79bq7p9qd37k5nbjs0" + "commit": "8fd65dd9c7d2393ab66c65ee1de67a84dcc779ce", + "sha256": "1yqbw8ikfrwya59xa0a17f2wwgswkdqcxj9y64fb00syps09fv0m" } }, { @@ -81491,16 +81668,16 @@ "repo": "bennya/shrink-path.el", "unstable": { "version": [ - 20170813, - 247 + 20190208, + 1335 ], "deps": [ "dash", "f", "s" ], - "commit": "9d06c453d1537df46a4b703a29213cc7f7857aa0", - "sha256": "021bpgpzysag1s11m9pyq2bk6a0mf9ayx10yxhf5cw56x3d0jj1b" + "commit": "c14882c8599aec79a6e8ef2d06454254bb3e1e41", + "sha256": "1xnby24gpxij1z03wvx89s459jw0f8bwhgi80xvdq8gxhbbz2w7a" }, "stable": { "version": [ @@ -82197,8 +82374,8 @@ "repo": "yuya373/emacs-slack", "unstable": { "version": [ - 20190710, - 749 + 20190803, + 1406 ], "deps": [ "alert", @@ -82208,8 +82385,8 @@ "request", "websocket" ], - "commit": "df605f45f15f9e78c5e622827a5e31475859983b", - "sha256": "0gpisd3mkdwbj0xg8f3r99v4z51z20nglfkfh80g6p0wf934l69r" + "commit": "ea89ac4291532a136d02bb8852b5dc641622ab73", + "sha256": "0gnmhlv3gzv5n8ydbg84n9m6i9d0akcvn032ipsyss6bqw1vzl1m" } }, { @@ -82518,14 +82695,14 @@ "repo": "mmgeorge/sly-asdf", "unstable": { "version": [ - 20190619, - 806 + 20190807, + 553 ], "deps": [ "sly" ], - "commit": "7fe3fedc110c2622ffc8d6517a38b03fb774a997", - "sha256": "1vyvvqcxccwg2ar9jl41zwg12a7iz42mv8bycy07nawwcbyq2l7q" + "commit": "c387ba34a75b172e8a75747220c416462ae9de31", + "sha256": "1cr6p11vsplb6afh2avwb585q606npp692gb5vqs377nni5vx7km" } }, { @@ -83595,15 +83772,15 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20190716, - 634 + 20190809, + 1202 ], "deps": [ "cl-lib", "dash" ], - "commit": "6d11d3e45e2def5ce5efb45541f9096b9e264f9a", - "sha256": "0gv202102p998mp1yj9dlhqvv5zqhnl51gfagy2wdmyslbkj1bfi" + "commit": "55cd77b61b6968048c61e13358ba487d217f24c0", + "sha256": "15ql8xcixgm7mbs7rsbybwszanqibq057j5b5ds89a31dw7zxf1g" }, "stable": { "version": [ @@ -84915,8 +85092,8 @@ 20190610, 1256 ], - "commit": "e2db9c7dee6fd755d4667a74461639d7257f2948", - "sha256": "0fjl0rba79nzir2h9ifclwhbnpsl6dkw3xhcs0ff50xpjnq5n95p" + "commit": "e1507feccf581160daece98b436dfac63020bb68", + "sha256": "1bbs2k65fggab61pgl8p5jgg8jxsggqkfcs55k6kg4s78gj2rqma" }, "stable": { "version": [ @@ -84973,11 +85150,11 @@ "repo": "stan-dev/stan-mode", "unstable": { "version": [ - 20180110, - 2241 + 20190805, + 1427 ], - "commit": "a8e88473ef996b455523dc3fbcf2d8520659652f", - "sha256": "13qw6n26jpr208h2366pcfv10d11880wlfzr0kiadrsg219wjgsi" + "commit": "e60fe0caecb8e84d0b8fc160a0cdf8343e33d905", + "sha256": "16wl8r1409v3cjfb91fkv42gf9cbzgcd1cvqpypj3jm3hdmlz9gz" }, "stable": { "version": [ @@ -84997,15 +85174,15 @@ "repo": "stan-dev/stan-mode", "unstable": { "version": [ - 20161024, - 258 + 20190805, + 1427 ], "deps": [ "stan-mode", "yasnippet" ], - "commit": "a8e88473ef996b455523dc3fbcf2d8520659652f", - "sha256": "13qw6n26jpr208h2366pcfv10d11880wlfzr0kiadrsg219wjgsi" + "commit": "e60fe0caecb8e84d0b8fc160a0cdf8343e33d905", + "sha256": "16wl8r1409v3cjfb91fkv42gf9cbzgcd1cvqpypj3jm3hdmlz9gz" }, "stable": { "version": [ @@ -85789,11 +85966,11 @@ "repo": "bbatsov/super-save", "unstable": { "version": [ - 20180929, - 727 + 20190806, + 915 ], - "commit": "2a905b8bdfc93bee16e2d62a61c6211bbe009331", - "sha256": "066fyg4r4pksyandpd7s53hagpvm2rw90q5ks4jlpgy7x00hw09l" + "commit": "279aa8e0103d6bd367619b7f57f9d60d7a3c5cfd", + "sha256": "14x3w6czyrw48bw7cfkdyv51jksf67nznv9wyp0hb4hrjdxaq1aq" }, "stable": { "version": [ @@ -86093,8 +86270,8 @@ "deps": [ "ivy" ], - "commit": "4389a261b30c8fbfc6e31228b33b1764221daac7", - "sha256": "153a9nn0m6q5a4psw2vvnmqixkny56dlbrfvvw45zc9ikdd1wv2b" + "commit": "20d604c139b82d98010aabbbc00ad487438bdf8e", + "sha256": "0clg04az8v5ia3z5fxcimprqp4kbf2g1z6na3js60gmi689ks8ll" }, "stable": { "version": [ @@ -86191,10 +86368,10 @@ }, { "ename": "swoop", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0zcxasc0bpldvlp6032f9v1s4vm9r76pzd7sjgwa9dxbajw5h7fs", + "commit": "7a4e84530b4607a277fc3b678fe7b34b1c5e3b4f", + "sha256": "1hbldd9cqh3vfa3h7idf0rjjnib7ih44l1p4hzc8p36q5fqbh0xp", "fetcher": "github", - "repo": "ShingoFukuyama/emacs-swoop", + "repo": "emacsorphanage/swoop", "unstable": { "version": [ 20160120, @@ -86325,8 +86502,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20190729, - 2303 + 20190809, + 443 ], "deps": [ "cider", @@ -86343,14 +86520,14 @@ "slime", "smartparens" ], - "commit": "1fd0b833948e21de40732f7f11536c34518e0411", - "sha256": "0nw5d7dzkxfs4512k9hzangfayl7qgjhy2v8afgnixbvl2akxgbs" + "commit": "163d54eb483a9986587c586cabfcaa15210a2b5d", + "sha256": "1y8va209v32f6rd7f420aqyh8fs9srxyc9hinb9q6i1bs92vkry9" }, "stable": { "version": [ 0, - 1, - 2 + 3, + 0 ], "deps": [ "cider", @@ -86367,8 +86544,8 @@ "slime", "smartparens" ], - "commit": "b139ace5e95a976b55791291170b61c887a92c03", - "sha256": "08nf3p2q4xk1vpgw76a4z8agf7d66vxmhfv7234cyk4vly8n5z20" + "commit": "88d09bdae222ae4ad0e40fbb1a724d63d06af214", + "sha256": "0nd96apnmdi4iv4pcai1bp9s5zrq5nsqqq1k5kdjbpiybhjdzk98" } }, { @@ -86962,11 +87139,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20190516, - 1512 + 20190805, + 1153 ], - "commit": "7004ef65eea954742054f0f68109004828fd6fd8", - "sha256": "003bv5932902bpmgv79m2hamwla1sw95ymap10xpxmv42ldyka52" + "commit": "3f5b0981a87f1c4895961f36e0a67b69ccbbb18d", + "sha256": "194m2rm1yv7jp6nb7mm3m4hyhj81i379ky7ifaisrvc1jm3dwp6n" }, "stable": { "version": [ @@ -87059,8 +87236,8 @@ 20181109, 428 ], - "commit": "5496f8dee27c4d925977da3cca6fcacf9b45bc58", - "sha256": "1clf56sxvrky05qzk5kri01r0jz4zfwysxzs3iix0aljrz8mdi8w" + "commit": "cb3403fb134dc62d8a48253027891785849cff31", + "sha256": "14q01mar66x3bv0ghfws0pv3qrpg9szgzb99ql3qfhbnkw0m859d" } }, { @@ -87143,14 +87320,14 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20190730, - 1750 + 20190812, + 2131 ], "deps": [ "visual-fill-column" ], - "commit": "501d11e8ae7e5499c6234787affeb67e9dddbbf9", - "sha256": "0cf1amcw57a6hwaif11h299jiyjdyfpsdx4qy6w1g1n5hhy8bfbv" + "commit": "5444e2a02374c245769417148ccf2dad0a0c633a", + "sha256": "0byddvnkyabcxy64f2w64sqcki4zfxjwkvzvkrcan46san6hsn87" }, "stable": { "version": [ @@ -88138,8 +88315,8 @@ 20180905, 1050 ], - "commit": "fabeafc20c1fed96030123362e2e09eb542bb682", - "sha256": "06virfzf71wj8ayd4kkcgy5rwf1ilq59kpgph1q2j8s33p1vhzvq" + "commit": "01ea3cb8cee36e31a0ab8015426b57eb4ce29cdc", + "sha256": "0mfgr1303lpfa0nzh4lbxpiiijwv41bh3r631hjj9cpz8jkwicc7" }, "stable": { "version": [ @@ -88685,8 +88862,8 @@ "deps": [ "cl-lib" ], - "commit": "d52853e93b40fc54ffd4552df9b8c07ad5446013", - "sha256": "0jdy1lqg3s01dxlpigqm0ss4kid2kzrhhyqm15rlj9s0ghdrbnby" + "commit": "ef0c6b84d92eecd05aa5cd4a35b73652f21b311a", + "sha256": "0wh0fwl2mimb48g2sf2nhmr3xxwvgkgr3566187x3kw8zxgh1nv7" } }, { @@ -89071,14 +89248,14 @@ "repo": "magit/transient", "unstable": { "version": [ - 20190630, - 1359 + 20190812, + 1336 ], "deps": [ "dash" ], - "commit": "01a166fcb8bbd9918ba741e9b5428a4b524eab33", - "sha256": "0wnp1wq9k67dghdlkpa2l302p7vdz2grw0nmw53c33f8mczxgf7b" + "commit": "9fb3f797f10fd069c2bffa7a3ead746aa53d1a25", + "sha256": "1xyj9ncqz0mrdgn6wg252p8kv2k9h391ni0bvkw8dqwz7xwgfl3g" }, "stable": { "version": [ @@ -89213,8 +89390,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20190801, - 1501 + 20190812, + 546 ], "deps": [ "ace-window", @@ -89226,8 +89403,8 @@ "pfuture", "s" ], - "commit": "b8692a6a72a41d93b637ba58354ac195aca2cb08", - "sha256": "1qwfvxjz9cvnmbz7v9kljlwh5yyi30m8i6g2lwp72i1ngs0srfvg" + "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936", + "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk" }, "stable": { "version": [ @@ -89263,8 +89440,8 @@ "evil", "treemacs" ], - "commit": "b8692a6a72a41d93b637ba58354ac195aca2cb08", - "sha256": "1qwfvxjz9cvnmbz7v9kljlwh5yyi30m8i6g2lwp72i1ngs0srfvg" + "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936", + "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk" }, "stable": { "version": [ @@ -89294,8 +89471,8 @@ "cl-lib", "treemacs" ], - "commit": "b8692a6a72a41d93b637ba58354ac195aca2cb08", - "sha256": "1qwfvxjz9cvnmbz7v9kljlwh5yyi30m8i6g2lwp72i1ngs0srfvg" + "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936", + "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk" }, "stable": { "version": [ @@ -89326,8 +89503,8 @@ "pfuture", "treemacs" ], - "commit": "b8692a6a72a41d93b637ba58354ac195aca2cb08", - "sha256": "1qwfvxjz9cvnmbz7v9kljlwh5yyi30m8i6g2lwp72i1ngs0srfvg" + "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936", + "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk" }, "stable": { "version": [ @@ -89358,8 +89535,8 @@ "projectile", "treemacs" ], - "commit": "b8692a6a72a41d93b637ba58354ac195aca2cb08", - "sha256": "1qwfvxjz9cvnmbz7v9kljlwh5yyi30m8i6g2lwp72i1ngs0srfvg" + "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936", + "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk" }, "stable": { "version": [ @@ -89520,6 +89697,37 @@ "sha256": "1fvpi02c6awyrwg2yqjapvcv4132qvmvd9bkbwpjmndxpicsann3" } }, + { + "ename": "ts", + "commit": "d8b0b0b20e2812a0ced3d38c07b466b3d200699d", + "sha256": "1pk2x9hjr57ph51w91zss46q8xrca34mgr6n5pbii5w8j1rgyd60", + "fetcher": "github", + "repo": "alphapapa/ts.el", + "unstable": { + "version": [ + 20190812, + 1655 + ], + "deps": [ + "dash", + "s" + ], + "commit": "31bd5a86aa35f7b8143170892ffaf6425284f3fd", + "sha256": "004z24vxk7xrc9in7q8rpaif79sw219zh86hj2fyczv2jixl6i9r" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "dash", + "s" + ], + "commit": "abf67b63ca562cb2304dfe445f67ed6c6f7c3c05", + "sha256": "1i93dfm6lw63q1r2fnk5yn95pifvpkfy654yg8mfczss1mz00q35" + } + }, { "ename": "ts-comint", "commit": "4a1c08c22704ac689235b8d5cc36cc437ba7356a", @@ -89602,14 +89810,14 @@ "repo": "ocaml/tuareg", "unstable": { "version": [ - 20190709, - 2158 + 20190805, + 958 ], "deps": [ "caml" ], - "commit": "c83f22780310415d885470766d38b0f9d6f55767", - "sha256": "16nnadl7037hglrrr3prak0sx20f4611xcks0hd2hgg2c3my5ig8" + "commit": "74e7f66f31290f6599fda0067d795e201270be43", + "sha256": "1fgaa3kq3aj6ddkkbag8bcqq67y8xq51cmsp2cvmzsx5lfwv0y3p" }, "stable": { "version": [ @@ -90924,17 +91132,17 @@ 20190715, 1836 ], - "commit": "9da0951274af3fcadfd7b40fc582ab00539c5884", - "sha256": "18skj7zqg84wvhwd5fsl0bn7v8l0w4ashr8rx45rvddqmgf1h36g" + "commit": "2405c8dd8f1cb995baeffb90324dc9c0e1966edc", + "sha256": "1jm3sagissbw8012mnppknsxl9dqd9514b891b64disqhdb5awg3" }, "stable": { "version": [ 2, 4, - 0 + 1 ], - "commit": "1fa416862f4bf95ded4ce3bc01a5ebdb9842ce56", - "sha256": "0sklms0crkmknlgjw2lrqbyslvfjg5mrc8cnz2ar98css4509qph" + "commit": "2405c8dd8f1cb995baeffb90324dc9c0e1966edc", + "sha256": "1jm3sagissbw8012mnppknsxl9dqd9514b891b64disqhdb5awg3" } }, { @@ -91607,29 +91815,29 @@ "repo": "csantosb/vhdl-tools", "unstable": { "version": [ - 20190730, - 752 + 20190809, + 922 ], "deps": [ "ggtags", "helm-rg", "outshine" ], - "commit": "d0cdafadf2fdc5ae96e6d57628e98106a38afeb9", - "sha256": "1ljda898xg8dvmka9z8am3fwfwn8i87kzdd8j6g8kchisjx1abjn" + "commit": "5202db4c6a511a90a950a723293d11d55ec05264", + "sha256": "1ygx8g9cxyyhhpcqan1ca4g741s3dd141bcmp6jjqbjfn2gqraz6" }, "stable": { "version": [ 6, - 1 + 2 ], "deps": [ "ggtags", "helm-rg", "outshine" ], - "commit": "cf8de6a3160532e2ce0018ecd52f2aefd0199a65", - "sha256": "11hzd6hrxcm9ip2gz8jkay4g53l3yvgwkl212wrd6a8sad34rb1p" + "commit": "5202db4c6a511a90a950a723293d11d55ec05264", + "sha256": "1ygx8g9cxyyhhpcqan1ca4g741s3dd141bcmp6jjqbjfn2gqraz6" } }, { @@ -92064,11 +92272,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20190731, - 1429 + 20190812, + 1520 ], - "commit": "ee07b5a1e798a8b45c242de2bcdabc009ff055be", - "sha256": "1xb37vl54imfnlncj2zvyy32dnwwrxkx726h1c49dnpik0hwf5lf" + "commit": "fad40c1436afcf73fe39ea2ec535628866c72b23", + "sha256": "0kbb2f7p8ivznyqxx1ji60iqks3sbp6fb6nzfw9q5phagryl5bys" } }, { @@ -92079,14 +92287,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20190731, - 1623 + 20190803, + 1103 ], "deps": [ "vterm" ], - "commit": "1850981b8c6303089ac60d9aa9a316cac65c40b6", - "sha256": "1c763jnxsf27s238ga35ksxw7yd8ria355g0xm9mn4l4hll0wcbs" + "commit": "96cac28e72dc5739958fa674acd51ceed8835556", + "sha256": "1scfbjr3vksn0d93gb3n0mi8gi49579szn24f78vkqwd99ivifwr" } }, { @@ -92192,11 +92400,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20190801, - 156 + 20190808, + 238 ], - "commit": "216aed66e2d5517365da9c16b2d1d2aa9876c871", - "sha256": "0bkdv31di311nrlk0lqrz055n8mnwnrbjs79bq7p9qd37k5nbjs0" + "commit": "8fd65dd9c7d2393ab66c65ee1de67a84dcc779ce", + "sha256": "1yqbw8ikfrwya59xa0a17f2wwgswkdqcxj9y64fb00syps09fv0m" } }, { @@ -92369,14 +92577,14 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20190725, - 823 + 20190812, + 818 ], "deps": [ "semi" ], - "commit": "3a64923f40e1b274f4bff39e28c1eb8173b47541", - "sha256": "17y09vz5d3d1fs58pbz96w4dp0n5xkbdzj55f1ng5wy5gkmjzpd7" + "commit": "ba07b99ee146c7945823874102e7db38e7aa8bd0", + "sha256": "14fp8s1baq3r6gxaf1c50zyk59bnzpnpbpxnp3lvcz1a1i5377ql" } }, { @@ -93072,11 +93280,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20190801, - 1932 + 20190802, + 240 ], - "commit": "a256c4bce66d3805af07cc9f3dec5baeae1808de", - "sha256": "0h63gxw80yghq4kpbqixwk48y57m92spll3w60r5r789wqws2wrf" + "commit": "42a25055163141165aa0269dbca69735e704825c", + "sha256": "0d27ka6pgkzv6bj31q4c5ksm30dspl9zy42ynnh4y2xb5wzp5ml2" }, "stable": { "version": [ @@ -93210,20 +93418,20 @@ "repo": "whizzml/whizzml-mode", "unstable": { "version": [ - 20190618, - 58 + 20190802, + 1637 ], - "commit": "ec4c8ba184a135bd3f5adf2cd98dbc4d324a0190", - "sha256": "0iv47m9gk2cb5k7mamkyakdn20jsspcbhmljsi3wijk3qzwwnd0k" + "commit": "fe8dd75941aac0749b97c9e4fd3709f828d784cd", + "sha256": "091gyi2qxx96hcq3r6rxkc9jdwmb5kbcsyp4cb6sm0rhiczvif79" }, "stable": { "version": [ 0, - 33, + 34, 0 ], - "commit": "ec4c8ba184a135bd3f5adf2cd98dbc4d324a0190", - "sha256": "0iv47m9gk2cb5k7mamkyakdn20jsspcbhmljsi3wijk3qzwwnd0k" + "commit": "fe8dd75941aac0749b97c9e4fd3709f828d784cd", + "sha256": "091gyi2qxx96hcq3r6rxkc9jdwmb5kbcsyp4cb6sm0rhiczvif79" } }, { @@ -93693,9 +93901,16 @@ "ename": "wisp-mode", "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", "sha256": "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc", - "error": "Not in archive", "fetcher": "bitbucket", - "repo": "ArneBab/wisp" + "repo": "ArneBab/wisp", + "unstable": { + "version": [ + 20190718, + 1218 + ], + "commit": "5e860c746ee02c764bf378aeb8f436a1a341bd5c", + "sha256": "12qcq5k7xdlqwnq01qdkjf1035idrdmjxb24ya1xsxdkd3jra9dw" + } }, { "ename": "wispjs-mode", @@ -93883,20 +94098,19 @@ "repo": "hsjunnesson/wolfram.el", "unstable": { "version": [ - 20170123, - 756 + 20190805, + 1007 ], - "commit": "6b5dceae3fd6cdb4d7562510deeafa02c93c010b", - "sha256": "1ijyjw2793i7n00i30ma8lw4fzi9w63m6k0xgjx6j78r5y7pfj2g" + "commit": "a172712d5045834f5434cca2843a7c3506805db8", + "sha256": "10z04y8p72rqs2b2bgf1xfq99iidgbwg3ipxwkhwcaq32027h36z" }, "stable": { "version": [ 1, - 1, - 1 + 2 ], - "commit": "6b5dceae3fd6cdb4d7562510deeafa02c93c010b", - "sha256": "1ijyjw2793i7n00i30ma8lw4fzi9w63m6k0xgjx6j78r5y7pfj2g" + "commit": "a172712d5045834f5434cca2843a7c3506805db8", + "sha256": "10z04y8p72rqs2b2bgf1xfq99iidgbwg3ipxwkhwcaq32027h36z" } }, { @@ -95820,11 +96034,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20190715, - 915 + 20190809, + 1324 ], - "commit": "7e22834dea334abe30f170bef54bbeeca566355c", - "sha256": "0l5fil8950471ffgr0aq6zrj4kn23vw0j5if07am703l1qmd3yhz" + "commit": "4db36d32207613340dfc6a48fcf8e57a60d97ba3", + "sha256": "0xkchyg3qsv7nwbl8idypr0wc90c9qhw5s1pbg6xwcyvn9751sba" }, "stable": { "version": [ @@ -95977,14 +96191,14 @@ "repo": "dzop/emacs-zmq", "unstable": { "version": [ - 20190613, - 138 + 20190812, + 1910 ], "deps": [ "cl-lib" ], - "commit": "6120251d86bc85138305c1bf02b1000dc435fdb5", - "sha256": "0ngxm5mm0kqgvn8977ryrngamx0khzlw86d8vz5s0jhm2kgwnqp8" + "commit": "0544b70bf99b6eb95f46e0fcd788d98da50cb892", + "sha256": "0r9aq933b2pk9m70phfz3ah3dk1c5axmjixcf8cf19sjsv1hcc9x" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix index e6f95f74011..30e46448c5b 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-php"; - version = "5.3.3"; + version = "5.4.0"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "0nn3yfbi60h7p7p1w2pvgg098qplbds79rk2iadyvhvl3sjd77wf"; + sha256 = "1lfl8y1nmai7kp7jil8cykalw2ib0f3n47jvnz7302qsrs3lvhf2"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix index 099153995c9..41dbc6d541e 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-python"; - version = "5.3.3"; + version = "5.4.0"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "0bqsny2jgi6wi1cz65i2j9r1hiwna2x10mzy7vdk8bz7b4z766yg"; + sha256 = "1bsls5gf8jcb5zmswz82x8whfqadpgcapfc8sxvpjv5yhnjknk8c"; }; cmakeFlags = [ diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 989432fc65d..8993adf92ea 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -7,16 +7,13 @@ , libksysguard, konsole, llvmPackages, makeWrapper, kpurpose, boost }: -let - qtVersion = "5.${lib.versions.minor qtbase.version}"; -in mkDerivation rec { pname = "kdevelop"; - version = "5.3.3"; + version = "5.4.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0778587qvi268ab2fgggfl40cv2swgr8q891q1paflp3m1xirpff"; + sha256 = "0zi59xlw6facak1jfzlyviwmpjn98dmircmjyqiv3ac5xr30f0ll"; }; nativeBuildInputs = [ @@ -44,13 +41,6 @@ mkDerivation rec { dontWrapQtApps = true; - postPatch = '' - # FIXME: temporary until https://invent.kde.org/kde/kdevelop/merge_requests/8 is merged - substituteInPlace kdevplatform/language/backgroundparser/parsejob.cpp --replace \ - 'if (internalFilePath.startsWith(dataPath.canonicalPath() + QStringLiteral("/kdev"))) {' \ - 'if (internalFilePath.startsWith(dataPath.canonicalPath() + QStringLiteral("/kdev")) || localFile.startsWith(path + QStringLiteral("/kdev"))) {' - ''; - postInstall = '' # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH. wrapProgram "$out/bin/kdevelop!" \ diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index aa1e2a6b5bd..ec799c0fa49 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -100,7 +100,7 @@ let # Only display the log on error since it will contain a few normally # irrelevant messages. if ! $out/bin/nvim \ - -u ${vimUtils.vimrcFile (configure // { customRC = ""; })} \ + -u ${vimUtils.vimrcFile (configure // { customRC = ""; beforePlugins = ''filetype indent plugin on | syn on''; })} \ -i NONE -n \ -E -V1rplugins.log -s \ +UpdateRemotePlugins +quit! > outfile 2>&1; then diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index fa547875a17..3d215b28856 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "10.0"; + version = "11.0"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { name = "netbeans-${version}"; src = fetchurl { url = "mirror://apache/incubator/netbeans/incubating-netbeans/incubating-${version}/incubating-netbeans-${version}-bin.zip"; - sha512 = "ba83575f42c1d5515e2a5336a621bc2b4087b2e0bcacb6edb76f376f8272555609bdd4eefde8beae8ffc6c1a7db2fb721b844638ce27933c3dd78f71cbb41ad8"; + sha512 = "15mv59njrnq3sjfzb0n7xcc79kpixygf37cxvbswnvm651cw6lb1i9w8wbjivh0z4zcf3f62vbmshxh5pkaxqpqsg0iyy6gddfbwzwx"; }; buildCommand = '' diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix index ab79c3e780b..efda2c58360 100644 --- a/pkgs/applications/editors/notepadqq/default.nix +++ b/pkgs/applications/editors/notepadqq/default.nix @@ -1,9 +1,8 @@ -{ stdenv, fetchFromGitHub, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit}: +{ mkDerivation, lib, fetchFromGitHub, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit }: -let +mkDerivation rec { + pname = "notepadqq"; version = "1.4.8"; -in stdenv.mkDerivation { - name = "notepadqq-${version}"; src = fetchFromGitHub { owner = "notepadqq"; repo = "notepadqq"; @@ -24,13 +23,19 @@ in stdenv.mkDerivation { export LRELEASE="lrelease" ''; + dontWrapQtApps = true; + + preFixup = '' + wrapQtApp $out/bin/notepadqq + ''; + enableParallelBuilding = true; - meta = { + meta = with lib; { homepage = https://notepadqq.com/; description = "Notepad++-like editor for the Linux desktop"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ rszibele ]; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.rszibele ]; }; } diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 871ca1c671d..90d89ce7799 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper +{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, makeWrapper , boost, xercesc , qtbase, qttools, qtwebkit, qtxmlpatterns , python3, python3Packages }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "sigil-${version}"; version = "0.9.14"; @@ -17,17 +17,18 @@ stdenv.mkDerivation rec { pythonPath = with python3Packages; [ lxml ]; - propagatedBuildInputs = with python3Packages; [ lxml ]; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; buildInputs = [ boost xercesc qtbase qttools qtwebkit qtxmlpatterns - python3 python3Packages.lxml ]; + python3Packages.lxml ]; + + dontWrapQtApps = true; preFixup = '' wrapProgram "$out/bin/sigil" \ - --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath ${python3Packages.lxml}) + --prefix PYTHONPATH : $PYTHONPATH \ + ''${qtWrapperArgs[@]} ''; enableParallelBuilding = true; @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { description = "Free, open source, multi-platform ebook (ePub) editor"; homepage = https://github.com/Sigil-Ebook/Sigil/; license = licenses.gpl3; - maintainers =[ maintainers.ramkromberg ]; + # currently unmaintained platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index d20f413700e..2d52aedc831 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -1,7 +1,7 @@ { stdenv, appimage-run, fetchurl, runtimeShell }: let - version = "3.0.6"; + version = "3.0.15"; plat = { "i386-linux" = "i386"; @@ -9,8 +9,8 @@ let }.${stdenv.hostPlatform.system}; sha256 = { - "i386-linux" = "0czhlbacjks9x8y2w46nzlvk595psqhqw0vl0bvsq7sz768dk0ni"; - "x86_64-linux" = "0haji9h8rrm9yvqdv6i2y6xdd0yhsssjjj83hmf6cb868lwyigsf"; + "i386-linux" = "0v2nsis6vb1lnhmjd28vrfxqwwpycv02j0nvjlfzcgj4b3400j7a"; + "x86_64-linux" = "130n586cw0836zsbwqcz3pp3h0d4ny74ngqs4k4cvfb92556r7xh"; }.${stdenv.hostPlatform.system}; in diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 438292b7683..7e4035ac336 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,13 +11,13 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "x86_64-linux" = "1ck13xpnfklfc81jd8d5md09fcp0gjypacdqj276mzhr5mig29cd"; - "x86_64-darwin" = "0xpzm372swv0by22saxib16fvvvfjr7d68aj3l5dsl5c9a8v23qj"; + "x86_64-linux" = "17g7mra9a52qlrrj77cw16vqvc7fsvbhc03wrl4iq1afzxsyqi22"; + "x86_64-darwin" = "1is04anvhl2b354h5w7i5qi7ixhzna277f7xdy4qj9gjby6zydc6"; }.${system}; in callPackage ./generic.nix rec { - version = "1.36.1"; + version = "1.37.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 8f0fe00a85e..b8f4d544503 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, ninja, coin3d, xercesc, ode, eigen, qt5, opencascade-occt, gts +{ stdenv, mkDerivation, fetchurl, cmake, ninja, coin3d, xercesc, ode, eigen, qt5, opencascade-occt, gts , hdf5, vtk, medfile, zlib, python3Packages, swig, gfortran, libXmu , soqt, libf2c, libGLU, makeWrapper, pkgconfig , mpi ? null }: @@ -7,7 +7,7 @@ assert mpi != null; let pythonPackages = python3Packages; -in stdenv.mkDerivation rec { +in mkDerivation rec { name = "freecad-${version}"; version = "0.18.3"; @@ -46,12 +46,13 @@ in stdenv.mkDerivation rec { # Their main() removes PYTHONPATH=, and we rely on it. preConfigure = '' sed '/putenv("PYTHONPATH/d' -i src/Main/MainGui.cpp + + qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") ''; - postInstall = '' - wrapProgram $out/bin/FreeCAD --prefix PYTHONPATH : $PYTHONPATH \ - --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1 - ''; + qtWrapperArgs = [ + "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1" + ]; postFixup = '' mv $out/share/doc $out @@ -59,9 +60,9 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; - homepage = https://www.freecadweb.org/; + homepage = "https://www.freecadweb.org/"; license = licenses.lgpl2Plus; - maintainers = [ maintainers.viric ]; + maintainers = with maintainers; [ viric gebner ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix new file mode 100644 index 00000000000..1511901ab91 --- /dev/null +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, pkgconfig +, python3 +, glib +, gtk3 +, meson +, ninja +, libgee +, pantheon +, desktop-file-utils +, xorg +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "ideogram"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "cassidyjames"; + repo = pname; + rev = version; + sha256 = "1qakgg3y4n2vcnykk2004ndvwmjbk2yy0p4j30mlb7p14dxscif6"; + }; + + nativeBuildInputs = [ + desktop-file-utils + meson + ninja + pantheon.vala + pkgconfig + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + libgee + pantheon.granite + xorg.libX11 + xorg.libXtst + ]; + + patches = [ + # See: https://github.com/cassidyjames/ideogram/issues/26 + (fetchpatch { + url = "https://github.com/cassidyjames/ideogram/commit/65994ee11bd21f8316b057cec01afbf50639a708.patch"; + sha256 = "12vrvvggpqq53dmhbm7gbbbigncn19m1fjln9wxaady21m0w776c"; + }) + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Insert emoji anywhere, even in non-native apps - designed for elementary OS"; + homepage = https://github.com/cassidyjames/ideogram; + license = licenses.gpl2Plus; + maintainers = pantheon.maintainers; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index 789ee1a6d89..c1b2beadcd5 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { - owner = "hhrutter"; + owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "1knvi0v9nfzw40dayrw5cjidg9h900143v1pi6240yd7r7isx348"; + sha256 = "11q57j3wzmy2glkv53i9n7jkp14x4bqm20f3rqs3gkm4j9bcas4y"; }; modSha256 = "0cz4gs88s9z2yv1gc9ap92vv2j93ab6kr25zjgl2r7z6clbl5fzp"; diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 5991a3351ee..c007f4f3de8 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, python3Packages +{ stdenv, mkDerivationWith, fetchurl, python3Packages , file, intltool, gobject-introspection, libgudev , udisks, gexiv2, gst_all_1, libnotify , exiftool, gdk-pixbuf, libmediainfo, vmtouch }: -python3Packages.buildPythonApplication rec { +mkDerivationWith python3Packages.buildPythonApplication rec { pname = "rapid-photo-downloader"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { url = "https://launchpad.net/rapid/pyqt/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "1nywkkyxlpzq3s9anza9k67j5689pfclfha218frih36qdb0j258"; + sha256 = "14s8x2qp1li05pailflw1nprp79q0aa7lb92hnwa1air8756z7al"; }; # Disable version check and fix install tests @@ -64,6 +64,7 @@ python3Packages.buildPythonApplication rec { requests colorlog pyprind + tenacity ]; makeWrapperArgs = [ @@ -72,6 +73,7 @@ python3Packages.buildPythonApplication rec { "--prefix PATH : ${stdenv.lib.makeBinPath [ exiftool vmtouch ]}" "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libmediainfo ]}" "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : \"$GST_PLUGIN_SYSTEM_PATH_1_0\"" + "\${qtWrapperArgs[@]}" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/graphics/runwayml/default.nix b/pkgs/applications/graphics/runwayml/default.nix index 6fa8efbf68c..f96b70a77b4 100644 --- a/pkgs/applications/graphics/runwayml/default.nix +++ b/pkgs/applications/graphics/runwayml/default.nix @@ -6,12 +6,12 @@ let pname = "runwayml"; - version = "0.8.1"; + version = "0.9.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://runway-releases.s3.amazonaws.com/Runway%20${version}.AppImage"; - sha256 = "0pqnlwk804cly2x9kph39g9ps5dv75ybi2v1fgrvmhk3wbmwmpb0"; + sha256 = "0rg7ipp7kx0l4qgcymfg5d3saz0c6d2j0c6rf28rwqgbm92gbjjq"; name="${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index abcbe443450..0b66be1f84c 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, poppler_utils, pkgconfig, libpng +{ stdenv, mkDerivation, fetchurl, poppler_utils, pkgconfig, libpng , imagemagick, libjpeg, fontconfig, podofo, qtbase, qmake, icu, sqlite -, makeWrapper, unrarSupport ? false, chmlib, python2Packages, libusb1, libmtp +, unrarSupport ? false, chmlib, python2Packages, libusb1, libmtp , xdg_utils, makeDesktopItem, wrapGAppsHook, removeReferencesTo, qt5 }: -stdenv.mkDerivation rec { - version = "3.45.2"; +mkDerivation rec { name = "calibre-${version}"; + version = "3.45.2"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ makeWrapper pkgconfig qmake removeReferencesTo qt5.wrapQtAppsHook ]; + nativeBuildInputs = [ pkgconfig qmake removeReferencesTo wrapGAppsHook ]; buildInputs = [ poppler_utils libpng imagemagick libjpeg - fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook + fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils ] ++ (with python2Packages; [ apsw cssselect css-parser dateutil dnspython html5-parser lxml mechanize netifaces pillow python pyqt5_with_qtwebkit sip @@ -48,10 +48,6 @@ stdenv.mkDerivation rec { odfpy ]); - qtWrapperArgs = [ - "--prefix PATH : ${poppler_utils.out}/bin" - ]; - installPhase = '' runHook preInstall @@ -74,10 +70,6 @@ stdenv.mkDerivation rec { sed -i "s/env python[0-9.]*/python/" $PYFILES sed -i "2i import sys; sys.argv[0] = 'calibre'" $out/bin/calibre - for program in $out/bin/*; do - wrapQtApp $program --prefix PYTHONPATH : $PYTHONPATH - done - # Replace @out@ by the output path. mkdir -p $out/share/applications/ cp {$calibreDesktopItem,$ebookEditDesktopItem,$ebookViewerDesktopItem}/share/applications/* $out/share/applications/ @@ -91,15 +83,23 @@ stdenv.mkDerivation rec { runHook postInstall ''; + # Wrap manually + dontWrapQtApps = true; + dontWrapGApps = true; + # Remove some references to shrink the closure size. This reference (as of # 2018-11-06) was a single string like the following: # /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-podofo-0.9.6-dev/include/podofo/base/PdfVariant.h preFixup = '' remove-references-to -t ${podofo.dev} $out/lib/calibre/calibre/plugins/podofo.so - ''; - - postFixup = '' + for program in $out/bin/*; do + wrapProgram $program \ + ''${qtWrapperArgs[@]} \ + ''${gappsWrapperArgs[@]} \ + --prefix PYTHONPATH : $PYTHONPATH \ + --prefix PATH : ${poppler_utils.out}/bin + done ''; disallowedReferences = [ podofo.dev ]; diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix new file mode 100644 index 00000000000..43ff1d73f78 --- /dev/null +++ b/pkgs/applications/misc/clight/clightd.nix @@ -0,0 +1,75 @@ +{ lib, stdenv, fetchFromGitHub +, dbus, cmake, pkgconfig +, glib, udev, polkit, libmodule +, pcre, libXdmcp, utillinux, libpthreadstubs +, enableDdc ? true, ddcutil +, enableDpms ? true, libXext +, enableGamma ? true, libXrandr +, enableScreen ? true }: + +stdenv.mkDerivation rec { + pname = "clightd"; + version = "3.4"; + + src = fetchFromGitHub { + owner = "FedeDP"; + repo = "Clightd"; + rev = version; + sha256 = "0g6kawizwfhvigkwm7rbfq6rg872xn8igy8n355w4d7mmcxk0jf8"; + }; + + # dbus-1.pc has datadir=/etc + SYSTEM_BUS_DIR = "${placeholder "out"}/share/dbus-1/system-services"; + # systemd.pc has prefix=${systemd.out} + MODULE_LOAD_DIR = "${placeholder "out"}/lib/modules-load.d"; + # polkit-gobject-1.pc has prefix=${polkit.out} + POLKIT_ACTION_DIR = "${placeholder "out"}/share/polkit-1/actions"; + + postPatch = '' + sed -i "s@/etc@$out\0@" CMakeLists.txt + sed -i "s@pkg_get_variable(SYSTEM_BUS_DIR.*@set(SYSTEM_BUS_DIR $SYSTEM_BUS_DIR)@" CMakeLists.txt + sed -i "s@pkg_get_variable(MODULE_LOAD_DIR.*@set(MODULE_LOAD_DIR $MODULE_LOAD_DIR)@" CMakeLists.txt + sed -i "s@pkg_get_variable(POLKIT_ACTION_DIR.*@set(POLKIT_ACTION_DIR $POLKIT_ACTION_DIR)@" CMakeLists.txt + ''; + + cmakeFlags = with lib; + optional enableDdc "-DENABLE_DDC=1" + ++ optional enableDpms "-DENABLE_DPMS=1" + ++ optional enableGamma "-DENABLE_GAMMA=1" + ++ optional enableScreen "-DENABLE_SCREEN=1"; + + nativeBuildInputs = [ + dbus + cmake + pkgconfig + ]; + + buildInputs = with lib; [ + glib + udev + polkit + libmodule + + pcre + libXdmcp + utillinux + libpthreadstubs + ] ++ optional enableDdc ddcutil + ++ optional enableDpms libXext + ++ optional enableGamma libXrandr; + + postInstall = '' + mkdir -p $out/bin + ln -svT $out/lib/clightd/clightd $out/bin/clightd + ''; + + meta = with lib; { + description = "Linux bus interface that changes screen brightness/temperature"; + homepage = https://github.com/FedeDP/Clightd; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ + eadwu + ]; + }; +} diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix new file mode 100644 index 00000000000..829fd4e1223 --- /dev/null +++ b/pkgs/applications/misc/clight/default.nix @@ -0,0 +1,57 @@ +{ lib, stdenv, fetchFromGitHub +, dbus, cmake, pkgconfig, bash-completion +, gsl, popt, clightd, systemd, libconfig +, withGeoclue ? true, geoclue2 +, withUpower ? true, upower }: + +stdenv.mkDerivation rec { + pname = "clight"; + version = "3.1"; + + src = fetchFromGitHub { + owner = "FedeDP"; + repo = "Clight"; + rev = version; + sha256 = "0rzcr1x9h4llnmklhgzs9r7xwhsrw1qkqvfffkp8fs90nycaqx81"; + }; + + # bash-completion.pc completionsdir=${bash-completion.out} + COMPLETIONS_DIR = "${placeholder "out"}/share/bash-completions/completions"; + # dbus-1.pc has datadir=/etc + SESSION_BUS_DIR = "${placeholder "out"}/share/dbus-1/services"; + + postPatch = '' + sed -i "s@/usr@$out@" CMakeLists.txt + sed -i "s@/etc@$out\0@" CMakeLists.txt + sed -i "s@pkg_get_variable(COMPLETIONS_DIR.*@set(COMPLETIONS_DIR $COMPLETIONS_DIR)@" CMakeLists.txt + sed -i "s@pkg_get_variable(SESSION_BUS_DIR.*@set(SESSION_BUS_DIR $SESSION_BUS_DIR)@" CMakeLists.txt + ''; + + nativeBuildInputs = [ + dbus + cmake + pkgconfig + bash-completion + ]; + + buildInputs = with lib; [ + gsl + popt + upower + clightd + systemd + geoclue2 + libconfig + ] ++ optional withGeoclue geoclue2 + ++ optional withUpower upower; + + meta = with lib; { + description = "A C daemon that turns your webcam into a light sensor"; + homepage = https://github.com/FedeDP/Clight; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ + eadwu + ]; + }; +} diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index c211879c3e2..084881f75d9 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -50,6 +50,7 @@ mkDerivation rec { postFixup = '' wrapPythonPrograms + wrapQtApp $out/bin/cura ''; meta = with lib; { diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 1eae8c57fc4..7cdf1a319f6 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -1,15 +1,29 @@ -{ stdenv, fetchurl, readline, ncurses }: +{ stdenv, fetchFromGitHub, readline, ncurses +, autoreconfHook, pkgconfig, gettext }: stdenv.mkDerivation rec { name = "hstr-${version}"; - version = "1.25"; + version = "2.0"; - src = fetchurl { - url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz"; - sha256 = "10njj0a3s5czv497wk3whka3gxr7vmhabs12vaw7kgb07h4ssnhg"; + src = fetchFromGitHub { + owner = "dvorka"; + repo = "hstr"; + rev = version; + sha256 = "1y9vsfbg07gbic0daqy569d9pb9i1d07fym3q7a0a99hbng85s20"; }; - buildInputs = [ readline ncurses ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ readline ncurses gettext ]; + + configurePhase = '' + autoreconf -fvi + ./configure + ''; + + installPhase = '' + mkdir -p $out/bin/ + mv src/hstr $out/bin/ + ''; meta = { homepage = https://github.com/dvorka/hstr; diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/applications/misc/menumaker/default.nix index 56854e7863f..718f2e46fa0 100644 --- a/pkgs/applications/misc/menumaker/default.nix +++ b/pkgs/applications/misc/menumaker/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "menumaker-${version}"; - version = "0.99.10"; + version = "0.99.11"; src = fetchurl { url = "mirror://sourceforge/menumaker/${name}.tar.gz"; - sha256 = "1mm4cvg3kphkkd8nwrhcg6d9nm5ar7mgc0wf6fxk6zck1l7xn8ky"; + sha256 = "0dprndnhwm7b803zkp4pisiq06ic9iv8vr42in5is47jmvdim0wx"; }; format = "other"; diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix index e0a1e33dc62..97751127342 100644 --- a/pkgs/applications/misc/qMasterPassword/default.nix +++ b/pkgs/applications/misc/qMasterPassword/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qtbase, qmake, libX11, libXtst, openssl, libscrypt }: +{ stdenv, mkDerivation, fetchFromGitHub, qtbase, qmake, libX11, libXtst, openssl, libscrypt }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "qMasterPassword"; version = "1.2.2"; diff --git a/pkgs/applications/misc/qlandkartegt/default.nix b/pkgs/applications/misc/qlandkartegt/default.nix new file mode 100644 index 00000000000..ae0fd61c33d --- /dev/null +++ b/pkgs/applications/misc/qlandkartegt/default.nix @@ -0,0 +1,91 @@ +{ mkDerivation, lib, fetchurl, fetchpatch, cmake +, qtmultimedia, qtserialport, qtscript, qtwebkit +, garmindev, gdal, gpsd, libdmtx, libexif, libGLU, proj }: + +mkDerivation rec { + name = "qlandkartegt-${version}"; + version = "1.8.1"; + + src = fetchurl { + url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${name}.tar.gz"; + sha256 = "1rwv5ar5jv15g1cc6pp0lk69q3ip10pjazsh3ds2ggaciymha1ly"; + }; + + patches = [ + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-gps_read.patch?h=qlandkartegt"; + sha256 = "1xyqxdqxwviq7b8jjxssxjlkldk01ms8dzqdjgvjs8n3fh7w0l70"; + }) + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-incomplete-type.patch?h=qlandkartegt"; + sha256 = "1q7rm321az3q6pq5mq0yjrihxl9sf3nln9z3xp20g9qldslv2cy2"; + }) + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-proj_api.patch?h=qlandkartegt"; + sha256 = "12yibxn85z2n30azmhyv02q091jj5r50nlnjq4gfzyqd3xb9582n"; + }) + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-qt5-build.patch?h=qlandkartegt"; + sha256 = "1wq2hr06gzq8m7zddh10vizmvpwp4lcy1g86rlpppvdc5cm3jpkl"; + }) + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-qtgui-include.patch?h=qlandkartegt"; + sha256 = "16hql8ignzw4n1hlp4icbvaddqcadh2rjns0bvis720535112sc8"; + }) + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-ver_str.patch?h=qlandkartegt"; + sha256 = "13fg05gqrjfa9j00lrqz1b06xf6r5j01kl6l06vkn0hz1jzxss5m"; + }) + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/improve-gpx-creator.patch?h=qlandkartegt"; + sha256 = "1sdf5z8qrd43azrhwfw06zc0qr48z925hgbcfqlp0xrsxv2n6kks"; + }) + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/improve-gpx-name.patch?h=qlandkartegt"; + sha256 = "10phafhns79i3rl4zpc7arw11x46cywgkdkxm7gw1i9y5h0cal79"; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + qtmultimedia qtserialport qtscript qtwebkit + garmindev gdal gpsd libdmtx libexif libGLU proj + ]; + + cmakeFlags = [ + "-DQK_QT5_PORT=ON" + "-DEXIF_LIBRARIES=${libexif}/lib/libexif.so" + "-DEXIF_INCLUDE_DIRS=${libexif}/include" + ]; + + enableParallelBuilding = true; + + postPatch = '' + substituteInPlace ConfigureChecks.cmake \ + --replace \$\{PLUGIN_INSTALL_DIR\} "${garmindev}/lib/qlandkartegt" + ''; + + postInstall = '' + mkdir -p $out/share/mime/packages + cat << EOF > $out/share/mime/packages/qlandkartegt.xml + + + QLandkarteGT File + + + + EOF + ''; + + meta = with lib; { + homepage = http://www.qlandkarte.org/; + description = '' + QLandkarte GT is the ultimate outdoor aficionado's tool. + It supports GPS maps in GeoTiff format as well as Garmin's img vector map format. + ''; + license = licenses.gpl2; + maintainers = with maintainers; [ sikmir ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/misc/qlandkartegt/garmindev.nix b/pkgs/applications/misc/qlandkartegt/garmindev.nix new file mode 100644 index 00000000000..f12a3021a19 --- /dev/null +++ b/pkgs/applications/misc/qlandkartegt/garmindev.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, cmake, libusb }: + +stdenv.mkDerivation rec { + name = "garmindev-${version}"; + version = "0.3.4"; + + src = fetchurl { + url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${name}.tar.gz"; + sha256 = "1mc7rxdn9790pgbvz02xzipxp2dp9h4hfq87xgawa18sp9jqzhw6"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libusb ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://www.qlandkarte.org/; + description = "Garmin Device Drivers for QlandkarteGT"; + license = licenses.gpl2; + maintainers = with maintainers; [ sikmir ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index 342eca0a6fd..65d01a5649d 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -1,51 +1,83 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dmd, gnome3, dbus -, gsettings-desktop-schemas, desktop-file-utils, gettext, gtkd, libsecret -, glib, perlPackages, wrapGAppsHook, xdg_utils }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, meson +, ninja +, python3 +, pkgconfig +, dmd +, gnome3 +, dbus +, gsettings-desktop-schemas +, desktop-file-utils +, gettext +, gtkd +, libsecret +, glib +, wrapGAppsHook +, libunwind +}: stdenv.mkDerivation rec { pname = "tilix"; - version = "1.9.3"; + version = "unstable-2019-08-03"; src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; - rev = version; - sha256 = "0mg9y4xd2pnv0smibg7dyy733jarvx6qpdqap3sj7fpyni0jvpph"; + rev = "09ec4e8e113703ca795946d8d2a83091e7b741e4"; + sha256 = "1vvp6l25xygzhbhscg8scik8y59nl8a92ri024ijk0c0lclga05m"; }; + # Default upstream else LDC fails to link + mesonBuildType = [ + "debugoptimized" + ]; + nativeBuildInputs = [ - autoreconfHook dmd desktop-file-utils perlPackages.Po4a pkgconfig xdg_utils + desktop-file-utils + dmd + meson + ninja + pkgconfig + python3 wrapGAppsHook ]; - buildInputs = [ gnome3.dconf gettext gsettings-desktop-schemas gtkd dbus libsecret ]; + buildInputs = [ + dbus + gettext + gnome3.dconf + gsettings-desktop-schemas + gtkd + libsecret + libunwind + ]; - preBuild = '' - makeFlagsArray=( - DCFLAGS='-O -inline -release -version=StdLoggerDisableTrace' - ) - ''; + patches = [ + # Depends on libsecret optionally + # https://github.com/gnunn1/tilix/pull/1745 + (fetchpatch { + url = "https://github.com/gnunn1/tilix/commit/e38dd182bfb92419d70434926ef9c0530189aab8.patch"; + sha256 = "1ws4iyzi67crzlp9p7cw8jr752b3phcg5ymx5aj0bh6321g38kfk"; + }) + ]; - postInstall = '' - ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py ''; preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH ":" "${libsecret}/lib") - substituteInPlace $out/share/applications/com.gexperts.Tilix.desktop \ --replace "Exec=tilix" "Exec=$out/bin/tilix" - - # TODO: Won't be needed after the switch to Meson - substituteInPlace $out/share/dbus-1/services/com.gexperts.Tilix.service \ - --replace "/usr/bin/tilix" "$out/bin/tilix" ''; meta = with stdenv.lib; { description = "Tiling terminal emulator following the Gnome Human Interface Guidelines"; homepage = https://gnunn1.github.io/tilix-web; license = licenses.mpl20; - maintainers = with maintainers; [ midchildan ]; + maintainers = with maintainers; [ midchildan worldofpeace ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 12cf96580f7..3db6f6ae565 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -57,7 +57,7 @@ python27Packages.buildPythonApplication rec { checkInputs = with python27Packages; [ mock - pytest_3 + pytest pytest-mock pytestpep8 xvfb_run diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index d8d2aff0d09..f8e56937021 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -11,8 +11,8 @@ version = "77.0.3860.5"; }; stable = { - sha256 = "1521vh38mfgy7aj1lw1vpbdm8m6wyh52d5p7bz4x6kvvxsnacp11"; - sha256bin64 = "0hnfn2zxdrp96a4p98r08w4krzwkpb1kp4rjk03754akjyg1b3xx"; - version = "76.0.3809.87"; + sha256 = "0vfjfxsqf8jrmd7y08ln1lpbilwi150875zn2bawwdq87vd3mncc"; + sha256bin64 = "1c5rlqgshv5295wg5cji12z2b38l6a81l94spmzr46h5z9nn1gqx"; + version = "76.0.3809.100"; }; } diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix index cb7c41d0c8a..bd8eb545152 100644 --- a/pkgs/applications/networking/cluster/click/default.nix +++ b/pkgs/applications/networking/cluster/click/default.nix @@ -4,18 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "click-${version}"; - version = "0.3.2"; + version = "0.4.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "databricks"; repo = "click"; - sha256 = "0sbj41kypn637z1w115w2h5v6bxz3y6w5ikgpx3ihsh89lkc19d2"; + sha256 = "18mpzvvww2g6y2d3m8wcfajzdshagihn59k03xvcknd5d8zxagl3"; }; - cargoSha256 = "1179a17lfr3001vp1a2adbkhdm9677n56af2c0zvkr18jas6b2w7"; - - patches = [ ./fix_cargo_lock_version.patch ]; + cargoSha256 = "0298x7wkr4j1l5flmv5vhl1ay8icvh4dlhsh4xi8fd3p8jl9jpqv"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/networking/cluster/click/fix_cargo_lock_version.patch b/pkgs/applications/networking/cluster/click/fix_cargo_lock_version.patch deleted file mode 100644 index bc4db7ef7c1..00000000000 --- a/pkgs/applications/networking/cluster/click/fix_cargo_lock_version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index ff80350..c86c6fe 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -111,7 +111,7 @@ dependencies = [ - - [[package]] - name = "click" --version = "0.3.1" -+version = "0.3.2" - dependencies = [ - "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index c9dfc79d267..2338f2478f8 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.85"; + version = "0.0.91"; src = fetchurl { - url = "https://dl-canary.discordapp.net/apps/linux/0.0.85/discord-canary-0.0.85.tar.gz"; - sha256 = "0kr2mxpghqbj856l09fgw3cmlbdv9h2cd5gxwaymnnywif7czp4j"; + url = "https://dl-canary.discordapp.net/apps/linux/0.0.91/discord-canary-0.0.91.tar.gz"; + sha256 = "0sw5m4z5k29rzqrsxbvjqd8fxjwd9jn7nbq65nyg7f0d790rhpy8"; }; }; }.${branch} diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 9b1939f0051..d337c62ea09 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub -, cmake, cmark, lmdb, qt5, qtmacextras, mtxclient -, boost, spdlog, olm, pkgconfig, nlohmann_json +, cmake, cmark, lmdb, mkDerivation, qtbase, qtmacextras +, qtmultimedia, qttools, mtxclient, boost, spdlog, olm, pkgconfig +, nlohmann_json }: # These hashes and revisions are based on those from here: @@ -20,7 +21,7 @@ let sha256 = "1whsc5cybf9rmgyaj6qjji03fv5jbgcgygp956s3835b9f9cjg1n"; }; in -stdenv.mkDerivation rec { +mkDerivation rec { name = "nheko-${version}"; version = "0.6.4"; @@ -63,7 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ mtxclient olm boost lmdb spdlog cmark - qt5.qtbase qt5.qtmultimedia qt5.qttools + qtbase qtmultimedia qttools ] ++ lib.optional stdenv.isDarwin qtmacextras; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index fa72d234ce9..381d66c678e 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -57,11 +57,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.25.3"; + version = "1.26.0"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0f7pip4d97xixwf667xpi50r0r65givvmry862zhp2cq24bs0693"; + sha256 = "17g5yxr6ydc4rlbqc3r3876jis1x7mw496skc098n4q4f0m2ih24"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 21a98676290..15cec96afc7 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -4,16 +4,13 @@ let arch = if stdenv.is64bit then "amd64" else "x86"; in stdenv.mkDerivation rec { pname = "teamspeak-server"; - version = "3.8.0"; + version = "3.9.1"; src = fetchurl { - urls = [ - "http://dl.4players.de/ts/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2" - "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2" - ]; + url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"; sha256 = if stdenv.is64bit - then "1bzmqqqpwn6q2pvkrkkxq0ggs8crxbkwaxlggcdxjlyg95cyq8k1" - else "0p5rqwdsvbria5dzjjm5mj8vfy0zpfs669wpbwxd4g3n4vh03kyw"; + then "0vzi0prnqhjxrwlghwgii0rsmml6aa3qk3yv227g9wz5m3b9f10a" + else "1nn0fh4s5rmnn27djbsk21jaah1kxyvap9qaf5p4r7cydwr1bzm6"; }; buildInputs = [ stdenv.cc.cc ]; @@ -28,7 +25,7 @@ in stdenv.mkDerivation rec { # Make symlinks to the binaries from bin. mkdir -p $out/bin/ ln -s $out/lib/teamspeak/ts3server $out/bin/ts3server - ln -s $out/lib/teamspeak/tsdnsserver $out/bin/tsdnsserver + ln -s $out/lib/teamspeak/tsdns/tsdnsserver $out/bin/tsdnsserver ''; meta = { diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 13c03b41909..4f9bbe021d1 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchsvn +{ mkDerivation, lib, fetchFromGitHub, fetchsvn, fetchpatch , pkgconfig, pythonPackages, cmake, wrapGAppsHook, wrapQtAppsHook, gcc8 , qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 @@ -8,14 +8,14 @@ with lib; mkDerivation rec { name = "telegram-desktop-${version}"; - version = "1.7.14"; + version = "1.8.0"; # Telegram-Desktop with submodules src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; - sha256 = "1bw804a9kffmn23wv0570wihbvfm7jy9cqmxlv196f4j7bw7zkv3"; + sha256 = "09r62dra6gab8hiyzyysslgqkzswf8vwfkcixbcb0jk5la0m07yy"; fetchSubmodules = true; }; @@ -23,8 +23,12 @@ mkDerivation rec { archPatches = fetchsvn { url = "svn://svn.archlinux.org/community/telegram-desktop/trunk"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - rev = "487779"; - sha256 = "0f09hvimb66xqksb2v0zc4ryshx7y7z0rafzjd99x37rpib9f3kq"; + rev = "498563"; + sha256 = "0g2y6impygqhfiqnyxc1ivxwl8j82q9qcnkqcjn6mwj3cisyxwnl"; + }; + privateHeadersPatch = fetchpatch { + url = "https://github.com/telegramdesktop/tdesktop/commit/b9d3ba621eb8af638af46c6b3cfd7a8330bf0dd5.patch"; + sha256 = "1s5xvcp9dk0jfywssk8xfcsh7bk5xxif8xqnba0413lfx5rgvs5v"; }; patches = [ @@ -32,7 +36,6 @@ mkDerivation rec { "${archPatches}/no-gtk2.patch" # "${archPatches}/Use-system-wide-font.patch" "${archPatches}/tdesktop_lottie_animation_qtdebug.patch" - "${archPatches}/issue6219.patch" ]; postPatch = '' @@ -79,8 +82,11 @@ mkDerivation rec { CPPFLAGS = NIX_CFLAGS_COMPILE; preConfigure = '' + # Patches to revert: patch -R -Np1 -i "${archPatches}/demibold.patch" + patch -R -Np1 -i "${privateHeadersPatch}" + # Patches to apply: pushd "Telegram/ThirdParty/libtgvoip" patch -Np1 -i "${archPatches}/libtgvoip.patch" popd diff --git a/pkgs/applications/networking/maestral/default.nix b/pkgs/applications/networking/maestral/default.nix new file mode 100644 index 00000000000..bfacac2eaf4 --- /dev/null +++ b/pkgs/applications/networking/maestral/default.nix @@ -0,0 +1,38 @@ +{ lib, python3Packages, fetchFromGitHub +, withGui ? false, wrapQtAppsHook ? null }: + +python3Packages.buildPythonApplication rec { + pname = "maestral${lib.optionalString withGui "-gui"}"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "SamSchott"; + repo = "maestral-dropbox"; + rev = "v${version}"; + sha256 = "1nfjm58f6hnqbx9xnz2h929s2175ka1yf5jjlk4i60v0wppnrrdf"; + }; + + disabled = python3Packages.pythonOlder "3.6"; + + propagatedBuildInputs = (with python3Packages; [ + blinker click dropbox keyring keyrings-alt requests u-msgpack-python watchdog + ] ++ lib.optional withGui pyqt5); + + nativeBuildInputs = lib.optional withGui wrapQtAppsHook; + + postInstall = lib.optionalString withGui '' + makeQtWrapper $out/bin/maestral $out/bin/maestral-gui \ + --add-flags gui + ''; + + # no tests + doCheck = false; + + meta = with lib; { + description = "Open-source Dropbox client for macOS and Linux"; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; + inherit (src.meta) homepage; + }; +} diff --git a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix new file mode 100644 index 00000000000..7019c309feb --- /dev/null +++ b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix @@ -0,0 +1,28 @@ +{ stdenv, python3, notmuch }: + +python3.pkgs.buildPythonApplication rec { + pname = "mlarchive2maildir"; + version = "0.0.6"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "025mv890zsk25cral9cas3qgqdsszh5025khz473zs36innjd0mw"; + }; + + nativeBuildInputs = with python3.pkgs; [ setuptools_scm ]; + + propagatedBuildInputs = with python3.pkgs; [ + beautifulsoup4 + click + click-log + requests + six + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/flokli/mlarchive2maildir; + description = "Imports mail from (pipermail) archives into a maildir"; + license = licenses.mit; + maintainers = with maintainers; [ andir flokli ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix deleted file mode 100644 index 5bb24c9ded7..00000000000 --- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix +++ /dev/null @@ -1,133 +0,0 @@ -{ dpkg, fetchurl, lib, pkgs, stdenv -, alsaLib -, atk -, cairo -, coreutils -, cups -, dbus -, desktop-file-utils -, expat -, fontconfig -, freetype -, gcc-unwrapped -, gdk-pixbuf -, glib -, gnome2 -, libgnome-keyring -, libnotify -, makeWrapper -, nodejs -, nspr -, nss -, pango -, python2 -, udev -, wget -, xorg -}: - -stdenv.mkDerivation rec { - name = "${pkgname}-${version}"; - pkgname = "nylas-mail-bin"; - version = "2.0.32"; - subVersion = "fec7941"; - - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://edgehill.s3.amazonaws.com/${version}-${subVersion}/linux-deb/x64/NylasMail.deb"; - sha256 = "40060aa1dc3b5187b8ed4a07b9de3427e3c5a291df98c2c82395647fa2aa4ada"; - } - else - throw "NylasMail is not supported on ${stdenv.hostPlatform.system}"; - - propagatedBuildInputs = [ - alsaLib - atk - cairo - coreutils - cups - dbus - desktop-file-utils - expat - fontconfig - freetype - gcc-unwrapped - gdk-pixbuf - glib - gnome2.GConf - gnome2.gtk - libgnome-keyring - libnotify - nodejs - nspr - nss - pango - python2 - udev - wget - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxkbfile - ]; - - - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = '' - mkdir -p $out - - ${dpkg}/bin/dpkg-deb -x $src unpacked - mv unpacked/usr/* $out/ - - # Fix path in desktop file - substituteInPlace $out/share/applications/nylas-mail.desktop \ - --replace /usr/bin/nylas-mail $out/bin/nylas-mail - - # Patch librariess - noderp=$(patchelf --print-rpath $out/share/nylas-mail/libnode.so) - patchelf --set-rpath $noderp:$out/lib:${stdenv.cc.cc.lib}/lib:${xorg.libxkbfile.out}/lib:${lib.makeLibraryPath propagatedBuildInputs } \ - $out/share/nylas-mail/libnode.so - - ffrp=$(patchelf --print-rpath $out/share/nylas-mail/libffmpeg.so) - patchelf --set-rpath $ffrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \ - $out/share/nylas-mail/libffmpeg.so - - # Patch binaries - binrp=$(patchelf --print-rpath $out/share/nylas-mail/nylas) - patchelf --interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) \ - --set-rpath $binrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \ - $out/share/nylas-mail/nylas - - wrapProgram $out/share/nylas-mail/nylas --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${pkgs.gnome3.libgnome-keyring}/lib"; - - # Fix path to bash so apm can install plugins. - substituteInPlace $out/share/nylas-mail/resources/apm/bin/apm \ - --replace /bin/bash ${stdenv.shell} - - wrapProgram $out/share/nylas-mail/resources/apm/bin/apm \ - --set PATH "${coreutils}/bin" - patchelf --interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) \ - --set-rpath ${gcc-unwrapped.lib}/lib $out/share/nylas-mail/resources/apm/bin/node - ''; - - meta = with stdenv.lib; { - description = "Open-source mail client built on the modern web with Electron, React, and Flux"; - longDescription = '' - Nylas Mail is an open-source mail client built on the modern web with Electron, React, and Flux. It is designed to be extensible, so it's easy to create new experiences and workflows around email. Nylas Mail can be enabled with it's requirements by enabling 'services.nylas-mail.enable=true'. Alternatively, make sure to have services.gnome3.gnome-keyring.enable = true; in your configuration.nix before running nylas-mail. If you happen to miss this step, you should remove ~/.nylas-mail and "~/.config/Nylas Mail" for a blank setup". - ''; - license = licenses.gpl3; - maintainers = with maintainers; [ johnramsden ]; - homepage = https://nylas.com; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 2cbf83c16ae..9ee16298ef1 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -40,11 +40,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2019.5"; + version = "2019.6"; src = fetchurl { url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; - sha256 = "542a93521906cd5e97075c9f3e9088c19562b127556a3de151e25bc66b11fe0b"; + sha256 = "0hlkka8mk7qzfhgsl10nz495nswh27gn7l9bd24c6lpkqnapz0vg"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index 9f775f0db65..e8fff0deddf 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -1,14 +1,13 @@ { stdenv, fetchurl , slang, ncurses, openssl }: -let version = "1.0.2"; in - -stdenv.mkDerivation { - name = "slrn-${version}"; +stdenv.mkDerivation rec { + pname = "slrn"; + version = "1.0.3a"; src = fetchurl { - url = "http://www.jedsoft.org/releases/slrn/slrn-${version}.tar.gz"; - sha256 = "1gn6m2zha2nnnrh9lz3m3nrqk6fgfij1wc53pg25j7sdgvlziv12"; + url = "http://www.jedsoft.org/releases/slrn/slrn-${version}.tar.bz2"; + sha256 = "1b1d9iikr60w0vq86y9a0l4gjl0jxhdznlrdp3r405i097as9a1v"; }; preConfigure = '' diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 696ced2d246..328561529ce 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall , gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook , gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3 -, bcrypt, gobject-introspection, gsettings-desktop-schemas }: +, bcrypt, gobject-introspection, gsettings-desktop-schemas +, pango, gdk-pixbuf, atk }: buildPythonApplication rec { version = "0.9.4"; @@ -18,6 +19,7 @@ buildPythonApplication rec { wrapGAppsHook # For setup hook populating GI_TYPELIB_PATH gobject-introspection + pango gdk-pixbuf atk libnotify ]; buildInputs = [ diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index cc916e069a0..5b847163a2a 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,21 +1,21 @@ -{ buildGoPackage, stdenv, lib, procps, fetchFromGitHub }: +{ buildGoModule, stdenv, lib, procps, fetchFromGitHub }: let common = { stname, target, postInstall ? "" }: - buildGoPackage rec { - version = "1.1.4"; + buildGoModule rec { + version = "1.2.1"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0a19l1kp4cwyzcd53v9yzv3ms69gn78gajkyfawafr7ls0i8x82f"; + sha256 = "0q1x6kd5kaij8mvs6yll2vqfzrbb31y5hpg6g5kjc8gngwv4rl6v"; }; goPackagePath = "github.com/syncthing/syncthing"; - goDeps = ./deps.nix; + modSha256 = "1daixrpdj97ck02853hwp8l158sja5a7a37h0gdbwb1lgf5hsn05"; patches = [ ./add-stcli-target.patch @@ -25,18 +25,14 @@ let buildPhase = '' runHook preBuild - pushd go/src/${goPackagePath} go run build.go -no-upgrade -version v${version} build ${target} - popd runHook postBuild ''; installPhase = '' - pushd go/src/${goPackagePath} runHook preInstall - install -Dm755 ${target} $bin/bin/${target} + install -Dm755 ${target} $out/bin/${target} runHook postInstall - popd ''; inherit postInstall; @@ -65,19 +61,19 @@ in { done '' + lib.optionalString (stdenv.isLinux) '' - mkdir -p $bin/lib/systemd/{system,user} + mkdir -p $out/lib/systemd/{system,user} substitute etc/linux-systemd/system/syncthing-resume.service \ - $bin/lib/systemd/system/syncthing-resume.service \ + $out/lib/systemd/system/syncthing-resume.service \ --replace /usr/bin/pkill ${procps}/bin/pkill substitute etc/linux-systemd/system/syncthing@.service \ - $bin/lib/systemd/system/syncthing@.service \ - --replace /usr/bin/syncthing $bin/bin/syncthing + $out/lib/systemd/system/syncthing@.service \ + --replace /usr/bin/syncthing $out/bin/syncthing substitute etc/linux-systemd/user/syncthing.service \ - $bin/lib/systemd/user/syncthing.service \ - --replace /usr/bin/syncthing $bin/bin/syncthing + $out/lib/systemd/user/syncthing.service \ + --replace /usr/bin/syncthing $out/bin/syncthing ''; }; @@ -101,7 +97,7 @@ in { substitute cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \ $out/lib/systemd/system/strelaysrv.service \ - --replace /usr/bin/strelaysrv $bin/bin/strelaysrv + --replace /usr/bin/strelaysrv $out/bin/strelaysrv ''; }; } diff --git a/pkgs/applications/networking/syncthing/deps.nix b/pkgs/applications/networking/syncthing/deps.nix deleted file mode 100644 index 4a58a490cc5..00000000000 --- a/pkgs/applications/networking/syncthing/deps.nix +++ /dev/null @@ -1,480 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/AudriusButkevicius/go-nat-pmp"; - fetch = { - type = "git"; - url = "https://github.com/AudriusButkevicius/go-nat-pmp"; - rev = "452c97607362"; - sha256 = "1accmpl1llk16a19nlyy991fqrgfay6l53gb64hgmdfmqljdvbk7"; - }; - } - { - goPackagePath = "github.com/AudriusButkevicius/recli"; - fetch = { - type = "git"; - url = "https://github.com/AudriusButkevicius/recli"; - rev = "v0.0.5"; - sha256 = "1m1xna1kb78pkmr1lfmvvnpk9j7c4x71j3a7c6vj7zpzc4srpsmf"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/bkaradzic/go-lz4"; - fetch = { - type = "git"; - url = "https://github.com/bkaradzic/go-lz4"; - rev = "7224d8d8f27e"; - sha256 = "10lmya17vdqg2pvqni0p73iahni48s1v11ya9a0hcz4jh5vw4dkb"; - }; - } - { - goPackagePath = "github.com/calmh/du"; - fetch = { - type = "git"; - url = "https://github.com/calmh/du"; - rev = "v1.0.1"; - sha256 = "0qb3a6y3p9nkyn3s66k6zcm16y8n8578qh23ddj14cxf2scrr2n2"; - }; - } - { - goPackagePath = "github.com/calmh/xdr"; - fetch = { - type = "git"; - url = "https://github.com/calmh/xdr"; - rev = "v1.1.0"; - sha256 = "072wqdncz3nd4a3zkhvzzx1y3in1lm29wfvl0d8wrnqs5pyqh0mh"; - }; - } - { - goPackagePath = "github.com/chmduquesne/rollinghash"; - fetch = { - type = "git"; - url = "https://github.com/chmduquesne/rollinghash"; - rev = "a60f8e7142b5"; - sha256 = "0fpaqq4zb0wikgbhn7vwqqj1h865f5xy195vkhivsp922p7qwsjr"; - }; - } - { - goPackagePath = "github.com/d4l3k/messagediff"; - fetch = { - type = "git"; - url = "https://github.com/d4l3k/messagediff"; - rev = "v1.2.1"; - sha256 = "104hl8x57ciaz7mzafg1vp9qggxcyfm8hsv9bmlihbz9ml3nyr8v"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/flynn-archive/go-shlex"; - fetch = { - type = "git"; - url = "https://github.com/flynn-archive/go-shlex"; - rev = "3f9db97f8568"; - sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "51eb1ee00b6d"; - sha256 = "090wzpwsjana1qas8ipwh1pj959gvc4b7vwybzi01f3bmd79jwlp"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.2.0"; - sha256 = "1c3y5m08mvrgvlw0kb9pldh3kkqcj99pa8gqmk1g3hp8ih3b2dv0"; - }; - } - { - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "84a468cf14b4"; - sha256 = "1ky1r9qh54yi9zp2769qrjngzndgd8fn7mja2qfac285n06chmcn"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.2.0"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "553a64147049"; - sha256 = "0kssxnih1l722hx9219c7javganjqkqhvl3i0hp0hif6xm6chvqk"; - }; - } - { - goPackagePath = "github.com/jackpal/gateway"; - fetch = { - type = "git"; - url = "https://github.com/jackpal/gateway"; - rev = "5795ac81146e"; - sha256 = "0fkwkwmhfadwk3cha8616bhqxfkr9gjjnynhhxyldlphixgs3f25"; - }; - } - { - goPackagePath = "github.com/kballard/go-shellquote"; - fetch = { - type = "git"; - url = "https://github.com/kballard/go-shellquote"; - rev = "cd60e84ee657"; - sha256 = "1xjpin4jq1zl84dcn96xhjmn9bsfyszf6g9aqyj2dc0xfi6c88y0"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "v1.0.0"; - sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.4"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/minio/sha256-simd"; - fetch = { - type = "git"; - url = "https://github.com/minio/sha256-simd"; - rev = "cc1980cb0338"; - sha256 = "04fp98nal0wsb26zwhw82spn5camxslc68g3xp8g4af9w6k9g31j"; - }; - } - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "6c46eb8334b3"; - sha256 = "0lxmpg3zhn7r2q8c29wcw0sqn5c48ihhb7qfh9m676c9j455rpm8"; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "ba3724c94e4d"; - sha256 = "0fqs7kyqzz2lykbr2xbvd8imvx748xv4lh4d6fdy3wkwxs2f9fhp"; - }; - } - { - goPackagePath = "github.com/oschwald/geoip2-golang"; - fetch = { - type = "git"; - url = "https://github.com/oschwald/geoip2-golang"; - rev = "v1.1.0"; - sha256 = "10pvjmbm1wc8xxwqlcfhdj2mciiyfddghmp6jyn7brd4mg65ppy2"; - }; - } - { - goPackagePath = "github.com/oschwald/maxminddb-golang"; - fetch = { - type = "git"; - url = "https://github.com/oschwald/maxminddb-golang"; - rev = "26fe5ace1c70"; - sha256 = "0szb96zq1jbd9zpf4qn9zng4582ww9mg8zgrqxbkkpf3862r6n49"; - }; - } - { - goPackagePath = "github.com/petermattis/goid"; - fetch = { - type = "git"; - url = "https://github.com/petermattis/goid"; - rev = "3db12ebb2a59"; - sha256 = "0z18a3mr72c52g7g94n08gxw0ksnaafbfwdl5p5jav2sffirb0kd"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.1"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v0.9.2"; - sha256 = "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "5c3871d89910"; - sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "4724e9255275"; - sha256 = "0pcx8hlnrxx5nnmpk786cn99rsgqk1jrd3c9f6fsx8qd8y5iwjy6"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "1dc9a6cbc91a"; - sha256 = "1zlv1x30xp7z5c3vn5vp870v4bjim0zcidzc3mr2l3xhazc0svab"; - }; - } - { - goPackagePath = "github.com/rcrowley/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/rcrowley/go-metrics"; - rev = "e181e095bae9"; - sha256 = "1pwkyw801hy7n94skzk6h177zqcil6ayrmb5gs3jdpsfayh8ia5w"; - }; - } - { - goPackagePath = "github.com/sasha-s/go-deadlock"; - fetch = { - type = "git"; - url = "https://github.com/sasha-s/go-deadlock"; - rev = "v0.2.0"; - sha256 = "13p7b7pakd9k1c2k0fs1hfim3c8mivz679977ai6zb01s4aw7gyg"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "github.com/syncthing/notify"; - fetch = { - type = "git"; - url = "https://github.com/syncthing/notify"; - rev = "4e389ea6c0d8"; - sha256 = "19gvl14s1l9m82f8c2xsjcr8lmbqrvw1mxkayvfcpimvxfz0j61i"; - }; - } - { - goPackagePath = "github.com/syndtr/goleveldb"; - fetch = { - type = "git"; - url = "https://github.com/syndtr/goleveldb"; - rev = "34011bf325bc"; - sha256 = "097ja0vyj6p27zrxha9nhk09fj977xsvhmd3bk2hbyvnbw4znnhd"; - }; - } - { - goPackagePath = "github.com/thejerf/suture"; - fetch = { - type = "git"; - url = "https://github.com/thejerf/suture"; - rev = "v3.0.2"; - sha256 = "03bdrl78jfwk0kw40lj63ga9cxhgccgss8yi9lp5j0m0ml7921gh"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v1.20.0"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "github.com/vitrun/qart"; - fetch = { - type = "git"; - url = "https://github.com/vitrun/qart"; - rev = "bf64b92db6b0"; - sha256 = "1xk7qki703xmay9ghi3kq2bjf1iw9dz8wik55739d6i7sn77vvkc"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "351d144fa1fc"; - sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "42b317875d0f"; - sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d0b11bdaac8a"; - sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "e19ae1496984"; - sha256 = "1cvnnx8nwx5c7gr6ajs7sldhbqh52n7h6fsa3i21l2lhx6xrsh4w"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "6dc17368e09b"; - sha256 = "1fx4cf5fpdz00g3c7vxzy92hdcg0vh4yqw00qp5s52j72qixynbk"; - }; - } - { - goPackagePath = "gopkg.in/asn1-ber.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/asn1-ber.v1"; - rev = "379148ca0225"; - sha256 = "1y8bvzbxpw0lfnn7pbcdwzqj4l90qj6xf88dvv9pxd9yl5g6cskx"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/ldap.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/ldap.v2"; - rev = "v2.5.1"; - sha256 = "1wf81wy04nhkqs0dg5zkivr4sh37r83bxrfwjz9vr4jq6vmljr3h"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "287cf08546ab"; - sha256 = "15502klds9wwv567vclb9kx95gs8lnyzn4ybsk6l9fc7a67lk831"; - }; - } -] diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index eb2bebb3993..2cd441794a4 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -1,26 +1,24 @@ -{ stdenv, fetchsvn, wrapQtAppsHook, pkgconfig, cmake, qtbase, cairo, pixman, +{ stdenv, fetchurl, mkDerivation, pkgconfig, cmake, qtbase, cairo, pixman, boost, cups, fontconfig, freetype, hunspell, libjpeg, libtiff, libxml2, lcms2, podofo, poppler, poppler_data, python2, harfbuzz, qtimageformats, qttools }: let pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]); - revision = "22806"; in -stdenv.mkDerivation rec { - name = "scribus-unstable-${version}"; - version = "2019-01-16"; +mkDerivation rec { + pname = "scribus"; + version = "1.5.5"; - src = fetchsvn { - url = "svn://scribus.net/trunk/Scribus"; - rev = revision; - sha256 = "16xpsbp6kca78jf48n6zdmyjras38xr11paan839hgy4ik83ncn0"; + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz"; + sha256 = "eQiyGmzoQyafWM7fX495GJMlfmIBzOX73ccNrKL+P3E="; }; enableParallelBuilding = true; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ - pkgconfig cmake qtbase cairo pixman boost cups fontconfig + qtbase cairo pixman boost cups fontconfig freetype hunspell libjpeg libtiff libxml2 lcms2 podofo poppler poppler_data pythonEnv harfbuzz qtimageformats qttools ]; diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 1c6d0478f76..aeadf49f898 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "chirp-daily"; - version = "20190511"; + version = "20190718"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "1k5smkzkvbr4d8gbl1yczf2i5xrdkgk6i8pmwnlfghzcgy8n4jzj"; + sha256 = "1zngdqqqrlm8qpv8dzinamhwq6rr8zcq7db3vb284wrq0jcvrry5"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index fd8c542fb42..b9af3a71233 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -2,12 +2,12 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.1.04"; + version = "4.1.07"; pname = "fldigi"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0idv6yr5l5z1icziv1shpjqxhjlxmb6qkpwlmcxws15gkqs9rhc9"; + sha256 = "1w11d6vbcvi3y7pps3rqb1ss3kxyyzd7nn1jv6fqns1wwsv68j6w"; }; buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix index 2b4a679acca..5bb561f1426 100644 --- a/pkgs/applications/radio/flrig/default.nix +++ b/pkgs/applications/radio/flrig/default.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "1.3.45"; + version = "1.3.47"; pname = "flrig"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "14rnyqwlk35j2027l7hxfig6v7j7302w4vsvx0l33b782i8phs2v"; + sha256 = "1xih3ik5dssa40lx48228pcrds8r7xmd8rmk2fcr1mw6apw6q141"; }; buildInputs = [ diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index 7e132efefbb..747015d80ee 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -11,17 +11,22 @@ , pkgconfig , pythonPackages , uhd +, log4cpp +, openblas +, matio +, pugixml +, protobuf }: stdenv.mkDerivation rec { name = "gnss-sdr-${version}"; - version = "0.0.9"; + version = "0.0.11"; src = fetchFromGitHub { owner = "gnss-sdr"; repo = "gnss-sdr"; rev = "v${version}"; - sha256 = "0gis932ly3vk7d5qvznffp54pkmbw3m6v60mxjfdj5dd3r7vf975"; + sha256 = "0ajj0wx68yyzigppxxa1wag3hzkrjj8dqq8k28rj0jhp8a6bw2q7"; }; buildInputs = [ @@ -40,6 +45,11 @@ stdenv.mkDerivation rec { # UHD support is optional, but gnuradio is built with it, so there's # nothing to be gained by leaving it out. uhd + log4cpp + openblas + matio + pugixml + protobuf ]; enableParallelBuilding = true; @@ -53,6 +63,8 @@ stdenv.mkDerivation rec { # armadillo is built using both, so skip checking for them. "-DBLAS=YES" "-DLAPACK=YES" + "-DBLAS_LIBRARIES=-lopenblas" + "-DLAPACK_LIBRARIES=-lopenblas" # Similarly, it doesn't actually use gfortran despite checking for # its presence. diff --git a/pkgs/applications/radio/wsjtx/default.nix b/pkgs/applications/radio/wsjtx/default.nix index 6e287b571d7..212f93fb093 100644 --- a/pkgs/applications/radio/wsjtx/default.nix +++ b/pkgs/applications/radio/wsjtx/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake, - docbook_xsl, fftw, fftwFloat, gfortran, libtool, qtbase, - qtmultimedia, qtserialport, texinfo, libusb1 }: + docbook_xsl, fftw, fftwFloat, gfortran, libtool, libusb1, qtbase, + qtmultimedia, qtserialport, qttools, texinfo }: stdenv.mkDerivation rec { name = "wsjtx-${version}"; - version = "2.0.1"; + version = "2.1.0"; # This is a "superbuild" tarball containing both wsjtx and a hamlib fork src = fetchurl { url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz"; - sha256 = "1kd0w57i9d9srbbfacza491vah8wa8100zjzzwqwdv70yy9qzw8q"; + sha256 = "04flhyfw0djnnbrzh3f5lx06bnn92khchz3bmswk8if8n8j58v4y"; }; # Hamlib builds with autotools, wsjtx builds with cmake # Omitting pkgconfig because it causes issues locating the built hamlib nativeBuildInputs = [ asciidoc asciidoctor autoconf automake cmake docbook_xsl gfortran libtool - texinfo + qttools texinfo ]; buildInputs = [ fftw fftwFloat libusb1 qtbase qtmultimedia qtserialport ]; @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Weak-signal digital communication modes for amateur radio"; longDescription = '' - WSJT-X implements communication protocols or "modes" called FT8, JT4, JT9, - JT65, QRA64, ISCAT, MSK144, and WSPR, as well as one called Echo for + WSJT-X implements communication protocols or "modes" called FT4, FT8, JT4, + JT9, JT65, QRA64, ISCAT, MSK144, and WSPR, as well as one called Echo for detecting and measuring your own radio signals reflected from the Moon. These modes were all designed for making reliable, confirmed ham radio contacts under extreme weak-signal conditions. @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { # Older licenses are for the statically-linked hamlib license = with licenses; [ gpl3Plus gpl2Plus lgpl21Plus ]; platforms = platforms.linux; - maintainers = [ maintainers.lasandell ]; + maintainers = with maintainers; [ lasandell ]; }; } diff --git a/pkgs/applications/radio/wsjtx/wsjtx.patch b/pkgs/applications/radio/wsjtx/wsjtx.patch index e92b420e58a..fd7c40fdc13 100644 --- a/pkgs/applications/radio/wsjtx/wsjtx.patch +++ b/pkgs/applications/radio/wsjtx/wsjtx.patch @@ -2,11 +2,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e7e816b..e7dbb14a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -860,6 +860,7 @@ find_package (Qt5Widgets 5 REQUIRED) - find_package (Qt5Multimedia 5 REQUIRED) - find_package (Qt5PrintSupport 5 REQUIRED) - find_package (Qt5Sql 5 REQUIRED) -+find_package (Qt5SerialPort 5 REQUIRED) +@@ -885,6 +885,6 @@ + # + + # Widgets finds its own dependencies. +-find_package (Qt5 COMPONENTS Widgets Multimedia PrintSupport Sql LinguistTools REQUIRED) ++find_package (Qt5 COMPONENTS Widgets Multimedia PrintSupport Sql LinguistTools SerialPort REQUIRED) if (WIN32) add_definitions (-DQT_NEEDS_QTMAIN) diff --git a/pkgs/applications/science/math/sage/patches/sympow-cache.patch b/pkgs/applications/science/math/sage/patches/sympow-cache.patch new file mode 100644 index 00000000000..20020d610f8 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/sympow-cache.patch @@ -0,0 +1,21 @@ +diff --git a/src/sage/lfunctions/sympow.py b/src/sage/lfunctions/sympow.py +index 1640ac4f6a..03578be7b8 100644 +--- a/src/sage/lfunctions/sympow.py ++++ b/src/sage/lfunctions/sympow.py +@@ -50,6 +50,7 @@ from __future__ import print_function, absolute_import + + import os + ++from sage.env import DOT_SAGE + from sage.structure.sage_object import SageObject + from sage.misc.all import pager, verbose + import sage.rings.all +@@ -76,7 +77,7 @@ class Sympow(SageObject): + """ + Used to call sympow with given args + """ +- cmd = 'sympow %s'%args ++ cmd = 'env SYMPOW_CACHEDIR="%s/sympow///" sympow %s' % (DOT_SAGE, args) + v = os.popen(cmd).read().strip() + verbose(v, level=2) + return v diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 51460154c5d..04a2cde9ba9 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -100,6 +100,11 @@ stdenv.mkDerivation rec { rev = "c11d9cfa23ff9f77681a8f12742f68143eed4504"; sha256 = "0xzra7mbgqvahk9v45bjwir2mqz73hrhhy314jq5nxrb35ysdxyi"; }) + + # After updating smypow to (https://trac.sagemath.org/ticket/3360) we can + # now set the cache dir to be withing the .sage directory. This is not + # strictly necessary, but keeps us from littering in the user's HOME. + ./patches/sympow-cache.patch ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/science/misc/motu-client/default.nix b/pkgs/applications/science/misc/motu-client/default.nix deleted file mode 100644 index d4367ef7e2d..00000000000 --- a/pkgs/applications/science/misc/motu-client/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ python27Packages, fetchurl, lib } : -python27Packages.buildPythonApplication rec { - pname = "motu-client"; - version = "1.5.00"; - - src = fetchurl { - url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${version}.tar.gz"; - sha256 = "1iqsws3wa2gpb36ms21xmaxfi83i8p8cdya4cxpn4r47c8mz74x8"; - }; - - meta = with lib; { - homepage = https://github.com/quiet-oceans/motuclient-setuptools; - description = "CLI to query oceanographic data to Motu servers"; - longDescription = '' - Access data from (motu)[https://sourceforge.net/projects/cls-motu/] servers. - This is a refactored fork of the original release in order to simplify integration, - deployment and packaging. Upstream code can be found at - https://sourceforge.net/projects/cls-motu/ . - ''; - license = licenses.lgpl3Plus; - maintainers = [ maintainers.lsix ]; - }; -} diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index 64b88dcc3d4..d43a05f1c61 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, hepmc, lhapdf, pythia, makeWrapper }: +{ stdenv, fetchurl, boost, hepmc2, lhapdf, pythia, makeWrapper }: stdenv.mkDerivation rec { name = "sacrifice-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "10bvpq63kmszy1habydwncm0j1dgvam0fkrmvkgbkvf804dcjp6g"; }; - buildInputs = [ boost hepmc lhapdf pythia ]; + buildInputs = [ boost hepmc2 lhapdf pythia ]; nativeBuildInputs = [ makeWrapper ]; patches = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-HepMC=${hepmc}" + "--with-HepMC=${hepmc2}" "--with-pythia=${pythia}" ]; diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index 7cb3e8881ca..1d61c612563 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, hepmc, fastjet, lhapdf, rivet, sqlite }: +{ stdenv, fetchurl, gfortran, hepmc2, fastjet, lhapdf, rivet, sqlite }: stdenv.mkDerivation rec { name = "sherpa-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-sqlite3=${sqlite.dev}" - "--enable-hepmc2=${hepmc}" + "--enable-hepmc2=${hepmc2}" "--enable-fastjet=${fastjet}" "--enable-lhapdf=${lhapdf}" "--enable-rivet=${rivet}" diff --git a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix index ed44043eb9a..98608b20b57 100644 --- a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix @@ -1,12 +1,12 @@ { stdenv, python3Packages }: with python3Packages; buildPythonApplication rec { pname = "pre-commit"; - version = "1.17.0"; + version = "1.18.1"; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "1qswk30w2cq8xvj16mhszsi3npp0z08s8lki1w67nif23c2kkk6c"; + sha256 = "0d9ja186g41kw3gmhbi6xjvaslz6z4xis4qn1q6jabkka6jz4qhp"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix index c183bbde7e6..0da0cfa02b6 100644 --- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix @@ -1,26 +1,30 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, git, perl }: stdenv.mkDerivation rec { - name = "topgit-0.9"; + pname = "topgit"; + version = "0.19.12"; - src = fetchurl { - url = "https://github.com/greenrd/topgit/archive/${name}.tar.gz"; - sha256 = "1z9x42a0cmn8n2n961qcfl522nd6j9a3dpx1jbqfp24ddrk5zd94"; + src = fetchFromGitHub { + owner = "mackyle"; + repo = "topgit"; + rev = "${pname}-${version}"; + sha256 = "1wvf8hmwwl7a2fr17cfs3pbxjccdsjw9ngzivxlgja0gvfz4hjd5"; }; - configurePhase = "makeFlags=prefix=$out"; + makeFlags = [ "prefix=${placeholder "out"}" ]; + + nativeBuildInputs = [ perl git ]; postInstall = '' - mkdir -p "$out/share/doc/${name}" "$out/etc/bash_completion.d/" - mv README "$out/share/doc/${name}/" - mv contrib/tg-completion.bash "$out/etc/bash_completion.d/" + install -Dm644 README -t"$out/share/doc/${pname}-${version}/" + install -Dm755 contrib/tg-completion.bash -t "$out/etc/bash_completion.d/" ''; - meta = { - homepage = https://github.com/greenrd/topgit; + meta = with stdenv.lib; { description = "TopGit manages large amount of interdependent topic branches"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ marcweber ]; + homepage = "https://github.com/mackyle/topgit"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ marcweber ]; }; } diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index ffca24ab27d..5b7fc119b5b 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -3,6 +3,7 @@ , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchurl, expat, gdk-pixbuf, libXdamage, libXrandr, dbus , dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme, at-spi2-atk, libuuid +, e2fsprogs, krb5 }: with stdenv.lib; @@ -12,11 +13,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "6.0.0"; + version = "6.1.1"; src = fetchurl { url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; - sha256 = "1ykjdnzl34pqr6dhfnswix44i412c7gcba1pk95a8670wmc29a1f"; + sha256 = "1ks8dscidqzmxy650xda6gvqg04iwidanidlsmgsi8365iqxvb1k"; }; libPath = makeLibraryPath [ @@ -55,6 +56,8 @@ stdenv.mkDerivation rec { openssl at-spi2-atk libuuid + e2fsprogs + krb5 ]; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 81949f95106..dffe3fadd74 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -19,10 +19,10 @@ let common = { version, sha256, extraBuildInputs ? [ ] }: stdenv.mkDerivation (rec { inherit version; - name = "subversion-${version}"; + pname = "subversion"; src = fetchurl { - url = "mirror://apache/subversion/${name}.tar.bz2"; + url = "mirror://apache/subversion/${pname}-${version}.tar.bz2"; inherit sha256; }; @@ -98,7 +98,7 @@ let meta = with stdenv.lib; { description = "A version control system intended to be a compelling replacement for CVS in the open source community"; license = licenses.asl20; - homepage = http://subversion.apache.org/; + homepage = "http://subversion.apache.org/"; maintainers = with maintainers; [ eelco lovek323 ]; platforms = platforms.linux ++ platforms.darwin; }; @@ -112,19 +112,19 @@ let in { subversion19 = common { - version = "1.9.10"; - sha256 = "1mwwbjs8nqr8qyc0xzy7chnylh4q3saycvly8rzq32swadbcca5f"; + version = "1.9.12"; + sha256 = "15z33gdnfiqblm5515020wfdwnp2837r3hnparava6m2fgyiafiw"; }; subversion_1_10 = common { - version = "1.10.4"; - sha256 = "18c1vdq32nil76w678lxmp73jsbqha3dmzgmfrj76nc0xjmywql2"; + version = "1.10.6"; + sha256 = "19zc215mhpnm92mlyl5jbv57r5zqp6cavr3s2g9yglp6j4kfgj0q"; extraBuildInputs = [ lz4 utf8proc ]; }; subversion = common { - version = "1.12.0"; - sha256 = "1prfbrd1jnndb5fcsvwnzvdi7c0bpirb6pmfq03w21x0v1rprbkz"; + version = "1.12.2"; + sha256 = "0wgpw3kzsiawzqk4y0xgh1z93kllxydgv4lsviim45y5wk4bbl1v"; extraBuildInputs = [ lz4 utf8proc ]; }; } diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index a683e192f11..1b80e379008 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, pkgconfig, qtbase -, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols -, qtgraphicaleffects, libmlt -, qmake, makeWrapper, qttools }: +{ stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, mkDerivation +, pkgconfig, qtbase, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets +, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools }: assert stdenv.lib.versionAtLeast libmlt.version "6.8.0"; assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; -stdenv.mkDerivation rec { +mkDerivation rec { name = "shotcut-${version}"; version = "19.07.15"; @@ -18,7 +17,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ makeWrapper pkgconfig qmake ]; + nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ SDL2 frei0r gettext mlt libmlt qtbase qtmultimedia qtwebkit qtx11extras qtwebsockets qtquickcontrols @@ -35,10 +34,15 @@ stdenv.mkDerivation rec { sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp ''; + qtWrapperArgs = [ + "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" + "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [jack1 SDL2 ]}" + "--prefix PATH : ${mlt}/bin" + ]; + postInstall = '' mkdir -p $out/share/shotcut cp -r src/qml $out/share/shotcut/ - wrapProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL2 ]} --prefix PATH : ${mlt}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index eb143412bd4..0b523d7b88d 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { project = "conmon"; name = "${project}-${version}"; - version = "0.3.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "containers"; repo = project; rev = "v${version}"; - sha256 = "0s23gm0cq4mylv882dr1n8bqql42674vny3z58yy77lwzmifc6id"; + sha256 = "1sigcylya668f5jzkf1vgfsgqy26l3glh9a3g8lhd2468ax6wymk"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index d495efc79ec..b3c6d585b8b 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "unifont-${version}"; - version = "12.1.01"; + version = "12.1.03"; ttf = fetchurl { url = "mirror://gnu/unifont/${name}/${name}.ttf"; - sha256 = "05knv3vlnk8ahaybwz6r95d3a1h7h7q9ll6ij2jl7zgjhcx4zy5d"; + sha256 = "10igjlf05d97h3vcggr2ahxmq9ljby4ypja2g4s9bvxs2w1si51p"; }; pcf = fetchurl { url = "mirror://gnu/unifont/${name}/${name}.pcf.gz"; - sha256 = "0q7dlnfzk49m4pgf2s7jv05jysa6sfxx3w0y17yis9j7g18lyw1b"; + sha256 = "1cd1fnk3m7giqp099kynnjj4m7q00lqm4ybqb1vzd2wi3j4a1awf"; }; nativeBuildInputs = [ mkfontscale mkfontdir ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0sgdr9dma4hkda3siydfvjrnzrpri8r7iqs2zqf77z9n4zn90qp5"; + outputHash = "0n3ms2k2mk7j6144l05c45smggwf3j5cwkaxhw93wf9hd1lhpwq1"; meta = with stdenv.lib; { description = "Unicode font for Base Multilingual Plane"; diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index ee2c2406bc6..21d31914479 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "12.1.02"; + version = "12.1.03"; in fetchzip rec { name = "unifont_upper-${version}"; @@ -9,7 +9,7 @@ in fetchzip rec { postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; - sha256 = "1bpzsgn64762sjkx4hssbm4qw0c1szwli38pch7r8z8hk4mgcv92"; + sha256 = "1w0bg276cyv6xs6clld8gv4w88rj9fw9rc8zs9ahc6y9hv677knj"; meta = with lib; { description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 5c2eae883cf..078145e1231 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -2,7 +2,7 @@ , intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr , p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib -, glib, gtk3, gnome-online-accounts, libgweather, libgdata }: +, glib, gtk3, gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; @@ -20,9 +20,14 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit tzdata; }) - ./hardcode-gsettings.patch ]; + prePatch = '' + substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas \ + --subst-var-by GDS_GSETTINGS_PATH "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}/glib-2.0/schemas" + patches="$patches $PWD/hardcode-gsettings.patch" + ''; + nativeBuildInputs = [ cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobject-introspection vala ]; @@ -43,11 +48,6 @@ stdenv.mkDerivation rec { "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" ]; - postPatch = '' - substituteInPlace src/libedataserver/e-source-registry.c --subst-var-by ESD_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas - ''; - - passthru = { updateScript = gnome3.updateScript { packageName = "evolution-data-server"; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch index 8b64b3df801..c499bac4552 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch @@ -1,36 +1,526 @@ -diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c -index 9c166dbaf..ef368f8d4 100644 ---- a/src/libedataserver/e-source-registry.c -+++ b/src/libedataserver/e-source-registry.c -@@ -116,6 +116,8 @@ struct _ESourceRegistryPrivate { - GHashTable *sources; - GMutex sources_lock; +diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c +index 2c0557c3c..5955aa55e 100644 +--- a/src/addressbook/libebook/e-book-client.c ++++ b/src/addressbook/libebook/e-book-client.c +@@ -1989,7 +1989,20 @@ e_book_client_get_self (ESourceRegistry *registry, -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; - GSettings *settings; + *out_client = book_client; - gboolean initialized; -@@ -1339,7 +1341,11 @@ source_registry_dispose (GObject *object) - if (priv->settings != NULL) { - g_signal_handlers_disconnect_by_data (priv->settings, object); - g_object_unref (priv->settings); -+ g_settings_schema_unref (priv->schema); -+ g_settings_schema_source_unref (priv->schema_source); - priv->settings = NULL; -+ priv->schema = NULL; -+ priv->schema_source = NULL; +- settings = g_settings_new (SELF_UID_PATH_ID); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ SELF_UID_PATH_ID, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + uid = g_settings_get_string (settings, SELF_UID_KEY); + g_object_unref (settings); + +@@ -2057,7 +2070,20 @@ e_book_client_set_self (EBookClient *client, + g_return_val_if_fail ( + e_contact_get_const (contact, E_CONTACT_UID) != NULL, FALSE); + +- settings = g_settings_new (SELF_UID_PATH_ID); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ SELF_UID_PATH_ID, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + g_settings_set_string ( + settings, SELF_UID_KEY, + e_contact_get_const (contact, E_CONTACT_UID)); +@@ -2093,8 +2119,20 @@ e_book_client_is_self (EContact *contact) + * unfortunately the API doesn't allow that. + */ + g_mutex_lock (&mutex); +- if (!settings) +- settings = g_settings_new (SELF_UID_PATH_ID); ++ if (!settings) { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ SELF_UID_PATH_ID, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + uid = g_settings_get_string (settings, SELF_UID_KEY); + g_mutex_unlock (&mutex); + +diff --git a/src/addressbook/libebook/e-book.c b/src/addressbook/libebook/e-book.c +index 3396b57c0..ac6420b2e 100644 +--- a/src/addressbook/libebook/e-book.c ++++ b/src/addressbook/libebook/e-book.c +@@ -2594,7 +2594,20 @@ e_book_get_self (ESourceRegistry *registry, + return FALSE; } - /* Chain up to parent's finalize() method. */ -@@ -1743,7 +1749,9 @@ e_source_registry_init (ESourceRegistry *registry) +- settings = g_settings_new (SELF_UID_PATH_ID); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ SELF_UID_PATH_ID, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + uid = g_settings_get_string (settings, SELF_UID_KEY); + g_object_unref (settings); + +@@ -2649,7 +2662,20 @@ e_book_set_self (EBook *book, + g_return_val_if_fail (E_IS_BOOK (book), FALSE); + g_return_val_if_fail (E_IS_CONTACT (contact), FALSE); + +- settings = g_settings_new (SELF_UID_PATH_ID); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ SELF_UID_PATH_ID, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + g_settings_set_string ( + settings, SELF_UID_KEY, + e_contact_get_const (contact, E_CONTACT_UID)); +@@ -2677,7 +2703,20 @@ e_book_is_self (EContact *contact) + + g_return_val_if_fail (E_IS_CONTACT (contact), FALSE); + +- settings = g_settings_new (SELF_UID_PATH_ID); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ SELF_UID_PATH_ID, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + uid = g_settings_get_string (settings, SELF_UID_KEY); + g_object_unref (settings); + +diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c +index de1716941..e83b104f1 100644 +--- a/src/calendar/backends/contacts/e-cal-backend-contacts.c ++++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c +@@ -1397,7 +1397,20 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) + (GDestroyNotify) g_free, + (GDestroyNotify) contact_record_free); + +- cbc->priv->settings = g_settings_new ("org.gnome.evolution-data-server.calendar"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server.calendar", ++ FALSE); ++ cbc->priv->settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + cbc->priv->notifyid = 0; + cbc->priv->update_alarms_id = 0; + cbc->priv->alarm_enabled = FALSE; +diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c +index b08a7f301..a49fe39c5 100644 +--- a/src/calendar/libecal/e-reminder-watcher.c ++++ b/src/calendar/libecal/e-reminder-watcher.c +@@ -2202,7 +2202,21 @@ e_reminder_watcher_init (EReminderWatcher *watcher) + + watcher->priv = G_TYPE_INSTANCE_GET_PRIVATE (watcher, E_TYPE_REMINDER_WATCHER, EReminderWatcherPrivate); + watcher->priv->cancellable = g_cancellable_new (); +- watcher->priv->settings = g_settings_new ("org.gnome.evolution-data-server.calendar"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server.calendar", ++ FALSE); ++ watcher->priv->settings = g_settings_new_full(schema, NULL, ++ NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + watcher->priv->scheduled = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, e_reminder_watcher_free_rd_slist); + watcher->priv->default_zone = icaltimezone_copy (zone); + watcher->priv->timers_enabled = TRUE; +diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c +index dcdc3eed0..fd2e428c2 100644 +--- a/src/camel/camel-cipher-context.c ++++ b/src/camel/camel-cipher-context.c +@@ -1635,7 +1635,20 @@ camel_cipher_can_load_photos (void) + GSettings *settings; + gboolean load_photos; + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + load_photos = g_settings_get_boolean (settings, "camel-cipher-load-photos"); + g_clear_object (&settings); + +diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c +index 1b3362886..f0811b292 100644 +--- a/src/camel/camel-gpg-context.c ++++ b/src/camel/camel-gpg-context.c +@@ -573,7 +573,20 @@ gpg_ctx_get_executable_name (void) + GSettings *settings; + gchar *path; + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + path = g_settings_get_string (settings, "camel-gpg-binary"); + g_clear_object (&settings); + +diff --git a/src/libedataserver/e-network-monitor.c b/src/libedataserver/e-network-monitor.c +index e0d8b87d6..3a4d5a359 100644 +--- a/src/libedataserver/e-network-monitor.c ++++ b/src/libedataserver/e-network-monitor.c +@@ -255,7 +255,20 @@ e_network_monitor_constructed (GObject *object) + /* Chain up to parent's method. */ + G_OBJECT_CLASS (e_network_monitor_parent_class)->constructed (object); + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + g_settings_bind ( + settings, "network-monitor-gio-name", + object, "gio-name", +diff --git a/src/libedataserver/e-oauth2-service-google.c b/src/libedataserver/e-oauth2-service-google.c +index f0c6f2cbf..0053e3ce6 100644 +--- a/src/libedataserver/e-oauth2-service-google.c ++++ b/src/libedataserver/e-oauth2-service-google.c +@@ -69,7 +69,20 @@ eos_google_read_settings (EOAuth2Service *service, + if (!value) { + GSettings *settings; + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + value = g_settings_get_string (settings, key_name); + g_object_unref (settings); + +diff --git a/src/libedataserver/e-oauth2-service-outlook.c b/src/libedataserver/e-oauth2-service-outlook.c +index 687c10d3b..684583c35 100644 +--- a/src/libedataserver/e-oauth2-service-outlook.c ++++ b/src/libedataserver/e-oauth2-service-outlook.c +@@ -70,7 +70,20 @@ eos_outlook_read_settings (EOAuth2Service *service, + if (!value) { + GSettings *settings; + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + value = g_settings_get_string (settings, key_name); + g_object_unref (settings); + +diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c +index 682673c16..436f52d5f 100644 +--- a/src/libedataserver/e-oauth2-service.c ++++ b/src/libedataserver/e-oauth2-service.c +@@ -95,7 +95,20 @@ eos_default_guess_can_process (EOAuth2Service *service, + name_len = strlen (name); + hostname_len = strlen (hostname); + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + values = g_settings_get_strv (settings, "oauth2-services-hint"); + g_object_unref (settings); + +diff --git a/src/libedataserver/e-proxy.c b/src/libedataserver/e-proxy.c +index 883379a60..989353494 100644 +--- a/src/libedataserver/e-proxy.c ++++ b/src/libedataserver/e-proxy.c +@@ -969,8 +969,37 @@ e_proxy_init (EProxy *proxy) + + proxy->priv->type = PROXY_TYPE_SYSTEM; + +- proxy->priv->evolution_proxy_settings = g_settings_new ("org.gnome.evolution.shell.network-config"); +- proxy->priv->proxy_settings = g_settings_new ("org.gnome.system.proxy"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution.shell.network-config", ++ FALSE); ++ proxy->priv->evolution_proxy_settings = g_settings_new_full(schema, ++ NULL, ++ NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@GDS_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.system.proxy", ++ FALSE); ++ proxy->priv->proxy_settings = g_settings_new_full(schema, ++ NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + proxy->priv->proxy_http_settings = g_settings_get_child (proxy->priv->proxy_settings, "http"); + proxy->priv->proxy_https_settings = g_settings_get_child (proxy->priv->proxy_settings, "https"); + proxy->priv->proxy_socks_settings = g_settings_get_child (proxy->priv->proxy_settings, "socks"); +diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c +index a5a30a3e1..5fbdf8190 100644 +--- a/src/libedataserver/e-source-registry.c ++++ b/src/libedataserver/e-source-registry.c +@@ -1749,7 +1749,21 @@ e_source_registry_init (ESourceRegistry *registry) g_mutex_init (®istry->priv->sources_lock); - registry->priv->settings = g_settings_new (GSETTINGS_SCHEMA); -+ GSettingsSchemaSource *schema_source = registry->priv->schema_source = g_settings_schema_source_new_from_directory ("@ESD_GSETTINGS_PATH@", g_settings_schema_source_get_default (), TRUE, NULL); -+ registry->priv->schema = g_settings_schema_source_lookup (schema_source, GSETTINGS_SCHEMA, FALSE); -+ registry->priv->settings = g_settings_new_full (registry->priv->schema, NULL, NULL); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ GSETTINGS_SCHEMA, ++ FALSE); ++ registry->priv->settings = g_settings_new_full(schema, NULL, ++ NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } g_signal_connect ( registry->priv->settings, "changed", +diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e-reminders-widget.c +index f89cd4a5c..06cca9b5f 100644 +--- a/src/libedataserverui/e-reminders-widget.c ++++ b/src/libedataserverui/e-reminders-widget.c +@@ -1642,7 +1642,21 @@ static void + e_reminders_widget_init (ERemindersWidget *reminders) + { + reminders->priv = G_TYPE_INSTANCE_GET_PRIVATE (reminders, E_TYPE_REMINDERS_WIDGET, ERemindersWidgetPrivate); +- reminders->priv->settings = g_settings_new ("org.gnome.evolution-data-server.calendar"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server.calendar", ++ FALSE); ++ reminders->priv->settings = g_settings_new_full(schema, NULL, ++ NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + reminders->priv->cancellable = g_cancellable_new (); + reminders->priv->is_empty = TRUE; + reminders->priv->is_mapped = FALSE; +diff --git a/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c b/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c +index 6f03053d6..dffc186c7 100644 +--- a/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c ++++ b/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c +@@ -706,7 +706,20 @@ evolution_source_registry_merge_autoconfig_sources (ESourceRegistryServer *serve + gchar *autoconfig_directory; + gint ii; + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + + autoconfig_sources = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, e_autoconfig_free_merge_source_data); + +diff --git a/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c b/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c +index d531cb9e2..c5b1c761c 100644 +--- a/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c ++++ b/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c +@@ -61,7 +61,20 @@ evolution_source_registry_migrate_proxies (ESourceRegistryServer *server) + extension_name = E_SOURCE_EXTENSION_PROXY; + extension = e_source_get_extension (source, extension_name); + +- settings = g_settings_new (NETWORK_CONFIG_SCHEMA_ID); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ NETWORK_CONFIG_SCHEMA_ID, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + + switch (g_settings_get_int (settings, "proxy-type")) { + case 1: +diff --git a/src/services/evolution-source-registry/evolution-source-registry.c b/src/services/evolution-source-registry/evolution-source-registry.c +index 1c0a11382..3e144845e 100644 +--- a/src/services/evolution-source-registry/evolution-source-registry.c ++++ b/src/services/evolution-source-registry/evolution-source-registry.c +@@ -181,7 +181,20 @@ main (gint argc, + + reload: + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + + if (!opt_disable_migration && !g_settings_get_boolean (settings, "migrated")) { + g_settings_set_boolean (settings, "migrated", TRUE); diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index e301305d405..6d487597900 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -3,6 +3,12 @@ , gtk3, gsettings-desktop-schemas, gnome-desktop, libxmlb, gnome-online-accounts, hicolor-icon-theme , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils }: +let + + withFwupd = stdenv.isx86_64 || stdenv.isi686; + +in + stdenv.mkDerivation rec { name = "gnome-software-${version}"; version = "3.32.4"; @@ -29,13 +35,16 @@ stdenv.mkDerivation rec { gtk3 glib packagekit appstream-glib libsoup gsettings-desktop-schemas gnome-desktop gspell json-glib libsecret ostree - polkit flatpak fwupd - libxmlb gnome-online-accounts + polkit flatpak libxmlb gnome-online-accounts + ] ++ stdenv.lib.optionals withFwupd [ + fwupd ]; mesonFlags = [ "-Dubuntu_reviews=false" "-Dgudev=false" + ] ++ stdenv.lib.optionals (!withFwupd) [ + "-Dfwupd=false" ]; passthru = { diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix index 6c1fa37e81a..984ab39c91a 100644 --- a/pkgs/development/compilers/dotnet/sdk/default.nix +++ b/pkgs/development/compilers/dotnet/sdk/default.nix @@ -12,14 +12,14 @@ let rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ]; in stdenv.mkDerivation rec { - version = "2.2.203"; - netCoreVersion = "2.2.4"; + version = "2.2.401"; + netCoreVersion = "2.2.6"; pname = "dotnet-sdk"; src = fetchurl { url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/${pname}-${version}-linux-x64.tar.gz"; # use sha512 from the download page - sha512 = "8DA955FA0AEEBB6513A6E8C4C23472286ED78BD5533AF37D79A4F2C42060E736FDA5FD48B61BF5AEC10BBA96EB2610FACC0F8A458823D374E1D437B26BA61A5C"; + sha512 = "05w3zk7bcd8sv3k4kplf20j906and2006g1fggq7y6kaxrlhdnpd6jhy6idm8v5bz48wfxga5b4yys9qx0fp3p8yl7wi67qljpzrq88"; }; sourceRoot = "."; diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index aaae9fa4ba9..3660e42e363 100644 --- a/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -1,24 +1,28 @@ { mkDerivation, fetchgit, ansi-terminal, ansi-wl-pprint, base, binary -, bytestring, Cabal, cmark, containers, directory, filepath, free -, HUnit, indents, json, mtl, optparse-applicative, parsec, process +, bytestring, cmark, containers, directory, filepath, free, HUnit +, indents, json, mtl, optparse-applicative, parsec, process , QuickCheck, quickcheck-io, split, stdenv, tasty, tasty-golden , tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "elm-format"; - version = "0.8.1"; + version = "0.8.2"; src = fetchgit { url = "https://github.com/avh4/elm-format"; - sha256 = "0p1dy1m6illsl7i04zsv5jqw7i4znv7pfpdfm53zy0k7mq0fk09j"; - rev = "89694e858664329e3cbdaeb71b15c4456fd739ff"; + sha256 = "0ly37fszrfviwqgrww57ikdcr7i8lcpczhqm8xqp5s7mrlpdxv7z"; + rev = "ab3627cce01e5556b3fe8c2b5e3d92b80bfc74af"; }; postPatch = '' - sed -i "s|desc <-.*||" ./Setup.hs - sed -i "s|gitDescribe = .*|gitDescribe = \\\\\"0.8.1\\\\\"\"|" ./Setup.hs + mkdir -p ./generated + cat < ./generated/Build_elm_format.hs + module Build_elm_format where + + gitDescribe :: String + gitDescribe = "0.8.2" + EOHS ''; - isLibrary = true; + isLibrary = false; isExecutable = true; - setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base binary bytestring containers directory filepath free indents json mtl optparse-applicative diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index c26ac151af4..98cc2804f60 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { name = "fasm-bin-${version}"; - version = "1.73.12"; + version = "1.73.15"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "19x5244bcg97mnx871daksj98fg4zxc8jmihl0napcd77xmiga8s"; + sha256 = "0yc30y4hkr226629347gcrzi153f10hcp5q7bm3q6ir3gx35xa39"; }; installPhase = '' diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix index 9390cbde637..73dd90ab4a1 100644 --- a/pkgs/development/compilers/icedtea-web/default.nix +++ b/pkgs/development/compilers/icedtea-web/default.nix @@ -1,30 +1,55 @@ -{ stdenv, fetchurl, jdk, gtk2, xulrunner, zip, pkgconfig, perl, npapi_sdk, bash, bc }: +{ stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkgconfig, npapi_sdk, bash, bc }: stdenv.mkDerivation rec { name = "icedtea-web-${version}"; - version = "1.7.1"; + version = "1.8.3"; - src = fetchurl { - url = "http://icedtea.wildebeest.org/download/source/${name}.tar.gz"; - sha256 = "1b9z0i9b1dsc2qpfdzbn2fi4vi3idrhm7ig45g1ny40ymvxcwwn9"; + src = fetchFromGitHub { + owner = "AdoptOpenJDK"; + repo = "IcedTea-Web"; + rev = name; + sha256 = "0bm5k11i2vgb54ch1bawsmjbwnqnp04saadwm2f2mggmmdc6b1qq"; }; - nativeBuildInputs = [ pkgconfig bc perl ]; - buildInputs = [ gtk2 xulrunner zip npapi_sdk ]; + nativeBuildInputs = [ autoreconfHook pkgconfig bc ]; + buildInputs = [ cargo rustc glib xulrunner zip npapi_sdk ]; preConfigure = '' - #patchShebangs javac.in configureFlagsArray+=("BIN_BASH=${bash}/bin/bash") ''; + patches = [ ./patches/0001-make-cargo-work-with-nix-build-on-linux.patch ]; + + doCheck = true; + preCheck = '' + # Needed for the below rust-launcher tests to pass + # dirs_paths_helper::tests::check_config_files_paths + # dirs_paths_helper::tests::check_legacy_config_files_paths + + mkdir -p $HOME/.icedtea + touch $HOME/.icedtea/deployment.properties + + mkdir -p $XDG_CONFIG_HOME/icedtea-web + touch $XDG_CONFIG_HOME/icedtea-web/deployment.properties + ''; + + HOME = "/build"; + XDG_CONFIG_HOME = "/build"; + configureFlags = [ + "--with-itw-libs=DISTRIBUTION" "--with-jdk-home=${jdk.home}" "--disable-docs" ]; mozillaPlugin = "/lib"; + postInstall = '' + mkdir -p $out/share/applications + cp javaws.desktop itweb-settings.desktop policyeditor.desktop $out/share/applications + ''; + meta = { description = "Java web browser plugin and an implementation of Java Web Start"; longDescription = '' @@ -32,7 +57,7 @@ stdenv.mkDerivation rec { programming language and an implementation of Java Web Start, originally based on the NetX project. ''; - homepage = http://icedtea.classpath.org/wiki/IcedTea-Web; + homepage = https://github.com/adoptopenjdk/icedtea-web; maintainers = with stdenv.lib.maintainers; [ wizeman ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/compilers/icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch b/pkgs/development/compilers/icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch new file mode 100644 index 00000000000..85cad6cf467 --- /dev/null +++ b/pkgs/development/compilers/icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch @@ -0,0 +1,46 @@ +Subject: [PATCH] make cargo work with nix-build on linux + +--- + .cargo/config | 2 ++ + rust-launcher/Cargo.lock | 4 ++++ + rust-launcher/Cargo.toml | 7 ++++--- + 3 files changed, 10 insertions(+), 3 deletions(-) + create mode 100644 .cargo/config + create mode 100644 rust-launcher/Cargo.lock + +diff --git a/.cargo/config b/.cargo/config +new file mode 100644 +index 0000000..03ec4a2 +--- /dev/null ++++ b/.cargo/config +@@ -0,0 +1,2 @@ ++[net] ++offline=true +diff --git a/rust-launcher/Cargo.lock b/rust-launcher/Cargo.lock +new file mode 100644 +index 0000000..6055cc0 +--- /dev/null ++++ b/rust-launcher/Cargo.lock +@@ -0,0 +1,4 @@ ++[[package]] ++name = "launcher" ++version = "1.8.0" ++ +diff --git a/rust-launcher/Cargo.toml b/rust-launcher/Cargo.toml +index 61ee308..5e6e91b 100644 +--- a/rust-launcher/Cargo.toml ++++ b/rust-launcher/Cargo.toml +@@ -3,6 +3,7 @@ name = "launcher" + version = "1.8.0" + authors = ["https://icedtea.classpath.org/wiki/IcedTea-Web"] + +-[dependencies] +-[target.'cfg(windows)'.dependencies] +-dunce = "0.1.1" ++[workspace] ++# We need this too or cargo will fail. Some files seem to be copied around and ++# cargo thinks we are in a workspace, so let's exclude everything. ++exclude = ["*"] +-- +2.19.2 + diff --git a/pkgs/development/compilers/llvm/8/libunwind.nix b/pkgs/development/compilers/llvm/8/libunwind.nix index 64832002853..75edd1fff54 100644 --- a/pkgs/development/compilers/llvm/8/libunwind.nix +++ b/pkgs/development/compilers/llvm/8/libunwind.nix @@ -1,4 +1,4 @@ -{ stdenv, version, fetch, cmake, fetchpatch }: +{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }: stdenv.mkDerivation { name = "libunwind-${version}"; @@ -19,4 +19,6 @@ stdenv.mkDerivation { ]; enableParallelBuilding = true; + + cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; } diff --git a/pkgs/development/compilers/ocaml/4.08.nix b/pkgs/development/compilers/ocaml/4.08.nix index 4f9b8ebd294..11c22e636ef 100644 --- a/pkgs/development/compilers/ocaml/4.08.nix +++ b/pkgs/development/compilers/ocaml/4.08.nix @@ -1,8 +1,8 @@ import ./generic.nix { major_version = "4"; minor_version = "08"; - patch_version = "0"; - sha256 = "0si976y8snbmhm96671di65z0rrdyldxd55wjxn2mkn6654nryna"; + patch_version = "1"; + sha256 = "18sycl3zmgb8ghpxymriy5d72gvw7m5ra65v51hcrmzzac21hkyd"; # If the executable is stripped it does not work dontStrip = true; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index e16e2c514a8..35a1ee37b36 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { pname = "ponyc"; - version = "0.28.1"; + version = "0.30.0"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "1yi41a03039yz9rf34l9iq8haf5vb6gwzplr04rahfhd8xsd38gq"; + sha256 = "1gs9x4rw4mfv499j3k1brm8gbz7pjl8dyr7v68pa2f563cbzwaq9"; }; buildInputs = [ llvm makeWrapper which ]; diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix index 821a9b8125c..2aab6a99a1c 100644 --- a/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/pkgs/development/compilers/ponyc/pony-stable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pony-stable-${version}"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "ponylang"; repo = "pony-stable"; rev = version; - sha256 = "0zzcq0vsl6kcrsxwqzd3s9mq7aq5sg8si5c83rxyi9n6a06gnbh7"; + sha256 = "1wiinw35bp3zpq9kx61x2zvid7ln00jrw052ah8801s0d9dbwrdr"; }; buildInputs = [ ponyc ]; diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix index d7315b73c9b..8926fced482 100644 --- a/pkgs/development/compilers/qbe/default.nix +++ b/pkgs/development/compilers/qbe/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "qbe"; - version = "unstable-2019-05-15"; + version = "unstable-2019-07-11"; src = fetchgit { url = "git://c9x.me/qbe.git"; - rev = "acc3af47330fd6610cf0fbdb28e9fbd05160888f"; - sha256 = "1c8ynqbakgz3hfdcyhwdmz7i1hnyd9m25f9y47sc21bvxwfrbzpi"; + rev = "7bf08ff50729037c8820b26d085905175b5593c8"; + sha256 = "0w1yack5ky6x6lbw8vn6swsy8s90n6ny0jpkw0866ja677z7qz34"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/compilers/sagittarius-scheme/default.nix b/pkgs/development/compilers/sagittarius-scheme/default.nix new file mode 100644 index 00000000000..4b1358b7247 --- /dev/null +++ b/pkgs/development/compilers/sagittarius-scheme/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, fetchurl +, cmake +, pkgconfig +, libffi +, boehmgc +, openssl +, zlib +, odbcSupport ? true +, libiodbc +}: + +let platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" + else if (stdenv.isLinux or stdenv.isBSD) then "LD_LIBRARY_PATH" + else throw "unsupported platform"; +in +stdenv.mkDerivation rec { + pname = "sagittarius-scheme"; + version = "0.9.6"; + src = fetchurl { + url = "https://bitbucket.org/ktakashi/${pname}/downloads/sagittarius-${version}.tar.gz"; + sha256 = "03nvvvfd4gdlvq244zpnikxxajp6w8jj3ymw4bcq83x7zilb2imr"; + }; + preBuild = '' + # since we lack rpath during build, need to explicitly add build path + # to LD_LIBRARY_PATH so we can load libsagittarius.so as required to + # build extensions + export ${platformLdLibraryPath}="$(pwd)/build" + ''; + nativeBuildInputs = [ pkgconfig cmake ]; + + buildInputs = [ libffi boehmgc openssl zlib ] ++ stdenv.lib.optional odbcSupport libiodbc; + + meta = with stdenv.lib; { + description = "An R6RS/R7RS Scheme system"; + longDescription = '' + Sagittarius Scheme is a free Scheme implementation supporting + R6RS/R7RS specification. + + Features: + + - Builtin CLOS. + - Common Lisp like reader macro. + - Cryptographic libraries. + - Customisable cipher and hash algorithm. + - Custom codec mechanism. + - CL like keyword lambda syntax (taken from Gauche). + - Constant definition form. (define-constant form). + - Builtin regular expression + - mostly works O(n) + - Replaceable reader + ''; + homepage = "https://bitbucket.org/ktakashi/sagittarius-scheme"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ abbe ]; + }; +} diff --git a/pkgs/development/compilers/scala/2.12.nix b/pkgs/development/compilers/scala/2.12.nix index ce863ef9c91..0e4207dccac 100644 --- a/pkgs/development/compilers/scala/2.12.nix +++ b/pkgs/development/compilers/scala/2.12.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.12.8"; + name = "scala-2.12.9"; src = fetchurl { url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "18w0vdbsp0q5rxglgalwlgkggld926bqi1fxc598rn4gh46a03j4"; + sha256 = "0wpnxrhnhhscfk0k8yxk86akpvxbr5w1i8jb2igj2q4vax7h97sy"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix new file mode 100644 index 00000000000..3bdf234f915 --- /dev/null +++ b/pkgs/development/compilers/unison/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, autoPatchelfHook +, ncurses5, zlib, gmp +}: + +stdenv.mkDerivation rec { + pname = "unison-code-manager"; + milestone_id = "M1c"; + version = "1.0.${milestone_id}-alpha"; + + src = if (stdenv.isDarwin) then + fetchurl { + url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz"; + sha256 = "03q02r7qc7ybqz16kmpk2d8l9vx28kaj9x59mlxzi8a4mr0j3vzb"; + } + else + fetchurl { + url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz"; + sha256 = "1iwynqnp1i39pyq9wc01x7y22y1qa0rrjlx40jjdgnj23y1r6jk4"; + }; + + # The tarball is just the prebuilt binary, in the archive root. + sourceRoot = "."; + dontBuild = true; + dontConfigure = true; + + nativeBuildInputs = stdenv.lib.optional (!stdenv.isDarwin) autoPatchelfHook; + buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ ncurses5 zlib gmp ]; + + installPhase = '' + mkdir -p $out/bin + mv ucm $out/bin + ''; + + meta = with stdenv.lib; { + description = "Modern, statically-typed purely functional language"; + homepage = http://unisonweb.org/posts/; + license = licenses.free; + maintainers = [ maintainers.virusdave ]; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index 0b97358d863..73a0a07f704 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -3,9 +3,9 @@ let params = if stdenv.lib.versionAtLeast coq.coq-version "8.7" then { - version = "3.4.0"; - uid = "37524"; - sha256 = "023j9sd64brqvjdidqkn5m8d7a93zd9r86ggh573z9nkjm2m7vvg"; + version = "3.4.1"; + uid = "38104"; + sha256 = "1zklv2w34k866fpwmw8q692mid5n6s75d2mmhhigrzpx5l3d4z6y"; } else { version = "3.3.0"; uid = "37077"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ which ]; buildInputs = [ coq ]; - propagatedBuildInputs = [ bignums coquelicot flocq mathcomp ]; + propagatedBuildInputs = [ bignums coquelicot flocq ]; configurePhase = "./configure --libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Interval"; buildPhase = "./remake"; @@ -38,7 +38,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" ]; }; diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index e4a548ae376..be885d990ec 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -5,13 +5,13 @@ let name = "${pname}-${version}"; pname = "guile-sdl2"; - version = "0.3.1"; + version = "0.4.0"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "https://files.dthompson.us/${pname}/${name}.tar.gz"; - sha256 = "0bw7x2lx90k4banc5k7yfkn3as93y25gr1xdr225ll7lmij21k64"; + sha256 = "0zcxwgyadwpbhq6h5mv2569c3kalgra26zc186y9fqiyyzmh1v9s"; }; nativeBuildInputs = [ libtool pkgconfig ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6ac2ccf45c1..779788785d0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -167,9 +167,6 @@ self: super: { inline-java = addBuildDepend super.inline-java pkgs.jdk; - # https://github.com/mvoidex/hsdev/issues/11 - hsdev = dontHaddock super.hsdev; - # Upstream notified by e-mail. permutation = dontCheck super.permutation; @@ -857,7 +854,7 @@ self: super: { # Wrap the generated binaries to include their run-time dependencies in # $PATH. Also, cryptol needs a version of sbl that's newer than what we have # in LTS-13.x. - cryptol = overrideCabal (super.cryptol.override { sbv = self.sbv_8_3; }) (drv: { + cryptol = overrideCabal super.cryptol (drv: { buildTools = drv.buildTools or [] ++ [ pkgs.makeWrapper ]; postInstall = drv.postInstall or "" + '' for b in $out/bin/cryptol $out/bin/cryptol-html; do @@ -1035,8 +1032,6 @@ self: super: { # https://github.com/dmwit/encoding/pull/3 encoding = appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch; - clock = dontCheck (appendPatch super.clock ./patches/clock-0.7.2.patch); - # Work around overspecified constraint on github ==0.18. github-backup = doJailbreak super.github-backup; @@ -1094,10 +1089,6 @@ self: super: { # haskell-names-0.9.4: Break out of “tasty >=0.12 && <1.2” haskell-names = doJailbreak super.haskell-names; - haskell-names_0_9_6 = super.haskell-names_0_9_6.overrideScope (self: super: { - haskell-src-exts = self.haskell-src-exts_1_21_0; - }); - # hdocs-0.5.3.1: Break out of “haddock-api ==2.21.*” # cannot use doJailbreak due to https://github.com/peti/jailbreak-cabal/issues/7 hdocs = overrideCabal super.hdocs (drv: { @@ -1106,11 +1097,6 @@ self: super: { ''; }); - hsdev_0_3_3_2 = super.hsdev_0_3_3_2.overrideScope (self: super: { - haskell-names = self.haskell-names_0_9_6; - network = self.network_3_0_1_1; - }); - # Break out of tasty >=0.10 && <1.2. aeson-compat = doJailbreak super.aeson-compat; @@ -1120,14 +1106,6 @@ self: super: { # Generate shell completion. cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: { - ansi-terminal = self.ansi-terminal_0_9_1; - concurrent-output = self.concurrent-output_1_10_10; # needed for new ansi-terminal version - hi-file-parser = dontCheck (unmarkBroken super.hi-file-parser); # Avoid depending on newer hspec versions. - http-download = dontCheck (unmarkBroken super.http-download); - pantry = dontCheck (unmarkBroken super.pantry); - rio = self.rio_0_1_11_0; - rio-prettyprint = unmarkBroken super.rio-prettyprint; - unliftio = self.unliftio_0_2_12; })); # musl fixes @@ -1203,10 +1181,6 @@ self: super: { # https://github.com/mgajda/json-autotype/issues/25 json-autotype = dontCheck super.json-autotype; - # The LTS-13.x versions doesn't suffice to build these packages. - hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; }); - hoogle = super.hoogle.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; }); - # Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30 tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1 these = doJailbreak super.these; # until these >= 0.7.6 @@ -1244,17 +1218,8 @@ self: super: { ''; }); - # Use latest pandoc despite what LTS says. - # Test suite fails in both 2.5 and 2.6: https://github.com/jgm/pandoc/issues/5309. - cmark-gfm = self.cmark-gfm_0_2_0; - pandoc = dontCheck (doDistribute super.pandoc_2_7_3); # test suite failure: https://github.com/jgm/pandoc/issues/5582 - pandoc-citeproc = doDistribute super.pandoc-citeproc_0_16_2; - skylighting = self.skylighting_0_8_2; - skylighting-core = self.skylighting-core_0_8_2; - - # Current versions of tasty-hedgehog need hedgehog 1.x, which - # we don't have in LTS-13.x. - tasty-hedgehog = super.tasty-hedgehog.override { hedgehog = self.hedgehog_1_0; }; + # test suite failure: https://github.com/jgm/pandoc/issues/5582 + pandoc = dontCheck super.pandoc; # The latest release version is ancient. You really need this tool from git. haskell-ci = generateOptparseApplicativeCompletion "haskell-ci" @@ -1275,10 +1240,10 @@ self: super: { yesod-markdown = doJailbreak super.yesod-markdown; # These packages needs network 3.x, which is not in LTS-13.x. - network-bsd = super.network-bsd.override { network = self.network_3_0_1_1; }; + network-bsd_2_8_1_0 = super.network-bsd_2_8_1_0.override { network = self.network_3_0_1_1; }; lambdabot-core = super.lambdabot-core.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; }); lambdabot-reference-plugins = super.lambdabot-reference-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; }); - lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; socks = self.socks_0_6_0; connection = self.connection_0_3_0; haskell-src-exts = self.haskell-src-exts_1_21_0; }); + lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; }); # Some tests depend on a postgresql instance # Haddock failure: https://github.com/haskell/haddock/issues/979 @@ -1308,10 +1273,13 @@ self: super: { # Test suite won't link for no apparent reason. constraints-deriving = dontCheck super.constraints-deriving; - # The old LTS-13.x version does not compile. - ip = self.ip_1_5_1; + # need newer version of ghc-libparser + hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_8_0_20190723; }; - # Needs deque >= 0.3, but latest version on stackage is 2.7 - butcher = super.butcher.override { deque = self.deque_0_4_2_3; }; + # https://github.com/sol/hpack/issues/366 + hpack = dontCheck super.hpack; + + # QuickCheck >=2.3 && <2.13, hspec >=2.1 && <2.7 + graphviz = dontCheck super.graphviz; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index de01fe4cd12..76aabb91561 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -39,9 +39,9 @@ self: super: { # These are now core libraries in GHC 8.4.x. mtl = self.mtl_2_2_2; - parsec = self.parsec_3_1_13_0; + parsec = self.parsec_3_1_14_0; stm = self.stm_2_5_0_0; - text = self.text_1_2_3_1; + text = self.text_1_2_4_0; # Build with the latest Cabal version, which works best albeit not perfectly. jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_2_2_0_1; }; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 6eeade90a07..d6344717dfa 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 13.30 + # LTS Haskell 14.0 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -55,29 +55,27 @@ default-package-overrides: - adjunctions ==4.4 - adler32 ==0.1.2.0 - advent-of-code-api ==0.1.2.3 - - aern2-mp ==0.1.3.1 - - aeson ==1.4.2.0 + - aeson ==1.4.4.0 - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.0 - - aeson-casing ==0.1.1.0 + - aeson-casing ==0.2.0.0 - aeson-compat ==0.3.9 - aeson-diff ==1.1.0.7 - - aeson-extra ==0.4.1.1 + - aeson-extra ==0.4.1.2 - aeson-generic-compat ==0.0.1.3 - aeson-iproute ==0.2 - aeson-picker ==0.1.0.4 - aeson-pretty ==0.8.7 - aeson-qq ==0.8.2 - - aeson-typescript ==0.1.3.0 - aeson-utils ==0.3.0.2 - aeson-yak ==0.1.1.3 - al ==0.1.4.2 - - alarmclock ==0.6.0.2 + - alarmclock ==0.7.0.1 - alerts ==0.1.2.0 - alex ==3.2.4 - alg ==0.2.10.0 - - algebraic-graphs ==0.3 - - Allure ==0.8.3.0 + - algebraic-graphs ==0.4 + - Allure ==0.9.5.0 - almost-fix ==0.0.2 - alsa-core ==0.5.0.1 - alsa-mixer ==0.3.0 @@ -86,112 +84,15 @@ default-package-overrides: - alternative-vector ==0.0.0 - alternators ==1.0.0.0 - ALUT ==2.4.0.3 - - amazonka ==1.6.1 - - amazonka-apigateway ==1.6.1 - - amazonka-application-autoscaling ==1.6.1 - - amazonka-appstream ==1.6.1 - - amazonka-athena ==1.6.1 - - amazonka-autoscaling ==1.6.1 - - amazonka-budgets ==1.6.1 - - amazonka-certificatemanager ==1.6.1 - - amazonka-cloudformation ==1.6.1 - - amazonka-cloudfront ==1.6.1 - - amazonka-cloudhsm ==1.6.1 - - amazonka-cloudsearch ==1.6.1 - - amazonka-cloudsearch-domains ==1.6.1 - - amazonka-cloudtrail ==1.6.1 - - amazonka-cloudwatch ==1.6.1 - - amazonka-cloudwatch-events ==1.6.1 - - amazonka-cloudwatch-logs ==1.6.1 - - amazonka-codebuild ==1.6.1 - - amazonka-codecommit ==1.6.1 - - amazonka-codedeploy ==1.6.1 - - amazonka-codepipeline ==1.6.1 - - amazonka-cognito-identity ==1.6.1 - - amazonka-cognito-idp ==1.6.1 - - amazonka-cognito-sync ==1.6.1 - - amazonka-config ==1.6.1 - - amazonka-core ==1.6.1 - - amazonka-datapipeline ==1.6.1 - - amazonka-devicefarm ==1.6.1 - - amazonka-directconnect ==1.6.1 - - amazonka-discovery ==1.6.1 - - amazonka-dms ==1.6.1 - - amazonka-ds ==1.6.1 - - amazonka-dynamodb ==1.6.1 - - amazonka-dynamodb-streams ==1.6.1 - - amazonka-ec2 ==1.6.1 - - amazonka-ecr ==1.6.1 - - amazonka-ecs ==1.6.1 - - amazonka-efs ==1.6.1 - - amazonka-elasticache ==1.6.1 - - amazonka-elasticbeanstalk ==1.6.1 - - amazonka-elasticsearch ==1.6.1 - - amazonka-elastictranscoder ==1.6.1 - - amazonka-elb ==1.6.1 - - amazonka-elbv2 ==1.6.1 - - amazonka-emr ==1.6.1 - - amazonka-gamelift ==1.6.1 - - amazonka-glacier ==1.6.1 - - amazonka-health ==1.6.1 - - amazonka-iam ==1.6.1 - - amazonka-importexport ==1.6.1 - - amazonka-inspector ==1.6.1 - - amazonka-iot ==1.6.1 - - amazonka-iot-dataplane ==1.6.1 - - amazonka-kinesis ==1.6.1 - - amazonka-kinesis-analytics ==1.6.1 - - amazonka-kinesis-firehose ==1.6.1 - - amazonka-kms ==1.6.1 - - amazonka-lambda ==1.6.1 - - amazonka-lightsail ==1.6.1 - - amazonka-marketplace-analytics ==1.6.1 - - amazonka-marketplace-metering ==1.6.1 - - amazonka-ml ==1.6.1 - - amazonka-opsworks ==1.6.1 - - amazonka-opsworks-cm ==1.6.1 - - amazonka-pinpoint ==1.6.1 - - amazonka-polly ==1.6.1 - - amazonka-rds ==1.6.1 - - amazonka-redshift ==1.6.1 - - amazonka-rekognition ==1.6.1 - - amazonka-route53 ==1.6.1 - - amazonka-route53-domains ==1.6.1 - - amazonka-s3 ==1.6.1 - - amazonka-sdb ==1.6.1 - - amazonka-servicecatalog ==1.6.1 - - amazonka-ses ==1.6.1 - - amazonka-shield ==1.6.1 - - amazonka-sms ==1.6.1 - - amazonka-snowball ==1.6.1 - - amazonka-sns ==1.6.1 - - amazonka-sqs ==1.6.1 - - amazonka-ssm ==1.6.1 - - amazonka-stepfunctions ==1.6.1 - - amazonka-storagegateway ==1.6.1 - - amazonka-sts ==1.6.1 - - amazonka-support ==1.6.1 - - amazonka-swf ==1.6.1 - - amazonka-test ==1.6.1 - - amazonka-waf ==1.6.1 - - amazonka-workspaces ==1.6.1 - - amazonka-xray ==1.6.1 - - amqp ==0.18.2 + - amqp ==0.18.3 - annotated-wl-pprint ==0.7.0 - - ansi-terminal ==0.8.2 - - ansi-wl-pprint ==0.6.8.2 - - antiope-athena ==6.2.0 - - antiope-core ==6.2.0 - - antiope-dynamodb ==6.2.0 - - antiope-messages ==6.2.0 - - antiope-s3 ==6.2.0 - - antiope-sns ==6.2.0 - - antiope-sqs ==6.2.0 + - ansi-terminal ==0.9.1 + - ansi-wl-pprint ==0.6.9 - ANum ==0.2.0.2 - aos-signature ==0.1.1 - - apecs ==0.7.3 - - apecs-gloss ==0.2.0 - - apecs-physics ==0.3.2 + - apecs ==0.8.1 + - apecs-gloss ==0.2.1 + - apecs-physics ==0.4.0 - api-field-json-th ==0.1.0.2 - appar ==0.1.8 - appendmap ==0.1.5 @@ -200,16 +101,17 @@ default-package-overrides: - approximate ==0.3.1 - app-settings ==0.2.0.12 - arbor-lru-cache ==0.1.1.0 - - arithmoi ==0.8.0.0 + - 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 ==3.2.0 + - asif ==6.0.1 - asn1-encoding ==0.9.5 - asn1-parse ==0.9.4 - asn1-types ==0.3.3 - assert-failure ==0.1.2.2 + - assoc ==1 - astro ==0.4.2.1 - async ==2.2.2 - async-extra ==0.2.0.0 @@ -228,21 +130,22 @@ default-package-overrides: - attoparsec-path ==0.0.0.1 - attoparsec-uri ==0.0.7 - audacity ==0.0.2 + - aur ==6.2.0.1 - authenticate ==1.3.4 - authenticate-oauth ==1.6 - auto ==0.4.3.1 - autoexporter ==1.1.13 - - auto-update ==0.1.5 + - auto-update ==0.1.6 - avers ==0.0.17.1 - avers-api ==0.1.0 - avers-server ==0.1.0.1 - - avro ==0.4.4.3 + - avro ==0.4.5.1 - avwx ==0.3.0.2 + - aws-cloudfront-signed-cookies ==0.2.0.1 - aws-lambda-haskell-runtime ==2.0.1 - - axel ==0.0.9 - backprop ==0.2.6.2 - - bank-holidays-england ==0.1.0.8 - - barbies ==1.1.2.1 + - bank-holidays-england ==0.2.0.1 + - barbies ==1.1.3.0 - barrier ==0.1.1 - base16-bytestring ==0.1.1.6 - base32string ==0.9.1 @@ -252,7 +155,7 @@ default-package-overrides: - base64-string ==0.2 - base-compat ==0.10.5 - base-compat-batteries ==0.10.5 - - basement ==0.0.10 + - basement ==0.0.11 - base-noprelude ==4.12.0.0 - base-orphans ==0.8.1 - base-prelude ==1.3 @@ -262,25 +165,31 @@ default-package-overrides: - bbdb ==0.8 - bcrypt ==0.0.11 - beam-core ==0.8.0.0 + - beam-migrate ==0.4.0.1 + - beam-mysql ==0.2.0.0 + - beam-postgres ==0.4.0.0 + - beam-sqlite ==0.4.0.0 - bench ==1.0.12 - benchpress ==0.2.2.12 + - bench-show ==0.3.0 - bencode ==0.6.0.0 + - bencoding ==0.4.5.1 - between ==0.11.0.0 - bibtex ==0.1.0.6 - bifunctors ==5.5.4 - - bimap ==0.3.3 + - bimap ==0.4.0 - bimap-server ==0.1.0.1 - binary-bits ==0.5 - binary-conduit ==1.3.1 - binary-ext ==2.0.4 - binary-ieee754 ==0.1.0.0 - binary-list ==1.1.1.2 - - binary-orphans ==0.1.8.0 + - binary-orphans ==1.0.1 - binary-parser ==0.5.5 - binary-parsers ==0.2.4.0 - binary-search ==1.0.0.3 - binary-shared ==0.8.3 - - binary-tagged ==0.1.5.2 + - binary-tagged ==0.2 - bindings-DSL ==1.0.25 - bindings-GLFW ==3.2.1.1 - bindings-libzip ==1.0.1 @@ -294,9 +203,11 @@ default-package-overrides: - bits ==0.5.2 - bitset-word8 ==0.1.1.1 - bits-extra ==0.0.1.3 - - bit-stream ==0.1.0.2 + - bitvec ==1.0.0.0 - bitx-bitcoin ==0.12.0.0 - - blake2 ==0.2.0 + - blake2 ==0.3.0 + - blas-carray ==0.1.0.1 + - blas-comfort-array ==0.0.0.2 - blas-ffi ==0.1 - blas-hs ==0.1.1.0 - blaze-bootstrap ==0.1.0.1 @@ -307,20 +218,24 @@ default-package-overrides: - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.1.0 - bmp ==1.2.6.3 - - bno055-haskell ==0.1.0 + - board-games ==0.3 - boltzmann-samplers ==0.1.1.0 - Boolean ==0.2.4 - boolean-like ==0.1.1.0 - boolean-normal-forms ==0.0.1 - boolsimplifier ==0.1.8 + - boots ==0.0.3 - bordacount ==0.1.0.0 - boring ==0.1.2 - both ==0.1.1.0 - bound ==2.0.1 - BoundedChan ==1.0.3.0 + - bounded-queue ==1.0.0 - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.5 + - brick ==0.47.1 + - brittany ==0.12.0.0 - bsb-http-chunked ==0.0.0.4 - bson ==0.3.2.8 - bson-lens ==0.1.1 @@ -329,9 +244,10 @@ default-package-overrides: - buffer-pipe ==0.0 - bugsnag-haskell ==0.0.3.0 - bulletproofs ==0.4.0 + - butcher ==1.3.2.3 - butter ==0.1.0.6 - bv ==0.5 - - bv-little ==0.1.2 + - bv-little ==1.1.0 - byteable ==0.1.1 - bytedump ==1.0 - byteorder ==1.0.4 @@ -341,6 +257,7 @@ default-package-overrides: - bytestring-conversion ==0.3.1 - bytestring-lexing ==0.5.0.2 - bytestring-strict-builder ==0.4.5.3 + - bytestring-to-vector ==0.3.0.1 - bytestring-tree-builder ==0.2.7.3 - bzlib ==0.5.0.5 - bzlib-conduit ==0.3.0.1 @@ -348,13 +265,12 @@ default-package-overrides: - Cabal ==2.4.1.0 - cabal2spec ==2.2.2.1 - cabal-doctest ==1.0.6 - - cabal-rpm ==0.12.6 + - cabal-file-th ==0.2.6 - cache ==0.1.1.2 - - cachix ==0.2.0 - - cachix-api ==0.2.0 - cacophony ==0.10.1 - calendar-recycling ==0.0.0.1 - call-stack ==0.1.0 + - ca-province-codes ==1.0.0.0 - carray ==0.1.6.8 - cased ==0.1.0.0 - case-insensitive ==1.2.0.11 @@ -365,9 +281,10 @@ default-package-overrides: - cassava-megaparsec ==2.0.0 - cassava-records ==0.1.0.4 - cast ==0.1.0.2 - - category ==0.2.4.0 + - caster ==0.0.3.0 + - category ==0.2.4.1 - cayley-client ==0.4.9 - - cborg ==0.2.1.0 + - cborg ==0.2.2.0 - cborg-json ==0.2.1.0 - cereal ==0.5.8.1 - cereal-conduit ==0.8.0 @@ -375,7 +292,7 @@ default-package-overrides: - cereal-time ==0.1.0.0 - cereal-vector ==0.2.0.1 - cfenv ==0.1.0.0 - - cgi ==3001.3.0.3 + - cgi ==3001.4.0.0 - chan ==0.0.4.1 - ChannelT ==0.0.0.7 - charset ==0.3.7.1 @@ -387,10 +304,13 @@ default-package-overrides: - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 - check-email ==1.0.2 - - checkers ==0.4.14 + - checkers ==0.5.0 - checksum ==0.0 + - chimera ==0.2.0.0 - choice ==0.2.2 - chronologique ==0.3.1.1 + - chronos ==1.0.6 + - chronos-bench ==0.2.0.2 - chunked-data ==0.3.1 - cipher-aes ==0.2.11 - cipher-aes128 ==0.7.0.4 @@ -407,13 +327,14 @@ default-package-overrides: - clay ==0.13.1 - clientsession ==0.9.1.2 - Clipboard ==2.3.2.0 - - clock ==0.7.2 + - clock ==0.8 - clock-extras ==0.1.0.2 + - closed ==0.2.0.1 - clr-host ==0.2.1.0 - clr-marshal ==0.2.0.0 - clumpiness ==0.17.0.2 - - cmark ==0.5.6.3 - - cmark-gfm ==0.1.8 + - cmark ==0.6 + - cmark-gfm ==0.2.0 - cmdargs ==0.10.20 - codec ==0.2.1 - codec-beam ==0.2.0 @@ -421,16 +342,19 @@ default-package-overrides: - code-page ==0.2 - codo-notation ==0.5.2 - coercible-utils ==0.0.0 - - co-log ==0.2.0 - - co-log-core ==0.1.1 + - co-log ==0.3.0.0 + - co-log-core ==0.2.0.0 - colonnade ==1.2.0.2 - colorful-monoids ==0.2.1.2 - colorize-haskell ==1.0.1 - colour ==2.3.5 + - columnar ==1.0.0.0 - combinatorial ==0.1.0.1 + - comfort-array ==0.4 - comfort-graph ==0.0.3.1 - commutative ==0.0.2 - comonad ==5.0.5 + - compact ==0.1.0.1 - compactmap ==0.1.4.2.1 - compensated ==0.7.2 - compiler-warnings ==0.1.0 @@ -439,9 +363,9 @@ default-package-overrides: - composition ==1.0.2.1 - composition-extra ==2.0.0 - concise ==0.1.0.1 - - concurrency ==1.6.2.0 + - concurrency ==1.7.0.0 - concurrent-extra ==0.7.0.12 - - concurrent-output ==1.10.9 + - concurrent-output ==1.10.10 - concurrent-split ==0.0.1.1 - concurrent-supply ==0.1.8 - cond ==0.4.1.1 @@ -449,17 +373,17 @@ default-package-overrides: - conduit-algorithms ==0.0.10.1 - conduit-combinators ==1.3.0 - conduit-concurrent-map ==0.1.1 - - conduit-connection ==0.1.0.5 - - conduit-extra ==1.3.3 + - conduit-extra ==1.3.4 - conduit-iconv ==0.1.1.3 - conduit-parse ==0.2.1.0 - conduit-throttle ==0.3.1.0 - conduit-zstd ==0.0.1.1 - - confcrypt ==0.1.0.4 + - config-ini ==0.2.4.0 - configuration-tools ==0.4.1 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - - connection ==0.2.8 + - configurator-pg ==0.1.0.3 + - connection ==0.3.0 - connection-pool ==0.2.2 - console-style ==0.0.2.1 - constraint ==0.1.3.0 @@ -472,6 +396,9 @@ default-package-overrides: - control-monad-omega ==0.3.1 - convertible ==1.1.1.0 - cookie ==0.4.4 + - core-data ==0.2.0.0 + - core-program ==0.2.0.0 + - core-text ==0.2.0.0 - countable ==1.0 - country ==0.1.6 - courier ==0.1.1.5 @@ -481,8 +408,9 @@ default-package-overrides: - cpu ==0.1.2 - cpuinfo ==0.1.0.1 - cql ==4.0.1 - - cql-io ==1.0.1.1 + - cql-io ==1.1.1 - crackNum ==2.3 + - crc32c ==0.0.0 - credential-store ==0.1.2 - criterion ==1.5.5.0 - criterion-measurement ==0.1.1.0 @@ -503,6 +431,8 @@ default-package-overrides: - cryptonite ==0.25 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.7 + - crypto-numbers ==0.2.7 + - crypto-pubkey ==0.2.8 - crypto-pubkey-openssh ==0.2.7 - crypto-pubkey-types ==0.4.3 - crypto-random ==0.0.9 @@ -513,7 +443,7 @@ default-package-overrides: - css-text ==0.1.3.0 - csv ==0.1.2 - ctrie ==0.2 - - cubicbezier ==0.6.0.5 + - cubicbezier ==0.6.0.6 - cubicspline ==0.1.2 - cublas ==0.5.0.0 - cuckoo-filter ==0.2.0.2 @@ -534,6 +464,7 @@ default-package-overrides: - data-binary-ieee754 ==0.4.4 - data-bword ==0.1.0.1 - data-checked ==0.3 + - data-clist ==0.1.2.3 - data-default ==0.7.1.1 - data-default-class ==0.1.2.0 - data-default-instances-containers ==0.0.1 @@ -556,6 +487,7 @@ default-package-overrides: - data-ref ==0.0.2 - data-reify ==0.6.1 - data-serializer ==0.3.4 + - datasets ==0.4.0 - data-textual ==0.3.0.2 - data-tree-print ==0.1.0.2 - dataurl ==0.1.0.0 @@ -572,20 +504,19 @@ default-package-overrides: - declarative ==0.5.2 - deepseq-generics ==0.2.0.0 - deferred-folds ==0.9.10.1 - - dejafu ==1.11.0.5 + - dejafu ==2.1.0.0 - dense-linear-algebra ==0.1.0.0 - dependent-map ==0.2.4.0 - dependent-sum ==0.4 - dependent-sum-template ==0.0.0.6 - - deque ==0.2.7 + - deque ==0.4.2.3 - deriveJsonNoPrefix ==0.1.0.1 - deriving-compat ==0.5.6 - derulo ==1.0.5 - detour-via-sci ==1.0.0 - - dhall ==1.19.1 - - dhall-bash ==1.0.18 - - dhall-json ==1.2.6 - - dhall-text ==1.0.18 + - dhall ==1.24.0 + - dhall-bash ==1.0.21 + - dhall-json ==1.3.0 - diagrams ==1.4 - diagrams-contrib ==1.4.3 - diagrams-core ==1.4.1.1 @@ -599,6 +530,7 @@ default-package-overrides: - Diff ==0.3.4 - digest ==0.0.1.2 - digits ==0.3.1 + - dimensional ==1.3 - di-monad ==1.3 - directory-tree ==0.12.1 - direct-sqlite ==2.3.24 @@ -607,19 +539,22 @@ default-package-overrides: - distributed-closure ==0.4.1.1 - distribution-opensuse ==1.1.1 - distributive ==0.6 + - dl-fedora ==0.5 - dlist ==0.8.0.6 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - - dns ==3.0.4 + - dns ==4.0.0 - dockerfile ==0.2.0 - docopt ==0.7.0.5 - doctemplates ==0.2.2.1 - - doctest ==0.16.0.1 + - doctest ==0.16.1 - doctest-discover ==0.2.0.0 - doctest-driver-gen ==0.3.0.1 + - doldol ==0.4.1.2 - do-list ==1.0.1 - dom-parser ==3.1.0 - - dotenv ==0.8.0.0 + - do-notation ==0.1.0.2 + - dotenv ==0.8.0.2 - dotgen ==0.4.2 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 @@ -634,11 +569,13 @@ default-package-overrides: - dvorak ==0.1.0.0 - dynamic-state ==0.3.1 - dyre ==0.8.12 + - eap ==0.9.0.2 - Earley ==0.13.0.1 - easy-file ==0.2.2 - easytest ==0.2.1 - Ebnf2ps ==1.0.15 - echo ==0.1.3 + - ecstasy ==0.2.1.0 - ed25519 ==0.0.5.0 - edit-distance ==0.2.2.1 - edit-distance-vector ==1.0.0.4 @@ -650,22 +587,26 @@ default-package-overrides: - ekg-json ==0.1.0.6 - ekg-statsd ==0.2.4.0 - elerea ==2.9.0 - - elf ==0.29 + - elf ==0.30 - eliminators ==0.5.1 - elm2nix ==0.1.1 + - elm-bridge ==0.5.2 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 + - elm-street ==0.0.1 - emacs-module ==0.1.1 - email-validate ==2.3.2.11 - emd ==0.1.4.0 - enclosed-exceptions ==1.0.3 + - ENIG ==0.0.1.0 - entropy ==0.4.1.4 - - enummapset ==0.6.0.1 + - enummapset ==0.6.0.2 - enumset ==0.0.4.1 - enum-subset-generate ==0.1.0.0 - - enum-text ==0.5.0.0 + - enum-text ==0.5.1.0 + - enum-text-rio ==1.2.0.0 - envelope ==0.2.2.0 - - envy ==1.5.1.0 + - envy ==2.0.0.0 - epub-metadata ==4.5 - eq ==4.2 - equal-files ==0.0.5.3 @@ -674,7 +615,7 @@ default-package-overrides: - errors-ext ==0.4.2 - error-util ==0.0.1.2 - ersatz ==0.4.7 - - esqueleto ==2.6.0 + - esqueleto ==3.0.0 - etc ==0.4.1.0 - eventful-core ==0.2.0 - eventful-memory ==0.2.0 @@ -682,7 +623,7 @@ default-package-overrides: - eventful-sqlite ==0.2.0 - eventful-test-helpers ==0.2.0 - event-list ==0.1.2 - - eventstore ==1.2.4 + - eventstore ==1.3.0 - every ==0.0.1 - exact-combinatorics ==0.2.0.9 - exact-pi ==0.5.0.1 @@ -702,19 +643,22 @@ default-package-overrides: - extractable-singleton ==0.0.1 - extrapolate ==0.3.3 - fail ==4.9.0.0 + - failable ==1.2.2.0 + - fakedata ==0.2.2 - farmhash ==0.1.0.5 + - fast-builder ==0.1.0.1 - fast-digits ==0.2.1.0 - fast-logger ==2.4.16 - fast-math ==1.0.2 - - fb ==1.2.1 + - fb ==2.0.0 - fclabels ==2.0.3.3 - feature-flags ==0.1.0.1 - fedora-dists ==1.0.1 - - fedora-haskell-tools ==0.6 - - feed ==1.0.1.0 + - feed ==1.2.0.0 - FenwickTree ==0.1.2.1 - fft ==0.1.8.6 - fgl ==5.7.0.1 + - fib ==0.1 - filecache ==0.4.1 - file-embed ==0.0.11 - file-embed-lzma ==0 @@ -725,27 +669,29 @@ default-package-overrides: - fileplow ==0.1.0.0 - filter-logger ==0.6.0.0 - filtrable ==0.1.1.0 - - fin ==0.0.3 + - fin ==0.1 - FindBin ==0.0.5 - fingertree ==0.1.4.2 - finite-typelits ==0.1.4.2 - - first-class-families ==0.3.0.1 + - first-class-families ==0.5.0.0 - first-class-patterns ==0.3.2.4 - fitspec ==0.4.7 - - fixed ==0.2.1.1 + - fixed ==0.3 - fixed-length ==0.2.1 - fixed-vector ==1.2.0.0 - fixed-vector-hetero ==0.5.0.0 - - flac ==0.1.2 + - flac ==0.2.0 - flac-picture ==0.1.2 + - flags-applicative ==0.1.0.1 - flat-mcmc ==1.5.0 - flay ==0.4 - flexible-defaults ==0.0.2 - FloatingHex ==0.4 - floatshow ==0.2.4 - flow ==1.0.18 - - fmlist ==0.9.2 + - fmlist ==0.9.3 - fmt ==0.6.1.2 + - fmt-for-rio ==1.0.0.0 - fn ==0.3.0.2 - focus ==1.0.1.3 - focuslist ==0.1.0.2 @@ -754,6 +700,7 @@ default-package-overrides: - fold-debounce-conduit ==0.2.0.3 - foldl ==1.4.5 - folds ==0.7.4 + - follow-file ==0.0.3 - FontyFruity ==0.5.3.4 - force-layout ==0.4.0.6 - foreign-store ==0.2 @@ -761,7 +708,7 @@ default-package-overrides: - forma ==1.1.2 - format-numbers ==0.1.0.0 - formatting ==6.3.7 - - foundation ==0.0.23 + - foundation ==0.0.24 - free ==5.1.1 - freenect ==1.2.1 - freer-simple ==1.2.1.0 @@ -773,54 +720,60 @@ default-package-overrides: - frontmatter ==0.1.0.2 - fsnotify ==0.3.0.1 - fsnotify-conduit ==0.1.1.1 - - ftp-client ==0.5.1.1 - - ftp-client-conduit ==0.5.0.4 - funcmp ==1.9 + - function-builder ==0.3.0.1 - functor-classes-compat ==1 - - fused-effects ==0.1.2.1 + - functor-combinators ==0.1.1.1 + - fused-effects ==0.5.0.0 - fuzzcheck ==0.1.1 - fuzzy-dates ==0.1.1.1 - - fuzzyset ==0.1.0.8 + - fuzzyset ==0.1.1 + - galois-field ==0.3.0 - gauge ==0.2.4 - gc ==0.0.3 - gd ==3000.7.3 - gdp ==0.0.0.2 - general-games ==1.1.1 - generic-arbitrary ==0.1.0 - - generic-data ==0.3.0.0 + - generic-data ==0.7.0.0 + - generic-data-surgery ==0.2.0.0 - generic-deriving ==1.12.4 - generic-lens ==1.1.0.0 - GenericPretty ==1.2.2 - generic-random ==1.2.0.0 - generics-eot ==0.4.0.1 - - generics-mrsop ==1.2.2 + - generics-mrsop ==2.1.0 - generics-sop ==0.4.0.1 - - generics-sop-lens ==0.1.3 - - genvalidity ==0.7.0.2 - - genvalidity-aeson ==0.2.0.2 - - genvalidity-bytestring ==0.3.0.1 - - genvalidity-containers ==0.5.1.1 - - genvalidity-hspec ==0.6.2.3 - - genvalidity-hspec-aeson ==0.3.0.1 + - generics-sop-lens ==0.2 + - genvalidity ==0.8.0.0 + - genvalidity-aeson ==0.3.0.0 + - genvalidity-bytestring ==0.5.0.0 + - genvalidity-containers ==0.6.0.0 + - genvalidity-hspec ==0.7.0.0 + - genvalidity-hspec-aeson ==0.3.1.0 - genvalidity-hspec-binary ==0.2.0.3 - genvalidity-hspec-cereal ==0.2.0.3 - genvalidity-hspec-hashable ==0.2.0.4 - genvalidity-hspec-optics ==0.1.1.1 - genvalidity-path ==0.3.0.2 - - genvalidity-property ==0.3.0.0 + - genvalidity-property ==0.4.0.0 - genvalidity-scientific ==0.2.1.0 - - genvalidity-text ==0.5.1.0 + - genvalidity-text ==0.6.0.0 - genvalidity-time ==0.2.1.1 - - genvalidity-unordered-containers ==0.2.0.4 + - genvalidity-unordered-containers ==0.3.0.0 - genvalidity-uuid ==0.1.0.2 - - genvalidity-vector ==0.2.0.3 - - geojson ==3.0.4 + - genvalidity-vector ==0.3.0.0 + - geojson ==4.0.1 - getopt-generics ==0.13.0.3 + - ghc-compact ==0.1.0.0 - ghc-core ==0.5.6 - - ghc-exactprint ==0.5.8.2 - - ghcid ==0.7.4 - - ghci-hexcalc ==0.1.0.2 + - ghc-exactprint ==0.6.1 + - ghcid ==0.7.5 + - ghci-hexcalc ==0.1.1.0 - 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-paths ==0.1.0.9 - ghc-prof ==1.4.1.5 - ghc-syntax-highlighter ==0.0.4.0 @@ -829,32 +782,32 @@ default-package-overrides: - ghc-typelits-knownnat ==0.6 - ghc-typelits-natnormalise ==0.6.2 - ghost-buster ==0.1.1.0 - - gi-atk ==2.0.18 - - gi-cairo ==1.0.17 - - gi-gdk ==3.0.16 - - gi-gdkpixbuf ==2.0.20 - - gi-gio ==2.0.19 - - gi-glib ==2.0.17 - - gi-gobject ==2.0.19 - - gi-gtk ==3.0.27 - - gi-gtk-hs ==0.3.6.3 - - gi-gtksource ==3.0.16 - - gi-javascriptcore ==4.0.16 + - gi-atk ==2.0.21 + - gi-cairo ==1.0.23 + - gi-gdk ==3.0.22 + - gi-gdkpixbuf ==2.0.23 + - gi-gio ==2.0.25 + - gi-glib ==2.0.23 + - gi-gobject ==2.0.22 + - gi-gtk ==3.0.32 + - gi-gtk-hs ==0.3.8.0 + - gi-gtksource ==3.0.22 + - gi-javascriptcore ==4.0.21 + - ginger ==0.9.0.0 - gingersnap ==0.3.1.0 - - gi-pango ==1.0.19 - - giphy-api ==0.6.0.1 + - gi-pango ==1.0.22 - githash ==0.1.3.1 - github-release ==1.2.4 - github-types ==0.2.1 - github-webhooks ==0.10.1 - gitrev ==1.3.1 - - gi-vte ==2.91.19 - - gl ==0.8.0 - - glabrous ==1.0.1 + - gi-vte ==2.91.25 + - gl ==0.9 + - glabrous ==2.0.0 - glaze ==0.3.0.1 - glazier ==1.0.0.0 - GLFW-b ==3.2.1.0 - - Glob ==0.9.3 + - Glob ==0.10.0 - gloss ==1.13.0.1 - gloss-algorithms ==1.13.0.1 - gloss-examples ==1.13.0.2 @@ -863,12 +816,13 @@ default-package-overrides: - GLURaw ==2.0.0.4 - GLUT ==2.7.0.15 - gnuplot ==0.5.6 - - goggles ==0.3.2 - google-isbn ==1.0.3 - google-oauth2-jwt ==0.3.1 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 + - graphite ==0.10.0.1 - graphs ==0.7.1 + - graphviz ==2999.20.0.3 - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 - graylog ==0.1.0.1 @@ -882,19 +836,21 @@ default-package-overrides: - groundhog-postgresql ==0.10 - groundhog-sqlite ==0.10.0 - groundhog-th ==0.10.2 + - group-by-date ==0.1.0.3 + - grouped-list ==0.2.2.1 - groups ==0.4.1.0 - guarded-allocation ==0.0.1 - gym-http-api ==0.1.0.1 - - h2c ==1.0.0 + - H ==0.9.0.1 - hackage-db ==2.0.1 - hackage-security ==0.5.3.0 - haddock-library ==1.7.0 - - hailgun ==0.4.2 + - hadolint ==1.17.1 - half ==0.3 - hamilton ==0.1.0.3 - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - - hapistrano ==0.3.9.2 + - hapistrano ==0.3.9.3 - happy ==1.19.11 - hasbolt ==0.1.3.3 - hashable ==1.2.7.0 @@ -903,27 +859,28 @@ default-package-overrides: - hashmap ==1.3.3 - hashtables ==1.2.3.3 - haskeline ==0.7.5.0 - - haskell-gi ==0.21.5 - - haskell-gi-base ==0.21.5 + - haskell-gi ==0.23.0 + - haskell-gi-base ==0.23.0 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.0.2 - - haskell-lsp ==0.8.2.0 - - haskell-lsp-types ==0.8.2.0 - - haskell-names ==0.9.4 - - HaskellNet ==0.5.1 + - haskell-lsp ==0.15.0.0 + - haskell-lsp-types ==0.15.0.0 + - haskell-names ==0.9.6 - haskell-spacegoo ==0.2.0.1 - haskell-src ==1.0.3.0 - - haskell-src-exts ==1.20.3 + - haskell-src-exts ==1.21.0 - haskell-src-exts-util ==0.2.5 - haskell-src-meta ==0.8.2 - haskey-btree ==0.3.0.1 - - haskoin-core ==0.8.4 - - hasql ==1.3.0.6 - - hasql-optparse-applicative ==0.3.0.4 + - haskintex ==0.8.0.0 + - haskoin-core ==0.9.0 + - hasql ==1.4 + - hasql-optparse-applicative ==0.3.0.5 - hasql-pool ==0.5.1 - - hasql-transaction ==0.7.1 + - hasql-transaction ==0.7.2 - hasty-hamiltonian ==1.3.2 - - haxl ==2.0.1.1 + - HaTeX ==3.21.0.0 + - haxl ==2.1.2.0 - hbeanstalk ==0.2.4 - HCodecs ==0.5.1 - hdaemonize ==0.5.5 @@ -933,9 +890,10 @@ default-package-overrides: - heap ==1.0.4 - heaps ==0.3.6.1 - hebrew-time ==0.1.2 - - hedgehog ==0.6.1 + - hedgehog ==1.0 - hedgehog-corpus ==0.1.0 - - hedis ==0.10.10 + - hedgehog-fn ==1.0 + - hedis ==0.12.6 - hedn ==0.2.0.1 - here ==1.2.13 - heredoc ==0.2.0.0 @@ -947,27 +905,30 @@ default-package-overrides: - hexstring ==0.11.1 - hformat ==0.3.3.1 - hfsevents ==0.1.6 - - hgmp ==0.1.1 - hidapi ==0.1.5 - hidden-char ==0.1.0.2 + - hi-file-parser ==0.1.0.0 - higher-leveldb ==0.5.0.2 - highlighting-kate ==0.6.4 - hinfo ==0.0.3.0 - hinotify ==0.4 - - hint ==0.9.0 + - hint ==0.9.0.1 - hjsmin ==0.2.0.2 + - hkgr ==0.2.2 - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.8.0 - - hmatrix ==0.19.0.0 + - hmatrix ==0.20.0.0 - hmatrix-backprop ==0.1.2.5 - hmatrix-gsl ==0.19.0.1 - hmatrix-gsl-stats ==0.4.1.8 - hmatrix-morpheus ==0.1.1.2 - hmatrix-vector-sized ==0.1.1.3 + - hmm-lapack ==0.4 - hmpfr ==0.4.4 - - hoauth2 ==1.8.7 + - hoauth2 ==1.8.8 - Hoed ==0.5.1 - - hOpenPGP ==2.7.4.1 + - hOpenPGP ==2.8 + - hopenpgp-tools ==0.21.3 - hopfli ==0.2.2.1 - hosc ==0.17 - hostname ==1.0 @@ -977,20 +938,22 @@ default-package-overrides: - hp2pretty ==0.9 - hpack ==0.31.2 - hpack-dhall ==0.5.2 + - hquantlib-time ==0.0.4.1 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 - hruby ==0.3.8 - hsass ==0.8.0 - hs-bibutils ==6.7.0.0 + - hsc2hs ==0.68.4 - hschema ==0.0.1.1 - hschema-aeson ==0.0.1.1 - hschema-prettyprinter ==0.0.1.1 - hschema-quickcheck ==0.0.1.1 - hscolour ==1.24.4 - hsdev ==0.3.2.3 - - hsdns ==1.7.1 + - hsdns ==1.8 - hsebaysdk ==0.4.0.0 - - hsemail ==2 + - hsemail ==2.2.0 - HSet ==0.0.1 - hset ==2.2.0 - hsexif ==0.6.1.6 @@ -1002,22 +965,23 @@ default-package-overrides: - hslogger ==1.2.12 - hslua ==1.0.3.1 - hslua-aeson ==1.0.0 + - hslua-module-system ==0.2.1 - hslua-module-text ==0.2.1 - HsOpenSSL ==0.11.4.16 - HsOpenSSL-x509-system ==0.1.0.3 - hsp ==0.10.0 - - hspec ==2.6.1 + - hspec ==2.7.1 - hspec-attoparsec ==0.1.0.2 - hspec-checkers ==0.1.0.2 - hspec-contrib ==0.5.1 - - hspec-core ==2.6.1 - - hspec-discover ==2.6.1 + - hspec-core ==2.7.1 + - hspec-discover ==2.7.1 - hspec-expectations ==0.8.2 - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.4 - hspec-golden-aeson ==0.7.0.0 - hspec-leancheck ==0.0.3 - - hspec-megaparsec ==2.0.0 + - hspec-megaparsec ==2.0.1 - hspec-meta ==2.6.0 - hspec-need-env ==0.1.0.3 - hspec-pg-transact ==0.1.0.2 @@ -1025,6 +989,7 @@ default-package-overrides: - hspec-wai ==0.9.2 - hspec-wai-json ==0.9.2 - hs-php-session ==0.0.9.3 + - hsshellscript ==3.4.5 - hstatsd ==0.1 - HStringTemplate ==0.8.7 - HSvm ==0.1.1.3.22 @@ -1040,49 +1005,55 @@ default-package-overrides: - htoml ==1.0.0.3 - http2 ==1.6.5 - HTTP ==4000.3.14 - - http-api-data ==0.4 - - http-client ==0.5.14 + - http-api-data ==0.4.1 + - 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-date ==0.0.8 - http-directory ==0.1.5 - - httpd-shed ==0.4.0.3 + - http-download ==0.1.0.0 + - httpd-shed ==0.4.1.1 - http-link-header ==1.0.3.1 - - http-media ==0.7.1.3 + - http-media ==0.8.0.0 - http-reverse-proxy ==0.6.0 - http-streams ==0.8.6.1 - http-types ==0.12.3 - human-readable-duration ==0.2.1.4 - HUnit ==1.6.0.0 - HUnit-approx ==1.1.1.1 - - hunit-dejafu ==1.2.1.0 + - hunit-dejafu ==2.0.0.1 - hvect ==0.4.0.0 - - hvega ==0.1.0.3 + - hvega ==0.3.0.1 - hw-balancedparens ==0.2.0.4 - hw-bits ==0.7.0.6 - hw-conduit ==0.2.0.5 - hw-conduit-merges ==0.2.0.0 - hw-diagnostics ==0.0.0.7 + - hw-dsv ==0.3.5 - hweblib ==0.6.3 - - hw-eliasfano ==0.1.0.1 + - 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-hspec-hedgehog ==0.1.0.4 + - hw-hedgehog ==0.1.0.3 + - hw-hspec-hedgehog ==0.1.0.7 - hw-int ==0.0.0.3 - - hw-ip ==2.0.1.0 - - hw-json ==0.9.0.1 - - hw-mquery ==0.1.0.3 - - hw-packed-vector ==0.0.0.1 + - hw-ip ==2.3.1.2 + - hw-json ==1.0.0.2 + - hw-json-simd ==0.1.0.2 + - hw-mquery ==0.2.0.1 + - hw-packed-vector ==0.0.0.3 - hw-parser ==0.1.0.1 - - hw-prim ==0.6.2.28 - - hw-rankselect ==0.12.0.4 + - hw-prim ==0.6.2.31 + - hw-rankselect ==0.13.0.0 - hw-rankselect-base ==0.3.2.1 + - hw-simd ==0.1.1.4 - hw-streams ==0.0.0.10 - hw-string-parse ==0.0.0.4 - hw-succinct ==0.1.0.1 - hxt ==9.3.1.18 - - hxt-charproperties ==9.2.0.1 + - hxt-charproperties ==9.4.0.0 - hxt-css ==0.1.0.3 - hxt-curl ==9.1.1.1 - hxt-expat ==9.1.1 @@ -1091,14 +1062,16 @@ default-package-overrides: - hxt-tagsoup ==9.1.4 - hxt-unicode ==9.0.2.4 - hybrid-vectors ==0.2.2 + - hyper ==0.1.0.3 - hyperloglog ==0.4.2 - - hyphenation ==0.7.1 + - hyphenation ==0.8 - hyraxAbif ==0.2.3.15 - iconv ==0.4.1.3 - identicon ==0.2.2 - ieee754 ==0.8.0 - if ==0.1.0.0 - iff ==0.0.6 + - ihaskell ==0.10.0.0 - ihs ==0.1.0.3 - ilist ==0.3.1.0 - imagesize-conduit ==1.1 @@ -1109,29 +1082,36 @@ default-package-overrides: - indentation-core ==0.0.0.2 - indentation-parsec ==0.0.0.2 - indents ==0.5.0.0 + - indexed ==0.1.3 - indexed-list-literals ==0.2.1.2 - infer-license ==0.2.0 - inflections ==0.4.0.4 - - influxdb ==1.6.1.3 - - ini ==0.3.6 + - influxdb ==1.7.1 + - ini ==0.4.1 + - inj ==1.0 - inline-c ==0.7.0.1 - inline-c-cpp ==0.3.0.2 + - inline-r ==0.10.2 - inliterate ==0.1.0 - insert-ordered-containers ==0.2.2 - inspection-testing ==0.4.2.1 - instance-control ==0.1.2.0 + - int-cast ==0.2.0.0 - integer-logarithms ==1.0.3 - integration ==0.2.1 - intern ==0.9.2 - interpolate ==0.2.0 - interpolatedstring-perl6 ==1.0.1 + - interpolatedstring-qq2 ==0.1.0.0 - interpolation ==0.1.1.1 - - interpolator ==0.1.2 + - interpolator ==1.0.0 - IntervalMap ==0.6.1.1 - intervals ==0.8.1 + - intro ==0.5.2.1 - intset-imperative ==0.1.0.0 - invariant ==0.5.3 - invertible ==0.2.0.5 + - invertible-grammar ==0.1.2 - io-choice ==0.0.7 - io-machine ==0.2.0.0 - io-manager ==0.1.0.2 @@ -1140,13 +1120,14 @@ default-package-overrides: - io-storage ==0.3 - io-streams ==1.5.1.0 - io-streams-haproxy ==1.0.1.0 - - ip ==1.4.2.1 + - ip ==1.5.1 - ip6addr ==1.0.0 - iproute ==1.7.7 - IPv6Addr ==1.1.2 - - ipython-kernel ==0.9.1.0 + - ipynb ==0.1 + - ipython-kernel ==0.10.0.0 - irc ==0.6.1.0 - - irc-client ==1.1.0.7 + - irc-client ==1.1.1.0 - irc-conduit ==0.3.0.3 - irc-ctcp ==0.1.3.0 - islink ==0.1.0.0 @@ -1157,7 +1138,7 @@ default-package-overrides: - ixset-typed ==0.4.0.1 - ix-shapable ==0.1.0 - jack ==0.7.1.4 - - jose ==0.8.0.0 + - jose ==0.8.1.0 - jose-jwt ==0.8.0 - js-dgtable ==0.5.2 - js-flot ==0.8.3 @@ -1165,6 +1146,7 @@ default-package-overrides: - json ==0.9.3 - json-alt ==1.0.0 - json-feed ==1.0.6 + - jsonpath ==0.1.0.1 - json-rpc ==1.0.0 - json-rpc-client ==0.2.5.0 - json-rpc-generic ==0.2.1.5 @@ -1173,9 +1155,10 @@ default-package-overrides: - JuicyPixels-extra ==0.4.1 - JuicyPixels-scale-dct ==0.1.2 - justified-containers ==0.3.0.0 + - jwt ==0.10.0 - kan-extensions ==5.2 - kanji ==3.4.0.2 - - katip ==0.7.0.0 + - katip ==0.8.3.0 - kawhi ==0.3.0 - kazura-queue ==0.1.0.4 - kdt ==0.2.4 @@ -1184,15 +1167,15 @@ default-package-overrides: - kind-apply ==0.3.1.0 - kind-generics ==0.3.0.0 - kind-generics-th ==0.1.1.0 - - kleene ==0 + - kleene ==0.1 - kmeans ==0.1.3 - koofr-client ==1.0.0.3 - kraken ==0.1.0 - l10n ==0.1.0.1 - labels ==0.3.3 - lackey ==1.0.9 - - LambdaHack ==0.8.3.0 - - lame ==0.1.1 + - LambdaHack ==0.9.5.0 + - lame ==0.2.0 - language-c ==0.8.2 - language-c-quote ==0.12.2 - language-docker ==8.0.2 @@ -1201,15 +1184,19 @@ default-package-overrides: - language-java ==0.2.9 - language-javascript ==0.6.0.13 - language-puppet ==1.4.5 + - lapack ==0.3.0.1 + - lapack-carray ==0.0.3 + - lapack-comfort-array ==0.0.0.1 - lapack-ffi ==0.0.2 - - lapack-ffi-tools ==0.1.2 + - lapack-ffi-tools ==0.1.2.1 - largeword ==1.2.5 - latex ==0.1.0.4 - - lattices ==1.7.1.1 + - lattices ==2.0.1 - lawful ==0.1.0.0 + - lazy-csv ==0.5.1 - lazyio ==0.1.0.4 - lca ==0.3.1 - - leancheck ==0.8.0 + - leancheck ==0.9.1 - leancheck-instances ==0.0.3 - leapseconds-announced ==2017.1.0.1 - learn-physics ==0.6.4 @@ -1220,10 +1207,11 @@ default-package-overrides: - lens-family ==1.2.3 - lens-family-core ==1.2.3 - lens-family-th ==0.5.0.2 - - lens-labels ==0.3.0.1 - lens-misc ==0.0.2.0 + - lens-process ==0.3.0.0 - lens-properties ==4.11.1 - lens-regex ==0.1.1 + - lens-regex-pcre ==0.3.1.0 - lens-simple ==0.1.0.9 - lens-typelevel ==0.1.1.0 - lenz ==0.3.0.0 @@ -1232,7 +1220,8 @@ default-package-overrides: - libgit ==0.3.1 - libgraph ==1.14 - libmpd ==0.9.0.9 - - libraft ==0.1.1.0 + - liboath-hs ==0.0.1.1 + - libraft ==0.5.0.0 - libyaml ==0.1.1.0 - LibZip ==1.0.1 - lifted-async ==0.10.0.4 @@ -1240,6 +1229,7 @@ default-package-overrides: - lift-generics ==0.1.2 - line ==4.0.1 - linear ==1.20.9 + - linear-circuit ==0.1.0.1 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - List ==0.6.2 @@ -1247,27 +1237,30 @@ default-package-overrides: - listsafe ==0.1.0.1 - list-t ==1.0.3.1 - ListTree ==0.2.3 - - llvm-hs-pure ==7.0.0 + - list-witnesses ==0.1.1.1 + - llvm-hs ==8.0.0 + - llvm-hs-pure ==8.0.0 - lmdb ==0.2.5 - load-env ==0.2.1.0 - loc ==0.1.3.4 - locators ==0.2.4.4 - loch-th ==0.2.2 - lockfree-queue ==0.2.3.1 - - log-base ==0.7.4.0 + - log-base ==0.8.0.0 - log-domain ==0.12 - logfloat ==0.13.3.3 - logger-thread ==0.1.0.2 - logging-effect ==1.3.4 - logging-facade ==0.3.0 - logging-facade-syslog ==1 - - logict ==0.6.0.3 - - long-double ==0.1 + - logict ==0.7.0.2 - loop ==0.3.0 + - loopbreaker ==0.1.1.0 + - lrucache ==1.2.0.1 - lrucaching ==0.3.3 - - lsp-test ==0.5.1.2 + - lsp-test ==0.6.0.0 - lucid ==2.9.11 - - lucid-extras ==0.1.0.1 + - lucid-extras ==0.2.2 - lxd-client-config ==0.1.0.1 - lzma ==0.0.0.3 - lzma-conduit ==1.2.1 @@ -1275,40 +1268,41 @@ default-package-overrides: - machines-binary ==0.3.0.3 - machines-directory ==0.2.1.0 - machines-io ==0.2.0.13 + - magico ==0.0.2.1 - mainland-pretty ==0.7 - main-tester ==0.2.0.1 - makefile ==1.1.0.0 - managed ==1.0.6 - - mapquest-api ==0.3.1 - markdown ==0.1.17.4 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - - massiv ==0.2.8.1 + - massiv ==0.4.0.0 - massiv-io ==0.1.6.0 + - massiv-test ==0.1.0 - mathexpr ==0.3.0.0 - math-functions ==0.3.1.0 - - matrices ==0.4.5 + - matplotlib ==0.7.4 + - matrices ==0.5.0 - matrix ==0.3.6.1 - matrix-market-attoparsec ==0.1.0.8 - matrix-static ==0.2 - maximal-cliques ==0.1.1 - mbox ==0.3.4 - - mbox-utility ==0.0.1 - mbtiles ==0.6.0.0 - - mbug ==1.3.2 - mcmc-types ==1.0.3 - median-stream ==0.7.0.0 - megaparsec ==7.0.5 - - mega-sdist ==0.3.3.2 + - megaparsec-tests ==7.0.5 + - mega-sdist ==0.4.0.1 - memory ==0.14.18 - MemoTrie ==0.6.9 - menshen ==0.0.3 - mercury-api ==0.1.0.2 - merkle-tree ==0.1.1 - mersenne-random-pure64 ==0.2.2.0 + - messagepack ==0.5.4 - metrics ==0.4.1.1 - mfsolve ==0.3.2.0 - - microbench ==0.1 - microformats2-parser ==1.0.1.9 - microlens ==0.4.10 - microlens-aeson ==2.3.0.4 @@ -1316,30 +1310,32 @@ 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-th ==0.4.2.3 - microspec ==0.2.1.3 - microstache ==1.0.1.1 - midair ==0.2.0.1 - midi ==0.2.2.2 + - midi-music-box ==0.0.1.1 - mighty-metropolis ==1.2.0 - - mime-mail ==0.4.14 + - mime-mail ==0.5.0 - mime-mail-ses ==0.4.1 - mime-types ==0.1.0.9 - minimorph ==0.2.1.0 - - minio-hs ==1.2.0 + - minio-hs ==1.5.0 - miniutter ==0.5.0.0 - mintty ==0.1.2 - - miso ==0.21.2.0 + - miso ==1.2.0.0 - missing-foreign ==0.1.1 - MissingH ==1.4.1.0 - - mixed-types-num ==0.3.1.5 - - mixpanel-client ==0.1.1 + - mixed-types-num ==0.4.0.1 - mltool ==0.2.0.1 - mmap ==0.5.9 - - mmark ==0.0.7.0 + - mmark ==0.0.7.1 - mmark-cli ==0.0.5.0 - mmark-ext ==0.2.1.2 - mmorph ==1.1.3 + - mmtf ==0.1.3.1 - mnist-idx ==0.1.2.8 - mockery ==0.3.5 - modern-uri ==0.3.0.1 @@ -1356,6 +1352,7 @@ default-package-overrides: - monad-logger-syslog ==0.1.4.0 - monad-loops ==0.4.3 - monad-memo ==0.5.1 + - monad-metrics ==0.2.1.4 - monad-par ==0.3.4.8 - monad-parallel ==0.7.2.3 - monad-par-extras ==0.3.3 @@ -1369,14 +1366,19 @@ default-package-overrides: - monad-time ==0.3.1.0 - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.1 - - mongoDB ==2.4.0.1 + - mongoDB ==2.5.0.0 - monoidal-containers ==0.4.0.0 - monoid-extras ==0.5 - monoid-subclasses ==0.4.6.1 - monoid-transformer ==0.0.4 - mono-traversable ==1.0.11.0 - mono-traversable-instances ==0.1.0.0 + - mono-traversable-keys ==0.1.0 + - more-containers ==0.2.1.2 - mountpoints ==1.0.2 + - mpi-hs ==0.5.1.2 + - msgpack ==1.0.1.0 + - msgpack-aeson ==0.1.0.0 - mtl ==2.2.2 - mtl-compat ==0.2.2 - mtl-prelude ==2.0.3.1 @@ -1384,12 +1386,13 @@ default-package-overrides: - multimap ==1.2.1 - multipart ==0.1.3 - multiset ==0.3.4.1 + - multistate ==0.8.0.2 - murmur3 ==1.0.3 - murmur-hash ==0.1.0.9 - MusicBrainz ==0.4.1 - mustache ==2.3.0 - mutable-containers ==0.3.4 - - mwc-probability ==2.0.4 + - mwc-probability ==2.1.0 - mwc-probability-transition ==0.4 - mwc-random ==0.14.0.0 - mysql ==0.1.7 @@ -1398,7 +1401,7 @@ default-package-overrides: - mysql-simple ==0.4.5 - n2o ==0.11.1 - nagios-check ==0.3.2 - - named ==0.2.0.0 + - named ==0.3.0.0 - names-th ==0.3.0.0 - nano-erl ==0.1.0.1 - nanospec ==0.2.2 @@ -1408,25 +1411,25 @@ default-package-overrides: - natural-transformation ==0.4 - ndjson-conduit ==0.1.0.5 - neat-interpolation ==0.3.2.4 + - netlib-carray ==0.1 + - netlib-comfort-array ==0.0.0.1 - netlib-ffi ==0.1.1 - netpbm ==1.0.3 - - netrc ==0.2.0.0 - nettle ==0.3.0 - netwire ==5.0.3 - netwire-input ==0.0.7 - netwire-input-glfw ==0.0.10 - network ==2.8.0.1 - network-anonymous-i2p ==0.10.0 - - network-anonymous-tor ==0.11.0 - network-attoparsec ==0.12.2 - network-bsd ==2.8.0.0 - - network-byte-order ==0.0.0.0 + - network-byte-order ==0.1.1.0 - network-conduit-tls ==1.3.2 - 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-multicast ==0.2.0 + - network-multicast ==0.3.2 - network-simple ==0.4.5 - network-simple-tls ==0.3.2 - network-transport ==0.5.4 @@ -1441,20 +1444,24 @@ default-package-overrides: - nonce ==1.0.7 - nondeterminism ==1.4 - non-empty ==0.3.2 - - nonempty-containers ==0.1.1.0 + - nonempty-containers ==0.3.1.0 - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.2 - non-negative ==0.1.2 - not-gloss ==0.7.7.0 + - no-value ==1.0.0.0 - nowdoc ==0.1.1.0 - nqe ==0.6.1 - nsis ==0.3.3 - numbers ==3000.2.0.2 - numeric-extras ==0.1 - numeric-prelude ==0.4.3.1 + - numhask ==0.3.0.0 - NumInstances ==1.4 - numtype-dk ==0.5.0.2 - nuxeo ==0.3.2 + - nvim-hs ==2.1.0.2 + - nvim-hs-contrib ==2.0.0.0 - nvvm ==0.9.0.0 - oauthenticated ==0.2.1.0 - ObjectName ==1.1.0.1 @@ -1483,22 +1490,28 @@ default-package-overrides: - open-witness ==0.4.0.1 - operational ==0.2.3.5 - operational-class ==0.3.0.0 - - opml-conduit ==0.6.0.4 - optional-args ==1.0.2 - options ==1.2.1.1 - optparse-applicative ==0.14.3.0 + - optparse-enum ==1.0.0.0 - optparse-generic ==1.3.0 - optparse-simple ==0.1.1.2 - optparse-text ==0.1.1.0 + - ordered-containers ==0.2.2 + - oset ==0.4.0.1 - overhang ==1.0.0 - packcheck ==0.4.2 - pager ==0.1.1.0 - pagination ==0.2.1 - - pairing ==0.1.4 - - pandoc ==2.5 - - pandoc-citeproc ==0.15.0.1 - - pandoc-pyplot ==1.0.3.0 + - pairing ==0.4.1 + - palette ==0.3.0.2 + - pandoc ==2.7.3 + - pandoc-citeproc ==0.16.2 + - pandoc-csv2table ==1.0.7 + - pandoc-markdown-ghci-filter ==0.1.0.0 + - pandoc-pyplot ==2.1.4.0 - pandoc-types ==1.17.5.4 + - pantry ==0.1.1.1 - parallel ==3.2.2.0 - parallel-io ==0.3.3 - paripari ==0.6.0.0 @@ -1508,11 +1521,14 @@ default-package-overrides: - parsec-numbers ==0.1.0 - parsec-numeric ==0.1.0.0 - ParsecTools ==0.0.2.0 - - parser-combinators ==1.0.3 + - parser-combinators ==1.1.0 + - parser-combinators-tests ==1.1.0 - parsers ==0.12.10 - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 - partial-semigroup ==0.5.1.1 + - password ==0.1.0.0 + - password-instances ==0.3.0.0 - path ==0.6.1 - path-extra ==0.2.0 - path-io ==1.4.2 @@ -1531,7 +1547,9 @@ default-package-overrides: - peano ==0.1.0.1 - pedersen-commitment ==0.2.0 - pem ==0.2.4 + - pencil ==1.0.1 - percent-format ==0.0.1 + - peregrin ==0.3.0 - perfect-hash-generator ==0.2.0.6 - persist ==0.1.1.3 - persistable-record ==0.6.0.4 @@ -1540,14 +1558,20 @@ default-package-overrides: - persistent-iproute ==0.2.3 - persistent-mysql ==2.9.0 - persistent-mysql-haskell ==0.5.2 + - persistent-pagination ==0.1.1.0 - persistent-postgresql ==2.9.1 + - persistent-qq ==2.9.1 - persistent-sqlite ==2.9.3 - - persistent-template ==2.5.4 + - persistent-template ==2.6.0 + - persistent-typed-db ==0.0.1.1 + - pg-harness-client ==0.6.0 + - pg-harness-server ==0.6.2 - pgp-wordlist ==0.1.0.3 - pg-transact ==0.1.0.1 - phantom-state ==0.2.1.2 - pid1 ==0.1.2.0 - - pipes ==4.3.10 + - pinboard ==0.10.1.4 + - pipes ==4.3.11 - pipes-aeson ==0.4.1.8 - pipes-attoparsec ==0.5.1.5 - pipes-binary ==0.4.2 @@ -1564,30 +1588,38 @@ default-package-overrides: - pipes-network ==0.6.5 - pipes-network-tls ==0.3 - pipes-parse ==3.0.8 + - pipes-random ==1.0.0.5 - pipes-safe ==2.3.1 - pipes-wai ==3.2.0 - pkcs10 ==0.2.0.0 - placeholders ==0.1 + - planb-token-introspection ==0.1.4.0 - plotlyhs ==0.2.1 - pointed ==5.0.1 - pointedlist ==0.6.1 - pointless-fun ==1.1.0.6 - poll ==0.0.0.1 + - poly ==0.3.1.0 - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.12.1 + - polysemy ==1.0.0.0 + - polysemy-plugin ==0.2.2.0 + - polysemy-zoo ==0.5.0.1 - pooled-io ==0.0.2.2 - port-utils ==0.2.1.0 - posix-paths ==0.2.1.6 - possibly ==1.0.0.0 - postgresql-binary ==0.12.1.2 - postgresql-libpq ==0.9.4.2 + - postgresql-orm ==0.5.1 - postgresql-schema ==0.1.14 - postgresql-simple ==0.6.2 - postgresql-simple-migration ==0.1.14.0 - postgresql-simple-queue ==1.0.1 - postgresql-simple-url ==0.2.1.0 - postgresql-transactional ==1.1.1 + - postgresql-typed ==0.6.0.1 - post-mess-age ==0.2.1.0 - pptable ==0.3.0.0 - pqueue ==1.4.1.2 @@ -1598,17 +1630,19 @@ default-package-overrides: - prettyclass ==1.0.0.0 - pretty-class ==1.0.1.1 - pretty-hex ==1.0 - - prettyprinter ==1.2.1 + - prettyprinter ==1.2.1.1 - prettyprinter-ansi-terminal ==1.1.1.2 - prettyprinter-compat-annotated-wl-pprint ==1 - prettyprinter-compat-ansi-wl-pprint ==1.0.1 - prettyprinter-compat-wl-pprint ==1.0.0.1 + - prettyprinter-convert-ansi-wl-pprint ==1.1 - pretty-show ==1.9.5 - pretty-simple ==2.2.0.1 - pretty-sop ==0.2.0.3 - - pretty-types ==0.2.3.1 + - pretty-types ==0.3.0.1 - primes ==0.2.1.0 - primitive ==0.6.4.0 + - primitive-extras ==0.7.1.1 - prim-uniq ==0.1.0.1 - probability ==0.2.5.2 - process-extras ==0.7.4 @@ -1621,19 +1655,19 @@ default-package-overrides: - prometheus-client ==1.0.0 - promises ==0.3 - prompt ==0.1.1.2 + - prospect ==0.1.0.0 - protobuf ==0.2.1.2 - protobuf-simple ==0.1.1.0 - protocol-buffers ==2.4.12 - protocol-buffers-descriptor ==2.4.12 - protocol-radius ==0.0.1.1 - - protocol-radius-test ==0.0.1.0 - - proto-lens ==0.4.0.1 + - protocol-radius-test ==0.1.0.0 + - proto-lens ==0.5.1.0 - proto-lens-arbitrary ==0.1.2.7 - - proto-lens-combinators ==0.4.0.1 - proto-lens-optparse ==0.1.1.5 - - proto-lens-protobuf-types ==0.4.0.1 - - proto-lens-protoc ==0.4.0.2 - - proto-lens-runtime ==0.4.0.2 + - proto-lens-protobuf-types ==0.5.0.0 + - proto-lens-protoc ==0.5.0.0 + - proto-lens-runtime ==0.5.0.0 - proto-lens-setup ==0.4.0.2 - protolude ==0.2.3 - proxied ==0.3.1 @@ -1646,21 +1680,25 @@ default-package-overrides: - pusher-http-haskell ==1.5.1.9 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - - qnap-decrypt ==0.3.4 - - quadratic-irrational ==0.0.6 + - qnap-decrypt ==0.3.5 + - qrcode-core ==0.9.1 + - qrcode-juicypixels ==0.8.0 + - quadratic-irrational ==0.1.0 - QuasiText ==0.1.2.6 - quickbench ==1.0 - - QuickCheck ==2.12.6.1 + - QuickCheck ==2.13.2 - quickcheck-arbitrary-adt ==0.3.1.0 - quickcheck-assertions ==0.3.0 - - quickcheck-classes ==0.6.0.0 - - quickcheck-instances ==0.3.19 + - quickcheck-classes ==0.6.1.0 + - quickcheck-instances ==0.3.22 - quickcheck-io ==0.2.0 - quickcheck-simple ==0.1.1.0 - quickcheck-special ==0.1.0.6 - - quickcheck-state-machine ==0.4.3 + - quickcheck-state-machine ==0.6.0 - quickcheck-text ==0.1.2.1 + - quickcheck-transformer ==0.3.1 - quickcheck-unicode ==1.0.1.0 + - radius ==0.6.0.3 - rainbow ==0.30.0.2 - rainbox ==0.20.0.0 - ramus ==0.1.2 @@ -1672,24 +1710,30 @@ default-package-overrides: - random-source ==0.3.0.6 - random-tree ==0.6.0.5 - range ==0.2.1.1 - - range-set-list ==0.1.3 + - Ranged-sets ==0.4.0 + - range-set-list ==0.1.3.1 - rank1dynamic ==0.4.0 - - rank2classes ==1.2.1 + - rank2classes ==1.3 - Rasterific ==0.7.4.4 - rasterific-svg ==0.3.3.2 - ratel ==1.0.8 - - ratel-wai ==1.0.5 - - rattletrap ==6.0.2 + - ratel-wai ==1.1.0 + - rattle ==0.1 + - rattletrap ==9.0.1 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 - raw-strings-qq ==1.1 - rcu ==0.2.4 + - rdf ==0.1.0.3 - re2 ==0.3 - 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.0.0 - rebase ==1.3.1.1 - - record-dot-preprocessor ==0.1.5 + - record-dot-preprocessor ==0.2 + - record-hasfield ==1.0 - records-sop ==0.1.0.3 - recursion-schemes ==5.1.3 - reducers ==3.12.3 @@ -1713,39 +1757,43 @@ default-package-overrides: - registry ==0.1.6.2 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - - relational-query ==0.12.2.1 + - relational-query ==0.12.2.2 - relational-query-HDBC ==0.7.2.0 - relational-record ==0.2.2.0 - relational-schemas ==0.1.7.0 - - relude ==0.4.0 + - relude ==0.5.0 - renderable ==0.2.0.1 - repa ==3.4.1.4 - repa-algorithms ==3.4.1.3 - repa-io ==3.4.1.1 - repline ==0.2.1.0 - - req ==1.2.1 + - req ==2.1.0 - req-conduit ==1.0.0 - - req-url-extra ==0.1.0.0 + - require ==0.4.2 - rerebase ==1.3.1.1 + - resistor-cube ==0.0.1.1 - resource-pool ==0.2.3.2 - resourcet ==1.2.2 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 - - retry ==0.7.7.0 + - retry ==0.8.0.1 - rev-state ==0.1.2 - rfc1751 ==0.1.2 - rfc5051 ==0.1.0.4 - rg ==1.4.0.0 - - rio ==0.1.8.0 + - rhine ==0.5.1.0 + - rhine-gloss ==0.5.1.0 + - rigel-viz ==0.2.0.0 + - rio ==0.1.11.0 - rio-orphans ==0.1.1.0 - - rng-utils ==0.3.0 + - rio-prettyprint ==0.1.0.0 - roc-id ==0.1.0.0 - rocksdb-haskell ==1.0.1 - rocksdb-query ==0.2.0 - roles ==0.2.0.0 + - rope-utf16-splay ==0.3.1.0 - rosezipper ==0.2 - rot13 ==0.2.0.1 - - rounded ==0.1.0.1 - rpmbuild-order ==0.2.1 - RSA ==2.3.1 - runmemo ==1.0.0.1 @@ -1757,8 +1805,12 @@ default-package-overrides: - safe-exceptions-checked ==0.1.0 - safe-foldable ==0.1.0.0 - safeio ==0.0.5.0 + - safe-json ==0.1.0 + - safe-money ==0.9 - SafeSemaphore ==0.10.1 - - salak ==0.1.11 + - salak ==0.3.3 + - salak-toml ==0.3.3 + - salak-yaml ==0.3.3 - saltine ==0.1.0.2 - salve ==1.0.6 - sample-frame ==0.0.3 @@ -1766,102 +1818,116 @@ default-package-overrides: - sampling ==0.3.3 - sandman ==0.2.0.1 - say ==0.1.0.1 - - sbp ==2.4.7 - - sbv ==7.13 - - scalpel ==0.5.1 - - scalpel-core ==0.5.1 + - sbp ==2.6.3 + - sbv ==8.3 + - scalpel ==0.6.0 + - scalpel-core ==0.6.0 - scanf ==0.1.0.0 - scanner ==0.3 + - scheduler ==1.4.1 - scientific ==0.3.6.2 - scotty ==0.11.4 - scrypt ==0.5.0 - - sdl2 ==2.4.1.0 + - sdl2 ==2.5.0.0 - sdl2-gfx ==0.2 - sdl2-image ==2.0.0 - sdl2-mixer ==1.1.0 - sdl2-ttf ==2.1.0 - secp256k1-haskell ==0.1.4 - securemem ==0.1.10 - - selda ==0.3.4.0 - - selda-postgresql ==0.1.7.3 - - selda-sqlite ==0.1.6.1 + - selda ==0.4.0.0 + - selda-json ==0.1.0.0 + - selda-postgresql ==0.1.8.0 + - selda-sqlite ==0.1.7.0 + - selective ==0.3 + - semialign ==1 - semigroupoid-extras ==5 - semigroupoids ==5.3.2 - semigroups ==0.18.5 - - semirings ==0.2.1.1 + - semirings ==0.4.2 - semiring-simple ==1.0.0.1 - semver ==0.3.4 - sendfile ==0.7.11.1 - seqalign ==0.2.0.4 - serf ==0.1.1.0 - serialise ==0.2.1.0 - - servant ==0.15 + - servant ==0.16.2 - servant-auth ==0.3.2.0 - - servant-auth-client ==0.3.3.0 + - servant-auth-client ==0.4.0.0 - servant-auth-docs ==0.2.10.0 - servant-auth-server ==0.4.4.0 - servant-auth-swagger ==0.2.10.0 - - servant-blaze ==0.8 + - servant-auth-wordpress ==1.0.0.1 + - servant-blaze ==0.9 - servant-cassava ==0.10 - - servant-checked-exceptions ==2.0.0.0 - - servant-checked-exceptions-core ==2.0.0.0 - - servant-client ==0.15 - - servant-client-core ==0.15 + - servant-checked-exceptions ==2.2.0.0 + - servant-checked-exceptions-core ==2.2.0.0 + - servant-cli ==0.1.0.1 + - servant-client ==0.16 + - servant-client-core ==0.16 - servant-conduit ==0.15 - servant-docs ==0.11.3 - - servant-elm ==0.5.0.0 - - servant-exceptions ==0.1.1 + - servant-elm ==0.6.0.2 - servant-foreign ==0.15 + - servant-http-streams ==0.16 - servant-js ==0.9.4 - servant-JuicyPixels ==0.3.0.4 - servant-kotlin ==0.1.1.8 - - servant-lucid ==0.8.1 + - servant-lucid ==0.9 + - servant-machines ==0.15 - servant-mock ==0.8.5 - - servant-pandoc ==0.5.0.0 - - servant-rawm ==0.3.0.0 + - servant-multipart ==0.11.4 + - servant-pipes ==0.15 - servant-ruby ==0.9.0.0 - - servant-server ==0.15 + - servant-server ==0.16.2 - servant-static-th ==0.2.2.0 - - servant-streaming ==0.3.0.0 - servant-swagger ==1.1.7.1 - servant-swagger-ui ==0.3.4.3.22.2 - servant-swagger-ui-core ==0.3.3 - servant-swagger-ui-redoc ==0.3.3.1.22.2 - servant-tracing ==0.1.0.2 - - servant-websockets ==1.1.0 + - servant-xml ==1.0.1.4 - servant-yaml ==0.1.0.1 - - serverless-haskell ==0.8.8 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - servius ==1.2.3.0 - ses-html ==0.4.0.0 + - set-cover ==0.0.9 - setenv ==0.1.1.3 - setlocale ==1.0.0.8 + - sexp-grammar ==2.0.2 + - sexpr-parser ==0.1.1.2 - SHA ==1.6.4.4 - shake-language-c ==0.12.0 - shakespeare ==2.0.20 - shared-memory ==0.2.0.0 - shell-conduit ==4.7.0 - shell-escape ==0.2.0 + - shellmet ==0.0.2.0 - shelltestrunner ==1.9 - - shelly ==1.8.0 + - 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 - - show-prettyprint ==0.2.3 + - shower ==0.2.0.1 + - show-prettyprint ==0.3.0.1 - siggy-chardust ==1.0.0 - signal ==0.1.0.4 - - silently ==1.2.5 - - simple-cabal ==0.0.0 - - simple-cmd ==0.1.4 + - silently ==1.2.5.1 + - simple ==0.11.3 + - simple-cabal ==0.0.0.1 + - simple-cmd ==0.2.0.1 - simple-cmd-args ==0.1.2 - simple-log ==0.9.12 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.28 - - simple-vec3 ==0.4.0.10 + - simple-session ==0.10.1.1 + - simple-templates ==0.9.0.0 + - simple-vec3 ==0.6 + - simplistic-generics ==0.1.0.0 - since ==0.0.0 - - singleton-bool ==0.1.4 + - singleton-bool ==0.1.5 - singleton-nats ==0.4.2 - singletons ==2.5.1 - siphash ==1.0.3 @@ -1870,20 +1936,20 @@ default-package-overrides: - skein ==1.0.9.4 - skews ==0.1.0.2 - skip-var ==0.1.1.0 - - skylighting ==0.7.7 - - skylighting-core ==0.7.7 + - skylighting ==0.8.2 + - skylighting-core ==0.8.2 - slack-web ==0.2.0.11 - smallcheck ==1.1.5 + - smallcheck-series ==0.6.1 - smoothie ==0.4.2.9 - - smtp-mail ==0.1.4.6 - snap-blaze ==0.2.1.5 - snap-core ==1.0.4.0 - - snap-server ==1.1.0.0 + - snap-server ==1.1.1.1 - snowflake ==0.1.1.1 - soap ==0.2.3.6 - soap-tls ==0.1.1.4 - socket-activation ==0.1.0.2 - - socks ==0.5.6 + - socks ==0.6.0 - sop-core ==0.4.0.0 - sort ==1.0.0.0 - sorted-list ==0.2.1.0 @@ -1899,7 +1965,7 @@ default-package-overrides: - Spintax ==0.3.3 - splice ==0.6.1.1 - split ==0.2.3.3 - - splitmix ==0.0.2 + - splitmix ==0.0.3 - spoon ==0.3.1 - spreadsheet ==0.1.3.8 - sqlite-simple ==0.4.16.0 @@ -1907,17 +1973,15 @@ default-package-overrides: - sql-words ==0.1.6.3 - srcloc ==0.5.1.2 - stache ==2.0.1 - - stack2nix ==0.2.3 - starter ==0.3.0 - state-codes ==0.1.3 - stateref ==0.3 - statestack ==0.2.0.5 - - StateVar ==1.1.1.1 + - StateVar ==1.2 - static-text ==0.2.0.4 - statistics ==0.15.0.0 - stb-image-redux ==0.2.1.2 - step-function ==0.2 - - stm ==2.5.0.0 - stm-chans ==3.0.0.4 - stm-conduit ==4.0.1 - stm-delay ==0.1.1.1 @@ -1928,50 +1992,58 @@ default-package-overrides: - storable-record ==0.0.4 - storable-tuple ==0.0.3.3 - storablevector ==0.2.13 - - store ==0.5.1.1 + - store ==0.5.1.2 - store-core ==0.4.4 - Strafunski-StrategyLib ==5.0.1.0 - - stratosphere ==0.29.1 + - stratosphere ==0.40.0 - streaming ==0.2.2.0 - streaming-attoparsec ==1.0.0.1 - streaming-bytestring ==0.1.6 + - streaming-cassava ==0.1.0.1 - streaming-commons ==0.2.1.1 - streaming-wai ==0.1.1 - - streamly ==0.5.2 + - streamly ==0.6.1 - streamproc ==1.6.2 - streams ==3.3 - strict ==0.3.2 - strict-base-types ==0.6.1 - strict-concurrency ==0.2.4.3 + - strict-list ==0.1.4 - stringbuilder ==0.5.1 - string-class ==0.1.7.0 - string-combinators ==0.6.0.5 - string-conv ==0.1.2 - string-conversions ==0.4.0.1 + - string-interpolate ==0.1.0.1 - string-qq ==0.0.2 - stringsearch ==0.3.6.6 - string-transform ==1.1.1 + - stripe-concepts ==1.0.1.0 + - stripe-scotty ==1.0.0.0 + - stripe-signature ==1.0.0.1 + - stripe-wreq ==1.0.0.0 - strive ==5.0.8 - structs ==0.1.2 - - stylish-haskell ==0.9.2.2 - - summoner ==1.2.0 + - structured-cli ==2.5.1.0 + - summoner ==1.3.0.1 - sum-type-boilerplate ==0.1.1 - sundown ==0.6 - superbuffer ==0.3.1.1 + - sv ==1.3.1 - sv-cassava ==0.3 - - sv-core ==0.3.1 + - sv-core ==0.4.1 - svg-builder ==0.1.1 - SVGFonts ==1.7.0.1 - svg-tree ==0.6.2.4 - swagger ==0.3.0 - - swagger2 ==2.3.1.1 + - swagger2 ==2.4 - swish ==0.10.0.1 - syb ==0.7.1 - symbol ==0.2.4 - symengine ==0.1.2.0 - sysinfo ==0.1.1 - system-argv0 ==0.1.1 - - systemd ==1.1.2 + - systemd ==1.2.0 - system-fileio ==0.3.16.4 - system-filepath ==0.4.14 - tabular ==0.2.2.7 @@ -1988,19 +2060,21 @@ default-package-overrides: - tar ==0.5.1.0 - tar-conduit ==0.3.2 - tardis ==0.4.1.0 - - tasty ==1.2 + - tasty ==1.2.3 - tasty-ant-xml ==1.1.6 - - tasty-dejafu ==1.2.1.0 + - tasty-dejafu ==2.0.0.1 - tasty-discover ==4.2.1 - tasty-expected-failure ==0.11.1.1 - tasty-golden ==2.3.2 + - tasty-hedgehog ==1.0.0.1 - tasty-hspec ==1.1.5.1 - - tasty-hunit ==0.10.0.1 + - tasty-hunit ==0.10.0.2 - tasty-kat ==0.0.3 - tasty-leancheck ==0.0.1 + - tasty-lua ==0.2.0.1 - tasty-program ==1.0.5 - tasty-quickcheck ==0.10.1 - - tasty-silver ==3.1.12 + - tasty-silver ==3.1.13 - tasty-smallcheck ==0.8.1 - tasty-th ==0.1.7 - TCache ==0.12.1 @@ -2008,14 +2082,14 @@ default-package-overrides: - tcp-streams ==1.0.1.1 - tcp-streams-openssl ==1.0.1.0 - tdigest ==0.2.1 - - telegram-bot-simple ==0.2.0 - template-toolkit ==0.1.1.0 - temporary ==1.3 - temporary-rc ==1.2.0.3 - temporary-resourcet ==0.1.0.1 - tensorflow-test ==0.1.0.0 - tensors ==0.1.4 - - termbox ==0.1.0 + - termbox ==0.2.0 + - terminal-progress-bar ==0.4.1 - terminal-size ==0.3.2.1 - test-framework ==0.8.2.0 - test-framework-hunit ==0.3.0.2 @@ -2026,7 +2100,6 @@ default-package-overrides: - testing-feat ==1.1.0.0 - testing-type-modifiers ==0.1.0.1 - texmath ==0.11.2.2 - - text ==1.2.3.1 - text-binary ==0.2.1.1 - text-builder ==0.6.5.1 - text-conversions ==0.3.0 @@ -2038,20 +2111,23 @@ default-package-overrides: - text-manipulate ==0.2.0.1 - text-metrics ==0.3.0 - text-postgresql ==0.0.3.1 - - text-printer ==0.5 + - text-printer ==0.5.0.1 - text-region ==0.3.1.0 - - text-short ==0.1.2 - - text-show ==3.7.5 + - text-short ==0.1.3 + - text-show ==3.8.2 + - text-show-instances ==3.8.1 + - text-zipper ==0.10.1 - tfp ==1.0.1.1 - tf-random ==0.5 - - th-abstraction ==0.2.11.0 + - th-abstraction ==0.3.1.0 - th-data-compat ==0.0.2.7 - th-desugar ==1.9 - - these ==0.7.6 + - these ==1.0.1 - th-expand-syns ==0.4.4.0 - th-extras ==0.0.0.4 - - th-lift ==0.7.11 - - th-lift-instances ==0.1.12 + - th-lift ==0.8.0.1 + - th-lift-instances ==0.1.13 + - th-nowq ==0.1.0.3 - th-orphans ==0.13.7 - th-printf ==0.6.0 - thread-hierarchy ==0.3.0.1 @@ -2063,11 +2139,11 @@ 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-utilities ==0.2.3.0 - thyme ==0.3.5.5 - - tidal ==1.0.14 - tile ==0.3.0.0 - - time-compat ==0.1.0.3 + - time-compat ==1.9.2.2 - timeit ==2.0 - timelens ==0.2.0.2 - time-lens ==0.4.0.2 @@ -2077,33 +2153,46 @@ default-package-overrides: - time-parsers ==0.1.2.1 - time-qq ==0.0.1.0 - timerep ==2.0.0.2 - - timer-wheel ==0.1.0 + - timer-wheel ==0.2.0.1 - timezone-olson ==0.1.9 - timezone-series ==0.1.9 - - tinylog ==0.14.1 + - tintin ==1.10.0 + - tinylog ==0.15.0 - titlecase ==1.0.1 - tldr ==0.4.0.1 - tls ==1.4.1 - tls-debug ==0.4.5 - - tls-session-manager ==0.0.2.1 + - tls-session-manager ==0.0.3 - tmapchan ==0.0.3 - tmapmvar ==0.0.4 - - tmp-postgres ==0.1.2.2 + - tmp-postgres ==0.2.0.0 - token-bucket ==0.1.0.1 - - tomland ==0.5.0 + - tomland ==1.1.0.1 + - tonalude ==0.1.1.0 + - tonaparser ==0.1.0.0 + - tonatona ==0.1.0.1 + - tonatona-logger ==0.2.0.0 + - tonatona-persistent-postgresql ==0.1.0.1 + - tonatona-persistent-sqlite ==0.1.0.1 + - tonatona-servant ==0.1.0.2 + - torsor ==0.1 - tostring ==0.2.1.1 - TotalMap ==0.1.0.0 + - tracing ==0.0.4.0 - transaction ==0.1.1.3 - transformers-base ==0.4.5.2 - transformers-bifunctors ==0.1 - transformers-compat ==0.6.5 - transformers-fix ==1.0 - traverse-with-class ==1.0.0.0 - - tree-diff ==0.0.2.1 + - tree-diff ==0.1 - tree-fun ==0.8.1.0 - trifecta ==2 - triplesec ==0.2.2.1 + - trivial-constraint ==0.6.0.0 + - true-name ==0.1.0.3 - tsv2csv ==0.1.0.2 + - ttl-hashtables ==1.3.1.0 - ttrie ==0.1.2.1 - tuple ==0.3.0.2 - tuples-homogenous-h98 ==0.1.1.0 @@ -2111,28 +2200,33 @@ default-package-overrides: - tuple-th ==0.2.5 - turtle ==1.5.14 - TypeCompose ==0.9.14 - - typed-process ==0.2.5.0 + - typed-process ==0.2.6.0 + - type-errors ==0.2.0.0 + - type-errors-pretty ==0.0.0.0 - type-fun ==0.1.1 - type-hint ==0.1 - type-level-integers ==0.0.1 - type-level-kv-list ==1.1.0 - type-level-numbers ==0.1.1.1 - - typelits-witnesses ==0.3.0.3 + - typelits-witnesses ==0.4.0.0 + - type-map ==0.1.6.0 - typenums ==0.1.2.1 - type-of-html ==1.5.0.0 - type-of-html-static ==0.1.0.2 - - type-operators ==0.1.0.4 - - typerep-map ==0.3.1 - - type-spec ==0.3.0.1 + - type-operators ==0.2.0.0 + - typerep-map ==0.3.2 + - type-spec ==0.4.0.0 - tz ==0.1.3.2 - tzdata ==0.1.20190325.0 - ua-parser ==0.7.5.1 - ucam-webauth ==0.1.0.0 - ucam-webauth-types ==0.1.0.0 - uglymemo ==0.1.0.1 + - unagi-chan ==0.4.1.0 - unbounded-delays ==0.1.1.0 - unbound-generics ==0.4.0 - unboxed-ref ==0.4.0.0 + - unboxing-vector ==0.1.1.0 - uncertain ==0.3.1.0 - unconstrained ==0.1.0.2 - unicode ==0.0.1.1 @@ -2145,17 +2239,24 @@ default-package-overrides: - uniprot-kb ==0.1.2.0 - uniq-deep ==1.1.1 - unique ==0 + - unique-logic ==0.4 + - unique-logic-tf ==0.5.1 - unit-constraint ==0.0.0 - - universe-base ==1.0.2.1 - - universe-instances-base ==1.0 - - universe-instances-trans ==1.0.0.1 - - universe-reverse-instances ==1.0 + - universe ==1.1 + - universe-base ==1.1.1 + - universe-dependent-sum ==1.1.0.1 + - universe-instances-base ==1.1 + - universe-instances-extended ==1.1 + - universe-instances-trans ==1.1 + - universe-reverse-instances ==1.1 - universum ==1.5.0 - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.1 - unix-time ==0.4.7 - - unliftio ==0.2.11 + - unliftio ==0.2.12 - unliftio-core ==0.1.2.0 + - unliftio-pool ==0.2.1.0 + - unliftio-streams ==0.1.1.0 - unlit ==0.4.0.0 - unordered-containers ==0.2.10.0 - unordered-intmap ==0.1.1 @@ -2175,7 +2276,7 @@ default-package-overrides: - utility-ht ==0.0.14 - uuid ==1.3.13 - uuid-types ==1.0.3 - - validation ==1 + - validation ==1.1 - validity ==0.9.0.1 - validity-aeson ==0.2.0.2 - validity-bytestring ==0.4.1.0 @@ -2188,8 +2289,8 @@ default-package-overrides: - validity-uuid ==0.1.0.2 - validity-vector ==0.2.0.2 - valor ==0.1.0.0 - - vault ==0.3.1.2 - - vec ==0.1.1 + - vault ==0.3.1.3 + - vec ==0.1.1.1 - vector ==0.12.0.3 - vector-algorithms ==0.8.0.1 - vector-binary-instances ==0.2.5.1 @@ -2199,13 +2300,14 @@ default-package-overrides: - vector-instances ==3.4 - vector-mmap ==0.0.3 - vector-sized ==1.2.0.1 - - vector-space ==0.15 + - vector-space ==0.16 - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.6 - - verbosity ==0.2.3.0 + - verbosity ==0.3.0.0 - versions ==3.5.1 - ViennaRNAParser ==1.3.3 - - vinyl ==0.10.0.1 + - viewprof ==0.0.0.28 + - vinyl ==0.11.0 - vivid ==0.4.2.3 - vivid-osc ==0.5.0.0 - vivid-supercollider ==0.4.1.2 @@ -2213,11 +2315,12 @@ default-package-overrides: - vty ==5.25.1 - wai ==3.2.2.1 - wai-app-static ==3.1.6.3 - - wai-cli ==0.1.1 + - wai-cli ==0.2.1 - wai-conduit ==3.0.0.4 - wai-cors ==0.2.7 + - wai-enforce-https ==0.0.1 - wai-eventsource ==3.0.0 - - wai-extra ==3.0.26.1 + - wai-extra ==3.0.27 - wai-handler-launch ==3.0.2.4 - wai-logger ==2.3.5 - wai-middleware-auth ==0.1.2.1 @@ -2235,10 +2338,10 @@ default-package-overrides: - warp ==3.2.28 - warp-tls ==3.2.7 - warp-tls-uid ==0.2.0.6 - - wave ==0.1.5 + - wave ==0.2.0 - wcwidth ==0.0.2 - web3 ==0.8.3.2 - - webdriver ==0.8.5 + - webdriver ==0.9.0.1 - webex-teams-api ==0.2.0.0 - webex-teams-conduit ==0.2.0.0 - webex-teams-pipes ==0.2.0.0 @@ -2253,9 +2356,10 @@ default-package-overrides: - wikicfp-scraper ==0.1.0.11 - wild-bind ==0.1.2.4 - wild-bind-x11 ==0.2.0.7 + - Win32 ==2.6.1.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - winery ==0.3.1 + - winery ==1.1.2 - wire-streams ==0.1.1.0 - witherable ==0.3.1 - with-location ==0.1.0 @@ -2266,10 +2370,15 @@ default-package-overrides: - wl-pprint-text ==1.2.0.0 - word24 ==2.0.1 - word8 ==0.1.3 + - wordpress-auth ==1.0.0.0 - word-trie ==0.3.0 - - world-peace ==0.1.0.0 + - word-wrap ==0.4.1 + - world-peace ==1.0.1.0 - wrap ==0.0.0 - - wreq ==0.5.3.1 + - wreq ==0.5.3.2 + - writer-cps-exceptions ==0.1.0.1 + - writer-cps-mtl ==0.1.1.6 + - writer-cps-transformers ==0.5.6.1 - ws ==0.0.5 - wuss ==1.1.14 - X11 ==1.9 @@ -2281,16 +2390,16 @@ default-package-overrides: - x509-validation ==1.6.11 - Xauth ==0.1 - xdg-basedir ==0.2.2 + - xdg-userdirs ==0.1.0.2 - xeno ==0.3.5.1 - xenstore ==0.1.1 - - xhtml ==3000.2.2.1 - xls ==0.1.2 - xlsx ==0.7.2 - xlsx-tabular ==0.2.2.1 - xml ==1.3.14 - xml-basic ==0.1.3.1 - - xmlbf ==0.4.1 - - xmlbf-xeno ==0.1.1 + - xmlbf ==0.6 + - xmlbf-xeno ==0.2 - xml-conduit ==1.8.0.1 - xml-conduit-parse ==0.3.1.2 - xml-conduit-writer ==0.1.1.2 @@ -2309,8 +2418,6 @@ default-package-overrides: - xmonad-extras ==0.15.1 - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - - yam ==0.5.17 - - yam-datasource ==0.5.17 - yaml ==0.11.1.0 - yeshql ==4.1.0.1 - yeshql-core ==4.1.0.2 @@ -2325,11 +2432,10 @@ default-package-overrides: - yesod-csp ==0.2.5.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 - - yesod-form ==1.6.5 + - yesod-form ==1.6.6 - yesod-form-bootstrap4 ==2.1.2 - yesod-gitrepo ==0.3.0 - yesod-gitrev ==0.2.1 - - yesod-markdown ==0.12.6.2 - yesod-newsfeed ==1.6.1.0 - yesod-paginator ==1.1.0.2 - yesod-persistent ==1.6.0.2 @@ -2346,12 +2452,12 @@ default-package-overrides: - yoga ==0.0.0.5 - youtube ==0.2.1.1 - zero ==0.1.5 - - zeromq4-haskell ==0.7.0 + - zeromq4-haskell ==0.8.0 - zeromq4-patterns ==0.3.1.0 - zim-parser ==0.2.1.0 - zip ==1.2.0 - zip-archive ==0.4.1 - - zippers ==0.2.5 + - zippers ==0.3 - zip-stream ==0.2.0.1 - zlib ==0.6.2 - zlib-bindings ==0.1.1.5 @@ -2369,6 +2475,7 @@ extra-packages: - binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers - blank-canvas < 0.6.3 # more recent versions depend on base-compat-batteries == 0.10.* but we're on base-compat-0.9.* - Cabal == 2.2.* # required for jailbreak-cabal etc. + - Cabal == 2.4.* # required for cabal-install etc. - colour < 2.3.4 # newer versions don't support GHC 7.10.x - conduit >=1.1 && <1.3 # pre-lts-11.x versions neeed by git-annex 6.20180227 - conduit-extra >=1.1 && <1.3 # pre-lts-11.x versions neeed by git-annex 6.20180227 @@ -2664,7 +2771,6 @@ broken-packages: - acme-stringly-typed - acme-zalgo - acme-zero - - acousticbrainz-client - ActionKid - activehs - activehs-base @@ -2708,6 +2814,7 @@ broken-packages: - aeson-t - aeson-tiled - aeson-typescript + - affection - affine-invariant-ensemble-mcmc - afv - ag-pictgen @@ -2742,6 +2849,7 @@ broken-packages: - AlgorithmW - align-text - AlignmentAlgorithms + - Allure - alms - alpha - alphachar @@ -2758,6 +2866,146 @@ broken-packages: - amazon-emailer - amazon-emailer-client-snap - amazon-products + - amazonka + - amazonka-alexa-business + - amazonka-apigateway + - amazonka-application-autoscaling + - amazonka-appstream + - amazonka-appsync + - amazonka-athena + - amazonka-autoscaling + - amazonka-autoscaling-plans + - amazonka-batch + - amazonka-budgets + - amazonka-certificatemanager + - amazonka-certificatemanager-pca + - amazonka-cloud9 + - amazonka-clouddirectory + - amazonka-cloudformation + - amazonka-cloudfront + - amazonka-cloudhsm + - amazonka-cloudhsmv2 + - amazonka-cloudsearch + - amazonka-cloudsearch-domains + - amazonka-cloudtrail + - amazonka-cloudwatch + - amazonka-cloudwatch-events + - amazonka-cloudwatch-logs + - amazonka-codebuild + - amazonka-codecommit + - amazonka-codedeploy + - amazonka-codepipeline + - amazonka-codestar + - amazonka-cognito-identity + - amazonka-cognito-idp + - amazonka-cognito-sync + - amazonka-comprehend + - amazonka-config + - amazonka-connect + - amazonka-core + - amazonka-cost-explorer + - amazonka-cur + - amazonka-datapipeline + - amazonka-devicefarm + - amazonka-directconnect + - amazonka-discovery + - amazonka-dms + - amazonka-ds + - amazonka-dynamodb + - amazonka-dynamodb-dax + - amazonka-dynamodb-streams + - amazonka-ec2 + - amazonka-ecr + - amazonka-ecs + - amazonka-efs + - amazonka-elasticache + - amazonka-elasticbeanstalk + - amazonka-elasticsearch + - amazonka-elastictranscoder + - amazonka-elb + - amazonka-elbv2 + - amazonka-emr + - amazonka-fms + - amazonka-gamelift + - amazonka-glacier + - amazonka-glue + - amazonka-greengrass + - amazonka-guardduty + - amazonka-health + - amazonka-iam + - amazonka-importexport + - amazonka-inspector + - amazonka-iot + - amazonka-iot-analytics + - amazonka-iot-dataplane + - amazonka-iot-jobs-dataplane + - amazonka-kinesis + - amazonka-kinesis-analytics + - amazonka-kinesis-firehose + - amazonka-kinesis-video + - amazonka-kinesis-video-archived-media + - amazonka-kinesis-video-media + - amazonka-kms + - amazonka-lambda + - amazonka-lex-models + - amazonka-lex-runtime + - amazonka-lightsail + - amazonka-marketplace-analytics + - amazonka-marketplace-entitlement + - amazonka-marketplace-metering + - amazonka-mechanicalturk + - amazonka-mediaconvert + - amazonka-medialive + - amazonka-mediapackage + - amazonka-mediastore + - amazonka-mediastore-dataplane + - amazonka-migrationhub + - amazonka-ml + - amazonka-mobile + - amazonka-mq + - amazonka-opsworks + - amazonka-opsworks-cm + - amazonka-organizations + - amazonka-pinpoint + - amazonka-polly + - amazonka-pricing + - amazonka-rds + - amazonka-redshift + - amazonka-rekognition + - amazonka-resourcegroups + - amazonka-resourcegroupstagging + - amazonka-route53 + - amazonka-route53-autonaming + - amazonka-route53-domains + - amazonka-s3 + - amazonka-s3-streaming + - amazonka-sagemaker + - amazonka-sagemaker-runtime + - amazonka-sdb + - amazonka-secretsmanager + - amazonka-serverlessrepo + - amazonka-servicecatalog + - amazonka-ses + - amazonka-shield + - amazonka-sms + - amazonka-snowball + - amazonka-sns + - amazonka-sqs + - amazonka-ssm + - amazonka-stepfunctions + - amazonka-storagegateway + - amazonka-sts + - amazonka-support + - amazonka-swf + - amazonka-test + - amazonka-transcribe + - amazonka-translate + - amazonka-waf + - amazonka-waf-regional + - amazonka-workdocs + - amazonka-workmail + - amazonka-workspaces + - amazonka-xray - amby - AMI - ampersand @@ -2784,11 +3032,22 @@ broken-packages: - anonymous-sums - anonymous-sums-tests - ansi-terminal-game + - ansigraph - antagonist - antfarm - anticiv - antigate - antimirov + - antiope-athena + - antiope-contract + - antiope-core + - antiope-dynamodb + - antiope-messages + - antiope-optparse-applicative + - antiope-s3 + - antiope-sns + - antiope-sqs + - antiope-swf - antisplice - antlr-haskell - antlrc @@ -2830,6 +3089,7 @@ broken-packages: - ApproxFun-hs - arb-fft - arbb-vm + - arbor-monad-logger - arbor-monad-metric - arbor-monad-metric-datadog - arbor-postgres @@ -2853,6 +3113,7 @@ broken-packages: - arpack - array-forth - array-primops + - arraylist - ArrayRef - arrow-improve - arrow-list @@ -2862,6 +3123,7 @@ broken-packages: - ArrowVHDL - artery - artifact + - asap - ascii-flatten - ascii-string - ascii-vector-avc @@ -2896,7 +3158,6 @@ broken-packages: - atomic-primops-vector - atomo - ats-format - - ats-pkg - ats-setup - ats-storable - attic-schedule @@ -2904,11 +3165,13 @@ broken-packages: - AttoJson - attoparsec-data - attoparsec-enumerator + - attoparsec-ip - attoparsec-iteratee - attoparsec-text - attoparsec-text-enumerator - attoparsec-time - attoparsec-trans + - attoparsec-uri - attosplit - Attrac - atuin @@ -2941,6 +3204,7 @@ broken-packages: - aws-configuration-tools - aws-dynamodb-conduit - aws-dynamodb-streams + - aws-easy - aws-ec2 - aws-ec2-knownhosts - aws-elastic-transcoder @@ -2949,12 +3213,14 @@ broken-packages: - aws-kinesis-client - aws-kinesis-reshard - aws-lambda + - aws-lambda-runtime - aws-mfa-credentials - aws-performance-tests - aws-route53 - aws-sdk - aws-sdk-text-converter - aws-sdk-xml-unordered + - aws-ses-easy - aws-sign4 - aws-simple - aws-sns @@ -2968,6 +3234,7 @@ broken-packages: - babylon - backblaze-b2-hs - backdropper + - backprop - backstop - backtracking-exceptions - backward-state @@ -2997,7 +3264,6 @@ broken-packages: - base-feature-macros - base-generics - base-io-access - - base64-bytestring-type - base64-conduit - baserock-schema - BASIC @@ -3039,7 +3305,6 @@ broken-packages: - bidirectionalization-combined - bidispec - bidispec-extras - - bifunctor - BiGUL - billboard-parser - billeksah-forms @@ -3051,7 +3316,6 @@ broken-packages: - binary-ext - binary-file - binary-indexed-tree - - binary-instances - binary-protocol - binary-protocol-zmq - binary-streams @@ -3097,9 +3361,7 @@ broken-packages: - Biobase - BiobaseBlast - BiobaseDotP - - BiobaseENA - BiobaseEnsembl - - BiobaseFasta - BiobaseFR3D - BiobaseHTTP - BiobaseHTTPTools @@ -3108,9 +3370,7 @@ broken-packages: - BiobaseNewick - BiobaseTrainingData - BiobaseTurner - - BiobaseTypes - BiobaseVienna - - BiobaseXNA - biocore - biofasta - biofastq @@ -3123,8 +3383,8 @@ broken-packages: - birch-beer - bird - BirdPP + - bisc - bisect-binary - - bishbosh - bit-array - bit-stream - bitcoin-hs @@ -3138,11 +3398,13 @@ broken-packages: - bitstream - BitStringRandomMonad - bittorrent - - bitvec + - bitwise - bizzlelude - bizzlelude-js - bkr - bla + - blacktip + - blake2 - blakesum - blakesum-demo - blas @@ -3184,7 +3446,6 @@ broken-packages: - blunt - BNFC-meta - bno055-haskell - - board-games - bogre-banana - bolt - boltzmann-brain @@ -3194,10 +3455,11 @@ broken-packages: - bookkeeper - bookkeeper-permissions - Bookshelf + - boolean-normal-forms - boolexpr - boombox - boomslang - - boots + - boots-app - borel - boring-window-switcher - bot @@ -3243,13 +3505,15 @@ broken-packages: - buildbox-tools - buildwrapper - bullet + - bulletproofs + - bulmex - bumper - bunz - burnt-explorer - burst-detection - bus-pirate - - buster - Buster + - buster - buster-gtk - buster-network - butter @@ -3285,6 +3549,7 @@ broken-packages: - cabal-dependency-licenses - cabal-dev - cabal-dir + - cabal-fmt - cabal-ghc-dynflags - cabal-ghci - cabal-graphdeps @@ -3298,10 +3563,12 @@ broken-packages: - cabal-nirvana - cabal-progdeps - cabal-query + - cabal-rpm - cabal-setup - cabal-sort - cabal-src - cabal-test + - cabal-test-quickcheck - cabal-toolkit - cabal-upload - cabal2arch @@ -3318,6 +3585,9 @@ broken-packages: - cabin - cabocha - cached + - cachix + - cachix-api + - cacophony - caffegraph - cairo-core - cake @@ -3335,7 +3605,6 @@ broken-packages: - call-haskell-from-anything - camfort - campfire - - canon - canonical-filepath - canonical-json - canteven-http @@ -3343,10 +3612,10 @@ broken-packages: - canteven-log - canteven-parsedate - cantor + - cantor-pairing - cao - cap - Capabilities - - capataz - capnp - capped-list - capri @@ -3371,18 +3640,20 @@ broken-packages: - cash - cassandra-cql - Cassava + - cassava-conduit - cassette - cassy + - caster - castle - casui - catamorphism - Catana - catch-fd - categorical-algebra - - category - category-extras - category-traced - catnplus + - cautious-gen - cayley-client - CBOR - CC-delcont-alt @@ -3407,6 +3678,7 @@ broken-packages: - cereal-ieee754 - cereal-io-streams - cereal-plus + - cereal-streams - certificate - cf - cfipu @@ -3427,8 +3699,8 @@ broken-packages: - chatwork - cheapskate-terminal - check-pvp - - checked - Checked + - checked - checkmate - chell - chell-hunit @@ -3436,6 +3708,7 @@ broken-packages: - chessIO - chevalier-common - chiasma + - chiphunk - chitauri - Chitra - choose @@ -3531,6 +3804,8 @@ broken-packages: - clustering - clustertools - clutterhs + - cmark-highlight + - cmark-patterns - cmark-sections - cmath - cmathml3 @@ -3567,6 +3842,7 @@ broken-packages: - collada-types - collapse-duplication - collapse-util + - collection-json - collections - collections-api - collections-base-instances @@ -3626,12 +3902,13 @@ broken-packages: - concrete-typerep - concurrent-buffer - Concurrent-Cache + - concurrent-dns-cache - concurrent-machines - concurrent-state - Concurrential - ConcurrentUtils - - condor - Condor + - condor - condorcet - conductive-base - conductive-hsc3 @@ -3644,6 +3921,7 @@ broken-packages: - conduit-throttle - conduit-tokenize-attoparsec - conf + - confcrypt - conffmt - confide - config-parser @@ -3666,9 +3944,7 @@ broken-packages: - constrained-category - constrained-dynamic - constrained-monads - - constraint - constraint-manip - - constraint-reflection - ConstraintKinds - constraints-emerge - constructive-algebra @@ -3703,8 +3979,12 @@ broken-packages: - convert-annotation - convertible-ascii - convertible-text + - copilot - copilot-cbmc + - copilot-language + - copilot-libraries - copilot-sbv + - copilot-theorem - copr - COrdering - core @@ -3731,7 +4011,6 @@ broken-packages: - cparsing - CPBrainfuck - cpio-conduit - - cpkg - cplusplus-th - cprng-aes-effect - cpuperf @@ -3782,8 +4061,10 @@ broken-packages: - crypto-simple - cryptocompare - cryptoconditions + - cryptol - cryptsy-api - crystalfontz + - csa - cse-ghc-plugin - csg - CSPM-cspm @@ -3806,7 +4087,6 @@ broken-packages: - curry-frontend - CurryDB - cursedcsv - - cursor-gen - curve25519 - curves - custom-prelude @@ -3817,8 +4097,8 @@ broken-packages: - dag - DAG-Tournament - Dangerous - - dao - Dao + - dao - dapi - darcs-benchmark - darcs-beta @@ -3852,6 +4132,7 @@ broken-packages: - data-fin - data-fin-simple - data-flagset + - data-interval - data-ivar - data-kiln - data-layer @@ -3872,14 +4153,13 @@ broken-packages: - data-repr - data-result - data-rev - - data-rope - Data-Rope + - data-rope - data-rtuple - data-size - data-spacepart - data-standards - data-store - - data-stringmap - data-structure-inferrer - data-type - data-util @@ -3890,6 +4170,7 @@ broken-packages: - datadog-tracing - datafix - dataflow + - DataIndex - datalog - datasets - DataTreeView @@ -3974,8 +4255,10 @@ broken-packages: - deptrack-core - deptrack-devops - deptrack-dot + - dequeue - derangement - derivation-trees + - derive - derive-enumerable - derive-gadt - derive-IG @@ -3996,6 +4279,7 @@ broken-packages: - dgim - dgs - dhall-check + - dhall-json - dhall-lsp-server - dhall-nix - dhall-to-cabal @@ -4031,8 +4315,10 @@ broken-packages: - difftodo - digestive-bootstrap - digestive-foundation-lucid + - digestive-functors-happstack - digestive-functors-heist - digestive-functors-hsp + - digit - DigitalOcean - digitalocean-kzs - digraph @@ -4054,6 +4340,7 @@ broken-packages: - dirtree - discogs-haskell - discord-gateway + - discord-haskell - discord-hs - discord-rest - discord-types @@ -4096,6 +4383,7 @@ broken-packages: - djembe - djinn-th - dl-fedora + - dmcc - dmenu - dmenu-pkill - dmenu-pmount @@ -4108,13 +4396,13 @@ broken-packages: - doc-review - doccheck - docidx + - docker - docker-build-cacher - dockercook - DocTest - doctest-discover-configurator - doctest-driver-gen - doctest-prop - - docusign-client - docusign-example - docvim - doi @@ -4123,9 +4411,11 @@ broken-packages: - domain-auth - domplate - dot-linker + - dot2graphml - dotenv - dotfs - doublify-toolkit + - dovin - download-media-content - dozenal - dozens @@ -4181,7 +4471,6 @@ broken-packages: - dwarfadt - dyckword - dynamic-cabal - - dynamic-graph - dynamic-object - dynamic-plot - dynamic-pp @@ -4200,6 +4489,7 @@ broken-packages: - easyplot - ebeats - ebnf-bff + - ec2-unikernel - ecma262 - ecu - eddie @@ -4226,15 +4516,18 @@ broken-packages: - Eight-Ball-Pool-Hack-Cheats - either-list-functions - EitherT + - ekg-cloudwatch - ekg-elastic - ekg-elasticsearch - ekg-influxdb - ekg-log + - ekg-prometheus-adapter - ekg-push - ekg-rrd - elevator - elision - elm-websocket + - elsa - emacs-keys - email - email-header @@ -4252,12 +4545,10 @@ broken-packages: - encoding-io - engine-io-growler - engine-io-snap - - engine-io-wai - engine-io-yesod - entangle - EntrezHTTP - entwine - - enum-text-rio - EnumContainers - enumerate - enumerate-function @@ -4268,7 +4559,6 @@ broken-packages: - enumfun - EnumMap - enummapmap - - enummapset - enummapset-th - env-parser - envstatus @@ -4320,6 +4610,7 @@ broken-packages: - ethereum-client-haskell - ethereum-merkle-patricia-db - eths-rlp + - euler-tour-tree - euphoria - eurofxref - Euterpea @@ -4333,6 +4624,8 @@ broken-packages: - eventlog2html - EventSocket - eventsource-geteventstore-store + - eventsource-store-specs + - eventsource-stub-store - eventstore - every-bit-counts - exact-cover @@ -4362,21 +4655,21 @@ broken-packages: - explicit-sharing - explore - exposed-containers - - expressions - expressions-z3 - extcore - extemp - extended-categories - extensible-data + - extensible-effects-concurrent - Extra - extract-dependencies - extractelf + - extralife - ez-couch - ez3 - f-ree-hack-cheats-free-v-bucks-generator - Facebook-Password-Hacker-Online-Latest-Version - faceted - - factory - Facts - factual-api - fadno @@ -4402,9 +4695,18 @@ broken-packages: - FastxPipe - fathead-util - fault-tree + - fay + - fay-base - fay-builder + - fay-dom + - fay-geoposition - fay-hsx + - fay-jquery + - fay-ref - fay-simplejson + - fay-text + - fay-uri + - fay-websockets - fb-persistent - fbmessenger-api - fca @@ -4417,6 +4719,7 @@ broken-packages: - fdo-trash - feature-flipper - feature-flipper-postgres + - fedora-haskell-tools - fedora-img-dl - fedora-packages - feed-cli @@ -4439,7 +4742,6 @@ broken-packages: - ffmpeg-tutorials - ffunctor - fgl-extras-decompositions - - fib - fibon - ficketed - fields @@ -4454,14 +4756,15 @@ broken-packages: - FileManipCompat - fileneglect - filepath-io-access - - filepather - FilePather + - filepather - Files - FileSystem - filesystem-conduit - filesystem-enumerator - filesystem-trees - fillit + - Fin - final-pretty-printer - Finance-Quote-Yahoo - Finance-Treasury @@ -4476,8 +4779,8 @@ broken-packages: - first-and-last - firstify - FirstOrderTheory - - fishfood - fit + - fits-parse - fitsio - fix-parser-simple - fix-symbols-gitit @@ -4486,6 +4789,7 @@ broken-packages: - fixed-point-vector-space - fixed-precision - fixed-storable-array + - fixed-timestep - fixed-vector-binary - fixed-vector-cborg - fixed-vector-cereal @@ -4526,8 +4830,8 @@ broken-packages: - FM-SBLEX - fmark - FModExRaw - - fmt-for-rio - fn-extra + - focuslist - foldl-incremental - foldl-statistics - folds-common @@ -4559,6 +4863,7 @@ broken-packages: - forth-hll - Fortnite-Hack-Cheats-Free-V-Bucks-Generator - fortran-src + - fortytwo - foscam-directory - foscam-filename - foscam-sort @@ -4570,6 +4875,7 @@ broken-packages: - Fractaler - fractals - frag + - Frames - Frames-beam - Frames-dsv - Frames-map-reduce @@ -4605,6 +4911,7 @@ broken-packages: - fresh - friday-devil - friday-scale-dct + - front - frown - frp-arduino - frpnow @@ -4617,8 +4924,11 @@ broken-packages: - fsmActions - fsutils - fswait + - ft-generator - ftdi - FTGL-bytestring + - ftp-client + - ftp-client-conduit - ftp-conduit - FTPLine - ftshell @@ -4639,9 +4949,9 @@ broken-packages: - FunGEn - Fungi - funion + - funnyprint - funpat - funsat - - fused-effects-exceptions - fusion - futun - future @@ -4722,6 +5032,7 @@ broken-packages: - GeocoderOpenCage - geodetic - geodetic-types + - geojson - geojson-types - geolite-csv - geom2d @@ -4732,7 +5043,6 @@ broken-packages: - getflag - GGg - ggtsTC - - gh-labeler - ghc-core-smallstep - ghc-datasize - ghc-dump-tree @@ -4740,7 +5050,6 @@ broken-packages: - ghc-events-analyze - ghc-events-parallel - ghc-generic-instances - - ghc-heap-view - ghc-imported-from - ghc-instances - ghc-man-completion @@ -4774,40 +5083,24 @@ broken-packages: - ghcprofview - ght - gi-cairo-again - - gi-dbusmenu - - gi-dbusmenugtk3 - - gi-gdkx11 - - gi-ggit - - gi-girepository - - gi-gst - - gi-gstaudio - - gi-gstbase + - gi-graphene + - gi-gsk - gi-gstpbutils - gi-gsttag - - gi-gstvideo - - gi-gtk - gi-gtk-declarative - gi-gtk-declarative-app-simple - - gi-gtk-hs - gi-gtkosxapplication - - gi-gtksource - gi-handy - gi-notify - - gi-ostree - - gi-pangocairo - gi-poppler - - gi-secret - - gi-soup - - gi-vte - gi-wnck - - gi-xlib - giak - Gifcurry - - ginger - ginsu - gipeda - - gist + - giphy-api - GiST + - gist - git-checklist - git-config - git-date @@ -4818,9 +5111,7 @@ broken-packages: - git-remote-ipfs - git-repair - git-sanity - - git-vogue - gitdo - - github - github-backup - github-data - github-tools @@ -4834,6 +5125,7 @@ broken-packages: - gitlib-s3 - gitlib-utils - gitson + - givegif - glade - gladexml-accessor - glapp @@ -4880,9 +5172,11 @@ broken-packages: - google-drive - google-html5-slide - google-mail-filters + - google-maps-geocoding - google-oauth2 - google-oauth2-easy - google-search + - google-static-maps - google-translate - GoogleCodeJam - GoogleDirections @@ -4904,6 +5198,7 @@ broken-packages: - GotoT-transformers - gotta-go-fast - gpah + - GPipe - GPipe-Collada - GPipe-Examples - GPipe-GLFW @@ -4912,6 +5207,8 @@ broken-packages: - gps2htmlReport - GPX - gpx-conduit + - grab + - grab-form - graceful - graflog - Grafos @@ -4946,7 +5243,9 @@ broken-packages: - graphics-formats-collada - graphicsFormats - graphicstools - - graphql-w-persistent + - graphite + - graphql + - graphql-api - graphtype - graql - grasp @@ -4968,6 +5267,7 @@ broken-packages: - group-with - growler - GrowlNotify + - grpc-api-etcd - grpc-etcd-client - gruff - gruff-examples @@ -4979,8 +5279,6 @@ broken-packages: - GTALib - gtfs - gtk-serialized-event - - gtk-sni-tray - - gtk-strut - gtk-toy - gtk2hs-hello - gtk2hs-rpn @@ -5053,12 +5351,15 @@ broken-packages: - hahp - haiji - hail + - hailgun - hailgun-send + - hailgun-simple - hairy - hakaru - hakismet - hakka - hako + - hakyll - hakyll-agda - hakyll-blaze-templates - hakyll-contrib @@ -5068,9 +5369,15 @@ broken-packages: - hakyll-contrib-links - hakyll-convert - hakyll-dhall + - hakyll-dir-list + - hakyll-favicon - hakyll-filestore + - hakyll-images - hakyll-ogmarkup - hakyll-R + - hakyll-sass + - hakyll-series + - hakyll-shakespeare - hakyll-shortcode - hakyll-shortcut-links - halberd @@ -5116,20 +5423,25 @@ broken-packages: - happstack-data - happstack-dlg - happstack-facebook + - happstack-fastcgi - happstack-fay - happstack-fay-ajax - happstack-foundation - happstack-hamlet - happstack-heist - happstack-helpers + - happstack-hsp - happstack-hstringtemplate - happstack-ixset - happstack-jmacro - happstack-lite - happstack-monad-peel - happstack-plugins + - happstack-server + - happstack-server-tls - happstack-server-tls-cryptonite - happstack-state + - happstack-static-routing - happstack-util - happstack-yui - happy-meta @@ -5159,6 +5471,7 @@ broken-packages: - Haschoo - HasGP - hash + - hash-store - hashable-extras - hashable-generics - hashabler @@ -5185,7 +5498,6 @@ broken-packages: - haskell-cnc - haskell-coffee - haskell-compression - - haskell-conll - haskell-course-preludes - haskell-disque - haskell-eigen-util @@ -5194,6 +5506,7 @@ broken-packages: - haskell-generate - haskell-go-checkers - haskell-holes-th + - haskell-import-graph - haskell-in-space - haskell-kubernetes - haskell-lsp-client @@ -5215,7 +5528,6 @@ broken-packages: - haskell-src-exts-prisms - haskell-src-exts-qq - haskell-src-exts-sc - - haskell-src-exts-simple - haskell-src-meta-mwotton - haskell-stack-trace-plugin - haskell-token-utils @@ -5259,6 +5571,8 @@ broken-packages: - haskelldb-th - haskelldb-wx - HaskellLM + - HaskellNet + - HaskellNet-SSL - HaskellNN - Haskelloids - haskellscrabble @@ -5301,6 +5615,7 @@ broken-packages: - haskus-system-build - haskus-utils - haskus-utils-compat + - haskus-utils-variant - haskus-web - haslo - hasloGUI @@ -5308,7 +5623,6 @@ broken-packages: - hasql-backend - hasql-class - hasql-cursor-query - - hasql-cursor-transaction - hasql-dynamic-statements - hasql-generic - hasql-implicits @@ -5331,7 +5645,6 @@ broken-packages: - HaTeX-qq - hats - hatt - - haven - haverer - HaVSA - hawitter @@ -5373,8 +5686,8 @@ broken-packages: - hdaemonize-buildfix - hdbc-aeson - HDBC-mysql - - hdbc-postgresql-hstore - HDBC-postgresql-hstore + - hdbc-postgresql-hstore - hdbi - hdbi-conduit - hdbi-postgresql @@ -5396,14 +5709,14 @@ broken-packages: - heartbeat-streams - heatitup - heatitup-complete + - heavy-logger-amazon - hecc - heckle - hedgehog-checkers - hedgehog-checkers-lens - hedgehog-classes - - hedgehog-fn - hedgehog-gen-json - - hedgehog-quickcheck + - hedgehog-generic - Hedi - hedis-config - hedis-pile @@ -5462,6 +5775,7 @@ broken-packages: - hexquote - hext - heyefi + - heyting-algebras - hF2 - hfann - hfd @@ -5486,6 +5800,7 @@ broken-packages: - hgis - hgithub - HGL + - hgmp - hgom - hgopher - HGraphStorage @@ -5494,7 +5809,6 @@ broken-packages: - hgrib - hharp - HHDL - - hi-file-parser - hi3status - hiccup - hichi @@ -5507,6 +5821,7 @@ broken-packages: - hierarchy - hiernotify - Hieroglyph + - higgledy - HiggsSet - higherorder - highjson @@ -5524,6 +5839,7 @@ broken-packages: - hinstaller - hint-server - hinter + - hinterface - hinvaders - hinze-streams - hipbot @@ -5551,7 +5867,6 @@ broken-packages: - hjsonschema - hjugement-cli - HJVM - - hkgr - hlatex - hlbfgsb - hlcm @@ -5560,6 +5875,7 @@ broken-packages: - HLearn-classification - HLearn-datastructures - HLearn-distributions + - hledger-api - hledger-chart - hledger-flow - hledger-irr @@ -5569,14 +5885,16 @@ broken-packages: - hlibfam - HList - HListPP - - hlogger + - hlivy - HLogger + - hlogger - hlongurl - hls - hlwm - hly - hmark - hmarkup + - hmatrix-backprop - hmatrix-banded - hmatrix-mmap - hmatrix-morpheus @@ -5584,6 +5902,7 @@ broken-packages: - hmatrix-sparse - hmatrix-static - hmatrix-sundials + - hmatrix-svdlibc - hmatrix-syntax - hmatrix-tests - hmeap @@ -5591,8 +5910,8 @@ broken-packages: - hmenu - hmep - hmk - - hmm - HMM + - hmm - hmm-hmatrix - hmm-lapack - hMollom @@ -5600,6 +5919,10 @@ broken-packages: - Hmpf - hmt-diagrams - hmumps + - hnetcdf + - hnix + - hnix-store-core + - hnix-store-remote - HNM - hnormalise - ho-rewriting @@ -5648,6 +5971,7 @@ broken-packages: - hoovie - hopencc - hopencl + - hopenpgp-tools - hopfield - hoppy-docs - hoppy-generator @@ -5666,7 +5990,9 @@ broken-packages: - hp2any-core - hp2any-graph - hp2any-manager + - hpack - hpack-convert + - hpack-dhall - hpaco - hpaco-lib - hpage @@ -5681,12 +6007,14 @@ broken-packages: - hpdft - hpg - HPi + - hpio - hplaylist - HPlot - hpodder - HPong - hpqtypes - hpqtypes-extras + - hprotoc - hprotoc-fork - hprox - hps @@ -5701,8 +6029,8 @@ broken-packages: - hR - hranker - HRay - - hricket - Hricket + - hricket - hriemann - HROOT - HROOT-core @@ -5749,6 +6077,7 @@ broken-packages: - hsbencher - hsbencher-codespeed - hsbencher-fusion + - hsc2hs - hsc3-auditor - hsc3-cairo - hsc3-data @@ -5874,6 +6203,7 @@ broken-packages: - hsx - hsx-jmacro - hsx-xhtml + - hsx2hs - hsXenCtrl - HsYAML-aeson - hsyscall @@ -5892,6 +6222,8 @@ broken-packages: - html-kure - html-rules - html-tokenizer + - htoml + - htoml-megaparsec - hts - htsn - htsn-import @@ -5899,10 +6231,10 @@ broken-packages: - http-client-auth - http-client-lens - http-client-request-modifiers + - http-client-restricted - http-client-session - http-client-streams - http-conduit-browser - - http-conduit-downloader - http-directory - http-dispatch - http-download @@ -5910,7 +6242,6 @@ broken-packages: - http-grammar - http-kinder - http-monad - - http-pony - http-pony-serve-wai - http-proxy - http-querystring @@ -5919,7 +6250,6 @@ broken-packages: - http-streams - http-wget - http2-client-grpc - - http2-grpc-types - https-everywhere-rules - https-everywhere-rules-raw - httpspec @@ -5944,7 +6274,6 @@ broken-packages: - hunspell-hs - hunt-searchengine - hunt-server - - hup - hurdle - hurriyet - husk-scheme @@ -5956,6 +6285,7 @@ broken-packages: - hVOIDP - hw-balancedparens - hw-bits + - hw-ci-assist - hw-dsv - hw-dump - hw-eliasfano @@ -5995,8 +6325,8 @@ broken-packages: - hybrid - hydra-hs - hydra-print - - hydrogen - Hydrogen + - hydrogen - hydrogen-cli - hydrogen-cli-args - hydrogen-data @@ -6028,6 +6358,7 @@ broken-packages: - ical - iCalendar - IcoGrid + - iconv-typed - ide-backend - ide-backend-common - ide-backend-server @@ -6073,7 +6404,6 @@ broken-packages: - imap - imapget - imbib - - imgur - imgurder - imj-animation - imj-base @@ -6085,6 +6415,7 @@ broken-packages: - imperative-edsl - imperative-edsl-vhdl - ImperativeHaskell + - impl - implicit-logging - implicit-params - importify @@ -6111,11 +6442,11 @@ broken-packages: - InfixApplicative - inflist - informative + - ini-qq - inilist - inject-function - inline-java - inserts - - inspection-proxy - inspector-wrecker - instana-haskell-trace-sdk - instant-aeson @@ -6144,11 +6475,13 @@ broken-packages: - invertible-hlist - io-capture - io-reactive + - ion - IOR - IORefCAS - iostring - iothread - iotransaction + - ip - ip2location - ip2proxy - ipatch @@ -6190,7 +6523,16 @@ broken-packages: - iterIO - iterio-server - ivor + - ivory + - ivory-backend-c - ivory-bitdata + - ivory-eval + - ivory-examples + - ivory-hw + - ivory-opts + - ivory-quickcheck + - ivory-serialize + - ivory-stdlib - ivy-web - ixdopp - ixmonad @@ -6198,8 +6540,8 @@ broken-packages: - iyql - j2hs - jack-bindings - - jackminimix - JackMiniMix + - jackminimix - jacobi-roots - jaeger-flamegraph - jail @@ -6213,10 +6555,10 @@ broken-packages: - java-character - java-reflect - javascript-extras - - javasf - Javasf - - javav + - javasf - Javav + - javav - jbi - jcdecaux-vls - Jdh @@ -6237,6 +6579,7 @@ broken-packages: - join-api - joinlist - jonathanscard + - jose - jpeg - js-good-parts - jsaddle-hello @@ -6244,7 +6587,6 @@ broken-packages: - jsaddle-wkwebview - JsContracts - jsmw - - json-api - json-api-lib - json-ast-json-encoder - json-ast-quickcheck @@ -6269,7 +6611,6 @@ broken-packages: - JSONb - jsonextfilter - JsonGrammar - - jsonpath - jsonresume - jsonrpc-conduit - jsons-to-schema @@ -6281,6 +6622,7 @@ broken-packages: - judge - judy - juicy-gcode + - JuicyPixels-blp - JuicyPixels-canvas - JunkDB - JunkDB-driver-gdbm @@ -6297,8 +6639,8 @@ broken-packages: - kademlia - kafka-client - kaleidoscope - - kalman - Kalman + - kalman - kangaroo - kansas-lava - kansas-lava-cores @@ -6306,14 +6648,15 @@ broken-packages: - kansas-lava-shake - karakuri - karps - - katip-datadog - katip-elasticsearch - - katip-logzio + - katip-kafka - katip-rollbar - katip-scalyr-scribe - katip-syslog - katt + - katydid - kawaii + - kawhi - kd-tree - kdesrc-build-extra - keccak @@ -6339,6 +6682,7 @@ broken-packages: - keyring - keysafe - keystore + - keyvaluehash - keyword-args - khph - kicad-data @@ -6346,7 +6690,6 @@ broken-packages: - kickchan - kif-parser - kit - - kleene - kmeans-par - kmeans-vector - kmp-dfa @@ -6355,6 +6698,7 @@ broken-packages: - knit-haskell - knots - koellner-phonetic + - kontra-config - korfu - kqueue - krapsh @@ -6367,6 +6711,7 @@ broken-packages: - kubernetes-client-core - kure - kure-your-boilerplate + - kurita - KyotoCabinet - l-bfgs-b - L-seed @@ -6418,7 +6763,6 @@ broken-packages: - LambdaShell - lambdatex - lambdatwit - - Lambdaya - lambdaya-bus - lambdiff - lame @@ -6484,11 +6828,11 @@ broken-packages: - lazy-hash-cache - lazy-io-streams - lazyarray + - lazyboy - lazyset - LazyVault - ld-intervals - lda - - ldap-client - ldapply - ldif - leaf @@ -6564,13 +6908,15 @@ broken-packages: - limp-cbc - linda - linden - - line-drawing + - line-bot-sdk - linear-algebra-cblas - linear-circuit - linear-code - linear-maps - linear-opengl + - linear-socket - linear-vect + - linearEqSolver - linearmap-category - linearscan - linearscan-hoopl @@ -6581,6 +6927,7 @@ broken-packages: - linkcore - linked-list-with-iterator - linkedhashmap + - linode - linode-v4 - linux-blkid - linux-cgroup @@ -6603,10 +6950,12 @@ broken-packages: - list-t-html-parser - list-t-http-client - list-t-text + - list-witnesses - list-zipper - listenbrainz-client - listlike-instances - ListT + - liszt - lit - literals - live-sequencer @@ -6691,6 +7040,7 @@ broken-packages: - LslPlus - lsp-test - lsystem + - ltext - ltk - lua-bc - luachunk @@ -6719,17 +7069,20 @@ broken-packages: - machines-amazonka - machines-process - machines-zlib + - mackerel-client - maclight - macos-corelibs - macosx-make-standalone - madlang - mage - magic-wormhole + - magicbane - MagicHaskeller - magico - magma - mahoro - maid + - mail-pool - mailbox-count - mailchimp - mailchimp-subscribe @@ -6765,6 +7118,7 @@ broken-packages: - map-exts - map-reduce-folds - map-syntax + - mapalgebra - Mapping - mappy - marionetta @@ -6772,6 +7126,7 @@ broken-packages: - markdown-pap - markdown2svg - marked-pretty + - markov-chain-usage-model - markov-processes - markov-realization - markup @@ -6783,12 +7138,16 @@ broken-packages: - marxup - masakazu-bot - MASMGen + - massiv + - massiv-io - massiv-test - master-plan + - matchable-th - matchers - math-grads - mathblog - mathflow + - mathgenealogy - mathlink - matplotlib - matrix-as-xyz @@ -6806,6 +7165,7 @@ broken-packages: - MazesOfMonad - MBot - mbox-tools + - mbug - MC-Fold-DP - mcl - mcm @@ -6823,19 +7183,20 @@ broken-packages: - mecab - mech - Mecha - - mechs - Mechs + - mechs - med-module - mediabus - mediabus-fdk-aac - mediabus-rtp - mediawiki + - mediawiki2latex - medium-sdk-haskell + - mega-sdist - mellon-core - mellon-gpio - mellon-web - melody - - membrain - memcache-conduit - memcache-haskell - memcached-binary @@ -6876,8 +7237,10 @@ broken-packages: - microgroove - microlens-each - micrologger + - microsoft-translator - MicrosoftTranslator - mida + - midi-simple - midi-utils - midimory - midisurface @@ -6888,6 +7251,7 @@ broken-packages: - mikrokosmos - miku - mime-directory + - min-max-pqueue - minecraft-data - minesweeper - miniforth @@ -6904,6 +7268,7 @@ broken-packages: - mios - mirror-tweet - miso-action-logger + - miso-examples - miss - miss-porcelain - missing-py2 @@ -6915,9 +7280,6 @@ broken-packages: - ml-w - mlist - mltool - - mmark - - mmark-cli - - mmark-ext - mmtf - mmtl - mmtl-base @@ -6932,15 +7294,14 @@ broken-packages: - module-management - modulespection - modulo - - moe - Moe + - moe - MoeDict - mohws - mole - mollie-api-haskell - monad-atom - monad-atom-simple - - monad-chronicle - monad-codec - monad-dijkstra - monad-exception @@ -7016,7 +7377,6 @@ broken-packages: - morphisms-objects - morte - mosaico-lib - - moss - mount - movie-monad - mp @@ -7034,6 +7394,8 @@ broken-packages: - mrifk - mrm - ms + - msgpack + - msgpack-aeson - msgpack-idl - msgpack-rpc - msh @@ -7129,9 +7491,11 @@ broken-packages: - nanovg - nanovg-simple - nanq + - NaperianNetCDF - narc - nat-sized-numbers - nationstates + - nats-queue - natural - natural-number - naver-translate @@ -7154,6 +7518,9 @@ broken-packages: - nested-sequence - NestedFunctor - nestedmap + - net-mqtt + - net-spider + - net-spider-cli - net-spider-pangraph - net-spider-rpl - netclock @@ -7172,7 +7539,8 @@ broken-packages: - network-address - network-anonymous-i2p - network-anonymous-tor - - network-bsd + - network-api-support + - network-arbitrary - network-builder - network-bytestring - network-connection @@ -7188,17 +7556,14 @@ broken-packages: - network-run - network-server - network-service - - network-simple - network-simple-sockaddr - - network-simple-tls - - network-simple-ws - - network-simple-wss - network-stream - network-topic-models - network-transport-amqp - network-transport-inmemory - network-transport-tcp - network-transport-tests + - network-uri-json - network-voicetext - network-wai-router - network-websocket @@ -7228,12 +7593,12 @@ broken-packages: - nitro - niv - nixfromnpm - - nixpkgs-update - nkjp - nlp-scores - nlp-scores-scripts - nm - NMap + - nn - nntp - no-role-annots - noether @@ -7247,13 +7612,11 @@ broken-packages: - Nomyx-Web - non-empty-zipper - NonEmpty - - nonempty-containers - NonEmptyList - normalization-insensitive - NoSlow - not-gloss-examples - notcpp - - notifications-tray-icon - notmuch-haskell - notmuch-web - np-linear @@ -7298,6 +7661,7 @@ broken-packages: - objectid - ObjectIO - objective + - oblivious-transfer - ocaml-export - octane - octohat @@ -7318,8 +7682,8 @@ broken-packages: - olwrapper - omaketex - ombra - - omega - Omega + - omega - omnifmt - on-a-horse - onama @@ -7334,6 +7698,7 @@ broken-packages: - open-haddock - open-pandoc - open-signals + - open-typerep - OpenAFP - OpenAFP-Utils - openapi-petstore @@ -7347,6 +7712,7 @@ broken-packages: - OpenSCAD - opensoundcontrol-ht - openssh-github-keys + - openssh-protocol - opentheory-char - opentok - opentype @@ -7355,6 +7721,8 @@ broken-packages: - openweathermap - Operads - operational-extra + - opml-conduit + - opn - optima - optimal-blocks - optimization @@ -7362,7 +7730,6 @@ broken-packages: - optional - options-time - optparse-applicative-simple - - optparse-enum - orc - orchestrate - OrchestrateDB @@ -7399,20 +7766,27 @@ broken-packages: - packed-dawg - packed-multikey-map - packedstring + - packer-messagepack - packman - packunused - pacman-memcache - padKONTROL + - pads-haskell - pagarme - PageIO - pagure-hook-receiver - Paillier + - pairing - pam - panda + - pandoc-emphasize-code - pandoc-include + - pandoc-include-code - pandoc-japanese-filters - pandoc-lens + - pandoc-markdown-ghci-filter - pandoc-plantuml-diagrams + - pandoc-pyplot - pandoc-unlit - PandocAgda - pang-a-lambda @@ -7437,7 +7811,7 @@ broken-packages: - Parallel-Arrows-Eden - parallel-tasks - parameterized - - paramtree + - parameterized-utils - paranoia - parco - parco-attoparsec @@ -7502,6 +7876,7 @@ broken-packages: - pedestrian-dag - peg - peggy + - pell - penny - penny-bin - penny-lib @@ -7511,8 +7886,9 @@ broken-packages: - peregrin - perf - perf-analysis - - perfecthash + - perfect-vector-shuffle - PerfectHash + - perfecthash - perhaps - periodic - perm @@ -7534,10 +7910,8 @@ broken-packages: - persistent-protobuf - persistent-ratelimit - persistent-refs - - persistent-relational-record - persistent-template-classy - persistent-test - - persistent-typed-db - persistent-vector - persistent-zookeeper - persona @@ -7576,11 +7950,13 @@ broken-packages: - pier-core - piet - pig + - pinboard-notes-backup - pinchot - ping - pinpon - Pipe - pipe-enumerator + - piped - pipes-async - pipes-attoparsec-streaming - pipes-bgzf @@ -7597,9 +7973,6 @@ broken-packages: - pipes-illumina - pipes-io - pipes-key-value-csv - - pipes-network - - pipes-network-tls - - pipes-network-ws - pipes-p2p - pipes-p2p-examples - pipes-protolude @@ -7630,7 +8003,6 @@ broken-packages: - plat - platinum-parsing - PlayingCards - - plex - plist-buddy - plocketed - plot @@ -7653,7 +8025,6 @@ broken-packages: - pocket-dns - point-octree - pointfree-fancy - - pointful - pointless-lenses - pointless-rewrite - pokemon-go-protobuf-types @@ -7664,12 +8035,10 @@ broken-packages: - polh-lexicon - polimorf - Pollutocracy - - poly - poly-control - polydata - polydata-core - polynomial - - polysemy - polysemy-plugin - polysemy-RandomFu - polysemy-zoo @@ -7677,6 +8046,7 @@ broken-packages: - polysoup - polytypeable - polytypeable-utils + - pomaps - pomodoro - pomohoro - ponder @@ -7698,7 +8068,6 @@ broken-packages: - postgres-tmp - postgres-websockets - postgresql-copy-escape - - postgresql-lo-stream - postgresql-named - postgresql-query - postgresql-simple-bind @@ -7712,6 +8081,7 @@ broken-packages: - postgrest - postgrest-ws - postie + - postmark - postmark-streams - potato-tool - potoki @@ -7751,11 +8121,9 @@ broken-packages: - preview - prim-array - primes-type - - primitive-addr - primitive-atomic - primitive-checked - primitive-containers - - primitive-extras - primitive-indexed - primitive-simd - primitive-sort @@ -7782,7 +8150,6 @@ broken-packages: - procrastinating-variable - procstat - producer - - product - prof2dot - prof2pretty - progress @@ -7794,12 +8161,13 @@ broken-packages: - project-m36 - projectile - prolog-graph + - prolog-graph-lib + - prometheus - prometheus-effect - promise - pronounce - proof-combinators - propane - - propellor - Proper - properties - property-list @@ -7854,6 +8222,7 @@ broken-packages: - puzzle-draw - puzzle-draw-cmdline - pvd + - PyF - pyffi - pyfi - python-pickle @@ -7890,7 +8259,7 @@ broken-packages: - quick-schema - QuickAnnotate - quickbooks - - quickcheck-arbitrary-template + - quickcheck-combinators - quickcheck-poly - quickcheck-property-comb - quickcheck-property-monad @@ -7900,8 +8269,8 @@ broken-packages: - quickcheck-report - quickcheck-state-machine - quickcheck-state-machine-distributed + - quickcheck-string-random - quickcheck-webdriver - - quickcheck-with-counterexamples - QuickCheckVariant - QuickPlot - quickpull @@ -7926,6 +8295,7 @@ broken-packages: - radium - radium-formula-parser - radix + - radixtree - rados-haskell - raft - rail-compiler-editor @@ -7934,6 +8304,7 @@ broken-packages: - raketka - rakhana - rakuten + - ralist - rallod - raml - rand-vars @@ -7943,12 +8314,10 @@ broken-packages: - random-derive - random-eff - random-effin - - random-fu-multivariate - random-hypergeometric - random-stream - RandomDotOrg - Range - - range-set-list - range-space - rangemin - rank1dynamic @@ -7969,7 +8338,6 @@ broken-packages: - rasa-ext-vim - rascal - Rasenschach - - rating-chgk-info - rattle - rattletrap - raven-haskell-scotty @@ -7999,7 +8367,6 @@ broken-packages: - reactor - read-io - readline-statevar - - readme-lhs - readpyc - readshp - really-simple-xml-parser @@ -8021,13 +8388,14 @@ broken-packages: - reduce-equations - reedsolomon - reenact - - ref - Ref + - ref - ref-fd - ref-mtl - refcount - Referees - refh + - refined - reflection-extras - reflex - reflex-animation @@ -8039,6 +8407,9 @@ broken-packages: - reflex-orphans - reflex-sdl2 - reflex-transformers + - reflex-vty + - reform-happstack + - reform-hsp - reformat - refresht - refurb @@ -8075,6 +8446,8 @@ broken-packages: - reified-records - reify - relacion + - relapse + - relation - relational-postgresql8 - relative-date - reload @@ -8110,10 +8483,14 @@ broken-packages: - reprinter - reproject - req-conduit + - req-oauth2 + - req-url-extra + - reqcatcher - request-monad - require - reserve - reservoir + - resin - resistor-cube - resolve - resolve-trivial-conflicts @@ -8153,7 +8530,7 @@ broken-packages: - rfc-psql - rfc-redis - rfc-servant - - rfc1413-server + - rg - rhythm-game-tutorial - RichConditional - ridley @@ -8162,7 +8539,6 @@ broken-packages: - riff - ring-buffer - ring-buffers - - rio-prettyprint - riot - risc386 - riscv-isa @@ -8174,6 +8550,7 @@ broken-packages: - rl-satton - Rlang-QQ - rlglue + - RLP - rlwe-challenges - rmonad - RMP @@ -8241,7 +8618,7 @@ broken-packages: - safe-json - safe-lazy-io - safe-length - - safe-money-xmlbf + - safe-money-store - safe-plugins - safe-printf - safecopy-store @@ -8254,7 +8631,6 @@ broken-packages: - sai-shape-syb - sajson - salak-toml - - salak-yaml - Salsa - saltine-quickcheck - salvia @@ -8282,14 +8658,15 @@ broken-packages: - savage - sax - SBench + - sbv - sbvPlugin - sc2-lowlevel - sc2-proto - sc3-rdu - scalable-server - scaleimage - - scalendar - SCalendar + - scalendar - scalp-webhooks - scan-metadata - scan-vector-machine @@ -8303,7 +8680,6 @@ broken-packages: - scholdoc-citeproc - scholdoc-texmath - scholdoc-types - - SciBaseTypes - scidb-hquery - science-constants-dimensional - SciFlow @@ -8338,6 +8714,7 @@ broken-packages: - sde-solver - sdl2-cairo-image - sdl2-compositor + - sdl2-fps - sdr - seakale - seakale-postgresql @@ -8352,7 +8729,6 @@ broken-packages: - secret-sharing - secrm - sednaDBXML - - selda-json - selectors - SelectSequencesFromMSA - selenium @@ -8361,8 +8737,7 @@ broken-packages: - Semantique - semdoc - semi-iso - - semialign - - semialign-indexed + - semibounded-lattices - Semigroup - semigroupoids-syntax - semigroups-actions @@ -8392,12 +8767,14 @@ broken-packages: - servant-aeson-specs - servant-auth-cookie - servant-auth-hmac + - servant-auth-server - servant-auth-token - servant-auth-token-acid - servant-auth-token-api - servant-auth-token-leveldb - servant-auth-token-persistent - servant-auth-token-rocksdb + - servant-checked-exceptions - servant-cli - servant-client-namedargs - servant-csharp @@ -8405,10 +8782,10 @@ broken-packages: - servant-db-postgresql - servant-dhall - servant-examples + - servant-exceptions - servant-generate - servant-generic - servant-github - - servant-github-webhook - servant-haxl-client - servant-hmac-auth - servant-http-streams @@ -8418,12 +8795,15 @@ broken-packages: - servant-matrix-param - servant-namedargs - servant-nix + - servant-pandoc - servant-pool - servant-postgresql - servant-proto-lens + - servant-purescript - servant-pushbullet-client - servant-py - servant-quickcheck + - servant-rawm - servant-reason - servant-reflex - servant-router @@ -8431,10 +8811,15 @@ broken-packages: - servant-server-namedargs - servant-smsc-ru - servant-snap + - servant-static-th + - servant-streaming - servant-streaming-client - servant-streaming-docs - servant-streaming-server + - servant-subscriber + - servant-swagger-tags - servant-waargonaut + - servant-websockets - servant-xml - servant-zeppelin - servant-zeppelin-client @@ -8442,6 +8827,7 @@ broken-packages: - servant-zeppelin-swagger - server-generic - serverless-haskell + - serversession-backend-redis - serversession-frontend-snap - serversession-frontend-yesod - services @@ -8451,7 +8837,6 @@ broken-packages: - sessions - sessiontypes - sessiontypes-distributed - - set-cover - set-with - setdown - setgame @@ -8466,6 +8851,7 @@ broken-packages: - sfnt2woff - SFont - SG + - sgd - SGdemo - sgf - SGplus @@ -8511,13 +8897,14 @@ broken-packages: - sibe - sifflet - sifflet-lib + - siggy-chardust - sigma-ij + - sign - signals - signed-multiset - silvi - simd - simgi - - simple - simple-actors - simple-affine-space - simple-atom @@ -8538,13 +8925,10 @@ broken-packages: - simple-nix - simple-pascal - simple-pipe - - simple-postgresql-orm - simple-rope - - simple-session + - simple-src-utils - simple-tabular - simple-tar - - simple-templates - - simple-units - simple-vec3 - simple-zipper - simpleargs @@ -8582,6 +8966,7 @@ broken-packages: - skylark-client - skype4hs - slack + - slate - slave-thread - slidemews - Slides @@ -8620,6 +9005,7 @@ broken-packages: - snake - snake-game - snap + - snap-accept - snap-auth-cli - snap-blaze-clay - snap-configuration-utilities @@ -8743,11 +9129,15 @@ broken-packages: - splay - splaytree - splines + - split-morphism - splitter - splot - Spock - Spock-api-ghcjs + - Spock-api-server - Spock-auth + - Spock-core + - Spock-digestive - Spock-lucid - Spock-worker - spoonutil @@ -8768,7 +9158,6 @@ broken-packages: - sqlvalue-list - sqsd-local - squeal-postgresql - - squeeze - srcinst - sscan - sscgi @@ -8806,6 +9195,7 @@ broken-packages: - stackage-types - stackage-upload - stackage2nix + - stacked-dag - standalone-derive-topdown - starling - stash @@ -8837,6 +9227,7 @@ broken-packages: - stemmer - stemmer-german - stepwise + - stern-brocot - stgi - stm-chunked-queues - stm-containers @@ -8845,6 +9236,7 @@ broken-packages: - stm-io-hooks - stm-promise - stm-stats + - stm-supply - stmcontrol - stochastic - Stomp @@ -8859,8 +9251,6 @@ broken-packages: - stratum-tool - stratux - stratux-demo - - stratux-http - - stratux-types - stratux-websockets - stream - stream-fusion @@ -8871,12 +9261,10 @@ broken-packages: - streaming-cassava - streaming-conduit - streaming-fft - - streaming-lzma - streaming-png - streaming-postgresql-simple - streaming-process - streaming-sort - - streaming-utils - strelka - strict-data - StrictBench @@ -8890,13 +9278,16 @@ broken-packages: - stripe-haskell - stripe-http-client - stripe-http-streams + - stripe-tests - structural-induction - structural-traversal - structured-mongoDB - structures - stt - stunts + - stylist - stylized + - suavemente - sub-state - subhask - subleq-toolchain @@ -8917,6 +9308,7 @@ broken-packages: - sunroof-server - super-user-spark - superbubbles + - superbuffer - supercollider-ht - supercollider-midi - superconstraints @@ -8924,6 +9316,7 @@ broken-packages: - supermonad - supero - supervisor + - supervisors - supplemented - surjective - sv @@ -8931,8 +9324,8 @@ broken-packages: - SVD2HS - svfactor - svg-builder-fork - - svg2q - SVG2Q + - svg2q - svgutils - svm-simple - svndump @@ -8949,16 +9342,14 @@ broken-packages: - sylvia - sym - sym-plot - - symantic - - symantic-cli - symantic-http-test - - symantic-lib - symantic-xml - symengine - symengine-hs - sync - sync-mht - syncthing-hs + - syntactic - syntax - syntax-attoparsec - syntax-example @@ -8985,15 +9376,15 @@ broken-packages: - t3-server - ta - table + - table-layout - table-tennis - tableaux - - tables - Tables + - tables - tablestorage - Tablify - tabloid - tabs - - taffybar - tag-bits - tag-stream - tagged-exception-core @@ -9005,7 +9396,6 @@ broken-packages: - tagsoup-megaparsec - tagsoup-parsec - tagsoup-selection - - tai - tai64 - takahashi - Takusen @@ -9023,16 +9413,18 @@ broken-packages: - task-distribution - taskell - tasty-auto + - tasty-discover - tasty-fail-fast - tasty-groundhog-converters - tasty-hedgehog-coverage + - tasty-hspec - tasty-integrate - tasty-jenkins-xml - tasty-laws - tasty-lens - tasty-stats - tasty-tap - - tasty-travis + - Taxonomy - TaxonomyTools - TBC - TBit @@ -9070,7 +9462,6 @@ broken-packages: - tensorflow-opgen - tensorflow-ops - tensorflow-proto - - termbox-banana - termbox-bindings - terminal-punch - terminal-text @@ -9107,7 +9498,6 @@ broken-packages: - text-containers - text-generic-pretty - text-icu-normalized - - text-icu-translit - text-lens - text-locale-encoding - text-markup @@ -9115,11 +9505,12 @@ broken-packages: - text-plus - text-position - text-register-machine - - text-show-instances + - text-replace - text-time - text-utf8 - text-xml-qq - text-zipper-monad + - text1 - textmatetags - textocat-api - textual @@ -9145,7 +9536,6 @@ broken-packages: - Theora - theoremquest - theoremquest-client - - these-lens - these-skinny - thih - thimk @@ -9158,6 +9548,7 @@ broken-packages: - thrift - throttled-io-loop - through-text + - throwable-exceptions - thumbnail-plus - tic-tac-toe - tickle @@ -9193,6 +9584,7 @@ broken-packages: - timers-tick - timeseries - timespan + - timeutils - timezone-unix - tintin - tiny-scheduler @@ -9225,10 +9617,11 @@ broken-packages: - tomato-rubato-openal - toml - tomland + - tomlcheck - too-many-cells - toodles - - top - Top + - top - topkata - torch - TORCS @@ -9240,7 +9633,6 @@ broken-packages: - toysolver - tpar - tpb - - tpdb - trace - trace-call - trace-function-call @@ -9268,7 +9660,11 @@ broken-packages: - translatable-intset - translate - translate-cli + - trasa + - trasa-client - trasa-extra + - trasa-form + - trasa-server - trasa-th - travis - travis-meta-yaml @@ -9298,6 +9694,7 @@ broken-packages: - TrieMap - tries - trigger + - trim - trimpolya - tripLL - trivia @@ -9342,8 +9739,11 @@ broken-packages: - twill - twine - twitter + - twitter-conduit - twitter-enumerator - twitter-feed + - twitter-types + - twitter-types-lens - tx - txt - txtblk @@ -9358,7 +9758,6 @@ broken-packages: - type-combinators-singletons - type-digits - type-eq - - type-errors - type-indexed-queues - type-int - type-interpreter @@ -9390,6 +9789,7 @@ broken-packages: - types-compat - typesafe-precure - typescript-docs + - typograffiti - typography-geometry - tyro - u2f @@ -9401,7 +9801,6 @@ broken-packages: - uhc-light - uhc-util - uhexdump - - uhttpc - ui-command - UMM - unagi-bloomfilter @@ -9411,27 +9810,29 @@ broken-packages: - unbounded-delays-units - unboxed-containers - unbreak + - unfoldable + - unfoldable-restricted - uni-graphs - uni-uDrawGraph - unicode-normalization - unicode-show - unicode-symbols - uniform-io + - union - union-map + - Unique - uniqueid - uniquely-represented-sets - units-attoparsec - unittyped - unity-testresult-parser - unitym-yesod - - universe - - universe-dependent-sum - - universe-instances-extended - universe-th - universum - unix-fcntl - unix-handle - unix-process-conduit + - unjson - unm-hip - unordered-containers-rematch - unordered-graphs @@ -9478,6 +9879,7 @@ broken-packages: - usb-id-database - usb-iteratee - usb-safe + - userid - users-mysql-haskell - users-persistent - utc @@ -9487,6 +9889,7 @@ broken-packages: - util-exception - util-primitive - util-primitive-control + - util-universe - uu-cco - uu-cco-examples - uu-cco-hut-parsing @@ -9500,6 +9903,7 @@ broken-packages: - uxadt - v4l2 - v4l2-examples + - vabal - vacuum - vacuum-cairo - vacuum-graphviz @@ -9507,7 +9911,6 @@ broken-packages: - vacuum-ubigraph - valid-names - validate-input - - validated-literals - validated-types - Validation - validations @@ -9541,6 +9944,7 @@ broken-packages: - vector-instances-collections - vector-random - vector-read-instances + - vector-space-map - vector-space-opengl - vector-static - vectortiles @@ -9565,7 +9969,11 @@ broken-packages: - Villefort - vimus - vintage-basic + - vinyl + - vinyl-generics + - vinyl-gl - vinyl-json + - vinyl-named-sugar - vinyl-operational - vinyl-plus - vinyl-utils @@ -9626,6 +10034,7 @@ broken-packages: - wai-request-spec - wai-responsible - wai-router + - wai-routes - wai-routing - wai-secure-cookies - wai-session-alt @@ -9655,12 +10064,15 @@ broken-packages: - web-css - web-encodings - web-fpco + - web-inv-route - web-mongrel2 - web-output - web-page - web-push + - web-routes-happstack - web-routes-quasi - web-routes-regular + - web-routes-th - web-routes-transformers - web-routing - web3 @@ -9669,11 +10081,13 @@ broken-packages: - WebBits - WebBits-Html - WebBits-multiplate + - webby - webcloud - WebCont - webcrank - webcrank-dispatch - webcrank-wai + - webdriver-angular - webdriver-snoy - webdriver-w3c - WeberLogic @@ -9684,8 +10098,8 @@ broken-packages: - webserver - webshow - websockets-rpc + - websockets-simple - webwire - - weekdaze - weighted - weighted-regexp - welshy @@ -9700,6 +10114,7 @@ broken-packages: - whiskers - whitespace - why3 + - wide-word - WikimediaParser - wikipedia4epub - wild-bind-indicator @@ -9722,6 +10137,7 @@ broken-packages: - wobsurv - woffex - wolf + - word - word2vec-model - WordAlignment - wordify @@ -9768,7 +10184,6 @@ broken-packages: - wxSimpleCanvas - wxturtle - wyvern - - X - x-dsp - X11-extras - X11-rm @@ -9793,9 +10208,12 @@ broken-packages: - xkcd - xleb - xlsior + - xlsx + - xlsx-tabular - xlsx-templater - xml-catalog - xml-conduit-decode + - xml-conduit-stylist - xml-enumerator - xml-enumerator-combinators - xml-html-conduit-lens @@ -9811,7 +10229,7 @@ broken-packages: - xml-tydom-core - xml2json - xml2x - - xmlbf-xmlhtml + - xmlbf-xeno - XmlHtmlWriter - xmltv - XMMS @@ -9848,7 +10266,6 @@ broken-packages: - yajl - yajl-enumerator - yam-job - - yam-redis - yam-servant - yam-transaction-odbc - yam-web @@ -9875,7 +10292,6 @@ broken-packages: - yate - yavie - yaya - - yaya-hedgehog - yaya-unsafe - ycextra - yeller @@ -9909,6 +10325,7 @@ broken-packages: - yesod-dsl - yesod-examples - yesod-fast-devel + - yesod-fay - yesod-form-richtext - yesod-gitrev - yesod-goodies @@ -9942,6 +10359,7 @@ broken-packages: - yesod-tls - yesod-vend - yesod-worker + - yet-another-logger - YFrob - yggdrasil - yhccore @@ -9949,6 +10367,7 @@ broken-packages: - yi-contrib - yi-core - yi-dynamic-configuration + - yi-emacs-colours - yi-frontend-pango - yi-frontend-vty - yi-fuzzy-open @@ -9956,6 +10375,7 @@ broken-packages: - yi-keymap-cua - yi-keymap-emacs - yi-keymap-vim + - yi-language - yi-misc-modes - yi-mode-haskell - yi-mode-javascript @@ -10022,6 +10442,7 @@ broken-packages: - zoom-cache-pcm - zoom-cache-sndfile - zoom-refs + - Zora - zre - zsh-battery - zsyntax diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 23cbf15e51b..b5f1db71e31 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -279,10 +279,7 @@ self: super: builtins.intersectAttrs super { let dontCheckDarwin = if pkgs.stdenv.isDarwin then dontCheck else pkgs.lib.id; - in dontCheckDarwin (super.llvm-hs.override { - llvm-config = pkgs.llvm_8; - llvm-hs-pure = super.llvm-hs-pure_8_0_0; - }); + in dontCheckDarwin (super.llvm-hs.override { llvm-config = pkgs.llvm_8; }); # Needs help finding LLVM. spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; @@ -506,6 +503,12 @@ self: super: builtins.intersectAttrs super { ''; }); + # Break infinite recursion cycle between QuickCheck and splitmix. + splitmix = dontCheck super.splitmix; + + # Break infinite recursion cycle between tasty and clock. + clock = dontCheck super.clock; + # loc and loc-test depend on each other for testing. Break that infinite cycle: loc-test = super.loc-test.override { loc = dontCheck self.loc; }; @@ -585,5 +588,7 @@ self: super: builtins.intersectAttrs super { # Tests require internet dhall_1_25_0 = dontCheck super.dhall_1_25_0; + http-download = dontCheck super.http-download; + pantry = dontCheck super.pantry; } diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 184d45eda44..96774f71730 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -2,6 +2,7 @@ , cacert, stack, makeSetupHook, lib }@depArgs: { buildInputs ? [] +, nativeBuildInputs ? [] , extraArgs ? [] , LD_LIBRARY_PATH ? [] , ghc ? depArgs.ghc @@ -22,7 +23,8 @@ in stdenv.mkDerivation (args // { buildInputs = buildInputs ++ lib.optional (stdenv.hostPlatform.libc == "glibc") glibcLocales; - nativeBuildInputs = [ ghc pkgconfig stack stackHook ]; + nativeBuildInputs = nativeBuildInputs + ++ [ ghc pkgconfig stack stackHook ]; STACK_PLATFORM_VARIANT = "nix"; STACK_IN_NIX_SHELL = 1; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d5e5aa7ef56..62e2ff6c53b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -918,31 +918,6 @@ self: { }) {}; "Allure" = callPackage - ({ mkDerivation, async, base, containers, enummapset, filepath - , LambdaHack, optparse-applicative, random, template-haskell, text - , transformers, zlib - }: - mkDerivation { - pname = "Allure"; - version = "0.8.3.0"; - sha256 = "1yzqiidc8qbjlpgs2d3jkikzggyd7ajq7i7l1dgwqv6sh4r030vb"; - isLibrary = false; - isExecutable = true; - enableSeparateDataOutput = true; - executableHaskellDepends = [ - async base containers enummapset filepath LambdaHack - optparse-applicative random template-haskell text transformers zlib - ]; - testHaskellDepends = [ - base containers enummapset filepath LambdaHack optparse-applicative - random template-haskell text transformers zlib - ]; - description = "Near-future Sci-Fi roguelike and tactical squad game"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "Allure_0_9_5_0" = callPackage ({ mkDerivation, async, base, enummapset, filepath, ghc-compact , LambdaHack, optparse-applicative, primitive, random , template-haskell, text, transformers @@ -968,6 +943,7 @@ self: { description = "Near-future Sci-Fi roguelike and tactical squad combat game"; license = stdenv.lib.licenses.agpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AndroidViewHierarchyImporter" = callPackage @@ -1585,8 +1561,6 @@ self: { ]; description = "European Nucleotide Archive data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "BiobaseEnsembl" = callPackage @@ -1647,8 +1621,6 @@ self: { ]; description = "streaming FASTA parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "BiobaseHTTP" = callPackage @@ -1844,8 +1816,6 @@ self: { ]; description = "Collection of types for bioinformatics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "BiobaseVienna" = callPackage @@ -1904,8 +1874,6 @@ self: { ]; description = "Efficient RNA/DNA/Protein Primary/Secondary Structure"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "BirdPP" = callPackage @@ -2683,6 +2651,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Cabal_3_0_0_0" = callPackage + ({ mkDerivation, array, base, base-compat, base-orphans, binary + , bytestring, containers, deepseq, Diff, directory, filepath + , integer-logarithms, mtl, optparse-applicative, parsec, pretty + , process, QuickCheck, stm, tagged, tar, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, temporary, text, time + , transformers, tree-diff, unix + }: + mkDerivation { + pname = "Cabal"; + version = "3.0.0.0"; + sha256 = "11yjd0cmqngi1yr7v0dr55n59rq78kk6121sr44abha0swkfqhsi"; + setupHaskellDepends = [ mtl parsec ]; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + mtl parsec pretty process text time transformers unix + ]; + testHaskellDepends = [ + array base base-compat base-orphans binary bytestring containers + deepseq Diff directory filepath integer-logarithms + optparse-applicative pretty process QuickCheck stm tagged tar tasty + tasty-golden tasty-hunit tasty-quickcheck temporary text tree-diff + ]; + doCheck = false; + description = "A framework for packaging Haskell software"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Cabal-ide-backend" = callPackage ({ mkDerivation, array, base, binary, bytestring, Cabal, containers , deepseq, directory, extensible-exceptions, filepath, HUnit @@ -4168,6 +4165,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "A package for adding index column to data files"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DataTreeView" = callPackage @@ -4189,6 +4188,19 @@ self: { broken = true; }) {}; + "DataVersion" = callPackage + ({ mkDerivation, base, generic-lens, hspec, microlens, QuickCheck + }: + mkDerivation { + pname = "DataVersion"; + version = "0.1.0.0"; + sha256 = "13cw7rzp510spn5ncxdqyzz66d9dnyq7s650zmpmjx2cg456zw9x"; + libraryHaskellDepends = [ base generic-lens microlens ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "Type safe data migrations"; + license = stdenv.lib.licenses.mit; + }) {}; + "Deadpan-DDP" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, doctest, filemanip, hashable, haskeline, lens, mtl @@ -5807,6 +5819,8 @@ self: { ]; description = "Finite totally-ordered sets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Finance-Quote-Yahoo" = callPackage @@ -6203,6 +6217,8 @@ self: { benchmarkHaskellDepends = [ base criterion pipes transformers ]; description = "Data frames For working with tabular data files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Frames-beam" = callPackage @@ -6589,6 +6605,8 @@ self: { ]; description = "Typesafe functional GPU graphics programming"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GPipe-Collada" = callPackage @@ -6629,8 +6647,8 @@ self: { ({ mkDerivation, async, base, containers, GLFW-b, GPipe, stm }: mkDerivation { pname = "GPipe-GLFW"; - version = "1.4.1.1"; - sha256 = "1sr4dxc9bkfijaxvs7s94x5yfg14pb1r49fycwmzqkcycgz87n8q"; + version = "1.4.1.2"; + sha256 = "0i63pxz6bvzixjgi1hbipxhrg7nykd37zii555qhss2m7x4pydak"; enableSeparateDataOutput = true; libraryHaskellDepends = [ async base containers GLFW-b GPipe stm ]; description = "GLFW OpenGL context creation for GPipe"; @@ -7024,28 +7042,6 @@ self: { }) {}; "Glob" = callPackage - ({ mkDerivation, base, containers, directory, dlist, filepath - , HUnit, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, transformers, transformers-compat - }: - mkDerivation { - pname = "Glob"; - version = "0.9.3"; - sha256 = "1s69lk3ic6zlkikhvb78ly9wl3g70a1h1m6ndhsca01pp8z8axrs"; - libraryHaskellDepends = [ - base containers directory dlist filepath transformers - transformers-compat - ]; - testHaskellDepends = [ - base containers directory dlist filepath HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - transformers transformers-compat - ]; - description = "Globbing library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Glob_0_10_0" = callPackage ({ mkDerivation, base, containers, directory, dlist, filepath , HUnit, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, transformers, transformers-compat @@ -7067,7 +7063,6 @@ self: { ]; description = "Globbing library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GlomeTrace" = callPackage @@ -9831,6 +9826,8 @@ self: { ]; description = "Client support for POP3, SMTP, and IMAP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HaskellNet-SSL" = callPackage @@ -9847,6 +9844,8 @@ self: { ]; description = "Helpers to connect to SSL/TLS mail servers with HaskellNet"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HaskellTorrent" = callPackage @@ -10612,6 +10611,8 @@ self: { pname = "HsYAML-aeson"; version = "0.1.0.0"; sha256 = "1hf1gwa89ghd4aaim6g8dx9wppp6d1y0w1xiddm1r8lpfidca1nw"; + revision = "1"; + editedCabalFile = "1kf35mnvc2syly35c2ffl8xxcw4h6lxv9kqirzj2in1ms19df41y"; libraryHaskellDepends = [ aeson base bytestring HsYAML mtl text vector ]; @@ -11337,6 +11338,8 @@ self: { ]; description = "BLP format decoder/encoder over JuicyPixels library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "JuicyPixels-canvas" = callPackage @@ -11843,48 +11846,6 @@ self: { }) {}; "LambdaHack" = callPackage - ({ mkDerivation, assert-failure, async, base, base-compat, binary - , bytestring, containers, deepseq, directory, enummapset, filepath - , ghc-prim, hashable, hsini, keys, miniutter, optparse-applicative - , pretty-show, random, sdl2, sdl2-ttf, stm, template-haskell, text - , time, transformers, unordered-containers, vector - , vector-binary-instances, zlib - }: - mkDerivation { - pname = "LambdaHack"; - version = "0.8.3.0"; - sha256 = "0v07c8v7l8yg111fysl735scsbsl9l6q3vzigy7rv05sjfl276ss"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - assert-failure async base base-compat binary bytestring containers - deepseq directory enummapset filepath ghc-prim hashable hsini keys - miniutter optparse-applicative pretty-show random sdl2 sdl2-ttf stm - text time transformers unordered-containers vector - vector-binary-instances zlib - ]; - executableHaskellDepends = [ - assert-failure async base base-compat binary bytestring containers - deepseq directory enummapset filepath ghc-prim hashable hsini keys - miniutter optparse-applicative pretty-show random stm - template-haskell text time transformers unordered-containers vector - vector-binary-instances zlib - ]; - testHaskellDepends = [ - assert-failure async base base-compat binary bytestring containers - deepseq directory enummapset filepath ghc-prim hashable hsini keys - miniutter optparse-applicative pretty-show random stm - template-haskell text time transformers unordered-containers vector - vector-binary-instances zlib - ]; - description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "LambdaHack_0_9_5_0" = callPackage ({ mkDerivation, assert-failure, async, base, base-compat, binary , bytestring, containers, deepseq, directory, enummapset, filepath , ghc-compact, ghc-prim, hashable, hsini, keys, miniutter @@ -12027,8 +11988,6 @@ self: { ]; description = "Library for RedPitaya"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "LargeCardinalHierarchy" = callPackage @@ -13743,6 +13702,8 @@ self: { executableHaskellDepends = [ base hnetcdf Naperian split ]; description = "Instances of NcStore for hypercuboids"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "NaturalLanguageAlphabets" = callPackage @@ -15301,10 +15262,8 @@ self: { }: mkDerivation { pname = "Persistence"; - version = "2.0"; - sha256 = "0iwkvplldy6sznp33n5w5ink312cg6shh3qg98canz6j6hrspa8y"; - revision = "1"; - editedCabalFile = "063rizxqn44pzblj2nxyk3ia2zymryrqq55n081g21aih38n8xlr"; + version = "2.0.1"; + sha256 = "1qv35q7y7sl142dxdaf7647g62xr76b4blij0yn9x5694qm9r80v"; libraryHaskellDepends = [ base containers maximal-cliques parallel vector ]; @@ -15762,25 +15721,28 @@ self: { }) {}; "PyF" = callPackage - ({ mkDerivation, base, containers, deepseq, directory, filepath - , hashable, haskell-src-exts, haskell-src-meta, hspec, HUnit - , megaparsec, process, python3, template-haskell, temporary, text + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , filepath, hashable, haskell-src-exts, haskell-src-meta, hspec + , HUnit, megaparsec, process, python3, template-haskell, temporary + , text }: mkDerivation { pname = "PyF"; - version = "0.7.3.0"; - sha256 = "17asilwlq7c8kj5jk0gm0pkfr2m65pgdspgx8hl0hwlp1wsg74yl"; + version = "0.8.0.0"; + sha256 = "0np08pyx5kd1wbnrxbzcbp6zryvh38iy2mbz1xbb6ldfmn98r78p"; libraryHaskellDepends = [ base containers haskell-src-exts haskell-src-meta megaparsec template-haskell text ]; testHaskellDepends = [ - base deepseq directory filepath hashable hspec HUnit process - template-haskell temporary text + base bytestring deepseq directory filepath hashable hspec HUnit + process template-haskell temporary text ]; testToolDepends = [ python3 ]; description = "Quasiquotations for a python like interpolated string formater"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) python3;}; "QIO" = callPackage @@ -15904,25 +15866,6 @@ self: { }) {}; "QuickCheck" = callPackage - ({ mkDerivation, base, containers, deepseq, erf, process, random - , template-haskell, tf-random, transformers - }: - mkDerivation { - pname = "QuickCheck"; - version = "2.12.6.1"; - sha256 = "0w51zbbvh46g3wllqfmx251xzbnddy94ixgm6rf8gd95qvssfahb"; - revision = "3"; - editedCabalFile = "1cxsn5y6mnzqp681fcghjiqk47bq8mnkvcfc5c8c7yvl258lz5yf"; - libraryHaskellDepends = [ - base containers deepseq erf random template-haskell tf-random - transformers - ]; - testHaskellDepends = [ base deepseq process ]; - description = "Automatic testing of Haskell programs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "QuickCheck_2_13_2" = callPackage ({ mkDerivation, base, containers, deepseq, process, random , splitmix, template-haskell, transformers }: @@ -15937,7 +15880,6 @@ self: { testHaskellDepends = [ base deepseq process ]; description = "Automatic testing of Haskell programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "QuickCheck-GenT" = callPackage @@ -16124,6 +16066,8 @@ self: { testHaskellDepends = [ base binary bytestring hspec ]; description = "RLP serialization as defined in Ethereum Yellow Paper"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "RMP" = callPackage @@ -16318,13 +16262,16 @@ self: { }) {}; "RSolve" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, lens, mtl }: mkDerivation { pname = "RSolve"; - version = "0.1.0.1"; - sha256 = "1qqcn87hmya2cl8d4b312y4j4s099czsw5qgqcwh1gc261ppkxvm"; - libraryHaskellDepends = [ base containers ]; - description = "A general solver for equations"; + version = "2.0.0.0"; + sha256 = "0rcbdxn9n2fimqxmprcfgq5c48y69wfjy5ny3acr5ln8ppcinmq8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers lens mtl ]; + executableHaskellDepends = [ base containers lens mtl ]; + testHaskellDepends = [ base containers lens mtl ]; license = stdenv.lib.licenses.mit; }) {}; @@ -17319,8 +17266,6 @@ self: { ]; description = "Base types and classes for statistics, sciences and humanities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "SciFlow" = callPackage @@ -18140,6 +18085,8 @@ self: { libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ]; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Spock-auth" = callPackage @@ -18181,6 +18128,8 @@ self: { ]; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Spock-digestive" = callPackage @@ -18197,6 +18146,8 @@ self: { ]; description = "Digestive functors support for Spock"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Spock-lucid" = callPackage @@ -18285,17 +18236,6 @@ self: { }) {}; "StateVar" = callPackage - ({ mkDerivation, base, stm, transformers }: - mkDerivation { - pname = "StateVar"; - version = "1.1.1.1"; - sha256 = "08r2iw0gdmfs4f6wraaq19vfmkjdbics3dbhw39y7mdjd98kcr7b"; - libraryHaskellDepends = [ base stm transformers ]; - description = "State variables"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "StateVar_1_2" = callPackage ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "StateVar"; @@ -18304,7 +18244,6 @@ self: { libraryHaskellDepends = [ base stm transformers ]; description = "State variables"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "StateVar-transformer" = callPackage @@ -18844,6 +18783,8 @@ self: { ]; description = "Libary for parsing, processing and vizualization of taxonomy data"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "TaxonomyTools" = callPackage @@ -19519,6 +19460,8 @@ self: { ]; description = "It provides the functionality like unix \"uniq\" utility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Unixutils" = callPackage @@ -20129,6 +20072,19 @@ self: { }) {}; "Win32" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "Win32"; + version = "2.6.1.0"; + sha256 = "1qwwznnnqnr6zqvjzwr35bkvzrvjf7v90j4qkhinzs8p0yx4b97b"; + revision = "1"; + editedCabalFile = "1ia6dk2fvxg3gzqdmcypdka6fcnnrza23hq1rhslj53jy3qzs3kn"; + description = "A binding to part of the Win32 library"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.none; + }) {}; + + "Win32_2_8_3_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "Win32"; @@ -20422,15 +20378,13 @@ self: { ({ mkDerivation, base, bytestring, deepseq, text, text-short }: mkDerivation { pname = "X"; - version = "0.2.0.0"; - sha256 = "1p03ah2qi694kcbwb7gk2cypj6p42c6ajn51wpak96p9vmpp5a4r"; + version = "0.3.0.0"; + sha256 = "0grjiznl8j44mq3m0jkhm9z7wcr4cywrnfmk92nk3g6ddhcyakkc"; libraryHaskellDepends = [ base bytestring deepseq text text-short ]; description = "A light-weight XML library"; license = "BSD-3-Clause AND GPL-3.0-or-later"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "X11" = callPackage @@ -20983,6 +20937,8 @@ self: { testHaskellDepends = [ base containers random tasty tasty-hunit ]; description = "Graphing library wrapper + assorted useful functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Zwaluw" = callPackage @@ -22460,8 +22416,6 @@ self: { ]; description = "AcousticBrainz API client"; license = stdenv.lib.licenses.cc0; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "acquire" = callPackage @@ -22866,26 +22820,6 @@ self: { }) {}; "aern2-mp" = callPackage - ({ mkDerivation, base, convertible, hspec, integer-logarithms, lens - , mixed-types-num, QuickCheck, regex-tdfa, rounded - , template-haskell - }: - mkDerivation { - pname = "aern2-mp"; - version = "0.1.3.1"; - sha256 = "1gyicxsdqzdbhs9bss5cfjqx859iksr7z1ilsfm9077jdf2032vm"; - libraryHaskellDepends = [ - base convertible hspec integer-logarithms lens mixed-types-num - QuickCheck regex-tdfa rounded template-haskell - ]; - testHaskellDepends = [ base hspec QuickCheck ]; - description = "Multi-precision ball (interval) arithmetic"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "aern2-mp_0_1_4" = callPackage ({ mkDerivation, base, convertible, hspec, integer-logarithms, lens , mixed-types-num, QuickCheck, regex-tdfa, rounded , template-haskell @@ -22959,39 +22893,6 @@ self: { }) {}; "aeson" = callPackage - ({ mkDerivation, attoparsec, base, base-compat, base-orphans - , base16-bytestring, bytestring, containers, deepseq, directory - , dlist, filepath, generic-deriving, ghc-prim, hashable - , hashable-time, integer-logarithms, primitive, QuickCheck - , quickcheck-instances, scientific, tagged, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text, th-abstraction, time - , time-locale-compat, unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "aeson"; - version = "1.4.2.0"; - sha256 = "1l4b675nxddim3v30kd7zr3vmrs7i1m81rh8h9bfbm9k9a0p3kkm"; - revision = "1"; - editedCabalFile = "067y82gq86740j2zj4y6v7z9b5860ncg2g9lfnrpsnb9jqm7arl1"; - libraryHaskellDepends = [ - attoparsec base base-compat bytestring containers deepseq dlist - ghc-prim hashable primitive scientific tagged template-haskell text - th-abstraction time time-locale-compat unordered-containers - uuid-types vector - ]; - testHaskellDepends = [ - attoparsec base base-compat base-orphans base16-bytestring - bytestring containers directory dlist filepath generic-deriving - ghc-prim hashable hashable-time integer-logarithms QuickCheck - quickcheck-instances scientific tagged tasty tasty-hunit - tasty-quickcheck template-haskell text time time-locale-compat - unordered-containers uuid-types vector - ]; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson_1_4_4_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat, base-orphans , base16-bytestring, bytestring, containers, deepseq, Diff , directory, dlist, filepath, generic-deriving, ghc-prim, hashable @@ -23021,7 +22922,6 @@ self: { ]; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-applicative" = callPackage @@ -23084,22 +22984,6 @@ self: { }) {}; "aeson-casing" = callPackage - ({ mkDerivation, aeson, base, tasty, tasty-hunit, tasty-quickcheck - , tasty-th - }: - mkDerivation { - pname = "aeson-casing"; - version = "0.1.1.0"; - sha256 = "14qx1aqrf25bdasrwibprl116ixxfr0s4fc62fa6pdj64a7jc480"; - libraryHaskellDepends = [ aeson base ]; - testHaskellDepends = [ - aeson base tasty tasty-hunit tasty-quickcheck tasty-th - ]; - description = "Tools to change the formatting of field names in Aeson instances"; - license = stdenv.lib.licenses.mit; - }) {}; - - "aeson-casing_0_2_0_0" = callPackage ({ mkDerivation, aeson, base, tasty, tasty-hunit, tasty-quickcheck , tasty-th }: @@ -23113,7 +22997,6 @@ self: { ]; description = "Tools to change the formatting of field names in Aeson instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-coerce" = callPackage @@ -23224,35 +23107,6 @@ self: { }) {}; "aeson-extra" = callPackage - ({ mkDerivation, aeson, aeson-compat, attoparsec - , attoparsec-iso8601, base, base-compat-batteries, bytestring - , containers, deepseq, exceptions, hashable, parsec - , quickcheck-instances, recursion-schemes, scientific, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, text, these - , time, time-parsers, unordered-containers, vector - }: - mkDerivation { - pname = "aeson-extra"; - version = "0.4.1.1"; - sha256 = "1y7xss382hdxrv4jzprsm3b7ij7wiw8jgjg9wp49dx6bfvcnb2nl"; - revision = "4"; - editedCabalFile = "0ja5vr9w22wyknkjyl7w43frdfdfnxphvrai1b18lhinjqcd9bl5"; - libraryHaskellDepends = [ - aeson aeson-compat attoparsec attoparsec-iso8601 base - base-compat-batteries bytestring containers deepseq exceptions - hashable parsec recursion-schemes scientific template-haskell text - these time unordered-containers vector - ]; - testHaskellDepends = [ - base containers quickcheck-instances tasty tasty-hunit - tasty-quickcheck these time time-parsers unordered-containers - vector - ]; - description = "Extra goodies for aeson"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson-extra_0_4_1_2" = callPackage ({ mkDerivation, aeson, aeson-compat, align, attoparsec , attoparsec-iso8601, base, base-compat-batteries, bytestring , containers, deepseq, exceptions, hashable, parsec @@ -23278,7 +23132,6 @@ self: { ]; description = "Extra goodies for aeson"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-filthy" = callPackage @@ -23748,30 +23601,6 @@ self: { }) {}; "aeson-typescript" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, hspec, interpolate, mtl, process, template-haskell - , temporary, text, th-abstraction, unordered-containers - }: - mkDerivation { - pname = "aeson-typescript"; - version = "0.1.3.0"; - sha256 = "0vn6pckb03vf7lwpfjari4v86clyhq5fpqw9vvnr4gcgh5hhsa1v"; - libraryHaskellDepends = [ - aeson base containers interpolate mtl template-haskell text - th-abstraction unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring containers directory filepath hspec - interpolate mtl process template-haskell temporary text - th-abstraction unordered-containers - ]; - description = "Generate TypeScript definition files from your ADTs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "aeson-typescript_0_2_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, hspec, interpolate, mtl, process, template-haskell , temporary, text, th-abstraction, unordered-containers @@ -23856,6 +23685,8 @@ self: { ]; description = "A simple Game Engine using SDL"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "affine" = callPackage @@ -24448,24 +24279,6 @@ self: { }) {inherit (pkgs) openal;}; "alarmclock" = callPackage - ({ mkDerivation, async, base, clock, hspec, stm, time - , unbounded-delays - }: - mkDerivation { - pname = "alarmclock"; - version = "0.6.0.2"; - sha256 = "1zhq3sx6x54v7cjzmjvcs7pzqyql3x4vk3b5n4x7xhgxs54xdasc"; - libraryHaskellDepends = [ - async base clock stm time unbounded-delays - ]; - testHaskellDepends = [ - async base clock hspec stm time unbounded-delays - ]; - description = "Wake up and perform an action at a certain time"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "alarmclock_0_7_0_1" = callPackage ({ mkDerivation, async, base, clock, hspec, stm, time , unbounded-delays }: @@ -24481,7 +24294,6 @@ self: { ]; description = "Wake up and perform an action at a certain time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alea" = callPackage @@ -24747,27 +24559,6 @@ self: { }) {}; "algebraic-graphs" = callPackage - ({ mkDerivation, array, base, base-compat, base-orphans, containers - , deepseq, extra, inspection-testing, mtl, QuickCheck - }: - mkDerivation { - pname = "algebraic-graphs"; - version = "0.3"; - sha256 = "1q4xlyg3xjm7q2x11s4lbffywp096y3s3b72b8amfdyi27har4hl"; - libraryHaskellDepends = [ - array base base-compat containers deepseq mtl - ]; - testHaskellDepends = [ - array base base-compat base-orphans containers extra - inspection-testing QuickCheck - ]; - description = "A library for algebraic graph construction and transformation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "algebraic-graphs_0_4" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, containers , deepseq, extra, inspection-testing, mtl, QuickCheck }: @@ -25077,8 +24868,8 @@ self: { }: mkDerivation { pname = "alsa-gui"; - version = "0.1"; - sha256 = "0zcyjckdjhsj614iib3dzj9dfp8xj847jfqf4q1sk9311gscbzns"; + version = "0.1.0.1"; + sha256 = "17a34k0c6s1cisbnh02akyry7fmxigzn3d2ml9j0v56340r86059"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -25404,6 +25195,8 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; description = "Comprehensive Amazon Web Services SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-alexa-business" = callPackage @@ -25421,6 +25214,8 @@ self: { ]; description = "Amazon Alexa For Business SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-apigateway" = callPackage @@ -25438,6 +25233,8 @@ self: { ]; description = "Amazon API Gateway SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-application-autoscaling" = callPackage @@ -25455,6 +25252,8 @@ self: { ]; description = "Amazon Application Auto Scaling SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-appstream" = callPackage @@ -25472,6 +25271,8 @@ self: { ]; description = "Amazon AppStream SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-appsync" = callPackage @@ -25489,6 +25290,8 @@ self: { ]; description = "Amazon AppSync SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-athena" = callPackage @@ -25506,6 +25309,8 @@ self: { ]; description = "Amazon Athena SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-autoscaling" = callPackage @@ -25523,6 +25328,8 @@ self: { ]; description = "Amazon Auto Scaling SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-autoscaling-plans" = callPackage @@ -25540,6 +25347,8 @@ self: { ]; description = "Amazon Auto Scaling Plans SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-batch" = callPackage @@ -25557,6 +25366,8 @@ self: { ]; description = "Amazon Batch SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-budgets" = callPackage @@ -25574,6 +25385,8 @@ self: { ]; description = "Amazon Budgets SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-certificatemanager" = callPackage @@ -25591,6 +25404,8 @@ self: { ]; description = "Amazon Certificate Manager SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-certificatemanager-pca" = callPackage @@ -25608,6 +25423,8 @@ self: { ]; description = "Amazon Certificate Manager Private Certificate Authority SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloud9" = callPackage @@ -25625,6 +25442,8 @@ self: { ]; description = "Amazon Cloud9 SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-clouddirectory" = callPackage @@ -25642,6 +25461,8 @@ self: { ]; description = "Amazon CloudDirectory SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudformation" = callPackage @@ -25659,6 +25480,8 @@ self: { ]; description = "Amazon CloudFormation SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudfront" = callPackage @@ -25676,6 +25499,8 @@ self: { ]; description = "Amazon CloudFront SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudhsm" = callPackage @@ -25693,6 +25518,8 @@ self: { ]; description = "Amazon CloudHSM SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudhsmv2" = callPackage @@ -25710,6 +25537,8 @@ self: { ]; description = "Amazon CloudHSM V2 SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudsearch" = callPackage @@ -25727,6 +25556,8 @@ self: { ]; description = "Amazon CloudSearch SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudsearch-domains" = callPackage @@ -25744,6 +25575,8 @@ self: { ]; description = "Amazon CloudSearch Domain SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudtrail" = callPackage @@ -25761,6 +25594,8 @@ self: { ]; description = "Amazon CloudTrail SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudwatch" = callPackage @@ -25778,6 +25613,8 @@ self: { ]; description = "Amazon CloudWatch SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudwatch-events" = callPackage @@ -25795,6 +25632,8 @@ self: { ]; description = "Amazon CloudWatch Events SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudwatch-logs" = callPackage @@ -25812,6 +25651,8 @@ self: { ]; description = "Amazon CloudWatch Logs SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-codebuild" = callPackage @@ -25829,6 +25670,8 @@ self: { ]; description = "Amazon CodeBuild SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-codecommit" = callPackage @@ -25846,6 +25689,8 @@ self: { ]; description = "Amazon CodeCommit SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-codedeploy" = callPackage @@ -25863,6 +25708,8 @@ self: { ]; description = "Amazon CodeDeploy SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-codepipeline" = callPackage @@ -25880,6 +25727,8 @@ self: { ]; description = "Amazon CodePipeline SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-codestar" = callPackage @@ -25897,6 +25746,8 @@ self: { ]; description = "Amazon CodeStar SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cognito-identity" = callPackage @@ -25914,6 +25765,8 @@ self: { ]; description = "Amazon Cognito Identity SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cognito-idp" = callPackage @@ -25931,6 +25784,8 @@ self: { ]; description = "Amazon Cognito Identity Provider SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cognito-sync" = callPackage @@ -25948,6 +25803,8 @@ self: { ]; description = "Amazon Cognito Sync SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-comprehend" = callPackage @@ -25965,6 +25822,8 @@ self: { ]; description = "Amazon Comprehend SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-config" = callPackage @@ -25982,6 +25841,8 @@ self: { ]; description = "Amazon Config SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-connect" = callPackage @@ -25999,6 +25860,8 @@ self: { ]; description = "Amazon Connect Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-core" = callPackage @@ -26029,6 +25892,8 @@ self: { ]; description = "Core data types and functionality for Amazonka libraries"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cost-explorer" = callPackage @@ -26046,6 +25911,8 @@ self: { ]; description = "Amazon Cost Explorer Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cur" = callPackage @@ -26063,6 +25930,8 @@ self: { ]; description = "Amazon Cost and Usage Report Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-datapipeline" = callPackage @@ -26080,6 +25949,8 @@ self: { ]; description = "Amazon Data Pipeline SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-devicefarm" = callPackage @@ -26097,6 +25968,8 @@ self: { ]; description = "Amazon Device Farm SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-directconnect" = callPackage @@ -26114,6 +25987,8 @@ self: { ]; description = "Amazon Direct Connect SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-discovery" = callPackage @@ -26131,6 +26006,8 @@ self: { ]; description = "Amazon Application Discovery Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-dms" = callPackage @@ -26148,6 +26025,8 @@ self: { ]; description = "Amazon Database Migration Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-ds" = callPackage @@ -26165,6 +26044,8 @@ self: { ]; description = "Amazon Directory Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-dynamodb" = callPackage @@ -26182,6 +26063,8 @@ self: { ]; description = "Amazon DynamoDB SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-dynamodb-dax" = callPackage @@ -26199,6 +26082,8 @@ self: { ]; description = "Amazon DynamoDB Accelerator (DAX) SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-dynamodb-streams" = callPackage @@ -26216,6 +26101,8 @@ self: { ]; description = "Amazon DynamoDB Streams SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-ec2" = callPackage @@ -26233,6 +26120,8 @@ self: { ]; description = "Amazon Elastic Compute Cloud SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-ecr" = callPackage @@ -26250,6 +26139,8 @@ self: { ]; description = "Amazon EC2 Container Registry SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-ecs" = callPackage @@ -26267,6 +26158,8 @@ self: { ]; description = "Amazon EC2 Container Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-efs" = callPackage @@ -26284,6 +26177,8 @@ self: { ]; description = "Amazon Elastic File System SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-elasticache" = callPackage @@ -26301,6 +26196,8 @@ self: { ]; description = "Amazon ElastiCache SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-elasticbeanstalk" = callPackage @@ -26318,6 +26215,8 @@ self: { ]; description = "Amazon Elastic Beanstalk SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-elasticsearch" = callPackage @@ -26335,6 +26234,8 @@ self: { ]; description = "Amazon Elasticsearch Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-elastictranscoder" = callPackage @@ -26352,6 +26253,8 @@ self: { ]; description = "Amazon Elastic Transcoder SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-elb" = callPackage @@ -26369,6 +26272,8 @@ self: { ]; description = "Amazon Elastic Load Balancing SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-elbv2" = callPackage @@ -26386,6 +26291,8 @@ self: { ]; description = "Amazon Elastic Load Balancing SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-emr" = callPackage @@ -26403,6 +26310,8 @@ self: { ]; description = "Amazon Elastic MapReduce SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-fms" = callPackage @@ -26420,6 +26329,8 @@ self: { ]; description = "Amazon Firewall Management Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-gamelift" = callPackage @@ -26437,6 +26348,8 @@ self: { ]; description = "Amazon GameLift SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-glacier" = callPackage @@ -26454,6 +26367,8 @@ self: { ]; description = "Amazon Glacier SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-glue" = callPackage @@ -26471,6 +26386,8 @@ self: { ]; description = "Amazon Glue SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-greengrass" = callPackage @@ -26488,6 +26405,8 @@ self: { ]; description = "Amazon Greengrass SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-guardduty" = callPackage @@ -26505,6 +26424,8 @@ self: { ]; description = "Amazon GuardDuty SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-health" = callPackage @@ -26522,6 +26443,8 @@ self: { ]; description = "Amazon Health APIs and Notifications SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-iam" = callPackage @@ -26539,6 +26462,8 @@ self: { ]; description = "Amazon Identity and Access Management SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-iam-policy" = callPackage @@ -26577,6 +26502,8 @@ self: { ]; description = "Amazon Import/Export SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-inspector" = callPackage @@ -26594,6 +26521,8 @@ self: { ]; description = "Amazon Inspector SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-iot" = callPackage @@ -26611,6 +26540,8 @@ self: { ]; description = "Amazon IoT SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-iot-analytics" = callPackage @@ -26628,6 +26559,8 @@ self: { ]; description = "Amazon IoT Analytics SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-iot-dataplane" = callPackage @@ -26645,6 +26578,8 @@ self: { ]; description = "Amazon IoT Data Plane SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-iot-jobs-dataplane" = callPackage @@ -26662,6 +26597,8 @@ self: { ]; description = "Amazon IoT Jobs Data Plane SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-kinesis" = callPackage @@ -26679,6 +26616,8 @@ self: { ]; description = "Amazon Kinesis SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-kinesis-analytics" = callPackage @@ -26696,6 +26635,8 @@ self: { ]; description = "Amazon Kinesis Analytics SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-kinesis-firehose" = callPackage @@ -26713,6 +26654,8 @@ self: { ]; description = "Amazon Kinesis Firehose SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-kinesis-video" = callPackage @@ -26730,6 +26673,8 @@ self: { ]; description = "Amazon Kinesis Video Streams SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-kinesis-video-archived-media" = callPackage @@ -26747,6 +26692,8 @@ self: { ]; description = "Amazon Kinesis Video Streams Archived Media SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-kinesis-video-media" = callPackage @@ -26764,6 +26711,8 @@ self: { ]; description = "Amazon Kinesis Video Streams Media SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-kms" = callPackage @@ -26781,6 +26730,8 @@ self: { ]; description = "Amazon Key Management Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-lambda" = callPackage @@ -26798,6 +26749,8 @@ self: { ]; description = "Amazon Lambda SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-lex-models" = callPackage @@ -26815,6 +26768,8 @@ self: { ]; description = "Amazon Lex Model Building Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-lex-runtime" = callPackage @@ -26832,6 +26787,8 @@ self: { ]; description = "Amazon Lex Runtime Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-lightsail" = callPackage @@ -26849,6 +26806,8 @@ self: { ]; description = "Amazon Lightsail SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-marketplace-analytics" = callPackage @@ -26866,6 +26825,8 @@ self: { ]; description = "Amazon Marketplace Commerce Analytics SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-marketplace-entitlement" = callPackage @@ -26883,6 +26844,8 @@ self: { ]; description = "Amazon Marketplace Entitlement Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-marketplace-metering" = callPackage @@ -26900,6 +26863,8 @@ self: { ]; description = "Amazon Marketplace Metering SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-mechanicalturk" = callPackage @@ -26917,6 +26882,8 @@ self: { ]; description = "Amazon Mechanical Turk SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-mediaconvert" = callPackage @@ -26934,6 +26901,8 @@ self: { ]; description = "Amazon Elemental MediaConvert SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-medialive" = callPackage @@ -26951,6 +26920,8 @@ self: { ]; description = "Amazon Elemental MediaLive SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-mediapackage" = callPackage @@ -26968,6 +26939,8 @@ self: { ]; description = "Amazon Elemental MediaPackage SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-mediastore" = callPackage @@ -26985,6 +26958,8 @@ self: { ]; description = "Amazon Elemental MediaStore SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-mediastore-dataplane" = callPackage @@ -27002,6 +26977,8 @@ self: { ]; description = "Amazon Elemental MediaStore Data Plane SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-migrationhub" = callPackage @@ -27019,6 +26996,8 @@ self: { ]; description = "Amazon Migration Hub SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-ml" = callPackage @@ -27036,6 +27015,8 @@ self: { ]; description = "Amazon Machine Learning SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-mobile" = callPackage @@ -27053,6 +27034,8 @@ self: { ]; description = "Amazon Mobile SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-mq" = callPackage @@ -27070,6 +27053,8 @@ self: { ]; description = "Amazon MQ SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-opsworks" = callPackage @@ -27087,6 +27072,8 @@ self: { ]; description = "Amazon OpsWorks SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-opsworks-cm" = callPackage @@ -27104,6 +27091,8 @@ self: { ]; description = "Amazon OpsWorks for Chef Automate SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-organizations" = callPackage @@ -27121,6 +27110,8 @@ self: { ]; description = "Amazon Organizations SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-pinpoint" = callPackage @@ -27138,6 +27129,8 @@ self: { ]; description = "Amazon Pinpoint SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-polly" = callPackage @@ -27155,6 +27148,8 @@ self: { ]; description = "Amazon Polly SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-pricing" = callPackage @@ -27172,6 +27167,8 @@ self: { ]; description = "Amazon Price List Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-rds" = callPackage @@ -27189,6 +27186,8 @@ self: { ]; description = "Amazon Relational Database Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-redshift" = callPackage @@ -27206,6 +27205,8 @@ self: { ]; description = "Amazon Redshift SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-rekognition" = callPackage @@ -27223,6 +27224,8 @@ self: { ]; description = "Amazon Rekognition SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-resourcegroups" = callPackage @@ -27240,6 +27243,8 @@ self: { ]; description = "Amazon Resource Groups SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-resourcegroupstagging" = callPackage @@ -27257,6 +27262,8 @@ self: { ]; description = "Amazon Resource Groups Tagging API SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-route53" = callPackage @@ -27274,6 +27281,8 @@ self: { ]; description = "Amazon Route 53 SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-route53-autonaming" = callPackage @@ -27291,6 +27300,8 @@ self: { ]; description = "Amazon Route 53 Auto Naming SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-route53-domains" = callPackage @@ -27308,6 +27319,8 @@ self: { ]; description = "Amazon Route 53 Domains SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-s3" = callPackage @@ -27325,6 +27338,8 @@ self: { ]; description = "Amazon Simple Storage Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-s3-streaming" = callPackage @@ -27344,6 +27359,8 @@ self: { ]; description = "Provides conduits to upload data to S3 using the Multipart API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-sagemaker" = callPackage @@ -27361,6 +27378,8 @@ self: { ]; description = "Amazon SageMaker Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-sagemaker-runtime" = callPackage @@ -27378,6 +27397,8 @@ self: { ]; description = "Amazon SageMaker Runtime SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-sdb" = callPackage @@ -27395,6 +27416,8 @@ self: { ]; description = "Amazon SimpleDB SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-secretsmanager" = callPackage @@ -27412,6 +27435,8 @@ self: { ]; description = "Amazon Secrets Manager SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-serverlessrepo" = callPackage @@ -27429,6 +27454,8 @@ self: { ]; description = "Amazon ServerlessApplicationRepository SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-servicecatalog" = callPackage @@ -27446,6 +27473,8 @@ self: { ]; description = "Amazon Service Catalog SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-ses" = callPackage @@ -27463,6 +27492,8 @@ self: { ]; description = "Amazon Simple Email Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-shield" = callPackage @@ -27480,6 +27511,8 @@ self: { ]; description = "Amazon Shield SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-sms" = callPackage @@ -27497,6 +27530,8 @@ self: { ]; description = "Amazon Server Migration Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-snowball" = callPackage @@ -27514,6 +27549,8 @@ self: { ]; description = "Amazon Import/Export Snowball SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-sns" = callPackage @@ -27531,6 +27568,8 @@ self: { ]; description = "Amazon Simple Notification Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-sqs" = callPackage @@ -27548,6 +27587,8 @@ self: { ]; description = "Amazon Simple Queue Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-ssm" = callPackage @@ -27565,6 +27606,8 @@ self: { ]; description = "Amazon Simple Systems Manager (SSM) SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-stepfunctions" = callPackage @@ -27582,6 +27625,8 @@ self: { ]; description = "Amazon Step Functions SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-storagegateway" = callPackage @@ -27599,6 +27644,8 @@ self: { ]; description = "Amazon Storage Gateway SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-sts" = callPackage @@ -27616,6 +27663,8 @@ self: { ]; description = "Amazon Security Token Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-support" = callPackage @@ -27633,6 +27682,8 @@ self: { ]; description = "Amazon Support SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-swf" = callPackage @@ -27650,6 +27701,8 @@ self: { ]; description = "Amazon Simple Workflow Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-test" = callPackage @@ -27671,6 +27724,8 @@ self: { ]; description = "Common functionality for Amazonka library test-suites"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-transcribe" = callPackage @@ -27688,6 +27743,8 @@ self: { ]; description = "Amazon Transcribe Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-translate" = callPackage @@ -27705,6 +27762,8 @@ self: { ]; description = "Amazon Translate SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-waf" = callPackage @@ -27722,6 +27781,8 @@ self: { ]; description = "Amazon WAF SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-waf-regional" = callPackage @@ -27739,6 +27800,8 @@ self: { ]; description = "Amazon WAF Regional SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-workdocs" = callPackage @@ -27756,6 +27819,8 @@ self: { ]; description = "Amazon WorkDocs SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-workmail" = callPackage @@ -27773,6 +27838,8 @@ self: { ]; description = "Amazon WorkMail SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-workspaces" = callPackage @@ -27790,6 +27857,8 @@ self: { ]; description = "Amazon WorkSpaces SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-xray" = callPackage @@ -27807,6 +27876,8 @@ self: { ]; description = "Amazon X-Ray SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amby" = callPackage @@ -27869,33 +27940,6 @@ self: { }) {}; "amqp" = callPackage - ({ mkDerivation, base, binary, bytestring, clock, connection - , containers, data-binary-ieee754, hspec, hspec-expectations - , monad-control, network, network-uri, split, stm, text, vector - , xml - }: - mkDerivation { - pname = "amqp"; - version = "0.18.2"; - sha256 = "0sp7c9vbgaxc5rhfc402q52djr0qpqgmfklhcrx45av2rqymkyxv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring clock connection containers - data-binary-ieee754 monad-control network network-uri split stm - text vector - ]; - executableHaskellDepends = [ base containers xml ]; - testHaskellDepends = [ - base binary bytestring clock connection containers - data-binary-ieee754 hspec hspec-expectations network network-uri - split stm text vector - ]; - description = "Client library for AMQP servers (currently only RabbitMQ)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "amqp_0_18_3" = callPackage ({ mkDerivation, base, binary, bytestring, clock, connection , containers, data-binary-ieee754, hspec, hspec-expectations , monad-control, network, network-uri, split, stm, text, vector @@ -27920,7 +27964,6 @@ self: { ]; description = "Client library for AMQP servers (currently only RabbitMQ)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amqp-conduit" = callPackage @@ -28515,19 +28558,6 @@ self: { }) {}; "ansi-terminal" = callPackage - ({ mkDerivation, base, colour }: - mkDerivation { - pname = "ansi-terminal"; - version = "0.8.2"; - sha256 = "147ss9wz03ww6ypbv6yh5vi1wfrfcaqm8r6nxh50vnp7254359wh"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base colour ]; - description = "Simple ANSI terminal support, with Windows compatibility"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ansi-terminal_0_9_1" = callPackage ({ mkDerivation, base, colour }: mkDerivation { pname = "ansi-terminal"; @@ -28538,7 +28568,6 @@ self: { libraryHaskellDepends = [ base colour ]; description = "Simple ANSI terminal support, with Windows compatibility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ansi-terminal-game" = callPackage @@ -28567,21 +28596,6 @@ self: { }) {}; "ansi-wl-pprint" = callPackage - ({ mkDerivation, ansi-terminal, base }: - mkDerivation { - pname = "ansi-wl-pprint"; - version = "0.6.8.2"; - sha256 = "0gnb4mkqryv08vncxnj0bzwcnd749613yw3cxfzw6y3nsldp4c56"; - revision = "2"; - editedCabalFile = "0xq83bwya8mfijp3dn9zfsqbbkl1wpzfjcmnkw8a06icjh9vg458"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ ansi-terminal base ]; - description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ansi-wl-pprint_0_6_9" = callPackage ({ mkDerivation, ansi-terminal, base }: mkDerivation { pname = "ansi-wl-pprint"; @@ -28592,7 +28606,6 @@ self: { libraryHaskellDepends = [ ansi-terminal base ]; description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ansigraph" = callPackage @@ -28607,6 +28620,8 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "Terminal-based graphing via ANSI and Unicode"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antagonist" = callPackage @@ -28723,25 +28738,6 @@ self: { }) {}; "antiope-athena" = callPackage - ({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base - , lens, resourcet, text, unliftio-core - }: - mkDerivation { - pname = "antiope-athena"; - version = "6.2.0"; - sha256 = "0kd31s399rddcjj8ayvki85j66xlkb7gh0jgfwxmxcxp3x4gs0xi"; - libraryHaskellDepends = [ - amazonka amazonka-athena amazonka-core base lens resourcet text - unliftio-core - ]; - testHaskellDepends = [ - amazonka amazonka-athena amazonka-core base lens resourcet text - unliftio-core - ]; - license = stdenv.lib.licenses.mit; - }) {}; - - "antiope-athena_7_2_2" = callPackage ({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base , lens, resourcet, text, unliftio-core }: @@ -28760,6 +28756,7 @@ self: { description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-contract" = callPackage @@ -28773,31 +28770,11 @@ self: { ]; description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-core" = callPackage - ({ mkDerivation, amazonka, amazonka-core, base, bytestring - , exceptions, generic-lens, http-client, http-types, lens - , monad-logger, mtl, resourcet, text, transformers, unliftio-core - }: - mkDerivation { - pname = "antiope-core"; - version = "6.2.0"; - sha256 = "0g3bhh8vdnkd5h9savhjc053jbb4k7b7chbzcjjqd4kj95v8jmr3"; - libraryHaskellDepends = [ - amazonka amazonka-core base bytestring exceptions generic-lens - http-client http-types lens monad-logger mtl resourcet text - transformers unliftio-core - ]; - testHaskellDepends = [ - amazonka amazonka-core base bytestring exceptions generic-lens - http-client http-types lens monad-logger mtl resourcet text - transformers unliftio-core - ]; - license = stdenv.lib.licenses.mit; - }) {}; - - "antiope-core_7_2_2" = callPackage ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base , bytestring, exceptions, generic-lens, hedgehog, hspec , http-client, http-types, hw-hspec-hedgehog, lens, mtl, resourcet @@ -28821,29 +28798,10 @@ self: { description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-dynamodb" = callPackage - ({ mkDerivation, amazonka, amazonka-core, amazonka-dynamodb - , antiope-core, base, generic-lens, lens, text, unliftio-core - , unordered-containers - }: - mkDerivation { - pname = "antiope-dynamodb"; - version = "6.2.0"; - sha256 = "1kv6ihb6829fbgzz489sg0zyz02rp9p8wk90w4x3sjsynf8djrjj"; - libraryHaskellDepends = [ - amazonka amazonka-core amazonka-dynamodb antiope-core base - generic-lens lens text unliftio-core unordered-containers - ]; - testHaskellDepends = [ - amazonka amazonka-core amazonka-dynamodb antiope-core base - generic-lens lens text unliftio-core unordered-containers - ]; - license = stdenv.lib.licenses.mit; - }) {}; - - "antiope-dynamodb_7_2_2" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb , antiope-core, base, generic-lens, lens, text, unliftio-core , unordered-containers @@ -28863,31 +28821,10 @@ self: { description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-messages" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 - , amazonka-sqs, antiope-s3, base, generic-lens, lens, lens-aeson - , monad-loops, network-uri, text, unliftio-core - }: - mkDerivation { - pname = "antiope-messages"; - version = "6.2.0"; - sha256 = "11zkyfv06fsqxznr36hh563yz401y3wg2a5hc6x6ydza4xdnrzdz"; - libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 - base generic-lens lens lens-aeson monad-loops network-uri text - unliftio-core - ]; - testHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 - base generic-lens lens lens-aeson monad-loops network-uri text - unliftio-core - ]; - license = stdenv.lib.licenses.mit; - }) {}; - - "antiope-messages_7_2_2" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring , generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens , lens-aeson, monad-loops, network-uri, scientific, text @@ -28909,6 +28846,7 @@ self: { description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-optparse-applicative" = callPackage @@ -28928,34 +28866,11 @@ self: { ]; description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-s3" = callPackage - ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, antiope-core - , attoparsec, base, bytestring, conduit, conduit-extra, exceptions - , generic-lens, hedgehog, hspec, http-types, hw-hspec-hedgehog - , lens, monad-logger, mtl, network-uri, resourcet, text - , unliftio-core - }: - mkDerivation { - pname = "antiope-s3"; - version = "6.2.0"; - sha256 = "1gb9ypj5gp6qkzncg44sja35pw2s6qg7msjrlcvhdfbcjs6pxrqj"; - libraryHaskellDepends = [ - amazonka amazonka-core amazonka-s3 antiope-core attoparsec base - bytestring conduit conduit-extra exceptions generic-lens http-types - lens monad-logger mtl network-uri resourcet text unliftio-core - ]; - testHaskellDepends = [ - amazonka amazonka-core amazonka-s3 antiope-core attoparsec base - bytestring conduit conduit-extra exceptions generic-lens hedgehog - hspec http-types hw-hspec-hedgehog lens monad-logger mtl - network-uri resourcet text unliftio-core - ]; - license = stdenv.lib.licenses.mit; - }) {}; - - "antiope-s3_7_2_2" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , antiope-core, antiope-messages, attoparsec, base, bytestring , conduit, conduit-extra, exceptions, generic-lens, hedgehog, hspec @@ -28981,28 +28896,10 @@ self: { description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-sns" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base - , generic-lens, lens, text, unliftio-core - }: - mkDerivation { - pname = "antiope-sns"; - version = "6.2.0"; - sha256 = "0npm9q3vf2njiqwyswxc6xh5psjls0skz29mz22y59sk25m5fmkv"; - libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-sns base generic-lens lens - text unliftio-core - ]; - testHaskellDepends = [ - aeson amazonka amazonka-core amazonka-sns base generic-lens lens - text unliftio-core - ]; - license = stdenv.lib.licenses.mit; - }) {}; - - "antiope-sns_7_2_2" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base , bytestring, generic-lens, hedgehog, hspec, hw-hspec-hedgehog , lens, text, time, unliftio-core @@ -29023,31 +28920,10 @@ self: { description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-sqs" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 - , amazonka-sqs, antiope-messages, antiope-s3, base, generic-lens - , lens, lens-aeson, monad-loops, network-uri, text, unliftio-core - }: - mkDerivation { - pname = "antiope-sqs"; - version = "6.2.0"; - sha256 = "0v33diw8cwvfb9b4k24whbyl4apjq67rh36ndn5qr6627kp3b825"; - libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 amazonka-sqs - antiope-messages antiope-s3 base generic-lens lens lens-aeson - monad-loops network-uri text unliftio-core - ]; - testHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 amazonka-sqs - antiope-messages antiope-s3 base generic-lens lens lens-aeson - monad-loops network-uri text unliftio-core - ]; - license = stdenv.lib.licenses.mit; - }) {}; - - "antiope-sqs_7_2_2" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base , bytestring, conduit, generic-lens, hedgehog, hspec , hw-hspec-hedgehog, lens, lens-aeson, monad-loops, mtl @@ -29071,6 +28947,7 @@ self: { description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-swf" = callPackage @@ -29085,6 +28962,8 @@ self: { testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiprimes" = callPackage @@ -29298,23 +29177,6 @@ self: { }) {}; "apecs" = callPackage - ({ mkDerivation, base, containers, criterion, linear, mtl - , QuickCheck, template-haskell, vector - }: - mkDerivation { - pname = "apecs"; - version = "0.7.3"; - sha256 = "1vrfmpnpihsywd8lq1kc7bsjsp8kxrcv341mzxsaa68qd5xi698l"; - libraryHaskellDepends = [ - base containers mtl template-haskell vector - ]; - testHaskellDepends = [ base containers linear QuickCheck vector ]; - benchmarkHaskellDepends = [ base criterion linear ]; - description = "Fast Entity-Component-System library for game programming"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "apecs_0_8_1" = callPackage ({ mkDerivation, array, base, containers, criterion, linear, mtl , QuickCheck, template-haskell, vector }: @@ -29329,7 +29191,6 @@ self: { benchmarkHaskellDepends = [ base criterion linear ]; description = "Fast Entity-Component-System library for game programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "apecs-gloss" = callPackage @@ -29338,8 +29199,8 @@ self: { }: mkDerivation { pname = "apecs-gloss"; - version = "0.2.0"; - sha256 = "0qkdjanbrnwhxzr168xwrnhcd1hwsymlb1nvsb1mrklzj93amfvh"; + version = "0.2.1"; + sha256 = "0v1nagzwhb1l9wfjl4yp3ymbhbpjcrwrih2y8cxkzws5wxgbbnvg"; libraryHaskellDepends = [ apecs apecs-physics base containers gloss linear ]; @@ -29347,14 +29208,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "apecs-gloss_0_2_1" = callPackage + "apecs-gloss_0_2_2" = callPackage ({ mkDerivation, apecs, apecs-physics, base, containers, gloss , linear }: mkDerivation { pname = "apecs-gloss"; - version = "0.2.1"; - sha256 = "0v1nagzwhb1l9wfjl4yp3ymbhbpjcrwrih2y8cxkzws5wxgbbnvg"; + version = "0.2.2"; + sha256 = "0p8r8hraqa49f13p045j54kzyrcvgscppgqllwnqgdx0in8j71cf"; libraryHaskellDepends = [ apecs apecs-physics base containers gloss linear ]; @@ -29369,8 +29230,8 @@ self: { }: mkDerivation { pname = "apecs-physics"; - version = "0.3.2"; - sha256 = "15xwhji60garvryv971ahibdb6b0qlpafx9xy5898h0s4bhrhysf"; + version = "0.4.0"; + sha256 = "0yqylgsl2n0fsb73qdvl1iinazfzzx64683jp37sr2dm8jpys3lc"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ apecs base containers inline-c linear template-haskell vector @@ -29379,14 +29240,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "apecs-physics_0_4_0" = callPackage + "apecs-physics_0_4_2" = callPackage ({ mkDerivation, apecs, base, Cabal, containers, inline-c, linear , template-haskell, vector }: mkDerivation { pname = "apecs-physics"; - version = "0.4.0"; - sha256 = "0yqylgsl2n0fsb73qdvl1iinazfzzx64683jp37sr2dm8jpys3lc"; + version = "0.4.2"; + sha256 = "0jqylv937c4y4jygqyb127n9lvvmss52pz7rcwq7x3qc3k5mwgnh"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ apecs base containers inline-c linear template-haskell vector @@ -30433,6 +30294,8 @@ self: { testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; description = "Simple logging library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arbor-monad-metric" = callPackage @@ -30949,34 +30812,6 @@ self: { }) {}; "arithmoi" = callPackage - ({ mkDerivation, array, base, containers, deepseq, exact-pi, gauge - , ghc-prim, integer-gmp, integer-logarithms, QuickCheck, random - , smallcheck, tasty, tasty-hunit, tasty-quickcheck - , tasty-smallcheck, transformers, vector - }: - mkDerivation { - pname = "arithmoi"; - version = "0.8.0.0"; - sha256 = "17nk0n89fb0qh6w8535ll45mq4msir32w6fhqzpzhlpbily3mlw2"; - revision = "3"; - editedCabalFile = "1cn6axcdiahaqnq1rsm0snr78lrypay6cxh3yxw3vrrwilavri1i"; - configureFlags = [ "-f-llvm" ]; - libraryHaskellDepends = [ - array base containers deepseq exact-pi ghc-prim integer-gmp - integer-logarithms random transformers vector - ]; - testHaskellDepends = [ - base containers exact-pi integer-gmp QuickCheck smallcheck tasty - tasty-hunit tasty-quickcheck tasty-smallcheck transformers vector - ]; - benchmarkHaskellDepends = [ - base containers deepseq gauge integer-logarithms random vector - ]; - description = "Efficient basic number-theoretic functions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "arithmoi_0_9_0_0" = callPackage ({ mkDerivation, array, base, containers, deepseq, exact-pi, gauge , ghc-prim, integer-gmp, integer-logarithms, QuickCheck, random , semirings, smallcheck, tasty, tasty-hunit, tasty-quickcheck @@ -31004,7 +30839,6 @@ self: { ]; description = "Efficient basic number-theoretic functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "arity-generic-liftA" = callPackage @@ -31194,6 +31028,8 @@ self: { ]; description = "Memory-efficient ArrayList implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arrow-extras" = callPackage @@ -31377,6 +31213,8 @@ self: { testHaskellDepends = [ base hedgehog jwt mtl text time ]; description = "Atlassian Service Authentication Protocol"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ascetic" = callPackage @@ -31601,44 +31439,6 @@ self: { }) {}; "asif" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring, conduit - , conduit-combinators, conduit-extra, containers, cpu, directory - , either, exceptions, generic-lens, hedgehog, hspec, hw-bits - , hw-hspec-hedgehog, hw-ip, iproute, lens, network, old-locale - , optparse-applicative, resourcet, temporary-resourcet, text, thyme - , vector - }: - mkDerivation { - pname = "asif"; - version = "3.2.0"; - sha256 = "0ryg35rl7i89r28l0hpchgmrgmhxwgzxz7jhnwhqfwk5mql08hq0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base binary bytestring conduit conduit-combinators - conduit-extra containers cpu either exceptions generic-lens hw-bits - hw-ip iproute lens network old-locale resourcet temporary-resourcet - text thyme vector - ]; - executableHaskellDepends = [ - attoparsec base binary bytestring conduit conduit-combinators - conduit-extra containers cpu directory either exceptions - generic-lens hw-bits hw-ip iproute lens network old-locale - optparse-applicative resourcet temporary-resourcet text thyme - vector - ]; - testHaskellDepends = [ - attoparsec base binary bytestring conduit conduit-combinators - conduit-extra containers cpu either exceptions generic-lens - hedgehog hspec hw-bits hw-hspec-hedgehog hw-ip iproute lens network - old-locale resourcet temporary-resourcet text thyme vector - ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "asif_6_0_1" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, conduit , conduit-combinators, conduit-extra, containers, cpu, directory , either, exceptions, foldl, generic-lens, hedgehog, hspec, hw-bits @@ -32741,8 +32541,6 @@ self: { doHaddock = false; description = "A build tool for ATS"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ats-setup" = callPackage @@ -33006,6 +32804,8 @@ self: { ]; description = "Parse IP data types with attoparsec"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "attoparsec-iso8601" = callPackage @@ -33149,6 +32949,8 @@ self: { ]; description = "URI parser / printer using attoparsec"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "attoparsec-varword" = callPackage @@ -33484,17 +33286,6 @@ self: { }) {}; "auto-update" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "auto-update"; - version = "0.1.5"; - sha256 = "0gyczrbz85gp90ibig99556gvi1m0j3rrilxdms6jryw70kkxbnz"; - libraryHaskellDepends = [ base ]; - description = "Efficiently run periodic, on-demand actions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "auto-update_0_1_6" = callPackage ({ mkDerivation, base, exceptions, hspec, HUnit, retry }: mkDerivation { pname = "auto-update"; @@ -33504,7 +33295,6 @@ self: { testHaskellDepends = [ base exceptions hspec HUnit retry ]; description = "Efficiently run periodic, on-demand actions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "autoexporter" = callPackage @@ -33859,40 +33649,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.4.3"; - sha256 = "12r08n7bz8qwknv8108qz3j0n7x12ia0wnzqng54pjb47jfdgfzi"; - 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 - template-haskell text tf-random transformers unordered-containers - vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - aeson base bytestring containers gauge hashable mtl random - raw-strings-qq text transformers unordered-containers vector - ]; - description = "Avro serialization support for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "avro_0_4_5_1" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors , binary, bytestring, containers, data-binary-ieee754, deepseq , directory, extra, fail, gauge, hashable, hspec, hspec-discover @@ -33924,7 +33680,6 @@ self: { ]; description = "Avro serialization support for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "avwx" = callPackage @@ -34204,6 +33959,8 @@ self: { ]; description = "Helper function and types for working with amazonka"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-ec2" = callPackage @@ -34464,6 +34221,8 @@ self: { executableHaskellDepends = [ aeson base lens lens-aeson text ]; description = "Haskell on AWS Lambda Runtime API"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-mfa-credentials" = callPackage @@ -34627,6 +34386,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Wrapper over Amazonka's SES"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-sign4" = callPackage @@ -35064,6 +34825,8 @@ self: { ]; description = "Heterogeneous automatic differentation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "backstop" = callPackage @@ -35385,18 +35148,6 @@ self: { }) {}; "bank-holidays-england" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck, time }: - mkDerivation { - pname = "bank-holidays-england"; - version = "0.1.0.8"; - sha256 = "0ak7m4xaymbh3cyhddj45p0pcazf79lnp63wvh4kh2f4fwh4f69j"; - libraryHaskellDepends = [ base containers time ]; - testHaskellDepends = [ base containers hspec QuickCheck time ]; - description = "Calculation of bank holidays in England and Wales"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bank-holidays-england_0_2_0_1" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck, time }: mkDerivation { pname = "bank-holidays-england"; @@ -35406,7 +35157,6 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck time ]; description = "Calculation of bank holidays in England and Wales"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "banwords" = callPackage @@ -35431,22 +35181,6 @@ self: { }) {}; "barbies" = callPackage - ({ mkDerivation, base, bifunctors, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "barbies"; - version = "1.1.2.1"; - sha256 = "0svcdjs03i4ryhg3qzrp3l7ck0ilgnhxwc2h69qnzknqjklz7p1y"; - libraryHaskellDepends = [ base bifunctors ]; - testHaskellDepends = [ - base QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - description = "Classes for working with types that can change clothes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "barbies_1_1_3_0" = callPackage ({ mkDerivation, base, bifunctors, QuickCheck, tasty, tasty-hunit , tasty-quickcheck }: @@ -35460,7 +35194,6 @@ self: { ]; description = "Classes for working with types that can change clothes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "barchart" = callPackage @@ -35908,8 +35641,6 @@ self: { ]; description = "A newtype around ByteString, for base64 encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "base64-conduit" = callPackage @@ -35967,19 +35698,6 @@ self: { }) {}; "basement" = callPackage - ({ mkDerivation, base, ghc-prim }: - mkDerivation { - pname = "basement"; - version = "0.0.10"; - sha256 = "01gmqkwd8cizlsn24wb1ld358k40kbaw84579y0h5nl7f41iniz3"; - revision = "2"; - editedCabalFile = "0ysyr6ir3i05a52rphsd3sp5izw397b0idamb7hm23jzl58qhj5v"; - libraryHaskellDepends = [ base ghc-prim ]; - description = "Foundation scrap box of array & string"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "basement_0_0_11" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "basement"; @@ -35988,7 +35706,6 @@ self: { libraryHaskellDepends = [ base ghc-prim ]; description = "Foundation scrap box of array & string"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "basen-bytestring" = callPackage @@ -37386,8 +37103,6 @@ self: { libraryHaskellDepends = [ base category ]; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bifunctors" = callPackage @@ -37548,22 +37263,6 @@ self: { }) {}; "bimap" = callPackage - ({ mkDerivation, base, containers, exceptions, QuickCheck - , template-haskell - }: - mkDerivation { - pname = "bimap"; - version = "0.3.3"; - sha256 = "1lca7bdw4bh8xj88g0h05dq43dis9ah858r2pbnkxgdwqxar70kk"; - libraryHaskellDepends = [ base containers exceptions ]; - testHaskellDepends = [ - base containers exceptions QuickCheck template-haskell - ]; - description = "Bidirectional mapping between two key types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bimap_0_4_0" = callPackage ({ mkDerivation, base, containers, deepseq, exceptions, QuickCheck , template-haskell }: @@ -37579,7 +37278,6 @@ self: { ]; description = "Bidirectional mapping between two key types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bimap-server" = callPackage @@ -37857,8 +37555,6 @@ self: { ]; description = "Orphan instances for binary"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "binary-list" = callPackage @@ -37891,32 +37587,6 @@ self: { }) {}; "binary-orphans" = callPackage - ({ mkDerivation, aeson, base, binary, case-insensitive, hashable - , QuickCheck, quickcheck-instances, scientific, tagged, tasty - , tasty-quickcheck, text, text-binary, time, unordered-containers - , vector, vector-binary-instances - }: - mkDerivation { - pname = "binary-orphans"; - version = "0.1.8.0"; - sha256 = "1k6067wn9zki7xvbslvxx8cq1wrmz3kjb3q3x8mxycc9v765fxgi"; - revision = "5"; - editedCabalFile = "1dny1jvwwcyrbzhqvymmn6n7ib48bpy0nasbrcrdrpzjypkmg500"; - libraryHaskellDepends = [ - aeson base binary case-insensitive hashable scientific tagged text - text-binary time unordered-containers vector - vector-binary-instances - ]; - testHaskellDepends = [ - aeson base binary case-insensitive hashable QuickCheck - quickcheck-instances scientific tagged tasty tasty-quickcheck text - time unordered-containers vector - ]; - description = "Orphan instances for binary"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "binary-orphans_1_0_1" = callPackage ({ mkDerivation, base, binary, QuickCheck, quickcheck-instances , tagged, tasty, tasty-quickcheck, transformers }: @@ -37933,7 +37603,6 @@ self: { ]; description = "Compatibility package for binary; provides instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-parser" = callPackage @@ -38122,37 +37791,6 @@ self: { }) {}; "binary-tagged" = callPackage - ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors - , binary, binary-orphans, bytestring, containers, criterion - , deepseq, generics-sop, hashable, nats, quickcheck-instances - , scientific, semigroups, SHA, tagged, tasty, tasty-quickcheck - , text, time, unordered-containers, vector - }: - mkDerivation { - pname = "binary-tagged"; - version = "0.1.5.2"; - sha256 = "04yy7af7iv6i4wbv69j9vldk8c2xaxd9vz3cg0j1dn7h4dmwwbsz"; - libraryHaskellDepends = [ - aeson array base base16-bytestring binary bytestring containers - generics-sop hashable scientific SHA tagged text time - unordered-containers vector - ]; - testHaskellDepends = [ - aeson array base base16-bytestring bifunctors binary binary-orphans - bytestring containers generics-sop hashable quickcheck-instances - scientific SHA tagged tasty tasty-quickcheck text time - unordered-containers vector - ]; - benchmarkHaskellDepends = [ - aeson array base base16-bytestring binary binary-orphans bytestring - containers criterion deepseq generics-sop hashable nats scientific - semigroups SHA tagged text time unordered-containers vector - ]; - description = "Tagged binary serialisation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "binary-tagged_0_2" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors , binary, binary-instances, bytestring, containers, criterion , cryptohash-sha1, deepseq, generics-sop, hashable, nats @@ -38183,7 +37821,6 @@ self: { ]; description = "Tagged binary serialisation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-tree" = callPackage @@ -39425,8 +39062,8 @@ self: { }: mkDerivation { pname = "birch-beer"; - version = "0.1.4.2"; - sha256 = "02q89rp7f12vf257f2m7g34qwv15027k7gsm4yq95blhi4c5rbg0"; + version = "0.1.4.4"; + sha256 = "04pw1znsv7gm1qkdvb65kh4x0d8na590ks7437dymzy9h75m6mvj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39486,6 +39123,8 @@ self: { ]; description = "A small tool that clears qutebrowser cookies"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bisect-binary" = callPackage @@ -39538,8 +39177,6 @@ self: { ]; description = "Plays chess"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bit-array" = callPackage @@ -40175,8 +39812,28 @@ self: { benchmarkHaskellDepends = [ base gauge vector ]; description = "Unboxed bit vectors"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "bitvec_1_0_0_1" = 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; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bitwise" = callPackage @@ -40192,6 +39849,8 @@ self: { benchmarkHaskellDepends = [ array base bytestring criterion ]; description = "fast multi-dimensional unboxed bit packed Bool arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bitx-bitcoin" = callPackage @@ -40349,27 +40008,11 @@ self: { ]; description = "Decentralized, k-ordered unique ID generator"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blake2" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, criterion - , hlint, QuickCheck, tasty, tasty-quickcheck - }: - mkDerivation { - pname = "blake2"; - version = "0.2.0"; - sha256 = "1z1c70l2lmaj7d4wffsikf2w61i5ypjxnlwxddd8zsf6ypii1n87"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ - base base16-bytestring bytestring hlint QuickCheck tasty - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ base bytestring criterion ]; - description = "A library providing BLAKE2"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "blake2_0_3_0" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, criterion , hlint, QuickCheck, tasty, tasty-quickcheck }: @@ -40386,6 +40029,7 @@ self: { description = "A library providing BLAKE2"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blakesum" = callPackage @@ -41388,8 +41032,6 @@ self: { ]; description = "Three games for inclusion in a web server"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bogocopy" = callPackage @@ -41722,6 +41364,8 @@ self: { ]; description = "Boolean normal form: NNF, DNF & CNF"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "boolector" = callPackage @@ -41881,6 +41525,41 @@ self: { ]; description = "Boot application by plugins"; license = stdenv.lib.licenses.mit; + }) {}; + + "boots_0_1" = callPackage + ({ mkDerivation, base, exceptions, hspec, mtl }: + mkDerivation { + pname = "boots"; + version = "0.1"; + sha256 = "0d9mg56alrh6fhv5r5lh33pykfqaw45yz38gky1k6idnyy7w5aik"; + libraryHaskellDepends = [ base exceptions mtl ]; + testHaskellDepends = [ base exceptions hspec mtl ]; + description = "IoC Monad in Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "boots-app" = callPackage + ({ mkDerivation, base, boots, data-default, exceptions, fast-logger + , hspec, menshen, microlens, monad-logger, mtl, salak, salak-yaml + , splitmix, text, unliftio-core, vault + }: + mkDerivation { + pname = "boots-app"; + version = "0.1.0.3"; + sha256 = "0sgd5girr559plpd055xc8zixwmmfdlq2mrcm3vkwsr1djr5wi95"; + libraryHaskellDepends = [ + base boots data-default exceptions fast-logger menshen microlens + monad-logger mtl salak salak-yaml splitmix text unliftio-core vault + ]; + testHaskellDepends = [ + base boots data-default exceptions fast-logger hspec menshen + microlens monad-logger mtl salak salak-yaml splitmix text + unliftio-core vault + ]; + description = "Startup factories using IoC monad"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -42684,6 +42363,8 @@ self: { pname = "broadcast-chan"; version = "0.2.0.2"; sha256 = "12ax37y9i3cs8wifz01lpq0awm9c235l5xkybf13ywvyk5svb0jv"; + revision = "1"; + editedCabalFile = "1sgifhdf9l8zkc0dddnkfy8f1bkry061vm67iich489fi8nlhfjn"; libraryHaskellDepends = [ base unliftio-core ]; benchmarkHaskellDepends = [ async base criterion deepseq stm ]; description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks"; @@ -42738,8 +42419,8 @@ self: { pname = "broadcast-chan-tests"; version = "0.2.0.2"; sha256 = "1m7m06pd9vfvz0rfnylpr6pjvizxv31qizri3a400rkz3zanhkym"; - revision = "1"; - editedCabalFile = "0vlqyhz02y5jkmxlic1rsxf1ddfffrsvkp67vsaf2zmqjjkvc8rh"; + revision = "2"; + editedCabalFile = "0mfld36ppfyhx2w9a99gxa8qxnik0mnznl7bvqhbbaf1ayinhx91"; libraryHaskellDepends = [ async base broadcast-chan clock containers optparse-applicative paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis @@ -43170,8 +42851,8 @@ self: { pname = "buffer"; version = "0.5.3"; sha256 = "0bf9y6rb3q26rk6qd7a2mjlb1gd1gp2k080ywhp5g48l474h6p26"; - revision = "1"; - editedCabalFile = "19v3zis3fqirsacacqnn7ypgvddgi6i8dj8bkbap2ln2mmqkvlh0"; + revision = "2"; + editedCabalFile = "0lg7sy7c059a29gmyihlwck6d98vq5kqfkw4bjixnvc2r9znfcv7"; libraryHaskellDepends = [ base base-prelude bug bytestring ]; testHaskellDepends = [ bug quickcheck-instances rerebase tasty tasty-hunit @@ -43482,6 +43163,8 @@ self: { tasty-quickcheck text ]; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bulletproofs_1_0_0" = callPackage @@ -43511,6 +43194,7 @@ self: { ]; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bulmex" = callPackage @@ -43529,6 +43213,8 @@ self: { ]; description = "Reflex infused with bulma (css)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bumper" = callPackage @@ -43795,28 +43481,6 @@ self: { }) {}; "bv-little" = callPackage - ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp - , mono-traversable, primitive, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "bv-little"; - version = "0.1.2"; - sha256 = "0xscq4qjwisqiykdhiirxc58gsrmabvxmxwxw80f2m6ia103k3cc"; - libraryHaskellDepends = [ - base deepseq hashable integer-gmp mono-traversable primitive - QuickCheck - ]; - testHaskellDepends = [ - base deepseq hashable mono-traversable QuickCheck tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ base criterion deepseq hashable ]; - description = "Efficient little-endian bit vector library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bv-little_1_1_0" = callPackage ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp , keys, mono-traversable, mono-traversable-keys, primitive , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck @@ -43841,7 +43505,6 @@ self: { ]; description = "Efficient little-endian bit vector library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bv-sized" = callPackage @@ -44550,6 +44213,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) bzip2;}; + "bzlib-conduit_0_3_0_2" = callPackage + ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit + , data-default-class, hspec, mtl, random, resourcet + }: + mkDerivation { + pname = "bzlib-conduit"; + version = "0.3.0.2"; + sha256 = "0a21zin5plsl37hkxh2jv8cxwyjrbs2fy7n5cyrzgdaa7lmp6b7b"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bindings-DSL bytestring conduit data-default-class mtl + resourcet + ]; + librarySystemDepends = [ bzip2 ]; + testHaskellDepends = [ + base bindings-DSL bytestring conduit data-default-class hspec mtl + random resourcet + ]; + benchmarkHaskellDepends = [ + base bindings-DSL bytestring conduit data-default-class mtl + resourcet + ]; + description = "Streaming compression/decompression via conduits"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) bzip2;}; + "c-dsl" = callPackage ({ mkDerivation, base, language-c }: mkDerivation { @@ -44975,8 +44665,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.38.5"; - sha256 = "0pqislgc38q57jf252aha7x71pbdw5nxinx3gcm4s7311m25fw1f"; + version = "4.39"; + sha256 = "0cp1q9pa6wdij23bq7c3dac1byxxdr7maxvjj3jyi3v4d2mhgyvp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45079,6 +44769,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-fmt" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, directory + , filepath, mtl, optparse-applicative, parsec, pretty, process + , tasty, tasty-golden + }: + mkDerivation { + pname = "cabal-fmt"; + version = "0.1"; + sha256 = "0rk2gmidsikbzvh0jkrzwn2pbri8z5fhxfvlsh7wivlcqrz4jsf3"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers filepath mtl parsec pretty + ]; + executableHaskellDepends = [ + base bytestring directory filepath optparse-applicative + ]; + testHaskellDepends = [ + base bytestring Cabal filepath process tasty tasty-golden + ]; + doHaddock = false; + description = "Format .cabal files"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "cabal-ghc-dynflags" = callPackage ({ mkDerivation, base, Cabal, ghc, transformers }: mkDerivation { @@ -45449,27 +45166,6 @@ self: { }) {}; "cabal-rpm" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, filepath - , http-client, http-client-tls, http-conduit, process, simple-cmd - , time, unix - }: - mkDerivation { - pname = "cabal-rpm"; - version = "0.12.6"; - sha256 = "1k602v7v87w6xcd9a5m8n5grnjbkyn79rdi9azl7djna0rs129ns"; - revision = "1"; - editedCabalFile = "0wfj9gcygm1c9fy86973ybs8ww8g6fn3l7f5v2kvs28204g8i18g"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring Cabal directory filepath http-client - http-client-tls http-conduit process simple-cmd time unix - ]; - description = "RPM packaging tool for Haskell Cabal-based packages"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "cabal-rpm_0_13_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath , http-client, http-client-tls, http-conduit, process, simple-cmd , time, unix @@ -45489,6 +45185,7 @@ self: { description = "RPM packaging tool for Haskell Cabal-based packages"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-scripts" = callPackage @@ -45634,6 +45331,8 @@ self: { libraryHaskellDepends = [ base Cabal QuickCheck ]; description = "QuickCheck for Cabal"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-toolkit" = callPackage @@ -46034,45 +45733,6 @@ self: { }) {}; "cachix" = callPackage - ({ mkDerivation, async, base, base16-bytestring, base64-bytestring - , bytestring, cachix-api, conduit, conduit-extra, cookie - , cryptonite, data-default, dhall, directory, ed25519, filepath - , fsnotify, here, hspec, hspec-discover, http-client - , http-client-tls, http-conduit, http-types, lzma-conduit - , megaparsec, memory, mmorph, netrc, optparse-applicative, process - , protolude, retry, safe-exceptions, servant, servant-auth - , servant-auth-client, servant-client, servant-client-core - , servant-conduit, temporary, text, unix, uri-bytestring, versions - }: - mkDerivation { - pname = "cachix"; - version = "0.2.0"; - sha256 = "0nk6ay0vdq656bwkbnd16y95ivjbi34k8k58gcabr91bgypp1fhn"; - revision = "1"; - editedCabalFile = "103ypqp0kclc1814q2ci5fi2jpfbxwmjqfsnkvwf3c1vr8cqplmh"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - async base base16-bytestring base64-bytestring bytestring - cachix-api conduit conduit-extra cookie cryptonite data-default - dhall directory ed25519 filepath fsnotify here http-client - http-client-tls http-conduit http-types lzma-conduit megaparsec - memory mmorph netrc optparse-applicative process protolude retry - safe-exceptions servant servant-auth servant-auth-client - servant-client servant-client-core servant-conduit text unix - uri-bytestring versions - ]; - executableHaskellDepends = [ base cachix-api ]; - executableToolDepends = [ hspec-discover ]; - testHaskellDepends = [ - base cachix-api directory here hspec protolude temporary - ]; - description = "Command line client for Nix binary cache hosting https://cachix.org"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "cachix_0_2_1" = callPackage ({ mkDerivation, async, base, base16-bytestring, base64-bytestring , bytestring, cachix-api, conduit, conduit-extra, cookie , cryptonite, dhall, directory, ed25519, filepath, fsnotify, here @@ -46108,44 +45768,10 @@ self: { description = "Command line client for Nix binary cache hosting https://cachix.org"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cachix-api" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , conduit, cookie, cryptonite, deepseq, exceptions, hspec - , hspec-discover, http-api-data, http-media, lens, memory - , protolude, resourcet, servant, servant-auth, servant-auth-server - , servant-auth-swagger, servant-client, servant-swagger - , servant-swagger-ui-core, string-conv, swagger2, text - , transformers - }: - mkDerivation { - pname = "cachix-api"; - version = "0.2.0"; - sha256 = "1wmyxknd5fliqfsavngpj01i34jcl39rsm1lx0nf13vlsf279wkk"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring conduit cookie cryptonite - deepseq exceptions http-api-data http-media lens memory resourcet - servant servant-auth servant-auth-server servant-auth-swagger - servant-client servant-swagger string-conv swagger2 text - transformers - ]; - executableHaskellDepends = [ aeson base ]; - testHaskellDepends = [ - aeson base base16-bytestring bytestring conduit cookie cryptonite - hspec http-api-data http-media lens memory protolude servant - servant-auth servant-auth-server servant-auth-swagger - servant-swagger servant-swagger-ui-core string-conv swagger2 text - transformers - ]; - testToolDepends = [ hspec-discover ]; - description = "Servant HTTP API specification for https://cachix.org"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "cachix-api_0_2_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , conduit, cookie, cryptonite, deepseq, exceptions, hspec , hspec-discover, http-api-data, http-media, lens, memory @@ -46179,6 +45805,7 @@ self: { description = "Servant HTTP API specification for https://cachix.org"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cacophony" = callPackage @@ -46206,6 +45833,8 @@ self: { ]; description = "A library implementing the Noise protocol"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "caf" = callPackage @@ -46714,8 +46343,6 @@ self: { libraryHaskellDepends = [ arithmoi array base containers random ]; description = "Arithmetic for Psychedelically Large Numbers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "canonical-filepath" = callPackage @@ -46890,6 +46517,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Convert data to and from a natural number representation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cao" = callPackage @@ -46973,8 +46602,6 @@ self: { ]; description = "OTP-like supervision trees in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "capnp" = callPackage @@ -47765,6 +47392,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Conduit interface for cassava package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cassava-embed" = callPackage @@ -47919,6 +47548,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Multicast, thread-safe, and fast logger"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "castle" = callPackage @@ -48009,19 +47640,6 @@ self: { }) {}; "category" = callPackage - ({ mkDerivation, alg, base, transformers }: - mkDerivation { - pname = "category"; - version = "0.2.4.0"; - sha256 = "0c1507vl3r91f401ccsnphhis8krrzj789vzx9ynlg2lfalkvnni"; - libraryHaskellDepends = [ alg base transformers ]; - description = "Categorical types and classes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "category_0_2_4_1" = callPackage ({ mkDerivation, alg, base, transformers }: mkDerivation { pname = "category"; @@ -48030,8 +47648,6 @@ self: { libraryHaskellDepends = [ alg base transformers ]; description = "Categorical types and classes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "category-extras" = callPackage @@ -48151,6 +47767,8 @@ self: { hspec QuickCheck ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cayene-lpp" = callPackage @@ -48245,29 +47863,6 @@ self: { }) {}; "cborg" = callPackage - ({ mkDerivation, aeson, array, base, base16-bytestring - , base64-bytestring, bytestring, containers, deepseq, fail - , ghc-prim, half, integer-gmp, primitive, QuickCheck, scientific - , tasty, tasty-hunit, tasty-quickcheck, text, vector - }: - mkDerivation { - pname = "cborg"; - version = "0.2.1.0"; - sha256 = "10vlv5mwg9625rmir7mi0zj5ygs3j3vlhm2h8lilkbj5frgp764i"; - libraryHaskellDepends = [ - array base bytestring containers deepseq ghc-prim half integer-gmp - primitive text - ]; - testHaskellDepends = [ - aeson array base base16-bytestring base64-bytestring bytestring - deepseq fail half QuickCheck scientific tasty tasty-hunit - tasty-quickcheck text vector - ]; - description = "Concise Binary Object Representation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cborg_0_2_2_0" = callPackage ({ mkDerivation, aeson, array, base, base-orphans , base16-bytestring, base64-bytestring, bytestring, containers , deepseq, fail, ghc-prim, half, integer-gmp, primitive, QuickCheck @@ -48289,7 +47884,6 @@ self: { ]; description = "Concise Binary Object Representation (CBOR)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cborg-json" = callPackage @@ -48710,6 +48304,8 @@ self: { ]; description = "Use cereal to encode/decode io-streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cereal-text" = callPackage @@ -48931,24 +48527,6 @@ self: { }) {}; "cgi" = callPackage - ({ mkDerivation, base, bytestring, containers, exceptions, mtl - , multipart, network, network-uri, parsec, time, xhtml - }: - mkDerivation { - pname = "cgi"; - version = "3001.3.0.3"; - sha256 = "1rml686pvjhpd51vj6g79c6132m8kx6kxikk7g246imps3bl90gb"; - revision = "3"; - editedCabalFile = "06gyp3mxx9jkkbz9sbn389wjsz33s231vk53pbsm37a1z9ply14a"; - libraryHaskellDepends = [ - base bytestring containers exceptions mtl multipart network - network-uri parsec time xhtml - ]; - description = "A library for writing CGI programs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cgi_3001_4_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, mtl , multipart, network-uri, parsec, time, xhtml }: @@ -48966,7 +48544,6 @@ self: { ]; description = "A library for writing CGI programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cgi-undecidable" = callPackage @@ -49547,19 +49124,6 @@ self: { }) {}; "checkers" = callPackage - ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: - mkDerivation { - pname = "checkers"; - version = "0.4.14"; - sha256 = "0pnb7xdhaq4rw28hd4cz1b04w52ffjghw3x9zchiwm4h8hwhvibz"; - libraryHaskellDepends = [ - array base QuickCheck random semigroupoids - ]; - description = "Check properties on standard classes and data structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "checkers_0_5_0" = callPackage ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: mkDerivation { pname = "checkers"; @@ -49570,7 +49134,6 @@ self: { ]; description = "Check properties on standard classes and data structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "checkmate" = callPackage @@ -49792,6 +49355,8 @@ self: { libraryToolDepends = [ c2hs ]; description = "Haskell bindings for Chipmunk2D physics engine"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chitauri" = callPackage @@ -52041,18 +51606,6 @@ self: { }) {}; "clock" = callPackage - ({ mkDerivation, base, tasty, tasty-quickcheck }: - mkDerivation { - pname = "clock"; - version = "0.7.2"; - sha256 = "07v91s20halsqjmziqb1sqjp2sjpckl9by7y28aaklwqi2bh2rl8"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base tasty tasty-quickcheck ]; - description = "High-resolution clock functions: monotonic, realtime, cputime"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "clock_0_8" = callPackage ({ mkDerivation, base, criterion, tasty, tasty-quickcheck }: mkDerivation { pname = "clock"; @@ -52063,7 +51616,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "High-resolution clock functions: monotonic, realtime, cputime"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clock-extras" = callPackage @@ -52538,23 +52090,6 @@ self: { }) {}; "cmark" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, cheapskate - , criterion, discount, HUnit, markdown, sundown, text - }: - mkDerivation { - pname = "cmark"; - version = "0.5.6.3"; - sha256 = "09vzb6hsh20ykr7z7vb5af1m68w0aj0yah39kjqkwbahsq2y5qpf"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ base HUnit text ]; - benchmarkHaskellDepends = [ - base blaze-html cheapskate criterion discount markdown sundown text - ]; - description = "Fast, accurate CommonMark (Markdown) parser and renderer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cmark_0_6" = callPackage ({ mkDerivation, base, blaze-html, bytestring, cheapskate , criterion, discount, HUnit, markdown, sundown, text }: @@ -52569,27 +52104,9 @@ self: { ]; description = "Fast, accurate CommonMark (Markdown) parser and renderer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cmark-gfm" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, cheapskate - , criterion, discount, HUnit, markdown, sundown, text - }: - mkDerivation { - pname = "cmark-gfm"; - version = "0.1.8"; - sha256 = "0z5zkhax975b3ih71x846n09zrhqb7j4pn6rmfv6p4q8gncrrv9l"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ base HUnit text ]; - benchmarkHaskellDepends = [ - base blaze-html cheapskate criterion discount markdown sundown text - ]; - description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cmark-gfm_0_2_0" = callPackage ({ mkDerivation, base, blaze-html, bytestring, cheapskate , criterion, discount, HUnit, markdown, sundown, text }: @@ -52604,7 +52121,6 @@ self: { ]; description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cmark-highlight" = callPackage @@ -52621,6 +52137,8 @@ self: { ]; description = "Code highlighting for cmark"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cmark-lucid" = callPackage @@ -52645,6 +52163,8 @@ self: { libraryHaskellDepends = [ base cmark ]; description = "Pattern synonyms for cmark"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cmark-sections" = callPackage @@ -52839,6 +52359,20 @@ self: { broken = true; }) {cmph = null;}; + "cmptype" = callPackage + ({ mkDerivation, base, ghc, magic-tyfams, should-not-typecheck }: + mkDerivation { + pname = "cmptype"; + version = "0.2.0.0"; + sha256 = "0pkflrrwrwks7qjw3rpqnrk1k3p1dw4dq75cqzq12m356m3a2fpc"; + libraryHaskellDepends = [ base ghc magic-tyfams ]; + testHaskellDepends = [ + base ghc magic-tyfams should-not-typecheck + ]; + description = "Compare types of any kinds"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cmt" = callPackage ({ mkDerivation, attoparsec, base, classy-prelude, containers , directory, file-embed, filepath, process, tasty, tasty-discover @@ -52945,31 +52479,6 @@ self: { }) {}; "co-log" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, co-log-core - , containers, contravariant, directory, filepath, markdown-unlit - , mtl, stm, text, time, transformers, typerep-map - }: - mkDerivation { - pname = "co-log"; - version = "0.2.0"; - sha256 = "1xd83srrm659nf2s2xrm3zjg6zhrmhvj6s6mwx4axrgvnxf2lbjr"; - revision = "1"; - editedCabalFile = "0np7g6sqm6iyjyrypwlgrz67n0vhasvgp1k6cwrcj2lnmvjcrmvl"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base bytestring co-log-core containers contravariant - directory filepath mtl stm text time transformers typerep-map - ]; - executableHaskellDepends = [ base text typerep-map ]; - executableToolDepends = [ markdown-unlit ]; - description = "Composable Contravariant Comonadic Logging Library"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "co-log_0_3_0_0" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, chronos , co-log-core, containers, contravariant, directory, filepath , hedgehog, markdown-unlit, mtl, stm, text, transformers @@ -53000,18 +52509,6 @@ self: { }) {}; "co-log-core" = callPackage - ({ mkDerivation, base, doctest }: - mkDerivation { - pname = "co-log-core"; - version = "0.1.1"; - sha256 = "00qkkycxm4dmqpacbhi50kk9dyhd96b0d6csxs75pm4xy337205w"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - description = "Composable Contravariant Comonadic Logging Library"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "co-log-core_0_2_0_0" = callPackage ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "co-log-core"; @@ -53021,7 +52518,6 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "Composable Contravariant Comonadic Logging Library"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "co-log-polysemy" = callPackage @@ -53366,6 +52862,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "coercion-extras" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "coercion-extras"; + version = "0.1.0.0"; + sha256 = "051gh93yncgclmi5i16rm07wg7v0zqz7s1q40h50vny39glsgwc7"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base containers ]; + description = "Extra utilities for manipulating nominal and representational coercions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cofunctor" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -53643,6 +53151,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Collection+JSON—Hypermedia Type Tools"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "collections" = callPackage @@ -55554,22 +55064,6 @@ self: { }) {}; "concurrency" = callPackage - ({ mkDerivation, array, atomic-primops, base, exceptions - , monad-control, mtl, stm, transformers - }: - mkDerivation { - pname = "concurrency"; - version = "1.6.2.0"; - sha256 = "004h1wxdgqpxpk9vcvds759pn5qdp873b4bidakffxgh35nkxr68"; - libraryHaskellDepends = [ - array atomic-primops base exceptions monad-control mtl stm - transformers - ]; - description = "Typeclasses, functions, and data types for concurrency and STM"; - license = stdenv.lib.licenses.mit; - }) {}; - - "concurrency_1_7_0_0" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: @@ -55583,7 +55077,6 @@ self: { ]; description = "Typeclasses, functions, and data types for concurrency and STM"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrency-benchmarks" = callPackage @@ -55673,6 +55166,8 @@ self: { testHaskellDepends = [ async base dns hspec ]; description = "Concurrent DNS cache"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "concurrent-extra" = callPackage @@ -55716,22 +55211,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.9"; - sha256 = "0mwf155w89nbbkjln7hhbn8k3f8p0ylcvgrg31cm7ijpx4499i4c"; - 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_10" = callPackage ({ mkDerivation, ansi-terminal, async, base, directory, exceptions , process, stm, terminal-size, text, transformers, unix }: @@ -55745,7 +55224,6 @@ self: { ]; description = "Ungarble output from several threads or commands"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrent-rpc" = callPackage @@ -56190,34 +55668,6 @@ self: { }) {}; "conduit-extra" = callPackage - ({ mkDerivation, async, attoparsec, base, bytestring - , bytestring-builder, conduit, directory, exceptions, filepath - , gauge, hspec, network, primitive, process, QuickCheck, resourcet - , stm, streaming-commons, text, transformers, transformers-base - , typed-process, unliftio-core - }: - mkDerivation { - pname = "conduit-extra"; - version = "1.3.3"; - sha256 = "037k62w01iskzkg0mw4rk8dp2szshzwskgsc3shffhbkqk654ksm"; - libraryHaskellDepends = [ - async attoparsec base bytestring conduit directory filepath network - primitive process resourcet stm streaming-commons text transformers - typed-process unliftio-core - ]; - testHaskellDepends = [ - async attoparsec base bytestring bytestring-builder conduit - directory exceptions filepath hspec process QuickCheck resourcet - stm streaming-commons text transformers transformers-base - ]; - benchmarkHaskellDepends = [ - base bytestring bytestring-builder conduit gauge transformers - ]; - description = "Batteries included conduit: adapters for common libraries"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit-extra_1_3_4" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring , bytestring-builder, conduit, directory, exceptions, filepath , gauge, hspec, network, primitive, process, QuickCheck, resourcet @@ -56243,7 +55693,6 @@ self: { ]; description = "Batteries included conduit: adapters for common libraries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-find" = callPackage @@ -56519,41 +55968,6 @@ self: { }) {}; "confcrypt" = callPackage - ({ mkDerivation, amazonka, amazonka-kms, base, base64-bytestring - , bytestring, conduit, containers, crypto-pubkey-openssh - , crypto-pubkey-types, cryptonite, deepseq, HUnit, lens, megaparsec - , memory, mtl, optparse-applicative, parser-combinators, QuickCheck - , tasty, tasty-hunit, tasty-quickcheck, text, transformers - }: - mkDerivation { - pname = "confcrypt"; - version = "0.1.0.4"; - sha256 = "1c25xjpnw802pqfjksx5fxjq9ynwfjkkmyad169bvfasry98cdbb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - amazonka amazonka-kms base base64-bytestring bytestring conduit - containers crypto-pubkey-openssh crypto-pubkey-types cryptonite - deepseq lens megaparsec mtl optparse-applicative parser-combinators - text transformers - ]; - executableHaskellDepends = [ - amazonka amazonka-kms base base64-bytestring bytestring conduit - containers crypto-pubkey-openssh crypto-pubkey-types cryptonite - deepseq lens megaparsec mtl optparse-applicative parser-combinators - text transformers - ]; - testHaskellDepends = [ - amazonka amazonka-kms base base64-bytestring bytestring conduit - containers crypto-pubkey-openssh crypto-pubkey-types cryptonite - deepseq HUnit lens megaparsec memory mtl optparse-applicative - parser-combinators QuickCheck tasty tasty-hunit tasty-quickcheck - text transformers - ]; - license = stdenv.lib.licenses.mit; - }) {}; - - "confcrypt_0_2_3_3" = callPackage ({ mkDerivation, amazonka, amazonka-kms, base, base64-bytestring , bytestring, conduit, containers, crypto-pubkey-openssh , crypto-pubkey-types, cryptonite, deepseq, HUnit, lens, megaparsec @@ -56587,6 +56001,7 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "confetti" = callPackage @@ -57021,25 +56436,6 @@ self: { }) {}; "connection" = callPackage - ({ mkDerivation, base, byteable, bytestring, containers - , data-default-class, network, socks, tls, x509, x509-store - , x509-system, x509-validation - }: - mkDerivation { - pname = "connection"; - version = "0.2.8"; - sha256 = "1swkb9w5vx9ph7x55y51dc0srj2z27nd9ibgn8c0qcl6hx7g9cbh"; - revision = "2"; - editedCabalFile = "0bhwcd9dqa2jk23bdz3z3vn2p1gzssinp96dxzznb7af4y5x2gmk"; - libraryHaskellDepends = [ - base byteable bytestring containers data-default-class network - socks tls x509 x509-store x509-system x509-validation - ]; - description = "Simple and easy network connections API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "connection_0_3_0" = callPackage ({ mkDerivation, base, basement, bytestring, containers , data-default-class, network, socks, tls, x509, x509-store , x509-system, x509-validation @@ -57056,7 +56452,6 @@ self: { ]; description = "Simple and easy network connections API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "connection-pool" = callPackage @@ -57276,8 +56671,6 @@ self: { libraryHaskellDepends = [ base category unconstrained ]; description = "Reified constraints"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "constraint-classes" = callPackage @@ -57313,8 +56706,6 @@ self: { libraryHaskellDepends = [ base category constraint reflection ]; description = "Constraint reflection"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "constraints" = callPackage @@ -58365,6 +57756,8 @@ self: { ]; description = "A stream DSL for writing embedded C programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "copilot-c99" = callPackage @@ -58429,6 +57822,8 @@ self: { ]; description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "copilot-libraries" = callPackage @@ -58444,6 +57839,8 @@ self: { ]; description = "Libraries for the Copilot language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "copilot-sbv" = callPackage @@ -58478,6 +57875,8 @@ self: { ]; description = "k-induction for Copilot"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "copr" = callPackage @@ -59076,8 +58475,6 @@ 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 @@ -59292,35 +58689,6 @@ self: { }) {}; "cql-io" = callPackage - ({ mkDerivation, async, auto-update, base, bytestring, containers - , cql, cryptohash, data-default-class, Decimal, exceptions - , hashable, HsOpenSSL, iproute, lens, monad-control, mtl - , mwc-random, network, raw-strings-qq, retry, semigroups, stm - , tasty, tasty-hunit, text, time, tinylog, transformers - , transformers-base, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "cql-io"; - version = "1.0.1.1"; - sha256 = "1kdv00fv21s8vbb3dfgzlgsrr0xxl4p2h655ga3q5cg47by564xc"; - libraryHaskellDepends = [ - async auto-update base bytestring containers cql cryptohash - data-default-class exceptions hashable HsOpenSSL iproute lens - monad-control mtl mwc-random network retry semigroups stm text time - tinylog transformers transformers-base unordered-containers uuid - vector - ]; - testHaskellDepends = [ - base containers cql Decimal iproute mtl raw-strings-qq tasty - tasty-hunit text time tinylog uuid - ]; - description = "Cassandra CQL client"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "cql-io_1_1_1" = callPackage ({ mkDerivation, async, auto-update, base, bytestring, containers , cql, cryptonite, data-default-class, Decimal, exceptions , hashable, HsOpenSSL, iproute, lens, mtl, mwc-random, network @@ -60065,6 +59433,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "criterion-measurement_0_1_2_0" = callPackage + ({ mkDerivation, aeson, base, base-compat, binary, containers + , deepseq, vector + }: + mkDerivation { + pname = "criterion-measurement"; + version = "0.1.2.0"; + sha256 = "03p71mfnnfjx9dnf0yhrhdcr30zc2nwn5f8lql48cabccpd3793l"; + libraryHaskellDepends = [ + aeson base base-compat binary containers deepseq vector + ]; + description = "Criterion measurement functionality and associated types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "criterion-plus" = callPackage ({ mkDerivation, base, criterion, deepseq, HTF, HUnit, loch-th , monad-control, mtl, optparse-applicative, placeholders @@ -60920,6 +60304,8 @@ self: { ]; description = "Cryptol: The Language of Cryptography"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cryptonite" = callPackage @@ -61079,6 +60465,8 @@ self: { ]; description = "Connection-set algebra (CSA) library"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cse-ghc-plugin" = callPackage @@ -61527,26 +60915,6 @@ self: { }) {}; "cubicbezier" = callPackage - ({ mkDerivation, base, containers, fast-math, integration, matrices - , microlens, microlens-mtl, microlens-th, mtl, parsec, tasty - , tasty-hunit, vector, vector-space - }: - mkDerivation { - pname = "cubicbezier"; - version = "0.6.0.5"; - sha256 = "0n17nr20skrds3b9gzy0v86jgnqz8zbds796n9cl0z6rh9bq5jf5"; - revision = "1"; - editedCabalFile = "0dii4z0cl1ylvay1n5z90d6rbvnk9k30q81i6izhgxbgdawwhh33"; - libraryHaskellDepends = [ - base containers fast-math integration matrices microlens - microlens-mtl microlens-th mtl vector vector-space - ]; - testHaskellDepends = [ base parsec tasty tasty-hunit ]; - description = "Efficient manipulating of 2D cubic bezier curves"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cubicbezier_0_6_0_6" = callPackage ({ mkDerivation, base, containers, fast-math, integration, matrices , microlens, microlens-mtl, microlens-th, mtl, parsec, tasty , tasty-hunit, vector, vector-space @@ -61562,7 +60930,6 @@ self: { testHaskellDepends = [ base parsec tasty tasty-hunit ]; description = "Efficient manipulating of 2D cubic bezier curves"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cubicspline" = callPackage @@ -61977,8 +61344,8 @@ self: { }: mkDerivation { pname = "cursor"; - version = "0.0.0.1"; - sha256 = "0iq83v3yp7rj1fn82qkwakxi180nri50irzf8p8bzi558c6b3bmr"; + version = "0.1.0.1"; + sha256 = "1ipwk9lnazhkzy4fxdc4y0hqa1vdlgda43jdjnp9j00q5fgrhldz"; libraryHaskellDepends = [ base containers microlens text validity validity-containers validity-text @@ -61987,6 +61354,16 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cursor-brick" = callPackage + ({ mkDerivation, base, brick, cursor }: + mkDerivation { + pname = "cursor-brick"; + version = "0.0.0.0"; + sha256 = "1cbby07x8d8pr3j07s9hl78xx8zd2va4g06xjb2qkjd2ffs705gb"; + libraryHaskellDepends = [ base brick cursor ]; + license = stdenv.lib.licenses.mit; + }) {}; + "cursor-gen" = callPackage ({ mkDerivation, base, containers, cursor, genvalidity , genvalidity-containers, genvalidity-hspec @@ -61995,8 +61372,8 @@ self: { }: mkDerivation { pname = "cursor-gen"; - version = "0.0.0.0"; - sha256 = "10jxxy3dx2gsddmq4l95ddim4cj85l7l76lamhgqlhx6zw4j7d52"; + version = "0.1.0.0"; + sha256 = "1f9s1da9vf8sr27aidk3rgvkn594pv94w4gqqyi6ikl5dx8yzqxn"; libraryHaskellDepends = [ base containers cursor genvalidity genvalidity-containers genvalidity-text QuickCheck text @@ -62007,8 +61384,6 @@ self: { ]; description = "Generators for Purely Functional Cursors"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "curve25519" = callPackage @@ -63774,6 +63149,8 @@ self: { ]; description = "Interval datatype, interval arithmetic and interval-based containers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-inttrie" = callPackage @@ -64406,8 +63783,6 @@ self: { ]; description = "An efficient implementation of maps from strings to arbitrary values"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "data-structure-inferrer" = callPackage @@ -65810,8 +65185,8 @@ self: { }: mkDerivation { pname = "debian"; - version = "3.95"; - sha256 = "1qbg1kya1a8ysmbls44hcwqlv7kr9cnlpnxwqv4pixamraqhqx1i"; + version = "3.95.1"; + sha256 = "1sfvjq9vilibvvcpm404z6j64ic54bd1s7yri8plfg849miynh95"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66485,22 +65860,6 @@ self: { }) {}; "dejafu" = callPackage - ({ mkDerivation, base, concurrency, containers, contravariant - , deepseq, exceptions, leancheck, profunctors, random, transformers - }: - mkDerivation { - pname = "dejafu"; - version = "1.11.0.5"; - sha256 = "18pcjk60r1q798qba285g20fh8v5q2qphgpx3r0a0yy7p1qnjwv2"; - 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_0" = callPackage ({ mkDerivation, base, concurrency, containers, contravariant , deepseq, exceptions, leancheck, profunctors, random, transformers }: @@ -66514,7 +65873,6 @@ self: { ]; description = "A library for unit-testing concurrent programs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "deka" = callPackage @@ -66877,12 +66235,12 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "dependent-sum_0_6_1" = callPackage + "dependent-sum_0_6_2_0" = callPackage ({ mkDerivation, base, constraints-extras }: mkDerivation { pname = "dependent-sum"; - version = "0.6.1"; - sha256 = "077pq10kldxk47zlrz022a1m7a5qpr2xa2wapa01xa2hrlgv5xh4"; + version = "0.6.2.0"; + sha256 = "17xj5mfrqbhf614z25l2km5grhrxh1rfhb8h8g677sv2xgxrv82d"; libraryHaskellDepends = [ base constraints-extras ]; description = "Dependent sum type"; license = stdenv.lib.licenses.publicDomain; @@ -67029,23 +66387,6 @@ self: { }) {}; "deque" = callPackage - ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase - , tasty, tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "deque"; - version = "0.2.7"; - sha256 = "1wshylwnajw3hhqnnb72rlb05m91br57gf32770xi2h4r0h30lcr"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "Double-ended queue"; - license = stdenv.lib.licenses.mit; - }) {}; - - "deque_0_4_2_3" = callPackage ({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances , rerebase, strict-list, tasty, tasty-hunit, tasty-quickcheck }: @@ -67060,7 +66401,6 @@ self: { ]; description = "Double-ended queues"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dequeue" = callPackage @@ -67075,6 +66415,8 @@ self: { testHaskellDepends = [ base Cabal cabal-test-quickcheck ]; description = "A typeclass and an implementation for double-ended queues"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "derangement" = callPackage @@ -67123,6 +66465,8 @@ self: { executableHaskellDepends = [ base ]; description = "A program and library to derive instances for data types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "derive-IG" = callPackage @@ -67691,38 +67035,42 @@ self: { }) {}; "dhall" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive - , cborg, containers, contravariant, criterion, cryptonite, deepseq - , Diff, directory, doctest, dotgen, exceptions, filepath, haskeline + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base + , bytestring, case-insensitive, cborg, cborg-json, containers + , contravariant, criterion, cryptonite, deepseq, Diff, directory + , doctest, dotgen, exceptions, filepath, foldl, haskeline , http-client, http-client-tls, http-types, lens-family-core , megaparsec, memory, mockery, mtl, optparse-applicative, parsers - , prettyprinter, prettyprinter-ansi-terminal, QuickCheck - , quickcheck-instances, repline, scientific, serialise, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, text - , transformers, unordered-containers, uri-encode, vector + , prettyprinter, prettyprinter-ansi-terminal, profunctors + , QuickCheck, quickcheck-instances, repline, scientific, serialise + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , transformers, transformers-compat, turtle, unordered-containers + , uri-encode, vector }: mkDerivation { pname = "dhall"; - version = "1.19.1"; - sha256 = "14fjfwsirf8l7wirv590ix01liyd0xbhqy4h7pjblyy62m22mlzq"; - revision = "1"; - editedCabalFile = "193h4dmlz1asfr1ldy0saa9spgp64xh60xh3yywzn9lz0hxzbfpg"; + version = "1.24.0"; + sha256 = "1n04jk45qjl00wx7gxzp36j7d1m1ca7h7y4qlp8gxhykpkr6zzv7"; + revision = "2"; + editedCabalFile = "10ki70113z1kgq35xaib7qwrpzjl93hq4qxm0qb62d3pvaf4wp15"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal base bytestring case-insensitive cborg containers - contravariant cryptonite Diff directory dotgen exceptions filepath - haskeline http-client http-client-tls http-types lens-family-core - megaparsec memory mtl optparse-applicative parsers prettyprinter - prettyprinter-ansi-terminal repline scientific serialise - template-haskell text transformers unordered-containers uri-encode - vector + aeson aeson-pretty ansi-terminal base bytestring case-insensitive + cborg cborg-json containers contravariant cryptonite Diff directory + dotgen exceptions filepath haskeline http-client http-client-tls + http-types lens-family-core megaparsec memory mtl + optparse-applicative parsers prettyprinter + prettyprinter-ansi-terminal profunctors repline scientific + serialise template-haskell text transformers transformers-compat + unordered-containers uri-encode vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base containers deepseq directory doctest filepath mockery - prettyprinter QuickCheck quickcheck-instances serialise tasty - tasty-hunit tasty-quickcheck text transformers vector + base bytestring cborg containers deepseq directory doctest filepath + foldl megaparsec mockery prettyprinter QuickCheck + quickcheck-instances serialise tasty tasty-hunit tasty-quickcheck + text transformers turtle vector ]; benchmarkHaskellDepends = [ base bytestring containers criterion directory serialise text @@ -67782,8 +67130,8 @@ self: { }: mkDerivation { pname = "dhall-bash"; - version = "1.0.18"; - sha256 = "036ccz1kwhavl03q5lh14dxic8gjqb5cw14aws6a53gpk6p4vvff"; + version = "1.0.21"; + sha256 = "06rv0wrs1ym6szy78wg3nyfwaqm279vy6m7zny9s90lnpa6dc098"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -67839,30 +67187,35 @@ self: { }) {}; "dhall-json" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall - , optparse-applicative, tasty, tasty-hunit, text - , unordered-containers, vector, yaml + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , dhall, exceptions, lens, libyaml, optparse-applicative + , scientific, tasty, tasty-hunit, text, unordered-containers + , vector, yaml }: mkDerivation { pname = "dhall-json"; - version = "1.2.6"; - sha256 = "0f18kn15v8pzkdayj2hql28fbba9i75msbi41yscik40lw2sg2cr"; + version = "1.3.0"; + sha256 = "176i30shaklranbhmb4m4zqn13cn9hd6lqiqdjv9qmckkapbkjpi"; revision = "1"; - editedCabalFile = "1x6dgsqcgd8mvqwqq53aj8xgnfin6c66wn8vc7ikxiy0gilp686x"; + editedCabalFile = "101xfp3zg9i7qyibknjpcdhha8sc024xmylphiwb509h3fjy3yks"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base dhall optparse-applicative text unordered-containers + aeson aeson-pretty base bytestring containers dhall exceptions lens + libyaml optparse-applicative scientific text unordered-containers + vector yaml ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring dhall optparse-applicative text - vector yaml + aeson aeson-pretty base bytestring dhall exceptions + optparse-applicative text ]; testHaskellDepends = [ aeson base bytestring dhall tasty tasty-hunit text ]; - description = "Compile Dhall to JSON or YAML"; + description = "Convert between Dhall and JSON or YAML"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dhall-json_1_4_0" = callPackage @@ -67893,6 +67246,7 @@ self: { description = "Convert between Dhall and JSON or YAML"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dhall-lex" = callPackage @@ -69242,6 +68596,8 @@ self: { ]; description = "Happstack backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "digestive-functors-heist" = callPackage @@ -69340,6 +68696,8 @@ self: { ]; description = "A data-type representing digits 0-9 and other combinations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "digitalocean-kzs" = callPackage @@ -69991,6 +69349,8 @@ self: { executableHaskellDepends = [ base text ]; description = "Write bots for Discord in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "discord-hs" = callPackage @@ -71214,6 +70574,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dlist_0_8_0_7" = callPackage + ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: + mkDerivation { + pname = "dlist"; + version = "0.8.0.7"; + sha256 = "0b5spkzvj2kx8pk86xz0djkxs13j7dryf5fl16dk4mlp1wh6mh53"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base Cabal QuickCheck ]; + description = "Difference lists"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dlist-instances" = callPackage ({ mkDerivation, base, dlist, semigroups }: mkDerivation { @@ -71289,6 +70662,8 @@ self: { ]; description = "AVAYA DMCC API bindings and WebSockets server for AVAYA"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dmenu" = callPackage @@ -71366,31 +70741,6 @@ self: { }) {}; "dns" = callPackage - ({ mkDerivation, async, attoparsec, auto-update, base - , base64-bytestring, binary, bytestring, containers, cryptonite - , doctest, hspec, iproute, mtl, network, psqueues, QuickCheck, safe - , time, word8 - }: - mkDerivation { - pname = "dns"; - version = "3.0.4"; - sha256 = "1aa4zb9zkk244rndimrq8maxj9qrmz3rb13v9n8jblmp6ssk6d3v"; - revision = "1"; - editedCabalFile = "15jafrm919w4p23m7kpmyc1yvzpy88jcccycc00dza69d119zjdr"; - libraryHaskellDepends = [ - async attoparsec auto-update base base64-bytestring binary - bytestring containers cryptonite iproute mtl network psqueues safe - time - ]; - testHaskellDepends = [ - base bytestring doctest hspec iproute network QuickCheck word8 - ]; - testTarget = "spec"; - description = "DNS library in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dns_4_0_0" = callPackage ({ mkDerivation, array, async, attoparsec, auto-update, base , base16-bytestring, base64-bytestring, bytestring, Cabal , cabal-doctest, containers, cryptonite, doctest, hourglass, hspec @@ -71412,7 +70762,6 @@ self: { testTarget = "spec"; description = "DNS library in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dnscache" = callPackage @@ -71602,6 +70951,8 @@ self: { ]; description = "An API client for docker written in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "docker-build-cacher" = callPackage @@ -71751,35 +71102,6 @@ self: { }) {}; "doctest" = callPackage - ({ mkDerivation, base, base-compat, code-page, deepseq, directory - , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process - , QuickCheck, setenv, silently, stringbuilder, syb, transformers - , with-location - }: - mkDerivation { - pname = "doctest"; - version = "0.16.0.1"; - sha256 = "106pc4rs4cfym7754gzdgy36dm9aidwmnqpjm9k7yq1hfd4pallv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat code-page deepseq directory filepath ghc ghc-paths - process syb transformers - ]; - executableHaskellDepends = [ - base base-compat code-page deepseq directory filepath ghc ghc-paths - process syb transformers - ]; - testHaskellDepends = [ - base base-compat code-page deepseq directory filepath ghc ghc-paths - hspec HUnit mockery process QuickCheck setenv silently - stringbuilder syb transformers with-location - ]; - description = "Test interactive Haskell examples"; - license = stdenv.lib.licenses.mit; - }) {}; - - "doctest_0_16_1" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process , QuickCheck, setenv, silently, stringbuilder, syb, transformers @@ -71805,7 +71127,6 @@ self: { ]; description = "Test interactive Haskell examples"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctest-discover" = callPackage @@ -71936,8 +71257,6 @@ self: { ]; description = "Client bindings for the DocuSign API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "docusign-example" = callPackage @@ -72212,39 +71531,11 @@ self: { executableHaskellDepends = [ base containers graphviz hxt text ]; description = "Converter from GraphViz .dot format to yEd GraphML"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "dotenv" = callPackage - ({ mkDerivation, base, base-compat, containers, directory - , exceptions, hspec, hspec-megaparsec, megaparsec - , optparse-applicative, process, text, transformers, yaml - }: - mkDerivation { - pname = "dotenv"; - version = "0.8.0.0"; - sha256 = "0b1pz7wh5kf0sjkig0y4ks6i2z5yzpvlnd6hgzl0sj4j6w2j35ly"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base base-compat containers directory exceptions megaparsec process - text transformers yaml - ]; - executableHaskellDepends = [ - base base-compat megaparsec optparse-applicative process text - transformers yaml - ]; - testHaskellDepends = [ - base base-compat containers directory exceptions hspec - hspec-megaparsec megaparsec process text transformers yaml - ]; - description = "Loads environment variables from dotenv files"; - license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; - "dotenv_0_8_0_2" = callPackage + "dotenv" = callPackage ({ mkDerivation, base, base-compat, containers, directory , exceptions, hspec, hspec-megaparsec, megaparsec , optparse-applicative, process, text, transformers, yaml @@ -72424,6 +71715,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "A proof assistant for Magic: The Gathering puzzles"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dow" = callPackage @@ -73799,8 +73092,6 @@ self: { ]; description = "Draw and update graphs in real time with OpenGL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dynamic-graphs" = callPackage @@ -74365,6 +73656,8 @@ self: { ]; description = "A handy tool for uploading unikernels to Amazon's EC2"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "eccrypto" = callPackage @@ -75126,6 +74419,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "either-both_0_1_1_0" = callPackage + ({ mkDerivation, base, either-prime, smallcheck, tasty + , tasty-smallcheck + }: + mkDerivation { + pname = "either-both"; + version = "0.1.1.0"; + sha256 = "1dcr4pygk86rks764xcgfp8l6y3c11ycz0xaibxj00hy2zijzg8k"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base either-prime smallcheck tasty tasty-smallcheck + ]; + description = "Either or both"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {either-prime = null;}; + "either-list-functions" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { @@ -75230,6 +74541,8 @@ self: { ]; description = "An ekg backend for Amazon Cloudwatch"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ekg-core" = callPackage @@ -75354,6 +74667,8 @@ self: { testHaskellDepends = [ base ]; description = "Easily expose your EKG metrics to Prometheus"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ekg-push" = callPackage @@ -75511,18 +74826,6 @@ self: { }) {}; "elf" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, hspec }: - mkDerivation { - pname = "elf"; - version = "0.29"; - sha256 = "1b4g98fk1p8mk0zdh6fwzm3vnzcrhvpysx4g4ahcbgbr4bqhjra2"; - libraryHaskellDepends = [ base binary bytestring ]; - testHaskellDepends = [ base bytestring containers hspec ]; - description = "An Elf parser"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "elf_0_30" = callPackage ({ mkDerivation, base, binary, bytestring, containers, hspec }: mkDerivation { pname = "elf"; @@ -75532,7 +74835,6 @@ self: { testHaskellDepends = [ base bytestring containers hspec ]; description = "An Elf parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "eliminators" = callPackage @@ -76032,6 +75334,8 @@ self: { testHaskellDepends = [ base directory filepath tasty tasty-hunit ]; description = "A tiny language for understanding the lambda-calculus"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "emacs-keys" = callPackage @@ -76566,8 +75870,6 @@ self: { ]; description = "An @engine-io@ @ServerAPI@ that is compatible with @Wai@"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "engine-io-yesod" = callPackage @@ -76681,22 +75983,6 @@ self: { }) {}; "enum-text" = callPackage - ({ mkDerivation, array, base, bytestring, fmt, hashable, possibly - , text, time, unordered-containers - }: - mkDerivation { - pname = "enum-text"; - version = "0.5.0.0"; - sha256 = "0yg7rkbw1swr1mwkkkybrbs9prx1jj72af4rsx7jcb1zpzzarfs4"; - libraryHaskellDepends = [ - array base bytestring fmt hashable possibly text time - unordered-containers - ]; - description = "A text rendering and parsing toolkit for enumerated types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "enum-text_0_5_1_0" = callPackage ({ mkDerivation, array, base, bytestring, fmt, hashable, possibly , text, time, unordered-containers }: @@ -76710,7 +75996,6 @@ self: { ]; description = "A text rendering and parsing toolkit for enumerated types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "enum-text-rio" = callPackage @@ -76727,8 +76012,6 @@ self: { ]; description = "Making fmt available with rio"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "enum-types" = callPackage @@ -76916,26 +76199,6 @@ self: { }) {}; "enummapset" = callPackage - ({ mkDerivation, array, base, containers, deepseq, ghc-prim, HUnit - , QuickCheck, semigroups, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "enummapset"; - version = "0.6.0.1"; - sha256 = "0nljpb5fxk4piwl5mh1v23ps9bzhxxcybfhd8mmb66k20gxxxf7q"; - libraryHaskellDepends = [ base containers deepseq semigroups ]; - testHaskellDepends = [ - array base containers deepseq ghc-prim HUnit QuickCheck semigroups - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - description = "IntMap and IntSet with Enum keys/elements"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "enummapset_0_6_0_2" = callPackage ({ mkDerivation, array, base, containers, deepseq, ghc-prim, HUnit , QuickCheck, semigroups, test-framework, test-framework-hunit , test-framework-quickcheck2 @@ -76951,8 +76214,6 @@ self: { ]; description = "IntMap and IntSet with Enum keys/elements"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "enummapset-th" = callPackage @@ -77067,25 +76328,6 @@ self: { }) {}; "envy" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec, mtl - , QuickCheck, quickcheck-instances, text, time, transformers - }: - mkDerivation { - pname = "envy"; - version = "1.5.1.0"; - sha256 = "1r2181n5ayww1ycg7vvz5pp5cyxs6asljf4kir7g80qnj2wwpjid"; - libraryHaskellDepends = [ - base bytestring containers mtl text time transformers - ]; - testHaskellDepends = [ - base bytestring hspec mtl QuickCheck quickcheck-instances text time - transformers - ]; - description = "An environmentally friendly way to deal with environment variables"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "envy_2_0_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, hspec, mtl , QuickCheck, quickcheck-instances, text, time, transformers }: @@ -77102,7 +76344,6 @@ self: { ]; description = "An environmentally friendly way to deal with environment variables"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "epanet-haskell" = callPackage @@ -77926,8 +77167,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "2.6.0"; - sha256 = "1asbvcjmbyd44rfs8a645cvfqmf95b6hnb3l7lqd56kv32km69nn"; + version = "3.0.0"; + sha256 = "187c098h2xyf2nhifkdy2bqfl6iap7a93mzwd2kirl5yyicpc9zy"; libraryHaskellDepends = [ base blaze-html bytestring conduit monad-logger persistent resourcet tagged text time transformers unliftio @@ -77944,29 +77185,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "esqueleto_3_0_0" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, conduit, containers - , hspec, monad-logger, mysql, mysql-simple, persistent - , persistent-mysql, persistent-postgresql, persistent-sqlite - , persistent-template, postgresql-libpq, postgresql-simple - , resourcet, tagged, text, time, transformers, unliftio - , unordered-containers + "esqueleto_3_1_0" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit + , containers, exceptions, hspec, monad-logger, mysql, mysql-simple + , persistent, persistent-mysql, persistent-postgresql + , persistent-sqlite, persistent-template, postgresql-libpq + , postgresql-simple, resourcet, tagged, text, time, transformers + , unliftio, unordered-containers, vector }: mkDerivation { pname = "esqueleto"; - version = "3.0.0"; - sha256 = "187c098h2xyf2nhifkdy2bqfl6iap7a93mzwd2kirl5yyicpc9zy"; + version = "3.1.0"; + sha256 = "0x3hrh5ymv19l52634q18hsmxjranngc32ig6b2lbd5lz8d6iigy"; libraryHaskellDepends = [ - base blaze-html bytestring conduit monad-logger persistent + aeson base blaze-html bytestring conduit monad-logger persistent resourcet tagged text time transformers unliftio unordered-containers ]; testHaskellDepends = [ - base blaze-html bytestring conduit containers hspec monad-logger - mysql mysql-simple persistent persistent-mysql + aeson base blaze-html bytestring conduit containers exceptions + hspec monad-logger mysql mysql-simple persistent persistent-mysql persistent-postgresql persistent-sqlite persistent-template postgresql-libpq postgresql-simple resourcet tagged text time - transformers unliftio unordered-containers + transformers unliftio unordered-containers vector ]; description = "Type-safe EDSL for SQL queries on persistent backends"; license = stdenv.lib.licenses.bsd3; @@ -78413,6 +77654,8 @@ self: { ]; description = "Euler tour trees"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "euphoria" = callPackage @@ -78833,6 +78076,8 @@ self: { ]; description = "Provides common test specification for Store implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "eventsource-stub-store" = callPackage @@ -78854,6 +78099,8 @@ self: { ]; description = "An in-memory stub store implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "eventsourced" = callPackage @@ -78878,43 +78125,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, machines - , 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.2.4"; - sha256 = "057nxlq78v3fzby9b0506gb85rlsv3j7q98y5asnv92n5i2barxm"; - 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 machines - 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_0" = callPackage ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring , cereal, clock, connection, containers, dns, dotnet-timespan , ekg-core, exceptions, fast-logger, file-embed, hashable @@ -79907,12 +79117,12 @@ self: { ({ mkDerivation, base, leancheck, template-haskell }: mkDerivation { pname = "express"; - version = "0.1.0"; - sha256 = "1bm2bzkkjnwrzf67g7291pw7cvlxg86mz69fnlrigmlxcx3kxbn4"; + version = "0.1.1"; + sha256 = "0zx5wdrw506lb3himzbyr7bgw4l12fmn9rbl0w95njrgm67h6667"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; - description = "Express"; + description = "Dynamically-typed expressions involving applications and variables"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -79942,8 +79152,6 @@ self: { testHaskellDepends = [ base singletons text ]; description = "Expressions and Formulae a la carte"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "expressions-z3" = callPackage @@ -80177,6 +79385,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Message passing concurrency as extensible-effect"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "extensible-exceptions" = callPackage @@ -80296,6 +79506,8 @@ self: { ]; description = "API Client for ExtraLife team and user data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "extrapolate" = callPackage @@ -80312,14 +79524,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "extrapolate_0_4_0" = callPackage + "extrapolate_0_4_1" = callPackage ({ mkDerivation, base, express, leancheck, speculate , template-haskell }: mkDerivation { pname = "extrapolate"; - version = "0.4.0"; - sha256 = "0qlpgpwzdvc2my332krjs8pqwzrhpkw9l3irfx6gx8fpmgasfd8n"; + version = "0.4.1"; + sha256 = "1rhwgbx8skq8hl1h5hnv28qavy3v1p71vdlib1kwbdp1r7niwp8l"; libraryHaskellDepends = [ base express leancheck speculate template-haskell ]; @@ -80433,8 +79645,6 @@ self: { ]; description = "Rational arithmetic in an irrational world"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "facts" = callPackage @@ -81232,6 +80442,8 @@ self: { executableHaskellDepends = [ base mtl optparse-applicative split ]; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-base" = callPackage @@ -81244,6 +80456,8 @@ self: { libraryHaskellDepends = [ base fay ]; description = "The base package for Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-builder" = callPackage @@ -81277,6 +80491,8 @@ self: { libraryHaskellDepends = [ fay-base ]; description = "DOM FFI wrapper library for Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-geoposition" = callPackage @@ -81289,6 +80505,8 @@ self: { libraryHaskellDepends = [ fay-base fay-text ]; description = "W3C compliant implementation of GeoPosition API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-hsx" = callPackage @@ -81315,6 +80533,8 @@ self: { libraryHaskellDepends = [ fay-base fay-text ]; description = "jQuery bindings for Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-ref" = callPackage @@ -81327,6 +80547,8 @@ self: { libraryHaskellDepends = [ fay-base ]; description = "Like IORef but for Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-simplejson" = callPackage @@ -81355,6 +80577,8 @@ self: { libraryHaskellDepends = [ fay fay-base text ]; description = "Fay Text type represented as JavaScript strings"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-uri" = callPackage @@ -81367,6 +80591,8 @@ self: { libraryHaskellDepends = [ fay-base ]; description = "Persistent FFI bindings for using jsUri in Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-websockets" = callPackage @@ -81379,38 +80605,11 @@ self: { libraryHaskellDepends = [ fay-base ]; description = "Websockets FFI library for Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fb" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , base64-bytestring, bytestring, cereal, conduit, conduit-extra - , containers, crypto-api, cryptohash, cryptohash-cryptoapi - , data-default, hspec, http-client, http-conduit, http-types, HUnit - , monad-logger, old-locale, QuickCheck, resourcet, text, time - , transformers, transformers-base, unliftio, unliftio-core - , unordered-containers - }: - mkDerivation { - pname = "fb"; - version = "1.2.1"; - sha256 = "05ax0pd9j6c64n48r9q03k5pg2axkmv11cz6azjg7k72cfkp1mm9"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring base64-bytestring - bytestring cereal conduit conduit-extra crypto-api cryptohash - cryptohash-cryptoapi data-default http-client http-conduit - http-types monad-logger old-locale resourcet text time transformers - transformers-base unliftio unliftio-core unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring conduit containers data-default hspec - http-conduit HUnit QuickCheck resourcet text time transformers - unliftio - ]; - description = "Bindings to Facebook's API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fb_2_0_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit , conduit-extra, containers, cryptonite, data-default, hspec , http-client, http-conduit, http-types, HUnit, memory @@ -81434,7 +80633,6 @@ self: { ]; description = "Bindings to Facebook's API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fb-persistent" = callPackage @@ -81750,23 +80948,6 @@ self: { }) {}; "fedora-haskell-tools" = callPackage - ({ mkDerivation, base, csv, directory, filepath, HTTP, process - , time, unix - }: - mkDerivation { - pname = "fedora-haskell-tools"; - version = "0.6"; - sha256 = "06yr6hyksdqz0nksw0m23cqik51jjr74241xx96979pvw07zcym4"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base csv directory filepath HTTP process time unix - ]; - description = "Building and maintenance tools for Fedora Haskell"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "fedora-haskell-tools_0_8" = callPackage ({ mkDerivation, base, csv, directory, fedora-dists, filepath, HTTP , optparse-applicative, process, simple-cmd, simple-cmd-args, split , time, unix @@ -81786,6 +80967,7 @@ self: { description = "Building and maintenance tools for Fedora Haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fedora-img-dl" = callPackage @@ -81850,32 +81032,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.0.1.0"; - sha256 = "076krkyvbh24s50chdw3nz6w2svwchys65ppjzlm8gy42ddhbgc7"; - revision = "1"; - editedCabalFile = "10xjd3syr70g3blnjy7xvd6s21y68vxsi69f6bmizpsylbfb0245"; - 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_0" = 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 @@ -81897,7 +81053,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 @@ -82462,8 +81617,6 @@ self: { libraryHaskellDepends = [ base-noprelude integer-gmp semirings ]; description = "fibonacci algebra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fibon" = callPackage @@ -83042,21 +82195,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fin" = callPackage - ({ mkDerivation, base, dec, deepseq, hashable, inspection-testing - , tagged - }: + "filtrable_0_1_2_0" = callPackage + ({ mkDerivation, base }: mkDerivation { - pname = "fin"; - version = "0.0.3"; - sha256 = "1g8fsl8hbh39g4r29597rjjh9000i3gwx38asa6pvmmnx7glqb2f"; - libraryHaskellDepends = [ base dec deepseq hashable ]; - testHaskellDepends = [ base inspection-testing tagged ]; - description = "Nat and Fin: peano naturals and finite numbers"; + pname = "filtrable"; + version = "0.1.2.0"; + sha256 = "1bgy3pydi7paiia63kygrg7fjjs7fm73jqfmlmw4szcbjmv8xq8k"; + libraryHaskellDepends = [ base ]; + description = "Class of filtrable containers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fin_0_1" = callPackage + "fin" = callPackage ({ mkDerivation, base, dec, deepseq, hashable, inspection-testing , tagged }: @@ -83068,7 +82219,6 @@ self: { testHaskellDepends = [ base inspection-testing tagged ]; description = "Nat and Fin: peano naturals and finite numbers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "final" = callPackage @@ -83349,19 +82499,6 @@ self: { }) {}; "first-class-families" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "first-class-families"; - version = "0.3.0.1"; - sha256 = "07291dj197230kq8vxqdgs52zl428w12sgy18y0n5lk18g5isxib"; - revision = "1"; - editedCabalFile = "1gybi18yw6dzp3r82x0xq9364m3isqq31gvaa1agf6hk9c9szfl2"; - libraryHaskellDepends = [ base ]; - description = "First class type families"; - license = stdenv.lib.licenses.mit; - }) {}; - - "first-class-families_0_5_0_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "first-class-families"; @@ -83371,7 +82508,6 @@ self: { testHaskellDepends = [ base ]; description = "First class type families"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "first-class-patterns" = callPackage @@ -83425,8 +82561,6 @@ self: { ]; description = "Calculates file-size frequency-distribution"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fit" = callPackage @@ -83471,6 +82605,8 @@ self: { ]; description = "Parse FITS files"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fitsio" = callPackage @@ -83553,17 +82689,6 @@ self: { }) {}; "fixed" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "fixed"; - version = "0.2.1.1"; - sha256 = "1qhmwx8iqshns0crmr9d2f8hm65jxbcp3dvv0c39v34ra7if3a94"; - libraryHaskellDepends = [ base ]; - description = "Signed 15.16 precision fixed point arithmetic"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fixed_0_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "fixed"; @@ -83572,7 +82697,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Signed 15.16 precision fixed point arithmetic"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixed-length" = callPackage @@ -83678,6 +82802,8 @@ self: { libraryHaskellDepends = [ async base clock time ]; description = "Pure Haskell library to repeat an action at a specific frequency"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fixed-vector" = callPackage @@ -83983,33 +83109,6 @@ self: { }) {}; "flac" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , directory, exceptions, filepath, FLAC, hspec, mtl, temporary - , text, transformers, vector, wave - }: - mkDerivation { - pname = "flac"; - version = "0.1.2"; - sha256 = "0adc88h5dmazf9m2xah0qkcav3pm0l3jiy8wbg9fxjv1qpgv74jn"; - revision = "5"; - editedCabalFile = "0rwwq8qrxd497rd5m0kidz4v69frj72ds7a6zrdqigj5f5471rhd"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers data-default-class directory exceptions - filepath mtl text transformers vector wave - ]; - librarySystemDepends = [ FLAC ]; - testHaskellDepends = [ - base bytestring data-default-class directory filepath hspec - temporary transformers vector wave - ]; - description = "Complete high-level binding to libFLAC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {FLAC = null;}; - - "flac_0_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory , exceptions, filepath, FLAC, hspec, hspec-discover, mtl, temporary , text, transformers, vector, wave @@ -84985,17 +84084,6 @@ self: { }) {}; "fmlist" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "fmlist"; - version = "0.9.2"; - sha256 = "02868865hqm189h5wjd916abvqwkhbrx5b0119s1dwp70ifvbi4g"; - libraryHaskellDepends = [ base ]; - description = "FoldMap lists"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fmlist_0_9_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "fmlist"; @@ -85004,7 +84092,6 @@ self: { libraryHaskellDepends = [ base ]; description = "FoldMap lists"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fmt" = callPackage @@ -85043,8 +84130,6 @@ self: { libraryHaskellDepends = [ base enum-text-rio ]; description = "Adaptor for getting fmt to work with rio"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fmt-terminal-colors" = callPackage @@ -85140,6 +84225,8 @@ self: { ]; description = "Lists with a focused element"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fold-debounce" = callPackage @@ -86021,6 +85108,8 @@ self: { testHaskellDepends = [ base doctest hspec ]; description = "Interactive terminal prompt"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "forward-chan" = callPackage @@ -86105,21 +85194,6 @@ self: { }) {}; "foundation" = callPackage - ({ mkDerivation, base, basement, gauge, ghc-prim }: - mkDerivation { - pname = "foundation"; - version = "0.0.23"; - sha256 = "0g043cqgzn082jfg5q5y1mi4c4pa3is00j01gvggvz8937v3cq52"; - revision = "1"; - editedCabalFile = "1zdlh81dii11p3bw3ffm3sr69l7nlhj622mca81swj59klgmaxwh"; - libraryHaskellDepends = [ base basement ghc-prim ]; - testHaskellDepends = [ base basement ]; - benchmarkHaskellDepends = [ base basement gauge ]; - description = "Alternative prelude with batteries and no dependencies"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "foundation_0_0_24" = callPackage ({ mkDerivation, base, basement, gauge, ghc-prim }: mkDerivation { pname = "foundation"; @@ -86130,7 +85204,6 @@ self: { benchmarkHaskellDepends = [ base basement gauge ]; description = "Alternative prelude with batteries and no dependencies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foundation-edge" = callPackage @@ -87276,6 +86349,8 @@ self: { ]; description = "A reactive frontend web framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "frontmatter" = callPackage @@ -87616,6 +86691,8 @@ self: { executableHaskellDepends = [ base mtl parsec ]; description = "implementation accompanying a WFLP'19 submission"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ftdi" = callPackage @@ -87652,6 +86729,8 @@ self: { testHaskellDepends = [ base ]; description = "Transfer files with FTP and FTPS"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ftp-client-conduit" = callPackage @@ -87668,6 +86747,8 @@ self: { testHaskellDepends = [ base ]; description = "Transfer file with FTP and FTPS with Conduit"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ftp-conduit" = callPackage @@ -88320,6 +87401,8 @@ self: { benchmarkHaskellDepends = [ base criterion hscolour ipprint ]; description = "funnyPrint function to colorize GHCi output"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "funpat" = callPackage @@ -88370,20 +87453,6 @@ self: { }) {}; "fused-effects" = callPackage - ({ mkDerivation, base, deepseq, doctest, hspec, MonadRandom - , QuickCheck, random - }: - mkDerivation { - pname = "fused-effects"; - version = "0.1.2.1"; - sha256 = "00lr52zfi1k52z0iqg8wb2a40x80kpwhbvmasp8c4s8c8jx4s9yn"; - libraryHaskellDepends = [ base deepseq MonadRandom random ]; - testHaskellDepends = [ base doctest hspec QuickCheck ]; - description = "A fast, flexible, fused effect system"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fused-effects_0_5_0_0" = callPackage ({ mkDerivation, base, criterion, deepseq, doctest, hspec , inspection-testing, MonadRandom, QuickCheck, random, transformers , unliftio-core @@ -88401,7 +87470,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "A fast, flexible, fused effect system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fused-effects-exceptions" = callPackage @@ -88417,8 +87485,6 @@ self: { ]; description = "Handle exceptions thrown in IO with fused-effects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fused-effects-lens" = callPackage @@ -88603,26 +87669,6 @@ self: { }) {}; "fuzzyset" = callPackage - ({ mkDerivation, base, base-unicode-symbols, data-default, hspec - , ieee754, lens, text, text-metrics, unordered-containers, vector - }: - mkDerivation { - pname = "fuzzyset"; - version = "0.1.0.8"; - sha256 = "096izffsa3fgdi8qiz7n6l2fl2rbiq6kv5h1xljmq0nkaig5m5wv"; - libraryHaskellDepends = [ - base base-unicode-symbols data-default lens text text-metrics - unordered-containers vector - ]; - testHaskellDepends = [ - base base-unicode-symbols hspec ieee754 lens text - unordered-containers - ]; - description = "Fuzzy set for approximate string matching"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fuzzyset_0_1_1" = callPackage ({ mkDerivation, base, base-unicode-symbols, data-default, hspec , ieee754, lens, text, text-metrics, unordered-containers, vector }: @@ -88640,7 +87686,6 @@ self: { ]; description = "Fuzzy set for approximate string matching"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fuzzytime" = callPackage @@ -88858,6 +87903,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "galois-field_0_4_0" = callPackage + ({ mkDerivation, base, criterion, integer-gmp, MonadRandom, poly + , protolude, semirings, tasty, tasty-quickcheck, vector + , wl-pprint-text + }: + mkDerivation { + pname = "galois-field"; + version = "0.4.0"; + sha256 = "087mvqbp18ak9wgih3sxjp210pjw7rka9x1vjmsivk15ppm17zsz"; + libraryHaskellDepends = [ + base integer-gmp MonadRandom poly protolude semirings + tasty-quickcheck vector wl-pprint-text + ]; + testHaskellDepends = [ + base integer-gmp MonadRandom poly protolude semirings tasty + tasty-quickcheck vector wl-pprint-text + ]; + benchmarkHaskellDepends = [ + base criterion integer-gmp MonadRandom poly protolude semirings + tasty-quickcheck vector wl-pprint-text + ]; + description = "Galois field library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "game-of-life" = callPackage ({ mkDerivation, array, base, hscurses, hspec, random, text }: mkDerivation { @@ -89801,22 +88872,6 @@ self: { }) {}; "generic-data" = callPackage - ({ mkDerivation, base, base-orphans, contravariant - , show-combinators, tasty, tasty-hunit - }: - mkDerivation { - pname = "generic-data"; - version = "0.3.0.0"; - sha256 = "0n53z9vmwfmb8h1x86wm9lcqrkfi1lvlfvm6kcw79d2xxx6l90jc"; - libraryHaskellDepends = [ - base base-orphans contravariant show-combinators - ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - description = "Utilities for GHC.Generics"; - license = stdenv.lib.licenses.mit; - }) {}; - - "generic-data_0_7_0_0" = callPackage ({ mkDerivation, base, base-orphans, contravariant, criterion , deepseq, generic-lens, one-liner, show-combinators, tasty , tasty-hunit @@ -89834,7 +88889,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Deriving instances with GHC.Generics and related utilities"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generic-data-surgery" = callPackage @@ -90172,17 +89226,6 @@ self: { }) {}; "generics-mrsop" = callPackage - ({ mkDerivation, base, containers, mtl, template-haskell }: - mkDerivation { - pname = "generics-mrsop"; - version = "1.2.2"; - sha256 = "0xlvvcnmv24f0j3j4jaaymhdgz7klfdx15lxi9214d4ak4fnxjyv"; - libraryHaskellDepends = [ base containers mtl template-haskell ]; - description = "Generic Programming with Mutually Recursive Sums of Products"; - license = stdenv.lib.licenses.mit; - }) {}; - - "generics-mrsop_2_1_0" = callPackage ({ mkDerivation, base, containers, mtl, template-haskell }: mkDerivation { pname = "generics-mrsop"; @@ -90191,7 +89234,6 @@ self: { libraryHaskellDepends = [ base containers mtl template-haskell ]; description = "Generic Programming with Mutually Recursive Sums of Products"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generics-sop" = callPackage @@ -90234,17 +89276,6 @@ self: { }) {}; "generics-sop-lens" = callPackage - ({ mkDerivation, base, generics-sop, lens }: - mkDerivation { - pname = "generics-sop-lens"; - version = "0.1.3"; - sha256 = "1dk2v2ax2cryxpmgdv0bbawdfd30is3b5vzylhy9rr7bb5727vay"; - libraryHaskellDepends = [ base generics-sop lens ]; - description = "Lenses for types in generics-sop"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "generics-sop-lens_0_2" = callPackage ({ mkDerivation, base, generics-sop, lens }: mkDerivation { pname = "generics-sop-lens"; @@ -90253,7 +89284,6 @@ self: { libraryHaskellDepends = [ base generics-sop lens ]; description = "Lenses for types in generics-sop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genericserialize" = callPackage @@ -90441,8 +89471,8 @@ self: { pname = "geniplate-mirror"; version = "0.7.6"; sha256 = "1y0m0bw5zpm1y1y6d9qmxj3swl8j8hlw1shxbr5awycf6k884ssb"; - revision = "1"; - editedCabalFile = "1pyz2vdkr5w9wadmb5v4alx408dqamny3mkvl4x8v2pf549qn37k"; + revision = "2"; + editedCabalFile = "03fg4vfm1wgq4mylggawdx0bfvbbjmdn700sqx7v3hk1bx0kjfzh"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Use Template Haskell to generate Uniplate-like functions"; license = stdenv.lib.licenses.bsd3; @@ -90499,18 +89529,6 @@ self: { }) {}; "genvalidity" = callPackage - ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }: - mkDerivation { - pname = "genvalidity"; - version = "0.7.0.2"; - sha256 = "1yjvbpf75xrllmn7kzfjysw6rdv190bvgclzs5lapa9cakbsigyv"; - libraryHaskellDepends = [ base QuickCheck validity ]; - testHaskellDepends = [ base hspec hspec-core QuickCheck ]; - description = "Testing utilities for the validity library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity_0_8_0_0" = callPackage ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; @@ -90520,32 +89538,9 @@ self: { testHaskellDepends = [ base hspec hspec-core QuickCheck ]; description = "Testing utilities for the validity library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-aeson" = callPackage - ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec - , genvalidity-scientific, genvalidity-text - , genvalidity-unordered-containers, genvalidity-vector, hspec - , QuickCheck, validity, validity-aeson - }: - mkDerivation { - pname = "genvalidity-aeson"; - version = "0.2.0.2"; - sha256 = "1c77lbw4y6fmrsdzxwm38la161n6k3zvjwisg17ssz0a1bm4y96i"; - libraryHaskellDepends = [ - aeson base genvalidity genvalidity-scientific genvalidity-text - genvalidity-unordered-containers genvalidity-vector QuickCheck - validity validity-aeson - ]; - testHaskellDepends = [ - aeson base genvalidity genvalidity-hspec hspec - ]; - description = "GenValidity support for aeson"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-aeson_0_3_0_0" = callPackage ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec , genvalidity-scientific, genvalidity-text , genvalidity-unordered-containers, genvalidity-vector, hspec @@ -90565,30 +89560,9 @@ self: { ]; description = "GenValidity support for aeson"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-bytestring" = callPackage - ({ mkDerivation, base, bytestring, deepseq, genvalidity - , genvalidity-hspec, hspec, QuickCheck, validity - , validity-bytestring - }: - mkDerivation { - pname = "genvalidity-bytestring"; - version = "0.3.0.1"; - sha256 = "1jc3hd5aad5vblb1mmb1xzgfdcnk37w50vxyznr1m16rdfg1xrz8"; - libraryHaskellDepends = [ - base bytestring genvalidity QuickCheck validity validity-bytestring - ]; - testHaskellDepends = [ - base bytestring deepseq genvalidity genvalidity-hspec hspec - QuickCheck validity - ]; - description = "GenValidity support for ByteString"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-bytestring_0_5_0_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, genvalidity , genvalidity-hspec, hspec, QuickCheck, validity , validity-bytestring @@ -90606,28 +89580,9 @@ self: { ]; description = "GenValidity support for ByteString"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-containers" = callPackage - ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec - , hspec, QuickCheck, validity, validity-containers - }: - mkDerivation { - pname = "genvalidity-containers"; - version = "0.5.1.1"; - sha256 = "1z7bmbwi07nylkgm3dysmnv57z1iww2sjy2zv88jpg6nvq9r9ffg"; - libraryHaskellDepends = [ - base containers genvalidity QuickCheck validity validity-containers - ]; - testHaskellDepends = [ - base containers genvalidity genvalidity-hspec hspec validity - ]; - description = "GenValidity support for containers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-containers_0_6_0_0" = callPackage ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec , hspec, QuickCheck, validity, validity-containers }: @@ -90643,30 +89598,9 @@ self: { ]; description = "GenValidity support for containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec" = callPackage - ({ mkDerivation, base, doctest, genvalidity, genvalidity-property - , hspec, hspec-core, QuickCheck, transformers, validity - }: - mkDerivation { - pname = "genvalidity-hspec"; - version = "0.6.2.3"; - sha256 = "12j603wz8g9vadh613amvqz45zg2w8lwlflf8c7gds8gp0x44b26"; - libraryHaskellDepends = [ - base genvalidity genvalidity-property hspec hspec-core QuickCheck - transformers validity - ]; - testHaskellDepends = [ - base doctest genvalidity genvalidity-property hspec hspec-core - QuickCheck validity - ]; - description = "Standard spec's for GenValidity instances"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-hspec_0_7_0_0" = callPackage ({ mkDerivation, base, doctest, genvalidity, genvalidity-property , hspec, hspec-core, QuickCheck, transformers, validity }: @@ -90684,32 +89618,9 @@ self: { ]; description = "Standard spec's for GenValidity instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-aeson" = callPackage - ({ mkDerivation, aeson, base, bytestring, deepseq, doctest - , genvalidity, genvalidity-aeson, genvalidity-hspec - , genvalidity-property, genvalidity-text, hspec, QuickCheck, text - , validity - }: - mkDerivation { - pname = "genvalidity-hspec-aeson"; - version = "0.3.0.1"; - sha256 = "0x5ja3d6vab2gmcqif3cvvbvmdpxp4hrc4ygzns5pw91nlrf5lm2"; - libraryHaskellDepends = [ - aeson base bytestring deepseq genvalidity genvalidity-hspec hspec - QuickCheck - ]; - testHaskellDepends = [ - aeson base doctest genvalidity genvalidity-aeson genvalidity-hspec - genvalidity-property genvalidity-text hspec text validity - ]; - description = "Standard spec's for aeson-related instances"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-hspec-aeson_0_3_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, doctest , genvalidity, genvalidity-aeson, genvalidity-hspec , genvalidity-property, genvalidity-text, hspec, QuickCheck, text @@ -90729,7 +89640,6 @@ self: { ]; description = "Standard spec's for aeson-related instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-binary" = callPackage @@ -90854,22 +89764,6 @@ self: { }) {}; "genvalidity-property" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, genvalidity - , hspec, QuickCheck, validity - }: - mkDerivation { - pname = "genvalidity-property"; - version = "0.3.0.0"; - sha256 = "03cpmkqmfqypj9kydrdzs0pyix0ffwrlx8idzvgyrqiyhg03rsis"; - libraryHaskellDepends = [ - base genvalidity hspec QuickCheck validity - ]; - testHaskellDepends = [ base directory doctest filepath ]; - description = "Standard properties for functions on `Validity` types"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-property_0_4_0_0" = callPackage ({ mkDerivation, base, directory, doctest, filepath, genvalidity , hspec, QuickCheck, validity }: @@ -90883,7 +89777,6 @@ self: { testHaskellDepends = [ base directory doctest filepath ]; description = "Standard properties for functions on `Validity` types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-scientific" = callPackage @@ -90905,24 +89798,6 @@ self: { }) {}; "genvalidity-text" = callPackage - ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec - , QuickCheck, text, validity, validity-text - }: - mkDerivation { - pname = "genvalidity-text"; - version = "0.5.1.0"; - sha256 = "0j7fx2zzv6ljqk87148h1rq3yg6vvy0dsl7kfl3f2p6ghnz7wggg"; - libraryHaskellDepends = [ - array base genvalidity QuickCheck text validity validity-text - ]; - testHaskellDepends = [ - base genvalidity genvalidity-hspec hspec QuickCheck text - ]; - description = "GenValidity support for Text"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-text_0_6_0_0" = callPackage ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, text, validity, validity-text }: @@ -90938,7 +89813,6 @@ self: { ]; description = "GenValidity support for Text"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-time" = callPackage @@ -90958,27 +89832,6 @@ self: { }) {}; "genvalidity-unordered-containers" = callPackage - ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable - , hspec, QuickCheck, unordered-containers, validity - , validity-unordered-containers - }: - mkDerivation { - pname = "genvalidity-unordered-containers"; - version = "0.2.0.4"; - sha256 = "0rkvwm5imbgl8cx5pdk16dc4wzhcndw6g3wwxs0blykiri32wl3q"; - libraryHaskellDepends = [ - base genvalidity hashable QuickCheck unordered-containers validity - validity-unordered-containers - ]; - testHaskellDepends = [ - base genvalidity genvalidity-hspec hspec unordered-containers - validity - ]; - description = "GenValidity support for unordered-containers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-unordered-containers_0_3_0_0" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable , hspec, QuickCheck, unordered-containers, validity , validity-unordered-containers @@ -90997,7 +89850,6 @@ self: { ]; description = "GenValidity support for unordered-containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-uuid" = callPackage @@ -91019,24 +89871,6 @@ self: { }) {}; "genvalidity-vector" = callPackage - ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec - , QuickCheck, validity, validity-vector, vector - }: - mkDerivation { - pname = "genvalidity-vector"; - version = "0.2.0.3"; - sha256 = "161w5shgj1k8691mmi9ddhxrnrqhsp502ywln2h0sk55zqcj1i5k"; - libraryHaskellDepends = [ - base genvalidity QuickCheck validity validity-vector vector - ]; - testHaskellDepends = [ - base genvalidity genvalidity-hspec hspec vector - ]; - description = "GenValidity support for vector"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-vector_0_3_0_0" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, validity, validity-vector, vector }: @@ -91052,7 +89886,6 @@ self: { ]; description = "GenValidity support for vector"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geo-resolver" = callPackage @@ -91199,29 +90032,6 @@ self: { }) {}; "geojson" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , hlint, lens, scientific, semigroups, tasty, tasty-hspec - , tasty-quickcheck, text, transformers, validation - }: - mkDerivation { - pname = "geojson"; - version = "3.0.4"; - sha256 = "0dnk9cb7y8wgnx8wzzln635r9pijljd9h5rinl0s9g4bjhw0rcw5"; - revision = "1"; - editedCabalFile = "1dp2hmnh77il2nx809bbkhhq4bz7ycy38ai5bhyklagc4k5bxl1c"; - libraryHaskellDepends = [ - aeson base containers deepseq lens scientific semigroups text - transformers validation - ]; - testHaskellDepends = [ - aeson base bytestring containers hlint tasty tasty-hspec - tasty-quickcheck text validation - ]; - description = "A thin GeoJSON Layer above the aeson library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "geojson_4_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , hlint, lens, scientific, semigroups, tasty, tasty-hspec , tasty-quickcheck, text, transformers, validation, vector @@ -91241,6 +90051,7 @@ self: { description = "A thin GeoJSON Layer above the aeson library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "geojson-types" = callPackage @@ -91296,8 +90107,8 @@ self: { }: mkDerivation { pname = "geos"; - version = "0.2.1"; - sha256 = "15dhxhqswi9h8zas0x27hma7pz4c7rn40pppjraax29pi4alaiq9"; + version = "0.2.2"; + sha256 = "15mmgn5c2ls87ajpz11zybv5i3nzva60snws2gxjh19prkhydl5c"; libraryHaskellDepends = [ base bytestring mtl transformers vector ]; @@ -91439,8 +90250,6 @@ self: { ]; description = "Github Standard Labeler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gh-pocket-knife" = callPackage @@ -91744,29 +90553,6 @@ self: { }) {}; "ghc-exactprint" = callPackage - ({ mkDerivation, base, bytestring, containers, Diff, directory - , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl - , silently, syb - }: - mkDerivation { - pname = "ghc-exactprint"; - version = "0.5.8.2"; - sha256 = "18wlhvgpbk7ym1vbi8fkdwbjhcplgr7zcqm328yi4v7rilbxw7cn"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers directory filepath free ghc ghc-boot - ghc-paths mtl syb - ]; - testHaskellDepends = [ - base bytestring containers Diff directory filemanip filepath ghc - ghc-boot ghc-paths HUnit mtl silently syb - ]; - description = "ExactPrint for GHC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-exactprint_0_6_1" = callPackage ({ mkDerivation, base, bytestring, containers, Diff, directory , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl , silently, syb @@ -91787,7 +90573,6 @@ self: { ]; description = "ExactPrint for GHC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-gc-tune" = callPackage @@ -91833,8 +90618,6 @@ self: { testHaskellDepends = [ base deepseq ]; description = "Extract the heap representation of Haskell values and thunks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ghc-hotswap" = callPackage @@ -91929,8 +90712,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "8.8.0.20190723"; - sha256 = "161qmm41vayks22vxbji436by1rfbx0x5m2zm4cc11pjcjrd4p63"; + version = "8.8.0.20190424"; + sha256 = "03f1racabmixc4jk3mn6k6cnhapaplswa8fbb9yajrzj56ag16wm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -91947,7 +90730,52 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-lib_8_8_0_20190723" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy + , haskeline, hpc, pretty, process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib"; + version = "8.8.0.20190723"; + sha256 = "161qmm41vayks22vxbji436by1rfbx0x5m2zm4cc11pjcjrd4p63"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + ghc-lib-parser ghc-prim hpc pretty process time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ + array base bytestring containers deepseq directory filepath + ghc-prim haskeline process time transformers unix + ]; + description = "The GHC API, decoupled from GHC versions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-lib-parser" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty + , process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib-parser"; + version = "8.8.0.20190424"; + sha256 = "12gsh994pr13bsybwlravmi21la66dyw74pk74yfw2pnz682wv10"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + ghc-prim hpc pretty process time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "ghc-lib-parser_8_8_0_20190723" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty , process, time, transformers, unix @@ -91964,6 +90792,7 @@ self: { libraryToolDepends = [ alex happy ]; description = "The GHC API, decoupled from GHC versions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-make" = callPackage @@ -92620,18 +91449,6 @@ self: { }) {}; "ghci-hexcalc" = callPackage - ({ mkDerivation, base, doctest, QuickCheck }: - mkDerivation { - pname = "ghci-hexcalc"; - version = "0.1.0.2"; - sha256 = "134nby24044l0nxdss004325scca315dsa31101b9qcbwq2hd3fv"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest QuickCheck ]; - description = "GHCi as a Hex Calculator interactive"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghci-hexcalc_0_1_1_0" = callPackage ({ mkDerivation, base, binary, doctest, QuickCheck }: mkDerivation { pname = "ghci-hexcalc"; @@ -92641,7 +91458,6 @@ self: { testHaskellDepends = [ base binary doctest QuickCheck ]; description = "GHCi as a Hex Calculator interactive"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghci-history-parser" = callPackage @@ -92722,32 +91538,6 @@ self: { }) {}; "ghcid" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, containers - , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit - , terminal-size, time, unix - }: - mkDerivation { - pname = "ghcid"; - version = "0.7.4"; - sha256 = "1wd278xligp0qj98zhqp3lkxdzpgb8k7yy0vhva6cs1ch6032gpp"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base cmdargs directory extra filepath process time - ]; - executableHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process terminal-size time unix - ]; - testHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process tasty tasty-hunit terminal-size time unix - ]; - description = "GHCi based bare bones IDE"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghcid_0_7_5" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit , terminal-size, time, unix @@ -92771,7 +91561,6 @@ self: { ]; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-ajax" = callPackage @@ -93132,25 +91921,6 @@ self: { }) {}; "gi-atk" = callPackage - ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading - , text, transformers - }: - mkDerivation { - pname = "gi-atk"; - version = "2.0.18"; - sha256 = "15lh4pxif4gw3b7lly5135wabj9156jxsylrwsdppkcfcvxlbp26"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ atk ]; - description = "Atk bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) atk;}; - - "gi-atk_2_0_21" = callPackage ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading , text, transformers @@ -93167,34 +91937,9 @@ self: { libraryPkgconfigDepends = [ atk ]; description = "Atk bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) atk;}; "gi-cairo" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cairo, containers - , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers - }: - mkDerivation { - pname = "gi-cairo"; - version = "1.0.17"; - sha256 = "1ax7aly9ahvb18m3zjmy0dk47qfdx5yl15q52c3wp4wa0c5aggax"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ cairo ]; - doHaddock = false; - preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" - setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" - ''; - description = "Cairo bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) cairo;}; - - "gi-cairo_1_0_23" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , haskell-gi, haskell-gi-base, haskell-gi-overloading, text , transformers @@ -93215,7 +91960,6 @@ self: { ''; description = "Cairo bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo;}; "gi-cairo-again" = callPackage @@ -93286,8 +92030,6 @@ self: { libraryPkgconfigDepends = [ libdbusmenu ]; description = "Dbusmenu bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) libdbusmenu;}; "gi-dbusmenugtk3" = callPackage @@ -93312,8 +92054,6 @@ self: { libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ]; description = "DbusmenuGtk bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; "gi-gdk" = callPackage @@ -93324,9 +92064,12 @@ self: { }: mkDerivation { pname = "gi-gdk"; - version = "3.0.16"; - sha256 = "0jp3d3zfm20b4ax1g5k1wzh8fxxzsw4ssw7zqx0d13167m4smc3y"; - setupHaskellDepends = [ base Cabal haskell-gi ]; + version = "3.0.22"; + sha256 = "0a6qkikk31n5qc85zp8l8kcaf0804c52gp02hban3c8a9rbq1lgr"; + setupHaskellDepends = [ + base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango + haskell-gi + ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base @@ -93363,25 +92106,6 @@ self: { }) {gtk4 = null;}; "gi-gdkpixbuf" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf - , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gdkpixbuf"; - version = "2.0.20"; - sha256 = "1i3z9yk2zb15pwpgijdvyr08q8yc7yzm92jijgscwly9z6nin6x4"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gdk-pixbuf ]; - description = "GdkPixbuf bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) gdk-pixbuf;}; - - "gi-gdkpixbuf_2_0_23" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers @@ -93400,7 +92124,6 @@ self: { libraryPkgconfigDepends = [ gdk-pixbuf ]; description = "GdkPixbuf bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gdk-pixbuf;}; "gi-gdkx11" = callPackage @@ -93423,8 +92146,6 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "GdkX11 bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk3;}; "gi-ggit" = callPackage @@ -93446,30 +92167,9 @@ self: { libraryPkgconfigDepends = [ libgit2-glib ]; description = "libgit2-glib bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) libgit2-glib;}; "gi-gio" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, glib, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gio"; - version = "2.0.19"; - sha256 = "1xyg1hmxp408npri8ydm5iaphfwdq7jdgdhbwgbxiyia2ymxfhqc"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ glib ]; - description = "Gio bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib;}; - - "gi-gio_2_0_25" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, glib, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers @@ -93486,7 +92186,6 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "Gio bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-girepository" = callPackage @@ -93506,30 +92205,9 @@ self: { libraryPkgconfigDepends = [ gobject-introspection ]; description = "GIRepository (gobject-introspection) bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gobject-introspection;}; "gi-glib" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, glib - , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers - }: - mkDerivation { - pname = "gi-glib"; - version = "2.0.17"; - sha256 = "0rxbkrwlwnjf46z0qpw0vjw1nv9kl91xp7k2098rqs36kl5bwylx"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ glib ]; - description = "GLib bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib;}; - - "gi-glib_2_0_23" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text , transformers @@ -93546,29 +92224,9 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "GLib bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-gobject" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib - , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers - }: - mkDerivation { - pname = "gi-gobject"; - version = "2.0.19"; - sha256 = "1s10417vmrzdbzwkqzxj88c8mvcvicpxgdc9hm1m99c2z132rj23"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ glib ]; - description = "GObject bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib;}; - - "gi-gobject_2_0_22" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text , transformers @@ -93585,7 +92243,6 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "GObject bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-graphene" = callPackage @@ -93605,6 +92262,8 @@ self: { libraryPkgconfigDepends = [ graphene-gobject ]; description = "Graphene bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {graphene-gobject = null;}; "gi-gsk" = callPackage @@ -93629,6 +92288,8 @@ self: { libraryPkgconfigDepends = [ gtk4 ]; description = "Gsk bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gtk4 = null;}; "gi-gst" = callPackage @@ -93648,8 +92309,6 @@ self: { libraryPkgconfigDepends = [ gstreamer ]; description = "GStreamer bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs.gst_all_1) gstreamer;}; "gi-gstaudio" = callPackage @@ -93671,8 +92330,6 @@ self: { libraryPkgconfigDepends = [ gst-plugins-base ]; description = "GStreamerAudio bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstbase" = callPackage @@ -93694,8 +92351,6 @@ self: { libraryPkgconfigDepends = [ gst-plugins-base ]; description = "GStreamerBase bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstpbutils" = callPackage @@ -93766,8 +92421,6 @@ self: { libraryPkgconfigDepends = [ gst-plugins-base ]; description = "GStreamerVideo bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gtk" = callPackage @@ -93778,9 +92431,12 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "3.0.27"; - sha256 = "1i8xrq56lp8ha87zykr3hgp13yp8amsxal320mknr2s29x6iw1kr"; - setupHaskellDepends = [ base Cabal haskell-gi ]; + version = "3.0.32"; + sha256 = "0div9lqmirys1f3dy6bskvai72hb82g6rvcg0kwg1im974xp5m8l"; + setupHaskellDepends = [ + base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib + gi-gobject gi-pango haskell-gi + ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base @@ -93789,8 +92445,6 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "Gtk bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk3;}; "gi-gtk_4_0_1" = callPackage @@ -93816,7 +92470,6 @@ self: { description = "Gtk bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {gtk4 = null;}; "gi-gtk-declarative" = callPackage @@ -93865,25 +92518,6 @@ self: { }) {}; "gi-gtk-hs" = callPackage - ({ mkDerivation, base, base-compat, containers, gi-gdk - , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl - , text, transformers - }: - mkDerivation { - pname = "gi-gtk-hs"; - version = "0.3.6.3"; - sha256 = "0xnrssnfaz57akrkgpf1cm3d4lg3cmlh0b8yp6w9pdsbp0lld2ay"; - libraryHaskellDepends = [ - base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject - gi-gtk haskell-gi-base mtl text transformers - ]; - description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "gi-gtk-hs_0_3_8_0" = callPackage ({ mkDerivation, base, base-compat, containers, gi-gdk , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl , text, transformers @@ -93898,8 +92532,6 @@ self: { ]; description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gi-gtkosxapplication" = callPackage @@ -93926,30 +92558,6 @@ self: { }) {gtk-mac-integration-gtk3 = null;}; "gi-gtksource" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk - , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject - , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gtksource"; - version = "3.0.16"; - sha256 = "0fm5bnyq4f9icyhxkyxf42mmanmc2klbdgin75dcdq5r92gipfcp"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf - gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gtksourceview3 ]; - doHaddock = false; - description = "GtkSource bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {inherit (pkgs) gtksourceview3;}; - - "gi-gtksource_3_0_22" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base @@ -93971,8 +92579,6 @@ self: { libraryPkgconfigDepends = [ gtksourceview3 ]; description = "GtkSource bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtksourceview3;}; "gi-handy" = callPackage @@ -94002,27 +92608,6 @@ self: { }) {inherit (pkgs) libhandy;}; "gi-javascriptcore" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading - , text, transformers, webkitgtk - }: - mkDerivation { - pname = "gi-javascriptcore"; - version = "4.0.16"; - sha256 = "0kihq9sp42k2k9j8qrwgja62i5pzwhc1z1yy6h19n56aikddfc2z"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ webkitgtk ]; - doHaddock = false; - description = "JavaScriptCore bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) webkitgtk;}; - - "gi-javascriptcore_4_0_21" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading , text, transformers, webkitgtk @@ -94085,34 +92670,9 @@ self: { description = "OSTree bindings"; license = stdenv.lib.licenses.lgpl21; platforms = [ "i686-linux" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) ostree;}; "gi-pango" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cairo, containers - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, pango, text, transformers - }: - mkDerivation { - pname = "gi-pango"; - version = "1.0.19"; - sha256 = "1zrxqi5w9w3lgnmw64pah36y1iwp96vsgnzxwzjizmxc03waaf98"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ cairo pango ]; - preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" - setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" - ''; - description = "Pango bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; - - "gi-pango_1_0_22" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gi-glib, gi-gobject, haskell-gi, haskell-gi-base , haskell-gi-overloading, pango, text, transformers @@ -94133,7 +92693,6 @@ self: { ''; description = "Pango bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; "gi-pangocairo" = callPackage @@ -94160,8 +92719,6 @@ self: { ''; description = "PangoCairo bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; "gi-poppler" = callPackage @@ -94206,8 +92763,6 @@ self: { libraryPkgconfigDepends = [ libsecret ]; description = "Libsecret bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) libsecret;}; "gi-soup" = callPackage @@ -94229,34 +92784,9 @@ self: { libraryPkgconfigDepends = [ libsoup ]; description = "Libsoup bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) libsoup;}; "gi-vte" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk - , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers - , vte_291 - }: - mkDerivation { - pname = "gi-vte"; - version = "2.91.19"; - sha256 = "1hnhidjr7jh7i826lj6kdn264i592sfl5kwvymnpiycmcb37dd4y"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject - gi-gtk gi-pango haskell-gi haskell-gi-base haskell-gi-overloading - text transformers - ]; - libraryPkgconfigDepends = [ vte_291 ]; - description = "Vte bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {vte_291 = pkgs.vte;}; - - "gi-vte_2_91_25" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers @@ -94278,8 +92808,6 @@ self: { libraryPkgconfigDepends = [ vte_291 ]; description = "Vte bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {vte_291 = pkgs.vte;}; "gi-webkit" = callPackage @@ -94397,8 +92925,6 @@ self: { libraryPkgconfigDepends = [ xlibsWrapper ]; description = "xlib bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) xlibsWrapper;}; "giak" = callPackage @@ -94463,8 +92989,6 @@ self: { ]; description = "An implementation of the Jinja2 template language in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gingersnap" = callPackage @@ -94578,6 +93102,8 @@ self: { ]; description = "Giphy HTTP API wrapper and CLI search tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gist" = callPackage @@ -95044,8 +93570,6 @@ self: { testToolDepends = [ git ]; description = "A framework for pre-commit checks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gitHUD" = callPackage @@ -95152,8 +93676,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Access to the GitHub API, v3"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "github-backup" = callPackage @@ -95367,8 +93889,8 @@ self: { }: mkDerivation { pname = "githud"; - version = "3.0.0"; - sha256 = "1zr7d5h0x1fsnwb2pg9vn34ir0m144h1vnlh0avickazz2ljx2xr"; + version = "3.0.1"; + sha256 = "12ilxa52yib3ck80mr7djy59pzszb2l73npmpygcdwpcy46jq4p8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95733,6 +94255,8 @@ self: { ]; description = "CLI Giphy search tool with previews in iTerm 2"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gjk" = callPackage @@ -95759,27 +94283,6 @@ self: { }) {}; "gl" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, filepath - , fixed, half, hxt, libGL, transformers - }: - mkDerivation { - pname = "gl"; - version = "0.8.0"; - sha256 = "0f8l1ra05asqjnk97sliqb3wqvr6lic18rfs1f9dm1kw2lw2hkda"; - revision = "3"; - editedCabalFile = "0q8d4237ds78y4p35xl2arlmmpgs2ag7krw9chby6q9dcs00zxrl"; - setupHaskellDepends = [ - base Cabal containers directory filepath hxt transformers - ]; - libraryHaskellDepends = [ - base containers fixed half transformers - ]; - librarySystemDepends = [ libGL ]; - description = "Complete OpenGL raw bindings"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libGL;}; - - "gl_0_9" = callPackage ({ mkDerivation, base, containers, fixed, half, libGL, transformers }: mkDerivation { @@ -95794,7 +94297,6 @@ self: { librarySystemDepends = [ libGL ]; description = "Complete OpenGL raw bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libGL;}; "gl-capture" = callPackage @@ -95809,26 +94311,6 @@ self: { }) {}; "glabrous" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , cereal, cereal-text, directory, either, hspec, text - , unordered-containers - }: - mkDerivation { - pname = "glabrous"; - version = "1.0.1"; - sha256 = "11s7fhlv3aq80h20jf2l447bmxy95dy7dqvzqfp0myy4hgsasks3"; - libraryHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring cereal cereal-text - either text unordered-containers - ]; - testHaskellDepends = [ - base directory either hspec text unordered-containers - ]; - description = "A template DSL library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "glabrous_2_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , cereal, cereal-text, directory, either, hspec, text , unordered-containers @@ -95846,7 +94328,6 @@ self: { ]; description = "A template DSL library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glade" = callPackage @@ -96740,8 +95221,8 @@ self: { }: mkDerivation { pname = "gnome-keyring"; - version = "0.3.1"; - sha256 = "08fayi4ixqyzin7lxyx2s3yap377y6nrdf4fmv7bi895j2k642l8"; + version = "0.3.1.1"; + sha256 = "044bbgy8cssi1jc8wwb0kvxpw6d7pwxackkzvw7p9r8ybmgv4d0b"; libraryHaskellDepends = [ base bytestring text time ]; librarySystemDepends = [ gnome-keyring ]; libraryPkgconfigDepends = [ libgnome-keyring ]; @@ -99344,6 +97825,8 @@ self: { ]; description = "Bindings to the Google Geocoding API (formerly Maps Geocoding API)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "google-oauth2" = callPackage @@ -99473,6 +97956,8 @@ self: { ]; description = "Bindings to the Google Maps Static API (formerly Static Maps API)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "google-translate" = callPackage @@ -99784,6 +98269,25 @@ self: { broken = true; }) {}; + "gothic" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, connection + , exceptions, hashable, http-client, http-client-tls, http-conduit + , http-types, lens, lens-aeson, scientific, text, unix + , unordered-containers, vector + }: + mkDerivation { + pname = "gothic"; + version = "0.1.1"; + sha256 = "0bm8m77lcvi9c8smv0z4n23f6gw3aw47g0q47aqjcpipwmjcqvhm"; + libraryHaskellDepends = [ + aeson base binary bytestring connection exceptions hashable + http-client http-client-tls http-conduit http-types lens lens-aeson + scientific text unix unordered-containers vector + ]; + description = "A Haskell Vault KVv2 secret engine client"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gotta-go-fast" = callPackage ({ mkDerivation, base, brick, cmdargs, directory, random, text , time, vty, word-wrap @@ -99942,6 +98446,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Applicative non-linear consumption"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "grab-form" = callPackage @@ -99954,6 +98460,8 @@ self: { testHaskellDepends = [ base containers hedgehog text ]; description = "Applicative parsers for form parameter lists"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graceful" = callPackage @@ -99974,6 +98482,19 @@ self: { broken = true; }) {}; + "grafana" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, text }: + mkDerivation { + pname = "grafana"; + version = "0.1"; + sha256 = "0k8a8bwyn9hvn4j3wn4crqdjg2xh36zxlka0ddx3qj6fmbfl1lps"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring text + ]; + description = "grafana datatypes for dashboards"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "graflog" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec, mtl , test-fixture, text, text-conversions @@ -100595,6 +99116,8 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Graphs and networks library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graphmod" = callPackage @@ -100651,6 +99174,8 @@ self: { ]; description = "Haskell GraphQL implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graphql-api" = callPackage @@ -100676,19 +99201,19 @@ self: { ]; description = "GraphQL API"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graphql-w-persistent" = callPackage ({ mkDerivation, base, containers, json, text }: mkDerivation { pname = "graphql-w-persistent"; - version = "0.4.0.0"; - sha256 = "01k8h0fz0x8dfsg01d6xj9b43jaj47a6vb378f5y6zhf0s9ixzj1"; + version = "0.5.0.0"; + sha256 = "12z4fws4vz88j8xj1xvzl8jv6s4i3vnca7xln2q4ssn23a025fcg"; libraryHaskellDepends = [ base containers json text ]; - description = "Haskell GraphQL query parser-interpreter-data processor"; + description = "GraphQL interface middleware for (SQL) databases"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "graphs" = callPackage @@ -101571,6 +100096,8 @@ self: { libraryHaskellDepends = [ base proto-lens proto-lens-runtime ]; description = "Generated messages and instances for etcd gRPC"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "grpc-etcd-client" = callPackage @@ -102004,8 +100531,6 @@ self: { ]; description = "A standalone StatusNotifierItem/AppIndicator tray"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk3;}; "gtk-strut" = callPackage @@ -102017,8 +100542,6 @@ self: { libraryHaskellDepends = [ base gi-gdk gi-gtk text transformers ]; description = "Libary for creating strut windows with gi-gtk"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gtk-toggle-button-list" = callPackage @@ -102800,55 +101323,6 @@ self: { }) {}; "hOpenPGP" = callPackage - ({ mkDerivation, aeson, asn1-encoding, attoparsec, base - , base16-bytestring, base64-bytestring, bifunctors, binary - , binary-conduit, bytestring, bzlib, conduit, conduit-extra - , containers, criterion, crypto-cipher-types, cryptonite, errors - , hashable, incremental-parser, ixset-typed, lens, memory - , monad-loops, nettle, network, network-uri, newtype - , openpgp-asciiarmor, prettyprinter, QuickCheck - , quickcheck-instances, resourcet, semigroups, split, tasty - , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat - , transformers, unliftio-core, unordered-containers, zlib - }: - mkDerivation { - pname = "hOpenPGP"; - version = "2.7.4.1"; - sha256 = "0fcm87rkf1c94w68ad2zkd3r2pbxzqa82kh3d2ky87rc1wqnia0s"; - libraryHaskellDepends = [ - aeson asn1-encoding attoparsec base base16-bytestring - base64-bytestring bifunctors binary binary-conduit bytestring bzlib - conduit conduit-extra containers crypto-cipher-types cryptonite - errors hashable incremental-parser ixset-typed lens memory - monad-loops nettle network-uri newtype openpgp-asciiarmor - prettyprinter resourcet semigroups split text time - time-locale-compat transformers unliftio-core unordered-containers - zlib - ]; - testHaskellDepends = [ - aeson asn1-encoding attoparsec base base16-bytestring bifunctors - binary binary-conduit bytestring bzlib conduit conduit-extra - containers crypto-cipher-types cryptonite errors hashable - incremental-parser ixset-typed lens memory monad-loops nettle - network network-uri newtype prettyprinter QuickCheck - quickcheck-instances resourcet semigroups split tasty tasty-hunit - tasty-quickcheck text time time-locale-compat transformers - unliftio-core unordered-containers zlib - ]; - benchmarkHaskellDepends = [ - aeson base base16-bytestring base64-bytestring bifunctors binary - binary-conduit bytestring bzlib conduit conduit-extra containers - criterion crypto-cipher-types cryptonite errors hashable - incremental-parser ixset-typed lens memory monad-loops nettle - network network-uri newtype openpgp-asciiarmor prettyprinter - resourcet semigroups split text time time-locale-compat - transformers unliftio-core unordered-containers zlib - ]; - description = "native Haskell implementation of OpenPGP (RFC4880)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hOpenPGP_2_8" = callPackage ({ mkDerivation, aeson, asn1-encoding, attoparsec, base , base16-bytestring, base64-bytestring, bifunctors, binary , binary-conduit, bytestring, bzlib, conduit, conduit-extra @@ -102895,7 +101369,6 @@ self: { ]; description = "native Haskell implementation of OpenPGP (RFC4880)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hPDB" = callPackage @@ -104586,6 +103059,8 @@ self: { ]; description = "Mailgun REST api interface for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hailgun-send" = callPackage @@ -104618,6 +103093,8 @@ self: { ]; description = "Easy-to-use wrapper for the hailgun package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hails" = callPackage @@ -104840,6 +103317,8 @@ self: { testToolDepends = [ utillinux ]; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) utillinux;}; "hakyll-R" = callPackage @@ -105035,6 +103514,8 @@ self: { ]; description = "Allow Hakyll to create hierarchical menues from directories"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-elm" = callPackage @@ -105063,6 +103544,8 @@ self: { executableHaskellDepends = [ base hakyll ]; testHaskellDepends = [ base ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-filestore" = callPackage @@ -105088,10 +103571,8 @@ self: { }: mkDerivation { pname = "hakyll-images"; - version = "0.4.2"; - sha256 = "0la1c25jlqw0y0zfcskkj4mlmkpamr2psqfnsrgz52zvmhy2ha2p"; - revision = "1"; - editedCabalFile = "1kmvb0cxvphmx0f1bgjq636yga58n4g2lqrg2xg5xfpwf8r956qf"; + version = "0.4.4"; + sha256 = "0d837i2nsg6drwfsrxfnpzmzmzxqxvabjlrlml38z99pyp7m3h9b"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring hakyll JuicyPixels JuicyPixels-extra @@ -105102,6 +103583,8 @@ self: { ]; description = "Hakyll utilities to work with images"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-ogmarkup" = callPackage @@ -105130,6 +103613,8 @@ self: { ]; description = "Hakyll SASS compiler over hsass"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-series" = callPackage @@ -105141,6 +103626,8 @@ self: { libraryHaskellDepends = [ base containers hakyll ]; description = "Adds series functionality to hakyll"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-shakespeare" = callPackage @@ -105158,6 +103645,8 @@ self: { ]; description = "Hakyll Hamlet compiler"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-shortcode" = callPackage @@ -105873,37 +104362,6 @@ self: { }) {}; "hapistrano" = callPackage - ({ mkDerivation, aeson, async, base, directory, filepath - , formatting, gitrev, hspec, mtl, optparse-applicative, path - , path-io, process, QuickCheck, silently, stm, temporary, time - , transformers, typed-process, yaml - }: - mkDerivation { - pname = "hapistrano"; - version = "0.3.9.2"; - sha256 = "04a0r5q6vlwxkp1gwp10fmi22brb77w02psz44zbvqbm02jf7vhd"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base filepath formatting gitrev mtl path process stm time - transformers typed-process - ]; - executableHaskellDepends = [ - aeson async base formatting gitrev optparse-applicative path - path-io stm yaml - ]; - testHaskellDepends = [ - base directory filepath hspec mtl path path-io process QuickCheck - silently temporary - ]; - description = "A deployment library for Haskell applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hapistrano_0_3_9_3" = callPackage ({ mkDerivation, aeson, async, base, directory, filepath , formatting, gitrev, hspec, mtl, optparse-applicative, path , path-io, process, QuickCheck, silently, stm, temporary, time @@ -106276,6 +104734,8 @@ self: { ]; description = "Happstack extension for use with FastCGI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-fay" = callPackage @@ -106401,6 +104861,8 @@ self: { ]; description = "Support for using HSP templates in Happstack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-hstringtemplate" = callPackage @@ -106536,6 +104998,8 @@ self: { ]; description = "Web related tools and services"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-server-tls" = callPackage @@ -106554,6 +105018,8 @@ self: { librarySystemDepends = [ openssl ]; description = "extend happstack-server with https:// support (TLS/SSL)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) openssl;}; "happstack-server-tls-cryptonite" = callPackage @@ -106610,6 +105076,8 @@ self: { ]; description = "Support for static URL routing with overlap detection for Happstack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-util" = callPackage @@ -107101,6 +105569,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hasbolt_0_1_3_4" = callPackage + ({ mkDerivation, base, binary, bytestring, connection, containers + , data-binary-ieee754, data-default, hex, hspec, mtl, network + , QuickCheck, text + }: + mkDerivation { + pname = "hasbolt"; + version = "0.1.3.4"; + sha256 = "06z47djpg6sar1cadzrn86cmn092jhf7cwnjv402sx00i4r2v5dh"; + libraryHaskellDepends = [ + base binary bytestring connection containers data-binary-ieee754 + data-default mtl network text + ]; + testHaskellDepends = [ + base bytestring containers hex hspec QuickCheck text + ]; + description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasbolt-extras" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers , data-default, free, hasbolt, lens, mtl, neat-interpolation @@ -107298,6 +105787,8 @@ self: { ]; description = "Hash as cache"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hash-tree" = callPackage @@ -107432,8 +105923,8 @@ self: { pname = "hashable-time"; version = "0.2.0.2"; sha256 = "1q7y4plqqwy5286hhx2fygn12h8lqk0y047b597sbdckskxzfqgs"; - revision = "1"; - editedCabalFile = "1d43ia3cg9j9k1yam0w2a8b60df7xw4zydrdvk1m868ara3nlr58"; + revision = "2"; + editedCabalFile = "006phc5y9rrvsshdcmjmhxzxh8dpgs685mpqbkjm9c40xb1ydjbz"; libraryHaskellDepends = [ base hashable time ]; description = "Hashable instances for Data.Time"; license = stdenv.lib.licenses.bsd3; @@ -107605,6 +106096,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hashtables_1_2_3_4" = callPackage + ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: + mkDerivation { + pname = "hashtables"; + version = "1.2.3.4"; + sha256 = "1rjmxnr30g4hygiywkpz5p9sanh0abs7ap4zc1kgd8zv04kycp0j"; + libraryHaskellDepends = [ + base ghc-prim hashable primitive vector + ]; + description = "Mutable hash tables in the ST monad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hashtables-plus" = callPackage ({ mkDerivation, base, criterion-plus, deepseq, hashable , hashtables, lens, loch-th, mtl, mwc-random, placeholders @@ -108175,8 +106680,6 @@ self: { ]; description = "Core Types for NLP"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haskell-course-preludes" = callPackage @@ -108424,29 +106927,6 @@ self: { }) {}; "haskell-gi" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers - , directory, doctest, filepath, glib, gobject-introspection - , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe - , text, transformers, xdg-basedir, xml-conduit - }: - mkDerivation { - pname = "haskell-gi"; - version = "0.21.5"; - sha256 = "1rvi9bmgxq7q6js8yb5yb156yxmnm9px9amgjwzxmr7sxz31dl8j"; - revision = "1"; - editedCabalFile = "144knmzybslqz8w9cwgl5s4sk1crs9qhynwiqv68wdq67q0s4k80"; - libraryHaskellDepends = [ - attoparsec base bytestring Cabal containers directory filepath - haskell-gi-base mtl pretty-show process regex-tdfa safe text - transformers xdg-basedir xml-conduit - ]; - libraryPkgconfigDepends = [ glib gobject-introspection ]; - testHaskellDepends = [ base doctest process ]; - description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; - - "haskell-gi_0_23_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers , directory, doctest, filepath, glib, gobject-introspection , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe @@ -108465,22 +106945,9 @@ self: { testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; "haskell-gi-base" = callPackage - ({ mkDerivation, base, bytestring, containers, glib, text }: - mkDerivation { - pname = "haskell-gi-base"; - version = "0.21.5"; - sha256 = "1pxnwljicxyxr83c7d8xvla7zbp2krv1n6fp4i2zh8bqwln3fkgh"; - libraryHaskellDepends = [ base bytestring containers text ]; - libraryPkgconfigDepends = [ glib ]; - description = "Foundation for libraries generated by haskell-gi"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib;}; - - "haskell-gi-base_0_23_0" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; @@ -108490,7 +106957,6 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "haskell-gi-overloading_0_0" = callPackage @@ -108601,6 +107067,8 @@ self: { executableHaskellDepends = [ base ]; description = "create haskell import graph for graphviz"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-in-space" = callPackage @@ -108651,38 +107119,6 @@ self: { }) {}; "haskell-lsp" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, data-default - , directory, filepath, hashable, haskell-lsp-types, hslogger, hspec - , lens, mtl, network-uri, parsec, sorted-list, stm, text, time - , transformers, unordered-containers, vector, yi-rope - }: - mkDerivation { - pname = "haskell-lsp"; - version = "0.8.2.0"; - sha256 = "18qkrybwvmyz5h03xj9wjigpqs6s6rw9wi1lqcla4ppg1pkd5zyd"; - revision = "1"; - editedCabalFile = "0m6kprfsgxcmif0mmb1vpc46jyr0kjk6fqv3k1sqfvpjpldh0mvy"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hashable haskell-lsp-types hslogger lens mtl network-uri parsec - sorted-list stm text time unordered-containers yi-rope - ]; - executableHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hslogger lens mtl network-uri parsec stm text time transformers - unordered-containers vector yi-rope - ]; - testHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hashable hspec lens network-uri sorted-list stm text yi-rope - ]; - description = "Haskell library for the Microsoft Language Server Protocol"; - license = stdenv.lib.licenses.mit; - }) {}; - - "haskell-lsp_0_15_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, filepath, hashable , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl @@ -108709,7 +107145,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell library for the Microsoft Language Server Protocol"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-lsp-client" = callPackage @@ -108735,25 +107170,6 @@ self: { }) {}; "haskell-lsp-types" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, filepath - , hashable, lens, network-uri, scientific, text - , unordered-containers - }: - mkDerivation { - pname = "haskell-lsp-types"; - version = "0.8.2.0"; - sha256 = "13pgjm1pm1hp7bln115cn75ig6w3mj7g7rvnvpszlrg9lzmk3ip7"; - revision = "1"; - editedCabalFile = "0gmfxhjn92kzbpd9kzq5n3707lcpkxhnzxgg7lk34jhayiw5kyzj"; - libraryHaskellDepends = [ - aeson base bytestring data-default filepath hashable lens - network-uri scientific text unordered-containers - ]; - description = "Haskell library for the Microsoft Language Server Protocol, data types"; - license = stdenv.lib.licenses.mit; - }) {}; - - "haskell-lsp-types_0_15_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, deepseq , filepath, hashable, lens, network-uri, scientific, text , unordered-containers @@ -108768,7 +107184,6 @@ self: { ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-menu" = callPackage @@ -108848,29 +107263,6 @@ self: { }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;}; "haskell-names" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers - , data-lens-light, filemanip, filepath, haskell-src-exts, mtl - , pretty-show, tasty, tasty-golden, transformers - , traverse-with-class, uniplate - }: - mkDerivation { - pname = "haskell-names"; - version = "0.9.4"; - sha256 = "0dbf5rxysm57jn018wd3dfz3m621n0347mbpgv7q2yb77cwrlg8y"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring containers data-lens-light filepath - haskell-src-exts mtl transformers traverse-with-class uniplate - ]; - testHaskellDepends = [ - base containers filemanip filepath haskell-src-exts mtl pretty-show - tasty tasty-golden traverse-with-class - ]; - description = "Name resolution library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-names_0_9_6" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , data-lens-light, filemanip, filepath, haskell-src-exts, mtl , pretty-show, tasty, tasty-golden, transformers @@ -108891,7 +107283,6 @@ self: { ]; description = "Name resolution library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-neo4j-client" = callPackage @@ -109095,6 +107486,29 @@ self: { broken = true; }) {libpostal = null;}; + "haskell-postgis" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, bytestring-lexing + , cpu, data-binary-ieee754, hspec, mtl, placeholders, text + , unordered-containers, vector + }: + mkDerivation { + pname = "haskell-postgis"; + version = "0.1.0.2"; + sha256 = "0p3zdrzfsz3qj3rcx3yihg7vffa261ig5lywrfls5qvqihw62m41"; + libraryHaskellDepends = [ + aeson base binary bytestring bytestring-lexing cpu + data-binary-ieee754 mtl placeholders text unordered-containers + vector + ]; + testHaskellDepends = [ + aeson base binary bytestring bytestring-lexing cpu + data-binary-ieee754 hspec mtl placeholders text + unordered-containers vector + ]; + description = "A haskell library for PostGIS geometry types"; + license = stdenv.lib.licenses.mit; + }) {}; + "haskell-proxy-list" = callPackage ({ mkDerivation, base, base64-string, bytestring, lens, random , regex-base, regex-posix, text, wreq @@ -109242,26 +107656,6 @@ self: { }) {}; "haskell-src-exts" = callPackage - ({ mkDerivation, array, base, containers, directory, filepath - , ghc-prim, happy, mtl, pretty, pretty-show, smallcheck, tasty - , tasty-golden, tasty-smallcheck - }: - mkDerivation { - pname = "haskell-src-exts"; - version = "1.20.3"; - sha256 = "1a74s4zarxdvhnflkxy13pawbfcdhyrb6gkdx0si8spv66knhgj3"; - libraryHaskellDepends = [ array base ghc-prim pretty ]; - libraryToolDepends = [ happy ]; - testHaskellDepends = [ - base containers directory filepath mtl pretty-show smallcheck tasty - tasty-golden tasty-smallcheck - ]; - doCheck = false; - description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-src-exts_1_21_0" = callPackage ({ mkDerivation, array, base, containers, directory, filepath , ghc-prim, happy, mtl, pretty, pretty-show, smallcheck, tasty , tasty-golden, tasty-smallcheck @@ -109279,7 +107673,6 @@ self: { doCheck = false; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-exts-observe" = callPackage @@ -109354,8 +107747,6 @@ self: { libraryHaskellDepends = [ base haskell-src-exts ]; description = "A simplified view on the haskell-src-exts AST"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haskell-src-exts-util" = callPackage @@ -110687,32 +109078,6 @@ self: { }) {}; "haskoin-core" = callPackage - ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring - , cereal, conduit, containers, cryptonite, entropy, hashable, hspec - , hspec-discover, HUnit, memory, mtl, murmur3, network, QuickCheck - , safe, scientific, secp256k1-haskell, split, string-conversions - , text, time, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "haskoin-core"; - version = "0.8.4"; - sha256 = "0hpabz26wyxvpkvc2xv1xscmbvn0yfj2nnd41ysaf4xgfnh4c9sw"; - libraryHaskellDepends = [ - aeson array base base16-bytestring bytestring cereal conduit - containers cryptonite entropy hashable memory mtl murmur3 network - QuickCheck scientific secp256k1-haskell split string-conversions - text time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring cereal containers hspec HUnit mtl QuickCheck - safe split string-conversions text unordered-containers vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Bitcoin & Bitcoin Cash library for Haskell"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "haskoin-core_0_9_0" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring , cereal, conduit, containers, cryptonite, entropy, hashable, hspec , hspec-discover, HUnit, memory, mtl, murmur3, network, QuickCheck @@ -110736,7 +109101,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Bitcoin & Bitcoin Cash library for Haskell"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskoin-crypto" = callPackage @@ -111561,6 +109925,8 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ]; description = "Variant and EADT"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskus-web" = callPackage @@ -111702,34 +110068,6 @@ self: { }) {inherit (pkgs) aspell;}; "hasql" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring - , bytestring-strict-builder, contravariant, contravariant-extras - , criterion, data-default-class, dlist, hashable, hashtables - , loch-th, mtl, placeholders, postgresql-binary, postgresql-libpq - , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase - , tasty, tasty-hunit, tasty-quickcheck, text, text-builder - , transformers, vector - }: - mkDerivation { - pname = "hasql"; - version = "1.3.0.6"; - sha256 = "01kp8ajg7mw3j6g6d13fsygcbbw7gyrqh3hdllhb1jv53mr7fgb3"; - libraryHaskellDepends = [ - attoparsec base base-prelude bytestring bytestring-strict-builder - contravariant contravariant-extras data-default-class dlist - hashable hashtables loch-th mtl placeholders postgresql-binary - postgresql-libpq profunctors text text-builder transformers vector - ]; - testHaskellDepends = [ - bug data-default-class QuickCheck quickcheck-instances rebase - rerebase tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ bug criterion rerebase ]; - description = "An efficient PostgreSQL driver and a flexible mapping API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hasql_1_4" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring , bytestring-strict-builder, contravariant, contravariant-extras , criterion, dlist, hashable, hashtables, loch-th, mtl @@ -111755,7 +110093,6 @@ self: { benchmarkHaskellDepends = [ bug criterion rerebase ]; description = "An efficient PostgreSQL driver with a flexible mapping API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-backend" = callPackage @@ -111839,8 +110176,6 @@ self: { ]; description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hasql-dynamic-statements" = callPackage @@ -111926,23 +110261,6 @@ self: { }) {}; "hasql-optparse-applicative" = callPackage - ({ mkDerivation, base-prelude, hasql, hasql-pool - , optparse-applicative - }: - mkDerivation { - pname = "hasql-optparse-applicative"; - version = "0.3.0.4"; - sha256 = "0pna4cmpm2chb3ax0i11wgkdx64zchdi4ivz0a0sgklrwq614pmx"; - libraryHaskellDepends = [ - base-prelude hasql hasql-pool optparse-applicative - ]; - description = "\"optparse-applicative\" parsers for \"hasql\""; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hasql-optparse-applicative_0_3_0_5" = callPackage ({ mkDerivation, base-prelude, hasql, hasql-pool , optparse-applicative }: @@ -112059,24 +110377,6 @@ self: { }) {}; "hasql-transaction" = callPackage - ({ mkDerivation, async, base, bytestring, bytestring-tree-builder - , contravariant, contravariant-extras, hasql, mtl, rebase - , transformers - }: - mkDerivation { - pname = "hasql-transaction"; - version = "0.7.1"; - sha256 = "02isgjzx3dhp5a7zgz2pbvm6fwmgbnwbqz7k01argf4pawckb8s9"; - libraryHaskellDepends = [ - base bytestring bytestring-tree-builder contravariant - contravariant-extras hasql mtl transformers - ]; - testHaskellDepends = [ async hasql rebase ]; - description = "A composable abstraction over the retryable transactions for Hasql"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hasql-transaction_0_7_2" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-tree-builder , contravariant, contravariant-extras, hasql, mtl, rebase , transformers @@ -112092,7 +110392,6 @@ self: { testHaskellDepends = [ async hasql rebase ]; description = "A composable abstraction over the retryable transactions for Hasql"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hastache" = callPackage @@ -112461,8 +110760,6 @@ self: { ]; description = "Recursively retrieve maven dependencies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haverer" = callPackage @@ -112542,32 +110839,6 @@ self: { }) {}; "haxl" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers - , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty - , stm, test-framework, test-framework-hunit, text, time - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "haxl"; - version = "2.0.1.1"; - sha256 = "1wfnwi3impv4cv359a65yh50c6kdfxhvbwycf5h76w3cvqdhvwsr"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base binary bytestring containers deepseq exceptions filepath - ghc-prim hashable pretty stm text time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base binary bytestring containers deepseq filepath hashable - HUnit test-framework test-framework-hunit text time - unordered-containers - ]; - description = "A Haskell library for efficient, concurrent, and concise data access"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haxl_2_1_2_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty , stm, test-framework, test-framework-hunit, text, time @@ -112591,7 +110862,6 @@ self: { ]; description = "A Haskell library for efficient, concurrent, and concise data access"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haxl-amazonka" = callPackage @@ -113673,8 +111943,8 @@ self: { }: mkDerivation { pname = "hdocs"; - version = "0.5.3.1"; - sha256 = "0nxvkmhxpxx3500sy7kzpqyp45rq83hjm6gkj10vglxgjk32vzp4"; + version = "0.5.3.2"; + sha256 = "0x899pa5dw1jrc0vcw8aa1f3cx2xz8z0zqhplivji81lpjnajfgv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113949,6 +112219,8 @@ self: { ]; description = "heavy-logger compatibility with amazonka-core logging"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "heavy-logger-instances" = callPackage @@ -114019,34 +112291,6 @@ self: { }) {}; "hedgehog" = callPackage - ({ mkDerivation, ansi-terminal, async, base, bytestring - , concurrent-output, containers, directory, exceptions - , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive - , random, resourcet, semigroups, stm, template-haskell, text - , th-lift, time, transformers, transformers-base, unix - , wl-pprint-annotated - }: - mkDerivation { - pname = "hedgehog"; - version = "0.6.1"; - sha256 = "0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj"; - revision = "5"; - editedCabalFile = "0kwmxjb1y3gk85njacw5wcvmq3bzp1649dbjzgzpiba2w342f7il"; - libraryHaskellDepends = [ - ansi-terminal async base bytestring concurrent-output containers - directory exceptions lifted-async mmorph monad-control mtl - pretty-show primitive random resourcet semigroups stm - template-haskell text th-lift time transformers transformers-base - unix wl-pprint-annotated - ]; - testHaskellDepends = [ - base containers pretty-show semigroups text transformers - ]; - description = "Hedgehog will eat all your bugs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hedgehog_1_0" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring , concurrent-output, containers, directory, exceptions, fail , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive @@ -114071,7 +112315,6 @@ self: { ]; description = "Release with confidence"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedgehog-checkers" = callPackage @@ -114113,6 +112356,8 @@ self: { pname = "hedgehog-classes"; version = "0.2.2"; sha256 = "072w697nc7dv9yi700g5ap4h49ichpw1srzkq07sz637022l19wl"; + revision = "1"; + editedCabalFile = "03kz2y6k8p0ifhjmnpfmjmflz3v2qbjqccv3p87ffgpr5317m14k"; libraryHaskellDepends = [ aeson base binary containers hedgehog pretty-show semirings silently transformers wl-pprint-annotated @@ -114148,8 +112393,6 @@ self: { ]; description = "Function generation for `hedgehog`"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hedgehog-gen-json" = callPackage @@ -114187,6 +112430,8 @@ self: { libraryHaskellDepends = [ base hedgehog ]; description = "GHC Generics automatically derived hedgehog generators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hedgehog-quickcheck" = callPackage @@ -114198,8 +112443,6 @@ self: { libraryHaskellDepends = [ base hedgehog QuickCheck transformers ]; description = "Use QuickCheck generators in Hedgehog and vice versa"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hedis" = callPackage @@ -114210,10 +112453,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.10.10"; - sha256 = "0hbjhccipvg2i1cyinvhlk4jgscam9y5897ib1fh6rc0qwnlblhs"; - revision = "1"; - editedCabalFile = "0fcpf0jqga8wh0ikbpkma8sw7f5376wbc9w9rsiqp51q8f23x04h"; + version = "0.12.6"; + sha256 = "1lx7lwh282ijp63yfy6ybb6zc5zil09abnrsbm052ghdlnz3sfk1"; libraryHaskellDepends = [ async base bytestring bytestring-lexing deepseq errors HTTP mtl network network-uri resource-pool scanner stm text time tls @@ -114228,7 +112469,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hedis_0_12_6" = callPackage + "hedis_0_12_7" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri , resource-pool, scanner, stm, test-framework, test-framework-hunit @@ -114236,8 +112477,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.12.6"; - sha256 = "1lx7lwh282ijp63yfy6ybb6zc5zil09abnrsbm052ghdlnz3sfk1"; + version = "0.12.7"; + sha256 = "1q59g99mv4axwm77f8m5fmlnq04qy04c6s1aj57jvfq7p31iq05a"; libraryHaskellDepends = [ async base bytestring bytestring-lexing deepseq errors HTTP mtl network network-uri resource-pool scanner stm text time tls @@ -114967,8 +113208,8 @@ self: { }: mkDerivation { pname = "heredocs"; - version = "0.1.4"; - sha256 = "0vy5d7z58vspjgncfiy10nalm70xqqdhy8ba1rkqzn9l5w79p1rz"; + version = "0.1.5"; + sha256 = "1bmih3jwmx8dv128rb9w1682fp3w0f6i7hhyyakswy7a04q34ryi"; libraryHaskellDepends = [ base bytestring doctest parsec template-haskell text ]; @@ -115764,6 +114005,8 @@ self: { ]; description = "Heyting and Boolean algebras"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hfann" = callPackage @@ -116235,6 +114478,8 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Haskell interface to GMP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hgom" = callPackage @@ -116413,8 +114658,6 @@ self: { testHaskellDepends = [ base binary bytestring hspec rio vector ]; description = "Parser for GHC's hi files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hi3status" = callPackage @@ -116617,7 +114860,7 @@ self: { "hierarchical-spectral-clustering" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cassava - , clustering, containers, directory, eigen, fgl, filepath + , clustering, containers, directory, fgl, filepath , hierarchical-clustering, hmatrix, lens, managed, modularity, mtl , optparse-generic, safe, sparse-linear-algebra , spectral-clustering, streaming, streaming-bytestring @@ -116626,12 +114869,12 @@ self: { }: mkDerivation { pname = "hierarchical-spectral-clustering"; - version = "0.4.1.1"; - sha256 = "0wi1yw0mhszalixay7sd1n7i8xjmb3m6v7h3kn09ih5vn3bxj26f"; + version = "0.4.1.2"; + sha256 = "1yx366z7fnmxdb424b2n8bgfwcbhm85bha020p481wbq74nqfc6d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base cassava clustering containers eigen fgl + aeson base cassava clustering containers fgl hierarchical-clustering hmatrix managed modularity mtl safe sparse-linear-algebra spectral-clustering streaming streaming-bytestring streaming-cassava streaming-with text tree-fun @@ -116722,6 +114965,8 @@ self: { ]; description = "Partial types as a type constructor"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "highWaterMark" = callPackage @@ -117265,26 +115510,6 @@ self: { }) {}; "hint" = callPackage - ({ mkDerivation, base, directory, exceptions, extensible-exceptions - , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, temporary - , unix - }: - mkDerivation { - pname = "hint"; - version = "0.9.0"; - sha256 = "1g7q4clzc2pdnbvmm265dindjpynabsykd088qjjzlk6590sy9bl"; - libraryHaskellDepends = [ - base directory exceptions filepath ghc ghc-boot ghc-paths mtl - random temporary unix - ]; - testHaskellDepends = [ - base directory exceptions extensible-exceptions filepath HUnit unix - ]; - description = "Runtime Haskell interpreter (GHC API wrapper)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hint_0_9_0_1" = callPackage ({ mkDerivation, base, containers, directory, exceptions , extensible-exceptions, filepath, ghc, ghc-boot, ghc-paths, HUnit , mtl, random, temporary, unix @@ -117303,7 +115528,6 @@ self: { ]; description = "Runtime Haskell interpreter (GHC API wrapper)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hint-server" = callPackage @@ -117367,6 +115591,8 @@ self: { ]; description = "Haskell / Erlang interoperability library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hinvaders" = callPackage @@ -118055,8 +116281,6 @@ self: { ]; description = "Simple Hackage release workflow for package maintainers"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hkt" = callPackage @@ -118235,6 +116459,8 @@ self: { ]; description = "Web API server for the hledger accounting tool"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hledger-chart" = callPackage @@ -118635,6 +116861,8 @@ self: { ]; description = "Client library for the Apache Livy REST API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hlogger" = callPackage @@ -118786,27 +117014,6 @@ self: { }) {}; "hmatrix" = callPackage - ({ mkDerivation, array, base, binary, bytestring, deepseq - , openblasCompat, random, semigroups, split, storable-complex - , vector - }: - mkDerivation { - pname = "hmatrix"; - version = "0.19.0.0"; - sha256 = "10jd69nby29dggghcyjk6ykyr5wrn97nrv1dkpyrp0y5xm12xssj"; - revision = "1"; - editedCabalFile = "0krx0ds5mcj28y6zpg0r50lljn8681wi4c5lqcdz2c71nhixfq8h"; - configureFlags = [ "-fdisable-default-paths" "-fopenblas" ]; - libraryHaskellDepends = [ - array base binary bytestring deepseq random semigroups split - storable-complex vector - ]; - librarySystemDepends = [ openblasCompat ]; - description = "Numeric Linear Algebra"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) openblasCompat;}; - - "hmatrix_0_20_0_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, deepseq , openblasCompat, random, semigroups, split, storable-complex , vector @@ -118823,7 +117030,6 @@ self: { librarySystemDepends = [ openblasCompat ]; description = "Numeric Linear Algebra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openblasCompat;}; "hmatrix-backprop" = callPackage @@ -118846,6 +117052,8 @@ self: { ]; description = "hmatrix operations lifted for backprop"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hmatrix-banded" = callPackage @@ -119085,6 +117293,8 @@ self: { benchmarkHaskellDepends = [ base criterion hmatrix vector ]; description = "SVDLIBC bindings for HMatrix"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hmatrix-syntax" = callPackage @@ -119442,6 +117652,8 @@ self: { testSystemDepends = [ netcdf ]; description = "Haskell NetCDF library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) netcdf;}; "hnix" = callPackage @@ -119506,6 +117718,8 @@ self: { ]; description = "Haskell implementation of the Nix language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hnix-store-core" = callPackage @@ -119533,6 +117747,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Core effects for interacting with the Nix store"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hnix-store-remote" = callPackage @@ -119556,6 +117772,8 @@ self: { ]; description = "Remote hnix store"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hnn" = callPackage @@ -119667,25 +117885,6 @@ self: { }) {}; "hoauth2" = callPackage - ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit - , http-types, microlens, text, unordered-containers, uri-bytestring - , uri-bytestring-aeson - }: - mkDerivation { - pname = "hoauth2"; - version = "1.8.7"; - sha256 = "0x99dh6k6njhsab5vk9q9q4jd5l4yq4cb9c08shvsv0xghsnlh4z"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring exceptions http-conduit http-types microlens - text unordered-containers uri-bytestring uri-bytestring-aeson - ]; - description = "Haskell OAuth2 authentication client"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hoauth2_1_8_8" = callPackage ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit , http-types, microlens, text, unordered-containers, uri-bytestring , uri-bytestring-aeson @@ -119702,7 +117901,6 @@ self: { ]; description = "Haskell OAuth2 authentication client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hob" = callPackage @@ -120737,6 +118935,8 @@ self: { executableToolDepends = [ alex happy ]; description = "hOpenPGP-based command-line tools"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hopenssl" = callPackage @@ -121400,6 +119600,8 @@ self: { ]; description = "hpack's dhalling"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hpaco" = callPackage @@ -121698,6 +119900,8 @@ self: { ]; description = "Monads for GPIO in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hplayground" = callPackage @@ -121855,6 +120059,8 @@ self: { executableToolDepends = [ alex ]; description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hprotoc-fork" = callPackage @@ -123379,6 +121585,8 @@ self: { testHaskellDepends = [ base tasty tasty-hspec ]; description = "A preprocessor that helps with writing Haskell bindings to C code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsc3" = callPackage @@ -124075,7 +122283,7 @@ self: { broken = true; }) {}; - "hsdev_0_3_3_2" = callPackage + "hsdev_0_3_3_4" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, attoparsec , base, bytestring, Cabal, containers, cpphs, data-default, deepseq , direct-sqlite, directory, exceptions, filepath, fsnotify, ghc @@ -124089,8 +122297,8 @@ self: { }: mkDerivation { pname = "hsdev"; - version = "0.3.3.2"; - sha256 = "1qx5ppj1l871pm9qhqwd4297p3cp0v0fv64fkw4cdbpjza798x1i"; + version = "0.3.3.4"; + sha256 = "1hj2krdq4ybs1vcy9gw6p56sznzi7wrhkaaya4560kjyijvvfdml"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124150,23 +122358,6 @@ self: { }) {}; "hsdns" = callPackage - ({ mkDerivation, adns, base, containers, network }: - mkDerivation { - pname = "hsdns"; - version = "1.7.1"; - sha256 = "0i50p31zxsrkx9hv3mqcl2042lf922b1fsswmd99d66ybkl01kag"; - revision = "1"; - editedCabalFile = "0w4hrmj7ph5dgarl82xpa0g77ncjdqk0wc9wp771pry98xxihzl8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers network ]; - librarySystemDepends = [ adns ]; - description = "Asynchronous DNS Resolver"; - license = stdenv.lib.licenses.lgpl3; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {inherit (pkgs) adns;}; - - "hsdns_1_8" = callPackage ({ mkDerivation, adns, base, containers, network }: mkDerivation { pname = "hsdns"; @@ -124180,7 +122371,6 @@ self: { librarySystemDepends = [ adns ]; description = "Asynchronous DNS Resolver"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) adns;}; @@ -124229,19 +122419,6 @@ self: { }) {}; "hsemail" = callPackage - ({ mkDerivation, base, doctest, hspec, mtl, old-time, parsec }: - mkDerivation { - pname = "hsemail"; - version = "2"; - sha256 = "1nd8pzsdan6zxddm96xswcm67g43zkbj1rm3m3wx3as4jj3qmw7m"; - libraryHaskellDepends = [ base mtl old-time parsec ]; - testHaskellDepends = [ base doctest hspec mtl old-time parsec ]; - description = "Parsec parsers for the RFC2822 Internet Message format"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - - "hsemail_2_2_0" = callPackage ({ mkDerivation, base, hspec, parsec, time, time-compat }: mkDerivation { pname = "hsemail"; @@ -124251,7 +122428,6 @@ self: { testHaskellDepends = [ base hspec parsec time ]; description = "Parsec parsers for the Internet Message format (e-mail)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -125171,21 +123347,6 @@ self: { }) {}; "hspec" = callPackage - ({ mkDerivation, base, hspec-core, hspec-discover - , hspec-expectations, QuickCheck - }: - mkDerivation { - pname = "hspec"; - version = "2.6.1"; - sha256 = "1jkfqhdymr62rzqmlmc22mpla23p67rnls3v3zs30ggxbgs4dxlb"; - libraryHaskellDepends = [ - base hspec-core hspec-discover hspec-expectations QuickCheck - ]; - description = "A Testing Framework for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec_2_7_1" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: @@ -125198,7 +123359,6 @@ self: { ]; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-attoparsec" = callPackage @@ -125246,33 +123406,6 @@ self: { }) {}; "hspec-core" = callPackage - ({ mkDerivation, ansi-terminal, array, base, call-stack, clock - , deepseq, directory, filepath, hspec-expectations, hspec-meta - , HUnit, process, QuickCheck, quickcheck-io, random, setenv - , silently, stm, temporary, tf-random, transformers - }: - mkDerivation { - pname = "hspec-core"; - version = "2.6.1"; - sha256 = "0xg43kan7p6ahi5827qwcyiic6bq0bp8n0n8h3j4kh87qhdl4avv"; - libraryHaskellDepends = [ - ansi-terminal array base call-stack clock deepseq directory - filepath hspec-expectations HUnit QuickCheck quickcheck-io random - setenv stm tf-random transformers - ]; - testHaskellDepends = [ - ansi-terminal array base call-stack clock deepseq directory - filepath hspec-expectations hspec-meta HUnit process QuickCheck - quickcheck-io random setenv silently stm temporary tf-random - transformers - ]; - testToolDepends = [ hspec-meta ]; - testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; - description = "A Testing Framework for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-core_2_7_1" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, hspec-expectations, hspec-meta , HUnit, process, QuickCheck, quickcheck-io, random, setenv @@ -125297,7 +123430,6 @@ self: { testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-dirstream" = callPackage @@ -125319,25 +123451,6 @@ self: { }) {}; "hspec-discover" = callPackage - ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck - }: - mkDerivation { - pname = "hspec-discover"; - version = "2.6.1"; - sha256 = "189gj8drfzdf3j3xm8gbj9hjc1ha95ajhi47s9r440yjhyarlmlx"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base directory filepath ]; - executableHaskellDepends = [ base directory filepath ]; - testHaskellDepends = [ - base directory filepath hspec-meta QuickCheck - ]; - testToolDepends = [ hspec-meta ]; - description = "Automatically discover and run Hspec tests"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-discover_2_7_1" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck }: mkDerivation { @@ -125354,7 +123467,6 @@ self: { testToolDepends = [ hspec-meta ]; description = "Automatically discover and run Hspec tests"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-expectations" = callPackage @@ -125568,24 +123680,6 @@ self: { }) {}; "hspec-megaparsec" = callPackage - ({ mkDerivation, base, containers, hspec, hspec-expectations - , megaparsec - }: - mkDerivation { - pname = "hspec-megaparsec"; - version = "2.0.0"; - sha256 = "0c4vb0c2y8yar0jjhh24wkkp1g7pbg2wc8h8nw3avfznbil6zyd8"; - revision = "1"; - editedCabalFile = "15hpf1v1d4dwzdvk7xhgj37yd37pcyj6yzw750k1fcj6j0hk4rb7"; - libraryHaskellDepends = [ - base containers hspec-expectations megaparsec - ]; - testHaskellDepends = [ base hspec hspec-expectations megaparsec ]; - description = "Utility functions for testing Megaparsec parsers with Hspec"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hspec-megaparsec_2_0_1" = callPackage ({ mkDerivation, base, containers, hspec, hspec-expectations , megaparsec }: @@ -125599,7 +123693,6 @@ self: { testHaskellDepends = [ base hspec hspec-expectations megaparsec ]; description = "Utility functions for testing Megaparsec parsers with Hspec"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-meta" = callPackage @@ -126770,6 +124863,8 @@ self: { ]; description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsyscall" = callPackage @@ -127356,6 +125451,8 @@ self: { ]; description = "Parser for TOML files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "htoml-megaparsec" = callPackage @@ -127380,6 +125477,8 @@ self: { doHaddock = false; description = "Parser for TOML files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "htrace" = callPackage @@ -127500,33 +125599,6 @@ self: { }) {}; "http-api-data" = callPackage - ({ mkDerivation, attoparsec, attoparsec-iso8601, base, base-compat - , bytestring, Cabal, cabal-doctest, containers, cookie, directory - , doctest, filepath, hashable, hspec, hspec-discover, http-types - , HUnit, nats, QuickCheck, quickcheck-instances, tagged, text, time - , time-locale-compat, unordered-containers, uuid-types - }: - mkDerivation { - pname = "http-api-data"; - version = "0.4"; - sha256 = "12ja2rrs6dvajw300agp4fms21859a7n193m7nicmwixy8wkyzl3"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - attoparsec attoparsec-iso8601 base base-compat bytestring - containers cookie hashable http-types tagged text time - time-locale-compat unordered-containers uuid-types - ]; - testHaskellDepends = [ - base base-compat bytestring cookie directory doctest filepath hspec - HUnit nats QuickCheck quickcheck-instances text time - unordered-containers uuid-types - ]; - testToolDepends = [ hspec-discover ]; - description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-api-data_0_4_1" = callPackage ({ mkDerivation, attoparsec, attoparsec-iso8601, base, base-compat , bytestring, Cabal, cabal-doctest, containers, cookie, directory , doctest, filepath, hashable, hspec, hspec-discover, http-types @@ -127551,7 +125623,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-attoparsec" = callPackage @@ -127568,35 +125639,6 @@ self: { }) {}; "http-client" = callPackage - ({ mkDerivation, array, async, base, blaze-builder, bytestring - , case-insensitive, containers, cookie, deepseq, directory - , exceptions, filepath, ghc-prim, hspec, http-types, memory - , mime-types, monad-control, network, network-uri, random, stm - , streaming-commons, text, time, transformers, zlib - }: - mkDerivation { - pname = "http-client"; - version = "0.5.14"; - sha256 = "0irnvrxlsr9f7ybvzbpv24zbq3lhxjzh6bavjnl527020jbl0l4f"; - revision = "1"; - editedCabalFile = "0xw5ac4cvcd4hcwl7j12adi7sgffjryqhk0x992k3qs1cxyv5028"; - libraryHaskellDepends = [ - array base blaze-builder bytestring case-insensitive containers - cookie deepseq exceptions filepath ghc-prim http-types memory - mime-types network network-uri random stm streaming-commons text - time transformers - ]; - testHaskellDepends = [ - async base blaze-builder bytestring case-insensitive containers - deepseq directory hspec http-types monad-control network - network-uri streaming-commons text time transformers zlib - ]; - doCheck = false; - description = "An HTTP client engine"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-client_0_6_4" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , case-insensitive, containers, cookie, deepseq, directory , exceptions, filepath, ghc-prim, hspec, http-types, memory @@ -127621,7 +125663,6 @@ self: { doCheck = false; description = "An HTTP client engine"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-client-auth" = callPackage @@ -127757,6 +125798,8 @@ self: { ]; description = "restricting the servers that http-client will use"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-client-session" = callPackage @@ -127941,8 +125984,6 @@ self: { ]; description = "HTTP downloader tailored for web-crawler needs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "http-date" = callPackage @@ -128025,8 +126066,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Verified downloads with retries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "http-encodings" = callPackage @@ -128190,28 +126229,6 @@ self: { }) {}; "http-media" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , QuickCheck, test-framework, test-framework-quickcheck2 - , utf8-string - }: - mkDerivation { - pname = "http-media"; - version = "0.7.1.3"; - sha256 = "0kqjzvh5y8r6x5rw2kgd816w2963c6cbyw2qjvaj2mv59zxzqkrr"; - revision = "1"; - editedCabalFile = "19py5pspx80gg679p9dzqr3iidflppxc1x4vkldamjkidyi406j8"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers utf8-string - ]; - testHaskellDepends = [ - base bytestring case-insensitive containers QuickCheck - test-framework test-framework-quickcheck2 utf8-string - ]; - description = "Processing HTTP Content-Type and Accept headers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-media_0_8_0_0" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , QuickCheck, test-framework, test-framework-quickcheck2 , utf8-string @@ -128231,7 +126248,6 @@ self: { ]; description = "Processing HTTP Content-Type and Accept headers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-monad" = callPackage @@ -128269,8 +126285,6 @@ self: { ]; description = "A type unsafe http library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "http-pony-serve-wai" = callPackage @@ -128694,26 +126708,9 @@ self: { ]; description = "Types for gRPC over HTTP2 common for client and servers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "httpd-shed" = callPackage - ({ mkDerivation, base, network, network-uri }: - mkDerivation { - pname = "httpd-shed"; - version = "0.4.0.3"; - sha256 = "064jy1mqhnf1hvq6s04wlhmp916rd522x58djb9qixv13vc8gzxh"; - revision = "2"; - editedCabalFile = "12y9qf8s0aq4dc80wrvh14cjvvm4mcygrqq72w4z8w9n8mp8jg9p"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base network network-uri ]; - description = "A simple web-server with an interact style API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "httpd-shed_0_4_1_1" = callPackage ({ mkDerivation, base, network, network-bsd, network-uri }: mkDerivation { pname = "httpd-shed"; @@ -128724,7 +126721,6 @@ self: { libraryHaskellDepends = [ base network network-bsd network-uri ]; description = "A simple web-server with an interact style API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "https-everywhere-rules" = callPackage @@ -129105,17 +127101,6 @@ self: { }) {}; "hunit-dejafu" = callPackage - ({ mkDerivation, base, dejafu, exceptions, HUnit }: - mkDerivation { - pname = "hunit-dejafu"; - version = "1.2.1.0"; - sha256 = "075xx6rz1bxyj00plkrfz04wfq1rim8nkn43xj0d7js86qhvqyrc"; - libraryHaskellDepends = [ base dejafu exceptions HUnit ]; - description = "Deja Fu support for the HUnit test framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hunit-dejafu_2_0_0_1" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; @@ -129124,7 +127109,6 @@ self: { libraryHaskellDepends = [ base dejafu exceptions HUnit ]; description = "Deja Fu support for the HUnit test framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hunit-gui" = callPackage @@ -129318,8 +127302,6 @@ self: { ]; description = "Upload packages or documentation to a hackage server"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hurdle" = callPackage @@ -129484,17 +127466,6 @@ self: { }) {}; "hvega" = callPackage - ({ mkDerivation, aeson, base, text, vector }: - mkDerivation { - pname = "hvega"; - version = "0.1.0.3"; - sha256 = "0hh5izmw6ss4yznr665674p48lwxgzf3kspl86sy4sfrbab5jxqa"; - libraryHaskellDepends = [ aeson base text vector ]; - description = "Create Vega and Vega-Lite visualizations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hvega_0_3_0_1" = callPackage ({ mkDerivation, aeson, base, text, vector }: mkDerivation { pname = "hvega"; @@ -129503,7 +127474,6 @@ self: { libraryHaskellDepends = [ aeson base text vector ]; description = "Create Vega-Lite visualizations (version 3) in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-aeson" = callPackage @@ -129619,6 +127589,8 @@ self: { doHaddock = false; description = "CI Assistant for Haskell projects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-conduit" = callPackage @@ -129744,26 +127716,6 @@ self: { }) {}; "hw-eliasfano" = callPackage - ({ mkDerivation, base, hspec, hw-bits, hw-int, hw-packed-vector - , hw-prim, QuickCheck, safe, vector - }: - mkDerivation { - pname = "hw-eliasfano"; - version = "0.1.0.1"; - sha256 = "1rj8435fyg882f69cw0p20j8q9j6jlyvf3gshgkbyi2fzv5hnw8l"; - libraryHaskellDepends = [ - base hw-bits hw-int hw-packed-vector hw-prim safe vector - ]; - testHaskellDepends = [ - base hspec hw-bits hw-int hw-prim QuickCheck vector - ]; - description = "Elias-Fano"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hw-eliasfano_0_1_1_0" = 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 @@ -129875,20 +127827,6 @@ self: { }) {}; "hw-hspec-hedgehog" = callPackage - ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }: - mkDerivation { - pname = "hw-hspec-hedgehog"; - version = "0.1.0.4"; - sha256 = "1vlrrskalip7a477px7imwy9yifvdx7c03zrgk90rlarivwkggaq"; - revision = "2"; - editedCabalFile = "1jh0p4i87c2bn926s0d7qx6ykssjj26fia0d24grlklkd14bnmpq"; - libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit ]; - testHaskellDepends = [ base hedgehog hspec ]; - description = "Interoperability between hspec and hedgehog"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-hspec-hedgehog_0_1_0_7" = callPackage ({ mkDerivation, base, call-stack, hedgehog, hspec, hspec-discover , HUnit, transformers }: @@ -129905,7 +127843,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Interoperability between hspec and hedgehog"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-int" = callPackage @@ -129920,27 +127857,6 @@ self: { }) {}; "hw-ip" = callPackage - ({ mkDerivation, appar, base, containers, generic-lens, hedgehog - , hspec, hw-bits, hw-hspec-hedgehog, iproute, text - }: - mkDerivation { - pname = "hw-ip"; - version = "2.0.1.0"; - sha256 = "1r1ck890id7x9b1dpp23h656mvh24bacxdbvxhgkdjiryklrjsqr"; - libraryHaskellDepends = [ - appar base containers generic-lens hw-bits iproute text - ]; - testHaskellDepends = [ - appar base generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog - text - ]; - description = "Library for manipulating IP addresses and CIDR blocks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hw-ip_2_3_1_2" = callPackage ({ mkDerivation, appar, base, binary, bytestring, containers , generic-lens, hedgehog, hspec, hspec-discover, hw-bits , hw-hspec-hedgehog, iproute, lens, optparse-applicative, text @@ -129971,34 +127887,38 @@ self: { "hw-json" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base - , bytestring, containers, criterion, directory, dlist, hspec - , hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim - , hw-rankselect, hw-rankselect-base, lens, mmap - , optparse-applicative, text, vector, word8 + , bits-extra, bytestring, criterion, directory, dlist, generic-lens + , hedgehog, hspec, hspec-discover, hw-balancedparens, hw-bits + , hw-hspec-hedgehog, hw-json-simd, hw-mquery, hw-parser, hw-prim + , hw-rankselect, hw-rankselect-base, hw-simd, lens, mmap + , optparse-applicative, text, transformers, vector, word8 }: mkDerivation { pname = "hw-json"; - version = "0.9.0.1"; - sha256 = "00prvi3jrb02g92vq1ghyxpdpqangj482x1k3l13s385804grgqw"; + version = "1.0.0.2"; + sha256 = "0lb38kfxhamvdhp6z3aw4as57nc6jxf6wj7nr3lmiry6h2gx15js"; + revision = "1"; + editedCabalFile = "1laxwrcjdjrpym4gghnqa39xvdvbxsp2sbpzcc703ac3kj7v2b6h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint array attoparsec base bytestring containers dlist + ansi-wl-pprint array attoparsec base bits-extra bytestring dlist hw-balancedparens hw-bits hw-mquery hw-parser hw-prim hw-rankselect - hw-rankselect-base mmap text vector word8 + hw-rankselect-base hw-simd mmap text vector word8 ]; executableHaskellDepends = [ - base bytestring criterion dlist hw-balancedparens hw-bits hw-mquery - hw-prim hw-rankselect hw-rankselect-base lens mmap + base bytestring dlist generic-lens hw-balancedparens hw-json-simd + hw-mquery hw-prim hw-rankselect hw-rankselect-base lens mmap optparse-applicative vector ]; testHaskellDepends = [ - attoparsec base bytestring containers hspec hw-balancedparens - hw-bits hw-prim hw-rankselect hw-rankselect-base mmap vector + attoparsec base bytestring hedgehog hspec hw-balancedparens hw-bits + hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base + transformers vector ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - base bytestring criterion directory hw-balancedparens hw-bits - hw-prim hw-rankselect hw-rankselect-base mmap vector + base bytestring criterion directory mmap ]; description = "Memory efficient JSON parser"; license = stdenv.lib.licenses.bsd3; @@ -130236,33 +128156,6 @@ self: { }) {}; "hw-mquery" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, dlist, hedgehog, hspec - , hspec-discover, hw-hspec-hedgehog, lens, QuickCheck, semigroups - }: - mkDerivation { - pname = "hw-mquery"; - version = "0.1.0.3"; - sha256 = "0i020vl1f2nkk80rd1fmx9ilkrzyggp01ka3bz9n0365mcq5g3s5"; - revision = "1"; - editedCabalFile = "1i5kir4fxv564h01sjj29zs460w23rj7q5ykq98x3cwmynlrkl6l"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-wl-pprint base dlist lens semigroups - ]; - executableHaskellDepends = [ - ansi-wl-pprint base dlist lens semigroups - ]; - testHaskellDepends = [ - ansi-wl-pprint base dlist hedgehog hspec hw-hspec-hedgehog lens - QuickCheck semigroups - ]; - testToolDepends = [ hspec-discover ]; - description = "Monadic query DSL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-mquery_0_2_0_1" = callPackage ({ mkDerivation, ansi-wl-pprint, base, dlist, hedgehog, hspec , hspec-discover, hw-hspec-hedgehog, lens, semigroups }: @@ -130284,22 +128177,27 @@ self: { testToolDepends = [ hspec-discover ]; description = "Monadic query DSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-packed-vector" = callPackage - ({ mkDerivation, base, bytestring, hspec, hw-bits, hw-int, hw-prim - , hw-string-parse, QuickCheck, safe, vector + ({ mkDerivation, base, bytestring, criterion, deepseq, directory + , hedgehog, hspec, hspec-discover, hw-bits, hw-hedgehog + , hw-hspec-hedgehog, hw-prim, vector }: mkDerivation { pname = "hw-packed-vector"; - version = "0.0.0.1"; - sha256 = "0ca9073b79ifh5rhif6ph6fqq5aad0pk1djbka46xk93rf00m65n"; + version = "0.0.0.3"; + sha256 = "1l021x4sya6fmdhz6nsqh4nvvc3bbb29y30ari0qvn5789nwxzv3"; libraryHaskellDepends = [ - base bytestring hw-bits hw-int hw-prim hw-string-parse safe vector + base bytestring deepseq hw-bits hw-prim vector ]; testHaskellDepends = [ - base bytestring hspec hw-bits hw-prim QuickCheck vector + base bytestring hedgehog hspec hw-bits hw-hedgehog + hw-hspec-hedgehog hw-prim vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base criterion directory hedgehog hspec hw-prim vector ]; description = "Packed Vector"; license = stdenv.lib.licenses.bsd3; @@ -130360,30 +128258,6 @@ self: { }) {}; "hw-prim" = callPackage - ({ mkDerivation, base, bytestring, criterion, directory, exceptions - , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog - , mmap, QuickCheck, semigroups, transformers, vector - }: - mkDerivation { - pname = "hw-prim"; - version = "0.6.2.28"; - sha256 = "13sszlfw4k4vb2zzipjisk3b4qjs19jzmczfjhzs0dap6gw39haz"; - libraryHaskellDepends = [ - base bytestring ghc-prim mmap semigroups transformers vector - ]; - testHaskellDepends = [ - base bytestring directory exceptions hedgehog hspec - hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion mmap semigroups transformers vector - ]; - description = "Primitive functions and data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-prim_0_6_2_31" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, exceptions , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog , mmap, QuickCheck, semigroups, transformers, unliftio-core, vector @@ -130406,7 +128280,6 @@ self: { ]; description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-prim-bits" = callPackage @@ -130431,15 +128304,17 @@ self: { "hw-rankselect" = callPackage ({ mkDerivation, base, bytestring, conduit, criterion, deepseq - , directory, hedgehog, hspec, hw-balancedparens, hw-bits - , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens - , mmap, mtl, optparse-applicative, QuickCheck, resourcet - , transformers, vector + , directory, generic-lens, hedgehog, hspec, hspec-discover + , hw-balancedparens, hw-bits, hw-hedgehog, hw-hspec-hedgehog + , hw-prim, hw-rankselect-base, lens, mmap, mtl + , optparse-applicative, QuickCheck, resourcet, transformers, vector }: mkDerivation { pname = "hw-rankselect"; - version = "0.12.0.4"; - sha256 = "0l27pfsqvil9l4p7hk2bvgxsa35z88179w88wbwvmjf4vsmpiqkh"; + version = "0.13.0.0"; + sha256 = "13cdsrg7akizf5gcjvpwr8mwhl6ds9n3y7ql559w52xy5s8viqzv"; + revision = "1"; + editedCabalFile = "17f9zdy7620d36mrrcakpr9rhzzr7rkv8hd5n47cqllmhzvns5mg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130447,13 +128322,14 @@ self: { vector ]; executableHaskellDepends = [ - base directory hw-bits hw-prim hw-rankselect-base lens mmap mtl - optparse-applicative vector + base directory generic-lens hw-bits hw-prim hw-rankselect-base lens + mmap mtl optparse-applicative vector ]; testHaskellDepends = [ base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog hw-prim hw-rankselect-base mmap QuickCheck transformers vector ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base bytestring conduit criterion directory hw-bits hw-prim hw-rankselect-base mmap resourcet vector @@ -131028,17 +128904,6 @@ self: { }) {}; "hxt-charproperties" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "hxt-charproperties"; - version = "9.2.0.1"; - sha256 = "1mml8wglvagqq891rchgli6r8rnkwrqhgsxfl6kb5403pzb18rp4"; - libraryHaskellDepends = [ base ]; - description = "Character properties and classes for XML and Unicode"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hxt-charproperties_9_4_0_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "hxt-charproperties"; @@ -131047,7 +128912,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Character properties and classes for XML and Unicode"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hxt-css" = callPackage @@ -131851,28 +129715,6 @@ self: { }) {}; "hyphenation" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, containers - , doctest, unordered-containers, zlib - }: - mkDerivation { - pname = "hyphenation"; - version = "0.7.1"; - sha256 = "1h5i07v2zlka29dj4zysc47p747j88x6z4zm3zwcr5i8yirm0p52"; - revision = "5"; - editedCabalFile = "00wsp69aqi5i906liqa4sfs0p2yclhr1ihz8y1700b3ymb70lzql"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base bytestring containers unordered-containers zlib - ]; - testHaskellDepends = [ - base containers doctest unordered-containers - ]; - description = "Configurable Knuth-Liang hyphenation"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "hyphenation_0_8" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, containers , doctest, text, unordered-containers, zlib }: @@ -131890,7 +129732,6 @@ self: { ]; description = "Configurable Knuth-Liang hyphenation"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hypher" = callPackage @@ -132257,6 +130098,8 @@ self: { testHaskellDepends = [ base ]; description = "Type safe iconv wrapper"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ide-backend" = callPackage @@ -133407,8 +131250,6 @@ self: { ]; description = "A function to post an image to imgur"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "imgurder" = callPackage @@ -133661,6 +131502,8 @@ self: { doHaddock = false; description = "Framework for defaulting superclasses"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "implicit" = callPackage @@ -134465,29 +132308,6 @@ self: { }) {}; "influxdb" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal - , cabal-doctest, clock, containers, doctest, foldl, http-client - , http-types, lens, network, optional-args, scientific, tagged - , template-haskell, text, time, unordered-containers, vector - }: - mkDerivation { - pname = "influxdb"; - version = "1.6.1.3"; - sha256 = "1l03bwmwxb42cha8v3fj616ks927mcklxrmqxrr1ms53m7bsa587"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson attoparsec base bytestring clock containers foldl http-client - http-types lens network optional-args scientific tagged text time - unordered-containers vector - ]; - testHaskellDepends = [ base doctest template-haskell ]; - description = "Haskell client library for InfluxDB"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "influxdb_1_7_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, clock, containers, doctest, foldl, http-client , http-types, lens, network, optional-args, raw-strings-qq @@ -134512,7 +132332,6 @@ self: { ]; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "informative" = callPackage @@ -134546,21 +132365,6 @@ self: { }) {}; "ini" = callPackage - ({ mkDerivation, attoparsec, base, text, unordered-containers }: - mkDerivation { - pname = "ini"; - version = "0.3.6"; - sha256 = "1n9wsl7nz910bc8jx9ps7pvpql4hlnryjkqbdpfq0phjb9sf7fzw"; - revision = "1"; - editedCabalFile = "0gfikdal67aws20i5r4wg4r0lgn844glykcn3nnmbmyvwsks049l"; - libraryHaskellDepends = [ - attoparsec base text unordered-containers - ]; - description = "Quick and easy configuration files in the INI format"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ini_0_4_1" = callPackage ({ mkDerivation, attoparsec, base, hspec, text , unordered-containers }: @@ -134574,7 +132378,6 @@ self: { testHaskellDepends = [ base hspec unordered-containers ]; description = "Quick and easy configuration files in the INI format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ini-qq" = callPackage @@ -134589,6 +132392,8 @@ self: { testHaskellDepends = [ base HUnit ini raw-strings-qq text ]; description = "Quasiquoter for INI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "inilist" = callPackage @@ -134939,8 +132744,6 @@ self: { ]; description = "A simple proxy for debugging plaintext protocols communication"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "inspection-testing" = callPackage @@ -135639,27 +133442,6 @@ self: { }) {}; "interpolator" = callPackage - ({ mkDerivation, aeson, base, containers, either, hspec - , mono-traversable, mtl, product-profunctors, profunctors - , QuickCheck, template-haskell, text - }: - mkDerivation { - pname = "interpolator"; - version = "0.1.2"; - sha256 = "1kzqlwgpbzrq0flr90f9q359j8qjxll5adl9w5r9gp1yj3j7hrrz"; - libraryHaskellDepends = [ - aeson base containers either mono-traversable mtl - product-profunctors profunctors QuickCheck template-haskell text - ]; - testHaskellDepends = [ - aeson base containers either hspec mono-traversable mtl - product-profunctors profunctors QuickCheck template-haskell text - ]; - description = "Runtime interpolation of environment variables in records using profunctors"; - license = stdenv.lib.licenses.mit; - }) {}; - - "interpolator_1_0_0" = callPackage ({ mkDerivation, aeson, base, containers, either, hspec , mono-traversable, mtl, product-profunctors, profunctors , QuickCheck, template-haskell, text @@ -135678,7 +133460,6 @@ self: { ]; description = "Runtime interpolation of environment variables in records using profunctors"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "interprocess" = callPackage @@ -136265,6 +134046,8 @@ self: { ]; description = "EDSL for concurrent, realtime, embedded programming on top of Ivory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ioref-stable" = callPackage @@ -136318,33 +134101,6 @@ self: { }) {}; "ip" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion - , deepseq, doctest, hashable, hspec, hspec-discover, HUnit - , primitive, QuickCheck, quickcheck-classes, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, vector - }: - mkDerivation { - pname = "ip"; - version = "1.4.2.1"; - sha256 = "0661bygbgd2j897hbzs2pgqdk12px2d904r13lfw7bcrp892xja1"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring deepseq hashable primitive text - vector - ]; - testHaskellDepends = [ - attoparsec base bytestring doctest hspec HUnit QuickCheck - quickcheck-classes test-framework test-framework-hunit - test-framework-quickcheck2 text - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - attoparsec base bytestring criterion text - ]; - description = "Library for IP and MAC addresses"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ip_1_5_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , deepseq, doctest, hashable, hspec, hspec-discover, HUnit , primitive, QuickCheck, quickcheck-classes, test-framework @@ -136371,6 +134127,7 @@ self: { description = "Library for IP and MAC addresses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ip-quoter" = callPackage @@ -136640,27 +134397,6 @@ self: { }) {}; "ipython-kernel" = callPackage - ({ mkDerivation, aeson, base, bytestring, cereal, containers - , cryptonite, directory, filepath, memory, mtl, process, temporary - , text, transformers, unordered-containers, uuid, zeromq4-haskell - }: - mkDerivation { - pname = "ipython-kernel"; - version = "0.9.1.0"; - sha256 = "0944riw00i3m8n3cab0g9c14b24xryf9w8ddlddnmxgys4sn8qak"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring cereal 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_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text , containers, cryptonite, directory, filepath, memory, mtl, process , temporary, text, transformers, unordered-containers, uuid @@ -136680,7 +134416,6 @@ self: { ]; description = "A library for creating kernels for IPython frontends"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc" = callPackage @@ -136712,26 +134447,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.0.7"; - sha256 = "0vfcf4fsyqwvr6mjf89x368121m3dqscywrsgpn1qm80gpzsncj2"; - 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_0" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, containers , contravariant, exceptions, irc-conduit, irc-ctcp, mtl , network-conduit-tls, old-locale, profunctors, stm, stm-chans @@ -136749,7 +134464,6 @@ self: { ]; description = "An IRC client library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-colors" = callPackage @@ -137676,6 +135390,8 @@ self: { libraryToolDepends = [ alex happy ]; description = "Safe embedded C programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-artifact" = callPackage @@ -137711,6 +135427,8 @@ self: { ]; description = "Ivory C backend"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-bitdata" = callPackage @@ -137749,6 +135467,8 @@ self: { ]; description = "Simple concrete evaluator for Ivory programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-examples" = callPackage @@ -137771,6 +135491,8 @@ self: { ]; description = "Ivory examples"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-hw" = callPackage @@ -137783,6 +135505,8 @@ self: { libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; description = "Ivory hardware model (STM32F4)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-opts" = callPackage @@ -137799,6 +135523,8 @@ self: { ]; description = "Ivory compiler optimizations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-quickcheck" = callPackage @@ -137820,6 +135546,8 @@ self: { ]; description = "QuickCheck driver for Ivory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-serialize" = callPackage @@ -137836,6 +135564,8 @@ self: { ]; description = "Serialization library for Ivory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-stdlib" = callPackage @@ -137848,6 +135578,8 @@ self: { libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; description = "Ivory standard library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivy-web" = callPackage @@ -138896,40 +136628,6 @@ self: { }) {}; "jose" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bytestring, concise, containers, cryptonite, hspec, lens, memory - , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances - , safe, semigroups, tasty, tasty-hspec, tasty-quickcheck - , template-haskell, text, time, unix, unordered-containers, vector - , x509 - }: - mkDerivation { - pname = "jose"; - version = "0.8.0.0"; - sha256 = "027698xq5l8in420x3sc5zqwp16i1jzjcy8rlh546j8acxcvrqc4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring bytestring concise - containers cryptonite lens memory monad-time mtl network-uri - QuickCheck quickcheck-instances safe semigroups template-haskell - text time unordered-containers vector x509 - ]; - executableHaskellDepends = [ - aeson base bytestring lens mtl semigroups text unix - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring bytestring concise - containers cryptonite hspec lens memory monad-time mtl network-uri - QuickCheck quickcheck-instances safe semigroups tasty tasty-hspec - tasty-quickcheck template-haskell text time unordered-containers - vector x509 - ]; - description = "Javascript Object Signing and Encryption and JSON Web Token library"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "jose_0_8_1_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, concise, containers, cryptonite, hspec, lens, memory , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances @@ -138958,6 +136656,7 @@ self: { description = "Javascript Object Signing and Encryption and JSON Web Token library"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jose-jwt" = callPackage @@ -139306,8 +137005,6 @@ self: { ]; description = "Utilities for generating JSON-API payloads"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "json-api-lib" = callPackage @@ -140085,8 +137782,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Library to parse and execute JSONPath"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "jsonresume" = callPackage @@ -141044,43 +138739,6 @@ self: { }) {}; "katip" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , bytestring, containers, criterion, deepseq, directory, either - , filepath, hostname, microlens, microlens-th, monad-control, mtl - , old-locale, quickcheck-instances, regex-tdfa, resourcet - , safe-exceptions, scientific, semigroups, stm, string-conv, tasty - , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell - , text, time, time-locale-compat, transformers, transformers-base - , transformers-compat, unix, unliftio-core, unordered-containers - }: - mkDerivation { - pname = "katip"; - version = "0.7.0.0"; - sha256 = "1z4533952sal5ma71xpsrwbi9pniy1cciw20w31igrx9rw9kx98b"; - revision = "1"; - editedCabalFile = "1lzla1iv5ll9iks5xh8399vs2mjxb33pbdg115kqbq9r5z3h84qp"; - libraryHaskellDepends = [ - aeson async auto-update base bytestring containers either hostname - microlens microlens-th monad-control mtl old-locale resourcet - safe-exceptions scientific semigroups stm string-conv - template-haskell text time transformers transformers-base - transformers-compat unix unliftio-core unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring containers directory microlens - quickcheck-instances regex-tdfa safe-exceptions stm tasty - tasty-golden tasty-hunit tasty-quickcheck template-haskell text - time time-locale-compat unordered-containers - ]; - benchmarkHaskellDepends = [ - aeson async base blaze-builder criterion deepseq directory filepath - safe-exceptions text time transformers unix - ]; - description = "A structured logging framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "katip_0_8_3_0" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , bytestring, containers, criterion, deepseq, directory, either , filepath, hostname, microlens, microlens-th, monad-control, mtl @@ -141113,7 +138771,6 @@ self: { ]; description = "A structured logging framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "katip-datadog" = callPackage @@ -141136,8 +138793,6 @@ self: { ]; description = "Datadog scribe for the Katip logging framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "katip-elasticsearch" = callPackage @@ -141184,6 +138839,8 @@ self: { ]; description = "Katip scribe to send logs to Kafka"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "katip-logzio" = callPackage @@ -141210,8 +138867,6 @@ self: { ]; description = "Logz.IO scribe for the Katip logging framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "katip-rollbar" = callPackage @@ -141324,6 +138979,8 @@ self: { ]; description = "A haskell implementation of Katydid"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kawa" = callPackage @@ -141394,6 +139051,8 @@ self: { ]; description = "stats.NBA.com library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kazura-queue" = callPackage @@ -142167,6 +139826,8 @@ self: { ]; description = "Pure Haskell key/value store implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keyword-args" = callPackage @@ -142378,27 +140039,6 @@ self: { }) {}; "kleene" = callPackage - ({ mkDerivation, base, base-compat-batteries, containers, lattices - , MemoTrie, QuickCheck, range-set-list, regex-applicative - , step-function, text, transformers - }: - mkDerivation { - pname = "kleene"; - version = "0"; - sha256 = "00hbrmsm19azxxql14y6k7h7z8k4azlmy4y0gimyqbx4nb7swln6"; - revision = "1"; - editedCabalFile = "1izdmr7a2d7qssnj732m2qc02inm3hrc882x9nyvz68648pvwwsx"; - libraryHaskellDepends = [ - base base-compat-batteries containers lattices MemoTrie QuickCheck - range-set-list regex-applicative step-function text transformers - ]; - description = "Kleene algebra"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "kleene_0_1" = callPackage ({ mkDerivation, attoparsec, base, base-compat, bytestring , containers, lattices, MemoTrie, QuickCheck, range-set-list , regex-applicative, semigroupoids, step-function, text @@ -142417,8 +140057,6 @@ self: { ]; description = "Kleene algebra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "kmeans" = callPackage @@ -142613,6 +140251,8 @@ self: { ]; description = "JSON config file parsing based on unjson"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kontrakcja-templates" = callPackage @@ -142938,6 +140578,8 @@ self: { testHaskellDepends = [ base ]; description = "Find the alpha emoji"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kyotocabinet" = callPackage @@ -144001,33 +141643,6 @@ self: { }) {}; "lame" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, directory - , exceptions, filepath, hspec, htaglib, mp3lame, temporary, text - , transformers, wave - }: - mkDerivation { - pname = "lame"; - version = "0.1.1"; - sha256 = "0j35zpfhppb09m6h23awxgsawisvgsnrw7d99f5z3xq2bjihjq5k"; - revision = "4"; - editedCabalFile = "0r364limqm570a8xd82wwpcvmcx2j7nfndg5kad022vz2v5n0smz"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring data-default-class directory exceptions filepath - text transformers wave - ]; - librarySystemDepends = [ mp3lame ]; - testHaskellDepends = [ - base data-default-class directory filepath hspec htaglib temporary - text - ]; - description = "Fairly complete high-level binding to LAME encoder"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {mp3lame = null;}; - - "lame_0_2_0" = callPackage ({ mkDerivation, base, bytestring, directory, exceptions, filepath , hspec, hspec-discover, htaglib, mp3lame, temporary, text , transformers, wave @@ -145360,28 +142975,6 @@ self: { }) {inherit (pkgs) liblapack;}; "lapack-ffi-tools" = callPackage - ({ mkDerivation, base, bytestring, cassava, containers - , explicit-exception, filepath, non-empty, optparse-applicative - , parsec, pathtype, transformers, unordered-containers, utility-ht - , vector - }: - mkDerivation { - pname = "lapack-ffi-tools"; - version = "0.1.2"; - sha256 = "14wfnddya7ch8hm3wgabd7nma7ahcgv6h2innfbp1ck92isn2s0q"; - isLibrary = false; - isExecutable = true; - enableSeparateDataOutput = true; - executableHaskellDepends = [ - base bytestring cassava containers explicit-exception filepath - non-empty optparse-applicative parsec pathtype transformers - unordered-containers utility-ht vector - ]; - description = "Generator for Haskell interface to Fortran LAPACK"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lapack-ffi-tools_0_1_2_1" = callPackage ({ mkDerivation, base, bytestring, cassava, containers , explicit-exception, filepath, non-empty, optparse-applicative , parsec, pathtype, transformers, unordered-containers, utility-ht @@ -145401,7 +142994,6 @@ self: { ]; description = "Generator for Haskell interface to Fortran LAPACK"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "large-hashable" = callPackage @@ -145610,32 +143202,6 @@ self: { }) {}; "lattices" = callPackage - ({ mkDerivation, base, base-compat, containers, deepseq, hashable - , QuickCheck, quickcheck-instances, semigroupoids, tagged, tasty - , tasty-quickcheck, transformers, universe-base - , universe-instances-base, universe-reverse-instances - , unordered-containers - }: - mkDerivation { - pname = "lattices"; - version = "1.7.1.1"; - sha256 = "1byx2hmmh2213afdcsjxf3mvq3h9bwkl5wrvzxv1yqvd9jiqjz3r"; - revision = "2"; - editedCabalFile = "0qxz4v5pqwvhb79mz4b7wc66r2c0xc9ixfhss4h56jk3vb1hriys"; - libraryHaskellDepends = [ - base base-compat containers deepseq hashable semigroupoids tagged - universe-base universe-reverse-instances unordered-containers - ]; - testHaskellDepends = [ - base base-compat containers QuickCheck quickcheck-instances tasty - tasty-quickcheck transformers universe-instances-base - unordered-containers - ]; - description = "Fine-grained library for constructing and manipulating lattices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lattices_2_0_1" = callPackage ({ mkDerivation, base, base-compat, containers, deepseq, hashable , integer-logarithms, QuickCheck, quickcheck-instances , semigroupoids, tagged, tasty, tasty-quickcheck, transformers @@ -145657,7 +143223,6 @@ self: { ]; description = "Fine-grained library for constructing and manipulating lattices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "launchpad-control" = callPackage @@ -145970,6 +143535,8 @@ self: { ]; description = "An EDSL for programming the Game Boy"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lazyio" = callPackage @@ -146109,8 +143676,6 @@ self: { testHaskellDepends = [ base bytestring hspec process semigroups ]; description = "Pure Haskell LDAP Client Library"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ldapply" = callPackage @@ -146215,18 +143780,6 @@ self: { }) {}; "leancheck" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "leancheck"; - version = "0.8.0"; - sha256 = "1lblxlg881asqgbdv6sivzxryis7cgkpclgyyks598ii06vd0z1s"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base ]; - description = "Enumerative property-based testing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "leancheck_0_9_1" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; @@ -146236,7 +143789,6 @@ self: { testHaskellDepends = [ base ]; description = "Enumerative property-based testing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "leancheck-enum-instances" = callPackage @@ -147963,46 +145515,6 @@ self: { }) {inherit (pkgs) postgresql;}; "libraft" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, cereal, concurrency - , containers, dejafu, directory, exceptions, haskeline - , hunit-dejafu, mtl, network, network-simple, parsec, protolude - , QuickCheck, random, repline, stm, tasty, tasty-dejafu - , tasty-discover, tasty-expected-failure, tasty-hunit - , tasty-quickcheck, text, time, transformers, word8 - }: - mkDerivation { - pname = "libraft"; - version = "0.1.1.0"; - sha256 = "1kjrrpgci6f1wsb75xrndp7xx50xgw8fgh4f6l345wyy2xxlpj8c"; - revision = "1"; - editedCabalFile = "0bzfkay18wphlqfm0i6rmr7rm1d6s16nxvrmc4wp0szim1k9k0gh"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base bytestring cereal concurrency containers directory - exceptions haskeline mtl network network-simple parsec protolude - random repline text time transformers word8 - ]; - executableHaskellDepends = [ - attoparsec base bytestring cereal concurrency containers directory - exceptions haskeline mtl network network-simple parsec protolude - random repline stm text time transformers word8 - ]; - testHaskellDepends = [ - attoparsec base bytestring cereal concurrency containers dejafu - directory exceptions haskeline hunit-dejafu mtl network - network-simple parsec protolude QuickCheck random repline tasty - tasty-dejafu tasty-discover tasty-expected-failure tasty-hunit - tasty-quickcheck text time transformers word8 - ]; - testToolDepends = [ tasty-discover ]; - description = "Raft consensus algorithm"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "libraft_0_5_0_0" = callPackage ({ mkDerivation, async, atomic-write, attoparsec, base , base16-bytestring, bytestring, cereal, concurrency, containers , cryptohash-sha256, dejafu, directory, ekg, ekg-core, exceptions @@ -148916,6 +146428,8 @@ self: { ]; description = "Haskell SDK for LINE Messaging API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "line-break" = callPackage @@ -148941,8 +146455,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "raster line drawing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "line-size" = callPackage @@ -149148,6 +146660,8 @@ self: { testHaskellDepends = [ base hspec network tasty-hspec ]; description = "Typed sockets"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linear-vect" = callPackage @@ -149172,6 +146686,8 @@ self: { libraryHaskellDepends = [ base sbv ]; description = "Use SMT solvers to solve linear systems over integers and rationals"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linearmap-category" = callPackage @@ -149400,6 +146916,8 @@ self: { ]; description = "Bindings to the Linode API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linode-v4" = callPackage @@ -150093,6 +147611,8 @@ self: { ]; description = "Witnesses for working with type-level lists"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "list-zip-def" = callPackage @@ -150217,6 +147737,8 @@ self: { ]; description = "Append only key-list database"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lit" = callPackage @@ -150646,26 +148168,6 @@ self: { }) {}; "llvm-hs-pure" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, fail - , mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell - , transformers, unordered-containers - }: - mkDerivation { - pname = "llvm-hs-pure"; - version = "7.0.0"; - sha256 = "1b82cin889qkyp9qv5p3yk7wq7ibnx2v9pk0mpvk6k9ca7fpr7dg"; - libraryHaskellDepends = [ - attoparsec base bytestring containers fail mtl template-haskell - transformers unordered-containers - ]; - testHaskellDepends = [ - base containers mtl tasty tasty-hunit tasty-quickcheck transformers - ]; - description = "Pure Haskell LLVM functionality (no FFI)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "llvm-hs-pure_8_0_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, fail , mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell , transformers, unordered-containers @@ -150683,7 +148185,6 @@ self: { ]; description = "Pure Haskell LLVM functionality (no FFI)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "llvm-ht" = callPackage @@ -151231,24 +148732,6 @@ self: { }) {}; "log-base" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq - , exceptions, mmorph, monad-control, monad-time, mtl, semigroups - , stm, text, time, transformers-base, unordered-containers - }: - mkDerivation { - pname = "log-base"; - version = "0.7.4.0"; - sha256 = "06rzvh3g294hpwpxw2syvywrw3rms1chjxqhki8b97ml1nlfnrs0"; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring deepseq exceptions mmorph - monad-control monad-time mtl semigroups stm text time - transformers-base unordered-containers - ]; - description = "Structured logging solution (base package)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "log-base_0_8_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq , exceptions, mmorph, monad-control, monad-time, mtl, semigroups , stm, text, time, transformers-base, unliftio-core @@ -151265,7 +148748,6 @@ self: { ]; description = "Structured logging solution (base package)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log-domain" = callPackage @@ -151454,8 +148936,8 @@ self: { }: mkDerivation { pname = "log4hs"; - version = "0.0.3.0"; - sha256 = "0bbl1cfa85dr1kxiikykh32x0141bkgfabvkjp37m52sv3vs9mvi"; + version = "0.0.4.0"; + sha256 = "1731vg58q9qcizlbsjvpy1xl9vls7gyi4bk2f7klid7204fnz2zk"; libraryHaskellDepends = [ aeson base containers data-default directory filepath template-haskell text time @@ -151737,17 +149219,6 @@ self: { }) {}; "logict" = callPackage - ({ mkDerivation, base, mtl }: - mkDerivation { - pname = "logict"; - version = "0.6.0.3"; - sha256 = "1a3sqws8bc55a7sxkl406a69ls75l60syv20b5rmkd30nbdisryh"; - libraryHaskellDepends = [ base mtl ]; - description = "A backtracking logic-programming monad"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "logict_0_7_0_2" = callPackage ({ mkDerivation, base, mtl, tasty, tasty-hunit }: mkDerivation { pname = "logict"; @@ -151757,7 +149228,6 @@ self: { testHaskellDepends = [ base mtl tasty tasty-hunit ]; description = "A backtracking logic-programming monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logict-state" = callPackage @@ -152505,33 +149975,6 @@ self: { }) {}; "lsp-test" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base - , bytestring, conduit, conduit-parse, containers, data-default - , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl - , parser-combinators, process, text, transformers, unix - , unordered-containers, yi-rope - }: - mkDerivation { - pname = "lsp-test"; - version = "0.5.1.2"; - sha256 = "1fc58krsm2q92azkcq57xdj7ngqvkqbvngjcr3plf0793xdarxj8"; - libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal base bytestring conduit - conduit-parse containers data-default Diff directory filepath - haskell-lsp lens mtl parser-combinators process text transformers - unix unordered-containers yi-rope - ]; - testHaskellDepends = [ - aeson base data-default haskell-lsp hspec lens text - unordered-containers - ]; - description = "Functional test framework for LSP servers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "lsp-test_0_6_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl @@ -152626,6 +150069,8 @@ self: { ]; description = "Parameterized file evaluator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ltiv1p1" = callPackage @@ -152803,24 +150248,6 @@ self: { }) {}; "lucid-extras" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, directory - , lucid, text - }: - mkDerivation { - pname = "lucid-extras"; - version = "0.1.0.1"; - sha256 = "0wyb5pqhphfckmzpnl0xp6fy8fmnwqjqim3h3f3sdjqkqdly5iaw"; - revision = "1"; - editedCabalFile = "030mj3yddbia6dkbl8d6mssi42l3z8gs79z50r78gwiif6mh5dny"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring lucid text - ]; - testHaskellDepends = [ base directory lucid ]; - description = "Generate more HTML with Lucid"; - license = stdenv.lib.licenses.mit; - }) {}; - - "lucid-extras_0_2_2" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, directory , lucid, text }: @@ -152834,7 +150261,6 @@ self: { testHaskellDepends = [ base directory lucid ]; description = "Generate more HTML with Lucid - Bootstrap, Rdash, Vega-Lite, Leaflet JS, Email"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lucid-foundation" = callPackage @@ -153626,6 +151052,8 @@ self: { ]; description = "An API client library for Mackerel"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "maclight" = callPackage @@ -153753,6 +151181,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) file;}; + "magic-tyfams" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra, syb }: + mkDerivation { + pname = "magic-tyfams"; + version = "0.1.1.0"; + sha256 = "1vgbbmv2807cyi6hh2137nw6dldn84qall828d64lg2ja6zj6xii"; + libraryHaskellDepends = [ base ghc ghc-tcplugins-extra syb ]; + description = "Write plugins for magic type families with ease"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "magic-wormhole" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, cryptonite , hashable, hedgehog, memory, network, network-uri @@ -153813,6 +151252,8 @@ self: { ]; description = "A web framework that integrates Servant, RIO, EKG, fast-logger, wai-cli…"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "magico" = callPackage @@ -153912,6 +151353,8 @@ self: { ]; description = "Preconfigured email connection pool on top of smtp"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mailbox-count" = callPackage @@ -154869,6 +152312,8 @@ self: { ]; description = "Efficient, polymorphic Map Algebra"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mappy" = callPackage @@ -155096,6 +152541,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Computations for Markov chain usage models"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "markov-processes" = callPackage @@ -155362,27 +152809,6 @@ self: { }) {}; "massiv" = callPackage - ({ mkDerivation, base, bytestring, data-default, data-default-class - , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions - , vector - }: - mkDerivation { - pname = "massiv"; - version = "0.2.8.1"; - sha256 = "10fq5h3nkgfibh0yix8j3h0ldqapyxivxj74jyrzc5zjbpa1j8pb"; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq ghc-prim primitive - vector - ]; - testHaskellDepends = [ - base bytestring data-default deepseq hspec QuickCheck - safe-exceptions vector - ]; - description = "Massiv (Массив) is an Array Library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "massiv_0_4_0_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest , data-default-class, deepseq, doctest, exceptions , mersenne-random-pure64, primitive, QuickCheck, random, scheduler @@ -155404,6 +152830,7 @@ self: { description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "massiv-io" = callPackage @@ -155420,6 +152847,8 @@ self: { ]; description = "Import/export of Image files into massiv Arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "massiv-scheduler" = callPackage @@ -155536,6 +152965,8 @@ self: { testHaskellDepends = [ base containers matchable ]; description = "Generates Matchable instances using TemplateHaskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "matcher" = callPackage @@ -155705,6 +153136,8 @@ self: { ]; description = "Discover your (academic) ancestors!"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mathista" = callPackage @@ -155786,23 +153219,6 @@ self: { }) {}; "matrices" = callPackage - ({ mkDerivation, base, criterion, deepseq, primitive, tasty - , tasty-hunit, tasty-quickcheck, vector - }: - mkDerivation { - pname = "matrices"; - version = "0.4.5"; - sha256 = "15vkkd3jwfdp648lfhskzhnisb1bzqia3asw8fmanpk71l9nyf9d"; - libraryHaskellDepends = [ base deepseq primitive vector ]; - testHaskellDepends = [ - base tasty tasty-hunit tasty-quickcheck vector - ]; - benchmarkHaskellDepends = [ base criterion vector ]; - description = "native matrix based on vector"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "matrices_0_5_0" = callPackage ({ mkDerivation, base, criterion, deepseq, primitive, tasty , tasty-hunit, tasty-quickcheck, vector }: @@ -155817,7 +153233,6 @@ self: { benchmarkHaskellDepends = [ base criterion vector ]; description = "native matrix based on vector"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "matrix" = callPackage @@ -156212,26 +153627,6 @@ self: { }) {}; "mbox-utility" = callPackage - ({ mkDerivation, base, bytestring, hsemail, non-empty, old-time - , parsec, spreadsheet, utility-ht - }: - mkDerivation { - pname = "mbox-utility"; - version = "0.0.1"; - sha256 = "1y792np4i24jlyxfsm4dw3m1bvij5wxj77dkqj2hvclm7kw0kq75"; - revision = "1"; - editedCabalFile = "0lhka293xbgsjs7sb3yrck6q7vw4dfdhpmpalc7s9az1mj4l4mjz"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring hsemail non-empty old-time parsec spreadsheet - utility-ht - ]; - description = "List contents of an mbox file containing e-mails"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mbox-utility_0_0_3_1" = callPackage ({ mkDerivation, base, bytestring, hsemail, non-empty, parsec , spreadsheet, time, utility-ht }: @@ -156247,7 +153642,6 @@ self: { ]; description = "List contents of an mbox file containing e-mails"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mbtiles" = callPackage @@ -156291,6 +153685,8 @@ self: { ]; description = "download bugs mailboxes"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mcl" = callPackage @@ -156750,6 +154146,8 @@ self: { ]; description = "Convert MediaWiki text to LaTeX"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "medium-sdk-haskell" = callPackage @@ -156791,25 +154189,6 @@ self: { }) {}; "mega-sdist" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , http-conduit, optparse-simple, rio, rio-orphans, tar-conduit - , yaml - }: - mkDerivation { - pname = "mega-sdist"; - version = "0.3.3.2"; - sha256 = "0jhlaww753spj5k2mrzrizcb408265wglc7gycdicnashsxc7qd4"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring conduit conduit-extra http-conduit optparse-simple - rio rio-orphans tar-conduit yaml - ]; - description = "Handles uploading to Hackage from mega repos"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mega-sdist_0_4_0_1" = callPackage ({ mkDerivation, base, bytestring, optparse-simple, pantry, path , path-io, rio, rio-orphans, yaml }: @@ -156826,6 +154205,7 @@ self: { description = "Handles uploading to Hackage from mega repos"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "megaparsec_6_5_0" = callPackage @@ -157043,8 +154423,6 @@ self: { ]; description = "Type-safe memory units"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "memcache" = callPackage @@ -158302,6 +155680,8 @@ self: { ]; description = "Bindings to the Microsoft Translator API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "microspec" = callPackage @@ -158466,6 +155846,8 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "A simple and fast library for working with MIDI messages"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "midi-util" = callPackage @@ -158729,25 +156111,6 @@ self: { }) {}; "mime-mail" = callPackage - ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring - , filepath, hspec, process, random, text - }: - mkDerivation { - pname = "mime-mail"; - version = "0.4.14"; - sha256 = "0gmapbjci8nclwm8syg5xfci4nj8cpchb9ry1b7gwhcp9kaw6cln"; - revision = "1"; - editedCabalFile = "14zadyz63gjpf58h6v36w3jwwpxpg86czw19r4211wprqfclvr92"; - libraryHaskellDepends = [ - base base64-bytestring blaze-builder bytestring filepath process - random text - ]; - testHaskellDepends = [ base blaze-builder bytestring hspec text ]; - description = "Compose MIME email messages"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mime-mail_0_5_0" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , filepath, hspec, process, random, text }: @@ -158762,7 +156125,6 @@ self: { testHaskellDepends = [ base blaze-builder bytestring hspec text ]; description = "Compose MIME email messages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mime-mail-ses" = callPackage @@ -158827,6 +156189,8 @@ self: { ]; description = "Double-ended priority queues"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "minecraft" = callPackage @@ -159026,39 +156390,6 @@ self: { }) {}; "minio-hs" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , case-insensitive, conduit, conduit-extra, containers, cryptonite - , cryptonite-conduit, directory, filepath, http-client - , http-conduit, http-types, ini, memory, protolude, QuickCheck - , resourcet, tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck - , temporary, text, time, transformers, unliftio, unliftio-core - , xml-conduit - }: - mkDerivation { - pname = "minio-hs"; - version = "1.2.0"; - sha256 = "14qhaiki7g09gkakl1irf0a5fnrcaj2x84vvh09g3dfsgybr851i"; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring case-insensitive conduit - conduit-extra containers cryptonite cryptonite-conduit directory - filepath http-client http-conduit http-types ini memory protolude - resourcet text time transformers unliftio unliftio-core xml-conduit - ]; - testHaskellDepends = [ - aeson base base64-bytestring bytestring case-insensitive conduit - conduit-extra containers cryptonite cryptonite-conduit directory - filepath http-client http-conduit http-types ini memory protolude - QuickCheck resourcet tasty tasty-hunit tasty-quickcheck - tasty-smallcheck temporary text time transformers unliftio - unliftio-core xml-conduit - ]; - description = "A Minio Haskell Library for Amazon S3 compatible cloud storage"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "minio-hs_1_5_0" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring , case-insensitive, conduit, conduit-extra, connection, cryptonite , cryptonite-conduit, digest, directory, exceptions, filepath @@ -159455,25 +156786,6 @@ self: { }) {}; "miso" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, http-api-data - , http-types, lucid, network-uri, servant, servant-lucid, text - , transformers, vector - }: - mkDerivation { - pname = "miso"; - version = "0.21.2.0"; - sha256 = "061bjvxcs6psh8hj947p4jm9ki9ngrwvn23szvk8i3x4xd87jbfm"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers http-api-data http-types lucid - network-uri servant servant-lucid text transformers vector - ]; - description = "A tasty Haskell front-end framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "miso_1_2_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-api-data , http-types, lucid, network-uri, servant, servant-lucid, text , transformers, vector @@ -159490,7 +156802,6 @@ self: { ]; description = "A tasty Haskell front-end framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "miso-action-logger" = callPackage @@ -159506,6 +156817,20 @@ self: { broken = true; }) {}; + "miso-examples" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "miso-examples"; + version = "1.2.0.0"; + sha256 = "1wg4nli3qzq0dw9il4hqw78mpvcsbj22i2vdv2n9gafv9qsb6r68"; + isLibrary = false; + isExecutable = true; + description = "A tasty Haskell front-end framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "miss" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring , ChasingBottoms, containers, cryptohash-sha1, deepseq, digest @@ -159636,23 +156961,6 @@ self: { }) {}; "mixed-types-num" = callPackage - ({ mkDerivation, base, convertible, hspec, hspec-smallcheck - , QuickCheck, smallcheck, template-haskell - }: - mkDerivation { - pname = "mixed-types-num"; - version = "0.3.1.5"; - sha256 = "0n60s5vy6l6mbc5z7di91whb3hn0qav2c98fmb7l7inxq8abzw3w"; - libraryHaskellDepends = [ - base convertible hspec hspec-smallcheck QuickCheck smallcheck - template-haskell - ]; - testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ]; - description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mixed-types-num_0_4_0_1" = callPackage ({ mkDerivation, base, hspec, hspec-smallcheck, mtl, QuickCheck , smallcheck, template-haskell }: @@ -159667,34 +156975,9 @@ self: { testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ]; description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mixpanel-client" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring, hspec - , hspec-discover, http-client, http-client-tls, markdown-unlit - , servant, servant-client, string-conv, text, time - }: - mkDerivation { - pname = "mixpanel-client"; - version = "0.1.1"; - sha256 = "1dr7h8ss3msnabz6nisq3q4khi48b4ahmghil9sz4in4s1dvn9am"; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring http-client http-client-tls - servant servant-client string-conv text time - ]; - testHaskellDepends = [ - aeson base base64-bytestring bytestring hspec http-client - http-client-tls servant servant-client string-conv text time - ]; - testToolDepends = [ hspec-discover markdown-unlit ]; - description = "Mixpanel client"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "mixpanel-client_0_2_0" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, hspec , hspec-discover, http-client, http-client-tls, markdown-unlit , servant, servant-client, string-conv, text, time @@ -159823,37 +157106,6 @@ self: { }) {}; "mmark" = callPackage - ({ mkDerivation, aeson, base, case-insensitive, containers - , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec - , hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens - , microlens-th, modern-uri, mtl, parser-combinators, QuickCheck - , text, text-metrics, unordered-containers, weigh, yaml - }: - mkDerivation { - pname = "mmark"; - version = "0.0.7.0"; - sha256 = "0g7mx3xvvj8vgcids231zlz9kp7z3zjrq4xfhdm0wk0v1k51dflx"; - revision = "2"; - editedCabalFile = "06hr9p2lqyh4zx38i601yd24acbl08p69l0pwh8266qvfripcsm9"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base case-insensitive containers deepseq dlist email-validate - foldl hashable html-entity-map lucid megaparsec microlens - microlens-th modern-uri mtl parser-combinators text text-metrics - unordered-containers yaml - ]; - testHaskellDepends = [ - aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri - QuickCheck text - ]; - benchmarkHaskellDepends = [ base criterion text weigh ]; - description = "Strict markdown processor for writers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "mmark_0_0_7_1" = callPackage ({ mkDerivation, aeson, base, case-insensitive, containers , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec , hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens @@ -159878,8 +157130,6 @@ self: { benchmarkHaskellDepends = [ base criterion text weigh ]; description = "Strict markdown processor for writers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mmark-cli" = callPackage @@ -159903,8 +157153,6 @@ self: { ]; description = "Command line interface to the MMark markdown processor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mmark-ext" = callPackage @@ -159927,8 +157175,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Commonly useful extensions for the MMark markdown processor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mmorph" = callPackage @@ -160139,6 +157385,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "modern-uri_0_3_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, contravariant + , criterion, deepseq, exceptions, hspec, hspec-discover + , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck + , reflection, tagged, template-haskell, text, weigh + }: + mkDerivation { + pname = "modern-uri"; + version = "0.3.1.0"; + sha256 = "1pi7la2rrpfa9qszz7zm4dd7dihakm4kjrhjzvxpbp4n34ihl8h5"; + libraryHaskellDepends = [ + base bytestring containers contravariant deepseq exceptions + megaparsec mtl profunctors QuickCheck reflection tagged + template-haskell text + ]; + testHaskellDepends = [ + base bytestring hspec hspec-megaparsec megaparsec QuickCheck text + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq megaparsec text weigh + ]; + description = "Modern library for working with URIs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "modify-fasta" = callPackage ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split @@ -160242,15 +157515,15 @@ self: { }) {}; "modularity" = callPackage - ({ mkDerivation, base, eigen, hmatrix, sparse-linear-algebra + ({ mkDerivation, base, hmatrix, sparse-linear-algebra , spectral-clustering, vector }: mkDerivation { pname = "modularity"; - version = "0.2.1.0"; - sha256 = "1xs9hdxsdpylhq3dzmyxfycwyqzy3v1zz48gvzpfcamfivxxpdph"; + version = "0.2.1.1"; + sha256 = "0s7n6z48wi2cc51i9aj8c35p02jsj2g1z1lbrsa0gpk684wzg8nq"; libraryHaskellDepends = [ - base eigen hmatrix sparse-linear-algebra spectral-clustering vector + base hmatrix sparse-linear-algebra spectral-clustering vector ]; description = "Find the modularity of a network"; license = stdenv.lib.licenses.gpl3; @@ -160534,8 +157807,6 @@ self: { ]; description = "These as a transformer, ChronicleT"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "monad-classes" = callPackage @@ -161550,10 +158821,8 @@ self: { }: mkDerivation { pname = "monad-validate"; - version = "1.0.0.0"; - sha256 = "0d2r54jhy5zkjph57f85syw6g0fmvj3csas8ki2hg7lfiqj6yq4q"; - revision = "1"; - editedCabalFile = "0zdxr266655w77zgzfqiw2aij64rhlys310c38myq1g6vgcxlbc2"; + version = "1.2.0.0"; + sha256 = "1wqiifcwm24mfshlh0xaq9b4blpsccqxglwgjqmg4jqbav3143zm"; libraryHaskellDepends = [ base exceptions monad-control mtl transformers transformers-base ]; @@ -161941,36 +159210,6 @@ self: { }) {}; "mongoDB" = callPackage - ({ mkDerivation, array, base, base16-bytestring, base64-bytestring - , binary, bson, bytestring, conduit, conduit-extra, containers - , criterion, cryptohash, data-default-class, hashtables, hspec - , lifted-base, monad-control, mtl, network, nonce, old-locale - , parsec, pureMD5, random, random-shuffle, resourcet, stm, tagged - , text, time, tls, transformers, transformers-base - }: - mkDerivation { - pname = "mongoDB"; - version = "2.4.0.1"; - sha256 = "0wadf91vymy1wzf1xq9k5ackj5fc7220fgg6h42y4qpmg1xzbpip"; - libraryHaskellDepends = [ - array base base16-bytestring base64-bytestring binary bson - bytestring conduit conduit-extra containers cryptohash - data-default-class hashtables lifted-base monad-control mtl network - nonce parsec pureMD5 random random-shuffle resourcet stm tagged - text time tls transformers transformers-base - ]; - testHaskellDepends = [ base hspec mtl old-locale text time ]; - benchmarkHaskellDepends = [ - array base base16-bytestring base64-bytestring binary bson - bytestring containers criterion cryptohash data-default-class - hashtables lifted-base monad-control mtl network nonce parsec - random random-shuffle stm text transformers-base - ]; - description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "mongoDB_2_5_0_0" = callPackage ({ mkDerivation, array, base, base16-bytestring, base64-bytestring , binary, bson, bytestring, conduit, conduit-extra, containers , criterion, cryptohash, data-default-class, hashtables, hspec @@ -161998,7 +159237,6 @@ self: { ]; description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mongodb-queue" = callPackage @@ -162295,17 +159533,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "monoidal-containers_0_5_0_0" = callPackage + "monoidal-containers_0_5_0_1" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, hashable, lens - , newtype, semigroups, these, unordered-containers + , newtype, semialign, semigroups, these, unordered-containers }: mkDerivation { pname = "monoidal-containers"; - version = "0.5.0.0"; - sha256 = "0dayylvsn6mcgyis04nl4384sg8vr4mrnvf1wvfhb5pip3v7hl7a"; + version = "0.5.0.1"; + sha256 = "1d7a4kkwv86f69zv5g6wxq9bkxq3bxarb26rr5q9gxkyx9m5rwd3"; libraryHaskellDepends = [ - aeson base containers deepseq hashable lens newtype semigroups - these unordered-containers + aeson base containers deepseq hashable lens newtype semialign + semigroups these unordered-containers ]; description = "Containers with monoidal accumulation"; license = stdenv.lib.licenses.bsd3; @@ -162829,8 +160067,6 @@ self: { ]; description = "Haskell client for Moss"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "moto" = callPackage @@ -163359,6 +160595,8 @@ self: { ]; description = "A Haskell implementation of MessagePack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "msgpack-aeson" = callPackage @@ -163377,6 +160615,8 @@ self: { testHaskellDepends = [ aeson base msgpack tasty tasty-hunit ]; description = "Aeson adapter for MessagePack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "msgpack-idl" = callPackage @@ -163459,17 +160699,19 @@ self: { "mssql-simple" = callPackage ({ mkDerivation, base, binary, bytestring, hostname, ms-tds - , network, text, time, tls + , network, template-haskell, text, time, tls }: mkDerivation { pname = "mssql-simple"; - version = "0.3.0.0"; - sha256 = "0wssw1d3ki95b83ww6brx8apk7s86vnzgwlh91xvfdp8hkqygx1q"; + version = "0.4.0.2"; + sha256 = "0pa1q404xlq23ywdwkx9w1v8dn2nznkpng9ijwixkcd520bnx043"; libraryHaskellDepends = [ - base binary bytestring hostname ms-tds network text time tls + base binary bytestring hostname ms-tds network template-haskell + text time tls ]; testHaskellDepends = [ - base binary bytestring hostname ms-tds network text time tls + base binary bytestring hostname ms-tds network template-haskell + text time tls ]; description = "SQL Server client library implemented in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -165152,19 +162394,6 @@ self: { }) {}; "mwc-probability" = callPackage - ({ mkDerivation, base, mwc-random, primitive, transformers }: - mkDerivation { - pname = "mwc-probability"; - version = "2.0.4"; - sha256 = "0msi72qp5aps3n4ji565r4rzyjg7svwilsh8lch59y2b4q7fvscz"; - revision = "1"; - editedCabalFile = "1b4wbxkxx0szjgzgn5jc1qap80zx6ispxrd51yxs4z7llv15w5k6"; - libraryHaskellDepends = [ base mwc-random primitive transformers ]; - description = "Sampling function-based probability distributions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mwc-probability_2_1_0" = callPackage ({ mkDerivation, base, mwc-random, primitive, transformers }: mkDerivation { pname = "mwc-probability"; @@ -165173,7 +162402,6 @@ self: { libraryHaskellDepends = [ base mwc-random primitive transformers ]; description = "Sampling function-based probability distributions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mwc-probability-transition" = callPackage @@ -165944,20 +163172,6 @@ self: { }) {}; "named" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "named"; - version = "0.2.0.0"; - sha256 = "17ldvxypf099wj5phzh2aymzfwmyiyzhz24h1aj2s21nrys5n6n0"; - revision = "2"; - editedCabalFile = "0h9d74h6g685g1g0ylqf7kws1ancdy3q6fi39vinf5alkqa7kxwd"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; - description = "Named parameters (keyword arguments) for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "named_0_3_0_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "named"; @@ -165967,7 +163181,6 @@ self: { testHaskellDepends = [ base ]; description = "Named parameters (keyword arguments) for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "named-formlet" = callPackage @@ -166462,6 +163675,8 @@ self: { ]; description = "Haskell API for NATS messaging system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "natural" = callPackage @@ -167072,6 +164287,8 @@ self: { ]; description = "An MQTT Protocol Implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "net-spider" = callPackage @@ -167094,6 +164311,8 @@ self: { ]; description = "A graph database middleware to maintain a time-varying graph"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "net-spider-cli" = callPackage @@ -167114,6 +164333,8 @@ self: { ]; description = "CLI option parsers for NetSpider objects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "net-spider-pangraph" = callPackage @@ -167743,6 +164964,8 @@ self: { ]; description = "Toolkit for building http client libraries over Network.Http.Conduit"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-arbitrary" = callPackage @@ -167764,6 +164987,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Arbitrary Instances for Network Types"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-attoparsec" = callPackage @@ -167820,8 +165045,6 @@ self: { doHaddock = false; description = "Network.BSD"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "network-bsd_2_8_1_0" = callPackage @@ -167836,7 +165059,6 @@ self: { description = "POSIX network database () API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "network-builder" = callPackage @@ -167863,18 +165085,6 @@ self: { }) {}; "network-byte-order" = callPackage - ({ mkDerivation, base, bytestring, doctest }: - mkDerivation { - pname = "network-byte-order"; - version = "0.0.0.0"; - sha256 = "0wfy57ip87ksppggpz26grk4w144yld95mf2y0c6mhcs1l8z3div"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ base bytestring doctest ]; - description = "Network byte order utilities"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-byte-order_0_1_1_0" = callPackage ({ mkDerivation, base, bytestring, doctest }: mkDerivation { pname = "network-byte-order"; @@ -167884,7 +165094,6 @@ self: { testHaskellDepends = [ base bytestring doctest ]; description = "Network byte order utilities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-bytestring" = callPackage @@ -168225,19 +165434,6 @@ self: { }) {}; "network-multicast" = callPackage - ({ mkDerivation, base, network }: - mkDerivation { - pname = "network-multicast"; - version = "0.2.0"; - sha256 = "1wkmx5gic0zqghxxdyyrcysfaj1aknj53v50qq6c40d4qfmm0fqg"; - revision = "2"; - editedCabalFile = "1hha4vvyrx29d2lwwjl0bfpbaj00k85bd4w83s4hvawqbxqvvhkw"; - libraryHaskellDepends = [ base network ]; - description = "Simple multicast library"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "network-multicast_0_3_2" = callPackage ({ mkDerivation, base, network, network-bsd }: mkDerivation { pname = "network-multicast"; @@ -168246,7 +165442,6 @@ self: { libraryHaskellDepends = [ base network network-bsd ]; description = "Simple multicast library"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-netpacket" = callPackage @@ -168380,8 +165575,6 @@ self: { ]; description = "Simple network sockets usage patterns"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "network-simple-sockaddr" = callPackage @@ -168416,8 +165609,6 @@ self: { ]; description = "Simple interface to TLS secured network sockets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "network-simple-ws" = callPackage @@ -168434,8 +165625,6 @@ self: { ]; description = "Simple interface to WebSockets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "network-simple-wss" = callPackage @@ -168452,8 +165641,6 @@ self: { ]; description = "Simple interface to TLS secured WebSockets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "network-socket-options" = callPackage @@ -168697,6 +165884,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "FromJSON and ToJSON Instances for Network.URI"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-uri-lenses" = callPackage @@ -169633,8 +166822,6 @@ self: { ]; description = "Tool for semi-automatic updating of nixpkgs repository"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "nkjp" = callPackage @@ -169757,6 +166944,8 @@ self: { testHaskellDepends = [ base tasty tasty-hspec tasty-quickcheck ]; description = "A tiny neural network"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nntp" = callPackage @@ -170154,27 +167343,6 @@ self: { }) {}; "nonempty-containers" = callPackage - ({ mkDerivation, base, comonad, containers, deepseq, hedgehog - , hedgehog-fn, semigroupoids, tasty, tasty-hedgehog, text, these - }: - mkDerivation { - pname = "nonempty-containers"; - version = "0.1.1.0"; - sha256 = "1vhpanz5n7fljc86kxif9kp9fr75wr87wy1fmawd7c5qmhk1b61k"; - libraryHaskellDepends = [ - base comonad containers deepseq semigroupoids these - ]; - testHaskellDepends = [ - base comonad containers hedgehog hedgehog-fn semigroupoids tasty - tasty-hedgehog text these - ]; - description = "Non-empty variants of containers data types, with full API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "nonempty-containers_0_3_1_0" = callPackage ({ mkDerivation, base, comonad, containers, deepseq, hedgehog , hedgehog-fn, semigroupoids, tasty, tasty-hedgehog, text, these }: @@ -170191,8 +167359,6 @@ self: { ]; description = "Non-empty variants of containers data types, with full API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "nonemptymap" = callPackage @@ -170417,8 +167583,6 @@ self: { transformers tuple ]; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "notmuch" = callPackage @@ -171771,6 +168935,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "An implementation of the Oblivious Transfer protocol in Haskell"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "observable" = callPackage @@ -172142,8 +169308,8 @@ self: { }: mkDerivation { pname = "oidc-client"; - version = "0.4.0.0"; - sha256 = "15lnxxmnpmkvz9zqgz8sq5lzjxvgc5x8a6hrizj3m0mzg9cvml0b"; + version = "0.4.0.1"; + sha256 = "0761m8yi8yrqspf9hig6pbdzchz8nvc9qn995wz4v0wklcypiagr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172817,6 +169983,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Open type representations and dynamic types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "open-union" = callPackage @@ -173277,6 +170445,8 @@ self: { testHaskellDepends = [ base cereal hedgehog time ]; description = "Haskell implementation of openssh protocol primitives"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "openssl-createkey" = callPackage @@ -173667,36 +170837,6 @@ self: { }) {}; "opml-conduit" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, conduit - , conduit-combinators, containers, data-default, lens-simple - , mono-traversable, monoid-subclasses, mtl, parsers, QuickCheck - , quickcheck-instances, resourcet, safe-exceptions, semigroups - , tasty, tasty-hunit, tasty-quickcheck, text, time, timerep - , uri-bytestring, xml-conduit, xml-types - }: - mkDerivation { - pname = "opml-conduit"; - version = "0.6.0.4"; - sha256 = "07axacfa0wik2cnpzcnjjp9w6ws8sjhinzxdc4vrxdxaj1v5a2s8"; - revision = "1"; - editedCabalFile = "160sazqsrmm2755642c5y5i38miiglqb66cy5k0hy4k2jkdmjfbi"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base case-insensitive conduit conduit-combinators containers - lens-simple mono-traversable monoid-subclasses safe-exceptions - semigroups text time timerep uri-bytestring xml-conduit xml-types - ]; - testHaskellDepends = [ - base bytestring conduit conduit-combinators containers data-default - lens-simple mono-traversable mtl parsers QuickCheck - quickcheck-instances resourcet semigroups tasty tasty-hunit - tasty-quickcheck text time uri-bytestring xml-conduit - ]; - description = "Streaming parser/renderer for the OPML 2.0 format."; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "opml-conduit_0_7_0_0" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, conduit , conduit-combinators, containers, data-default, lens-simple , monoid-subclasses, mtl, parsers, QuickCheck, quickcheck-instances @@ -173723,6 +170863,7 @@ self: { description = "Streaming parser/renderer for the OPML 2.0 format."; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "opn" = callPackage @@ -173741,6 +170882,8 @@ self: { ]; description = "Open files or URLs using associated programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "optima" = callPackage @@ -173971,8 +171114,6 @@ self: { ]; description = "An enum-text based toolkit for optparse-applicative"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "optparse-generic" = callPackage @@ -174950,6 +172091,8 @@ self: { ]; description = "MessagePack Serialization an Deserialization for Packer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "packman" = callPackage @@ -175052,6 +172195,8 @@ self: { ]; description = "PADS data description language for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pagarme" = callPackage @@ -175163,32 +172308,6 @@ self: { }) {}; "pairing" = callPackage - ({ mkDerivation, base, bytestring, criterion, cryptonite, memory - , protolude, QuickCheck, random, tasty, tasty-discover, tasty-hunit - , tasty-quickcheck, wl-pprint-text - }: - mkDerivation { - pname = "pairing"; - version = "0.1.4"; - sha256 = "13g1waqb32by4qlrl2hy3mgrr3lmfwkixy0745xv33vvw8wmm36c"; - libraryHaskellDepends = [ - base bytestring cryptonite memory protolude QuickCheck random - wl-pprint-text - ]; - testHaskellDepends = [ - base bytestring cryptonite memory protolude QuickCheck random tasty - tasty-discover tasty-hunit tasty-quickcheck wl-pprint-text - ]; - testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion cryptonite memory protolude QuickCheck - random tasty tasty-hunit tasty-quickcheck wl-pprint-text - ]; - description = "Optimal ate pairing over Barreto-Naehrig curves"; - license = stdenv.lib.licenses.mit; - }) {}; - - "pairing_0_4_1" = callPackage ({ mkDerivation, arithmoi, base, binary, bytestring, criterion , errors, galois-field, hexstring, integer-logarithms, memory , MonadRandom, protolude, QuickCheck, quickcheck-instances, random @@ -175220,6 +172339,7 @@ self: { description = "Bilinear pairings"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "palette" = callPackage @@ -175287,60 +172407,6 @@ self: { }) {}; "pandoc" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring - , binary, blaze-html, blaze-markup, bytestring, Cabal - , case-insensitive, cmark-gfm, containers, criterion, data-default - , deepseq, Diff, directory, doctemplates, exceptions - , executable-path, filepath, Glob, haddock-library, hslua - , hslua-module-text, HsYAML, HTTP, http-client, http-client-tls - , http-types, JuicyPixels, mtl, network, network-uri, pandoc-types - , parsec, process, QuickCheck, random, safe, SHA, skylighting - , split, syb, tagsoup, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, temporary, texmath, text, time - , unicode-transforms, unix, unordered-containers, vector, weigh - , xml, zip-archive, zlib - }: - mkDerivation { - pname = "pandoc"; - version = "2.5"; - sha256 = "0bi26r2qljdfxq26gaxj1xnhrawrfndfavs3f3g098x0g3dwazfm"; - revision = "2"; - editedCabalFile = "1z44hcwqqmkmhfak7svrrf950amf008gzhnlxkhwdyjpnpqp21sm"; - configureFlags = [ "-fhttps" "-f-trypandoc" ]; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - aeson aeson-pretty base base64-bytestring binary blaze-html - blaze-markup bytestring case-insensitive cmark-gfm containers - data-default deepseq directory doctemplates exceptions filepath - Glob haddock-library hslua hslua-module-text HsYAML HTTP - http-client http-client-tls http-types JuicyPixels mtl network - network-uri pandoc-types parsec process random safe SHA skylighting - split syb tagsoup temporary texmath text time unicode-transforms - unix unordered-containers vector xml zip-archive zlib - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base base64-bytestring bytestring containers Diff directory - executable-path filepath Glob hslua pandoc-types process QuickCheck - tasty tasty-golden tasty-hunit tasty-quickcheck temporary text time - xml zip-archive - ]; - benchmarkHaskellDepends = [ - base bytestring containers criterion mtl text time weigh - ]; - postInstall = '' - mkdir -p $out/share - mv $data/*/*/man $out/share/ - ''; - description = "Conversion between markup formats"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - - "pandoc_2_7_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, cmark-gfm, containers, criterion, data-default @@ -175389,45 +172455,10 @@ self: { ''; description = "Conversion between markup formats"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "pandoc-citeproc" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , Cabal, containers, data-default, directory, filepath, hs-bibutils - , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051 - , setenv, split, syb, tagsoup, temporary, text, time - , unordered-containers, vector, xml-conduit, yaml - }: - mkDerivation { - pname = "pandoc-citeproc"; - version = "0.15.0.1"; - sha256 = "1y4jmralmcikmk75cf5bjlv4ymr42x35a6174ybqa99jmlm5znr9"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 - setenv split syb tagsoup text time unordered-containers vector - xml-conduit yaml - ]; - executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring filepath pandoc - pandoc-types syb text yaml - ]; - testHaskellDepends = [ - aeson base bytestring containers directory filepath mtl pandoc - pandoc-types process temporary text yaml - ]; - doCheck = false; - description = "Supports using pandoc with citeproc"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pandoc-citeproc_0_16_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils , libyaml, mtl, network, old-locale, pandoc, pandoc-types, parsec @@ -175461,7 +172492,6 @@ self: { doCheck = false; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-citeproc-preamble" = callPackage @@ -175554,6 +172584,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "A Pandoc filter for emphasizing code in fenced blocks"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-filter-graphviz" = callPackage @@ -175635,6 +172667,8 @@ self: { ]; description = "A Pandoc filter for including code from source files"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-japanese-filters" = callPackage @@ -175694,6 +172728,8 @@ self: { ]; description = "Pandoc-filter to evaluate `code` section in markdown and auto-embed output"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-placetable" = callPackage @@ -175740,25 +172776,6 @@ self: { }) {}; "pandoc-pyplot" = callPackage - ({ mkDerivation, base, containers, directory, filepath - , pandoc-types, temporary, typed-process - }: - mkDerivation { - pname = "pandoc-pyplot"; - version = "1.0.3.0"; - sha256 = "0nzpww21j79s1ww2q26856m6zq325pz32jjd4hanki7ch0ni2kg2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory filepath pandoc-types temporary - typed-process - ]; - executableHaskellDepends = [ base pandoc-types ]; - description = "A Pandoc filter for including figures generated from Matplotlib"; - license = stdenv.lib.licenses.mit; - }) {}; - - "pandoc-pyplot_2_1_4_0" = callPackage ({ mkDerivation, base, containers, data-default-class, deepseq , directory, filepath, hashable, hspec, hspec-expectations , open-browser, optparse-applicative, pandoc, pandoc-types, tasty @@ -175787,6 +172804,39 @@ self: { description = "A Pandoc filter to include figures generated from Python code blocks"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "pandoc-pyplot_2_1_5_1" = callPackage + ({ mkDerivation, base, containers, data-default-class, deepseq + , directory, filepath, hashable, hspec, hspec-expectations + , open-browser, optparse-applicative, pandoc, pandoc-types, tasty + , tasty-hspec, tasty-hunit, template-haskell, temporary, text + , typed-process, yaml + }: + mkDerivation { + pname = "pandoc-pyplot"; + version = "2.1.5.1"; + sha256 = "100mn7q5nz7xvhbnhjsfmcf9n6x1gjl71akrnc5j8k2j57bk1kkf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-default-class directory filepath hashable + pandoc pandoc-types temporary text typed-process yaml + ]; + executableHaskellDepends = [ + base data-default-class deepseq directory filepath open-browser + optparse-applicative pandoc pandoc-types template-haskell temporary + text + ]; + testHaskellDepends = [ + base data-default-class directory filepath hspec hspec-expectations + pandoc-types tasty tasty-hspec tasty-hunit temporary text + ]; + description = "A Pandoc filter to include figures generated from Python code blocks"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-sidenote" = callPackage @@ -176082,8 +173132,6 @@ self: { ]; description = "Content addressable Haskell package management"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pantry-tmp" = callPackage @@ -176737,6 +173785,8 @@ self: { ]; description = "Classes and data structures for working with data-kind indexed types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "paramtree" = callPackage @@ -176747,14 +173797,14 @@ self: { pname = "paramtree"; version = "0.1.1.1"; sha256 = "0ls9wzmz5lk7gyl8lx9cjs49zpwhrv955fs5q6ypv7bpbvjbchs1"; + revision = "1"; + editedCabalFile = "0p7zb0xvx88i72garnlihp2q1x5lpsr73jp2qh8lgasy12gy7g0q"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base bytestring tasty tasty-golden tasty-hunit temporary ]; description = "Generate labelled test/benchmark trees from sets of parameters"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "paranoia" = callPackage @@ -176964,16 +174014,14 @@ self: { broken = true; }) {}; - "parsec_3_1_13_0" = callPackage + "parsec_3_1_14_0" = callPackage ({ mkDerivation, base, bytestring, HUnit, mtl, test-framework , test-framework-hunit, text }: mkDerivation { pname = "parsec"; - version = "3.1.13.0"; - sha256 = "1wc09pyn70p8z6llink10c8pqbh6ikyk554911yfwxv1g91swqbq"; - revision = "2"; - editedCabalFile = "032sizm03m2vdqshkv4sdviyka05gqf8gs6r4hqf9did177i0qnm"; + version = "3.1.14.0"; + sha256 = "132waj2cpn892midbhpkfmb74qq83v0zv29v885frlp1gvh94b67"; libraryHaskellDepends = [ base bytestring mtl text ]; testHaskellDepends = [ base HUnit mtl test-framework test-framework-hunit @@ -177224,8 +174272,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "parser-combinators"; - version = "1.0.3"; - sha256 = "0cqic88xwi60x5x6pli0r8401yljvg2cis8a67766zypfg0il3bp"; + version = "1.1.0"; + sha256 = "149yhbnrrl108h1jinrsxni3rwrldhphpk9bbmbpr90q5fbl4xmc"; libraryHaskellDepends = [ base ]; description = "Lightweight package providing commonly useful parser combinators"; license = stdenv.lib.licenses.bsd3; @@ -177244,6 +174292,30 @@ self: { }) {}; "parser-combinators-tests" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, hspec-expectations + , hspec-megaparsec, megaparsec, megaparsec-tests + , parser-combinators, QuickCheck + }: + mkDerivation { + pname = "parser-combinators-tests"; + version = "1.1.0"; + sha256 = "0m3xgdi1q3q638zfvgpdqyrhfq9abqwjripvbdx5z9rai4whzqmz"; + revision = "1"; + editedCabalFile = "0adgbzpylvk9p7ylxynsdrmqhhbh5pm8ww1s3nz3czl79y8lhh47"; + isLibrary = false; + isExecutable = false; + testHaskellDepends = [ + base hspec hspec-expectations hspec-megaparsec megaparsec + megaparsec-tests parser-combinators QuickCheck + ]; + testToolDepends = [ hspec-discover ]; + description = "Test suite of parser-combinators"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "parser-combinators-tests_1_2_0" = callPackage ({ mkDerivation, base, hspec, hspec-discover, hspec-expectations , hspec-megaparsec, megaparsec, megaparsec-tests , parser-combinators, QuickCheck @@ -178890,6 +175962,8 @@ self: { ]; description = "Package to solve the Generalized Pell Equation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pem" = callPackage @@ -179255,6 +176329,8 @@ self: { ]; description = "Library for performing vector shuffles"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "perfecthash" = callPackage @@ -179546,7 +176622,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent_2_10_0" = callPackage + "persistent_2_10_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, fast-logger, hspec , http-api-data, monad-logger, mtl, path-pieces, resource-pool @@ -179555,8 +176631,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.10.0"; - sha256 = "1ja34gdwf72rxnz3v5d9wjri11285fpzxn8sh9ws7ldrx3kfqy1g"; + version = "2.10.1"; + sha256 = "1wwka7pxyym12hcvf45qr15n3ig9zyz5y2wl30vgcvwnhawmrsbg"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data monad-logger mtl @@ -179807,7 +176883,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "persistent-mysql_2_10_0" = callPackage + "persistent-mysql_2_10_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, fast-logger, hspec, HUnit, monad-logger, mysql , mysql-simple, persistent, persistent-qq, persistent-template @@ -179816,8 +176892,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.10.0"; - sha256 = "13y65l0vaiczxndah2djh28j4jhslymb53gnfz3av24kg5vb2y4n"; + version = "2.10.1"; + sha256 = "0a75zqfhcd8xigcifi4ksdn5xwyq5qnif1r3yvnkhp5f3vjzm9vj"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger mysql mysql-simple persistent resource-pool resourcet text @@ -180072,8 +177148,6 @@ self: { ]; description = "relational-record on persisten backends"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "persistent-spatial" = callPackage @@ -180196,10 +177270,10 @@ self: { }: mkDerivation { pname = "persistent-template"; - version = "2.5.4"; - sha256 = "008afcy7zbw7bzp9jww8gdldb51kfm0fg4p0x4xcp61gx4679bjc"; - revision = "4"; - editedCabalFile = "08yb4kcmpqmm50lwrbmavd0zhgg6p7bl8dy026xw644cazrzcvr1"; + version = "2.6.0"; + sha256 = "0wr1z2nfrl6jv1lprxb0d2jw4izqfcbcwvkdrhryzg95gjz8ryjv"; + revision = "1"; + editedCabalFile = "1p7j3lz0jrczrl25bw7cg0vskhxki065x8r6913sh8l1kvrdbkk8"; libraryHaskellDepends = [ aeson aeson-compat base bytestring containers ghc-prim http-api-data monad-control monad-logger path-pieces persistent @@ -180289,6 +177363,32 @@ self: { }) {}; "persistent-typed-db" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec + , http-api-data, monad-logger, path-pieces, persistent + , persistent-template, resource-pool, resourcet, template-haskell + , text, transformers + }: + mkDerivation { + pname = "persistent-typed-db"; + version = "0.0.1.1"; + sha256 = "0cn9dyv5gzkjn9jbv2srw94akz1rpgxsvn1hv1ik90a8sl3drh9n"; + revision = "1"; + editedCabalFile = "106dkixvzg2zia8hzxsw5fb458v7bka69szlnfxnffa5sdbm8him"; + libraryHaskellDepends = [ + aeson base bytestring conduit http-api-data monad-logger + path-pieces persistent persistent-template resource-pool resourcet + template-haskell text transformers + ]; + testHaskellDepends = [ + aeson base bytestring conduit esqueleto hspec http-api-data + monad-logger path-pieces persistent persistent-template + resource-pool resourcet template-haskell text transformers + ]; + description = "Type safe access to multiple database schemata"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "persistent-typed-db_0_1_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec , http-api-data, monad-logger, path-pieces, persistent , persistent-template, resource-pool, resourcet, template-haskell @@ -180311,7 +177411,6 @@ self: { description = "Type safe access to multiple database schemata"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "persistent-vector" = callPackage @@ -181401,6 +178500,8 @@ self: { ]; description = "Back up the notes you've saved to Pinboard"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pinch" = callPackage @@ -181594,6 +178695,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Conduit with a smaller core"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipeline" = callPackage @@ -181608,29 +178711,6 @@ self: { }) {}; "pipes" = callPackage - ({ mkDerivation, base, criterion, exceptions, mmorph, mtl - , optparse-applicative, QuickCheck, semigroups, test-framework - , test-framework-quickcheck2, transformers, void - }: - mkDerivation { - pname = "pipes"; - version = "4.3.10"; - sha256 = "1vhq8z3518y6xl0nzgdxmcd44ax40c8fghlccwhgqq132bf59nb2"; - libraryHaskellDepends = [ - base exceptions mmorph mtl semigroups transformers void - ]; - testHaskellDepends = [ - base mtl QuickCheck test-framework test-framework-quickcheck2 - transformers - ]; - benchmarkHaskellDepends = [ - base criterion mtl optparse-applicative transformers - ]; - description = "Compositional pipelines"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes_4_3_11" = callPackage ({ mkDerivation, base, criterion, exceptions, mmorph, mtl , optparse-applicative, QuickCheck, semigroups, test-framework , test-framework-quickcheck2, transformers, void @@ -181651,7 +178731,6 @@ self: { ]; description = "Compositional pipelines"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-aeson" = callPackage @@ -182361,8 +179440,6 @@ self: { ]; description = "Use network sockets together with the pipes library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pipes-network-tls" = callPackage @@ -182380,8 +179457,6 @@ self: { ]; description = "TLS-secured network connections support for pipes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pipes-network-ws" = callPackage @@ -182395,8 +179470,6 @@ self: { ]; description = "WebSockets support for pipes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pipes-ordered-zip" = callPackage @@ -183287,8 +180360,6 @@ self: { ]; description = "run a subprocess, combining stdout and stderr"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "plist" = callPackage @@ -183920,8 +180991,6 @@ self: { executableHaskellDepends = [ base ]; description = "Pointful refactoring tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pointless-fun" = callPackage @@ -184135,8 +181204,6 @@ self: { benchmarkHaskellDepends = [ base gauge semirings vector ]; description = "Polynomials"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "poly-arity" = callPackage @@ -184325,8 +181392,6 @@ self: { ]; description = "Higher-order, low-boilerplate, zero-cost free monads"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "polysemy-RandomFu" = callPackage @@ -184499,6 +181564,8 @@ self: { ]; description = "Maps and sets of partial orders"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pomodoro" = callPackage @@ -185235,6 +182302,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "postgresql-binary_0_12_1_3" = callPackage + ({ mkDerivation, aeson, base, base-prelude, binary-parser + , bytestring, bytestring-strict-builder, containers, conversion + , conversion-bytestring, conversion-text, criterion, json-ast + , loch-th, network-ip, placeholders, postgresql-libpq, QuickCheck + , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, unordered-containers + , uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.12.1.3"; + sha256 = "0y2irx1fw0xqs77qpaa3lk06r2q7j7wzbzriyc274h6lmn85sjdw"; + libraryHaskellDepends = [ + aeson base base-prelude binary-parser bytestring + bytestring-strict-builder containers loch-th network-ip + placeholders scientific text time transformers unordered-containers + uuid vector + ]; + testHaskellDepends = [ + aeson conversion conversion-bytestring conversion-text json-ast + loch-th network-ip placeholders postgresql-libpq QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-common" = callPackage ({ mkDerivation, attoparsec, base, bytestring, postgresql-simple }: mkDerivation { @@ -185365,8 +182462,6 @@ self: { ]; description = "Utilities for streaming PostgreSQL LargeObjects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "postgresql-named" = callPackage @@ -185865,6 +182960,8 @@ self: { ]; description = "Library for postmarkapp.com HTTP Api"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postmark-streams" = callPackage @@ -187041,6 +184138,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pretty-simple_3_0_0_0" = callPackage + ({ mkDerivation, ansi-terminal, base, criterion, doctest, Glob, mtl + , text, transformers + }: + mkDerivation { + pname = "pretty-simple"; + version = "3.0.0.0"; + sha256 = "0cv21iq6xk73dlmkm9ax22qv93sgqj72gzl1zxxn2870vhf102ab"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base mtl text transformers + ]; + testHaskellDepends = [ base doctest Glob ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "pretty printer for data types with a 'Show' instance"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pretty-sop" = callPackage ({ mkDerivation, base, generics-sop, markdown-unlit, pretty-show }: mkDerivation { @@ -187082,18 +184199,6 @@ self: { }) {}; "pretty-types" = callPackage - ({ mkDerivation, base, hspec, mtl, tagged }: - mkDerivation { - pname = "pretty-types"; - version = "0.2.3.1"; - sha256 = "0kvqp39q1qydgf6rlrabgjcgv53irdh9xvw2p7hazbls178ljv75"; - libraryHaskellDepends = [ base mtl tagged ]; - testHaskellDepends = [ base hspec tagged ]; - description = "A small pretty printing DSL for complex types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pretty-types_0_3_0_1" = callPackage ({ mkDerivation, base, hspec, mtl, tagged }: mkDerivation { pname = "pretty-types"; @@ -187103,7 +184208,6 @@ self: { testHaskellDepends = [ base hspec tagged ]; description = "A small pretty printing DSL for complex types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prettyFunctionComposing" = callPackage @@ -187135,13 +184239,13 @@ self: { }: mkDerivation { pname = "prettyprinter"; - version = "1.2.1"; - sha256 = "1kvza7jp5n833m8rj0bc35bd2p8wx3fq0iqflm9nbh3wm05kwrg7"; + version = "1.2.1.1"; + sha256 = "1p9c3q55hba4c0zyxc624g5df7wgsclpsmd8wqpdnmib882q9d1v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ - base bytestring doctest pgp-wordlist tasty tasty-hunit + base bytestring doctest pgp-wordlist QuickCheck tasty tasty-hunit tasty-quickcheck text ]; benchmarkHaskellDepends = [ @@ -187445,8 +184549,6 @@ self: { libraryHaskellDepends = [ base primitive ]; description = "Addresses to unmanaged memory"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "primitive-atomic" = callPackage @@ -187506,6 +184608,30 @@ self: { }) {}; "primitive-extras" = callPackage + ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus + , foldl, list-t, primitive, profunctors, QuickCheck + , quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck, vector + }: + mkDerivation { + pname = "primitive-extras"; + version = "0.7.1.1"; + sha256 = "1hffgvqdrsxml2z834jb1mpywkflcnlymmxp9dmapwg8pcadjzdm"; + revision = "1"; + editedCabalFile = "10z7fnz907s7ar15lk3kq62p11bbsksdb0nmg5y7ii0n97mqni96"; + libraryHaskellDepends = [ + base bytestring cereal deferred-folds focus foldl list-t primitive + profunctors vector + ]; + testHaskellDepends = [ + cereal deferred-folds focus primitive QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + ]; + description = "Extras for the \"primitive\" library"; + license = stdenv.lib.licenses.mit; + }) {}; + + "primitive-extras_0_8" = callPackage ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus , foldl, list-t, primitive, primitive-unlifted, profunctors , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit @@ -187526,7 +184652,6 @@ self: { description = "Extras for the \"primitive\" library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "primitive-foreign" = callPackage @@ -188267,8 +185392,6 @@ self: { libraryHaskellDepends = [ base category ]; description = "Product category"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "product-isomorphic" = callPackage @@ -188744,6 +185867,8 @@ self: { libraryHaskellDepends = [ base fgl graphviz mtl prolog text ]; description = "Generating images of resolution trees for Prolog queries"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prologue" = callPackage @@ -188786,6 +185911,8 @@ self: { ]; description = "Prometheus Haskell Client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prometheus-client" = callPackage @@ -188982,8 +186109,6 @@ self: { executableHaskellDepends = [ base ]; description = "property-based host configuration management in haskell"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "properties" = callPackage @@ -189157,24 +186282,6 @@ self: { }) {}; "proto-lens" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq - , lens-family, lens-labels, parsec, pretty, text, transformers - , void - }: - mkDerivation { - pname = "proto-lens"; - version = "0.4.0.1"; - sha256 = "1ryz183ds1k28nvw6y1w84k29aq5mgrpv5yyqarj0g463gp137cm"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - attoparsec base bytestring containers deepseq lens-family - lens-labels parsec pretty text transformers void - ]; - description = "A lens-based implementation of protocol buffers in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "proto-lens_0_5_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim , lens-family, parsec, pretty, primitive, profunctors, QuickCheck , tagged, test-framework, test-framework-quickcheck2, text @@ -189195,7 +186302,6 @@ self: { ]; description = "A lens-based implementation of protocol buffers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-arbitrary" = callPackage @@ -189286,23 +186392,6 @@ self: { }) {inherit (pkgs) protobuf;}; "proto-lens-protobuf-types" = callPackage - ({ mkDerivation, base, Cabal, lens-labels, proto-lens - , proto-lens-runtime, proto-lens-setup, protobuf, text - }: - mkDerivation { - pname = "proto-lens-protobuf-types"; - version = "0.4.0.1"; - sha256 = "091284pyp4b36hnvfjsrsg6zlgw1payzwfbsy66sgbbi285mwira"; - setupHaskellDepends = [ base Cabal proto-lens-setup ]; - libraryHaskellDepends = [ - base lens-labels proto-lens proto-lens-runtime text - ]; - libraryToolDepends = [ protobuf ]; - description = "Basic protocol buffer message types"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) protobuf;}; - - "proto-lens-protobuf-types_0_5_0_0" = callPackage ({ mkDerivation, base, Cabal, lens-family, proto-lens , proto-lens-runtime, proto-lens-setup, protobuf, text }: @@ -189317,7 +186406,6 @@ self: { libraryToolDepends = [ protobuf ]; description = "Basic protocol buffer message types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) protobuf;}; "proto-lens-protoc_0_2_2_3" = callPackage @@ -189348,28 +186436,6 @@ self: { }) {inherit (pkgs) protobuf;}; "proto-lens-protoc" = callPackage - ({ mkDerivation, base, bytestring, containers, filepath - , haskell-src-exts, lens-family, pretty, proto-lens, protobuf, text - }: - mkDerivation { - pname = "proto-lens-protoc"; - version = "0.4.0.2"; - sha256 = "1kvbv7c42qcynh25mh1vzwdzk4fhvjai031hwmsrmpqywgbgknmm"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers filepath haskell-src-exts lens-family pretty - proto-lens text - ]; - libraryToolDepends = [ protobuf ]; - executableHaskellDepends = [ - base bytestring containers lens-family proto-lens text - ]; - description = "Protocol buffer compiler for the proto-lens library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) protobuf;}; - - "proto-lens-protoc_0_5_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, filepath , haskell-src-exts, lens-family, pretty, proto-lens, protobuf, text }: @@ -189389,26 +186455,9 @@ self: { ]; description = "Protocol buffer compiler for the proto-lens library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) protobuf;}; "proto-lens-runtime" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, filepath - , lens-family, lens-labels, proto-lens, text - }: - mkDerivation { - pname = "proto-lens-runtime"; - version = "0.4.0.2"; - sha256 = "1k6biy5z890nn5b76sd3xr086sbrqr09rx1r2a7jxra2l2ymc4sr"; - libraryHaskellDepends = [ - base bytestring containers deepseq filepath lens-family lens-labels - proto-lens text - ]; - doHaddock = false; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "proto-lens-runtime_0_5_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, filepath , lens-family, proto-lens, text, vector }: @@ -189422,7 +186471,6 @@ self: { ]; doHaddock = false; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-setup" = callPackage @@ -189659,23 +186707,6 @@ self: { }) {}; "protocol-radius-test" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers - , protocol-radius, QuickCheck, quickcheck-simple, transformers - }: - mkDerivation { - pname = "protocol-radius-test"; - version = "0.0.1.0"; - sha256 = "185d85d9gfylcg575rvr43p4p8wzh0mi9frvkm2cn3liwwarmk5m"; - libraryHaskellDepends = [ - base bytestring cereal containers protocol-radius QuickCheck - quickcheck-simple transformers - ]; - testHaskellDepends = [ base quickcheck-simple ]; - description = "testsuit of protocol-radius haskell package"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "protocol-radius-test_0_1_0_0" = callPackage ({ mkDerivation, base, bytestring, cereal, containers , protocol-radius, QuickCheck, quickcheck-simple, transformers }: @@ -189690,7 +186721,6 @@ self: { testHaskellDepends = [ base quickcheck-simple ]; description = "testsuit of protocol-radius haskell package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protolude" = callPackage @@ -191360,37 +188390,6 @@ self: { }) {}; "qnap-decrypt" = callPackage - ({ mkDerivation, base, binary, bytestring, cipher-aes128, conduit - , conduit-extra, crypto-api, directory, filepath, hspec, HUnit - , optparse-applicative, streaming-commons, tagged, temporary - , utf8-string - }: - mkDerivation { - pname = "qnap-decrypt"; - version = "0.3.4"; - sha256 = "0s263zkdns50bvanjiaiavdk6bpd1ccqbckdmxwbbl2sxp2s3jxz"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base binary bytestring cipher-aes128 conduit conduit-extra - crypto-api directory streaming-commons tagged utf8-string - ]; - executableHaskellDepends = [ - base binary bytestring cipher-aes128 conduit conduit-extra - crypto-api directory filepath optparse-applicative - streaming-commons tagged utf8-string - ]; - testHaskellDepends = [ - base binary bytestring cipher-aes128 conduit conduit-extra - crypto-api directory filepath hspec HUnit streaming-commons tagged - temporary utf8-string - ]; - description = "Decrypt files encrypted by QNAP's Hybrid Backup Sync"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "qnap-decrypt_0_3_5" = callPackage ({ mkDerivation, base, binary, bytestring, cipher-aes128, conduit , conduit-extra, crypto-api, directory, filepath, hspec, HUnit , optparse-applicative, streaming-commons, tagged, temporary @@ -191419,7 +188418,6 @@ self: { ]; description = "Decrypt files encrypted by QNAP's Hybrid Backup Sync"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "qq-literals" = callPackage @@ -191646,28 +188644,6 @@ self: { }) {}; "quadratic-irrational" = callPackage - ({ mkDerivation, arithmoi, base, containers, directory, doctest - , filepath, mtl, numbers, QuickCheck, tasty, tasty-quickcheck - , transformers - }: - mkDerivation { - pname = "quadratic-irrational"; - version = "0.0.6"; - sha256 = "02hdxi9kjp7dccmb7ix3a0yqr7fvl2vpc588ibxq6gjd5v3716r0"; - revision = "1"; - editedCabalFile = "0i7dsl7zm9r7sgfs2cwmic3qbk15lc7kbhjd53vin89p21fh8mzm"; - libraryHaskellDepends = [ - arithmoi base containers mtl transformers - ]; - testHaskellDepends = [ - base directory doctest filepath mtl numbers QuickCheck tasty - tasty-quickcheck - ]; - description = "An implementation of quadratic irrationals"; - license = stdenv.lib.licenses.mit; - }) {}; - - "quadratic-irrational_0_1_0" = callPackage ({ mkDerivation, arithmoi, base, containers, directory, doctest , filepath, mtl, numbers, QuickCheck, tasty, tasty-quickcheck , transformers @@ -191683,7 +188659,6 @@ self: { ]; description = "An implementation of quadratic irrationals"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quandl-api" = callPackage @@ -192107,8 +189082,6 @@ self: { ]; description = "Generate QuickCheck Gen for Sum Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "quickcheck-assertions" = callPackage @@ -192130,11 +189103,14 @@ self: { }: mkDerivation { pname = "quickcheck-classes"; - version = "0.6.0.0"; - sha256 = "02ssvvhi87ggyxi3jsg2h1xirwqyydda88n5ax4imfljvig366cy"; + version = "0.6.1.0"; + sha256 = "01mqsffks1d0wf3vwrlmalqxqha2gfqa389gqq0zr5b9y7ka5a8h"; + revision = "1"; + editedCabalFile = "1n68f8qw8if3db7x7b49lfvs0hpdvlmq0bhdjf1dvmaz0wmw932i"; libraryHaskellDepends = [ aeson base base-orphans bifunctors containers fail primitive QuickCheck semigroupoids semigroups semirings tagged transformers + vector ]; testHaskellDepends = [ aeson base base-orphans containers primitive QuickCheck @@ -192144,20 +189120,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "quickcheck-classes_0_6_2_1" = callPackage + "quickcheck-classes_0_6_3_0" = callPackage ({ mkDerivation, aeson, base, base-orphans, bifunctors, containers , contravariant, fail, primitive, primitive-addr, QuickCheck - , semigroupoids, semigroups, semirings, tagged, tasty - , tasty-quickcheck, transformers, vector + , quickcheck-classes-base, semigroupoids, semigroups, semirings + , tagged, tasty, tasty-quickcheck, transformers, vector }: mkDerivation { pname = "quickcheck-classes"; - version = "0.6.2.1"; - sha256 = "1pw4r4166a3f0ylvjifpcnicfh9kidz7lvjpgp4m0frhaqhx82ig"; + version = "0.6.3.0"; + sha256 = "0rbrxs79naffzp809523452xprh7z33j6p256qs0cnni9v9zfgjf"; libraryHaskellDepends = [ aeson base base-orphans bifunctors containers contravariant fail - primitive primitive-addr QuickCheck semigroupoids semigroups - semirings tagged transformers vector + primitive primitive-addr QuickCheck quickcheck-classes-base + semigroupoids semigroups semirings tagged transformers vector ]; testHaskellDepends = [ aeson base base-orphans containers primitive QuickCheck @@ -192168,6 +189144,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "quickcheck-classes-base" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, containers + , contravariant, fail, QuickCheck, semigroups, tagged, transformers + }: + mkDerivation { + pname = "quickcheck-classes-base"; + version = "0.6.0.0"; + sha256 = "193jbr3fy2451gx0hzw82xrzxp6mxz5ics6yaybbz1a3dhlz53yx"; + libraryHaskellDepends = [ + base base-orphans bifunctors containers contravariant fail + QuickCheck semigroups tagged transformers + ]; + description = "QuickCheck common typeclasses from `base`"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "quickcheck-combinators" = callPackage ({ mkDerivation, base, QuickCheck, unfoldable-restricted }: mkDerivation { @@ -192176,6 +189168,8 @@ self: { sha256 = "0qdjls949kmcv8wj3a27p4dz8nb1dq4i99zizkw7qyqn47r9ccxd"; libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickcheck-enum-instances" = callPackage @@ -192190,29 +189184,6 @@ self: { }) {}; "quickcheck-instances" = callPackage - ({ mkDerivation, array, base, base-compat, bytestring - , case-insensitive, containers, hashable, old-time, QuickCheck - , scientific, tagged, text, time, transformers, transformers-compat - , unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "quickcheck-instances"; - version = "0.3.19"; - sha256 = "0mls8095ylk5pq2j787ary5lyn4as64414silq3zn4sky3zsx92p"; - libraryHaskellDepends = [ - array base base-compat bytestring case-insensitive containers - hashable old-time QuickCheck scientific tagged text time - transformers transformers-compat unordered-containers uuid-types - vector - ]; - testHaskellDepends = [ - base containers QuickCheck tagged uuid-types - ]; - description = "Common quickcheck instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "quickcheck-instances_0_3_22" = callPackage ({ mkDerivation, array, base, base-compat, bytestring , case-insensitive, containers, hashable, old-time, QuickCheck , scientific, splitmix, tagged, text, time, time-compat @@ -192235,7 +189206,6 @@ self: { benchmarkHaskellDepends = [ base bytestring QuickCheck ]; description = "Common quickcheck instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-io" = callPackage @@ -192393,6 +189363,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-simple_0_1_1_1" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "quickcheck-simple"; + version = "0.1.1.1"; + sha256 = "0ah32y1p39p3d0696zp4mlf4bj67ggh73sb8nvf21snkwll86dai"; + libraryHaskellDepends = [ base QuickCheck ]; + description = "Test properties and default-mains for QuickCheck"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-special" = callPackage ({ mkDerivation, base, QuickCheck, special-values }: mkDerivation { @@ -192407,38 +189389,6 @@ self: { }) {}; "quickcheck-state-machine" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers - , directory, doctest, exceptions, filelock, filepath, http-client - , lifted-async, matrix, monad-control, monad-logger, mtl, network - , persistent, persistent-postgresql, persistent-template - , pretty-show, process, QuickCheck, quickcheck-instances, random - , resourcet, servant, servant-client, servant-server, split, stm - , strict, string-conversions, tasty, tasty-hunit, tasty-quickcheck - , text, tree-diff, vector, wai, warp - }: - mkDerivation { - pname = "quickcheck-state-machine"; - version = "0.4.3"; - sha256 = "0f9hsjhrnab8gy51m4m1fn5i594ixx1qw14hsfwsakbn8f78aarx"; - libraryHaskellDepends = [ - ansi-wl-pprint base containers exceptions lifted-async matrix - monad-control mtl pretty-show QuickCheck split stm tree-diff vector - ]; - testHaskellDepends = [ - base bytestring directory doctest filelock filepath http-client - lifted-async matrix monad-control monad-logger mtl network - persistent persistent-postgresql persistent-template process - QuickCheck quickcheck-instances random resourcet servant - servant-client servant-server stm strict string-conversions tasty - tasty-hunit tasty-quickcheck text tree-diff vector wai warp - ]; - description = "Test monadic programs using state machine based models"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "quickcheck-state-machine_0_6_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers , directory, doctest, exceptions, filelock, filepath, http-client , matrix, monad-logger, mtl, network, persistent @@ -192510,6 +189460,8 @@ self: { ]; description = "Helper to build generators with Text.StringRandom"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickcheck-text" = callPackage @@ -192568,8 +189520,6 @@ self: { libraryHaskellDepends = [ base QuickCheck template-haskell ]; description = "Get counterexamples from QuickCheck as Haskell values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "quicklz" = callPackage @@ -193188,6 +190138,8 @@ self: { attoparsec base criterion deepseq QuasiText text vector ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rados-haskell" = callPackage @@ -193438,6 +190390,8 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Random access list with a list compatible interface"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rallod" = callPackage @@ -193691,8 +190645,6 @@ self: { testHaskellDepends = [ base ]; description = "Multivariate distributions for random-fu"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "random-hypergeometric" = callPackage @@ -193893,26 +190845,6 @@ self: { }) {}; "range-set-list" = callPackage - ({ mkDerivation, base, containers, deepseq, hashable, tasty - , tasty-quickcheck - }: - mkDerivation { - pname = "range-set-list"; - version = "0.1.3"; - sha256 = "1pwnriv5r093qvqzzg9s868613nf92d3h8qmqaqc5qq95hykj6z5"; - revision = "1"; - editedCabalFile = "00ddj7if8lcrqf5c882m4slm15sdwcghz7d2fz222c7jcw1ahvdr"; - libraryHaskellDepends = [ base containers deepseq hashable ]; - testHaskellDepends = [ - base containers deepseq hashable tasty tasty-quickcheck - ]; - description = "Memory efficient sets with ranges of elements"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "range-set-list_0_1_3_1" = callPackage ({ mkDerivation, base, containers, deepseq, hashable, tasty , tasty-quickcheck }: @@ -193926,8 +190858,6 @@ self: { ]; description = "Memory efficient sets with ranges of elements"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "range-space" = callPackage @@ -194015,26 +190945,6 @@ self: { }) {}; "rank2classes" = callPackage - ({ mkDerivation, base, distributive, doctest, tasty, tasty-hunit - , template-haskell, transformers - }: - mkDerivation { - pname = "rank2classes"; - version = "1.2.1"; - sha256 = "0dbg5hc8vy0nikyw9h99d9z5jpwfzqb3jwg1li5h281fi5cm4nb0"; - libraryHaskellDepends = [ - base distributive template-haskell transformers - ]; - testHaskellDepends = [ - base distributive doctest tasty tasty-hunit - ]; - 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; - }) {}; - - "rank2classes_1_3" = callPackage ({ mkDerivation, base, distributive, doctest, tasty, tasty-hunit , template-haskell, transformers }: @@ -194387,21 +191297,6 @@ self: { }) {}; "ratel-wai" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , http-client, ratel, wai - }: - mkDerivation { - pname = "ratel-wai"; - version = "1.0.5"; - sha256 = "07k2gzc2by6zhsk1zqp0kjk37zc6ikigdp0j5d38pd7x30a7qk7x"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers http-client ratel wai - ]; - description = "Notify Honeybadger about exceptions via a WAI middleware"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ratel-wai_1_1_0" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai }: @@ -194414,7 +191309,6 @@ self: { ]; description = "Notify Honeybadger about exceptions via a WAI middleware"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rating-chgk-info" = callPackage @@ -194443,8 +191337,6 @@ self: { benchmarkHaskellDepends = [ base-noprelude gauge relude ]; description = "Client for rating.chgk.info API and CSV tables (documentation in Russian)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rating-systems" = callPackage @@ -194492,39 +191384,6 @@ self: { }) {}; "rattletrap" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits - , bytestring, clock, containers, filepath, http-client - , http-client-tls, HUnit, template-haskell, temporary, text - , transformers - }: - mkDerivation { - pname = "rattletrap"; - version = "6.0.2"; - sha256 = "1904g1s61zazhg6zn189m7y9v5aap39zd0gfypzd9jrk6489aqi1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls template-haskell text - transformers - ]; - executableHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls template-haskell text - transformers - ]; - testHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring clock - containers filepath http-client http-client-tls HUnit - template-haskell temporary text transformers - ]; - description = "Parse and generate Rocket League replays"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "rattletrap_9_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits , bytestring, containers, filepath, http-client, http-client-tls , HUnit, scientific, template-haskell, temporary, text @@ -195471,8 +192330,6 @@ self: { testHaskellDepends = [ base doctest protolude tasty ]; description = "See readme.md"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "readpyc" = callPackage @@ -195710,21 +192567,6 @@ self: { }) {}; "record-dot-preprocessor" = callPackage - ({ mkDerivation, base, extra, filepath }: - mkDerivation { - pname = "record-dot-preprocessor"; - version = "0.1.5"; - sha256 = "1vap09g7gh9nsr4x4bfysx3ha8kc9vpx252j0fdmffbivyj5d2wl"; - revision = "1"; - editedCabalFile = "1hggzp6fh071f2d11pn1y2rgczgxgvcfw86717gpxsm34kr60pgb"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ base extra filepath ]; - description = "Preprocessor to allow record.field syntax"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "record-dot-preprocessor_0_2" = callPackage ({ mkDerivation, base, extra, filepath, ghc, record-hasfield , uniplate }: @@ -195739,7 +192581,6 @@ self: { testHaskellDepends = [ base extra filepath record-hasfield ]; description = "Preprocessor to allow record.field syntax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "record-encode" = callPackage @@ -195908,8 +192749,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "recursion"; - version = "2.2.3.0"; - sha256 = "193v6ygjhgv8l5b31gs4279dah677lhlj68kvj80pw5vj5azyawr"; + version = "2.2.4.0"; + sha256 = "0n50nv1lzahy2mfvia5v41f8jx9w2yygzq584xbkirazhj73sjbx"; libraryHaskellDepends = [ base composition-prelude ]; description = "A recursion schemes library for GHC"; license = stdenv.lib.licenses.bsd3; @@ -196439,6 +193280,8 @@ self: { testHaskellDepends = [ base doctest ]; description = "Refinement types with static and runtime checking"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reflection" = callPackage @@ -196868,6 +193711,8 @@ self: { ]; description = "Reflex FRP host and widgets for vty applications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reform" = callPackage @@ -196920,6 +193765,8 @@ self: { ]; description = "Happstack support for reform"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reform-hsp" = callPackage @@ -196931,6 +193778,8 @@ self: { libraryHaskellDepends = [ base hsp hsx2hs reform text ]; description = "Add support for using HSP with Reform"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reform-lucid" = callPackage @@ -197735,6 +194584,35 @@ self: { broken = true; }) {}; + "registry_0_1_7_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph + , MonadRandom, mtl, multimap, protolude, random, resourcet + , semigroupoids, semigroups, tasty, tasty-discover, tasty-hedgehog + , tasty-th, template-haskell, text, transformers-base, universum + }: + mkDerivation { + pname = "registry"; + version = "0.1.7.0"; + sha256 = "14da74d1fijib9w6xi2x904c9iqhdja685lq63c0wc6zgi7ss2ln"; + libraryHaskellDepends = [ + base containers exceptions hashable mmorph mtl protolude resourcet + semigroupoids semigroups template-haskell text transformers-base + ]; + testHaskellDepends = [ + async base bytestring containers directory exceptions generic-lens + hashable hedgehog io-memoize mmorph MonadRandom mtl multimap + protolude random resourcet semigroupoids semigroups tasty + tasty-discover tasty-hedgehog tasty-th template-haskell text + transformers-base universum + ]; + testToolDepends = [ tasty-discover ]; + description = "data structure for assembling components"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "registry-hedgehog" = callPackage ({ mkDerivation, base, containers, generic-lens, hedgehog, mmorph , multimap, protolude, registry, tasty, tasty-discover @@ -197959,6 +194837,8 @@ self: { ]; description = "Sensible RLP encoding"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "relation" = callPackage @@ -197976,6 +194856,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "A data structure representing Relations on Sets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "relational-postgresql8" = callPackage @@ -197998,28 +194880,6 @@ self: { }) {}; "relational-query" = callPackage - ({ mkDerivation, array, base, bytestring, containers, dlist - , names-th, persistable-record, product-isomorphic - , quickcheck-simple, sql-words, template-haskell, text - , th-reify-compat, time, time-locale-compat, transformers - }: - mkDerivation { - pname = "relational-query"; - version = "0.12.2.1"; - sha256 = "09ihkynff79kpgph6kwb0rr6q9crkppdhal4nz7gvb1nx3y8fw9s"; - libraryHaskellDepends = [ - array base bytestring containers dlist names-th persistable-record - product-isomorphic sql-words template-haskell text th-reify-compat - time time-locale-compat transformers - ]; - testHaskellDepends = [ - base containers product-isomorphic quickcheck-simple transformers - ]; - description = "Typeful, Modular, Relational, algebraic query engine"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "relational-query_0_12_2_2" = callPackage ({ mkDerivation, array, base, bytestring, containers, dlist , names-th, persistable-record, product-isomorphic , quickcheck-simple, sql-words, template-haskell, text @@ -198039,7 +194899,6 @@ self: { ]; description = "Typeful, Modular, Relational, algebraic query engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-query-HDBC" = callPackage @@ -198197,29 +195056,6 @@ self: { }) {}; "relude" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, doctest - , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty - , tasty-hedgehog, text, transformers, unordered-containers - }: - mkDerivation { - pname = "relude"; - version = "0.4.0"; - sha256 = "03z8ji8hssb811d1xvmv2zlnq7h7dsr801x05xydhfl1srbg5i9f"; - libraryHaskellDepends = [ - base bytestring containers deepseq ghc-prim hashable mtl stm text - transformers unordered-containers - ]; - testHaskellDepends = [ - base bytestring doctest Glob hedgehog tasty tasty-hedgehog text - ]; - benchmarkHaskellDepends = [ - base containers gauge unordered-containers - ]; - description = "Custom prelude from Kowainik"; - license = stdenv.lib.licenses.mit; - }) {}; - - "relude_0_5_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, QuickCheck, stm , tasty, tasty-hedgehog, text, transformers, unordered-containers @@ -198243,7 +195079,6 @@ self: { ]; description = "Custom prelude from Kowainik"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "remark" = callPackage @@ -199056,38 +195891,6 @@ self: { }) {}; "req" = callPackage - ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder - , bytestring, case-insensitive, connection, data-default-class - , hspec, hspec-core, hspec-discover, http-api-data, http-client - , http-client-tls, http-types, monad-control, mtl, QuickCheck - , retry, text, time, transformers, transformers-base - , unordered-containers - }: - mkDerivation { - pname = "req"; - version = "1.2.1"; - sha256 = "1s8gjifc9jixl4551hay013fwyhlamcyrxjb00qr76wwikqa0g8k"; - revision = "3"; - editedCabalFile = "1sbm2rk2q56gma2wja47q1rc8a2pizl8487g5z4fy1zynxm5inyj"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson authenticate-oauth base blaze-builder bytestring - case-insensitive connection data-default-class http-api-data - http-client http-client-tls http-types monad-control mtl retry text - time transformers transformers-base - ]; - testHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive - data-default-class hspec hspec-core http-client http-types - monad-control mtl QuickCheck text time unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - doCheck = false; - description = "Easy-to-use, type-safe, expandable, high-level HTTP client library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "req_2_1_0" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder , bytestring, case-insensitive, connection, hspec, hspec-core , hspec-discover, http-api-data, http-client, http-client-tls @@ -199114,7 +195917,6 @@ self: { doCheck = false; description = "Easy-to-use, type-safe, expandable, high-level HTTP client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "req-conduit" = callPackage @@ -199163,30 +195965,11 @@ self: { testHaskellDepends = [ base hspec ]; description = "Provides OAuth2 authentication for use with Req"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "req-url-extra" = callPackage - ({ mkDerivation, aeson, base, data-default-class, hspec, modern-uri - , req, text - }: - mkDerivation { - pname = "req-url-extra"; - version = "0.1.0.0"; - sha256 = "113xsf37kra3k3jhf2wh37rsgphxz24rsn3dy8zw1cwzsim2dpmk"; - revision = "2"; - editedCabalFile = "0srj9fcbm9y8ddqgs8wc6caxamhgnic54y8qpxwnqdxrggdfkk67"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base modern-uri req ]; - executableHaskellDepends = [ - aeson base data-default-class modern-uri req text - ]; - testHaskellDepends = [ base hspec modern-uri req ]; - description = "Provides URI/URL helper functions for use with Req"; - license = stdenv.lib.licenses.mit; - }) {}; - - "req-url-extra_0_1_1_0" = callPackage ({ mkDerivation, aeson, base, hspec, modern-uri, req, text }: mkDerivation { pname = "req-url-extra"; @@ -199200,6 +195983,7 @@ self: { description = "Provides URI/URL helper functions for use with Req"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reqcatcher" = callPackage @@ -199216,6 +196000,8 @@ self: { ]; description = "A local http server to catch the HTTP redirect"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "request-monad" = callPackage @@ -199347,6 +196133,8 @@ self: { libraryHaskellDepends = [ base ghc-prim ralist semigroupoids ]; description = "High performance variable binders"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "resistor-cube" = callPackage @@ -199986,26 +196774,6 @@ self: { }) {}; "retry" = callPackage - ({ mkDerivation, base, data-default-class, exceptions, ghc-prim - , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog - , tasty-hunit, time, transformers - }: - mkDerivation { - pname = "retry"; - version = "0.7.7.0"; - sha256 = "0v6irf01xykhv0mwr1k5i08jn77irqbz8h116j8p435d11xc5jrw"; - libraryHaskellDepends = [ - base data-default-class exceptions ghc-prim random transformers - ]; - testHaskellDepends = [ - base data-default-class exceptions ghc-prim hedgehog HUnit mtl - random stm tasty tasty-hedgehog tasty-hunit time transformers - ]; - description = "Retry combinators for monadic actions that may fail"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "retry_0_8_0_1" = callPackage ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl , random, stm, tasty, tasty-hedgehog, tasty-hunit, time , transformers @@ -200023,7 +196791,6 @@ self: { ]; description = "Retry combinators for monadic actions that may fail"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "retryer" = callPackage @@ -200365,8 +197132,6 @@ self: { libraryHaskellDepends = [ base network-simple rfc1413-types ]; description = "rfc1413 server"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rfc1413-types" = callPackage @@ -200440,6 +197205,8 @@ self: { ]; description = "A dynamic/unbounded alternative to Bounded Enum"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rgb-color-model" = callPackage @@ -200574,6 +197341,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rib" = callPackage + ({ mkDerivation, aeson, async, base, binary, bytestring, clay + , cmdargs, containers, data-default, fsnotify, http-types, lens + , lens-aeson, lucid, mtl, pandoc, pandoc-include-code, pandoc-types + , safe, shake, skylighting, text, time, wai, wai-app-static + , wai-extra, warp + }: + mkDerivation { + pname = "rib"; + version = "0.2.0.0"; + sha256 = "0fn6hwg1lns92qy7c531rqrdryaildkr25isvdflnydczvy9wx3r"; + libraryHaskellDepends = [ + aeson async base binary bytestring clay cmdargs containers + data-default fsnotify http-types lens lens-aeson lucid mtl pandoc + pandoc-include-code pandoc-types safe shake skylighting text time + wai wai-app-static wai-extra warp + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ribbit" = callPackage ({ mkDerivation, base, Only, postgresql-simple, text, time }: mkDerivation { @@ -200830,30 +197617,6 @@ self: { }) {}; "rio" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , exceptions, filepath, hashable, hspec, microlens, mtl, primitive - , process, text, time, typed-process, unix, unliftio - , unordered-containers, vector - }: - mkDerivation { - pname = "rio"; - version = "0.1.8.0"; - sha256 = "1qgmvfc8whhg0qd6zh4jaqqbx5c4p11r8dskybanj6hs482ds4x0"; - libraryHaskellDepends = [ - base bytestring containers deepseq directory exceptions filepath - hashable microlens mtl primitive process text time typed-process - unix unliftio unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring containers deepseq directory exceptions filepath - hashable hspec microlens mtl primitive process text time - typed-process unix unliftio unordered-containers vector - ]; - description = "A standard library for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rio_0_1_11_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , exceptions, filepath, hashable, hspec, microlens, mtl, primitive , process, QuickCheck, text, time, typed-process, unix, unliftio @@ -200876,7 +197639,6 @@ self: { ]; description = "A standard library for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rio-orphans" = callPackage @@ -200915,8 +197677,6 @@ self: { ]; description = "Pretty-printing for RIO"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "riot" = callPackage @@ -201690,8 +198450,8 @@ self: { }: mkDerivation { pname = "ron"; - version = "0.7"; - sha256 = "1bh4vdq9nwi5kwfa2qly1n0jfnphy17b8svd1k3jdzjfclwrjpgj"; + version = "0.8"; + sha256 = "1j5agf0367ldn3jb1jwgi9x9r4sss4jb93j6sgw5w9yzgqj23i8w"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring containers hashable integer-gmp mtl scientific template-haskell text time @@ -201708,8 +198468,8 @@ self: { }: mkDerivation { pname = "ron-rdt"; - version = "0.7"; - sha256 = "1fcvsirzhwmkzcsdr0bhipqq7k7wsg1cjb6z3q4sjihcq9qp22gq"; + version = "0.8"; + sha256 = "1k8xyxi5s3c1q45j51s7ssghqq5m5ka3hn29z4wb7inyzllz6ifx"; libraryHaskellDepends = [ base containers Diff hashable integer-gmp mtl ron text time transformers unordered-containers @@ -201725,8 +198485,8 @@ self: { }: mkDerivation { pname = "ron-schema"; - version = "0.7"; - sha256 = "12vnzmsj6vxvr26x7a9vvp025dxn9jlyi40hgpydpyg9dmjbs246"; + version = "0.8"; + sha256 = "1hqf9wpiwckaj25ljfyfl6dkp53jg31x3wyryc0vwfdy269v8lfb"; libraryHaskellDepends = [ base bytestring containers hedn integer-gmp megaparsec mtl ron ron-rdt template-haskell text transformers @@ -201742,8 +198502,8 @@ self: { }: mkDerivation { pname = "ron-storage"; - version = "0.8"; - sha256 = "1326r8x3m4x1ylf32x66h9s6y7z4hwrwah33kkshj656f3f4bnds"; + version = "0.9"; + sha256 = "0bvmy5mya2v64cj3sxvr0mlfp4zc0xy4q33qr6hk3r6k5jwdfqwx"; libraryHaskellDepends = [ base bytestring containers directory filepath integer-gmp mtl network-info ron ron-rdt stm text transformers @@ -203285,6 +200045,8 @@ self: { ]; description = "Instances from the store library for the safe-money library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "safe-money-xmlbf" = callPackage @@ -203302,8 +200064,6 @@ self: { ]; description = "Instances from the xmlbf library for the safe-money library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "safe-plugins" = callPackage @@ -203591,30 +200351,6 @@ self: { }) {}; "salak" = callPackage - ({ mkDerivation, aeson, attoparsec, base, containers, data-default - , directory, filepath, hspec, menshen, mtl, pqueue, QuickCheck - , scientific, text, transformers, unordered-containers, vector - , yaml - }: - mkDerivation { - pname = "salak"; - version = "0.1.11"; - sha256 = "03l6vadg5wzz2pf1kaxl0h7qndkspymamfdm27ifpwz3vwfy7m1p"; - libraryHaskellDepends = [ - aeson attoparsec base containers data-default directory filepath - menshen mtl pqueue scientific text transformers - unordered-containers vector yaml - ]; - testHaskellDepends = [ - aeson attoparsec base containers data-default directory filepath - hspec menshen mtl pqueue QuickCheck scientific text transformers - unordered-containers vector yaml - ]; - description = "Configuration Loader"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "salak_0_3_3" = callPackage ({ mkDerivation, attoparsec, base, bytestring, data-default , directory, exceptions, filepath, hashable, heaps, hspec, menshen , mtl, QuickCheck, random, scientific, text, time, unliftio-core @@ -203636,6 +200372,30 @@ self: { ]; description = "Configuration (re)Loader and Parser"; license = stdenv.lib.licenses.mit; + }) {}; + + "salak_0_3_3_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , data-default, directory, exceptions, filepath, hashable, heaps + , hspec, menshen, mtl, QuickCheck, random, scientific, text, time + , unliftio-core, unordered-containers + }: + mkDerivation { + pname = "salak"; + version = "0.3.3.1"; + sha256 = "0gv7qjiwnr67s38g68y2aqjljihrlggmnz2jz79865bi2v34isd2"; + libraryHaskellDepends = [ + attoparsec base bytestring containers data-default directory + exceptions filepath hashable heaps menshen mtl scientific text time + unliftio-core unordered-containers + ]; + testHaskellDepends = [ + attoparsec base bytestring containers data-default directory + exceptions filepath hashable heaps hspec menshen mtl QuickCheck + random scientific text time unliftio-core unordered-containers + ]; + description = "Configuration (re)Loader and Parser"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -203674,8 +200434,6 @@ self: { ]; description = "Configuration Loader for yaml"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "saltine" = callPackage @@ -204277,32 +201035,6 @@ self: { }) {}; "sbp" = callPackage - ({ mkDerivation, aeson, array, base, base64-bytestring - , basic-prelude, binary, binary-conduit, bytestring, conduit - , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops - , resourcet, tasty, tasty-hunit, template-haskell, text, time, yaml - }: - mkDerivation { - pname = "sbp"; - version = "2.4.7"; - sha256 = "1ik254jzgazlbjm09nms8imansk8nb7hhghzyqjcgywg45i119i3"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array base base64-bytestring basic-prelude binary bytestring - data-binary-ieee754 lens lens-aeson monad-loops template-haskell - text - ]; - executableHaskellDepends = [ - aeson base basic-prelude binary-conduit bytestring conduit - conduit-extra resourcet time yaml - ]; - testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; - description = "SwiftNav's SBP Library"; - license = stdenv.lib.licenses.lgpl3; - }) {}; - - "sbp_2_6_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -204327,7 +201059,6 @@ self: { testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; description = "SwiftNav's SBP Library"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sbp2udp" = callPackage @@ -204351,33 +201082,6 @@ self: { }) {}; "sbv" = callPackage - ({ mkDerivation, array, async, base, bytestring, containers - , crackNum, deepseq, directory, doctest, filepath, generic-deriving - , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb - , tasty, tasty-golden, tasty-hunit, tasty-quickcheck - , template-haskell, time, z3 - }: - mkDerivation { - pname = "sbv"; - version = "7.13"; - sha256 = "0bk400swnb4s98c5p71ml1px6jndaiqhf5dj7zmnliyplqcgpfik"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array async base containers crackNum deepseq directory filepath - generic-deriving ghc mtl pretty process QuickCheck random syb - template-haskell time - ]; - testHaskellDepends = [ - base bytestring containers crackNum directory doctest filepath Glob - hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit - tasty-quickcheck template-haskell - ]; - testSystemDepends = [ z3 ]; - description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) z3;}; - - "sbv_8_3" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , crackNum, deepseq, directory, doctest, filepath, generic-deriving , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb @@ -204403,6 +201107,7 @@ self: { description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) z3;}; "sbvPlugin" = callPackage @@ -204607,21 +201312,6 @@ self: { }) {}; "scalpel" = callPackage - ({ mkDerivation, base, bytestring, curl, data-default, scalpel-core - , tagsoup, text - }: - mkDerivation { - pname = "scalpel"; - version = "0.5.1"; - sha256 = "03cbc0yahs8pzp1jz0mvfnd9sl80zd3ql18l9xswm8kh6m1ndpr0"; - libraryHaskellDepends = [ - base bytestring curl data-default scalpel-core tagsoup text - ]; - description = "A high level web scraping library for Haskell"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "scalpel_0_6_0" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, data-default , http-client, http-client-tls, scalpel-core, tagsoup, text }: @@ -204635,29 +201325,9 @@ self: { ]; description = "A high level web scraping library for Haskell"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scalpel-core" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion - , data-default, fail, HUnit, regex-base, regex-tdfa, tagsoup, text - , vector - }: - mkDerivation { - pname = "scalpel-core"; - version = "0.5.1"; - sha256 = "1a99wazrgpvnjzsjk5az61f54hvppdxrrp2487nzndxpadlbh1cc"; - libraryHaskellDepends = [ - base bytestring containers data-default fail regex-base regex-tdfa - tagsoup text vector - ]; - testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ]; - benchmarkHaskellDepends = [ base criterion tagsoup text ]; - description = "A high level web scraping library for Haskell"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "scalpel-core_0_6_0" = callPackage ({ mkDerivation, base, bytestring, containers, criterion , data-default, fail, HUnit, pointedlist, regex-base, regex-tdfa , tagsoup, text, vector @@ -204674,7 +201344,6 @@ self: { benchmarkHaskellDepends = [ base criterion tagsoup text ]; description = "A high level web scraping library for Haskell"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scan" = callPackage @@ -205937,27 +202606,6 @@ self: { }) {}; "sdl2" = callPackage - ({ mkDerivation, base, bytestring, deepseq, exceptions, linear - , SDL2, StateVar, text, transformers, vector, weigh - }: - mkDerivation { - pname = "sdl2"; - version = "2.4.1.0"; - sha256 = "0p4b12fmxps0sbnkqdfy0qw19s355yrkw7fgw6xz53wzq706k991"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring exceptions linear StateVar text transformers vector - ]; - librarySystemDepends = [ SDL2 ]; - libraryPkgconfigDepends = [ SDL2 ]; - testHaskellDepends = [ base deepseq linear vector weigh ]; - description = "Both high- and low-level bindings to the SDL library (version 2.0.4+)."; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) SDL2;}; - - "sdl2_2_5_0_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, linear , SDL2, StateVar, text, transformers, vector, weigh }: @@ -205976,7 +202624,6 @@ self: { testHaskellDepends = [ base deepseq linear vector weigh ]; description = "Both high- and low-level bindings to the SDL library (version 2.0.6+)."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2;}; "sdl2-cairo" = callPackage @@ -206043,6 +202690,8 @@ self: { libraryHaskellDepends = [ base sdl2 ]; description = "Run of the mill, frames per second timer implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sdl2-gfx" = callPackage @@ -206561,22 +203210,6 @@ self: { }) {sedna = null;}; "selda" = callPackage - ({ mkDerivation, base, bytestring, exceptions, hashable, mtl - , psqueues, text, time, unordered-containers - }: - mkDerivation { - pname = "selda"; - version = "0.3.4.0"; - sha256 = "1ww4v30ywmdshcf4fpgqj5ycd9c197xdlvnby366hzsm7byqq8wj"; - libraryHaskellDepends = [ - base bytestring exceptions hashable mtl psqueues text time - unordered-containers - ]; - description = "Multi-backend, high-level EDSL for interacting with SQL databases"; - license = stdenv.lib.licenses.mit; - }) {}; - - "selda_0_4_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, mtl , random, text, time, uuid-types }: @@ -206590,7 +203223,6 @@ self: { ]; description = "Multi-backend, high-level EDSL for interacting with SQL databases"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "selda-json" = callPackage @@ -206604,28 +203236,9 @@ self: { libraryHaskellDepends = [ aeson base bytestring selda text ]; description = "JSON support for the Selda database library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "selda-postgresql" = callPackage - ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq - , selda, text - }: - mkDerivation { - pname = "selda-postgresql"; - version = "0.1.7.3"; - sha256 = "0ardh6ds8fmqy09y74nflsb8r5y4cvl2ddxcla0vzaf5xppx4czc"; - revision = "2"; - editedCabalFile = "1zrj412hkjjka4cvl5zj6gdpvdafmcny6xighi1glg67n8cmpb67"; - libraryHaskellDepends = [ - base bytestring exceptions postgresql-libpq selda text - ]; - description = "PostgreSQL backend for the Selda database EDSL"; - license = stdenv.lib.licenses.mit; - }) {}; - - "selda-postgresql_0_1_8_0" = callPackage ({ mkDerivation, base, bytestring, exceptions, postgresql-binary , postgresql-libpq, selda, selda-json, text, time, uuid-types }: @@ -206639,27 +203252,9 @@ self: { ]; description = "PostgreSQL backend for the Selda database EDSL"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "selda-sqlite" = callPackage - ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda - , text - }: - mkDerivation { - pname = "selda-sqlite"; - version = "0.1.6.1"; - sha256 = "1qqrgqzcfwqzlcklm0qjvdy3ndn3zg8s5mp8744v76bd6z2xwq4d"; - revision = "2"; - editedCabalFile = "0gb8raqmy8r8xwjpx238mqar5gdfd4194si2ms1a9ndcrilkkqja"; - libraryHaskellDepends = [ - base direct-sqlite directory exceptions selda text - ]; - description = "SQLite backend for the Selda database EDSL"; - license = stdenv.lib.licenses.mit; - }) {}; - - "selda-sqlite_0_1_7_0" = callPackage ({ mkDerivation, base, bytestring, direct-sqlite, directory , exceptions, selda, text, time, uuid-types }: @@ -206673,7 +203268,6 @@ self: { ]; description = "SQLite backend for the Selda database EDSL"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "select" = callPackage @@ -206887,8 +203481,6 @@ self: { ]; description = "Align and Zip type-classes from the common Semialign ancestor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "semialign-indexed" = callPackage @@ -206905,8 +203497,6 @@ self: { ]; description = "SemialignWithIndex, i.e. izip and ialign"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "semibounded-lattices" = callPackage @@ -206919,6 +203509,8 @@ self: { testHaskellDepends = [ base ]; description = "A Haskell implementation of semibounded lattices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "semigroupoid-extras" = callPackage @@ -207091,21 +203683,6 @@ self: { }) {}; "semirings" = callPackage - ({ mkDerivation, base, containers, hashable, integer-gmp - , unordered-containers, vector - }: - mkDerivation { - pname = "semirings"; - version = "0.2.1.1"; - sha256 = "0s28qq6fk2zqzz6y76fa1ddrrmpax99mlkxhz89mw15hx04mnsjp"; - libraryHaskellDepends = [ - base containers hashable integer-gmp unordered-containers vector - ]; - description = "two monoids as one, in holy haskimony"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "semirings_0_4_2" = callPackage ({ mkDerivation, base, containers, hashable, integer-gmp , unordered-containers }: @@ -207120,7 +203697,6 @@ self: { ]; description = "two monoids as one, in holy haskimony"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "semver" = callPackage @@ -207793,34 +204369,6 @@ self: { }) {}; "servant" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors - , bytestring, Cabal, cabal-doctest, case-insensitive, doctest - , hspec, hspec-discover, http-api-data, http-media, http-types - , mmorph, mtl, network-uri, QuickCheck, quickcheck-instances - , singleton-bool, string-conversions, tagged, text, transformers - , vault - }: - mkDerivation { - pname = "servant"; - version = "0.15"; - sha256 = "0fgsddg8yn23izk3g4bmax6rlh56qhx13j8h5n6fxr7mq34kagsg"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson attoparsec base base-compat bifunctors bytestring - case-insensitive http-api-data http-media http-types mmorph mtl - network-uri QuickCheck singleton-bool string-conversions tagged - text transformers vault - ]; - testHaskellDepends = [ - aeson base base-compat bytestring doctest hspec mtl QuickCheck - quickcheck-instances string-conversions text transformers - ]; - testToolDepends = [ hspec-discover ]; - description = "A family of combinators for defining webservices APIs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant_0_16_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors , bytestring, Cabal, cabal-doctest, case-insensitive, deepseq , doctest, hspec, hspec-discover, http-api-data, http-media @@ -207847,7 +204395,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A family of combinators for defining webservices APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-JuicyPixels" = callPackage @@ -207913,33 +204460,6 @@ self: { }) {}; "servant-auth-client" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hspec - , hspec-discover, http-client, http-types, jose, QuickCheck - , servant, servant-auth, servant-auth-server, servant-client - , servant-client-core, servant-server, text, time, transformers - , wai, warp - }: - mkDerivation { - pname = "servant-auth-client"; - version = "0.3.3.0"; - sha256 = "1pxkwpg1in3anamfvrp8gd7iihng0ikhl4k7ymz5d75ma1qwa2j9"; - revision = "3"; - editedCabalFile = "1kzyqd9hg7xld5s8qpm76l9ym48z81j6ycdwp3lb0f1p2d3aagcd"; - libraryHaskellDepends = [ - base bytestring containers servant servant-auth servant-client-core - text - ]; - testHaskellDepends = [ - aeson base bytestring hspec http-client http-types jose QuickCheck - servant servant-auth servant-auth-server servant-client - servant-server time transformers wai warp - ]; - testToolDepends = [ hspec-discover ]; - description = "servant-client/servant-auth compatibility"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-auth-client_0_4_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec , hspec-discover, http-client, http-types, jose, QuickCheck , servant, servant-auth, servant-auth-server, servant-client @@ -207963,7 +204483,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "servant-client/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-cookie" = callPackage @@ -208087,6 +204606,8 @@ self: { testToolDepends = [ hspec-discover markdown-unlit ]; description = "servant-server/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-swagger" = callPackage @@ -208274,22 +204795,6 @@ self: { }) {}; "servant-blaze" = callPackage - ({ mkDerivation, base, blaze-html, http-media, servant - , servant-server, wai, warp - }: - mkDerivation { - pname = "servant-blaze"; - version = "0.8"; - sha256 = "155f20pizgkhn0hczwpxwxw1i99h0l6kfwwhs2r6bmr305aqisj6"; - revision = "2"; - editedCabalFile = "1cfla60vn4kk5gb7fawlp34jr2k6b2fprysq05561wdfv990x4bj"; - libraryHaskellDepends = [ base blaze-html http-media servant ]; - testHaskellDepends = [ base blaze-html servant-server wai warp ]; - description = "Blaze-html support for servant"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-blaze_0_9" = callPackage ({ mkDerivation, base, blaze-html, http-media, servant , servant-server, wai, warp }: @@ -208303,7 +204808,6 @@ self: { testHaskellDepends = [ base blaze-html servant-server wai warp ]; description = "Blaze-html support for servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-cassava" = callPackage @@ -208328,35 +204832,6 @@ self: { }) {}; "servant-checked-exceptions" = callPackage - ({ mkDerivation, aeson, base, bytestring, deepseq, hspec-wai - , http-media, http-types, profunctors, servant - , servant-checked-exceptions-core, servant-client - , servant-client-core, servant-docs, servant-server, tagged, tasty - , tasty-hspec, tasty-hunit, text, wai, world-peace - }: - mkDerivation { - pname = "servant-checked-exceptions"; - version = "2.0.0.0"; - sha256 = "127nav7z2zkgfgzpjjprqb6s55mbdj9z2p05knjx3mangs2q5wm7"; - revision = "1"; - editedCabalFile = "0h18x8gimmczgml4rj74kx3463pwrsyxl2vnd13ra5hj0q44d683"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring deepseq http-media http-types profunctors - servant servant-checked-exceptions-core servant-client - servant-client-core servant-docs servant-server tagged text wai - world-peace - ]; - testHaskellDepends = [ - base bytestring hspec-wai http-types servant servant-server tasty - tasty-hspec tasty-hunit wai - ]; - description = "Checked exceptions for Servant APIs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-checked-exceptions_2_2_0_0" = callPackage ({ mkDerivation, base, bytestring, hspec-wai, http-types, servant , servant-checked-exceptions-core, servant-client , servant-client-core, servant-server, tasty, tasty-hspec @@ -208379,31 +204854,10 @@ self: { description = "Checked exceptions for Servant APIs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-checked-exceptions-core" = callPackage - ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob - , http-media, http-types, profunctors, servant, servant-docs - , tagged, text, world-peace - }: - mkDerivation { - pname = "servant-checked-exceptions-core"; - version = "2.0.0.0"; - sha256 = "0j5j7ai1b7nnsvzal27jy6hamwx5i2pyc1f6mmmb06r40cs53lxa"; - revision = "1"; - editedCabalFile = "1q2y4cri4h33cfdpgz95dczhvhmyrqajm7k6ypl3b8rw953qlzy7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring deepseq http-media http-types profunctors - servant servant-docs tagged text world-peace - ]; - testHaskellDepends = [ base doctest Glob ]; - description = "Checked exceptions for Servant APIs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-checked-exceptions-core_2_2_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, contravariant, doctest , Glob, http-media, http-types, mtl, profunctors, servant , servant-docs, tagged, text, transformers, world-peace @@ -208422,7 +204876,6 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "Checked exceptions for Servant APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-cli" = callPackage @@ -208455,39 +204908,6 @@ self: { }) {}; "servant-client" = callPackage - ({ mkDerivation, aeson, base, base-compat, bytestring, containers - , deepseq, entropy, exceptions, generics-sop, hspec, hspec-discover - , http-api-data, http-client, http-media, http-types, HUnit - , kan-extensions, markdown-unlit, monad-control, mtl, network - , QuickCheck, semigroupoids, servant, servant-client-core - , servant-server, stm, tdigest, text, time, transformers - , transformers-base, transformers-compat, wai, warp - }: - mkDerivation { - pname = "servant-client"; - version = "0.15"; - sha256 = "098aaickq6j6f0d7bl2y72fcl53xp2w29qg3gy7yls4z8wd76v1a"; - revision = "1"; - editedCabalFile = "1h3j8mpnrbpc1i4appf8g4zn7h30f6ybg6fg3w057kz18bk9y76f"; - libraryHaskellDepends = [ - base base-compat bytestring containers deepseq exceptions - http-client http-media http-types kan-extensions monad-control mtl - semigroupoids servant servant-client-core stm text time - transformers transformers-base transformers-compat - ]; - testHaskellDepends = [ - aeson base base-compat bytestring entropy generics-sop hspec - http-api-data http-client http-types HUnit kan-extensions - markdown-unlit mtl network QuickCheck servant servant-client-core - servant-server tdigest text transformers transformers-compat wai - warp - ]; - testToolDepends = [ hspec-discover markdown-unlit ]; - description = "Automatic derivation of querying functions for servant"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-client_0_16" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, containers , deepseq, entropy, exceptions, hspec, hspec-discover , http-api-data, http-client, http-media, http-types, HUnit @@ -208517,31 +204937,9 @@ self: { testToolDepends = [ hspec-discover markdown-unlit ]; description = "Automatic derivation of querying functions for servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-client-core" = callPackage - ({ mkDerivation, aeson, base, base-compat, base64-bytestring - , bytestring, containers, deepseq, exceptions, free, generics-sop - , hspec, hspec-discover, http-media, http-types, network-uri - , QuickCheck, safe, servant, template-haskell, text, transformers - }: - mkDerivation { - pname = "servant-client-core"; - version = "0.15"; - sha256 = "0q3rrbdplzzj90kdb7cmb6qknsbd9dy4w5lkqcb95nndwgjlk3lv"; - libraryHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring containers - deepseq exceptions free generics-sop http-media http-types - network-uri safe servant template-haskell text transformers - ]; - testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ]; - testToolDepends = [ hspec-discover ]; - description = "Core functionality and class for client function generation for servant APIs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-client-core_0_16" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, containers, deepseq, exceptions, free, hspec , hspec-discover, http-media, http-types, network-uri, QuickCheck @@ -208562,7 +204960,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Core functionality and class for client function generation for servant APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-client-namedargs" = callPackage @@ -208777,26 +205174,6 @@ self: { }) {}; "servant-elm" = callPackage - ({ mkDerivation, aeson, base, Diff, elm-export, hspec, HUnit, lens - , servant, servant-foreign, text, wl-pprint-text - }: - mkDerivation { - pname = "servant-elm"; - version = "0.5.0.0"; - sha256 = "0l5rjml46qbnq4p3d7zjk8zl9gnpz8m5n6n8yf8kgy89ybm6xnfr"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base elm-export lens servant servant-foreign text wl-pprint-text - ]; - testHaskellDepends = [ - aeson base Diff elm-export hspec HUnit servant text - ]; - description = "Automatically derive Elm functions to query servant webservices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-elm_0_6_0_2" = callPackage ({ mkDerivation, aeson, base, Diff, directory, elm-bridge, hspec , HUnit, lens, servant, servant-client, servant-foreign, text , wl-pprint-text @@ -208816,7 +205193,6 @@ self: { ]; description = "Automatically derive Elm functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-examples" = callPackage @@ -208861,6 +205237,8 @@ self: { aeson base exceptions http-types servant-server text warp ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-fiat-content" = callPackage @@ -208984,8 +205362,6 @@ self: { ]; description = "Servant combinators to facilitate writing GitHub webhooks"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-haxl-client" = callPackage @@ -209197,22 +205573,6 @@ self: { }) {}; "servant-lucid" = callPackage - ({ mkDerivation, base, http-media, lucid, servant, servant-server - , text, wai, warp - }: - mkDerivation { - pname = "servant-lucid"; - version = "0.8.1"; - sha256 = "0g8icz12ydyxyv710fhixswdphiri0b44pw5p0dr21cvwbaxawb6"; - revision = "1"; - editedCabalFile = "0jna96jy6nmhk6w5zxdd3qn3vlrnhnvh4s3f2bqkn3c0had5py7d"; - libraryHaskellDepends = [ base http-media lucid servant text ]; - testHaskellDepends = [ base lucid servant-server wai warp ]; - description = "Servant support for lucid"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-lucid_0_9" = callPackage ({ mkDerivation, base, http-media, lucid, servant, servant-server , text, wai, warp }: @@ -209226,7 +205586,6 @@ self: { testHaskellDepends = [ base lucid servant-server wai warp ]; description = "Servant support for lucid"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-machines" = callPackage @@ -209445,6 +205804,8 @@ self: { ]; description = "Use Pandoc to render servant API documentation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-pipes" = callPackage @@ -209548,6 +205909,8 @@ self: { ]; description = "Generate PureScript accessor functions for you servant API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-pushbullet-client" = callPackage @@ -209625,34 +205988,6 @@ self: { }) {}; "servant-rawm" = callPackage - ({ mkDerivation, base, bytestring, doctest, filepath, Glob - , hspec-wai, http-client, http-media, http-types, lens, resourcet - , servant, servant-client, servant-client-core, servant-docs - , servant-server, tasty, tasty-hspec, tasty-hunit, text - , transformers, wai, wai-app-static, warp - }: - mkDerivation { - pname = "servant-rawm"; - version = "0.3.0.0"; - sha256 = "09va9glqkyarxsq9296br55ka8j5jd5nlb833hndpf4ib10yxzp9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring filepath http-client http-media http-types lens - resourcet servant-client servant-client-core servant-docs - servant-server wai wai-app-static - ]; - testHaskellDepends = [ - base bytestring doctest Glob hspec-wai http-client http-media - http-types servant servant-client servant-client-core - servant-server tasty tasty-hspec tasty-hunit text transformers wai - warp - ]; - description = "Embed a raw 'Application' in a Servant API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-rawm_0_3_1_0" = callPackage ({ mkDerivation, base, bytestring, doctest, filepath, Glob , hspec-wai, http-client, http-media, http-types, lens, resourcet , servant, servant-client, servant-client-core, servant-docs @@ -209679,6 +206014,7 @@ self: { description = "Embed a raw 'Application' in a Servant API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-reason" = callPackage @@ -209796,43 +206132,6 @@ self: { }) {}; "servant-server" = callPackage - ({ mkDerivation, aeson, base, base-compat, base64-bytestring - , bytestring, Cabal, cabal-doctest, containers, directory, doctest - , exceptions, filepath, hspec, hspec-discover, hspec-wai - , http-api-data, http-media, http-types, monad-control, mtl - , network, network-uri, QuickCheck, resourcet, safe, servant - , should-not-typecheck, string-conversions, tagged, temporary, text - , transformers, transformers-base, transformers-compat, wai - , wai-app-static, wai-extra, warp, word8 - }: - mkDerivation { - pname = "servant-server"; - version = "0.15"; - sha256 = "1qlkdgls2z71sx09lbkrqcxwx1wam3hn7dnyps6z2i7qixhlw0wq"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base base-compat base64-bytestring bytestring containers exceptions - filepath http-api-data http-media http-types monad-control mtl - network network-uri resourcet servant string-conversions tagged - text transformers transformers-base wai wai-app-static word8 - ]; - executableHaskellDepends = [ - aeson base base-compat servant text wai warp - ]; - testHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring directory - doctest hspec hspec-wai http-types mtl QuickCheck resourcet safe - servant should-not-typecheck string-conversions temporary text - transformers transformers-compat wai wai-extra - ]; - testToolDepends = [ hspec-discover ]; - description = "A family of combinators for defining webservices APIs and serving them"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-server_0_16_2" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, Cabal, cabal-doctest, containers, directory, doctest , exceptions, filepath, hspec, hspec-discover, hspec-wai @@ -209867,7 +206166,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-server-namedargs" = callPackage @@ -209998,6 +206296,8 @@ self: { ]; description = "Embed a directory of static files in your Servant server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-streaming" = callPackage @@ -210012,6 +206312,8 @@ self: { testHaskellDepends = [ base hspec http-types QuickCheck servant ]; description = "Servant combinators for the 'streaming' package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-streaming-client" = callPackage @@ -210112,6 +206414,8 @@ self: { executableHaskellDepends = [ base purescript-bridge ]; description = "When REST is not enough ..."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-swagger" = callPackage @@ -210156,6 +206460,8 @@ self: { ]; description = "Swagger Tags for Servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-swagger-ui" = callPackage @@ -210298,6 +206604,8 @@ self: { ]; description = "Small library providing WebSocket endpoints for servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-xml" = callPackage @@ -210557,6 +206865,8 @@ self: { ]; description = "Storage backend for serversession using Redis"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "serversession-frontend-snap" = callPackage @@ -210783,8 +207093,6 @@ self: { ]; description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "set-extra" = callPackage @@ -211041,6 +207349,34 @@ self: { }) {}; "sexp-grammar" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers + , criterion, deepseq, happy, invertible-grammar, prettyprinter + , QuickCheck, recursion-schemes, scientific, semigroups, tasty + , tasty-hunit, tasty-quickcheck, text, utf8-string + }: + mkDerivation { + pname = "sexp-grammar"; + version = "2.0.2"; + sha256 = "1cmn5y72wp9dlzqzrv4rmfb1zm3zw517la0kf0vgyv3nhsn58397"; + libraryHaskellDepends = [ + array base bytestring containers deepseq invertible-grammar + prettyprinter recursion-schemes scientific semigroups text + utf8-string + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + base containers invertible-grammar prettyprinter QuickCheck + scientific semigroups tasty tasty-hunit tasty-quickcheck text + utf8-string + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq text + ]; + description = "Invertible grammar combinators for S-expressions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "sexp-grammar_2_1_0" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , criterion, deepseq, happy, invertible-grammar, prettyprinter , QuickCheck, recursion-schemes, scientific, semigroups, tasty @@ -211066,6 +207402,7 @@ self: { ]; description = "Invertible grammar combinators for S-expressions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sexp-show" = callPackage @@ -211205,6 +207542,8 @@ self: { ]; description = "Stochastic gradient descent library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sgf" = callPackage @@ -212215,37 +208554,6 @@ self: { }) {}; "shelly" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory - , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib - , HUnit, lifted-async, lifted-base, monad-control, mtl, process - , system-fileio, system-filepath, text, time, transformers - , transformers-base, unix-compat - }: - mkDerivation { - pname = "shelly"; - version = "1.8.0"; - sha256 = "1y08pdw49yk4hbipgfwjab0wa85ng0mkypch5l0p53frykjm2zvk"; - revision = "1"; - editedCabalFile = "17achybammxg5i7zcmwlfcb7xk77q3lfvck3gqa9ljfb6ksgrxb7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async base bytestring containers directory enclosed-exceptions - exceptions lifted-async lifted-base monad-control mtl process - system-fileio system-filepath text time transformers - transformers-base unix-compat - ]; - testHaskellDepends = [ - async base bytestring containers directory enclosed-exceptions - exceptions filepath hspec hspec-contrib HUnit lifted-async - lifted-base monad-control mtl process system-fileio system-filepath - text time transformers transformers-base unix-compat - ]; - description = "shell-like (systems) programming in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "shelly_1_8_1" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib , HUnit, lifted-async, lifted-base, monad-control, mtl, process @@ -212274,7 +208582,6 @@ self: { ]; description = "shell-like (systems) programming in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shelly-extra" = callPackage @@ -212313,27 +208620,28 @@ self: { "shh" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq - , directory, doctest, filepath, mtl, process, split, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, temporary, unix - , utf8-string + , directory, doctest, filepath, markdown-unlit, mtl, process, split + , stringsearch, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, temporary, unix, utf8-string }: mkDerivation { pname = "shh"; - version = "0.6.0.0"; - sha256 = "10l13iyik4m0z2c4f2cjlj5kjg51i4g4z6gp1vldqfa0i3shzvvz"; + version = "0.7.0.0"; + sha256 = "0dgfjvxdli4z1i9qailq5mgrgynm1vvfcbjj9nsridypff0vf1qj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base bytestring containers deepseq directory filepath mtl - process split template-haskell unix utf8-string + process split stringsearch template-haskell unix utf8-string ]; executableHaskellDepends = [ async base bytestring deepseq directory temporary unix ]; testHaskellDepends = [ - async base bytestring directory doctest tasty tasty-hunit - tasty-quickcheck utf8-string + async base bytestring directory doctest filepath markdown-unlit + tasty tasty-hunit tasty-quickcheck utf8-string ]; + testToolDepends = [ markdown-unlit ]; description = "Simple shell scripting from Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -212599,22 +208907,6 @@ self: { }) {}; "show-prettyprint" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter - , trifecta - }: - mkDerivation { - pname = "show-prettyprint"; - version = "0.2.3"; - sha256 = "01wg1bzp6dylysbm9rfq8n0ci7yzg3gw6jkzy8kzmsydgs5c54pd"; - libraryHaskellDepends = [ - ansi-wl-pprint base prettyprinter trifecta - ]; - testHaskellDepends = [ base doctest ]; - description = "Robust prettyprinter for output of auto-generated Show instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "show-prettyprint_0_3_0_1" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, doctest , prettyprinter, trifecta }: @@ -212630,7 +208922,6 @@ self: { ]; description = "Robust prettyprinter for output of auto-generated Show instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "show-type" = callPackage @@ -212889,6 +209180,8 @@ self: { ]; description = "Rounding rationals to significant digits and decimal places"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sigma-ij" = callPackage @@ -212934,6 +209227,8 @@ self: { ]; description = "Arithmetic over signs and sets of signs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "signal" = callPackage @@ -212982,18 +209277,6 @@ self: { }) {}; "silently" = callPackage - ({ mkDerivation, base, deepseq, directory, nanospec, temporary }: - mkDerivation { - pname = "silently"; - version = "1.2.5"; - sha256 = "0f9qm3f7y0hpxn6mddhhg51mm1r134qkvd2kr8r6192ka1ijbxnf"; - libraryHaskellDepends = [ base deepseq directory ]; - testHaskellDepends = [ base deepseq directory nanospec temporary ]; - description = "Prevent or capture writing to stdout and other handles"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "silently_1_2_5_1" = callPackage ({ mkDerivation, base, deepseq, directory, nanospec, temporary }: mkDerivation { pname = "silently"; @@ -213003,7 +209286,6 @@ self: { testHaskellDepends = [ base deepseq directory nanospec temporary ]; description = "Prevent or capture writing to stdout and other handles"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "silvi" = callPackage @@ -213089,8 +209371,6 @@ self: { ]; description = "A minimalist web framework for the WAI server interface"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "simple-actors" = callPackage @@ -213179,17 +209459,6 @@ self: { }) {}; "simple-cabal" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath }: - mkDerivation { - pname = "simple-cabal"; - version = "0.0.0"; - sha256 = "051xfg48y09qa6avndllv29nibpchys5ksp38d1p3lk82qqywvqd"; - libraryHaskellDepends = [ base Cabal directory filepath ]; - description = "Cabal file wrapper library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-cabal_0_0_0_1" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "simple-cabal"; @@ -213198,21 +209467,9 @@ self: { libraryHaskellDepends = [ base Cabal directory filepath ]; description = "Cabal file wrapper library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-cmd" = callPackage - ({ mkDerivation, base, directory, filepath, process, unix }: - mkDerivation { - pname = "simple-cmd"; - version = "0.1.4"; - sha256 = "1g63c0bdm3231aqf12i45nsfpy6bvl1w3nn0jcbbg2hij377y9rg"; - libraryHaskellDepends = [ base directory filepath process unix ]; - description = "Simple String-based process commands"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-cmd_0_2_0_1" = callPackage ({ mkDerivation, base, directory, filepath, process, unix }: mkDerivation { pname = "simple-cmd"; @@ -213221,7 +209478,6 @@ self: { libraryHaskellDepends = [ base directory filepath process unix ]; description = "Simple String-based process commands"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-cmd-args" = callPackage @@ -213667,8 +209923,6 @@ self: { ]; description = "Connector package for integrating postgresql-orm with the Simple web framework"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "simple-reflect" = callPackage @@ -213745,8 +209999,6 @@ self: { ]; description = "Cookie-based session management for the Simple web framework"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "simple-sessions" = callPackage @@ -213800,6 +210052,8 @@ self: { testHaskellDepends = [ base extra tasty tasty-hunit text ]; description = "source code editing utilities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-stacked-vm" = callPackage @@ -213865,8 +210119,6 @@ self: { ]; description = "A basic template language for the Simple web framework"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "simple-text-format" = callPackage @@ -213911,30 +210163,9 @@ self: { libraryHaskellDepends = [ base first-class-families ]; description = "Simple arithmetic with SI units using type-checked dimensional analysis"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "simple-vec3" = callPackage - ({ mkDerivation, base, criterion, doctest, doctest-driver-gen - , QuickCheck, tasty, tasty-quickcheck, vector - }: - mkDerivation { - pname = "simple-vec3"; - version = "0.4.0.10"; - sha256 = "0dyr9bg3y8613hd0zz7knkniq7p0hxm7w9pjs0jjhq586g0qh5ql"; - libraryHaskellDepends = [ base QuickCheck vector ]; - testHaskellDepends = [ - base doctest doctest-driver-gen tasty tasty-quickcheck - ]; - benchmarkHaskellDepends = [ base criterion vector ]; - description = "Three-dimensional vectors of doubles with basic operations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "simple-vec3_0_6" = callPackage ({ mkDerivation, base, criterion, doctest, doctest-driver-gen , QuickCheck, tasty, tasty-quickcheck, vector }: @@ -214235,19 +210466,6 @@ self: { }) {inherit (pkgs.xorg) libXft;}; "singleton-bool" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "singleton-bool"; - version = "0.1.4"; - sha256 = "0apvzb6ym0fnm4rx7paz6ivv72ahzn2bxhvyd1drw50ypvicd581"; - revision = "1"; - editedCabalFile = "0ccd49z9xwa8gr8sclmmn0zc4xq39yyjws4zr6lrw3xjql130nsx"; - libraryHaskellDepends = [ base ]; - description = "Type level booleans"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "singleton-bool_0_1_5" = callPackage ({ mkDerivation, base, dec }: mkDerivation { pname = "singleton-bool"; @@ -214256,7 +210474,6 @@ self: { libraryHaskellDepends = [ base dec ]; description = "Type level booleans"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "singleton-dict" = callPackage @@ -214835,29 +211052,6 @@ 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 { - pname = "skylighting"; - version = "0.7.7"; - sha256 = "03nn5z67jg45myrcmbwkz06z4ywy06whbc0jhc3ycpw9wfy5iqvy"; - 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 - ]; - description = "syntax highlighting library"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "skylighting_0_8_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, directory, filepath, hxt @@ -214878,42 +211072,9 @@ self: { ]; description = "syntax highlighting library"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skylighting-core" = callPackage - ({ mkDerivation, aeson, ansi-terminal, attoparsec, base - , 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 - }: - mkDerivation { - pname = "skylighting-core"; - version = "0.7.7"; - sha256 = "0zd7gsybi02rigbgly63d8asfz8xy1xlnfy90m92zayizkagyg49"; - 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 - ]; - testHaskellDepends = [ - aeson base bytestring containers Diff directory filepath HUnit - pretty-show QuickCheck random tasty tasty-golden tasty-hunit - tasty-quickcheck text - ]; - benchmarkHaskellDepends = [ - base containers criterion directory filepath text - ]; - description = "syntax highlighting library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "skylighting-core_0_8_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, criterion, Diff, directory @@ -214943,7 +211104,6 @@ self: { ]; description = "syntax highlighting library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skylighting-extensions" = callPackage @@ -215138,6 +211298,8 @@ self: { ]; description = "A note taking CLI tool"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "slave-thread" = callPackage @@ -215897,24 +212059,6 @@ self: { }) {}; "smtp-mail" = callPackage - ({ mkDerivation, array, base, base16-bytestring, base64-bytestring - , bytestring, cryptohash, filepath, mime-mail, network, text - }: - mkDerivation { - pname = "smtp-mail"; - version = "0.1.4.6"; - sha256 = "1g0lsbd9h8bhk4xddgzm96i8fy233904jnqnl4i94ld2hzpwpnl6"; - revision = "1"; - editedCabalFile = "1lvzami2vzrkgz5na71k1yi7346xdarxm0sbi6alq3wbpj1raakq"; - libraryHaskellDepends = [ - array base base16-bytestring base64-bytestring bytestring - cryptohash filepath mime-mail network text - ]; - description = "Simple email sending via SMTP"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "smtp-mail_0_2_0_0" = callPackage ({ mkDerivation, array, base, base16-bytestring, base64-bytestring , bytestring, connection, cryptohash, filepath, mime-mail, network , network-bsd, text @@ -215931,7 +212075,6 @@ self: { ]; description = "Simple email sending via SMTP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smtp-mail-ng" = callPackage @@ -216094,6 +212237,8 @@ self: { ]; description = "Accept header branching for the Snap web framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snap-app" = callPackage @@ -216371,48 +212516,6 @@ self: { }) {}; "snap-server" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder - , bytestring, bytestring-builder, case-insensitive, clock - , containers, criterion, deepseq, directory, filepath, HsOpenSSL - , http-common, http-streams, HUnit, io-streams, io-streams-haproxy - , lifted-base, monad-control, mtl, network, old-locale - , openssl-streams, parallel, QuickCheck, random, snap-core - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, threads, time, transformers, unix, unix-compat, vector - }: - mkDerivation { - pname = "snap-server"; - version = "1.1.0.0"; - sha256 = "0vvw9n8xs272qdlrf3dxhnva41zh3awi7pf022rrjj75lj8a77i4"; - revision = "3"; - editedCabalFile = "0a9d3nqb5rvgm25nak68lp6yj9m6cwhbgdbg5l7ib5i2czcg7yjh"; - configureFlags = [ "-fopenssl" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base blaze-builder bytestring bytestring-builder - case-insensitive clock containers filepath HsOpenSSL io-streams - io-streams-haproxy lifted-base mtl network old-locale - openssl-streams snap-core text time unix unix-compat vector - ]; - testHaskellDepends = [ - attoparsec base base16-bytestring blaze-builder bytestring - bytestring-builder case-insensitive clock containers deepseq - directory filepath HsOpenSSL http-common http-streams HUnit - io-streams io-streams-haproxy lifted-base monad-control mtl network - old-locale openssl-streams parallel QuickCheck random snap-core - test-framework test-framework-hunit test-framework-quickcheck2 text - threads time transformers unix unix-compat vector - ]; - benchmarkHaskellDepends = [ - attoparsec base blaze-builder bytestring bytestring-builder - criterion io-streams io-streams-haproxy snap-core vector - ]; - description = "A web server for the Snap Framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "snap-server_1_1_1_1" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , bytestring, bytestring-builder, case-insensitive, clock , containers, criterion, deepseq, directory, filepath, HsOpenSSL @@ -216452,7 +212555,6 @@ self: { ]; description = "A web server for the Snap Framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-stream" = callPackage @@ -217998,19 +214100,6 @@ self: { }) {}; "socks" = callPackage - ({ mkDerivation, base, bytestring, cereal, network }: - mkDerivation { - pname = "socks"; - version = "0.5.6"; - sha256 = "0f44qy74i0n6ll3jym0a2ipafkpw1h67amcpqmj8iq95h21wsqzs"; - revision = "1"; - editedCabalFile = "19f6yzalxbvw0zi1z8wi0vz7s21p5anvfaqsaszppnkgk6j6nnvn"; - libraryHaskellDepends = [ base bytestring cereal network ]; - description = "Socks proxy (ver 5)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "socks_0_6_0" = callPackage ({ mkDerivation, base, basement, bytestring, cereal, network }: mkDerivation { pname = "socks"; @@ -218021,7 +214110,6 @@ self: { ]; description = "Socks proxy (ver 5)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sodium" = callPackage @@ -219006,17 +215094,17 @@ self: { }) {}; "spectral-clustering" = callPackage - ({ mkDerivation, base, clustering, containers, eigen, hmatrix + ({ mkDerivation, base, clustering, containers, hmatrix , hmatrix-svdlibc, mwc-random, safe, sparse-linear-algebra , statistics, vector }: mkDerivation { pname = "spectral-clustering"; - version = "0.3.1.0"; - sha256 = "140njrq73nalkm7dp9vyk3hz027jj0ppgjqdr3qcz93a9lkzdsyh"; + version = "0.3.1.1"; + sha256 = "02fmg0bkhvsfh6k6p8bfpfc08isnn5p5h55kdnkm1d6jmixdkrzy"; libraryHaskellDepends = [ - base clustering containers eigen hmatrix hmatrix-svdlibc mwc-random - safe sparse-linear-algebra statistics vector + base clustering containers hmatrix hmatrix-svdlibc mwc-random safe + sparse-linear-algebra statistics vector ]; description = "Library for spectral clustering"; license = stdenv.lib.licenses.gpl3; @@ -219037,12 +215125,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "speculate_0_4_0" = callPackage + "speculate_0_4_1" = callPackage ({ mkDerivation, base, cmdargs, containers, express, leancheck }: mkDerivation { pname = "speculate"; - version = "0.4.0"; - sha256 = "12h4lci5547fb1g21xh3fbq1d7fmn3w54ppqdnh8h35aa0jqw9hl"; + version = "0.4.1"; + sha256 = "1fyj6kizwwb2vpvn17s7gx4swmzsziwmf6mmxaldbrzkha46y9hn"; libraryHaskellDepends = [ base cmdargs containers express leancheck ]; @@ -219460,6 +215548,8 @@ self: { testHaskellDepends = [ base invariant lens QuickCheck ]; description = "Split Epimorphisms and Monomorphisms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "split-record" = callPackage @@ -219492,27 +215582,6 @@ self: { }) {}; "splitmix" = callPackage - ({ mkDerivation, async, base, base-compat-batteries, bytestring - , containers, criterion, deepseq, process, random, tf-random, time - , vector - }: - mkDerivation { - pname = "splitmix"; - version = "0.0.2"; - sha256 = "1y9vlik5icwimw6c8zh9pzgp0pbxvwxg48r54qsypnn1p4dbgaz6"; - libraryHaskellDepends = [ base deepseq random time ]; - testHaskellDepends = [ - async base base-compat-batteries bytestring deepseq process random - tf-random vector - ]; - benchmarkHaskellDepends = [ - base containers criterion random tf-random - ]; - description = "Fast Splittable PRNG"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "splitmix_0_0_3" = callPackage ({ mkDerivation, async, base, base-compat-batteries, bytestring , clock, containers, criterion, deepseq, HUnit, process, random , tf-random, time, vector @@ -219531,7 +215600,6 @@ self: { ]; description = "Fast Splittable PRNG"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "splitter" = callPackage @@ -220125,8 +216193,6 @@ self: { ]; description = "A file-packing application"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "sr-extra" = callPackage @@ -220541,6 +216607,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stache_2_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, directory, file-embed, filepath, hspec, hspec-discover + , hspec-megaparsec, megaparsec, mtl, template-haskell, text + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "stache"; + version = "2.1.0"; + sha256 = "1q34h46px7miy2kx1yzaj785ai70mkchmijpdq2iih1fffir8kvk"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq directory filepath + megaparsec mtl template-haskell text unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed hspec hspec-megaparsec + megaparsec template-haskell text yaml + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + aeson base criterion deepseq megaparsec text + ]; + description = "Mustache templates for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array , async, attoparsec, base, base64-bytestring, bytestring, Cabal @@ -221312,6 +217406,8 @@ self: { testHaskellDepends = [ base containers doctest graphviz text ]; description = "Ascii DAG(Directed acyclic graph) for visualization of dataflow"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "staf" = callPackage @@ -222297,6 +218393,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Positive rational numbers represented as paths in the Stern-Brocot tree"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stgi" = callPackage @@ -222648,6 +218746,8 @@ self: { testHaskellDepends = [ async base QuickCheck random Unique ]; description = "STM wrapper around Control.Concurrent.Supply."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stm-tlist" = callPackage @@ -222913,59 +219013,6 @@ self: { }) {}; "store" = callPackage - ({ mkDerivation, array, async, base, base-orphans - , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector - , clock, containers, contravariant, criterion, cryptohash, deepseq - , directory, filepath, free, ghc-prim, hashable, hspec - , hspec-smallcheck, integer-gmp, lifted-base, monad-control - , mono-traversable, network, primitive, resourcet, safe, semigroups - , smallcheck, store-core, syb, template-haskell, text, th-lift - , th-lift-instances, th-orphans, th-reify-many, th-utilities, time - , transformers, unordered-containers, vector - , vector-binary-instances, void, weigh - }: - mkDerivation { - pname = "store"; - version = "0.5.1.1"; - sha256 = "1lp2kcrb4d3wsyd1cfmw3927w693lq9hj2anv0j993wvpdvd1cgl"; - revision = "1"; - editedCabalFile = "0v9rvm94afixryskpm7hn6cc6qkfciw3q7yi1dvrsq2rq75jbamk"; - libraryHaskellDepends = [ - array async base base-orphans base64-bytestring bifunctors - bytestring containers contravariant cryptohash deepseq directory - filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp - lifted-base monad-control mono-traversable network primitive - resourcet safe semigroups smallcheck store-core syb - template-haskell text th-lift th-lift-instances th-orphans - th-reify-many th-utilities time transformers unordered-containers - vector void - ]; - testHaskellDepends = [ - array async base base-orphans base64-bytestring bifunctors - bytestring clock containers contravariant cryptohash deepseq - directory filepath free ghc-prim hashable hspec hspec-smallcheck - integer-gmp lifted-base monad-control mono-traversable network - primitive resourcet safe semigroups smallcheck store-core syb - template-haskell text th-lift th-lift-instances th-orphans - th-reify-many th-utilities time transformers unordered-containers - vector void - ]; - benchmarkHaskellDepends = [ - array async base base-orphans base64-bytestring bifunctors - bytestring cereal cereal-vector containers contravariant criterion - cryptohash deepseq directory filepath free ghc-prim hashable hspec - hspec-smallcheck integer-gmp lifted-base monad-control - mono-traversable network primitive resourcet safe semigroups - smallcheck store-core syb template-haskell text th-lift - th-lift-instances th-orphans th-reify-many th-utilities time - transformers unordered-containers vector vector-binary-instances - void weigh - ]; - description = "Fast binary serialization"; - license = stdenv.lib.licenses.mit; - }) {}; - - "store_0_5_1_2" = callPackage ({ mkDerivation, array, async, base, base-orphans , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector , clock, containers, contravariant, criterion, cryptohash, deepseq @@ -223014,7 +219061,6 @@ self: { ]; description = "Fast binary serialization"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "store-core" = callPackage @@ -223095,8 +219141,8 @@ self: { }: mkDerivation { pname = "stratosphere"; - version = "0.29.1"; - sha256 = "0j3mb09k498xynhc82cnsknzkbjwn9lvvanrz78jpx4fhh73zrlz"; + version = "0.40.0"; + sha256 = "0xj8bclyfvhdw12jfndg6pivzrbhqjf2qky383n0w6if11cfli1z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223112,15 +219158,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_40_0" = callPackage + "stratosphere_0_41_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.40.0"; - sha256 = "0xj8bclyfvhdw12jfndg6pivzrbhqjf2qky383n0w6if11cfli1z"; + version = "0.41.0"; + sha256 = "1prwkvlc9qglc0465gibv26h1nd06bdiayp22i91dw3ws3mbhzs5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223213,8 +219259,6 @@ self: { ]; description = "A library for using HTTP with stratux"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stratux-types" = callPackage @@ -223230,8 +219274,6 @@ self: { ]; description = "A library for reading JSON output from stratux"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stratux-websockets" = callPackage @@ -223655,8 +219697,6 @@ self: { ]; description = "Streaming interface for LZMA/XZ compression"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "streaming-osm" = callPackage @@ -223809,8 +219849,6 @@ self: { ]; description = "http, attoparsec, pipes and other utilities for the streaming libraries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "streaming-wai" = callPackage @@ -223847,34 +219885,6 @@ self: { }) {}; "streamly" = callPackage - ({ mkDerivation, atomic-primops, base, clock, containers, deepseq - , exceptions, gauge, ghc-prim, heaps, hspec, lockfree-queue - , monad-control, mtl, QuickCheck, random, transformers - , transformers-base - }: - mkDerivation { - pname = "streamly"; - version = "0.5.2"; - sha256 = "1pla9356yhf6zv2yz4mh8g1dslzdkkych4jrjyi4rw66frvw0jg6"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - atomic-primops base clock containers exceptions ghc-prim heaps - lockfree-queue monad-control mtl transformers transformers-base - ]; - testHaskellDepends = [ - base containers exceptions hspec mtl QuickCheck random transformers - ]; - benchmarkHaskellDepends = [ - atomic-primops base clock containers deepseq exceptions gauge - ghc-prim heaps lockfree-queue monad-control mtl random transformers - transformers-base - ]; - description = "Beautiful Streaming, Concurrent and Reactive Composition"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "streamly_0_6_1" = callPackage ({ mkDerivation, atomic-primops, base, containers, deepseq , exceptions, gauge, ghc-prim, heaps, hspec, lockfree-queue , monad-control, mtl, QuickCheck, random, transformers @@ -223896,7 +219906,6 @@ self: { benchmarkHaskellDepends = [ base deepseq gauge random ]; description = "Beautiful Streaming, Concurrent and Reactive Composition"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streamproc" = callPackage @@ -224559,8 +220568,8 @@ self: { }: mkDerivation { pname = "stripe-core"; - version = "2.4.1"; - sha256 = "1ab3smzvm9qw4g1b5prin7njifwfls51c4cb625aaziljmpwyg27"; + version = "2.5.0"; + sha256 = "06b5qx20zkvaqvn98jqmq0vqrpkgfvab5wjq7lwlcdm9nn7nrsgi"; libraryHaskellDepends = [ aeson base bytestring mtl text time transformers unordered-containers @@ -224573,8 +220582,8 @@ self: { ({ mkDerivation, base, stripe-core, stripe-http-client }: mkDerivation { pname = "stripe-haskell"; - version = "2.4.1"; - sha256 = "041kj0dh6qzpmcwb6wm5ii9l6dwdpja3big57n0134z41hw0p45f"; + version = "2.5.0"; + sha256 = "0qazqygkg6hlfvz6wg3gk2am7qnxzsfqjqh6mgyandz9l141pyx5"; libraryHaskellDepends = [ base stripe-core stripe-http-client ]; description = "Stripe API for Haskell"; license = stdenv.lib.licenses.mit; @@ -224588,8 +220597,8 @@ self: { }: mkDerivation { pname = "stripe-http-client"; - version = "2.4.1"; - sha256 = "1x7720awkh97wpkyn6mbqb788a07lfshd8w55qwywfxlp42qg4a3"; + version = "2.5.0"; + sha256 = "1386d2bhql56kazxx89icl1j5ikhhza2cv934x19s5lqsl8089yi"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-types stripe-core text @@ -224667,14 +220676,16 @@ self: { }: mkDerivation { pname = "stripe-tests"; - version = "2.4.1"; - sha256 = "1lq2m450y7ylalcimy2fm2c6vhl0m3pyj7m52cni5dm398qskmr6"; + version = "2.5.0"; + sha256 = "0jqxzdriaysf2lya8p9lc1ind2m4b4nz15dn7vb3sx74vw6lp4s3"; libraryHaskellDepends = [ aeson base bytestring free hspec hspec-core mtl random stripe-core text time transformers unordered-containers ]; description = "Tests for Stripe API bindings for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stripe-wreq" = callPackage @@ -225068,6 +221079,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stylist" = callPackage + ({ mkDerivation, base, css-syntax, hashable, hspec, network-uri + , QuickCheck, text, unordered-containers + }: + mkDerivation { + pname = "stylist"; + version = "1.0.0.0"; + sha256 = "0lh8x8wqq4rsy4zn025qhs6jr9iaw65xqpbrk233h620prj23525"; + libraryHaskellDepends = [ + base css-syntax hashable network-uri text unordered-containers + ]; + testHaskellDepends = [ + base css-syntax hashable hspec network-uri QuickCheck text + unordered-containers + ]; + description = "Apply CSS styles to a document tree"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "stylized" = callPackage ({ mkDerivation, ansi-terminal, base }: mkDerivation { @@ -225118,6 +221150,8 @@ self: { ]; description = "An applicative functor that seamlessly talks to HTML inputs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sub-state" = callPackage @@ -225428,34 +221462,6 @@ self: { }) {}; "summoner" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base-noprelude - , bytestring, directory, filepath, generic-deriving, gitrev - , hedgehog, hspec, neat-interpolation, optparse-applicative - , process, relude, text, time, tomland - }: - mkDerivation { - pname = "summoner"; - version = "1.2.0"; - sha256 = "04shi46j44g81zylmrm807rlinfx6sjpdwvxxyw9rhnpx56b8r34"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal base-noprelude bytestring directory filepath - generic-deriving gitrev neat-interpolation optparse-applicative - process relude text time tomland - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base-noprelude filepath hedgehog hspec neat-interpolation relude - tomland - ]; - description = "Tool for scaffolding completely configured production Haskell projects"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "summoner_1_3_0_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base-noprelude , bytestring, directory, filepath, generic-deriving, gitrev , hedgehog, hspec, neat-interpolation, optparse-applicative @@ -225683,6 +221689,8 @@ self: { ]; description = "Efficiently build a bytestring from smaller chunks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "supercollider-ht" = callPackage @@ -225873,6 +221881,8 @@ self: { testHaskellDepends = [ base hspec ]; description = "Monitor groups of threads with non-hierarchical lifetimes"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "supplemented" = callPackage @@ -225973,31 +221983,6 @@ self: { }) {}; "sv-core" = callPackage - ({ mkDerivation, attoparsec, base, bifunctors, bytestring - , containers, contravariant, deepseq, lens, mtl, parsec - , profunctors, QuickCheck, readable, semigroupoids, semigroups - , tasty, tasty-quickcheck, text, transformers, trifecta - , utf8-string, validation, vector, void - }: - mkDerivation { - pname = "sv-core"; - version = "0.3.1"; - sha256 = "08j8qin7q04jvrb1gd870cylix7p81f4rws1k31b3azby2mdja6h"; - libraryHaskellDepends = [ - attoparsec base bifunctors bytestring containers contravariant - deepseq lens mtl parsec profunctors readable semigroupoids - semigroups text transformers trifecta utf8-string validation vector - void - ]; - testHaskellDepends = [ - base bytestring profunctors QuickCheck semigroupoids semigroups - tasty tasty-quickcheck text validation vector - ]; - description = "Encode and decode separated values (CSV, PSV, ...)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "sv-core_0_4_1" = callPackage ({ mkDerivation, attoparsec, base, bifunctors, bytestring , containers, contravariant, deepseq, double-conversion, lens, mtl , parsec, profunctors, QuickCheck, readable, semigroupoids @@ -226022,7 +222007,6 @@ self: { ]; description = "Encode and decode separated values (CSV, PSV, ...)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sv-svfactor" = callPackage @@ -226312,40 +222296,6 @@ self: { }) {}; "swagger2" = callPackage - ({ mkDerivation, aeson, base, base-compat-batteries, bytestring - , Cabal, cabal-doctest, containers, cookie, doctest, generics-sop - , Glob, hashable, hspec, hspec-discover, http-media, HUnit - , insert-ordered-containers, lens, mtl, network, QuickCheck - , quickcheck-instances, scientific, template-haskell, text, time - , transformers, transformers-compat, unordered-containers - , utf8-string, uuid-types, vector - }: - mkDerivation { - pname = "swagger2"; - version = "2.3.1.1"; - sha256 = "19fslhjqcnk0da1c8sdflnnxjzbbzqb0nbknpgyd45q0psxr6xs7"; - revision = "1"; - editedCabalFile = "1g6jiadrvglrbf0857nzfbnjxmb3lwqamgs47j3qv9k6kfwilzyk"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson base base-compat-batteries bytestring containers cookie - generics-sop hashable http-media insert-ordered-containers lens mtl - network QuickCheck scientific template-haskell text time - transformers transformers-compat unordered-containers uuid-types - vector - ]; - testHaskellDepends = [ - aeson base base-compat-batteries bytestring containers doctest Glob - hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck - quickcheck-instances template-haskell text time - unordered-containers utf8-string vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Swagger 2.0 data model"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "swagger2_2_4" = callPackage ({ mkDerivation, aeson, base, base-compat-batteries, bytestring , Cabal, cabal-doctest, containers, cookie, doctest, generics-sop , Glob, hashable, hspec, hspec-discover, http-media, HUnit @@ -226375,7 +222325,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Swagger 2.0 data model"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "swapper" = callPackage @@ -226651,8 +222600,6 @@ self: { ]; description = "Library for Typed Tagless-Final Higher-Order Composable DSL"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "symantic-cli" = callPackage @@ -226669,8 +222616,6 @@ self: { ]; description = "Symantics for parsing and documenting a CLI"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "symantic-document" = callPackage @@ -226853,8 +222798,6 @@ self: { ]; description = "Symantics for common types"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "symantic-xml" = callPackage @@ -227123,6 +223066,8 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Generic representation and manipulation of abstract syntax"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "syntactical" = callPackage @@ -227856,8 +223801,8 @@ self: { ({ mkDerivation, base, bytestring, network, transformers, unix }: mkDerivation { pname = "systemd"; - version = "1.1.2"; - sha256 = "11wjsfnnsfgrffsxy9s5yqlzb7zxlrjg92mhanq66jvbnqh1jijr"; + version = "1.2.0"; + sha256 = "04jzgixwy267bx75byi1pavfgic2h3znn42psb70i6l6xvwn875g"; libraryHaskellDepends = [ base bytestring network transformers unix ]; @@ -228051,6 +223996,8 @@ self: { ]; description = "Layout text as grid or table"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "table-tennis" = callPackage @@ -228239,8 +224186,6 @@ self: { executablePkgconfigDepends = [ gtk3 ]; description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk3;}; "tag-bits" = callPackage @@ -228653,8 +224598,6 @@ self: { ]; description = "Support library to enable TAI usage on systems with time kept in UTC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tai64" = callPackage @@ -229143,8 +225086,8 @@ self: { }: mkDerivation { pname = "taskell"; - version = "1.4.0.0"; - sha256 = "1l0q1wyhkh271rpd6qw12j1kkzdqqcvp2xvqwykn98jwmnhswm4m"; + version = "1.5.0.0"; + sha256 = "0v66297i3d36r0k2jpp1cl3g3wj83k3s2dq5n50cm7zrrg0mc7sq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229184,23 +225127,6 @@ self: { }) {}; "tasty" = callPackage - ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl - , optparse-applicative, stm, tagged, unbounded-delays, unix - , wcwidth - }: - mkDerivation { - pname = "tasty"; - version = "1.2"; - sha256 = "05w3bl5kah238pds818sxp9x58rp1nszbiicb1l21hf9k83mw66n"; - libraryHaskellDepends = [ - ansi-terminal async base clock containers mtl optparse-applicative - stm tagged unbounded-delays unix wcwidth - ]; - description = "Modern and extensible testing framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty_1_2_3" = callPackage ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl , optparse-applicative, stm, tagged, unbounded-delays, unix , wcwidth @@ -229215,7 +225141,6 @@ self: { ]; description = "Modern and extensible testing framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-ant-xml" = callPackage @@ -229258,17 +225183,6 @@ self: { }) {}; "tasty-dejafu" = callPackage - ({ mkDerivation, base, dejafu, random, tagged, tasty }: - mkDerivation { - pname = "tasty-dejafu"; - version = "1.2.1.0"; - sha256 = "0a0iqc9vnrj4a44h77larcprydipwxy9qkh3zb6zk9mpn9fas498"; - libraryHaskellDepends = [ base dejafu random tagged tasty ]; - description = "Deja Fu support for the Tasty test framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-dejafu_2_0_0_1" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; @@ -229277,7 +225191,6 @@ self: { libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-discover" = callPackage @@ -229304,6 +225217,8 @@ self: { ]; description = "Test discovery for the tasty framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-expected-failure" = callPackage @@ -229433,6 +225348,8 @@ self: { ]; description = "Hspec support for the Tasty test framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-html" = callPackage @@ -229454,17 +225371,6 @@ self: { }) {}; "tasty-hunit" = callPackage - ({ mkDerivation, base, call-stack, tasty }: - mkDerivation { - pname = "tasty-hunit"; - version = "0.10.0.1"; - sha256 = "0j3hgga6c3s8h5snzivb8a75h96207ia2rlbxzj07xbf4zpkp44g"; - libraryHaskellDepends = [ base call-stack tasty ]; - description = "HUnit support for the Tasty test framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-hunit_0_10_0_2" = callPackage ({ mkDerivation, base, call-stack, tasty }: mkDerivation { pname = "tasty-hunit"; @@ -229473,7 +225379,6 @@ self: { libraryHaskellDepends = [ base call-stack tasty ]; description = "HUnit support for the Tasty test framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-hunit-adapter" = callPackage @@ -229687,29 +225592,6 @@ self: { }) {}; "tasty-silver" = callPackage - ({ mkDerivation, ansi-terminal, async, base, bytestring, containers - , deepseq, directory, filepath, mtl, optparse-applicative, process - , process-extras, regex-tdfa, semigroups, stm, tagged, tasty - , tasty-hunit, temporary, text, transformers - }: - mkDerivation { - pname = "tasty-silver"; - version = "3.1.12"; - sha256 = "0s6cz0z8xmhc3gqyb68lkx0j94kagbdgc5gagknmfj6an2i33fly"; - libraryHaskellDepends = [ - ansi-terminal async base bytestring containers deepseq directory - filepath mtl optparse-applicative process process-extras regex-tdfa - semigroups stm tagged tasty temporary text - ]; - testHaskellDepends = [ - base directory filepath process tasty tasty-hunit temporary - transformers - ]; - description = "A fancy test runner, including support for golden tests"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-silver_3_1_13" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process , process-extras, regex-tdfa, semigroups, stm, tagged, tasty @@ -229730,7 +225612,6 @@ self: { ]; description = "A fancy test runner, including support for golden tests"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-smallcheck" = callPackage @@ -229828,12 +225709,12 @@ self: { pname = "tasty-travis"; version = "0.2.0.2"; sha256 = "0g1qwmr11rgpvm964367mskgrjzbi34lbxzf9c0knx5ij9565gfg"; + revision = "2"; + editedCabalFile = "0m8h9r1cv38sva9k5aws1l4py4xzzmlfwik2avhm8avdr0hl71dk"; libraryHaskellDepends = [ base tasty ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Fancy Travis CI output for tasty tests"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tasty-wai" = callPackage @@ -231062,23 +226943,6 @@ self: { }) {}; "termbox" = callPackage - ({ mkDerivation, array, base, c2hs }: - mkDerivation { - pname = "termbox"; - version = "0.1.0"; - sha256 = "1wylp818y65rwdrzmh596sn8csiwjma6gh6wm4fn9m9zb1nvzbsa"; - revision = "1"; - editedCabalFile = "0qwab9ayd9b8gmcnvy6pbbp16vwnqdzji9qi71jmgvviayqdlly5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ array base ]; - libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base ]; - description = "termbox bindings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "termbox_0_2_0" = callPackage ({ mkDerivation, array, base, c2hs }: mkDerivation { pname = "termbox"; @@ -231091,7 +226955,6 @@ self: { executableHaskellDepends = [ base ]; description = "termbox bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "termbox-banana" = callPackage @@ -231107,8 +226970,6 @@ self: { libraryHaskellDepends = [ base reactive-banana termbox ]; description = "reactive-banana + termbox"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "termbox-bindings" = callPackage @@ -231275,14 +227136,15 @@ 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, lens, mono-traversable, pretty-simple, QuickCheck - , singletons, tasty, tasty-hedgehog, tasty-hspec, template-haskell - , vte_291, xml-conduit, xml-html-qq + , 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 }: mkDerivation { pname = "termonad"; - version = "1.3.0.0"; - sha256 = "1vyvh0b7r1l060yhm9j572yzlpvz3pba50snaqi9cicvddrj3aj9"; + version = "2.0.0.0"; + sha256 = "0rprqn5vcvhbqqg0grrmz0ijjpkrprza88la4mbdg6skb34fjsp0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -231290,11 +227152,11 @@ self: { libraryHaskellDepends = [ adjunctions base classy-prelude colour constraints containers data-default directory distributive dyre filepath focuslist gi-gdk - gi-gio gi-glib gi-gtk gi-pango gi-vte haskell-gi-base lens - mono-traversable pretty-simple QuickCheck singletons xml-conduit - xml-html-qq + gi-gio gi-glib gi-gtk gi-pango gi-vte haskell-gi-base inline-c lens + mono-traversable pretty-simple QuickCheck singletons text + xml-conduit xml-html-qq ]; - libraryPkgconfigDepends = [ gtk3 vte_291 ]; + libraryPkgconfigDepends = [ gtk3 libpcre2 vte_291 ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base doctest genvalidity-containers genvalidity-hspec hedgehog lens @@ -231304,7 +227166,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) gtk3; vte_291 = pkgs.vte;}; + }) {inherit (pkgs) gtk3; libpcre2 = null; vte_291 = pkgs.vte;}; "termplot" = callPackage ({ mkDerivation, base, brick, data-default, optparse-applicative @@ -232079,25 +227941,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "text_1_2_3_1" = callPackage + "text_1_2_4_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, deepseq , directory, ghc-prim, HUnit, integer-gmp, QuickCheck - , quickcheck-unicode, random, test-framework, test-framework-hunit - , test-framework-quickcheck2 + , quickcheck-unicode, random, template-haskell, test-framework + , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "text"; - version = "1.2.3.1"; - sha256 = "19j725g8xma1811avl3nz2vndwynsmpx3sqf6bd7iwh1bm6n4q43"; - revision = "2"; - editedCabalFile = "0ax6h9mvs4567nzi936jkd8f94bi8jnxis4wikjzyaxqfwm5zc6f"; + version = "1.2.4.0"; + sha256 = "0k739i0sjrbl029y5j8n5v1hqa68z00xazvrahjhyl69mp4s5qna"; libraryHaskellDepends = [ array base binary bytestring deepseq ghc-prim integer-gmp + template-haskell ]; testHaskellDepends = [ array base binary bytestring deepseq directory ghc-prim HUnit - integer-gmp QuickCheck quickcheck-unicode random test-framework - test-framework-hunit test-framework-quickcheck2 + integer-gmp QuickCheck quickcheck-unicode random template-haskell + test-framework test-framework-hunit test-framework-quickcheck2 ]; doCheck = false; description = "An efficient packed Unicode text type"; @@ -232372,8 +228233,6 @@ self: { ]; description = "ICU transliteration"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) icu;}; "text-json-qq" = callPackage @@ -232601,24 +228460,6 @@ self: { }) {}; "text-printer" = callPackage - ({ mkDerivation, base, bytestring, pretty, QuickCheck, semigroups - , test-framework, test-framework-quickcheck2, text, text-latin1 - }: - mkDerivation { - pname = "text-printer"; - version = "0.5"; - sha256 = "02sadjd19dbxzawr1q8z3j7w6vhp5mvz1dbssk118hsvl6k0234g"; - libraryHaskellDepends = [ - base bytestring pretty semigroups text text-latin1 - ]; - testHaskellDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 - ]; - description = "Abstract interface for text builders/printers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-printer_0_5_0_1" = callPackage ({ mkDerivation, base, bytestring, pretty, QuickCheck, semigroups , test-framework, test-framework-quickcheck2, text, text-latin1 }: @@ -232634,7 +228475,6 @@ self: { ]; description = "Abstract interface for text builders/printers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-regex-replace" = callPackage @@ -232710,31 +228550,11 @@ self: { testHaskellDepends = [ base hedgehog neat-interpolation text ]; description = "Simple text replacements from a list of search/replace pairs"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "text-short" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, ghc-prim - , hashable, quickcheck-instances, tasty, tasty-hunit - , tasty-quickcheck, text - }: - mkDerivation { - pname = "text-short"; - version = "0.1.2"; - sha256 = "0rqiwgjkgyfy8596swl0s0x2jqk6ddh2h02qxa32az2cs5kviwmk"; - revision = "2"; - editedCabalFile = "106p7c0399zxdlh9f9qkgy7g2gp3bxqdpy6m6lnfhzi0pm5y8mks"; - libraryHaskellDepends = [ - base binary bytestring deepseq ghc-prim hashable text - ]; - testHaskellDepends = [ - base binary quickcheck-instances tasty tasty-hunit tasty-quickcheck - text - ]; - description = "Memory-efficient representation of Unicode text strings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-short_0_1_3" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, ghc-prim , hashable, quickcheck-instances, tasty, tasty-hunit , tasty-quickcheck, text @@ -232752,44 +228572,9 @@ self: { ]; description = "Memory-efficient representation of Unicode text strings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-show" = callPackage - ({ mkDerivation, array, base, base-compat-batteries, base-orphans - , bifunctors, bytestring, bytestring-builder, containers - , contravariant, criterion, deepseq, deriving-compat - , generic-deriving, ghc-boot-th, ghc-prim, hspec, hspec-discover - , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups - , tagged, template-haskell, text, th-abstraction, th-lift - , transformers, transformers-compat, void - }: - mkDerivation { - pname = "text-show"; - version = "3.7.5"; - sha256 = "1by89i3c6qyjh7jjld06wb2sphb236rbvwb1mmvq8f6mxliiyf1r"; - revision = "1"; - editedCabalFile = "1v8czpi9mn54850k0pilqh1f3yfr5n5vykmg5k57wmrdpx25vkws"; - libraryHaskellDepends = [ - array base base-compat-batteries bifunctors bytestring - bytestring-builder containers contravariant generic-deriving - ghc-boot-th ghc-prim integer-gmp nats semigroups tagged - template-haskell text th-abstraction th-lift transformers - transformers-compat void - ]; - testHaskellDepends = [ - array base base-compat-batteries base-orphans bytestring - bytestring-builder deriving-compat generic-deriving ghc-prim hspec - nats QuickCheck quickcheck-instances semigroups tagged - template-haskell text transformers transformers-compat - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; - description = "Efficient conversion of values into Text"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-show_3_8_2" = callPackage ({ mkDerivation, array, base, base-compat-batteries, base-orphans , bifunctors, bytestring, bytestring-builder, containers , contravariant, criterion, deepseq, deriving-compat @@ -232819,7 +228604,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; description = "Efficient conversion of values into Text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-show-instances" = callPackage @@ -232853,8 +228637,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Additional instances for text-show"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "text-stream-decode" = callPackage @@ -233034,6 +228816,8 @@ self: { ]; description = "Non-empty values of `Data.Text`."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "textPlot" = callPackage @@ -233200,20 +228984,6 @@ self: { }) {}; "th-abstraction" = callPackage - ({ mkDerivation, base, containers, ghc-prim, template-haskell }: - mkDerivation { - pname = "th-abstraction"; - version = "0.2.11.0"; - sha256 = "0340w34cqa42m0b9hdys9bfphi13swdp7xc8cwzbj9fq6764p22i"; - libraryHaskellDepends = [ - base containers ghc-prim template-haskell - ]; - testHaskellDepends = [ base containers template-haskell ]; - description = "Nicer interface for reified information about data types"; - license = stdenv.lib.licenses.isc; - }) {}; - - "th-abstraction_0_3_1_0" = callPackage ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "th-abstraction"; @@ -233225,7 +228995,6 @@ self: { testHaskellDepends = [ base containers template-haskell ]; description = "Nicer interface for reified information about data types"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-alpha" = callPackage @@ -233332,6 +229101,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-data-compat_0_1_0_0" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "th-data-compat"; + version = "0.1.0.0"; + sha256 = "03d5ddbxzfn60ysxxn17q7gzdlls8hvlsvhzai4mn0qfjpwi6ljx"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Compatibility for data definition template of TH"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-desugar" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb , template-haskell, th-expand-syns, th-lift, th-orphans @@ -233525,23 +229306,6 @@ self: { }) {}; "th-lift" = callPackage - ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction - }: - mkDerivation { - pname = "th-lift"; - version = "0.7.11"; - sha256 = "131360zxb0hazbqwbkk6ab2p77jkxr79bwwm618mrwrwkm3x2g6m"; - revision = "1"; - editedCabalFile = "0whppp0p9df3fphv6pyg8f70bnm2kpyb3ylznknrklsl5vn2c49d"; - libraryHaskellDepends = [ - base ghc-prim template-haskell th-abstraction - ]; - testHaskellDepends = [ base ghc-prim template-haskell ]; - description = "Derive Template Haskell's Lift class for datatypes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-lift_0_8_0_1" = callPackage ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction }: mkDerivation { @@ -233554,28 +229318,9 @@ self: { testHaskellDepends = [ base ghc-prim template-haskell ]; description = "Derive Template Haskell's Lift class for datatypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-lift-instances" = callPackage - ({ mkDerivation, base, bytestring, containers, QuickCheck - , template-haskell, text, vector - }: - mkDerivation { - pname = "th-lift-instances"; - version = "0.1.12"; - sha256 = "1kjfwfmkn7r35qlsa0n4la3103jlfbjf3ia1pvsgizgrwxr1zjid"; - libraryHaskellDepends = [ - base bytestring containers template-haskell text vector - ]; - testHaskellDepends = [ - base bytestring containers QuickCheck template-haskell text vector - ]; - description = "Lift instances for template-haskell for common data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-lift-instances_0_1_13" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck , template-haskell, text, th-lift, transformers, vector }: @@ -233592,7 +229337,6 @@ self: { ]; description = "Lift instances for template-haskell for common data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-nowq" = callPackage @@ -233946,32 +229690,6 @@ self: { }) {}; "these" = callPackage - ({ mkDerivation, aeson, base, base-compat, bifunctors, binary - , containers, data-default-class, deepseq, hashable, keys, lens - , mtl, QuickCheck, quickcheck-instances, semigroupoids, tasty - , tasty-quickcheck, transformers, transformers-compat - , unordered-containers, vector, vector-instances - }: - mkDerivation { - pname = "these"; - version = "0.7.6"; - sha256 = "0in77b1g73m224dmpfc9khgcs0ajgsknp0yri853c9p6k0yvhr4l"; - libraryHaskellDepends = [ - aeson base base-compat bifunctors binary containers - data-default-class deepseq hashable keys lens mtl QuickCheck - semigroupoids transformers transformers-compat unordered-containers - vector vector-instances - ]; - testHaskellDepends = [ - aeson base base-compat bifunctors binary containers hashable lens - QuickCheck quickcheck-instances tasty tasty-quickcheck transformers - unordered-containers vector - ]; - description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "these_1_0_1" = callPackage ({ mkDerivation, aeson, assoc, base, base-compat, binary, deepseq , hashable, QuickCheck, semigroupoids, unordered-containers }: @@ -233985,7 +229703,6 @@ self: { ]; description = "An either-or-both data type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "these-lens" = callPackage @@ -233997,8 +229714,6 @@ self: { libraryHaskellDepends = [ base base-compat lens these ]; description = "Lenses for These"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "these-skinny" = callPackage @@ -234440,6 +230155,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "throwable-exceptions gives the easy way to throw exceptions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "thumbnail" = callPackage @@ -234632,25 +230349,6 @@ self: { }) {}; "tidal" = callPackage - ({ mkDerivation, base, bifunctors, bytestring, clock, colour - , containers, hosc, microspec, mwc-random, network, parsec - , template-haskell, text, transformers, vector - }: - mkDerivation { - pname = "tidal"; - version = "1.0.14"; - sha256 = "15bcv5np25sm11ny7b5ak6i321vsy7v1kdxx58y6hqpyn8yx0mx0"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bifunctors bytestring clock colour containers hosc mwc-random - network parsec template-haskell text transformers vector - ]; - testHaskellDepends = [ base containers microspec parsec ]; - description = "Pattern language for improvised music"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "tidal_1_3_0" = callPackage ({ mkDerivation, base, bifunctors, bytestring, clock, colour , containers, criterion, deepseq, hosc, microspec, mwc-random , network, parsec, text, transformers, vector, weigh @@ -234668,7 +230366,6 @@ self: { benchmarkHaskellDepends = [ base criterion weigh ]; description = "Pattern language for improvised music"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tidal-midi" = callPackage @@ -234898,17 +230595,6 @@ self: { }) {}; "time-compat" = callPackage - ({ mkDerivation, base, old-time, time }: - mkDerivation { - pname = "time-compat"; - version = "0.1.0.3"; - sha256 = "0zqgzr8yjn36rn6gflwh5s0c92vl44xzxiw0jz8d5h0h8lhi21sr"; - libraryHaskellDepends = [ base old-time time ]; - description = "Compatibility with old-time for the time package"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "time-compat_1_9_2_2" = callPackage ({ mkDerivation, base, base-compat, base-orphans, deepseq, HUnit , QuickCheck, tagged, tasty, tasty-hunit, tasty-quickcheck, time }: @@ -234925,7 +230611,6 @@ self: { ]; description = "Compatibility package for time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-extras" = callPackage @@ -235500,23 +231185,6 @@ self: { }) {}; "timer-wheel" = callPackage - ({ mkDerivation, atomic-primops, base, ghc-prim, primitive - , psqueues - }: - mkDerivation { - pname = "timer-wheel"; - version = "0.1.0"; - sha256 = "0wjm767yxf3hg3p80nd0hi0bfvdssq0f3lj9pzkmrsnsqafngs2j"; - revision = "1"; - editedCabalFile = "0vk0p21x90wiazss30zkbzr5fnsc4gih9a6xaa9myyycw078600v"; - libraryHaskellDepends = [ - atomic-primops base ghc-prim primitive psqueues - ]; - description = "A timer wheel"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "timer-wheel_0_2_0_1" = callPackage ({ mkDerivation, atomic-primops, base, psqueues, random, vector }: mkDerivation { pname = "timer-wheel"; @@ -235526,7 +231194,6 @@ self: { testHaskellDepends = [ base random ]; description = "A timer wheel"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timerep" = callPackage @@ -235666,6 +231333,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "timeutils" = callPackage + ({ mkDerivation, base, brick, hspec, microlens, time, vty }: + mkDerivation { + pname = "timeutils"; + version = "0.1.0"; + sha256 = "12i331hvnbzbln8c38wqj7a7836l40zm4p1b3lb10q81qk4wnygi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base microlens time ]; + executableHaskellDepends = [ base brick microlens time vty ]; + testHaskellDepends = [ base hspec microlens time ]; + description = "Time utilities"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "timezone-olson" = callPackage ({ mkDerivation, base, binary, bytestring, extensible-exceptions , time, timezone-series @@ -235836,23 +231520,6 @@ self: { }) {}; "tinylog" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion - , double-conversion, fast-logger, text, transformers, unix-time - }: - mkDerivation { - pname = "tinylog"; - version = "0.14.1"; - sha256 = "01yz41l45qmc878gzhbchzkvr4ha2cfmvvjv31hwivgwgl8rcgni"; - libraryHaskellDepends = [ - base bytestring containers double-conversion fast-logger text - transformers unix-time - ]; - benchmarkHaskellDepends = [ base bytestring criterion ]; - description = "Simplistic logging using fast-logger"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "tinylog_0_15_0" = callPackage ({ mkDerivation, base, bytestring, containers, criterion , double-conversion, fast-logger, text, transformers, unix-time }: @@ -235867,7 +231534,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Simplistic logging using fast-logger"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tinytemplate" = callPackage @@ -236184,21 +231850,6 @@ self: { }) {}; "tls-session-manager" = callPackage - ({ mkDerivation, auto-update, base, basement, bytestring, clock - , memory, psqueues, tls - }: - mkDerivation { - pname = "tls-session-manager"; - version = "0.0.2.1"; - sha256 = "19pygahf2hb5yp06spninqjs7a0078lmggmrqkq16ri9vifq6454"; - libraryHaskellDepends = [ - auto-update base basement bytestring clock memory psqueues tls - ]; - description = "In-memory TLS session manager"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tls-session-manager_0_0_3" = callPackage ({ mkDerivation, auto-update, base, basement, bytestring, clock , memory, psqueues, tls }: @@ -236211,7 +231862,6 @@ self: { ]; description = "In-memory TLS session manager"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tmapchan" = callPackage @@ -236250,30 +231900,6 @@ self: { }) {}; "tmp-postgres" = callPackage - ({ mkDerivation, async, base, bytestring, directory, hspec - , hspec-discover, network, port-utils, postgresql-simple, process - , temporary, unix - }: - mkDerivation { - pname = "tmp-postgres"; - version = "0.1.2.2"; - sha256 = "1lsf8ydf21dql452jk3x6maicip65r4jyb9xd5a98687j798bm6n"; - libraryHaskellDepends = [ - async base bytestring directory network port-utils - postgresql-simple process temporary unix - ]; - testHaskellDepends = [ - base bytestring directory hspec hspec-discover postgresql-simple - process temporary - ]; - testToolDepends = [ hspec-discover ]; - description = "Start and stop a temporary postgres for testing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "tmp-postgres_0_2_0_0" = callPackage ({ mkDerivation, async, base, bytestring, directory, hspec , hspec-discover, network, port-utils, postgresql-simple, process , temporary, unix @@ -236683,38 +232309,6 @@ self: { }) {}; "tomland" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , gauge, hashable, hedgehog, hspec-megaparsec, htoml - , htoml-megaparsec, megaparsec, mtl, parsec, parser-combinators - , tasty, tasty-discover, tasty-hedgehog, tasty-hspec, tasty-silver - , text, time, transformers, unordered-containers - }: - mkDerivation { - pname = "tomland"; - version = "0.5.0"; - sha256 = "001gw3yj0ibg3dm4q5wz8akjpcdx6zj3jza1y6gq7m5h13fzrvgf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers deepseq hashable megaparsec mtl - parser-combinators text time transformers unordered-containers - ]; - executableHaskellDepends = [ base text time unordered-containers ]; - testHaskellDepends = [ - base hedgehog hspec-megaparsec megaparsec tasty tasty-hedgehog - tasty-hspec tasty-silver text time unordered-containers - ]; - testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ - aeson base deepseq gauge htoml htoml-megaparsec parsec text time - ]; - description = "Bidirectional TOML parser"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "tomland_1_1_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , directory, gauge, hashable, hedgehog, hspec-megaparsec, htoml , htoml-megaparsec, markdown-unlit, megaparsec, mtl, parsec @@ -236767,6 +232361,8 @@ self: { ]; description = "Command-line tool to check syntax of TOML files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tonalude" = callPackage @@ -236919,8 +232515,8 @@ self: { }: mkDerivation { pname = "too-many-cells"; - version = "0.1.12.2"; - sha256 = "01jbz5a51myy4293637c9v2ac87cp60l4rax2gkdiqw8vj8231j4"; + version = "0.1.12.4"; + sha256 = "02qgin4x0vmj56y4yv3zb4fimd6zaqnx344gyj9lrq11fnr202yr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -237385,8 +232981,6 @@ self: { testHaskellDepends = [ base pretty text ]; description = "Data Type for Rewriting Systems"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tptp" = callPackage @@ -237557,8 +233151,8 @@ self: { }: mkDerivation { pname = "traction"; - version = "0.2.0"; - sha256 = "1rbbp2sw5i1x499bhi1d0f37m34rf6j9p2ndlqsijallmdiawcgq"; + version = "0.3.0"; + sha256 = "1y0l02hcbxmc3vidg477z7dlbikalmi448dv8dl5pl7zpflcp7di"; libraryHaskellDepends = [ base bytestring containers exceptions mmorph postgresql-simple resource-pool syb template-haskell text time transformers @@ -238142,6 +233736,8 @@ self: { testHaskellDepends = [ base doctest ]; description = "Type Safe Web Routing"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trasa-client" = callPackage @@ -238158,6 +233754,8 @@ self: { ]; description = "Type safe http requests"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trasa-extra" = callPackage @@ -238195,6 +233793,8 @@ self: { ]; description = "generate forms using lucid, ditto and trasa"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trasa-reflex" = callPackage @@ -238228,6 +233828,8 @@ self: { ]; description = "Type safe web server"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trasa-th" = callPackage @@ -238377,31 +233979,6 @@ self: { }) {}; "tree-diff" = callPackage - ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base - , base-compat, bytestring, containers, generics-sop, hashable - , MemoTrie, parsec, parsers, pretty, QuickCheck, scientific, tagged - , tasty, tasty-golden, tasty-quickcheck, text, time, trifecta - , unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "tree-diff"; - version = "0.0.2.1"; - sha256 = "0hz7jklzb4cc63l68jxc58ik0ybgim9niwq2gfi0cskv5g2yr3ym"; - libraryHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base base-compat bytestring - containers generics-sop hashable MemoTrie parsec parsers pretty - QuickCheck scientific tagged text time unordered-containers - uuid-types vector - ]; - testHaskellDepends = [ - ansi-terminal ansi-wl-pprint base base-compat parsec QuickCheck - tasty tasty-golden tasty-quickcheck trifecta - ]; - description = "Diffing of (expression) trees"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tree-diff_0_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base , base-compat, bytestring, bytestring-builder, containers, hashable , parsec, parsers, pretty, QuickCheck, scientific, tagged, tasty @@ -238424,7 +234001,6 @@ self: { ]; description = "Diffing of (expression) trees"; license = stdenv.lib.licenses.gpl2Plus; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tree-fun" = callPackage @@ -238896,6 +234472,8 @@ self: { testHaskellDepends = [ base hspec ]; description = "A command-line tool for trimming whitespace"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trimpolya" = callPackage @@ -240262,6 +235840,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Twitter API package with conduit interface and Streaming API support"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twitter-enumerator" = callPackage @@ -240327,6 +235907,8 @@ self: { ]; description = "Twitter JSON parser and types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twitter-types-lens" = callPackage @@ -240342,6 +235924,8 @@ self: { ]; description = "Twitter JSON types (lens powered)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tx" = callPackage @@ -240651,8 +236235,6 @@ self: { ]; description = "Tools for writing better type errors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "type-errors-pretty" = callPackage @@ -240973,17 +236555,6 @@ self: { }) {}; "type-operators" = callPackage - ({ mkDerivation, base, ghc-prim }: - mkDerivation { - pname = "type-operators"; - version = "0.1.0.4"; - sha256 = "0x0bshb13b7i4imn0pgpljcj109c9z5mgw84mjmlcg62d3ryvg6v"; - libraryHaskellDepends = [ base ghc-prim ]; - description = "Various type-level operators"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "type-operators_0_2_0_0" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "type-operators"; @@ -240992,7 +236563,6 @@ self: { libraryHaskellDepends = [ base ghc-prim ]; description = "Various type-level operators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-ord" = callPackage @@ -241040,6 +236610,18 @@ self: { broken = true; }) {}; + "type-sets" = callPackage + ({ mkDerivation, base, cmptype }: + mkDerivation { + pname = "type-sets"; + version = "0.1.1.0"; + sha256 = "0ryrivrhpplck0h6h7d8pfl5bg7lbv2519icz317yp2qy8r3g2l7"; + libraryHaskellDepends = [ base cmptype ]; + testHaskellDepends = [ base cmptype ]; + description = "Type-level sets"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "type-settheory" = callPackage ({ mkDerivation, base, containers, syb, template-haskell , transformers, type-equality @@ -241058,18 +236640,6 @@ self: { }) {}; "type-spec" = callPackage - ({ mkDerivation, base, pretty }: - mkDerivation { - pname = "type-spec"; - version = "0.3.0.1"; - sha256 = "0hd2lgfp6vydynr2ip4zy4kg2jzrfkrrqj1vnx1fn4zwkqqimkdf"; - libraryHaskellDepends = [ base pretty ]; - testHaskellDepends = [ base ]; - description = "Type Level Specification by Example"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "type-spec_0_4_0_0" = callPackage ({ mkDerivation, base, pretty }: mkDerivation { pname = "type-spec"; @@ -241079,7 +236649,6 @@ self: { testHaskellDepends = [ base ]; description = "Type Level Specification by Example"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-spine" = callPackage @@ -241242,25 +236811,6 @@ self: { }) {}; "typed-process" = callPackage - ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec - , process, stm, temporary, transformers - }: - mkDerivation { - pname = "typed-process"; - version = "0.2.5.0"; - sha256 = "01mx5zsivir6dpw8ih4y801figld65l0anbr1hfl5a6vwnmnjr2r"; - libraryHaskellDepends = [ - async base bytestring process stm transformers - ]; - testHaskellDepends = [ - async base base64-bytestring bytestring hspec process stm temporary - transformers - ]; - description = "Run external processes, with strong typing of streams"; - license = stdenv.lib.licenses.mit; - }) {}; - - "typed-process_0_2_6_0" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec , process, stm, temporary, transformers, unliftio-core }: @@ -241277,7 +236827,6 @@ self: { ]; description = "Run external processes, with strong typing of streams"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typed-spreadsheet" = callPackage @@ -241448,17 +236997,6 @@ self: { }) {}; "typelits-witnesses" = callPackage - ({ mkDerivation, base, constraints, reflection }: - mkDerivation { - pname = "typelits-witnesses"; - version = "0.3.0.3"; - sha256 = "078r9pbkzwzm1q821zqisj0wrx1rdk9w8c3ip0g1m5j97zzlmpaf"; - libraryHaskellDepends = [ base constraints reflection ]; - description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits"; - license = stdenv.lib.licenses.mit; - }) {}; - - "typelits-witnesses_0_4_0_0" = callPackage ({ mkDerivation, base, dependent-sum }: mkDerivation { pname = "typelits-witnesses"; @@ -241467,7 +237005,6 @@ self: { libraryHaskellDepends = [ base dependent-sum ]; description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typenums" = callPackage @@ -241514,37 +237051,6 @@ self: { }) {}; "typerep-map" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq - , dependent-map, dependent-sum, ghc-prim, ghc-typelits-knownnat - , hedgehog, primitive, QuickCheck, tasty, tasty-discover - , tasty-hedgehog, tasty-hspec, vector - }: - mkDerivation { - pname = "typerep-map"; - version = "0.3.1"; - sha256 = "1ycyk47h578vf4kpf1y708zg9cc6i028jv1fdaw3zy59wrbl8y74"; - revision = "2"; - editedCabalFile = "0zcvg2kr3kcnhxdndw6fcjdd1421ncglr34mc8d9sw1hjjcb5w38"; - libraryHaskellDepends = [ - base containers deepseq ghc-prim primitive vector - ]; - testHaskellDepends = [ - base ghc-typelits-knownnat hedgehog QuickCheck tasty tasty-discover - tasty-hedgehog tasty-hspec - ]; - testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ - base criterion deepseq dependent-map dependent-sum - ghc-typelits-knownnat - ]; - doHaddock = false; - description = "Efficient implementation of a dependent map with types as keys"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "typerep-map_0_3_2" = callPackage ({ mkDerivation, base, containers, criterion, deepseq , dependent-map, dependent-sum, ghc-prim, ghc-typelits-knownnat , hedgehog, primitive, QuickCheck, tasty, tasty-discover @@ -241678,6 +237184,8 @@ self: { ]; description = "Just let me draw nice text already"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "typography-geometry" = callPackage @@ -242131,8 +237639,6 @@ self: { ]; description = "Minimal HTTP client library optimized for benchmarking"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ui-command" = callPackage @@ -242544,6 +238050,8 @@ self: { ]; description = "Class of data structures that can be unfolded"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unfoldable-restricted" = callPackage @@ -242560,6 +238068,8 @@ self: { ]; description = "An alternative to the Unfoldable typeclass"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ungadtagger" = callPackage @@ -242897,6 +238407,8 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq lens ]; description = "Extensible type-safe unions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "union-find" = callPackage @@ -243130,8 +238642,8 @@ self: { ({ mkDerivation, base, template-haskell, units }: mkDerivation { pname = "units-defs"; - version = "2.0.1.1"; - sha256 = "0p99gchk3m4ibmhr6jws57sv083q142rhxjavq9laz97gjm2r9w2"; + version = "2.1.0.1"; + sha256 = "1ck50r8mhcvjyfx3wdkn8s89rrzjkxpn439zarg5s2vqmqji7gyy"; libraryHaskellDepends = [ base template-haskell units ]; description = "Definitions for use with the units package"; license = stdenv.lib.licenses.bsd3; @@ -243275,22 +238787,9 @@ self: { ]; description = "A class for finite and recursively enumerable types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "universe-base" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "universe-base"; - version = "1.0.2.1"; - sha256 = "0ldvk0bj16hl1v824vvsich3rzx84xm3sbppd5ahpp5cmx887i07"; - libraryHaskellDepends = [ base ]; - description = "A class for finite and recursively enumerable types and some helper functions for enumerating them"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "universe-base_1_1_1" = callPackage ({ mkDerivation, base, containers, QuickCheck, tagged, transformers }: mkDerivation { @@ -243301,7 +238800,6 @@ self: { testHaskellDepends = [ base containers QuickCheck ]; description = "A class for finite and recursively enumerable types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "universe-dependent-sum" = callPackage @@ -243323,24 +238821,9 @@ self: { ]; description = "Universe instances for types from dependent-sum"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "universe-instances-base" = callPackage - ({ mkDerivation, base, containers, universe-base }: - mkDerivation { - pname = "universe-instances-base"; - version = "1.0"; - sha256 = "04njgl32lk5a0masjdjkm4l2wsyrr29g0fsp599864mp7gp504d2"; - revision = "2"; - editedCabalFile = "0c9zxmifhy2qjvsikgm168n8k8ka8ia88ldy8qjqkz5pqknlr9sj"; - libraryHaskellDepends = [ base containers universe-base ]; - description = "Universe instances for types from the base package"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "universe-instances-base_1_1" = callPackage ({ mkDerivation, base, universe-base }: mkDerivation { pname = "universe-instances-base"; @@ -243351,7 +238834,6 @@ self: { libraryHaskellDepends = [ base universe-base ]; description = "Universe instances for types from the base package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "universe-instances-extended" = callPackage @@ -243365,28 +238847,9 @@ self: { libraryHaskellDepends = [ adjunctions base comonad universe-base ]; description = "Universe instances for types from selected extra packages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "universe-instances-trans" = callPackage - ({ mkDerivation, base, mtl, transformers, universe-base - , universe-instances-base - }: - mkDerivation { - pname = "universe-instances-trans"; - version = "1.0.0.1"; - sha256 = "03iix0bdhfi4qlgwr8sl3gsqck6lsbkqgx245w2z5yaaxgqpq10d"; - revision = "1"; - editedCabalFile = "0dcwgbgmbkjwzbxlncpl1b5hgjrmkl73djknjkhbnh02pysbwv69"; - libraryHaskellDepends = [ - base mtl transformers universe-base universe-instances-base - ]; - description = "Universe instances for types from the transformers and mtl packages"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "universe-instances-trans_1_1" = callPackage ({ mkDerivation, base, universe-base }: mkDerivation { pname = "universe-instances-trans"; @@ -243397,25 +238860,9 @@ self: { libraryHaskellDepends = [ base universe-base ]; description = "Universe instances for types from the transformers and mtl packages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "universe-reverse-instances" = callPackage - ({ mkDerivation, base, containers, universe-instances-base }: - mkDerivation { - pname = "universe-reverse-instances"; - version = "1.0"; - sha256 = "0jcd7qyvzq8xxv9d3hfi0f1h48xdsy9r9xnxgxc7ggga4szirm79"; - revision = "2"; - editedCabalFile = "0cpnsip1iakwkgnwnd21gwrc8qbifzpff6agjwm34jgkq9j646k8"; - libraryHaskellDepends = [ - base containers universe-instances-base - ]; - description = "instances of standard classes that are made possible by enumerations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "universe-reverse-instances_1_1" = callPackage ({ mkDerivation, base, containers, universe-base }: mkDerivation { pname = "universe-reverse-instances"; @@ -243426,7 +238873,6 @@ self: { libraryHaskellDepends = [ base containers universe-base ]; description = "Instances of standard classes that are made possible by enumerations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "universe-th" = callPackage @@ -243519,6 +238965,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unix-compat_0_5_2" = callPackage + ({ mkDerivation, base, unix }: + mkDerivation { + pname = "unix-compat"; + version = "0.5.2"; + sha256 = "1a8brv9fax76b1fymslzyghwa6ma8yijiyyhn12msl3i5x24x6k5"; + libraryHaskellDepends = [ base unix ]; + description = "Portable POSIX-compatibility layer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unix-fcntl" = callPackage ({ mkDerivation, base, foreign-var }: mkDerivation { @@ -243647,6 +239105,8 @@ self: { ]; description = "Bidirectional JSON parsing and generation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unlambda" = callPackage @@ -243675,31 +239135,6 @@ self: { }) {}; "unliftio" = callPackage - ({ mkDerivation, async, base, containers, deepseq, directory - , filepath, gauge, hspec, process, QuickCheck, stm, time - , transformers, unix, unliftio-core - }: - mkDerivation { - pname = "unliftio"; - version = "0.2.11"; - sha256 = "1bc80845pbrs19xh0557w14k1ymzdysc8sf5vh63cfx63vpkw772"; - libraryHaskellDepends = [ - async base deepseq directory filepath process stm time transformers - unix unliftio-core - ]; - testHaskellDepends = [ - async base containers deepseq directory filepath hspec process - QuickCheck stm time transformers unix unliftio-core - ]; - benchmarkHaskellDepends = [ - async base deepseq directory filepath gauge process stm time - transformers unix unliftio-core - ]; - description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "unliftio_0_2_12" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , directory, filepath, gauge, hspec, process, QuickCheck, stm, time , transformers, unix, unliftio-core @@ -243722,7 +239157,6 @@ self: { ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unliftio-core" = callPackage @@ -244888,6 +240322,8 @@ self: { ]; description = "The UserId type and useful instances for web development"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "users" = callPackage @@ -245151,6 +240587,8 @@ self: { testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Utilities for universal types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "utility-ht" = callPackage @@ -245595,6 +241033,8 @@ self: { testHaskellDepends = [ base process ]; description = "the cabal companion"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vabal-lib" = callPackage @@ -245779,6 +241219,8 @@ self: { pname = "validated-literals"; version = "0.3.0"; sha256 = "1k77jp19kl7h4v9hl2jhsmbq8dhzl8z9sgkw1jxx1rblm3fszjx1"; + revision = "1"; + editedCabalFile = "1l6b488pnarmx4a1cysbx0lpcx0kvrs4x3bc4sinpnzv0r5az4z4"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base bytestring deepseq tasty tasty-hunit tasty-travis @@ -245786,8 +241228,6 @@ self: { ]; description = "Compile-time checking for partial smart-constructors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "validated-types" = callPackage @@ -245805,24 +241245,6 @@ self: { }) {}; "validation" = callPackage - ({ mkDerivation, base, bifunctors, deepseq, hedgehog, HUnit, lens - , semigroupoids, semigroups - }: - mkDerivation { - pname = "validation"; - version = "1"; - sha256 = "08drmdvyzg2frbb26icy1mlz52xv0l6gi3v8gb7xp0vrcci5libh"; - revision = "1"; - editedCabalFile = "1x1g4nannz81j1h64l1m3ancc96zc57d1bjhj1wk7bwn1xxbi5h3"; - libraryHaskellDepends = [ - base bifunctors deepseq lens semigroupoids semigroups - ]; - testHaskellDepends = [ base hedgehog HUnit lens semigroups ]; - description = "A data-type like Either but with an accumulating Applicative"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "validation_1_1" = callPackage ({ mkDerivation, base, bifunctors, deepseq, hedgehog, HUnit, lens , semigroupoids, semigroups }: @@ -245838,7 +241260,6 @@ self: { testHaskellDepends = [ base hedgehog HUnit lens semigroups ]; description = "A data-type like Either but with an accumulating Applicative"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validations" = callPackage @@ -246192,21 +241613,6 @@ self: { }) {}; "vault" = callPackage - ({ mkDerivation, base, containers, hashable, semigroups - , unordered-containers - }: - mkDerivation { - pname = "vault"; - version = "0.3.1.2"; - sha256 = "072mbrihsdsb8c6xvg6lvk0rqjgvxvi8qkg4n6wwym5hq0pfa04y"; - libraryHaskellDepends = [ - base containers hashable semigroups unordered-containers - ]; - description = "a persistent store for values of arbitrary types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vault_0_3_1_3" = callPackage ({ mkDerivation, base, containers, hashable, semigroups , unordered-containers }: @@ -246219,7 +241625,6 @@ self: { ]; description = "a persistent store for values of arbitrary types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vault-tool" = callPackage @@ -246466,27 +241871,6 @@ self: { }) {}; "vec" = callPackage - ({ mkDerivation, adjunctions, base, base-compat, criterion, deepseq - , distributive, fin, hashable, inspection-testing, lens - , semigroupoids, tagged, transformers, vector - }: - mkDerivation { - pname = "vec"; - version = "0.1.1"; - sha256 = "1ryc6jshm26dh21xlf4wg4fhkw035bxx4smd3xyisjqm7nncq7n5"; - revision = "1"; - editedCabalFile = "0yaqc8ci0iy46fimznmr499c5ygrvhfspwbkxdhn112zrci3b7af"; - libraryHaskellDepends = [ - adjunctions base base-compat deepseq distributive fin hashable lens - semigroupoids transformers - ]; - testHaskellDepends = [ base fin inspection-testing tagged ]; - benchmarkHaskellDepends = [ base criterion fin vector ]; - description = "Vec: length-indexed (sized) list"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vec_0_1_1_1" = callPackage ({ mkDerivation, adjunctions, base, base-compat, criterion, deepseq , distributive, fin, hashable, inspection-testing, lens , semigroupoids, tagged, transformers, vector @@ -246503,7 +241887,6 @@ self: { benchmarkHaskellDepends = [ base criterion fin vector ]; description = "Vec: length-indexed (sized) list"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vect" = callPackage @@ -246916,19 +242299,6 @@ self: { }) {}; "vector-space" = callPackage - ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: - mkDerivation { - pname = "vector-space"; - version = "0.15"; - sha256 = "03swlbn0x8gfb7bilxmh3zckprjc6v64bildmhwzlimjvd1v8jb8"; - revision = "1"; - editedCabalFile = "19549mrhg3x0d1ancrxyvrskd6p4x11iprnv0b0d84q7sc40fa8w"; - libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; - description = "Vector & affine spaces, linear maps, and derivatives"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-space_0_16" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { pname = "vector-space"; @@ -246937,7 +242307,6 @@ self: { libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-space-map" = callPackage @@ -246950,6 +242319,8 @@ self: { testHaskellDepends = [ base doctest ]; description = "vector-space operations for finite maps using Data.Map"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vector-space-opengl" = callPackage @@ -247098,17 +242469,6 @@ self: { }) {}; "verbosity" = callPackage - ({ mkDerivation, base, binary, data-default-class, deepseq }: - mkDerivation { - pname = "verbosity"; - version = "0.2.3.0"; - sha256 = "0r7jj2h7xzz3i8ck00z19h4bfr4r4nxfzi6ya9kppcda92myak4b"; - libraryHaskellDepends = [ base binary data-default-class deepseq ]; - description = "Simple enum that encodes application verbosity"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "verbosity_0_3_0_0" = callPackage ({ mkDerivation, base, binary, data-default-class, deepseq, dhall , generic-lens, serialise }: @@ -247121,7 +242481,6 @@ self: { ]; description = "Simple enum that encodes application verbosity"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "verdict" = callPackage @@ -247558,28 +242917,6 @@ self: { }) {}; "vinyl" = callPackage - ({ mkDerivation, aeson, array, base, criterion, doctest, ghc-prim - , hspec, lens, lens-aeson, linear, microlens, mtl, mwc-random - , primitive, should-not-typecheck, singletons, tagged, text - , unordered-containers, vector - }: - mkDerivation { - pname = "vinyl"; - version = "0.10.0.1"; - sha256 = "1x2x40cgyhj3yzw4kajssjvlnwlcrrnz7vaa8as2k9xmv9x76ig4"; - libraryHaskellDepends = [ array base ghc-prim ]; - testHaskellDepends = [ - aeson base doctest hspec lens lens-aeson microlens mtl - should-not-typecheck singletons text unordered-containers vector - ]; - benchmarkHaskellDepends = [ - base criterion linear microlens mwc-random primitive tagged vector - ]; - description = "Extensible Records"; - license = stdenv.lib.licenses.mit; - }) {}; - - "vinyl_0_11_0" = callPackage ({ mkDerivation, aeson, array, base, criterion, doctest, ghc-prim , hspec, lens, lens-aeson, linear, microlens, mtl, mwc-random , primitive, should-not-typecheck, singletons, tagged, text @@ -247600,6 +242937,7 @@ self: { description = "Extensible Records"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vinyl-generics" = callPackage @@ -247617,6 +242955,8 @@ self: { ]; description = "Convert plain records to vinyl (and vice versa), generically"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vinyl-gl" = callPackage @@ -247638,6 +242978,8 @@ self: { ]; description = "Utilities for working with OpenGL's GLSL shading language and vinyl records"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vinyl-json" = callPackage @@ -247667,6 +243009,8 @@ self: { libraryHaskellDepends = [ base vinyl ]; description = "Syntax sugar for vinyl records using overloaded labels"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vinyl-operational" = callPackage @@ -248484,24 +243828,6 @@ self: { }) {}; "wai-cli" = callPackage - ({ mkDerivation, ansi-terminal, base, http-types, monads-tf - , network, options, socket-activation, stm, streaming-commons, unix - , wai, wai-extra, warp, warp-tls - }: - mkDerivation { - pname = "wai-cli"; - version = "0.1.1"; - sha256 = "0qi84p1x5b0hvsdgd03fn80j3ai0s0svcl340z9fvz6lrgcfnhq6"; - libraryHaskellDepends = [ - ansi-terminal base http-types monads-tf network options - socket-activation stm streaming-commons unix wai wai-extra warp - warp-tls - ]; - description = "Command line runner for Wai apps (using Warp) with TLS, CGI, socket activation & graceful shutdown"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "wai-cli_0_2_1" = callPackage ({ mkDerivation, ansi-terminal, base, http-types, iproute , monads-tf, network, options, socket-activation, stm , streaming-commons, unix, wai, wai-extra, warp, warp-tls @@ -248519,7 +243845,6 @@ self: { ]; description = "Command line runner for Wai apps (using Warp) with TLS, CGI, socket activation & graceful shutdown"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-conduit" = callPackage @@ -248654,35 +243979,6 @@ self: { }) {}; "wai-extra" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , bytestring, case-insensitive, containers, cookie - , data-default-class, deepseq, directory, fast-logger, hspec - , http-types, http2, HUnit, iproute, network, old-locale, resourcet - , streaming-commons, text, time, transformers, unix, unix-compat - , vault, void, wai, wai-logger, word8, zlib - }: - mkDerivation { - pname = "wai-extra"; - version = "3.0.26.1"; - sha256 = "1gsjji9i471j224sfp4xdm4vga3jcbdvdg7f40y3l58pplf6a3qd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring bytestring - case-insensitive containers cookie data-default-class deepseq - directory fast-logger http-types http2 iproute network old-locale - resourcet streaming-commons text time transformers unix unix-compat - vault void wai wai-logger word8 zlib - ]; - testHaskellDepends = [ - base bytestring case-insensitive cookie fast-logger hspec - http-types http2 HUnit resourcet text time transformers wai zlib - ]; - description = "Provides some basic WAI handlers and middleware"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wai-extra_3_0_27" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring , bytestring, case-insensitive, containers, cookie , data-default-class, deepseq, directory, fast-logger, hspec @@ -248709,7 +244005,6 @@ self: { ]; description = "Provides some basic WAI handlers and middleware"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-frontend-monadcgi" = callPackage @@ -249825,6 +245120,8 @@ self: { ]; description = "Typesafe URLs for Wai applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-routing" = callPackage @@ -250568,28 +245865,6 @@ self: { }) {}; "wave" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers - , data-default-class, hspec, QuickCheck, temporary, transformers - }: - mkDerivation { - pname = "wave"; - version = "0.1.5"; - sha256 = "03zycmwrchhqvi37fdvlzz2d1vl4hy0i8xyys1zznw38qfq0h2i5"; - revision = "2"; - editedCabalFile = "0zs0mw42z9xzs1r935pd5dssf0x10qbkhxlpfknv0x75n2k0azzj"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring cereal containers data-default-class transformers - ]; - testHaskellDepends = [ - base bytestring containers data-default-class hspec QuickCheck - temporary - ]; - description = "Work with WAVE and RF64 files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wave_0_2_0" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, hspec , hspec-discover, QuickCheck, temporary, transformers }: @@ -250607,7 +245882,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Work with WAVE and RF64 files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wavefront" = callPackage @@ -250808,6 +246082,8 @@ self: { testHaskellDepends = [ base bytestring HUnit network-uri text ]; description = "Composable, reversible, efficient web routing using invertible invariants and bijections"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "web-mongrel2" = callPackage @@ -250961,6 +246237,8 @@ self: { ]; description = "Adds support for using web-routes with Happstack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "web-routes-hsp" = callPackage @@ -251027,6 +246305,8 @@ self: { testHaskellDepends = [ base hspec HUnit QuickCheck web-routes ]; description = "Support for deriving PathInfo using Template Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "web-routes-transformers" = callPackage @@ -251187,6 +246467,8 @@ self: { ]; description = "A super-simple web server framework"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "webcloud" = callPackage @@ -251273,29 +246555,6 @@ self: { }) {}; "webdriver" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bytestring, data-default-class, directory, directory-tree - , exceptions, filepath, http-client, http-types, lifted-base - , monad-control, network, network-uri, scientific, temporary, text - , time, transformers, transformers-base, unordered-containers - , vector, zip-archive - }: - mkDerivation { - pname = "webdriver"; - version = "0.8.5"; - sha256 = "1gn168cjwlpv2f4jchj48a9pvk8zqdxsf9qpx0lsj4bl2j5pl5m8"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring bytestring - data-default-class directory directory-tree exceptions filepath - http-client http-types lifted-base monad-control network - network-uri scientific temporary text time transformers - transformers-base unordered-containers vector zip-archive - ]; - description = "a Haskell client for the Selenium WebDriver protocol"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "webdriver_0_9_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, call-stack, data-default-class, directory , directory-tree, exceptions, filepath, http-client, http-types @@ -251316,7 +246575,6 @@ self: { ]; description = "a Haskell client for the Selenium WebDriver protocol"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webdriver-angular" = callPackage @@ -251338,6 +246596,8 @@ self: { ]; description = "Webdriver actions to assist with testing a webpage which uses Angular.Js"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "webdriver-snoy" = callPackage @@ -251793,6 +247053,8 @@ self: { ]; description = "Composable websockets clients"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "websockets-snap" = callPackage @@ -251912,8 +247174,6 @@ self: { ]; description = "A school-timetable problem-solver"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "weigh" = callPackage @@ -252222,6 +247482,8 @@ self: { ]; description = "Data types for large but fixed width signed and unsigned integers"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wigner-symbols" = callPackage @@ -252437,44 +247699,6 @@ self: { }) {}; "winery" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, cassava - , containers, cpu, deepseq, directory, gauge, hashable, megaparsec - , mtl, prettyprinter, prettyprinter-ansi-terminal, QuickCheck - , scientific, semigroups, serialise, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "winery"; - version = "0.3.1"; - sha256 = "1f63fgw7ky6kd0dk41rhqjxgvi33pa5ffrv0vk2i7dr88bmc1wgy"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers cpu hashable megaparsec mtl - prettyprinter prettyprinter-ansi-terminal scientific semigroups - text time transformers unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring containers cpu hashable megaparsec mtl - prettyprinter prettyprinter-ansi-terminal scientific semigroups - text time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers cpu hashable megaparsec mtl - prettyprinter prettyprinter-ansi-terminal QuickCheck scientific - semigroups text time transformers unordered-containers vector - ]; - benchmarkHaskellDepends = [ - aeson base binary bytestring cassava containers cpu deepseq - directory gauge hashable megaparsec mtl prettyprinter - prettyprinter-ansi-terminal scientific semigroups serialise text - time transformers unordered-containers vector - ]; - description = "Sustainable serialisation library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "winery_1_1_2" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cereal , containers, cpu, deepseq, directory, fast-builder, gauge , hashable, HUnit, megaparsec, mtl, prettyprinter @@ -252509,7 +247733,6 @@ self: { ]; description = "A compact, well-typed seralisation format for Haskell values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "winio" = callPackage @@ -252661,6 +247884,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "witherable_0_3_2" = callPackage + ({ mkDerivation, base, base-orphans, containers, hashable + , monoidal-containers, transformers, transformers-compat + , unordered-containers, vector + }: + mkDerivation { + pname = "witherable"; + version = "0.3.2"; + sha256 = "1iqf3kc9h599lbiym8rf9b4fhj31lqwm1cxqz6x02q9dxyrcprmi"; + libraryHaskellDepends = [ + base base-orphans containers hashable monoidal-containers + transformers transformers-compat unordered-containers vector + ]; + description = "filterable traversable"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "witness" = callPackage ({ mkDerivation, base, constraints, semigroupoids, transformers }: mkDerivation { @@ -253005,6 +248246,8 @@ self: { testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Words of arbitrary size"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "word-trie" = callPackage @@ -253428,20 +248671,6 @@ self: { }) {}; "world-peace" = callPackage - ({ mkDerivation, aeson, base, deepseq, doctest, Glob, profunctors - , tagged - }: - mkDerivation { - pname = "world-peace"; - version = "0.1.0.0"; - sha256 = "19anwyh9n9agpcdhzfbh0l28nm0mdn8616klihbw55yxkiwqaxkk"; - libraryHaskellDepends = [ aeson base deepseq profunctors tagged ]; - testHaskellDepends = [ base doctest Glob ]; - description = "Open Union and Open Product Types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "world-peace_1_0_1_0" = callPackage ({ mkDerivation, aeson, base, deepseq, doctest, Glob, profunctors , should-not-typecheck, tagged, tasty, tasty-hunit, text }: @@ -253455,7 +248684,6 @@ self: { ]; description = "Open Union and Open Product Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wp-archivebot" = callPackage @@ -253596,46 +248824,6 @@ self: { }) {}; "wreq" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec - , authenticate-oauth, base, base16-bytestring, base64-bytestring - , bytestring, Cabal, cabal-doctest, case-insensitive, containers - , cryptonite, directory, doctest, exceptions, filepath, ghc-prim - , hashable, http-client, http-client-tls, http-types, HUnit, lens - , lens-aeson, memory, mime-types, network-info, psqueues - , QuickCheck, snap-core, snap-server, template-haskell, temporary - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, time, time-locale-compat, transformers, unix-compat - , unordered-containers, uuid, vector - }: - mkDerivation { - pname = "wreq"; - version = "0.5.3.1"; - sha256 = "1i2f2bxx84l8qzkz9v3qhx5sbl78ysc3vqadfhrxk3h0ljklwfz3"; - revision = "2"; - editedCabalFile = "1rjz4012vp9q7a3szpm8a7rnn62d5cbbp1pp3qwfyi1fgyd5rp6c"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson attoparsec authenticate-oauth base base16-bytestring - bytestring case-insensitive containers cryptonite exceptions - ghc-prim hashable http-client http-client-tls http-types lens - lens-aeson memory mime-types psqueues template-haskell text time - time-locale-compat unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty base base64-bytestring bytestring - case-insensitive containers directory doctest filepath hashable - http-client http-types HUnit lens lens-aeson network-info - QuickCheck snap-core snap-server temporary test-framework - test-framework-hunit test-framework-quickcheck2 text time - transformers unix-compat unordered-containers uuid vector - ]; - description = "An easy-to-use HTTP client library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wreq_0_5_3_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec , authenticate-oauth, base, base16-bytestring, base64-bytestring , bytestring, Cabal, cabal-doctest, case-insensitive, containers @@ -253673,7 +248861,6 @@ self: { ]; description = "An easy-to-use HTTP client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wreq-sb" = callPackage @@ -255121,6 +250308,8 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Simple and incomplete Excel file parser/writer"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xlsx-tabular" = callPackage @@ -255137,6 +250326,8 @@ self: { testHaskellDepends = [ base ]; description = "Xlsx table cell value extraction utility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xlsx-templater" = callPackage @@ -255298,6 +250489,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "xml-conduit-stylist" = callPackage + ({ mkDerivation, base, containers, css-syntax, network-uri, stylist + , text, unordered-containers, xml-conduit + }: + mkDerivation { + pname = "xml-conduit-stylist"; + version = "1.0.0.0"; + sha256 = "1w9ig4mr0l0kj8mk7sfsyv8p77k91l93cfpbpvmg32q9wffz2r02"; + libraryHaskellDepends = [ + base containers css-syntax network-uri stylist text + unordered-containers xml-conduit + ]; + description = "Bridge between xml-conduit/html-conduit and stylist"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "xml-conduit-writer" = callPackage ({ mkDerivation, base, containers, data-default, dlist, mtl, text , xml-conduit, xml-types @@ -255799,28 +251008,6 @@ self: { }) {}; "xmlbf" = callPackage - ({ mkDerivation, base, bytestring, containers, QuickCheck - , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text - , transformers, unordered-containers - }: - mkDerivation { - pname = "xmlbf"; - version = "0.4.1"; - sha256 = "0xfw9z1l3ja4qq0lj9i2n81fdh43ggprsy8rm71pcdacnpl056hq"; - revision = "1"; - editedCabalFile = "0j5yvsz0ib5w80wp1gc0li376adw8l861xvf5paa2hdq55jkxvi6"; - libraryHaskellDepends = [ - base bytestring containers text transformers unordered-containers - ]; - testHaskellDepends = [ - base bytestring QuickCheck quickcheck-instances tasty tasty-hunit - tasty-quickcheck text transformers unordered-containers - ]; - description = "XML back and forth! Parser, renderer, ToXml, FromXml, fixpoints"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "xmlbf_0_6" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, QuickCheck , quickcheck-instances, selective, tasty, tasty-hunit , tasty-quickcheck, text, transformers, unordered-containers @@ -255839,30 +251026,9 @@ self: { ]; description = "XML back and forth! Parser, renderer, ToXml, FromXml, fixpoints"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmlbf-xeno" = callPackage - ({ mkDerivation, base, bytestring, html-entities, QuickCheck - , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text - , unordered-containers, xeno, xmlbf - }: - mkDerivation { - pname = "xmlbf-xeno"; - version = "0.1.1"; - sha256 = "0cnxcw1sh92ljcpla2j7pg0md8yj7j48jgjlsn0f9ha0j90lw73c"; - libraryHaskellDepends = [ - base bytestring html-entities text unordered-containers xeno xmlbf - ]; - testHaskellDepends = [ - base bytestring QuickCheck quickcheck-instances tasty tasty-hunit - tasty-quickcheck text unordered-containers xmlbf - ]; - description = "xeno backend support for the xmlbf library"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "xmlbf-xeno_0_2" = callPackage ({ mkDerivation, base, bytestring, html-entities, QuickCheck , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text , unordered-containers, xeno, xmlbf @@ -255881,6 +251047,7 @@ self: { description = "xeno backend support for the xmlbf library"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xmlbf-xmlhtml" = callPackage @@ -255902,8 +251069,6 @@ self: { ]; description = "xmlhtml backend support for the xmlbf library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "xmlgen" = callPackage @@ -256843,37 +252008,6 @@ self: { }) {}; "yam" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring - , data-default, fast-logger, hspec, http-client, http-types, lens - , menshen, monad-logger, mtl, mwc-random, QuickCheck, reflection - , salak, scientific, servant-client, servant-server - , servant-swagger, servant-swagger-ui, swagger2, text - , unliftio-core, unordered-containers, vault, vector, wai, warp - }: - mkDerivation { - pname = "yam"; - version = "0.5.17"; - sha256 = "128h0j2v9jsr8hpk43hd75i62xasq3g40v0fk20yzp82avyirqzq"; - libraryHaskellDepends = [ - aeson base base16-bytestring binary bytestring data-default - fast-logger http-client http-types lens menshen monad-logger mtl - mwc-random reflection salak scientific servant-client - servant-server servant-swagger servant-swagger-ui swagger2 text - unliftio-core unordered-containers vault vector wai warp - ]; - testHaskellDepends = [ - aeson base base16-bytestring binary bytestring data-default - fast-logger hspec http-client http-types lens menshen monad-logger - mtl mwc-random QuickCheck reflection salak scientific - servant-client servant-server servant-swagger servant-swagger-ui - swagger2 text unliftio-core unordered-containers vault vector wai - warp - ]; - description = "Yam Web"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "yam_0_7" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring , data-default, exceptions, fast-logger, hspec, http-client , http-types, lens, menshen, monad-logger, mtl, mwc-random @@ -256904,7 +252038,6 @@ self: { ]; description = "A wrapper of servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yam-app" = callPackage @@ -256947,21 +252080,6 @@ self: { }) {}; "yam-datasource" = callPackage - ({ mkDerivation, base, conduit, persistent, resource-pool - , resourcet, unliftio-core, yam - }: - mkDerivation { - pname = "yam-datasource"; - version = "0.5.17"; - sha256 = "1ah2y614l0a3mkdrv6a4arbsy0a2wz7w7dwmkdf4rfl9zpm1lfsf"; - libraryHaskellDepends = [ - base conduit persistent resource-pool resourcet unliftio-core yam - ]; - description = "Yam DataSource Middleware"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "yam-datasource_0_7" = callPackage ({ mkDerivation, base, conduit, data-default, monad-logger , persistent, resource-pool, resourcet, salak, servant-server, text , unliftio-core, yam @@ -256976,7 +252094,6 @@ self: { ]; description = "Yam DataSource Middleware"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yam-job" = callPackage @@ -257020,8 +252137,6 @@ self: { ]; description = "Yam Redis Middleware"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "yam-servant" = callPackage @@ -257700,8 +252815,6 @@ self: { libraryHaskellDepends = [ base deriving-compat hedgehog yaya ]; description = "Hedgehog testing support for the Yaya recursion scheme library"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "yaya-unsafe" = callPackage @@ -258838,6 +253951,8 @@ self: { ]; description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-fb" = callPackage @@ -258881,28 +253996,6 @@ self: { }) {}; "yesod-form" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, containers, data-default - , email-validate, hspec, network-uri, persistent, resourcet - , semigroups, shakespeare, text, time, transformers, wai - , xss-sanitize, yesod-core, yesod-persistent - }: - mkDerivation { - pname = "yesod-form"; - version = "1.6.5"; - sha256 = "007six9sky5qc979jiagannfd5163vijl7g6grf9rlwbqdc8x7dg"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html blaze-markup - byteable bytestring containers data-default email-validate - network-uri persistent resourcet semigroups shakespeare text time - transformers wai xss-sanitize yesod-core yesod-persistent - ]; - testHaskellDepends = [ base hspec text time ]; - description = "Form handling support for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-form_1_6_6" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, containers, data-default , email-validate, hspec, network-uri, persistent, resourcet @@ -258922,7 +254015,6 @@ self: { testHaskellDepends = [ base hspec text time ]; description = "Form handling support for Yesod Web Framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-form-bootstrap4" = callPackage @@ -260083,6 +255175,8 @@ self: { ]; description = "Yet Another Logger"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yggdrasil" = callPackage @@ -260219,6 +255313,8 @@ self: { libraryHaskellDepends = [ base containers split yi-language ]; description = "Simple mapping from colour names used in emacs to Color"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi-frontend-pango" = callPackage @@ -260399,6 +255495,8 @@ self: { ]; description = "Collection of language-related Yi libraries"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi-misc-modes" = callPackage @@ -261388,27 +256486,6 @@ self: { }) {}; "zeromq4-haskell" = callPackage - ({ mkDerivation, async, base, bytestring, containers, exceptions - , monad-control, QuickCheck, semigroups, tasty, tasty-hunit - , tasty-quickcheck, transformers, transformers-base, zeromq - }: - mkDerivation { - pname = "zeromq4-haskell"; - version = "0.7.0"; - sha256 = "17q756mldxx9b8a2nx9lvjrgvbmgjbnp896sqcgnijq7wr751m2q"; - libraryHaskellDepends = [ - async base bytestring containers exceptions monad-control - semigroups transformers transformers-base - ]; - libraryPkgconfigDepends = [ zeromq ]; - testHaskellDepends = [ - async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - description = "Bindings to ZeroMQ 4.x"; - license = stdenv.lib.licenses.mit; - }) {inherit (pkgs) zeromq;}; - - "zeromq4-haskell_0_8_0" = callPackage ({ mkDerivation, async, base, bytestring, containers, exceptions , monad-control, QuickCheck, semigroups, tasty, tasty-hunit , tasty-quickcheck, transformers, transformers-base, zeromq @@ -261427,7 +256504,6 @@ self: { ]; description = "Bindings to ZeroMQ 4.x"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) zeromq;}; "zeromq4-patterns" = callPackage @@ -261813,26 +256889,6 @@ self: { }) {}; "zippers" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, criterion, doctest - , lens, profunctors, semigroupoids, semigroups - }: - mkDerivation { - pname = "zippers"; - version = "0.2.5"; - sha256 = "11f0jx0dbm2y9y5hnpakdvk9fmsm3awr2lcxp46dyma6arr7f4id"; - revision = "3"; - editedCabalFile = "0y0klc2jaj611cjvmqi95dyj9yvribf9xhibn1andrz5rs6ysz3p"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base lens profunctors semigroupoids semigroups - ]; - testHaskellDepends = [ base doctest ]; - benchmarkHaskellDepends = [ base criterion lens ]; - description = "Traversal based zippers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "zippers_0_3" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, criterion, doctest , fail, lens, profunctors, semigroupoids, semigroups }: @@ -261848,7 +256904,6 @@ self: { benchmarkHaskellDepends = [ base criterion lens ]; description = "Traversal based zippers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zippo" = callPackage diff --git a/pkgs/development/haskell-modules/patches/clock-0.7.2.patch b/pkgs/development/haskell-modules/patches/clock-0.7.2.patch deleted file mode 100644 index 8354c7fa589..00000000000 --- a/pkgs/development/haskell-modules/patches/clock-0.7.2.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/System/Clock.hsc b/System/Clock.hsc -index 297607b..c21196b 100644 ---- a/System/Clock.hsc -+++ b/System/Clock.hsc -@@ -41,7 +41,9 @@ import GHC.Generics (Generic) - # endif - #endif - --#let alignment t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__) -+#if __GLASGOW_HASKELL__ < 800 -+# let alignment t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__) -+#endif - - -- | Clock types. A clock may be system-wide (that is, visible to all processes) - -- or per-process (measuring time that is meaningful only within a process). -diff --git a/cbits/hs_clock_win32.c b/cbits/hs_clock_win32.c -index 5dcc2a9..ebdb7fe 100644 ---- a/cbits/hs_clock_win32.c -+++ b/cbits/hs_clock_win32.c -@@ -28,12 +28,22 @@ static void to_timespec_from_100ns(ULONGLONG t_100ns, long long *t) - t[1] = 100*(long)(t_100ns % 10000000UL); - } - -+/* See https://ghc.haskell.org/trac/ghc/ticket/15094 */ -+#if defined(_WIN32) && !defined(_WIN64) -+__attribute__((optimize("-fno-expensive-optimizations"))) -+#endif - void hs_clock_win32_gettime_monotonic(long long* t) - { - LARGE_INTEGER time; -- LARGE_INTEGER frequency; -+ static LARGE_INTEGER frequency; -+ static int hasFreq = 0; -+ - QueryPerformanceCounter(&time); -- QueryPerformanceFrequency(&frequency); -+ if (!hasFreq) -+ { -+ hasFreq = 1; -+ QueryPerformanceFrequency(&frequency); -+ } - // seconds - t[0] = time.QuadPart / frequency.QuadPart; - // nanos = -diff --git a/clock.cabal b/clock.cabal -index 0f2d18a..67d232e 100644 ---- a/clock.cabal -+++ b/clock.cabal -@@ -41,8 +41,8 @@ description: A package for convenient access to high-resolution clock and - copyright: Copyright © Cetin Sert 2009-2016, Eugene Kirpichov 2010, Finn Espen Gundersen 2013, Gerolf Seitz 2013, Mathieu Boespflug 2014 2015, Chris Done 2015, Dimitri Sabadie 2015, Christian Burger 2015, Mario Longobardi 2016 - license: BSD3 - license-file: LICENSE --author: Cetin Sert , Corsis Research --maintainer: Cetin Sert , Corsis Research -+author: Cetin Sert , Corsis Research -+maintainer: Cetin Sert , Corsis Research - homepage: https://github.com/corsis/clock - bug-reports: https://github.com/corsis/clock/issues - category: System diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix index 3bec73ea036..56becd3d6c9 100644 --- a/pkgs/development/interpreters/icon-lang/default.nix +++ b/pkgs/development/interpreters/icon-lang/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchFromGitHub, libX11, libXt }: +{ stdenv, fetchFromGitHub, libX11, libXt , withGraphics ? true }: stdenv.mkDerivation rec { name = "icon-lang-${version}"; version = "9.5.1"; src = fetchFromGitHub { - rev = "39d7438e8d23ccfe20c0af8bbbf61e34d9c715e9"; owner = "gtownsend"; repo = "icon"; + rev = "rel${builtins.replaceStrings ["."] [""] version}"; sha256 = "1gkvj678ldlr1m5kjhx6zpmq11nls8kxa7pyy64whgakfzrypynw"; }; - buildInputs = [ libX11 libXt ]; - configurePhase = '' - make X-Configure name=linux - ''; + buildInputs = stdenv.lib.optionals withGraphics [ libX11 libXt ]; + + configurePhase = + let + _name = if stdenv.isDarwin then "macintosh" else "linux"; + in + '' + make ${stdenv.lib.optionalString withGraphics "X-"}Configure name=${_name} + ''; installPhase = '' make Install dest=$out @@ -21,8 +26,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''A very high level general-purpose programming language''; - maintainers = with maintainers; [ vrthra ]; - platforms = platforms.linux; + maintainers = with maintainers; [ vrthra yurrriq ]; + platforms = with platforms; linux ++ darwin; license = licenses.publicDomain; homepage = https://www.cs.arizona.edu/icon/; }; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 3bcedc47c4b..2ecc5cbb2ef 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -43,7 +43,9 @@ let patches = [ # Do not look in /usr etc. for dependencies. - (if (versionOlder version "5.29.6") then ./no-sys-dirs-5.26.patch else ./no-sys-dirs-5.29.patch) + (if (versionOlder version "5.29.6") then ./no-sys-dirs-5.26.patch + else if (versionOlder version "5.31.1") then ./no-sys-dirs-5.29.patch + else ./no-sys-dirs-5.31.patch) ] ++ optional (versionOlder version "5.29.6") # Fix parallel building: https://rt.perl.org/Public/Bug/Display.html?id=132360 @@ -171,11 +173,11 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "2152db1ea241f796206ab309036be1a7d127b370"; # May 25, 2019 + crossVersion = "980998f7d11baf97284426ca91f84681d49a08f5"; # Jul 20, 2019 perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; - sha256 = "1k08iqdkf9q00hbcq2b933w3vmds7xkfr90phhk0qf64l18wdrkf"; + sha256 = "1hg3k2rhjs5gclrm05z87nvlh4j9pg7mkm9998h9gy6mzk8224q5"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -191,7 +193,7 @@ let setupHook = ./setup-hook-cross.sh; }); in { - # the latest Maint version + # Maint version perl528 = common { perl = pkgs.perl528; buildPerl = buildPackages.perl528; @@ -199,6 +201,7 @@ in { sha256 = "1iynpsxdym4h76kgndmn3ykvwxhqz444xvaz8z2irsxkvmnlb5da"; }; + # Maint version perl530 = common { perl = pkgs.perl530; buildPerl = buildPackages.perl530; @@ -210,7 +213,7 @@ in { perldevel = common { perl = pkgs.perldevel; buildPerl = buildPackages.perldevel; - version = "5.30.0"; - sha256 = "1wkmz6xn3fswpqhz29akiklcxclnlykhp96a8bqcz36rak3i64l5"; + version = "5.31.2"; + sha256 = "00bdh9lmjb0m7dhk8mj7kab7cg2zn9zgw82y4hgkwydzg6d1jis0"; }; } diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.31.patch b/pkgs/development/interpreters/perl/no-sys-dirs-5.31.patch new file mode 100644 index 00000000000..62dce0e25b9 --- /dev/null +++ b/pkgs/development/interpreters/perl/no-sys-dirs-5.31.patch @@ -0,0 +1,254 @@ +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure +--- perl-5.20.0-orig/Configure 2014-05-26 15:34:18.000000000 +0200 ++++ perl-5.20.0/Configure 2014-06-25 10:43:35.368285986 +0200 +@@ -106,15 +106,7 @@ + fi + + : Proper PATH setting +-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' +-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" +-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" +-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" +-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" +-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" +-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" +-paths="$paths /sbin /usr/sbin /usr/libexec" +-paths="$paths /system/gnu_library/bin" ++paths='' + + for p in $paths + do +@@ -1337,8 +1329,7 @@ + archname='' + : Possible local include directories to search. + : Set locincpth to "" in a hint file to defeat local include searches. +-locincpth="/usr/local/include /opt/local/include /usr/gnu/include" +-locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" ++locincpth="" + : + : no include file wanted by default + inclwanted='' +@@ -1349,17 +1340,12 @@ + + libnames='' + : change the next line if compiling for Xenix/286 on Xenix/386 +-xlibpth='/usr/lib/386 /lib/386' ++xlibpth='' + : Possible local library directories to search. +-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" +-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" ++loclibpth="" + + : general looking path for locating libraries +-glibpth="/lib /usr/lib $xlibpth" +-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" +-test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" +-test -f /shlib/libc.so && glibpth="/shlib $glibpth" +-test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" ++glibpth="" + + : Private path used by Configure to find libraries. Its value + : is prepended to libpth. This variable takes care of special +@@ -1391,8 +1377,6 @@ + libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" + : We probably want to search /usr/shlib before most other libraries. + : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. +-glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` +-glibpth="/usr/shlib $glibpth" + : Do not use vfork unless overridden by a hint file. + usevfork=false + +@@ -2446,7 +2430,6 @@ + zip + " + pth=`echo $PATH | sed -e "s/$p_/ /g"` +-pth="$pth $sysroot/lib $sysroot/usr/lib" + for file in $loclist; do + eval xxx=\$$file + case "$xxx" in +@@ -4936,7 +4919,7 @@ + : Set private lib path + case "$plibpth" in + '') if ./mips; then +- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib" ++ plibpth="$incpath/usr/lib" + fi;; + esac + case "$libpth" in +@@ -8600,13 +8583,8 @@ + echo " " + case "$sysman" in + '') +- syspath='/usr/share/man/man1 /usr/man/man1' +- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" +- syspath="$syspath /usr/man/u_man/man1" +- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" +- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" +- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" +- sysman=`./loc . /usr/man/man1 $syspath` ++ syspath='' ++ sysman='' + ;; + esac + if $test -d "$sysman"; then +@@ -19900,9 +19878,10 @@ + case "$full_ar" in + '') full_ar=$ar ;; + esac ++full_ar=ar + + : Store the full pathname to the sed program for use in the C program +-full_sed=$sed ++full_sed=sed + + : see what type gids are declared as in the kernel + echo " " +Only in perl-5.20.0/: Configure.orig +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL +--- perl-5.20.0-orig/ext/Errno/Errno_pm.PL 2014-05-26 15:34:20.000000000 +0200 ++++ perl-5.20.0/ext/Errno/Errno_pm.PL 2014-06-25 10:31:24.317970047 +0200 +@@ -134,12 +126,7 @@ + if ($dep =~ /(\S+errno\.h)/) { + $file{$1} = 1; + } +- } elsif ($^O eq 'linux' && +- $Config{gccversion} ne '' && +- $Config{gccversion} !~ /intel/i && +- # might be using, say, Intel's icc +- $linux_errno_h +- ) { ++ } elsif (0) { + $file{$linux_errno_h} = 1; + } elsif ($^O eq 'haiku') { + # hidden in a special place +Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh +--- perl-5.20.0-orig/hints/freebsd.sh 2014-01-31 22:55:51.000000000 +0100 ++++ perl-5.20.0/hints/freebsd.sh 2014-06-25 10:25:53.263964680 +0200 +@@ -119,21 +119,21 @@ + objformat=`/usr/bin/objformat` + if [ x$objformat = xaout ]; then + if [ -e /usr/lib/aout ]; then +- libpth="/usr/lib/aout /usr/local/lib /usr/lib" +- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" ++ libpth="" ++ glibpth="" + fi + lddlflags='-Bshareable' + else +- libpth="/usr/lib /usr/local/lib" +- glibpth="/usr/lib /usr/local/lib" ++ libpth="" ++ glibpth="" + ldflags="-Wl,-E " + lddlflags="-shared " + fi + cccdlflags='-DPIC -fPIC' + ;; + *) +- libpth="/usr/lib /usr/local/lib" +- glibpth="/usr/lib /usr/local/lib" ++ libpth="" ++ glibpth="" + ldflags="-Wl,-E " + lddlflags="-shared " + cccdlflags='-DPIC -fPIC' +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh +--- perl-5.20.0-orig/hints/linux.sh 2014-05-26 15:34:20.000000000 +0200 ++++ perl-5.20.0/hints/linux.sh 2014-06-25 10:33:47.354883843 +0200 +@@ -150,28 +150,6 @@ case "$optimize" in + ;; + esac + +-# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries +-# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us +-# where to look. We don't want gcc's own libraries, however, so we +-# filter those out. +-# This could be conditional on Unbuntu, but other distributions may +-# follow suit, and this scheme seems to work even on rather old gcc's. +-# This unconditionally uses gcc because even if the user is using another +-# compiler, we still need to find the math library and friends, and I don't +-# know how other compilers will cope with that situation. +-# Morever, if the user has their own gcc earlier in $PATH than the system gcc, +-# we don't want its libraries. So we try to prefer the system gcc +-# Still, as an escape hatch, allow Configure command line overrides to +-# plibpth to bypass this check. +-if [ -x /usr/bin/gcc ] ; then +- gcc=/usr/bin/gcc +-# clang also provides -print-search-dirs +-elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then +- gcc=${cc:-cc} +-else +- gcc=gcc +-fi +- + case "$plibpth" in + '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries | + cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'` +@@ -208,32 +186,6 @@ case "$usequadmath" in + ;; + esac + +-case "$libc" in +-'') +-# If you have glibc, then report the version for ./myconfig bug reporting. +-# (Configure doesn't need to know the specific version since it just uses +-# gcc to load the library for all tests.) +-# We don't use __GLIBC__ and __GLIBC_MINOR__ because they +-# are insufficiently precise to distinguish things like +-# libc-2.0.6 and libc-2.0.7. +- for p in $plibpth +- do +- for trylib in libc.so.6 libc.so +- do +- if $test -e $p/$trylib; then +- libc=`ls -l $p/$trylib | awk '{print $NF}'` +- if $test "X$libc" != X; then +- break +- fi +- fi +- done +- if $test "X$libc" != X; then +- break +- fi +- done +- ;; +-esac +- + if ${sh:-/bin/sh} -c exit; then + echo '' + echo 'You appear to have a working bash. Good.' +@@ -311,33 +263,6 @@ sparc*) + ;; + esac + +-# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than +-# true libraries. The scripts cause binding against static +-# version of -lgdbm which is a bad idea. So if we have 'nm' +-# make sure it can read the file +-# NI-S 2003/08/07 +-case "$nm" in +- '') ;; +- *) +- for p in $plibpth +- do +- if $test -r $p/libndbm.so; then +- if $nm $p/libndbm.so >/dev/null 2>&1 ; then +- echo 'Your shared -lndbm seems to be a real library.' +- _libndbm_real=1 +- break +- fi +- fi +- done +- if $test "X$_libndbm_real" = X; then +- echo 'Your shared -lndbm is not a real library.' +- set `echo X "$libswanted "| sed -e 's/ ndbm / /'` +- shift +- libswanted="$*" +- fi +- ;; +-esac +- + # Linux on Synology. + if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then + # Tested on Synology DS213 and DS413 diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index ea314789ce7..17a56665c5a 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -254,16 +254,16 @@ let in { php72 = generic { - version = "7.2.20"; - sha256 = "116a1m0xjn2yi8d5kwzjk335q4brgl7xplcji2p87i2l9vjjkf4z"; + version = "7.2.21"; + sha256 = "1vqldc2namfblwyv87fgpfffkjpzawfpcp48f40nfdl3pshq6c9l"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; }; php73 = generic { - version = "7.3.7"; - sha256 = "065z2q6imjxlbh6w1r7565ygqhigfbzcz70iaic74hj626kqyq63"; + version = "7.3.8"; + sha256 = "1xbndimrfamf97m3vln842g9w1ikq071gjfkk15ai7sx2wqccrnm"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index c4cbd970d41..7660ea81eaf 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -4,29 +4,30 @@ let parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; - rev = "8991d0b58d5a59925c87dd2a0bdb59a5a4a16bd4"; - sha256 = "00js5d1s98y3ianrvh1ggrd157yfmia4g55jx9xmfcz4a8mcbawx"; - }; - - # Enable non-bundled uriparser - # Introduced in https://github.com/apache/arrow/pull/4092 - Finduriparser_cmake = fetchurl { - url = https://raw.githubusercontent.com/apache/arrow/af4f52961209a5f1b43a19483536285c957e3bed/cpp/cmake_modules/Finduriparser.cmake; - sha256 = "1cylrw00n2nkc2c49xk9j3rrza351rpravxgpw047vimcw0sk93s"; + rev = "a277dc4e55ded3e3ea27dab1e4faf98c112442df"; + sha256 = "1yh5a8l4ship36hwmgmp2kl72s5ac9r8ly1qcs650xv2g9q7yhnq"; }; in stdenv.mkDerivation rec { name = "arrow-cpp-${version}"; - version = "0.13.0"; + version = "0.14.1"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "06irh5zx6lc7jjf6hpz1vzk0pvbdx08lcirc8cp8ksb8j7fpfamc"; + sha256 = "0a0xrsbr7dd1yp34yw82jw7psfkfvm935jhd5mam32vrsjvdsj4r"; }; sourceRoot = "apache-arrow-${version}/cpp"; + ARROW_JEMALLOC_URL = fetchurl { + # From + # ./cpp/cmake_modules/ThirdpartyToolchain.cmake + # ./cpp/thirdparty/versions.txt + url = "https://github.com/jemalloc/jemalloc/releases/download/5.2.0/jemalloc-5.2.0.tar.bz2"; + sha256 = "1d73a5c5qdrwck0fa5pxz0myizaf3s9alsvhiqwrjahdlr29zgkl"; + }; + patches = [ # patch to fix python-test ./darwin.patch @@ -42,8 +43,6 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace cmake_modules/FindLz4.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY - cp ${Finduriparser_cmake} cmake_modules/Finduriparser.cmake - patchShebangs build-support/ # Fix build for ARROW_USE_SIMD=OFF @@ -64,7 +63,7 @@ stdenv.mkDerivation rec { PARQUET_TEST_DATA = if doInstallCheck then "${parquet-testing}/data" else null; installCheckInputs = [ perl which ]; installCheckPhase = (stdenv.lib.optionalString stdenv.isDarwin '' - for f in release/*-test; do + for f in release/*test; do install_name_tool -add_rpath "$out"/lib "$f" done '') + '' diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 15744744067..4a1ea394207 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "actor-framework-${version}"; - version = "0.16.3"; + version = "0.17.0"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = "${version}"; - sha256 = "0nqw1cv7wxbcn2qwm08qffb6k4n3kgvdiaphks5gjgm305jk4vnx"; + sha256 = "10dcpmdsfq6r7hpvg413pqi1q3rjvgn7f87c17ghyz30x6rjhaic"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix index a37ebe7c5e0..77e26f6b5dc 100644 --- a/pkgs/development/libraries/fcppt/default.nix +++ b/pkgs/development/libraries/fcppt/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, boost, brigand, catch2 }: stdenv.mkDerivation rec { - name = "fcppt-${version}"; - version = "3.0.0"; + pname = "fcppt"; + version = "3.2.2"; src = fetchFromGitHub { owner = "freundlich"; repo = "fcppt"; rev = version; - sha256 = "0l78fjhy9nl3afrf0da9da4wzp1sx3kcyc2j6b71i60kvk44v4in"; + sha256 = "09mah52m3lih2n0swpsh8qb72yzl4nixaq99xp7wxyxxprhf4bpa"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 3431943155e..8fd2ce70498 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -6,12 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "4.1.4"; - sha256 = "01w44ygm5bvc243hlhfnvb2lxfb0blz2cxnphxqgw30vj3c1prx7"; - patches = [(fetchpatch { # remove on update - name = "fix-hardcoded-tables.diff"; - url = "http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/c8232e50074f"; - sha256 = "0jlksks4fjajby8fjk7rfp414gxfdgd6q9khq26i52xvf4kg2dw6"; - })]; + branch = "4.2"; + sha256 = "1f3glany3p2j832a9wia5vj8ds9xpm0xxlyia91y17hy85gxwsrh"; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; }) diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index fca567d683d..fa99dbe1d9f 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, cmake, vtk }: +{ stdenv, fetchurl, cmake, vtk, darwin }: stdenv.mkDerivation rec { - version = "3.0.0"; + version = "3.0.1"; name = "gdcm-${version}"; src = fetchurl { url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; - sha256 = "1rhblnl0q4bl3hmanz4ckv5kzdrzdiqp9xlcqh8df3rfrgk4d81x"; + sha256 = "1n206rr28f9ysd5yns6hc6vxwhwj1ck59p2j1wqyclm60zr84isq"; }; dontUseCmakeBuildDir = true; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - buildInputs = [ cmake vtk ]; + buildInputs = [ cmake vtk ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices darwin.apple_sdk.frameworks.Cocoa ]; propagatedBuildInputs = [ ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix index 60778df663a..d12b8a7c11d 100644 --- a/pkgs/development/libraries/glbinding/default.nix +++ b/pkgs/development/libraries/glbinding/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "glbinding"; - version = "3.0.2"; + version = "3.1.0"; src = fetchFromGitHub { owner = "cginternals"; repo = pname; rev = "v${version}"; - sha256 = "1lvcps0n0p8gg0p2bkm5aq4b4kv8bvxlaaf4fcham2pgbgzil9d4"; + sha256 = "1avd7ssms11xx7h0cm8h4pfpk55f07f1j1ybykxfgsym2chb2z08"; }; buildInputs = [ cmake libGLU xlibsWrapper ]; diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 44339c3dfed..bc10c9f9bdd 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libunwind }: stdenv.mkDerivation rec { - name = "gperftools-2.6.3"; + name = "gperftools-2.7"; src = fetchurl { url = "https://github.com/gperftools/gperftools/releases/download/${name}/${name}.tar.gz"; - sha256 = "17zfivp6n00rlqbrx6q6h71y2f815nvlzysff1ihgk4mxpv2yjri"; + sha256 = "1jb30zxmw7h9qxa8yi76rfxj4ssk60rv8n9y41m6pzqfk9lwis0y"; }; buildInputs = stdenv.lib.optional stdenv.isLinux libunwind; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 37d648bdf76..1212d3817d4 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "intel-gmmlib-${version}"; - version = "19.2.1"; + version = "19.2.3"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = name; - sha256 = "174bpkmr20ng9h9xf9fy85lj3pw6ysmbhcvhjfmj30xg3hs2ar3k"; + sha256 = "0hki53czv1na7h5b06fcwkd8bhn690ywg6dwjfs3x9fa4g48kqjb"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 6e393ba02ce..a459bd82755 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }: +{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk, darwin }: stdenv.mkDerivation rec { - name = "itk-4.13.2"; + name = "itk-5.0.0"; src = fetchurl { - url = mirror://sourceforge/itk/InsightToolkit-4.13.2.tar.xz; - sha256 = "19cgfpd63gqrvc3m27m394gy2d7w79g5y6lvznb5qqr49lihbgns"; + url = mirror://sourceforge/itk/InsightToolkit-5.0.0.tar.xz; + sha256 = "0bs63mk4q8jmx38f031jy5w5n9yy5ng9x8ijwinvjyvas8cichqi"; }; cmakeFlags = [ @@ -21,13 +21,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ cmake xz ]; - buildInputs = [ libX11 libuuid vtk ]; + buildInputs = [ libX11 libuuid vtk ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; meta = { description = "Insight Segmentation and Registration Toolkit"; homepage = http://www.itk.org/; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/libetpan/default.nix b/pkgs/development/libraries/libetpan/default.nix index b09c2dd0f47..6756a8dbc56 100644 --- a/pkgs/development/libraries/libetpan/default.nix +++ b/pkgs/development/libraries/libetpan/default.nix @@ -1,17 +1,24 @@ -{ autoconf, automake, fetchgit, libtool, stdenv, openssl }: +{ stdenv, fetchFromGitHub +, autoconf +, automake +, libtool +, openssl +}: -let version = "1.8"; in +stdenv.mkDerivation rec { + pname = "libetpan"; + version = "1.9.3"; -stdenv.mkDerivation { - name = "libetpan-${version}"; - - src = fetchgit { - url = "git://github.com/dinhviethoa/libetpan"; - rev = "refs/tags/" + version; - sha256 = "09xqy1n18qn63x7idfrpwm59lfkvb1p5vxkyksywvy4f6mn4pyxk"; + src = fetchFromGitHub { + owner = "dinhviethoa"; + repo = "libetpan"; + rev = version; + sha256 = "19g4qskg71jv7sxfxsdkjmrxk9mk5kf9b6fhw06g6wvm3205n95f"; }; - buildInputs = [ autoconf automake libtool openssl ]; + nativeBuildInputs = [ libtool autoconf automake ]; + + buildInputs = [ openssl ]; configureScript = "./autogen.sh"; diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 2a87994db5e..a8384de5552 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.17.1"; + version = "0.18.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1cnkcl9vif5lz1yx813qrphlpc6gvmzxdmkbd17kh5jqiqdi9vyk"; + sha256 = "0g4zbyvnxs4db3l5pqazyk42ahvwdqfz2222dbkl8zygblxncyjp"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index 83a500c1380..6464e4e5820 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { preConfigure = "NOCONFIGURE=1 ./autogen.sh"; configureFlags = [ - "--disable-static" "--disable-openssl" "--without-cython" ]; diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix new file mode 100644 index 00000000000..32a2971b3e3 --- /dev/null +++ b/pkgs/development/libraries/libirecovery/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig +, libusb +, readline +}: + +stdenv.mkDerivation rec { + pname = "libirecovery"; + version = "2019-01-28"; + + src = fetchFromGitHub { + owner = "libimobiledevice"; + repo = pname; + rev = "5da2a0d7d60f79d93c283964888c6fbbc17be1a3"; + sha256 = "0fqmr1h4b3qn608dn606y7aqv3bsm949gx72b5d6433xlw9b23n8"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + autoconf + automake + libtool + pkgconfig + ]; + + buildInputs = [ + libusb + readline + ]; + + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; + + # Packager note: Not clear whether this needs a NixOS configuration, + # as only the `idevicerestore` binary was tested so far (which worked + # without further configuration). + configureFlags = [ + "--with-udevrulesdir=${placeholder ''out''}/lib/udev/rules.d" + ''--with-udevrule="OWNER=\"root\", GROUP=\"myusergroup\", MODE=\"0660\""'' + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/libimobiledevice/libirecovery; + description = "Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux"; + longDescription = '' + libirecovery is a cross-platform library which implements communication to + iBoot/iBSS found on Apple's iOS devices via USB. A command-line utility is also + provided. + ''; + license = licenses.lgpl21; + # Upstream description says it works on more platforms, but packager hasn't tried that yet + platforms = platforms.linux; + maintainers = with maintainers; [ nh2 ]; + }; +} diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index b7d90100837..767485a7515 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake , darwin }: -let version = "1.0.9"; in +let version = "1.1.0"; in stdenv.mkDerivation rec { name = "liblastfm-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/lastfm/liblastfm/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "09qiaxsxw6g2m7mvkffpfsi5wis8nl1x4lgnk0sa30859z54iw53"; + sha256 = "1j34xc30vg7sfszm2jx9mlz9hy7p1l929fka9wnfcpbib8gfi43x"; }; prefixKey = "--prefix "; diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix index 313780a9f0f..9870e024687 100644 --- a/pkgs/development/libraries/liblcf/default.nix +++ b/pkgs/development/libraries/liblcf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "liblcf-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "EasyRPG"; repo = "liblcf"; rev = version; - sha256 = "1nhwwb32c3x0y82s0w93k0xz8h6xsd0sb4r1a0my8fd8p5rsnwbi"; + sha256 = "18kx9h004bncyi0hbj6vrc7f4k8l1rwp96cwncv3xm0lwspj0vyl"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/liblockfile/default.nix b/pkgs/development/libraries/liblockfile/default.nix index 46ea9fe6ee5..aba751bae5c 100644 --- a/pkgs/development/libraries/liblockfile/default.nix +++ b/pkgs/development/libraries/liblockfile/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { _name = "liblockfile"; - version = "1.14"; + version = "1.15"; name = "${_name}-${version}"; src = fetchurl { url = "mirror://debian/pool/main/libl/${_name}/${_name}_${version}.orig.tar.gz"; - sha256 = "0q6hn78fnzr6lhisg85a948rmpsd9rx67skzx3vh9hnbx2ix8h5b"; + sha256 = "04ml9isvdl72fbr1825x7jb680xp8aprdq4pag32ahyjqk909cmh"; }; preConfigure = '' diff --git a/pkgs/development/libraries/libmodule/default.nix b/pkgs/development/libraries/libmodule/default.nix new file mode 100644 index 00000000000..bcd20c3b407 --- /dev/null +++ b/pkgs/development/libraries/libmodule/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub +, cmake, pkgconfig }: + +stdenv.mkDerivation rec { + pname = "libmodule"; + version = "4.2.0"; + + src = fetchFromGitHub { + owner = "FedeDP"; + repo = "libmodule"; + rev = version; + sha256 = "1qn54pysdm0q7v1gnisd43i5i4ylf8s8an77jk6jd8qimysv08mx"; + }; + + nativeBuildInputs = [ + cmake + pkgconfig + ]; + + meta = with stdenv.lib; { + description = "C simple and elegant implementation of an actor library"; + homepage = https://github.com/FedeDP/libmodule; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ + eadwu + ]; + }; +} diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix index 26694eb3777..bf516b33d02 100644 --- a/pkgs/development/libraries/libpinyin/default.nix +++ b/pkgs/development/libraries/libpinyin/default.nix @@ -1,31 +1,36 @@ -{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, glib, db, pkgconfig }: +{ stdenv, fetchurl, fetchFromGitHub +, autoreconfHook +, glib +, db +, pkgconfig +}: let modelData = fetchurl { - url = "mirror://sourceforge/libpinyin/models/model14.text.tar.gz"; - sha256 = "0qqk30nflj07zjhs231c95ln4yj4ipzwxxiwrxazrg4hb8bhypqq"; + url = "mirror://sourceforge/libpinyin/models/model17.text.tar.gz"; + sha256 = "1kb2nswpsqlk2qm5jr7vqcp97f2dx7nvpk24lxjs1g12n252f5z0"; }; in stdenv.mkDerivation rec { name = "libpinyin-${version}"; - version = "2.1.91"; - - nativeBuildInputs = [ autoreconfHook glib db pkgconfig ]; - - postUnpack = '' - tar -xzf ${modelData} -C $sourceRoot/data - ''; + version = "2.3.0"; src = fetchFromGitHub { owner = "libpinyin"; repo = "libpinyin"; rev = version; - sha256 = "0jbvn65p3zh0573hh27aasd3qly5anyfi8jnps2dxi0my09wbrq3"; + sha256 = "14fkpp16s5k0pbw5wwd24pqr0qbdjgbl90n9aqwx72m03n7an40l"; }; + postUnpack = '' + tar -xzf ${modelData} -C $sourceRoot/data + ''; + + nativeBuildInputs = [ autoreconfHook glib db pkgconfig ]; + meta = with stdenv.lib; { description = "Library for intelligent sentence-based Chinese pinyin input method"; - homepage = https://sourceforge.net/projects/libpinyin; + homepage = "https://sourceforge.net/projects/libpinyin"; license = licenses.gpl2; maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index db8dfcf2eec..392c5052e07 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "librealsense-${version}"; - version = "2.21.0"; + version = "2.23.0"; src = fetchFromGitHub { owner = "IntelRealSense"; repo = "librealsense"; rev = "v${version}"; - sha256 = "0fg4js390gj9lhyh9hmr7k3lhg5q1r47skyvziv9dmbj9dqm1ll7"; + sha256 = "055fvfmkfi71bk7yxa527awq5qrq4dni5xhlaldhak2vlis8glwk"; }; buildInputs = [ diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 82a71be5210..bcc3e16dae8 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -1,19 +1,28 @@ -{ stdenv, fetchurl, pkgconfig, gnutls, zlib }: +{ stdenv, fetchFromGitHub +, autoreconfHook +, gnutls +, openssl +, pkgconfig +, zlib +}: stdenv.mkDerivation rec { - name = "librelp-1.3.0"; + pname = "librelp"; + version = "1.4.0"; - src = fetchurl { - url = "http://download.rsyslog.com/librelp/${name}.tar.gz"; - sha256 = "1xg99ndn65984mrh30qvys5npc73ag4348whshghrcj9azya494z"; + src = fetchFromGitHub { + owner = "rsyslog"; + repo = "librelp"; + rev = "v${version}"; + sha256 = "1q0k8zm7p6wpkri419kkpz734lp1hnxfqx1aa3xys4pj7zgx9jck"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gnutls zlib ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ gnutls zlib openssl ]; meta = with stdenv.lib; { - homepage = https://www.librelp.com/; description = "A reliable logging library"; + homepage = "https://www.librelp.com/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libsystemtap/default.nix b/pkgs/development/libraries/libsystemtap/default.nix new file mode 100644 index 00000000000..ecfa3377c99 --- /dev/null +++ b/pkgs/development/libraries/libsystemtap/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchgit, gettext, python, elfutils}: + +stdenv.mkDerivation { + pname = "libsystemtap"; + version = "3.2"; + + src = fetchgit { + url = git://sourceware.org/git/systemtap.git; + rev = "4051c70c9318c837981384cbb23f3e9eb1bd0892"; + sha256 = "0sd8n3j3rishks3gyqj2jyqhps7hmlfjyz8i0w8v98cczhhh04rq"; + fetchSubmodules = false; + }; + + dontBuild = true; + + nativeBuildInputs = [ gettext python elfutils ]; + + installPhase = '' + mkdir -p $out/include + cp -r includes/* $out/include/ + ''; + + meta = with stdenv.lib; { + description = "Statically defined probes development files"; + homepage = "https://sourceware.org/systemtap/"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = [ stdenv.lib.maintainers.farlion ]; + }; +} diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix index 0ace54582eb..3c7ed207703 100644 --- a/pkgs/development/libraries/libversion/default.nix +++ b/pkgs/development/libraries/libversion/default.nix @@ -1,10 +1,8 @@ { stdenv, fetchFromGitHub, cmake }: -let - version = "2.8.1"; -in -stdenv.mkDerivation { - name = "libversion-${version}"; +stdenv.mkDerivation rec { + pname = "libversion"; + version = "2.9.0"; src = fetchFromGitHub { owner = "repology"; diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 9c35d337350..29692c41c93 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -1,31 +1,78 @@ -{ stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool, gobject-introspection, gnome3 }: +{ stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkgconfig +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_412 +, libX11 +, glib +, gtk3 +, pango +, cairo +, libXres +, libstartup_notification +, gettext +, gobject-introspection +, gnome3 +}: -let +stdenv.mkDerivation rec{ pname = "libwnck"; - version = "3.30.0"; -in stdenv.mkDerivation rec{ - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0f9lvhm3w25046dqq8xyg7nzggxpmdriwrb661nng05a8qk0svdc"; - }; + version = "3.32.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - configureFlags = [ "--enable-introspection" ]; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1jp3p1lnwnwi6fxl2rz3166cmwzwy9vqz896anpwc3wdy9f875cm"; + }; - nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; - propagatedBuildInputs = [ libX11 gtk3 ]; + patches = [ + # https://gitlab.gnome.org/GNOME/libwnck/issues/139 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/libwnck/commit/0d9ff7db63af568feef8e8c566e249058ccfcb4e.patch; + sha256 = "18f78aayq9jma54v2qz3rm2clmz1cfq5bngxw8p4zba7hplyqsl9"; + }) + # https://gitlab.gnome.org/GNOME/libwnck/merge_requests/12 + ./fix-pc-file.patch + ]; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + nativeBuildInputs = [ + meson + ninja + pkgconfig + gettext + gobject-introspection + gtk-doc + docbook_xsl + docbook_xml_dtd_412 + ]; + + buildInputs = [ + libX11 + libstartup_notification + pango + cairo + libXres + ]; + + propagatedBuildInputs = [ + glib + gtk3 + ]; + + mesonFlags = [ + "-Dgtk_doc=true" + ]; passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "${pname}${stdenv.lib.versions.major version}"; }; }; diff --git a/pkgs/development/libraries/libwnck/fix-pc-file.patch b/pkgs/development/libraries/libwnck/fix-pc-file.patch new file mode 100644 index 00000000000..42017a993b5 --- /dev/null +++ b/pkgs/development/libraries/libwnck/fix-pc-file.patch @@ -0,0 +1,24 @@ +diff --git a/meson.build b/meson.build +index 28799d8..047e523 100644 +--- a/meson.build ++++ b/meson.build +@@ -72,11 +72,15 @@ + pc_conf = configuration_data() + pc_conf.set('prefix', get_option('prefix')) + pc_conf.set('exec_prefix', '${prefix}') +-pc_conf.set('libdir', '${exec_prefix}/' + get_option('libdir')) +-pc_conf.set('includedir', '${prefix}/' + get_option('includedir')) +-pc_conf.set('STARTUP_NOTIFICATION_PACKAGE', STARTUP_NOTIFICATION_PACKAGE) ++pc_conf.set('libdir', '${exec_prefix}' / get_option('libdir')) ++pc_conf.set('includedir', '${prefix}' / get_option('includedir')) ++if conf.has('HAVE_' + STARTUP_NOTIFICATION_PACKAGE.to_upper().underscorify()) ++ pc_conf.set('STARTUP_NOTIFICATION_PACKAGE', STARTUP_NOTIFICATION_PACKAGE) ++endif + pc_conf.set('X11_PACKAGE', X11_PACKAGE) +-pc_conf.set('XRES_PACKAGE', XRES_PACKAGE) ++if conf.has('HAVE_' + XRES_PACKAGE.to_upper().underscorify()) ++ pc_conf.set('XRES_PACKAGE', XRES_PACKAGE) ++endif + pc_conf.set('VERSION', meson.project_version()) + + foreach pc: [PACKAGE_NAME, PACKAGE_NAME + '-uninstalled'] diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index bf5b7bb1d0d..268476e079d 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -3,14 +3,14 @@ # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD stdenv.mkDerivation rec { name = "live555-${version}"; - version = "2019.05.29"; + version = "2019.06.28"; src = fetchurl { # the upstream doesn't provide a stable URL urls = [ "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" "https://download.videolan.org/contrib/live555/live.${version}.tar.gz" ]; - sha256 = "08i63jr8ihn1xiq5z5n3yls3yz6li5sg0s454l56p5bcvbrw81my"; + sha256 = "0pn5zhid9z8dsmwkhp2lvy84j5ahjskq1a8srdhd06hvh2w8dh2r"; }; postPatch = '' diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index 83673022835..9f8f34e0a80 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "matio-1.5.16"; + name = "matio-1.5.17"; src = fetchurl { url = "mirror://sourceforge/matio/${name}.tar.gz"; - sha256 = "0i2g7jqbb4j8xlf1ly7gfpw5zyxmr245qf57v6w0jmwx4rfkvfj7"; + sha256 = "00644612zhn53j25vj50q73kmjcrsns2lnmy99y2kavhsckmaiay"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index b667dea8d49..91318c802d8 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2 }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2, ronn }: stdenv.mkDerivation rec { name = "nuspell-${version}"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "17khkb1sxn1p6rfql72l7a4lxafbxj0dwi95hsmyi6wajvfrg9sy"; + sha256 = "0n5cajrp1fhk8p54ch3akkd9nl8b9c6wwf25980dhagcdys3vab3"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ronn ]; buildInputs = [ boost icu ]; + outputs = [ "out" "lib" "dev" "man" ]; + enableParallelBuilding = true; postPatch = '' @@ -21,6 +23,10 @@ stdenv.mkDerivation rec { ln -sf ${catch2.src} external/Catch2 ''; + postInstall = '' + rm -rf $out/share/doc + ''; + meta = with stdenv.lib; { description = "Free and open source C++ spell checking library"; homepage = "https://nuspell.github.io/"; diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix index b1a52f8fca9..6a7fd78d514 100644 --- a/pkgs/development/libraries/orcania/default.nix +++ b/pkgs/development/libraries/orcania/default.nix @@ -1,17 +1,28 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, cmake, check, subunit }: stdenv.mkDerivation rec { pname = "orcania"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "11ihbfm7qbqf55wdi7azqx75ggd3l0n8ybyq2ikidffvmg13l4g9"; + sha256 = "1kq1cpayflh4xy442q6prrkalm8lcz2cxydrp1fv8ppq1cnq4zr7"; }; nativeBuildInputs = [ cmake ]; + checkInputs = [ check subunit ]; + + cmakeFlags = [ "-DBUILD_ORCANIA_TESTING=on" ]; + + doCheck = true; + + preCheck = '' + export LD_LIBRARY_PATH="$(pwd):$LD_LIBRARY_PATH" + export DYLD_FALLBACK_LIBRARY_PATH="$(pwd):$DYLD_FALLBACK_LIBRARY_PATH" + ''; + meta = with stdenv.lib; { description = "Potluck with different functions for different purposes that can be shared among C programs"; homepage = "https://github.com/babelouest/orcania"; diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix index 30b56afb8a9..d542c6cf1d7 100644 --- a/pkgs/development/libraries/physics/apfel/default.nix +++ b/pkgs/development/libraries/physics/apfel/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "apfel-${version}"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "scarrazza"; repo = "apfel"; rev = version; - sha256 = "13dvcc5ba6djflrcy5zf5ikaw8s78zd8ac6ickc0hxhbmx1gjb4j"; + sha256 = "13n5ygbqvskg3qq5n4sff1nbii0li0zf1vqissai7x0hynxgy7p6"; }; buildInputs = [ gfortran lhapdf python2 ]; diff --git a/pkgs/development/libraries/physics/hepmc/default.nix b/pkgs/development/libraries/physics/hepmc2/default.nix similarity index 70% rename from pkgs/development/libraries/physics/hepmc/default.nix rename to pkgs/development/libraries/physics/hepmc2/default.nix index b935a3d56ea..d61a68ebe34 100644 --- a/pkgs/development/libraries/physics/hepmc/default.nix +++ b/pkgs/development/libraries/physics/hepmc2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hepmc-${version}"; - version = "2.06.09"; + version = "2.06.10"; src = fetchurl { - url = "http://lcgapp.cern.ch/project/simu/HepMC/download/HepMC-${version}.tar.gz"; - sha256 = "020sc7hzy7d6d1i6bs352hdzy5zy5zxkc33cw0jhh8s0jz5281y6"; + url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC-${version}.tar.gz"; + sha256 = "190i9jlnwz1xpc495y0xc70s4zdqb9s2zdq1zkjy2ivl7ygdvpjs"; }; patches = [ ./in_source.patch ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "The HepMC package is an object oriented event record written in C++ for High Energy Physics Monte Carlo Generators"; license = stdenv.lib.licenses.gpl2; - homepage = http://lcgapp.cern.ch/project/simu/HepMC/; + homepage = http://hepmc.web.cern.ch/hepmc/; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/hepmc/in_source.patch b/pkgs/development/libraries/physics/hepmc2/in_source.patch similarity index 100% rename from pkgs/development/libraries/physics/hepmc/in_source.patch rename to pkgs/development/libraries/physics/hepmc2/in_source.patch diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 2e17e49dcdb..e6b351c206d 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, fastjet, hepmc, lhapdf, rsync, zlib }: +{ stdenv, fetchurl, boost, fastjet, hepmc2, lhapdf, rsync, zlib }: stdenv.mkDerivation rec { name = "pythia-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0y8w5gdaczg8vdw63rkgjr1dcvqs2clqkdia34p30xcwgm1jgv7q"; }; - buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ]; + buildInputs = [ boost fastjet hepmc2 zlib rsync lhapdf ]; preConfigure = '' patchShebangs ./configure @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" - "--with-hepmc2=${hepmc}" + "--with-hepmc2=${hepmc2}" "--with-lhapdf6=${lhapdf}" ]; diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index c8dae0c2b51..c068424e416 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fastjet, ghostscript, gsl, hepmc, imagemagick, less, python2, texlive, yoda, which, makeWrapper }: +{ stdenv, fetchurl, fastjet, ghostscript, gsl, hepmc2, imagemagick, less, python2, texlive, yoda, which, makeWrapper }: stdenv.mkDerivation rec { name = "rivet-${version}"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { xkeyval xstring ;}; - buildInputs = [ hepmc imagemagick python2 latex makeWrapper ]; + buildInputs = [ hepmc2 imagemagick python2 latex makeWrapper ]; propagatedBuildInputs = [ fastjet ghostscript gsl yoda ]; preConfigure = '' @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-fastjet=${fastjet}" - "--with-hepmc=${hepmc}" + "--with-hepmc=${hepmc2}" "--with-yoda=${yoda}" ]; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 046413c64f4..272761977ba 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, fastjet, gsl, hepmc, lhapdf, rivet, zlib }: +{ stdenv, fetchurl, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }: stdenv.mkDerivation rec { name = "thepeg-${version}"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1rmmwhk9abn9mc9j3127axjwpvymv21ld4wcivwz01pldkxh06n6"; }; - buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ]; + buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ]; configureFlags = [ - "--with-hepmc=${hepmc}" + "--with-hepmc=${hepmc2}" "--with-rivet=${rivet}" "--without-javagui" ]; diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix index 54a563c518f..3f6a609121a 100644 --- a/pkgs/development/libraries/png++/default.nix +++ b/pkgs/development/libraries/png++/default.nix @@ -5,11 +5,11 @@ assert docSupport -> doxygen != null; stdenv.mkDerivation rec { name = "pngpp-${version}"; - version = "0.2.9"; + version = "0.2.10"; src = fetchurl { url = "mirror://savannah/pngpp/png++-${version}.tar.gz"; - sha256 = "14c74fsc3q8iawf60m74xkkawkqbhd8k8x315m06qaqjcl2nmg5b"; + sha256 = "1qgf8j25r57wjqlnzdkm8ya5x1bmj6xjvapv8f2visqnmcbg52lr"; }; doCheck = true; diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix index aa17771ec9f..b4571d07fbf 100644 --- a/pkgs/development/libraries/ptex/default.nix +++ b/pkgs/development/libraries/ptex/default.nix @@ -1,36 +1,27 @@ -{ stdenv, fetchFromGitHub, zlib, python, cmake }: +{ stdenv, fetchFromGitHub, zlib, python, cmake, pkg-config }: stdenv.mkDerivation rec { - name = "ptex-${version}"; - version = "2.3.0"; + pname = "ptex"; + version = "2.3.2"; src = fetchFromGitHub { owner = "wdas"; repo = "ptex"; rev = "v${version}"; - sha256 = "0nfz0y66bmi6xckn1whi4sfd8i3ibln212fgm4img2z98b6vccyg"; + sha256 = "1c3pdqszn4y3d86qzng8b0hqdrchnl39adq5ab30wfnrgl2hnm4z"; }; outputs = [ "bin" "dev" "out" "lib" ]; - buildInputs = [ zlib python cmake ]; + buildInputs = [ zlib python cmake pkg-config ]; enableParallelBuilding = true; - buildPhase = '' - mkdir -p $out - - make prefix=$out - - mkdir -p $bin/bin - mkdir -p $dev/include - mkdir -p $lib/lib - ''; - - installPhase = '' - make install - mv $out/bin $bin/ + # Can be removed in the next release + # https://github.com/wdas/ptex/pull/42 + patchPhase = '' + echo v${version} >version ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index c315cb8f72b..b2173ec21ee 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { preConfigure = stdenv.lib.optionalString stdenv.isAarch32 '' configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9") + '' + stdenv.lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' + configureFlagsArray+=("ac_cv_check_sjlj=ssjlj") ''; meta = with stdenv.lib; { @@ -17,6 +19,5 @@ stdenv.mkDerivation rec { homepage = https://www.gnu.org/software/pth; license = licenses.lgpl21Plus; platforms = platforms.all; - broken = stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index 1fb3a415dc6..94c69a4a14b 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gtk3, qtbase, qmake }: +{ mkDerivation, lib, fetchFromGitHub, pkgconfig, gtk3, qtbase, qmake }: -stdenv.mkDerivation rec { - name = "qgnomeplatform-${version}"; +mkDerivation rec { + pname = "qgnomeplatform"; version = "0.5"; src = fetchFromGitHub { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "QPlatformTheme for a better Qt application inclusion in GNOME"; homepage = https://github.com/FedoraQt/QGnomePlatform; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 8506a80ddf3..8250e42a1b6 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -146,6 +146,11 @@ stdenv.mkDerivation { sed -i mkspecs/common/linux.conf \ -e "/^QMAKE_INCDIR_OPENGL/ s|$|${libGL.dev or libGL}/include|" \ -e "/^QMAKE_LIBDIR_OPENGL/ s|$|${libGL.out}/lib|" + '' + + lib.optionalString (stdenv.hostPlatform.isx86_32 && stdenv.cc.isGNU) + '' + sed -i mkspecs/common/gcc-base-unix.conf \ + -e "/^QMAKE_LFLAGS_SHLIB/ s/-shared/-shared -static-libgcc/" '' ); diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index 080cab86ca4..fd9285ebf79 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -1,89 +1,74 @@ { stdenv -, fetchurl -, fetchpatch +, fetchFromGitLab , makeWrapper +, which +, autoconf +, help2man +, file +, pari }: stdenv.mkDerivation rec { - version = "1.018.1"; + version = "2.023.4"; name = "sympow-${version}"; - src = fetchurl { - # Original website no longer reachable - url = "mirror://sageupstream/sympow/sympow-${version}.tar.bz2"; - sha256 = "0hphs7ia1wr5mydf288zvwj4svrymfpadcg3pi6w80km2yg5bm3c"; + src = fetchFromGitLab { + group = "rezozer"; + owner = "forks"; + repo = "sympow"; + rev = "v${version}"; + sha256 = "0j2qdw9csbr081h8arhlx1z7ibgi5am4ndmvyc8y4hccfa8n4w1y"; }; + postUnpack = '' + patchShebangs . + ''; + nativeBuildInputs = [ makeWrapper + which + autoconf + help2man + file + pari ]; configurePhase = '' runHook preConfigure + export PREFIX="$out" + export VARPREFIX="$out" # see comment on postInstall ./Configure # doesn't take any options runHook postConfigure ''; - installPhase = '' - runHook preInstall - install -D datafiles/* --target-directory "$out/share/sympow/datafiles/" - install *.gp "$out/share/sympow/" - install -Dm755 sympow "$out/share/sympow/sympow" - install -D new_data "$out/bin/new_data" - - makeWrapper "$out/share/sympow/sympow" "$out/bin/sympow" \ - --run 'export SYMPOW_LOCAL="$HOME/.local/share/sympow"' \ - --run 'if [ ! -d "$SYMPOW_LOCAL" ]; then - mkdir -p "$SYMPOW_LOCAL" - cp -r ${placeholder "out"}/share/sympow/* "$SYMPOW_LOCAL" - chmod -R +xw "$SYMPOW_LOCAL" - fi' \ - --run 'cd "$SYMPOW_LOCAL"' - runHook postInstall + # Usually, sympow has 3 levels of caching: statically distributed in /usr/, + # shared in /var and per-user in ~/.sympow. The shared cache assumes trust in + # other users and a shared /var is not compatible with nix's approach, so we + # set VARPREFIX to the read-only $out. This effectively disables shared + # caching. See https://trac.sagemath.org/ticket/3360#comment:36 and sympow's + # README for more details on caching. + # sympow will complain at runtime about the lack of write-permissions on the + # shared cache. We pass the `-quiet` flag by default to disable this. + postInstall = '' + wrapProgram "$out/bin/sympow" --add-flags '-quiet' ''; - patches = [ - # don't hardcode paths - (fetchpatch { - name = "do_not_hardcode_paths.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympow/patches/Configure.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "1611p8ra8zkxvmxn3gm2l64bd4ma4m6r4vd6vwswcic91k1fci04"; - }) - - # bug on some platforms in combination with a newer gcc: - # https://trac.sagemath.org/ticket/11920 - (fetchpatch { - name = "fix_newer_gcc1.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympow/patches/fpu.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "14gfa56w3ddfmd4d5ir9a40y2zi43cj1i4d2l2ij9l0qlqdy9jyx"; - }) - (fetchpatch { - name = "fix_newer_gcc2.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympow/patches/execlp.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "190gqhgz9wgw4lqwz0nwb1izc9zffx34bazsiw2a2sz94bmgb54v"; - }) - - # fix pointer initialization bug (https://trac.sagemath.org/ticket/22862) - (fetchpatch { - name = "fix_pointer_initialization1.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympow/patches/initialize-tacks.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "02341vdbbidfs39s26vi4n5wigz619sw8fdbl0h9qsmwwhscgf85"; - }) - (fetchpatch { - name = "fix_pointer_initialization2.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sympow-datafiles.patch?h=packages/sympow&id=5088e641a45b23d0385d8e63be65315129b4cf58"; - sha256 = "1m0vz048layb47r1jjf7fplw650ccc9x0w3l322iqmppzmv3022a"; - }) - ]; + # Example from the README as a sanity check. + doInstallCheck = true; + installCheckPhase = '' + export HOME="$TMP/home" + mkdir -p "$HOME" + "$out/bin/sympow" -sp 2p16 -curve "[1,2,3,4,5]" | grep '8.3705' + ''; meta = with stdenv.lib; { - description = "A package to compute special values of symmetric power elliptic curve L-functions"; + description = "Compute special values of symmetric power elliptic curve L-functions"; license = { shortName = "sympow"; fullName = "Custom, BSD-like. See COPYING file."; free = true; }; maintainers = with maintainers; [ timokau ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/thrift/0.10.nix b/pkgs/development/libraries/thrift/0.10.nix new file mode 100644 index 00000000000..d626673a227 --- /dev/null +++ b/pkgs/development/libraries/thrift/0.10.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkgconfig, bison +, flex, twisted +}: + +stdenv.mkDerivation rec { + pname = "thrift"; + version = "0.10.0"; + + src = fetchurl { + url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz"; + sha256 = "02x1xw0l669idkn6xww39j60kqxzcbmim4mvpb5h9nz8wqnx1292"; + }; + + #enableParallelBuilding = true; problems on hydra + + # Workaround to make the python wrapper not drop this package: + # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } + pythonPath = []; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + boost zlib libevent openssl python bison flex twisted + ]; + + preConfigure = "export PY_PREFIX=$out"; + + # TODO: package boost-test, so we can run the test suite. (Currently it fails + # to find libboost_unit_test_framework.a.) + configureFlags = [ "--enable-tests=no" ]; + doCheck = false; + + meta = with stdenv.lib; { + description = "Library for scalable cross-language services"; + homepage = "http://thrift.apache.org/"; + license = licenses.asl20; + platforms = platforms.linux ++ platforms.darwin; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index bd9fb796247..8a79dab45b2 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "uid_wrapper-1.2.4"; + name = "uid_wrapper-1.2.7"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "1yjhrm3rcyiykkrgpifmig117mzjxrms75kp8gpp8022f59zcq1w"; + sha256 = "0mpzr70n24b0khri89hipxiqqay370m93syhnywrdmdxr3dhw2d8"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index adfce3ea50b..8af33c10319 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -59,6 +59,16 @@ stdenv.mkDerivation rec { name = "CVE-2018-19841.patch"; sha256 = "08gx5xx51bi86cqqy7cv1d25k669a7wnkksasjspphwkpwkcxymy"; }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/f68a9555b548306c5b1ee45199ccdc4a16a6101b.patch"; + name = "CVE-2019-1010317.patch"; + sha256 = "0v748nd9408v6ah37cn8wr0k0m0ny1g884q8q92j1dhwad69kfid"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/33a0025d1d63ccd05d9dbaa6923d52b1446a62fe.patch"; + name = "CVE-2019-1010319.patch"; + sha256 = "011sqdgpykilaj2c4ns298z7aad03yprpva0dqr39nx88ji6jnrb"; + }) ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index e7feaabc739..549e492e944 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wolfssl-${version}"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "155lmgz81ky0x04c8m2yzlsm58i9jk6hiw1ajc3wizvbpczbca57"; + sha256 = "16d1dzbdx6x7czbxf6i1rlb5mv59yzzpnha7qgwab3yq62rlsgw3"; }; configureFlags = [ "--enable-all" ]; diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/development/libraries/yder/default.nix index ffa326ccc53..82d2d20cb3e 100644 --- a/pkgs/development/libraries/yder/default.nix +++ b/pkgs/development/libraries/yder/default.nix @@ -4,28 +4,19 @@ assert withSystemd -> systemd != null; stdenv.mkDerivation rec { pname = "yder"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "0j46v93vn130gjcr704rkdiibbk3ampzsqb6xdcrn4x115gwyf5i"; + sha256 = "19ghiwpi972wjqvlgg576nk2nkf1ii5l1kvzb056496xfmlysrwa"; }; patches = [ # We set CMAKE_INSTALL_LIBDIR to the absolute path in $out, so # prefix and exec_prefix cannot be $out, too ./fix-pkgconfig.patch - - # - ORCANIA_LIBRARIES must be set before target_link_libraries is called - # - librt is not available, nor needed on Darwin - # - The test binary is not linked against all necessary libraries - # - Test for journald logging is not systemd specific and fails on darwin - # - If the working directory is different from the build directory, the - # dynamic linker can't find libyder - # - Return correct error code from y_init_logs when journald is disabled - ./fix-darwin.patch ]; nativeBuildInputs = [ cmake ]; @@ -42,6 +33,7 @@ stdenv.mkDerivation rec { preCheck = '' export LD_LIBRARY_PATH="$(pwd):$LD_LIBRARY_PATH" + export DYLD_FALLBACK_LIBRARY_PATH="$(pwd):$DYLD_FALLBACK_LIBRARY_PATH" ''; meta = with lib; { diff --git a/pkgs/development/libraries/yder/fix-darwin.patch b/pkgs/development/libraries/yder/fix-darwin.patch deleted file mode 100644 index dedde22d927..00000000000 --- a/pkgs/development/libraries/yder/fix-darwin.patch +++ /dev/null @@ -1,159 +0,0 @@ -diff --git i/CMakeLists.txt w/CMakeLists.txt -index 036ab73..0bab8c7 100644 ---- i/CMakeLists.txt -+++ w/CMakeLists.txt -@@ -87,33 +87,6 @@ else() - set(DISABLE_JOURNALD ON) - endif () - --# shared library -- --add_library(yder SHARED ${LIB_SRC}) --if (NOT MSVC) -- set_target_properties(yder PROPERTIES -- COMPILE_OPTIONS -Wextra -- PUBLIC_HEADER "${INC_DIR}/yder.h;${PROJECT_BINARY_DIR}/yder-cfg.h" -- VERSION "${LIBRARY_VERSION}" -- SOVERSION "${LIBRARY_SOVERSION}") --endif() --if (WIN32) -- set_target_properties(yder PROPERTIES SUFFIX "-${LIBRARY_VERSION_MAJOR}.dll") --endif () -- --target_link_libraries(yder ${LIBS} ${ORCANIA_LIBRARIES} ${SYSTEMD_LIBRARIES}) -- --# static library -- --option(BUILD_STATIC "Build static library." OFF) -- --if (BUILD_STATIC) -- add_library(yder_static STATIC ${LIB_SRC}) -- target_compile_definitions(yder_static PUBLIC -DO_STATIC_LIBRARY) -- set_target_properties(yder_static PROPERTIES -- OUTPUT_NAME yder) --endif () -- - option (SEARCH_ORCANIA "Search for Orcania library" ON) - if (SEARCH_ORCANIA) - set(Orcania_FIND_QUIETLY ON) # force to find Orcania quietly -@@ -145,6 +118,33 @@ else () - set(PKGCONF_REQ_PRIVATE "liborcania") - endif () - -+# shared library -+ -+add_library(yder SHARED ${LIB_SRC}) -+if (NOT MSVC) -+ set_target_properties(yder PROPERTIES -+ COMPILE_OPTIONS -Wextra -+ PUBLIC_HEADER "${INC_DIR}/yder.h;${PROJECT_BINARY_DIR}/yder-cfg.h" -+ VERSION "${LIBRARY_VERSION}" -+ SOVERSION "${LIBRARY_SOVERSION}") -+endif() -+if (WIN32) -+ set_target_properties(yder PROPERTIES SUFFIX "-${LIBRARY_VERSION_MAJOR}.dll") -+endif () -+ -+target_link_libraries(yder ${LIBS} ${ORCANIA_LIBRARIES} ${SYSTEMD_LIBRARIES}) -+ -+# static library -+ -+option(BUILD_STATIC "Build static library." OFF) -+ -+if (BUILD_STATIC) -+ add_library(yder_static STATIC ${LIB_SRC}) -+ target_compile_definitions(yder_static PUBLIC -DO_STATIC_LIBRARY) -+ set_target_properties(yder_static PROPERTIES -+ OUTPUT_NAME yder) -+endif () -+ - # build yder-cfg.h file - configure_file(${INC_DIR}/yder-cfg.h.in ${PROJECT_BINARY_DIR}/yder-cfg.h) - set (CMAKE_EXTRA_INCLUDE_FILES ${PROJECT_BINARY_DIR}) -@@ -168,10 +168,9 @@ if (BUILD_YDER_TESTING) - set(CMAKE_CTEST_COMMAND ctest -V) - - set(TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/test) -- set(LIBS yder ${LIBS} ${CHECK_LIBRARIES}) - if (NOT WIN32) - find_package(Threads REQUIRED) -- set(LIBS ${LIBS} ${SUBUNIT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m rt) -+ set(LIBS yder ${LIBS} ${SUBUNIT_LIBRARIES} ${ORCANIA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${CHECK_LIBRARIES} m) - endif () - - set(TESTS yder_test) -@@ -186,7 +185,6 @@ if (BUILD_YDER_TESTING) - target_include_directories(${t} PUBLIC ${TST_DIR}) - target_link_libraries(${t} PUBLIC ${LIBS}) - add_test(NAME ${t} -- WORKING_DIRECTORY ${TST_DIR} - COMMAND ${t}) - endforeach () - endif () -diff --git i/src/yder.c w/src/yder.c -index 3122e3f..79e4e70 100644 ---- i/src/yder.c -+++ w/src/yder.c -@@ -236,11 +236,12 @@ static int y_write_log(const char * app_name, - if (cur_mode & Y_LOG_MODE_SYSLOG) { - y_write_log_syslog(cur_app_name, level, message); - } -- #ifndef Y_DISABLE_JOURNALD -+#endif -+ -+#if !defined(_WIN32) && !defined(Y_DISABLE_JOURNALD) - if (cur_mode & Y_LOG_MODE_JOURNALD) { - y_write_log_journald(cur_app_name, level, message); - } -- #endif - #endif - if (cur_mode & Y_LOG_MODE_FILE) { - y_write_log_file(cur_app_name, now, cur_log_file, level, message); -@@ -266,18 +267,20 @@ static int y_write_log(const char * app_name, - */ - int y_init_logs(const char * app, const unsigned long init_mode, const unsigned long init_level, const char * init_log_file, const char * message) { - #ifdef _WIN32 -- if (init_mode & Y_LOG_MODE_SYSLOG) { -- perror("syslog mode not supported on your architecture"); -- return 0; -- } else if (init_mode & Y_LOG_MODE_JOURNALD) { -- perror("journald mode not supported on your architecture"); -- return 0; -- } else { -- return y_write_log(app, init_mode, init_level, init_log_file, NULL, NULL, Y_LOG_LEVEL_INFO, message); -- } --#else -- return y_write_log(app, init_mode, init_level, init_log_file, NULL, NULL, Y_LOG_LEVEL_INFO, message); -+ if (init_mode & Y_LOG_MODE_SYSLOG) { -+ perror("syslog mode not supported on your architecture"); -+ return 0; -+ } - #endif -+ -+#if defined(_WIN32) || defined(Y_DISABLE_JOURNALD) -+ if (init_mode & Y_LOG_MODE_JOURNALD) { -+ perror("journald mode not supported on your architecture"); -+ return 0; -+ } -+#endif -+ -+ return y_write_log(app, init_mode, init_level, init_log_file, NULL, NULL, Y_LOG_LEVEL_INFO, message); - } - - /** -diff --git i/test/yder_test.c w/test/yder_test.c -index a10fd9f..b73fb16 100644 ---- i/test/yder_test.c -+++ w/test/yder_test.c -@@ -27,7 +27,11 @@ START_TEST(test_yder_init) - y_close_logs(); - ck_assert_int_eq(y_init_logs("test_yder_syslog", Y_LOG_MODE_SYSLOG, Y_LOG_LEVEL_DEBUG, NULL, "third test"), 1); - y_close_logs(); -+#ifndef Y_DISABLE_JOURNALD - ck_assert_int_eq(y_init_logs("test_yder_journald", Y_LOG_MODE_JOURNALD, Y_LOG_LEVEL_DEBUG, NULL, "fourth test"), 1); -+#else -+ ck_assert_int_eq(y_init_logs("test_yder_journald", Y_LOG_MODE_JOURNALD, Y_LOG_LEVEL_DEBUG, NULL, "fourth test"), 0); -+#endif - y_close_logs(); - ck_assert_int_eq(y_init_logs("test_yder_file_fail", Y_LOG_MODE_FILE, Y_LOG_LEVEL_DEBUG, "/nope/nope", "second test"), 0); - } diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 7fb5be1c343..9f5af47c726 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -1,5 +1,20 @@ { stdenv , fetchurl +# Regarding static/shared libaries, the current behaviour is: +# +# - static=true, shared=true: builds both and moves .a to the .static output; +# in this case `pkg-config` auto detection will +# not work if the .static output is given as +# buildInputs to another package (#66461) +# - static=true, shared=false: builds .a only and leaves it in the main output +# - static=false, shared=true: builds shared only +# +# To get both `.a` and shared libraries in one output, +# you currently have to use +# static=false, shared=true +# and use +# .overrideAttrs (old: { dontDisableStatic = true; }) +# This is because by default, upstream zlib ./configure builds both. , static ? true , shared ? true }: @@ -68,6 +83,8 @@ stdenv.mkDerivation (rec { ] ++ stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ "-f" "win32/Makefile.gcc" ] ++ stdenv.lib.optionals shared [ + # Note that as of writing (zlib 1.2.11), this flag only has an effect + # for Windows as it is specific to `win32/Makefile.gcc`. "SHARED_MODE=1" ]; diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index 48bd3767742..ff0cb4aa3fe 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -1,28 +1,20 @@ -{ stdenv, fetchFromGitHub, ocaml, dune, cppo, findlib }: +{ stdenv, fetchFromGitHub, buildDunePackage, cppo }: -stdenv.mkDerivation rec { +buildDunePackage rec { pname = "camomile"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "yoriyuki"; repo = pname; rev = version; - sha256 = "1pfxr9kzkpd5bsdqrpxasfxkawwkg4cpx3m1h6203sxi7qv1z3fn"; + sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad"; }; - buildInputs = [ ocaml dune findlib cppo ]; + buildInputs = [ cppo ]; configurePhase = "ocaml configure.ml --share $out/share/camomile"; - # Use jbuilder executable because it breaks on dune>=1.10 - # https://github.com/yoriyuki/Camomile/commit/505202b58e22628f80bbe15ee76b9470a5bd2f57#r33816944 - buildPhase = '' - jbuilder build -p ${pname} - ''; - - inherit (dune) installPhase; - meta = { inherit (src.meta) homepage; maintainers = [ stdenv.lib.maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix index 38050bc09a1..23940ef1499 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "ocaml-migrate-parsetree"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = "v${version}"; - sha256 = "16kas19iwm4afijv3yxd250s08absabmdcb4yj57wc8r4fmzv5dm"; + sha256 = "0sv1p4615l8gpbah4ya2c40yr6fbvahvv3ks7zhrsgcwcq2ljyr2"; }; propagatedBuildInputs = [ ppx_derivers result ]; diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix index f4d1ef829bb..cf3cd3272a8 100644 --- a/pkgs/development/ocaml-modules/pgocaml/default.nix +++ b/pkgs/development/ocaml-modules/pgocaml/default.nix @@ -1,21 +1,26 @@ -{ stdenv, fetchurl, buildOcaml, ocaml, calendar, csv, re }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, camlp4 +, ppx_tools_versioned, result, rresult +, calendar, csv, hex, re +}: -if !stdenv.lib.versionAtLeast ocaml.version "4" +if !stdenv.lib.versionAtLeast ocaml.version "4.05" then throw "pgocaml is not available for OCaml ${ocaml.version}" else -buildOcaml { - name = "pgocaml"; - version = "2.3"; - src = fetchurl { - url = https://github.com/darioteixeira/pgocaml/archive/v2.3.tar.gz; - sha256 = "18lymxlvcf4nwxawkidq3pilsp5rhl0l8ifq6pjk3ssjlx9w53pg"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-pgocaml-${version}"; + version = "3.2"; + src = fetchFromGitHub { + owner = "darioteixeira"; + repo = "pgocaml"; + rev = "v${version}"; + sha256 = "0jxzr5niv8kdh90pr57b1qb500zkkasxb8b8l7w9cydcfprnlk24"; }; - buildInputs = [ ]; - propagatedBuildInputs = [ calendar csv re ]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ppx_tools_versioned result rresult ]; + propagatedBuildInputs = [ calendar csv hex re ]; - configureFlags = [ "--enable-p4" ]; + configureFlags = [ "--enable-p4" "--enable-ppx" ]; createFindlibDestdir = true; @@ -24,5 +29,6 @@ buildOcaml { homepage = http://pgocaml.forge.ocamlcore.org/; license = licenses.lgpl2; maintainers = with maintainers; [ vbgl ]; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index d93703c00c4..a2d19e9ee3c 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.11.1"; + version = "0.12.6"; src = fetchPypi { inherit pname version; - sha256 = "07m797jc5lpaj6m8469d67l2s43jf8w0mfhy0hfvbfs4mk0cjix0"; + sha256 = "0xvphwpa1n5q7kim4dw6fmsg9h5kkk7nd51bv9b36i3n4hilmq32"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 3689f85f225..c8574680c17 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { - version = "2.1.0"; + version = "2.2.0"; pname = "azure-mgmt-resource"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "aef8573066026db04ed3e7c5e727904e42f6462b6421c2e8a3646e4c4f8128be"; + sha256 = "173pxgly95dwblp4nj4l70zb0gasibgcjmcynxwa5282plynhgdw"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/boolean-py/default.nix b/pkgs/development/python-modules/boolean-py/default.nix new file mode 100644 index 00000000000..cf35243f2b0 --- /dev/null +++ b/pkgs/development/python-modules/boolean-py/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "boolean.py"; + version = "3.6"; + + src = fetchFromGitHub { + owner = "bastikr"; + repo = "boolean.py"; + rev = "v${version}"; + sha256 = "1wc89y73va58cj7dsx6c199zpxsy9q53dsffsdj6zmc90inqz6qs"; + }; + + meta = with lib; { + homepage = "https://github.com/bastikr/boolean.py"; + description = "Implements boolean algebra in one module"; + license = licenses.bsd2; + }; + +} diff --git a/pkgs/development/python-modules/click-default-group/default.nix b/pkgs/development/python-modules/click-default-group/default.nix index daf522fe653..eeee7370b7e 100644 --- a/pkgs/development/python-modules/click-default-group/default.nix +++ b/pkgs/development/python-modules/click-default-group/default.nix @@ -1,20 +1,20 @@ -{ lib, buildPythonPackage, fetchFromGitHub, click, pytest_3 }: +{ lib, buildPythonPackage, fetchFromGitHub, click, pytest }: buildPythonPackage rec { pname = "click-default-group"; - version = "1.2"; + version = "1.2.1"; # No tests in Pypi tarball src = fetchFromGitHub { owner = "click-contrib"; repo = "click-default-group"; rev = "v${version}"; - sha256 = "0lm2k4jvy4ilvv91niawklfnp5mp7wa8c1bicsqdfzrxmw7jliwp"; + sha256 = "1wdmabfpmzxpiww0slinvxm9xjyxql250dn1pvjijq675pxafiz4"; }; propagatedBuildInputs = [ click ]; - checkInputs = [ pytest_3 ]; + checkInputs = [ pytest ]; meta = with lib; { homepage = https://github.com/click-contrib/click-default-group; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index cd38c8f137c..ba8c06f73f2 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -1,7 +1,10 @@ { lib +, bokeh , buildPythonPackage , fetchPypi +, fsspec , pytest +, pythonOlder , cloudpickle , numpy , toolz @@ -12,15 +15,18 @@ buildPythonPackage rec { pname = "dask"; - version = "1.2.2"; + version = "2.2.0"; + + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "5e7876bae2a01b355d1969b73aeafa23310febd8c353163910b73e93dc7e492c"; + sha256 = "0wkiqkckwy7fv6m86cs3m3g6jdikkkw84ki9hiwp60xpk5xngnf0"; }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ cloudpickle numpy toolz dill pandas partd ]; + propagatedBuildInputs = [ + bokeh cloudpickle dill fsspec numpy pandas partd toolz ]; checkPhase = '' py.test dask diff --git a/pkgs/development/python-modules/django-logentry-admin/default.nix b/pkgs/development/python-modules/django-logentry-admin/default.nix new file mode 100644 index 00000000000..d9734ff4a22 --- /dev/null +++ b/pkgs/development/python-modules/django-logentry-admin/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, buildPythonPackage, django, pytest, pytest-django }: + +buildPythonPackage rec { + pname = "django-logentry-admin"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "yprez"; + repo = pname; + rev = "v${version}"; + sha256 = "1ji04qklzhjb7fx6644vzikjb2196rxyi8hrwf2knsz41ndvq1l9"; + }; + + checkInputs = [ pytest pytest-django ]; + checkPhase = '' + rm -r logentry_admin __init__.py + pytest + ''; + + propagatedBuildInputs = [ django ]; + + meta = with stdenv.lib; { + description = "Show all LogEntry objects in the Django admin site"; + homepage = "https://github.com/yprez/django-logentry-admin"; + license = licenses.isc; + maintainers = with maintainers; [ mrmebelman ]; + }; +} + diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index 3a33960faf8..443f793f37b 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "django-polymorphic"; - version = "2.0.3"; + version = "2.1.2"; # PyPI tarball is missing some test files src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "08qk3rbk0xlphwalkigbhqpmfaqjk1sxmlfh8zy8s8dw7fw1myk4"; + sha256 = "0zghrq7y7g2ls38cz6y98qj5xwnn992slhb95qyp6l66d420j179"; }; checkInputs = [ dj-database-url ]; diff --git a/pkgs/development/python-modules/fastpair/default.nix b/pkgs/development/python-modules/fastpair/default.nix index 090f9dd8260..e9e6316bb61 100644 --- a/pkgs/development/python-modules/fastpair/default.nix +++ b/pkgs/development/python-modules/fastpair/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest_3, scipy }: +{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy }: buildPythonPackage { pname = "fastpair"; @@ -11,14 +11,17 @@ buildPythonPackage { sha256 = "1pv9sxycxdk567s5gs947rhlqngrb9nn9yh4dhdvg1ix1i8dca71"; }; - nativeBuildInputs = [ (pytestrunner.override { pytest = pytest_3; }) ]; + nativeBuildInputs = [ pytestrunner ]; - checkInputs = [ pytest_3 ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ scipy ]; + # Does not support pytest 4 https://github.com/carsonfarmer/fastpair/issues/14 + doCheck = false; + checkPhase = '' pytest fastpair ''; diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index c8eca2ac60c..c89bfbfd524 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "folium"; - version = "0.9.1"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "66901483808839ed895a685ca7bc4731379f4a627d73a83b77f0df1847b14892"; + sha256 = "18fzxijsgrb95r0a8anc9ba5ijyw3nlnv3rpavfbkqa5v878x84f"; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix new file mode 100644 index 00000000000..8f4b9cf8c89 --- /dev/null +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "fsspec"; + version = "0.4.1"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fvm1kdnnbf0pppv23mlfdqh220gcldmv72w2rdxp6ks1rcphzg3"; + }; + + # no tests + doCheck = false; + + meta = with lib; { + description = "A specification that python filesystems should adhere to."; + homepage = "https://github.com/intake/filesystem_spec"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/development/python-modules/git-revise/default.nix new file mode 100644 index 00000000000..86d4decc6d8 --- /dev/null +++ b/pkgs/development/python-modules/git-revise/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonAtLeast +, tox +, pytest +, pylint +, mypy +, black +}: + +buildPythonPackage rec { + pname = "git-revise"; + version = "0.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mq1fh8m6jxl052d811cgpl378hiq20a8zrhdjn0i3dqmxrcb8vs"; + }; + + disabled = !(pythonAtLeast "3.6"); + + checkInputs = [ tox pytest pylint mypy black ]; + + checkPhase = '' + tox + ''; + + meta = with lib; { + description = "Efficiently update, split, and rearrange git commits"; + homepage = https://github.com/mystor/git-revise; + license = licenses.mit; + maintainers = with maintainers; [ emily ]; + }; +} diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 60a6caace5e..e81f8274086 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.7.10"; + version = "1.7.11"; src = fetchPypi { inherit pname version; - sha256 = "1mlx5dvkh6rjkvkd91flyhrmji2kw9rlr05n8n4wccv2np3sam9f"; + sha256 = "137vwb9544vjxkwnbr98x0f4p6ri5i678wxxxgbsx4kdyrs83a58"; }; # No tests included in archive diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index f31b9013d94..18a2d570497 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipdb"; - version = "0.12"; + version = "0.12.2"; disabled = isPyPy; # setupterm: could not find terminfo database src = fetchPypi { inherit pname version; - sha256 = "dce2112557edfe759742ca2d0fee35c59c97b0cc7a05398b791079d78f1519ce"; + sha256 = "0mzfv2sa8qabqzh2vqgwhavb15gsmcgqn6i3jgq6b5q9i9wxsgs7"; }; propagatedBuildInputs = [ ipython ]; diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix new file mode 100644 index 00000000000..6d52e5f5c1f --- /dev/null +++ b/pkgs/development/python-modules/license-expression/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, boolean-py +}: + +buildPythonPackage rec { + pname = "license-expression"; + version = "0.999"; + + src = fetchFromGitHub { + owner = "nexB"; + repo = "license-expression"; + rev = "v${version}"; + sha256 = "0q8sha38w7ajg7ar0rmbqrwv0n58l8yzyl96cqwcbvp578fn3ir0"; + }; + + propagatedBuildInputs = [ boolean-py ]; + + meta = with lib; { + homepage = "https://github.com/nexB/license-expression"; + description = "Utility library to parse, normalize and compare License expressions for Python using a boolean logic engine"; + license = licenses.asl20; + }; + +} diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index a9f37b52c1b..2a0544cf6d8 100644 --- a/pkgs/development/python-modules/matchpy/default.nix +++ b/pkgs/development/python-modules/matchpy/default.nix @@ -1,9 +1,10 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , hopcroftkarp , multiset -, pytest_3 +, pytest , pytestrunner , hypothesis , setuptools_scm @@ -20,12 +21,23 @@ buildPythonPackage rec { sha256 = "1vvf1cd9kw5z1mzvypc9f030nd18lgvvjc8j56b1s9b7dyslli2r"; }; + patches = [ + # Fix tests for pytest 4. Remove with the next release + (fetchpatch { + url = "https://github.com/HPAC/matchpy/commit/b405a2717a7793d58c47b2e2197d9d00c06fb13c.patch"; + includes = [ "tests/conftest.py" ]; + sha256 = "1b6gqf2vy9qxg384nqr9k8il335afhbdmlyx4vhd8r8rqpv7gax9"; + }) + ]; + postPatch = '' - substituteInPlace setup.cfg --replace "hypothesis>=3.6,<4.0" "hypothesis" + substituteInPlace setup.cfg \ + --replace "hypothesis>=3.6,<4.0" "hypothesis" \ + --replace "pytest>=3.0,<4.0" "pytest" ''; buildInputs = [ setuptools_scm pytestrunner ]; - checkInputs = [ pytest_3 hypothesis ]; + checkInputs = [ pytest hypothesis ]; propagatedBuildInputs = [ hopcroftkarp multiset ]; meta = with lib; { diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index f5be6ec308e..555f64bd42d 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "3.10.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "164aav7i3ann1lv3xbb76ylpph4hissl0wsnmil1s3m0r7sk7jsx"; + sha256 = "0iw0j2jwlbzknpbdpaqrjjlbycbwqhavp1crblvihf03knn7nkxz"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/poyo/default.nix b/pkgs/development/python-modules/poyo/default.nix index 26dcd244c51..b6d2eb3bda9 100644 --- a/pkgs/development/python-modules/poyo/default.nix +++ b/pkgs/development/python-modules/poyo/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "0.4.2"; + version = "0.5.0"; pname = "poyo"; src = fetchPypi { inherit pname version; - sha256 = "07fdxlqgnnzb8r6lasvdfjcbd8sb9af0wla08rbfs40j349m8jn3"; + sha256 = "1pflivs6j22frz0v3dqxnvc8yb8fb52g11lqr88z0i8cg2m5csg2"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix index 4d8d0589eda..a322518979a 100644 --- a/pkgs/development/python-modules/pybindgen/default.nix +++ b/pkgs/development/python-modules/pybindgen/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }: buildPythonPackage rec { pname = "PyBindGen"; - version = "0.19.0"; + version = "0.20.0"; src = fetchPypi { inherit pname version; - sha256 = "23f2b760e352729208cd4fbadbc618bd00f95a0a24db21a4182833afcc3b5208"; + sha256 = "0l9pz4s7p82ddf9nq56y1fk84j5dbsff1r2xnfily0m7sahyvc8g"; }; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix index 0ff269c9874..26a91a313ee 100644 --- a/pkgs/development/python-modules/pyhepmc/default.nix +++ b/pkgs/development/python-modules/pyhepmc/default.nix @@ -42,9 +42,9 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ pkgs.swig ]; - buildInputs = [ pkgs.hepmc ]; + buildInputs = [ pkgs.hepmc2 ]; - HEPMCPATH = pkgs.hepmc; + HEPMCPATH = pkgs.hepmc2; checkPhase = '' ${python.interpreter} test/test1.py diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix index 621820e39de..ae4c273fc00 100644 --- a/pkgs/development/python-modules/pysnmp/default.nix +++ b/pkgs/development/python-modules/pysnmp/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "4.4.10"; pname = "pysnmp"; + version = "4.4.11"; src = fetchPypi { inherit pname version; - sha256 = "0bbcnn49krawq8pkhpzc427yxki0kxjndhhn61140j3wjbvavhah"; + sha256 = "1v7vz045pami4nx5hfvk8drarcswjclb0pfmg932x95fddbdx2zy"; }; # NameError: name 'mibBuilder' is not defined diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index 3f4ee6fea28..ad0db8dc8bc 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -7,28 +7,32 @@ , ifaddr # Test dependencies -, pytest_3, pylint, flake8, graphviz +, pytest, pylint, flake8, graphviz , mock, sphinx, sphinx_rtd_theme }: buildPythonPackage rec { pname = "pysonos"; - version = "0.0.21"; + version = "0.0.22"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0x2nznjnm721qw9nys5ap3b6hq9s48bsd1yj5xih50pvn0rf0nz2"; + sha256 = "4a4fe630b97c81261246a448fe9dd2bdfaacd7df4453cf72f020599171416442"; }; propagatedBuildInputs = [ xmltodict requests ifaddr ]; checkInputs = [ - pytest_3 pylint flake8 graphviz + pytest pylint flake8 graphviz mock sphinx sphinx_rtd_theme ]; + checkPhase = '' + pytest --deselect=tests/test_discovery.py::TestDiscover::test_discover + ''; + meta = { homepage = https://github.com/amelchio/pysonos; description = "A SoCo fork with fixes for Home Assistant"; diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index 07e39e72bc0..958b1ee45b3 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "runway-python"; - version = "0.3.2"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "ef15c0df60cfe7ea26b070bbe2ba522d67d247b157c20f3f191fe545c17d0b85"; + sha256 = "cd23550211aa8542d9c06516e25c32de3963fff50d0793d94def271a4e2b4514"; }; propagatedBuildInputs = [ flask flask-cors numpy pillow gevent wget six colorcet ]; diff --git a/pkgs/development/python-modules/simplefix/default.nix b/pkgs/development/python-modules/simplefix/default.nix new file mode 100644 index 00000000000..8b84d6a248e --- /dev/null +++ b/pkgs/development/python-modules/simplefix/default.nix @@ -0,0 +1,25 @@ +{ lib, python, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "simplefix"; + version = "1.0.12"; + + src = fetchFromGitHub { + repo = "simplefix"; + owner = "da4089"; + rev = "v${version}"; + sha256 = "0pnyqxpki1ija0kha7axi6irgiifcz4w77libagkv46b1z11cc4r"; + }; + + checkPhase = '' + cd test + ${python.interpreter} -m unittest all + ''; + + meta = with lib; { + description = "Simple FIX Protocol implementation for Python"; + homepage = https://github.com/da4089/simplefix; + license = licenses.mit; + maintainers = with maintainers; [ catern ]; + }; +} diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix new file mode 100644 index 00000000000..13272a5a0b7 --- /dev/null +++ b/pkgs/development/python-modules/stm32loader/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchPypi +, progress +, pyserial +, pytest +, mock +}: + +buildPythonPackage rec { + pname = "stm32loader"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1w6jg4dcyz6si6dcyx727sxi75wnl0j89xkiwqmsw286s1y8ijjw"; + }; + + propagatedBuildInputs = [ progress pyserial ]; + + checkInputs = [ pytest ] ++ lib.optional isPy27 mock; + + checkPhase = '' + pytest --strict tests/unit + ''; + + meta = with lib; { + description = "Flash firmware to STM32 microcontrollers in Python"; + homepage = https://github.com/florisla/stm32loader; + changelog = "https://github.com/florisla/stm32loader/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl3; + maintainers = with maintainers; [ emily ]; + }; +} diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index da6bdcde463..1aa03983f68 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -18,7 +18,7 @@ , freezegun , mock , pretend -, pytest_3 +, pytest , pytestcov , requests-mock , aioresponses @@ -54,12 +54,15 @@ buildPythonPackage rec { mock pretend pytestcov - pytest_3 + pytest requests-mock ] ++ lib.optional isPy3k aioresponses; checkPhase = '' runHook preCheck + # fix compatibility with pytest 4 + substituteInPlace tests/conftest.py \ + --replace 'request.node.get_marker("requests")' 'request.node.get_closest_marker("requests")' # ignored tests requires xmlsec python module HOME=$(mktemp -d) pytest tests --ignore tests/test_wsse_signature.py runHook postCheck diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index ee9270f3596..dcebf7d4ecf 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -1,14 +1,14 @@ { stdenv, buildPythonPackage, fetchPypi , setuptools_scm, pathpy, nbconvert -, pytest_3 }: +, pytest }: buildPythonPackage rec { pname = "zetup"; - version = "0.2.48"; + version = "0.2.52"; src = fetchPypi { inherit pname version; - sha256 = "41af61e8e103656ee633f89ff67d6a94848b9b9a836d351bb813b87a139a7c46"; + sha256 = "9ce97276acf0425499251c5eb700f6a3820adc52859df1e03c6d0f0b88a452cd"; }; # Python 3.7 compatibility @@ -19,10 +19,10 @@ buildPythonPackage rec { ''; checkPhase = '' - py.test test -k "not TestObject" + py.test test -k "not TestObject" --deselect=test/test_zetup_config.py::test_classifiers ''; - checkInputs = [ pytest_3 pathpy nbconvert ]; + checkInputs = [ pytest pathpy nbconvert ]; propagatedBuildInputs = [ setuptools_scm ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 0db88835e6c..c26a5d8e0c8 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.104.0"; + version = "0.105.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "189pibz5b9md6dhiadr7616xlmmrx5zwh7brbyrvgbapq80k9lak"; + sha256 = "0p79v65h580vxm6j5nlrcxpkk4bxgn8wcvwmlfs70pbmdsj0hzwx"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 88d84ad1d11..3f3731e2ac8 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.16.0"; + version = "6.17.0"; nativeBuildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "0h4818dxd9nq925asa9g3g9i2i5hg85ziapacyiqq4bhab67ysy4"; + sha256 = "0000w28dg5z8gs7cxhx7d0fv10ry0yxamk5my28ncqqsg7a4qy8w"; }; installPhase = '' diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 701b0c48388..f67d8e761b4 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -22,11 +22,11 @@ }: let - version = "0.28.0"; + version = "0.28.1"; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "26ad8cdadd413b8432cf46d9fc3801e8db85d9922f85dd8a7f5a92fec876557f"; + sha256 = "0503fax70w7h6v00mkrrrgf1m5n0vkjqs76lyg95alhzc4yldsic"; }; # Update with `eval $(nix-build -A bazel.updater)`, diff --git a/pkgs/development/tools/cachix/default.nix b/pkgs/development/tools/cachix/default.nix deleted file mode 100644 index b6098ca98bf..00000000000 --- a/pkgs/development/tools/cachix/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ haskellPackages, haskell }: - -haskell.lib.justStaticExecutables (haskellPackages.extend (self: super: { - cachix = haskell.lib.doDistribute (self.cachix_0_2_1 or self.cachix); - cachix-api = self.cachix-api_0_2_1 or self.cachix-api; -})).cachix diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 0f4b6b73de3..1aa13a34d12 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -2,6 +2,16 @@ let version = "12.1.0"; + # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 + docker_x86_64 = fetchurl { + url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; + sha256 = "1yx530h5rz7wmd012962f9dfj0hvj1m7zab5vchndna4svzzycch"; + }; + + docker_arm = fetchurl { + url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; + sha256 = "0zsin76qiq46w675wdkaz3ng1i9szad3hzmk5dngdnr59gq5mqhk"; + }; in buildGoPackage rec { inherit version; @@ -24,6 +34,13 @@ buildGoPackage rec { patches = [ ./fix-shell-path.patch ]; + postInstall = '' + touch $bin/bin/hello + install -d $bin/bin/helper-images + ln -sf ${docker_x86_64} $bin/bin/helper-images/prebuilt-x86_64.tar.xz + ln -sf ${docker_arm} $bin/bin/helper-images/prebuilt-arm.tar.xz + ''; + meta = with lib; { description = "GitLab Runner the continuous integration executor of GitLab"; license = licenses.mit; diff --git a/pkgs/development/tools/electron/3.x.nix b/pkgs/development/tools/electron/3.x.nix index 597e66f9b29..a902f279a49 100644 --- a/pkgs/development/tools/electron/3.x.nix +++ b/pkgs/development/tools/electron/3.x.nix @@ -1,7 +1,7 @@ { stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2, at-spi2-atk }: let - version = "3.1.8"; + version = "3.1.13"; name = "electron-${version}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -19,19 +19,19 @@ let src = { i686-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; - sha256 = "1vq4vanlwixgk1q4v5d24f1ywgy2af1r14f9byzfy89vwds77yk9"; + sha256 = "04i0rcp4ajp4nf4arcl5crcc7a85sf0ixqd8jx07k2b1irv4dc23"; }; x86_64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "13zds8bzn4z11544llkh99fw75gddxs5b9h1m5xgjzw37vf6rpws"; + sha256 = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark"; }; armv7l-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; - sha256 = "0rfw1ydlmixyhifpmm2qyxapx3iqav4nlnzp2km9z7a0hpc4lii6"; + sha256 = "1pzs2cj12xw18jwab0mb8xhndwd95lbsj5ml5xdw2mb0ip5jsvsa"; }; aarch64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; - sha256 = "0qrnvzjz78fblfg4r6xpzc40p10y6865gqpwx2h5vsdfp6sgq898"; + sha256 = "13pc7xn0dkb8i31vg9zplqcvb7r9r7q3inmr3419b5p9bl0687x8"; }; }.${stdenv.hostPlatform.system} or throwSystem; @@ -59,7 +59,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "0ms75306dq2ym838zk9d9nypnd8yjipl0zqyq9bvd4r32p241hw9"; + sha256 = "1vvjm4jifzjqvbs2kjlwg1h9p2czr2b5imjr9hld1j8nyfrzb0dx"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/electron/5.x.nix b/pkgs/development/tools/electron/5.x.nix index 9da68f4dc46..0b993ccf2a7 100644 --- a/pkgs/development/tools/electron/5.x.nix +++ b/pkgs/development/tools/electron/5.x.nix @@ -1,7 +1,7 @@ { stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core }: let - version = "5.0.0"; + version = "5.0.8"; name = "electron-${version}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -19,19 +19,19 @@ let src = { i686-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; - sha256 = "01320qv0x18rmjn6ibbs49pd04d58rz5dac509lxxay8nfb14gdp"; + sha256 = "1blw38x4fp4w2vs6r1d0jz3pg0m78417i0q9bvwpnwbn6wil857y"; }; x86_64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "0mkc8r5xggkzdypyq4hxigmjl6d1jn0139l8nwj1vr224ggnskhn"; + sha256 = "1gz5n8gkgka7343qcwckagd4ply1lxwiaccdjv16srk2wwc9bc9m"; }; armv7l-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; - sha256 = "1w767yxm3b6sj52z0wnzr4vfn0m8n2jdjhj3ksmq6qrv401vvib3"; + sha256 = "1y8yna6z7xc378k6hsgngv9v98yjwq36knnr4qan0pw26paw1m82"; }; aarch64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; - sha256 = "1nvpfkrizkmr6xxb2ls19p9mhgpms65ws09bx3l8sqq6275916jk"; + sha256 = "1ha4ajvi0z051b6npigw6w4xi3bj3hhpxfr3xw4fgx6g6bvf1vpx"; }; }.${stdenv.hostPlatform.system} or throwSystem; @@ -68,7 +68,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "07s2cq4ffpx86pjxrh1hcvk3r85saxqi3kkbbfkg9r1bbq8zbapm"; + sha256 = "1h7i2ik6wms5v6ji0mp33kzfh9sd89m7w3m2nm6wrjny7m0b43ww"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/electron/6.x.nix b/pkgs/development/tools/electron/6.x.nix new file mode 100644 index 00000000000..5d412848d2d --- /dev/null +++ b/pkgs/development/tools/electron/6.x.nix @@ -0,0 +1,86 @@ +{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core}: + +let + version = "6.0.1"; + name = "electron-${version}"; + + throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; + + meta = with stdenv.lib; { + description = "Cross platform desktop application shell"; + homepage = https://github.com/electron/electron; + license = licenses.mit; + maintainers = with maintainers; [ travisbhartwell manveru ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]; + }; + + linux = { + inherit name version meta; + src = { + i686-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; + sha256 = "0ly6mjcljw0axkkrz7dsvfywmjb3pmspalfk2259gyqqxj8a37pb"; + }; + x86_64-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; + sha256 = "0l8k6v16ynikf6x59w5byzhji0d6mqp2q0kjlrby56546qzyfkh6"; + }; + armv7l-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; + sha256 = "0c2xl8dm9fmj0d92w53zbn2np2fiwr88hw0dqjdn1rwczhw7zqss"; + }; + aarch64-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; + sha256 = "0iyq229snm7z411xxfsv7f0bqg6hbw2l8y6ymys110f83hp01f8a"; + }; + }.${stdenv.hostPlatform.system} or throwSystem; + + buildInputs = [ gtk3 ]; + + nativeBuildInputs = [ + unzip + makeWrapper + wrapGAppsHook + ]; + + dontWrapGApps = true; # electron is in lib, we need to wrap it manually + + buildCommand = '' + mkdir -p $out/lib/electron $out/bin + unzip -d $out/lib/electron $src + ln -s $out/lib/electron/electron $out/bin + + fixupPhase + + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [ libuuid at-spi2-atk at-spi2-core ]}:$out/lib/electron" \ + $out/lib/electron/electron + + wrapProgram $out/lib/electron/electron \ + --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \ + "''${gappsWrapperArgs[@]}" + ''; + }; + + darwin = { + inherit name version meta; + + src = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; + sha256 = "0m8v5fs69kanrd1yk6smbmaaj9gb5j3q487z3wicifry0xn381i2"; + }; + + buildInputs = [ unzip ]; + + buildCommand = '' + mkdir -p $out/Applications + unzip $src + mv Electron.app $out/Applications + mkdir -p $out/bin + ln -s $out/Applications/Electron.app/Contents/MacOs/Electron $out/bin/electron + ''; + }; +in + + stdenv.mkDerivation (if stdenv.isDarwin then darwin else linux) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index fca9bc866fa..2efd97ebb1c 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,7 +1,7 @@ { stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, gtk3, unzip, atomEnv, libuuid, at-spi2-atk }: let - version = "4.1.5"; + version = "4.2.8"; name = "electron-${version}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -19,19 +19,19 @@ let src = { i686-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; - sha256 = "0rqaydlg7wkccks7crwpylad0bsz8knm82mpb7hnj68p9njxpsbz"; + sha256 = "1sikxr0pfpi3wrf1d7fia1vhb1gacsy9pr7qc0fycgnzsy2nvf8n"; }; x86_64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "0xwvn41pvpsrx54waix8kmg3w1f1f9nmfn08hf9bkgnlgh251shy"; + sha256 = "0wc954cjc13flvdh8rkmnifdx6nirf273v1n76lsklbsq6c73i4h"; }; armv7l-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; - sha256 = "172yq2m4i0pf72xr6w3xgkxfakkx2wrc54aah5j3nr6809bcnzji"; + sha256 = "0370ygpsm42drm70gj12i6mg960wchhqis7zz8i9is2ax1b2xjp5"; }; aarch64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; - sha256 = "0gcgvgplg9c2sm53sa4nll4x486c4m190ma9a98xfx9mp9vy55vq"; + sha256 = "0vl90lsjcsgcxivbaq526ffbx3lsh6axfmpkfxl8cj2jlbsg593k"; }; }.${stdenv.hostPlatform.system} or throwSystem; @@ -68,7 +68,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "1z43ga620rw84x1yxvnxf11pd782s5vgj5dgnn4k0nfgxlihy058"; + sha256 = "083v8k17b596fa63a7qrwyn2k8pd5vmg9yijbqbnpfcg4ja3bjx9"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 67030740290..4b2d107aa91 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "heroku"; - version = "7.22.4"; + version = "7.27.1"; src = fetchurl { url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; - sha256 = "067kvkdn7yvzb3ws6yjsfbypww914fclhnxrh2dw1hc6cazfgmqp"; + sha256 = "0aq89kvv80mz67j4dgl84ff5j58q5p3k82bbnvxs5nhf2jcandym"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix index 44df2b1e153..43cb6e6c2c7 100644 --- a/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/pkgs/development/tools/literate-programming/noweb/default.nix @@ -1,29 +1,77 @@ -{stdenv, fetchurl, gawk}: +{ stdenv, fetchFromGitHub, gawk, groff, icon-lang ? null }: -stdenv.mkDerivation { - name = "noweb-2.11b"; - src = fetchurl { - urls = [ "http://ftp.de.debian.org/debian/pool/main/n/noweb/noweb_2.11b.orig.tar.gz" - "ftp://www.eecs.harvard.edu/pub/nr/noweb.tgz" - ]; - sha256 = "10hdd6mrk26kyh4bnng4ah5h1pnanhsrhqa7qwqy6dyv3rng44y9"; +let noweb = stdenv.mkDerivation rec { + pname = "noweb"; + version = "2.12"; + + src = fetchFromGitHub { + owner = "nrnrnr"; + repo = "noweb"; + rev = "v${builtins.replaceStrings ["."] ["_"] version}"; + sha256 = "1160i2ghgzqvnb44kgwd6s3p4jnk9668rmc15jlcwl7pdf3xqm95"; }; - preBuild = '' - mkdir -p $out/lib/noweb - cd src - makeFlags="BIN=$out/bin LIB=$out/lib/noweb MAN=$out/share/man TEXINPUTS=$out/share/texmf/tex/latex" - ''; - preInstall=''mkdir -p $out/share/texmf/tex/latex''; - postInstall= '' - substituteInPlace $out/bin/cpif --replace "PATH=/bin:/usr/bin" "" - for f in $out/bin/{noweb,nountangle,noroots,noroff,noindex} \ - $out/lib/noweb/{toroff,btdefn,totex,noidx,unmarkup,toascii,tohtml,emptydefn}; do - substituteInPlace $f --replace "nawk" "${gawk}/bin/awk" - done - ''; + patches = [ ./no-FAQ.patch ]; - meta = { - platforms = stdenv.lib.platforms.linux; + nativeBuildInputs = [ groff ] ++ stdenv.lib.optionals (!isNull icon-lang) [ icon-lang ]; + + preBuild = '' + mkdir -p "$out/lib/noweb" + cd src + ''; + + makeFlags = stdenv.lib.optionals (!isNull icon-lang) [ + "LIBSRC=icon" + "ICONC=icont" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "CC=clang" + ]; + + installFlags = [ + "BIN=$(out)/bin" + "ELISP=$(out)/share/emacs/site-lisp" + "LIB=$(out)/lib/noweb" + "MAN=$(out)/share/man" + "TEXINPUTS=$(tex)/tex/latex/noweb" + ]; + + preInstall = '' + mkdir -p "$tex/tex/latex/noweb" + ''; + + installTargets = "install-code install-tex install-elisp"; + + postInstall = '' + substituteInPlace "$out/bin/cpif" --replace "PATH=/bin:/usr/bin" "" + + for f in $out/bin/no{index,roff,roots,untangle,web} \ + $out/lib/noweb/to{ascii,html,roff,tex} \ + $out/lib/noweb/{bt,empty}defn \ + $out/lib/noweb/{noidx,unmarkup}; do + # NOTE: substituteInPlace breaks Icon binaries, so make sure the script + # uses (n)awk before calling. + if grep -q nawk "$f"; then + substituteInPlace "$f" --replace "nawk" "${gawk}/bin/awk" + fi + done + + # HACK: This is ugly, but functional. + PATH=$out/bin:$PATH make -BC xdoc + make $installFlags install-man + + ln -s "$tex" "$out/share/texmf" + ''; + + outputs = [ "out" "tex" ]; + + tlType = "run"; + passthru.pkgs = [ noweb.tex ]; + + meta = with stdenv.lib; { + description = "A simple, extensible literate-programming tool"; + homepage = https://www.cs.tufts.edu/~nr/noweb; + license = licenses.bsd2; + maintainers = with maintainers; [ yurrriq ]; + platforms = with platforms; linux ++ darwin; }; -} +}; in noweb diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix index 28146352835..ddc15f856b5 100644 --- a/pkgs/development/tools/misc/blackmagic/default.nix +++ b/pkgs/development/tools/misc/blackmagic/default.nix @@ -1,28 +1,30 @@ { stdenv, lib, fetchFromGitHub -, gcc-arm-embedded, binutils-arm-embedded, libftdi +, gcc-arm-embedded, libftdi1 , python, pythonPackages }: with lib; stdenv.mkDerivation rec { - name = "blackmagic-${version}"; - version = "1.6.1"; + pname = "blackmagic"; + version = "unstable-2019-08-13"; + # `git describe --always` + firmwareVersion = "v1.6.1-317-gc9c8b08"; src = fetchFromGitHub { owner = "blacksphere"; repo = "blackmagic"; - rev = "29386aee140e5e99a958727358f60980418b4c88"; - sha256 = "05x19y80mixk6blpnfpfngy5d41jpjvdqgjzkmhv1qc03bhyhc82"; + rev = "c9c8b089f716c31433432f5ee54c5c206e4945cf"; + sha256 = "0175plba7h3r1p584ygkjlvg2clvxa2m0xfdcb2v8jza2vzc8ywd"; fetchSubmodules = true; }; nativeBuildInputs = [ - gcc-arm-embedded binutils-arm-embedded + gcc-arm-embedded ]; buildInputs = [ - libftdi + libftdi1 python pythonPackages.intelhex ]; @@ -30,7 +32,7 @@ stdenv.mkDerivation rec { postPatch = '' # Prevent calling out to `git' to generate a version number: substituteInPlace src/Makefile \ - --replace '`git describe --always --dirty`' '${version}' + --replace '$(shell git describe --always --dirty)' '${firmwareVersion}' # Fix scripts that generate headers: for f in $(find scripts libopencm3/scripts -type f); do @@ -41,6 +43,8 @@ stdenv.mkDerivation rec { buildPhase = "${stdenv.shell} ${./helper.sh}"; installPhase = ":"; # buildPhase does this. + enableParallelBuilding = true; + meta = { description = "In-application debugger for ARM Cortex microcontrollers"; longDescription = '' @@ -56,7 +60,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/blacksphere/blackmagic; license = licenses.gpl3Plus; - maintainers = with maintainers; [ pjones ]; + maintainers = with maintainers; [ pjones emily ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/blackmagic/helper.sh b/pkgs/development/tools/misc/blackmagic/helper.sh index b4c7558885b..991d0249e16 100755 --- a/pkgs/development/tools/misc/blackmagic/helper.sh +++ b/pkgs/development/tools/misc/blackmagic/helper.sh @@ -10,6 +10,8 @@ out=${out:-/tmp} ################################################################################ export CFLAGS=$NIX_CFLAGS_COMPILE +export MAKEFLAGS="\ + ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}" ################################################################################ PRODUCTS="blackmagic.bin blackmagic.hex blackmagic_dfu.bin blackmagic_dfu.hex" diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix index 904119bd6ae..a3579b73408 100644 --- a/pkgs/development/tools/misc/cli11/default.nix +++ b/pkgs/development/tools/misc/cli11/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cli11"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "CLIUtils"; repo = "CLI11"; rev = "v${version}"; - sha256 = "0wddck970pczk7c201i2g6s85mkv4f2f4zxy6mndh3pfz41wcs2d"; + sha256 = "0i1x4ax5hal7jdsxw40ljwfv68h0ac85iyi35i8p52p9s5qsc71q"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index 0d2e813071e..0c994e88e23 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,21 +1,18 @@ { stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }: rustPlatform.buildRustPackage rec { - version = "0.2.9"; + version = "0.2.10"; name = "sccache-${version}"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; rev = version; - sha256 = "0glaaan6fh19a2d8grgsgnbgw5w53vjl0qmvvnq0ldp3hax90v46"; + sha256 = "13fiifv3bi9shzp30wd7k2nd2j43vzdhk6z5rnfn5a9hmijqpg9n"; }; - cargoSha256 = "0chfdyhj9lyxydbnmldc8rh2v9dda46sxhv35g34a5137sjrizfh"; + cargoSha256 = "1bkglgrasyjyzjj9mwm32d3g3mg5yv74jj3zl7jf20dlq3rg3fh6"; + cargoBuildFlags = [ "--features=all" ]; - # see https://github.com/mozilla/sccache/issues/467 - postPatch = '' - sed -i 's/\(version = "0.2.9\)-alpha.0"/\1"/g' Cargo.lock - ''; nativeBuildInputs = [ pkgconfig cargo rustc ]; diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index efd6e562c29..19432843218 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { - name = "camlp5-7.07"; + name = "camlp5-7.08"; src = fetchzip { - url = "https://github.com/camlp5/camlp5/archive/rel707.tar.gz"; - sha256 = "1c8v45553ccbqha2ypfranqlgw06rr5wjr2hlnrx5bf9jfq0h0dn"; + url = "https://github.com/camlp5/camlp5/archive/rel708.tar.gz"; + sha256 = "0b39bvr1aa7kzjhbyycmvcrwil2yjbxc84cb43zfzahx4p2aqr76"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/development/tools/parsing/antlr/3.5.nix b/pkgs/development/tools/parsing/antlr/3.5.nix index 4c213ed1c4c..6fa6323d3e8 100644 --- a/pkgs/development/tools/parsing/antlr/3.5.nix +++ b/pkgs/development/tools/parsing/antlr/3.5.nix @@ -1,18 +1,23 @@ -{stdenv, fetchurl, jre}: +{stdenv, fetchurl, fetchFromGitHub, jre}: stdenv.mkDerivation rec { - name = "antlr-${version}"; + pname = "antlr"; version = "3.5.2"; - src = fetchurl { - url ="https://www.antlr3.org/download/antlr-${version}-complete.jar"; + jar = fetchurl { + url = "https://www.antlr3.org/download/antlr-${version}-complete.jar"; sha256 = "0srjwxipwsfzmpi0v32d1l5lzk9gi5in8ayg33sq8wyp8ygnbji6"; }; - - dontUnpack = true; + src = fetchFromGitHub { + owner = "antlr"; + repo = "antlr3"; + rev = "5c2a916a10139cdb5c7c8851ee592ed9c3b3d4ff"; + sha256 = "1i0w2v9prrmczlwkfijfp4zfqfgrss90a7yk2hg3y0gkg2s4abbk"; + }; installPhase = '' - mkdir -p "$out"/{lib/antlr,bin} - cp "$src" "$out/lib/antlr/antlr-${version}-complete.jar" + mkdir -p "$out"/{lib/antlr,bin,include} + cp "$jar" "$out/lib/antlr/antlr-${version}-complete.jar" + cp runtime/Cpp/include/* $out/include/ echo "#! ${stdenv.shell}" >> "$out/bin/antlr" echo "'${jre}/bin/java' -cp '$out/lib/antlr/antlr-${version}-complete.jar' -Xms200M -Xmx400M org.antlr.Tool \"\$@\"" >> "$out/bin/antlr" @@ -32,8 +37,9 @@ stdenv.mkDerivation rec { frameworks. From a grammar, ANTLR generates a parser that can build and walk parse trees. ''; - homepage = https://www.antlr.org/; + homepage = "https://www.antlr.org/"; license = licenses.bsd3; platforms = platforms.linux; + maintainers = [ stdenv.lib.maintainers.farlion ]; }; } diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index 4e73c820912..9b3fd86b555 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "byacc-${version}"; - version = "20180609"; + version = "20190617"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/byacc/${name}.tgz" "https://invisible-mirror.net/archives/byacc/${name}.tgz" ]; - sha256 = "173l9yai5yndbyn8nzdl6q11wv4x959bd0w392i82nfsqcz0pfsv"; + sha256 = "13ai0az00c86s4k94cpgh48nf5dfccpvccpw635z42wjgcb6hy7q"; }; configureFlags = [ diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 6b1918a5d98..8f711e14654 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -6,8 +6,8 @@ let ## fetchgit info url = git://sourceware.org/git/systemtap.git; rev = "release-${version}"; - sha256 = "075p45ndr4pzrf5679hcsw1ws4x0xqvx3m037v04545762hki6la"; - version = "4.0"; + sha256 = "0mmpiq7bsrwhp7z07a1pwka4q6d2fbmdx5wp83nxj31rvdxhqwnw"; + version = "4.1"; inherit (kernel) stdenv; inherit (stdenv) lib; diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix index 4b8a79c6190..91b4fe15e5a 100644 --- a/pkgs/development/web/now-cli/default.nix +++ b/pkgs/development/web/now-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "now-cli-${version}"; - version = "15.5.0"; + version = "15.8.7"; # TODO: switch to building from source, if possible src = fetchurl { url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz"; - sha256 = "06fs3f5r6ixzzl1bhs92w3lcmpyx8fkga4bv8n9g0ygfm9d1z8gk"; + sha256 = "1x6nsn9qmsy4hk7l2dsyabc7fxkwwwl1y1852vs4dgxi8w1hax93"; }; sourceRoot = "."; diff --git a/pkgs/games/azimuth/default.nix b/pkgs/games/azimuth/default.nix index 085bad674c7..8cb583e07d2 100644 --- a/pkgs/games/azimuth/default.nix +++ b/pkgs/games/azimuth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, SDL }: +{ stdenv, fetchFromGitHub, SDL, which, installTool ? false }: stdenv.mkDerivation rec { pname = "azimuth"; @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { sha256 = "1znfvpmqiixd977jv748glk5zc4cmhw5813zp81waj07r9b0828r"; }; + nativeBuildInputs = [ which ]; + buildInputs = [ SDL ]; + preConfigure = '' + cat Makefile substituteInPlace data/azimuth.desktop \ --replace Exec=azimuth "Exec=$out/bin/azimuth" \ --replace "Version=%AZ_VERSION_NUMBER" "Version=${version}" @@ -19,30 +23,12 @@ stdenv.mkDerivation rec { makeFlags = [ "BUILDTYPE=release" - ]; + "INSTALLDIR=$(out)" + ] ++ (if installTool then ["INSTALLTOOL=true"] else ["INSTALLTOOL=false"]); - buildInputs = [ SDL ]; enableParallelBuilding = true; - # the game doesn't have an installation procedure - installPhase = '' - mkdir -p $out/bin - cp out/release/host/bin/azimuth $out/bin/azimuth - cp out/release/host/bin/editor $out/bin/azimuth-editor - cp out/release/host/bin/muse $out/bin/azimuth-muse - cp out/release/host/bin/zfxr $out/bin/azimuth-zfxr - mkdir -p $out/share/doc/azimuth - cp doc/* README.md LICENSE $out/share/doc/azimuth - mkdir -p $out/share/icons/hicolor/128x128/apps $out/share/icons/hicolor/64x64/apps $out/share/icons/hicolor/48x48/apps $out/share/icons/hicolor/32x32/apps - cp data/icons/icon_128x128.png $out/share/icons/hicolor/128x128/apps/azimuth.png - cp data/icons/icon_64x64.png $out/share/icons/hicolor/64x64/apps/azimuth.png - cp data/icons/icon_48x48.png $out/share/icons/hicolor/48x48/apps/azimuth.png - cp data/icons/icon_32x32.png $out/share/icons/hicolor/32x32/apps/azimuth.png - mkdir -p $out/share/applications - cp data/azimuth.desktop $out/share/applications - ''; - meta = { description = "A metroidvania game using only vectorial graphic"; longDescription = '' diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix index 0f045faf371..d2f1e27b10e 100644 --- a/pkgs/games/opendune/default.nix +++ b/pkgs/games/opendune/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, SDL, SDL_image, SDL_mixer }: +{ stdenv, lib, fetchFromGitHub, pkgconfig +, alsaLib, libpulseaudio, SDL2, SDL2_image, SDL2_mixer }: # - set the opendune configuration at ~/.config/opendune/opendune.ini: # [opendune] @@ -16,17 +17,30 @@ stdenv.mkDerivation rec { sha256 = "15rvrnszdy3db8s0dmb696l4isb3x2cpj7wcl4j09pdi59pc8p37"; }; - buildInputs = [ SDL SDL_image SDL_mixer ]; + configureFlags = [ + "--with-alsa=${lib.getLib alsaLib}/lib/libasound.so" + "--with-pulse=${lib.getLib libpulseaudio}/lib/libpulse.so" + ]; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ alsaLib libpulseaudio SDL2 SDL2_image SDL2_mixer ]; + + enableParallelBuilding = true; installPhase = '' - install -m 555 -D bin/opendune $out/bin/opendune + runHook preInstall + + install -Dm555 -t $out/bin bin/opendune + install -Dm444 -t $out/share/doc/opendune enhancement.txt README.txt + + runHook postInstall ''; meta = with stdenv.lib; { description = "Dune, Reinvented"; homepage = https://github.com/OpenDUNE/OpenDUNE; license = licenses.gpl2; - maintainers = [ maintainers.nand0p ]; - platforms = platforms.linux; + maintainers = with maintainers; [ nand0p ]; }; } diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 9f0ac916751..5c73e458c1a 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -48,7 +48,7 @@ let runSh = writeScript "run.sh" '' #!${runtimeShell} - runtime_paths="${lib.concatStringsSep ":" ldPath}" + runtime_paths="/lib32:/lib64:${lib.concatStringsSep ":" ldPath}" if [ "$1" == "--print-steam-runtime-library-paths" ]; then echo "$runtime_paths" exit 0 @@ -83,6 +83,17 @@ in buildFHSUserEnv rec { mono xorg.xkeyboardconfig xorg.libpciaccess + ## screeps dependencies + gnome3.gtk + dbus + zlib + glib + atk + cairo + freetype + gdk_pixbuf + pango + fontconfig ] ++ (if (!nativeOnly) then [ (steamPackages.steam-runtime-wrapped.override { inherit runtimeOnly; @@ -246,7 +257,7 @@ in buildFHSUserEnv rec { exit 1 fi shift - ${lib.optionalString (!nativeOnly) "export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH"} + ${lib.optionalString (!nativeOnly) "export LD_LIBRARY_PATH=/lib32:/lib64:${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH"} exec -- "$run" "$@" ''; }; diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix new file mode 100644 index 00000000000..328e8ce4562 --- /dev/null +++ b/pkgs/misc/drivers/utsushi/default.nix @@ -0,0 +1,154 @@ +{ stdenv, fetchurl, autoreconfHook, boost, gtkmm2 +, pkg-config, libtool, udev, libjpeg, file, texlive +, libusb, libtiff, imagemagick, sane-backends, tesseract }: + +/* +Alternatively, this package could use the "community source" at +https://gitlab.com/utsushi/utsushi/ +Epson provides proprietary plugins for networking, ocr and some more +scanner models. Those are not (yet ?) packaged here. +*/ + +stdenv.mkDerivation rec { + pname = "utsushi"; + version = "3.57.0"; + + src = fetchurl { + url = "http://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${version}.orig.tar.gz"; + sha256 = "0qy6n6nbisbvy0q3idj7hpmj9i85cd0a18klfd8nsqsa2nkg57ny"; + }; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + libtool + ]; + + buildInputs = [ + boost + libusb + libtiff + libjpeg + udev + imagemagick + sane-backends + gtkmm2 + file + tesseract + ]; + + patches = [ + ./patches/absolute-path-to-convert.patch + ./patches/print-errors.patch + ./patches/absolute_path_for_tesseract.patch + ]; + + postPatch = '' + # remove vendored dependencies + rm -r upstream/boost + # create fake udev and sane config + mkdir -p $out/etc/{sane.d,udev/rules.d} + touch $out/etc/sane.d/dll.conf + ''; + + configureFlags = [ + "--with-boost-libdir=${boost}/lib" + "--with-sane-confdir=${placeholder "out"}/etc/sane.d" + "--with-udev-confdir=${placeholder "out"}/etc/udev" + "--with-sane" + "--with-gtkmm" + "--with-jpeg" + "--with-magick" + "--with-sane" + "--with-tiff" + ]; + + installFlags = [ "SANE_BACKENDDIR=${placeholder "out"}/lib/sane" ]; + + enableParallelBuilding = true; + + meta = { + description = "SANE utsushi backend for some Epson scanners"; + longDescription = '' + ImageScanV3 (aka utsushi) scanner driver. + Non-free plugins are not included so no network support. + To use the SANE backend, in /etc/nixos/configuration.nix: + + hardware.sane = { + enable = true; + extraBackends = [ pkgs.utsushi ]; + }; + services.udev.packages = [ pkgs.utsushi ]; + + Supported hardware: + - DS-40 + - DS-70 + - DS-80W + - DS-410 + - DS-510 + - DS-520 + - DS-530 + - DS-535 + - DS-535H + - DS-560 + - DS-575W + - DS-760 + - DS-775 + - DS-780N + - DS-860 + - DS-1630 + - DS-5500 + - DS-6500 + - DS-7500 + - DS-50000 + - DS-60000 + - DS-70000 + - EP-10VA Series + - EP-808A Series + - EP-978A3 Series + - ES-50 + - ES-55R + - ES-60W + - ES-65WR + - ES-300WR + - ES-400 + - ES-500WR + - ES-8500 + - ET-2500 Series + - ET-2550 Series + - ET-4500 Series + - ET-4550 Series + - Expression 1640XL + - FF-680W + - L220/L360 Series + - L365/L366 Series + - L380 Series + - L455 Series + - L565/L566 Series + - L655 Series + - PX-M840FX + - PX-M860F + - PX-M884F + - PX-M7050 Series + - PX-M7050FX Series + - WF-4720 + - WF-6530 Series + - WF-6590 Series + - WF-8510/8590 Series + - WF-R8590 Series + - XP-220 Series + - XP-230 Series + - XP-235 Series + - XP-332 335 Series + - XP-430 Series + - XP-432 435 Series + - XP-530 Series + - XP-540 + - XP-630 Series + - XP-640 + - XP-830 Series + - XP-960 Series + ''; + license = stdenv.lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/misc/drivers/utsushi/patches/absolute-path-to-convert.patch b/pkgs/misc/drivers/utsushi/patches/absolute-path-to-convert.patch new file mode 100644 index 00000000000..2bc9422b061 --- /dev/null +++ b/pkgs/misc/drivers/utsushi/patches/absolute-path-to-convert.patch @@ -0,0 +1,166 @@ +Index: utsushi-0.57.0/configure.ac +=================================================================== +--- utsushi-0.57.0.orig/configure.ac ++++ utsushi-0.57.0/configure.ac +@@ -221,6 +221,9 @@ AS_IF([test xno != x$enable_code_coverag + [AC_MSG_ERROR([code coverage support requires a GNU C/C++ compiler])]) + ]) + AM_PROG_AR ++AC_PATH_PROG([AWK],[awk]) ++AC_DEFINE_UNQUOTED([AWK], ["$AWK"], ++ [Path to awk.]) + + PKG_PROG_PKG_CONFIG + +@@ -379,27 +382,31 @@ AM_CONDITIONAL([have_libmagick_pp], [tes + AS_IF([test xno != "x$with_magick"], + AS_CASE("x$with_magick", + [xGraphicsMagick], +- [AC_CHECK_PROGS([MAGICK_CONVERT], [gm]) +- AS_IF([test xgm != x$MAGICK_CONVERT], ++ [[AC_PATH_PROG(MAGICK_CONVERT, gm)] ++ AS_IF([test x == x$MAGICK_CONVERT], + [AC_MSG_ERROR([$with_magick requested but not found])]) + AC_DEFINE([HAVE_GRAPHICS_MAGICK], [1]) +- MAGICK_CONVERT="gm convert" ++ HAVE_MAGICK=1 ++ MAGICK_CONVERT="$MAGICK_CONVERT convert" + ], + [xImageMagick], +- [AC_CHECK_PROGS([MAGICK_CONVERT], [convert]) +- AS_IF([test xconvert != x$MAGICK_CONVERT], ++ [[AC_PATH_PROG(MAGICK_CONVERT, convert)] ++ AS_IF([test x == x$MAGICK_CONVERT], + [AC_MSG_ERROR([$with_magick requested but not found])]) + AC_DEFINE([HAVE_IMAGE_MAGICK], [1]) ++ HAVE_MAGICK=1 + ], + [xyes|xcheck], +- [AC_CHECK_PROGS([MAGICK_CONVERT], [gm convert]) ++ [[AC_PATH_PROGS([MAGICK_CONVERT], [gm convert])] + AS_CASE(x$MAGICK_CONVERT, +- [xgm], ++ [x*gm], + [AC_DEFINE([HAVE_GRAPHICS_MAGICK], [1]) +- MAGICK_CONVERT="gm convert" ++ HAVE_MAGICK=1 ++ MAGICK_CONVERT="$MAGICK_CONVERT convert" + ], +- [xconvert], ++ [x*convert], + [AC_DEFINE([HAVE_IMAGE_MAGICK], [1]) ++ HAVE_MAGICK=1 + ], + [dnl default case + AS_IF([test xcheck != "x$with_magick"], +@@ -410,7 +417,7 @@ AS_IF([test xno != "x$with_magick"], + AC_MSG_ERROR([unknown value: --with-magick=$with_magick]) + ])) + AC_DEFINE_UNQUOTED([MAGICK_CONVERT], ["$MAGICK_CONVERT"]) +-AM_CONDITIONAL([have_magick], [test x != "x$MAGICK_CONVERT"]) ++AM_CONDITIONAL([have_magick], [test x != "x$HAVE_MAGICK"]) + + AS_IF([test xno != "x$with_gtkmm"], + [PKG_CHECK_MODULES([LIBGTKMM], [gtkmm-2.4 >= 2.20], +Index: utsushi-0.57.0/filters/magick.cpp +=================================================================== +--- utsushi-0.57.0.orig/filters/magick.cpp ++++ utsushi-0.57.0/filters/magick.cpp +@@ -81,19 +81,18 @@ chomp (char *str) + } + + bool +-magick_version_before_(const char *magick, const char *cutoff) ++magick_version_before_(const char *cutoff) + { + FILE *fp = NULL; + int errc = 0; + +- if (0 == strcmp ("GraphicsMagick", magick)) +- fp = popen ("gm convert -version" +- "| awk '/^GraphicsMagick/{print $2}'", "r"); +- if (fp) errc = errno; +- +- if (0 == strcmp ("ImageMagick", magick)) +- fp = popen ("convert -version" +- "| awk '/^Version:/{print $3}'", "r"); ++#if HAVE_GRAPHICS_MAGICK ++ fp = popen (MAGICK_CONVERT " -version" ++ "| " AWK " '/^GraphicsMagick/{print $2}'", "r"); ++#elif HAVE_IMAGE_MAGICK ++ fp = popen (MAGICK_CONVERT " -version" ++ "| " AWK " '/^Version:/{print $3}'", "r"); ++#endif + if (fp) errc = errno; + + if (fp) +@@ -106,42 +105,32 @@ magick_version_before_(const char *magic + + if (version) + { +- log::debug ("found %1%-%2%") % magick % version; ++ log::debug ("found " MAGICK_CONVERT "version %1%") % version; + return (0 > strverscmp (version, cutoff)); + } + } + + if (errc) +- log::alert ("failure checking %1% version: %2%") +- % magick ++ log::alert ("failure checking " MAGICK_CONVERT " version: %1%") + % strerror (errc); + + return false; + } + + bool +-graphics_magick_version_before_(const char *cutoff) +-{ +- return magick_version_before_("GraphicsMagick", cutoff); +-} +- +-bool +-image_magick_version_before_(const char *cutoff) +-{ +- return magick_version_before_("ImageMagick", cutoff); +-} +- +-bool + auto_orient_is_usable () + { + static int usable = -1; + + if (-1 == usable) + { +- if (HAVE_GRAPHICS_MAGICK) // version -auto-orient was added +- usable = !graphics_magick_version_before_("1.3.18"); +- if (HAVE_IMAGE_MAGICK) // version known to work +- usable = !image_magick_version_before_("6.7.8-9"); ++#if HAVE_GRAPHICS_MAGICK ++ // version -auto-orient was added ++ usable = !magick_version_before_("1.3.18"); ++#elif HAVE_IMAGE_MAGICK ++ // version known to work ++ usable = !magick_version_before_("6.7.8-9"); ++#endif + if (-1 == usable) + usable = false; + usable = (usable ? 1 : 0); +@@ -392,7 +381,7 @@ magick::arguments (const context& ctx) + if (color_correction_) + { + if (HAVE_IMAGE_MAGICK +- && !image_magick_version_before_("6.6.1-0")) ++ && !magick_version_before_("6.6.1-0")) + argv += " -color-matrix"; + else + argv += " -recolor"; +@@ -416,7 +405,7 @@ magick::arguments (const context& ctx) + size_t mat_size = ((HAVE_IMAGE_MAGICK) ? 6 : 5); + + if (HAVE_IMAGE_MAGICK +- && !image_magick_version_before_("6.6.1-0")) ++ && !magick_version_before_("6.6.1-0")) + argv += " -color-matrix"; + else + argv += " -recolor"; diff --git a/pkgs/misc/drivers/utsushi/patches/absolute_path_for_tesseract.patch b/pkgs/misc/drivers/utsushi/patches/absolute_path_for_tesseract.patch new file mode 100644 index 00000000000..d4d44497921 --- /dev/null +++ b/pkgs/misc/drivers/utsushi/patches/absolute_path_for_tesseract.patch @@ -0,0 +1,56 @@ +Index: utsushi-0.57.0/filters/reorient.cpp +=================================================================== +--- utsushi-0.57.0.orig/filters/reorient.cpp ++++ utsushi-0.57.0/filters/reorient.cpp +@@ -96,8 +96,8 @@ chomp (char *str) + bool + tesseract_version_before_(const char *cutoff) + { +- FILE *fp = popen ("tesseract --version 2>&1" +- "| awk '/^tesseract/{ print $2 }'", "r"); ++ FILE *fp = popen (TESSERACT " --version 2>&1" ++ "| " AWK " '/^tesseract/{ print $2 }'", "r"); + int errc = errno; + + if (fp) +@@ -126,7 +126,7 @@ tesseract_version_before_(const char *cu + bool + have_tesseract_language_pack_(const char *lang) + { +- std::string cmd("tesseract --list-langs 2>&1" ++ std::string cmd(TESSERACT " --list-langs 2>&1" + "| sed -n '/^"); + cmd += lang; + cmd += "$/p'"; +@@ -291,7 +291,7 @@ reorient::reorient () + + if (found) + { +- if (have_tesseract_()) engine_ = "tesseract"; ++ if (have_tesseract_()) engine_ = TESSERACT; + if (have_ocr_engine_()) engine_ = abs_path_name; + } + freeze_options (); // initializes option tracking member variables +Index: utsushi-0.57.0/configure.ac +=================================================================== +--- utsushi-0.57.0.orig/configure.ac ++++ utsushi-0.57.0/configure.ac +@@ -196,6 +196,8 @@ AC_DEFINE([HAVE_IMAGE_MAGICK_PP], + [0], [Define to 1 if ImageMagick's C++ API is usable]) + AC_DEFINE([MAGICK_CONVERT], + [], [Define to an appropriate command-line invocation for convert]) ++AC_DEFINE([TESSERACT], ++ [], [Define to an appropriate command-line invocation for tesseract]) + AC_DEFINE([WITH_INCLUDED_BOOST], + [0], [Define to 1 if using the included Boost sources]) + +@@ -419,6 +421,9 @@ AS_IF([test xno != "x$with_magick"], + AC_DEFINE_UNQUOTED([MAGICK_CONVERT], ["$MAGICK_CONVERT"]) + AM_CONDITIONAL([have_magick], [test x != "x$HAVE_MAGICK"]) + ++AC_PATH_PROG([TESSERACT], [tesseract], [tesseract]) ++AC_DEFINE_UNQUOTED([TESSERACT], ["$TESSERACT"]) ++ + AS_IF([test xno != "x$with_gtkmm"], + [PKG_CHECK_MODULES([LIBGTKMM], [gtkmm-2.4 >= 2.20], + [AC_DEFINE([HAVE_LIBGTKMM], [1])], diff --git a/pkgs/misc/drivers/utsushi/patches/print-errors.patch b/pkgs/misc/drivers/utsushi/patches/print-errors.patch new file mode 100644 index 00000000000..06660ebde98 --- /dev/null +++ b/pkgs/misc/drivers/utsushi/patches/print-errors.patch @@ -0,0 +1,15 @@ +Index: utsushi-0.57.0/lib/log.cpp +=================================================================== +--- utsushi-0.57.0.orig/lib/log.cpp ++++ utsushi-0.57.0/lib/log.cpp +@@ -26,8 +26,8 @@ + + namespace utsushi { + +-log::priority log::threshold = log::FATAL; +-log::category log::matching = log::NOTHING; ++log::priority log::threshold = log::ERROR; ++log::category log::matching = log::ALL; + + template<> + std::basic_ostream< char >& diff --git a/pkgs/misc/drivers/utsushi/patches/series b/pkgs/misc/drivers/utsushi/patches/series new file mode 100644 index 00000000000..de0964c758b --- /dev/null +++ b/pkgs/misc/drivers/utsushi/patches/series @@ -0,0 +1,3 @@ +absolute-path-to-convert.patch +print-errors.patch +absolute_path_for_tesseract.patch diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index a75c6c1ec76..d68ac0f9fc1 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}: stdenv.mkDerivation rec { - version = "6.2.11"; + version = "7.0.2"; name = "seafile-shared-${version}"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "16d4m5n5zhip13l6pv951lm081pnwxpiqcm7j4gxqm1ian48m787"; + sha256 = "0633hhz2cky95y8mvrg9q2cyrnzpnzvn8fcq350wl4a64ij6wa04"; }; nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ]; diff --git a/pkgs/misc/themes/adwaita-qt/default.nix b/pkgs/misc/themes/adwaita-qt/default.nix index f2a682bcf7d..9b979a11b93 100644 --- a/pkgs/misc/themes/adwaita-qt/default.nix +++ b/pkgs/misc/themes/adwaita-qt/default.nix @@ -1,16 +1,14 @@ -{ stdenv, fetchFromGitHub, cmake, ninja, qtbase }: +{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, qtbase }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "adwaita-qt"; - version = "1.0"; - - name = "${pname}-${version}"; + version = "1.1.0"; src = fetchFromGitHub { owner = "FedoraQt"; repo = pname; rev = version; - sha256 = "0xn8bianmdj15k11mnw52by9vxkmvpqr2s304kl3dbjj1l7v4cd7"; + sha256 = "1jlh4l3sxiwglgx6h4aqi364gr4xipmn09bk88cp997r9sm8jcp9"; }; nativeBuildInputs = [ @@ -28,7 +26,7 @@ stdenv.mkDerivation rec { --replace "DESTINATION \"\''${QT_PLUGINS_DIR}/styles" "DESTINATION \"$qtPluginPrefix/styles" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A style to bend Qt applications to look like they belong into GNOME Shell"; homepage = https://github.com/FedoraQt/adwaita-qt; license = licenses.gpl2Plus; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 7ad6283c930..5b1032fb031 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -39,12 +39,12 @@ let agda-vim = buildVimPluginFrom2Nix { pname = "agda-vim"; - version = "2019-01-23"; + version = "2019-08-04"; src = fetchFromGitHub { owner = "derekelkins"; repo = "agda-vim"; - rev = "06efbd079a7dfc0a8b079aed4509e17113cc0977"; - sha256 = "06i9m2xbdsp704d71zv6jcbbn7ibp3fy3wn823azkjcnk317n73i"; + rev = "4fc0a0a95a347b7b98715a78b6f41edd5aa084c5"; + sha256 = "15zzc1aqzflw36462ka5914cmfqckciqcgcff0kfmzglfcx7is6z"; }; }; @@ -303,34 +303,34 @@ let coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2019-07-24"; + version = "2019-08-11"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "e7f37ceaf250b152de5712454f42172337cb8a0f"; - sha256 = "0p2m3gwhjifbf53g68r8prg7rz7gm5nzv9hw4ar6msy61rmjpy56"; + rev = "30021c6a3aa7a33617ce1cb187468851bbaf1eb5"; + sha256 = "09r0ygsjv5d3v6js1ghb49j74plp0jkja2pmd1pbjgafxm02mb2y"; }; }; coc-go = buildVimPluginFrom2Nix { pname = "coc-go"; - version = "2019-08-02"; + version = "2019-08-06"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-go"; - rev = "6a4b1485dbbd1e4bbc18a03beaeebe3cc6018e8f"; - sha256 = "1nd9fph6yvg1n7cabd5li9qxs3b2g0v3q7qq1n1xmp3n49c5m0nr"; + rev = "3f2748c87c89242c59d3583e8effa0de76c8abe7"; + sha256 = "1c7v1j3vny20dkc898hgr6val3jk1vc2aswsqm3cb2c3mqwhsrls"; }; }; coc-highlight = buildVimPluginFrom2Nix { pname = "coc-highlight"; - version = "2019-07-01"; + version = "2019-08-03"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-highlight"; - rev = "00e3cc159b3ce427d9f4e7993bcd963f37a3eb54"; - sha256 = "0q9dfnn598499b8r9nsw0fi5ng873rvhwl5l70zqnc8ny9rbv74r"; + rev = "b84cfa2738ab0843217c742eb69b4b6e630d45fa"; + sha256 = "0yrl29fdn0hwyiz4z75km1gidc4bkx1ra6g1pfddlwbbjj32lbqp"; }; }; @@ -413,12 +413,12 @@ let coc-pairs = buildVimPluginFrom2Nix { pname = "coc-pairs"; - version = "2019-07-25"; + version = "2019-08-07"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-pairs"; - rev = "3070d22f15c8e41ff01aed9b6b9a377ae5f0358a"; - sha256 = "00ixzdn3wpwm3pp0b87l4bvln9nrmqcd0k5c851x6bif06gsnydz"; + rev = "51e404a60fa0461ebfaea4ba1311357b8825e73f"; + sha256 = "0sz45z7i7fqnvl4968dalksz9qk0al6a57wyyhyl7rx1wv67vaya"; }; }; @@ -490,12 +490,12 @@ let coc-solargraph = buildVimPluginFrom2Nix { pname = "coc-solargraph"; - version = "2019-06-21"; + version = "2019-08-11"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-solargraph"; - rev = "f7732c49d5173a4f32f3419eaf591857b9d753cb"; - sha256 = "14fcl9zwyq8rpc9pdbydsf1jilc8wmylvs8wjc13l8h3avndpkwd"; + rev = "6a146623192e661e18830c58abe1055fddcf57d7"; + sha256 = "1mc8jqpgwy5q4jzb5p09j5mal9paq50dl1hsxhg0y5q6rqrr7qhz"; }; }; @@ -512,12 +512,12 @@ let coc-tabnine = buildVimPluginFrom2Nix { pname = "coc-tabnine"; - version = "2019-07-21"; + version = "2019-08-11"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tabnine"; - rev = "4cddbdc9ecb92fb1633bd3b89bb9aacc3a5504ce"; - sha256 = "08k6vmdzgws6f9461gjc4psqn2ypwf1nz9sjncs1vddckxwxl9k3"; + rev = "819e2c523df6f809e0f83e4b5079bc9702adbe66"; + sha256 = "1l1hajj7hihm5klar28j6jqsad6bnjcy3h2cddvhavm696azibfv"; }; }; @@ -788,12 +788,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-08-03"; + version = "2019-08-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "85fa3ed3b430df61d1b8aeb8772162acfebc1f46"; - sha256 = "1m7y3ph51wxcm3yasdg3ajxwm4bqdjq7ajg5c4f3d3xf8f2nkl87"; + rev = "fb56c2ca2ff655c4d82e000e13e233629894caac"; + sha256 = "1bwcm7smvfpllbkxb512ys9gjc5gin7v75jkys7q0xq0xb73d1hn"; }; }; @@ -901,12 +901,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-08-03"; + version = "2019-08-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "e8cab49ac99a5bb45e16a4bf24bb697163e7beaf"; - sha256 = "1g03ybsjv7j5iad34bax949s29lxi89cs5i3g9h0ypg4if1c0g53"; + rev = "153e242b07cfe5d67cd217eda3163730046de88b"; + sha256 = "08slqd2kcy94xs669y8rbyz8xz72zn4rasa0yyk3i7yp8w4awgp8"; }; }; @@ -1124,12 +1124,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2019-07-04"; + version = "2019-08-07"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "08dff021a806c252d8eeccf44fa30e8d4118b137"; - sha256 = "05w4lqqs25m10rpjglkm1ggyssl9kig0nbd0qkg0l38zhc87afjr"; + rev = "f7aee1f324d2a731a13b4495260a1aeaf0c0b52a"; + sha256 = "1s0byckwkxwhrzrhdhjvfzzyg3pvbkbc3pikp395pzcf8kmpmvcv"; }; }; @@ -1477,12 +1477,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-08-02"; + version = "2019-08-06"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "d589eb55305043955e65df8f326580f06e4533c9"; - sha256 = "0fvj8p5dh0gg9kxnn6shfyb84jmvv5f6wvh6fa0cgycy7xl1jrrk"; + rev = "f5039419d87b76accee7000319b394ce25a0dbfb"; + sha256 = "0cfjw1jpddw92jz62ly8m6waxknj19cazff01x8drk1lr9xj6wdy"; }; }; @@ -1697,12 +1697,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-07-28"; + version = "2019-08-10"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "d49607c3dd8d041f3f61bc2ae58569b3f8259830"; - sha256 = "05akv0j09jr4k7hjyn717lpsw4xkjyfk572yabzfryii40mi3iga"; + rev = "ebfb1f5a24f39561b0299ffe4d346582a6e2432d"; + sha256 = "0yjd3h36zd5g4m0ldijx0p75hlf2dq69y38ilwpm2zp8rqhqgmaw"; }; }; @@ -1719,12 +1719,12 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2019-08-03"; + version = "2019-08-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "c5b182d5831f298bde1d6ce9bf28ada62fb61157"; - sha256 = "0diq8yhrs0359sajzd07ri0f985lgkl5959284pbjhv3r8vm22rc"; + rev = "f38f1732e4bb0643b3019b5b733a87f5f03ea348"; + sha256 = "1brzryd2sc44xpkz4w4s78a8vmwddvzkqgiyiaygp45k87q2yp24"; }; }; @@ -1785,23 +1785,23 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2019-07-03"; + version = "2019-08-07"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdcommenter"; - rev = "7f5c217f79b8fce063fec490ab0b2814dd480f08"; - sha256 = "0s7njz8v408hrb0kbkiisrjvqmzy9z5dxgd738ncpxpslyd81xlw"; + rev = "a05185584d7cae7791fb40b7656cf642fdbe4938"; + sha256 = "1yri2gw2i4nkssm6fd1l8b9hkinb6h70wsavkb712ivdzqpcls6y"; }; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2019-07-14"; + version = "2019-08-09"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "63c59208c1f9eef7068a944f5c3033bd1a348b97"; - sha256 = "11531x591dw99mf3ladsim6cv162ypb421q60kljg0hg7fvjml8y"; + rev = "184fbb6ffea6dc69726b229a08153c9d08522386"; + sha256 = "1h4wqmiplk3ay56db20dxxw90i9rij2kp2zjfhbfz525pxjg82gn"; }; }; @@ -1884,12 +1884,12 @@ let nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev-nvim"; - version = "2019-07-29"; + version = "2019-08-05"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "a874e3ae9ecd58c6b95b20813e47c4b45bd66a37"; - sha256 = "0kcki6g20i8p7fmh07cspz3vb38rz3w04mvima9b2kd6hqv23px7"; + rev = "4f2f53872672f44049cef04a1f8f3cc4f921eae8"; + sha256 = "1yci56rdxqk5zfzqlkmhsw5s7c9xladhl3d4ks1j2b4dcb8gdsf5"; }; }; @@ -2379,12 +2379,12 @@ let tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2019-07-23"; + version = "2019-08-11"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "9de9f7611297a1198b782d81eca84ec49e86008b"; - sha256 = "0lbnd4l0jslfhizg5v7d0db1kwvvqpf5d9s2d51mmy6a0787qb0h"; + rev = "c9cecefc639b6019e0f12b7e9fb5a2375cd550c1"; + sha256 = "0xb61wchvj1iqzwxzscv3zwbsx1qjh8qhkmijsrjz92566g12xhy"; }; }; @@ -2786,12 +2786,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-07-27"; + version = "2019-08-11"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "c213f2ac44292a6c5548872e63acb0648cc07a9a"; - sha256 = "0imhjaqhr145vw52517jbg8ckw4y9qr831v3rq8qpxgxawanr02w"; + rev = "a40184536b3b93b6272585da9c36dca802d47a01"; + sha256 = "0ygv6mc8fby6chzms7ah6sbq7yf7jhcnavbw52dra2sdfm2h2kch"; }; }; @@ -3083,23 +3083,23 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2019-07-20"; + version = "2019-08-05"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "eba64ed111a3aab8121a0e5b6df62c6f19e05322"; - sha256 = "13cmxbpimnm9nkn9igkd8cpcvydw6nlzgyxzq11qdj31bjfs4nma"; + rev = "3020cce00581054e9177297ee5461737a35de7de"; + sha256 = "1qvkgjfrwl2qmi2b1cvznvbmsn8rqgm4wcgb79il07ij4lnwf9g9"; }; }; vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2019-08-01"; + version = "2019-08-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "c58708e820252d594541a86e31fbc95ec8d37e3e"; - sha256 = "0py41f0dkvx95w8hb3a2cys981x8nz4a0nn3hs7rjv3z0brrsxfx"; + rev = "a76bec9196fe27e195d167a5c2ee1da763d31b96"; + sha256 = "0a9sxpdpll68drk3w98xvmv2z31q4afw70iwjrb7lmp8raxn0i2z"; }; }; @@ -3215,12 +3215,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-08-02"; + version = "2019-08-09"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "5886fd272a7957fa2791c567866c7fc2b4dec73c"; - sha256 = "11ygf520p7s7fj7gv1pnzv62ywa2afbm5kbkipbdwwnd4m90amzk"; + rev = "c4f084bc36bbb7b2ab4216d87f1cce644d278dc7"; + sha256 = "1c3vfpq7d3fibjz748sracfbxg6xp28c2y5780cc1jkph5z7wvvj"; }; }; @@ -3281,12 +3281,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-08-03"; + version = "2019-08-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "e5a6a8c5256c8afe2c607f8566e4ef35c43b5de2"; - sha256 = "165vgx5h1qmkbir30a1hd5mym2d09wz0q556cwhipmypkyfnfzcp"; + rev = "4daa0c558ceb14223c6c6861063ef0ae9a35233b"; + sha256 = "13m30hl6syha9pkr58w23sch89m2nd9cgxbdnkkcqvbzlq202nfh"; }; }; @@ -3325,12 +3325,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2019-07-26"; + version = "2019-08-10"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "c75c83df531881008f8cf903eab7cd68bc19ff7a"; - sha256 = "1j0jy4bld43lwsjwkmym369scxpk8zbj0v3sskam8sq71blkzqca"; + rev = "9bf988bd1d2d8001f84126d8bf74036bab33bb9b"; + sha256 = "0ksz7k29nzs00apnimp2r3hqjamdhcpr9h241hcagil3dqraqi5d"; }; }; @@ -3358,12 +3358,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-08-02"; + version = "2019-08-09"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "974fd4367cd327a075b79f6d9d7b71f3e84d7a4c"; - sha256 = "1q8k9rgy191d502jl654nvlmh2nd5m2lq03l5ldyi2y6cgrd5k8d"; + rev = "ed63c87496c030d436507c4eb211a923aa5dc90b"; + sha256 = "0vxqx343wgc9dr9s7jx33hai7ib8cqlfqfpwbmv7zq83x5ff0sh6"; }; }; @@ -3689,12 +3689,12 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2019-07-27"; + version = "2019-08-07"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "994503b30c929353c107eb9166accd68d35b83b5"; - sha256 = "134cmj0ajxjps649prmra9jgqp9gxqcfk0llxj92x0srjcg1xjhf"; + rev = "49a4b2e2a66b43c1335d1df378d5ebb6f381fe05"; + sha256 = "0pfscx95cjkw48ccn53x04wkrbh2kan2p3djyk2f5ml9n1ln8if5"; }; }; @@ -3810,12 +3810,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2019-08-02"; + version = "2019-08-10"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "ad9d2bd0582419e902bc402545da397634202ed0"; - sha256 = "12b46vcc8kw6nhp177vs8b4lwh0nd34a74j5vfa2wd5d3mhqz5j8"; + rev = "329d894f941945287e9797c42e6125838c8a2ac0"; + sha256 = "1cv1mgdc4i68kvbh1z090vj29yl2axqfnnlizikbf1z68s2ghnvr"; }; }; @@ -3975,12 +3975,12 @@ let vim-orgmode = buildVimPluginFrom2Nix { pname = "vim-orgmode"; - version = "2018-07-25"; + version = "2019-08-05"; src = fetchFromGitHub { owner = "jceb"; repo = "vim-orgmode"; - rev = "35e94218c12a0c063b4b3a9b48e7867578e1e13c"; - sha256 = "0j6zfqqysnky4z54413l87q7wxbskg0zb221zbz48ry4l1anilhx"; + rev = "10b5ddf57f9416ed5a33419e1095dba7d239b297"; + sha256 = "1hik7bkk1rfxwwn77w1p7c6m1dz7ifpvnnfs8yizhlp9rgs0wjch"; }; }; @@ -4052,12 +4052,12 @@ let vim-peekaboo = buildVimPluginFrom2Nix { pname = "vim-peekaboo"; - version = "2017-03-20"; + version = "2019-08-11"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-peekaboo"; - rev = "a7c940b15b008afdcea096d3fc4d25e3e431eb49"; - sha256 = "1rc4hr6vwj2mmrgz8lifxf9rvcw1rb5dahq649yn8ccw03x8zn6m"; + rev = "9d3c7f39a6771496fac5f730ae7574bc57da21b4"; + sha256 = "0r61r0s01nn4n153k60dlhr3l0sfj0gcx4y5ry7cvixl85b6y505"; }; }; @@ -4272,12 +4272,12 @@ let vim-sensible = buildVimPluginFrom2Nix { pname = "vim-sensible"; - version = "2019-07-29"; + version = "2019-08-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sensible"; - rev = "67fe033b2b56b6f631a4c7a1179865178665f2a4"; - sha256 = "1jhj88n0xj6s6xjx5zs5906y6wwzr855wczk3f5myzs8z8y5cih5"; + rev = "c176d137892f33945d3d4dd766fd21611e9b5ddf"; + sha256 = "11adqaccwph4z5a4kyycd1gbc1l9np4za0d4fbd3cnh1zqf2xzjz"; }; }; @@ -4294,12 +4294,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2019-05-29"; + version = "2019-08-09"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "ac23bd95d5fe0c7a7bf4a331e9d37eb72697c46e"; - sha256 = "18vwj2avxpvgk7pl82i6sxvv6cr80g0gvfsljpag1ncg278yap97"; + rev = "2673d732dd329b012b1f319de8ba289dbf5a281e"; + sha256 = "0qmf32yi6kk8y020qgi2g7xw3c7kxh0i58r5y3mfwya9f4lqm43r"; }; }; @@ -4360,12 +4360,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-07-19"; + version = "2019-08-11"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "84ab7e118ca5fee5a67ce4c884c0c1d5c9308e21"; - sha256 = "1ya7y9alzqqy8cpz1sljaqmh8f8pnd5pap9fmg99awr7bpn431rc"; + rev = "5dc42dbc6c4d9b5068ddde901b79c5e483c42114"; + sha256 = "00kf6a5k0gkync0pgw3d3b7gdm6ykb14lvybiaprvbsnxnflgw95"; }; }; @@ -4415,12 +4415,12 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2019-07-29"; + version = "2019-08-07"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "9abd2c76845de00eab207576b69332cf0e16d35c"; - sha256 = "0ljial7ymyzqbzzrmfh87v4207hhkfq0f5lq8v6jbv92nafrq17s"; + rev = "2486ab67bc5a84414ec8792f5ce7aaf04a91138c"; + sha256 = "1wpk9xflhj2cklfk9ac6dpp436gizl6la8877d8ra19774zgw0k1"; }; }; @@ -4503,12 +4503,12 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2019-07-08"; + version = "2019-08-06"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "6ee2aab70d8cd3d2405b3042141c94766ea461b0"; - sha256 = "1zld21a0l94hg3qvpb6rzi8kvv9f86mn7pl95rjvs022vfprry05"; + rev = "8b0a0ee7f2463f6949a5ce778169a782b80cdab4"; + sha256 = "0d66hv8r7hnahs6nh6jj00xbly38xgfz6ilg5zlab2kgswmkzxrf"; }; }; @@ -4646,12 +4646,12 @@ let vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2019-06-29"; + version = "2019-08-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "a49c4f2bf05f18a6e4f6572a19763ba7abba52b1"; - sha256 = "0ivybshm1dvlqsbh153a3fq3dhwj144x049l78ss7zrqnbb70jsw"; + rev = "ab7082c0e89df594a5ba111e18af17b3377d216d"; + sha256 = "1gvzjihkxnc84kd7sdh26kmm0rqi19xmwiisfqhf307yqyqa6lkj"; }; }; @@ -4690,12 +4690,12 @@ let vim-vue = buildVimPluginFrom2Nix { pname = "vim-vue"; - version = "2019-08-01"; + version = "2019-08-03"; src = fetchFromGitHub { owner = "posva"; repo = "vim-vue"; - rev = "fcdc2d25d19edf5f0dcf87bc2c5c7327190bf59b"; - sha256 = "1lryy3kqihgm3sql686z3irwsr96ka0vj10bqfsdmjzk05h87yhb"; + rev = "c424294e769b26659176065f9713c395731f7b3a"; + sha256 = "1ig8qacavr15i6z7whlkf2ivw5smnqsw3jwhh4dg5q6037k1hjh1"; }; }; @@ -4822,12 +4822,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-08-03"; + version = "2019-08-09"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "b2385ed9016442a27c8ce028ab566de864ee1910"; - sha256 = "0q2w8jhnpfzr49bqpmgya31w55pi7zvr41ar6maqchqi9fns25gf"; + rev = "d01f136c068451ef99795ceb15d285d362bec61b"; + sha256 = "06hqzw63mijiqadczaf2x3sy117hlzil16la1w6ynf6d37hr1zq1"; }; }; @@ -4844,12 +4844,12 @@ let vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; - version = "2019-04-20"; + version = "2019-08-08"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "be793e28bea4ac30c19c15c4db3fd42d26a5debe"; - sha256 = "18jkhpxmg5crbjsy4bnymgggsd73dqjvjb74kirxj86hh1khfqnh"; + rev = "57d23fa763b498561aca7eb4efb05b52efd120c9"; + sha256 = "034857pz36rps7jmg79brcb25vfb4dgqpdhfy24vyhn3nil46jxs"; }; }; @@ -4977,12 +4977,12 @@ let youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-07-27"; + version = "2019-08-10"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "afa2ea03d03e6793d34704e4c75f2846ecbffd52"; - sha256 = "0n3c5hzg3bxhcc0ixv7a8rkfwsqprkgd3nxaj5wc36kc2832rg6s"; + rev = "afd69b382844315812fd48912eaa9fa47cba3a8d"; + sha256 = "1x4q1l7dw0axm3hywj5p77057jh0qac7khk2clpdilfwhak0jp07"; fetchSubmodules = true; }; }; @@ -5022,12 +5022,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2019-07-27"; + version = "2019-08-03"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "b0c2afdd248b08a4525cba3fc428205f37cf0aad"; - sha256 = "05864kcrrkdvdydp967lg1ab3q4w9i1i75s0hpycnk3cvs51z88q"; + rev = "5ef469df4f663a81e983f5ee4dce9b50b8a612af"; + sha256 = "0bmcc051n9jhzggsi1mwcmlsg5qhhzycvsrziladl7xg22nv8w5m"; }; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 0281f9220e9..0c0a883f80a 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -33,6 +33,9 @@ self: super: { dependencies = with super; [ vim-addon-manager ]; }; + # Mainly used as a dependency for fzf-vim. Wraps the fzf program as a vim + # plugin, since part of the fzf vim plugin is included in the main fzf + # program. fzfWrapper = buildVimPluginFrom2Nix { pname = "fzf"; version = fzf.version; @@ -225,6 +228,10 @@ self: super: { dependencies = with super; [ ultisnips ]; }); + fzf-vim = super.fzf-vim.overrideAttrs(old: { + dependencies = [ self.fzfWrapper ]; + }); + sved = let # we put the script in its own derivation to benefit the magic of wrapGAppsHook svedbackend = stdenv.mkDerivation { diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 14332c70078..44bc7ec3ced 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -188,7 +188,8 @@ let vam ? null, pathogen ? null, plug ? null, - customRC ? "" + customRC ? "", + beforePlugins ? "", }: let @@ -291,7 +292,7 @@ let " tell vam about which plugins to load when: let l = [] - ${lib.concatMapStrings (p: "call add(l, ${toNix p})\n") vam.pluginDictionaries} + ${lib.concatMapStrings (p: "call add(l, {'name': '${p.pname}'})\n") plugins} call vam#Scripts(l, {}) ''); @@ -341,6 +342,8 @@ let " minimal setup, generated by NIX set nocompatible + ${beforePlugins} + ${vamImpl} ${pathogenImpl} ${plugImpl} diff --git a/pkgs/os-specific/linux/beegfs/default.nix b/pkgs/os-specific/linux/beegfs/default.nix index 076c19cf400..50c48098ab0 100644 --- a/pkgs/os-specific/linux/beegfs/default.nix +++ b/pkgs/os-specific/linux/beegfs/default.nix @@ -159,5 +159,8 @@ in stdenv.mkDerivation rec { free = false; }; maintainers = with maintainers; [ markuskowa ]; + # 2019-08-09 + # fails to build and had stability issues earlier + broken = true; }; } diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 7270877c52e..f041d2b5042 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { patches = [ ./busybox-in-store.patch - ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.targetPlatform) ./clang-cross.patch; + ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch; postPatch = "patchShebangs ."; diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index 887c09691eb..b10d45d8a4b 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -1,21 +1,46 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig }: +{ stdenv +, fetchgit +, autoreconfHook +, pkgconfig +, dbus +}: stdenv.mkDerivation rec { pname = "ell"; - version = "0.20"; + version = "0.21"; + + outputs = [ "out" "dev" ]; src = fetchgit { - url = https://git.kernel.org/pub/scm/libs/ell/ell.git; + url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "1g143dbc7cfks63k9yi2m8hpgfp9jj5b56s3hyxjzxm9dac3yn6c"; + sha256 = "0m7fk2xgzsz7am0wjw98sqa42zpw3cz3hz399niw5rj8dbqh0zpy"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + patches = [ + ./fix-dbus-tests.patch + ]; + + nativeBuildInputs = [ + pkgconfig + autoreconfHook + ]; + + checkInputs = [ + dbus + ]; + + enableParallelBuilding = true; + + doCheck = true; meta = with stdenv.lib; { - homepage = https://git.kernel.org/pub/scm/libs/ell/ell.git; + homepage = https://01.org/ell; description = "Embedded Linux Library"; - license = licenses.lgpl21; + longDescription = '' + The Embedded Linux* Library (ELL) provides core, low-level functionality for system daemons. It typically has no dependencies other than the Linux kernel, C standard library, and libdl (for dynamic linking). While ELL is designed to be efficient and compact enough for use on embedded Linux platforms, it is not limited to resource-constrained systems. + ''; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ mic92 dtzWill ]; }; diff --git a/pkgs/os-specific/linux/ell/fix-dbus-tests.patch b/pkgs/os-specific/linux/ell/fix-dbus-tests.patch new file mode 100644 index 00000000000..b494ba8b43c --- /dev/null +++ b/pkgs/os-specific/linux/ell/fix-dbus-tests.patch @@ -0,0 +1,65 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -140,6 +140,7 @@ + ell_libell_private_la_SOURCES = $(ell_libell_la_SOURCES) + + AM_CFLAGS = -fvisibility=hidden -DUNITDIR=\""$(top_srcdir)/unit/"\" \ ++ -DDBUS_DAEMON=\""$(DBUS_DAEMONDIR)/dbus-daemon"\" \ + -DCERTDIR=\""$(top_builddir)/unit/"\" + + pkgconfigdir = $(libdir)/pkgconfig +--- a/configure.ac ++++ b/configure.ac +@@ -14,6 +14,8 @@ + + AC_PREFIX_DEFAULT(/usr/local) + ++PKG_PROG_PKG_CONFIG ++ + COMPILER_FLAGS + + AC_LANG_C +@@ -131,6 +133,10 @@ + AC_CHECK_PROG(have_xxd, [xxd], [yes], [no]) + fi + ++PKG_CHECK_MODULES(DBUS, dbus-1, dummy=yes, ++ AC_MSG_ERROR(D-Bus is required for running tests)) ++PKG_CHECK_VAR(DBUS_DAEMONDIR, dbus-1, daemondir) ++ + AM_CONDITIONAL(DBUS_TESTS, test "${little_endian}" = "yes") + AM_CONDITIONAL(CERT_TESTS, test "${have_openssl}" = "yes") + +--- a/unit/test-dbus-message-fds.c ++++ b/unit/test-dbus-message-fds.c +@@ -51,7 +51,7 @@ + char *prg_envp[1]; + pid_t pid; + +- prg_argv[0] = "/usr/bin/dbus-daemon"; ++ prg_argv[0] = DBUS_DAEMON; + prg_argv[1] = "--nopidfile"; + prg_argv[2] = "--nofork"; + prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; +--- a/unit/test-dbus-properties.c ++++ b/unit/test-dbus-properties.c +@@ -48,7 +48,7 @@ + char *prg_envp[1]; + pid_t pid; + +- prg_argv[0] = "/usr/bin/dbus-daemon"; ++ prg_argv[0] = DBUS_DAEMON; + prg_argv[1] = "--nopidfile"; + prg_argv[2] = "--nofork"; + prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; +--- a/unit/test-dbus.c ++++ b/unit/test-dbus.c +@@ -45,7 +45,7 @@ + char *prg_envp[1]; + pid_t pid; + +- prg_argv[0] = "/usr/bin/dbus-daemon"; ++ prg_argv[0] = DBUS_DAEMON; + prg_argv[1] = "--nopidfile"; + prg_argv[2] = "--nofork"; + prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index b8fec2f416a..d4a23f3ed07 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, kernel, libdrm }: stdenv.mkDerivation rec { - name = "evdi-${version}"; - version = "1.6.1"; + pname = "evdi"; + version = "1.6.2"; src = fetchFromGitHub { owner = "DisplayLink"; - repo = "evdi"; + repo = pname; rev = "v${version}"; - sha256 = "1h98w1yfqsrjfhpnyfnggpkxs9yayw441nmfkllmzhzfnsd31fp7"; + sha256 = "0ajjsh1fw7w0k28r6qq7kh3qcr87gzzjp8s890algbglynlafzfw"; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index e0d70b5d43e..b4d5d54137c 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -17,6 +17,18 @@ let fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; + + isx86 = stdenv.isx86_64 || stdenv.isi686; + + # Dell isn't supported on Aarch64 + haveDell = isx86; + + # only redfish for x86_64 + haveRedfish = stdenv.isx86_64; + + # Currently broken on Aarch64 + haveFlashrom = isx86; + in stdenv.mkDerivation rec { pname = "fwupd"; version = "1.2.8"; @@ -32,11 +44,12 @@ in stdenv.mkDerivation rec { meson ninja gtk-doc pkgconfig gobject-introspection intltool shared-mime-info valgrind gcab docbook_xml_dtd_43 docbook_xsl help2man libxslt python wrapGAppsHook vala ]; + buildInputs = [ - polkit libxmlb gusb sqlite libarchive libsoup elfutils libsmbios gnu-efi libyaml - libgudev colord gpgme libuuid gnutls glib-networking efivar json-glib umockdev - bash-completion cairo freetype fontconfig pango - ]; + polkit libxmlb gusb sqlite libarchive libsoup elfutils gnu-efi libyaml + libgudev colord gpgme libuuid gnutls glib-networking json-glib umockdev + bash-completion cairo freetype fontconfig pango efivar + ] ++ stdenv.lib.optionals haveDell [ libsmbios ]; patches = [ ./fix-paths.patch @@ -71,11 +84,14 @@ in stdenv.mkDerivation rec { # /etc/os-release not available in sandbox # doCheck = true; - preFixup = '' + preFixup = let + binPath = [ efibootmgr bubblewrap tpm2-tools ] ++ stdenv.lib.optional haveFlashrom flashrom; + in + '' gappsWrapperArgs+=( --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" # See programs reached with fu_common_find_program_in_path in source - --prefix PATH : "${stdenv.lib.makeBinPath [ flashrom efibootmgr bubblewrap tpm2-tools ]}" + --prefix PATH : "${stdenv.lib.makeBinPath binPath}" ) ''; @@ -89,6 +105,13 @@ in stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/etc" "-Dsysconfdir_install=${placeholder "out"}/etc" + ] ++ stdenv.lib.optionals (!haveDell) [ + "-Dplugin_dell=false" + "-Dplugin_synaptics=false" + ] ++ stdenv.lib.optionals (!haveRedfish) [ + "-Dplugin_redfish=false" + ] ++ stdenv.lib.optionals (!haveFlashrom) [ + "-Dplugin_flashrom=false" ]; # TODO: We need to be able to override the directory flags from meson setup hook diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index 387792b8631..ad965f95c94 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl, libnl, pkgconfig}: +{ stdenv, fetchurl, pkgconfig, libnl }: stdenv.mkDerivation rec { pname = "iw"; - version = "5.0.1"; + version = "5.3"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "03awbfrr9i78vgwsa6z2c8g14mia9z8qzrvzxar2ad9299wylf0y"; + sha256 = "1m85ap8hwzfs7xf9r0v5d55ra4mhw45f6vclc7j6gsldpibyibq4"; }; nativeBuildInputs = [ pkgconfig ]; @@ -16,9 +16,15 @@ stdenv.mkDerivation rec { meta = { description = "Tool to use nl80211"; - homepage = http://wireless.kernel.org/en/users/Documentation/iw; + longDescription = '' + iw is a new nl80211 based CLI configuration utility for wireless devices. + It supports all new drivers that have been added to the kernel recently. + The old tool iwconfig, which uses Wireless Extensions interface, is + deprecated and it's strongly recommended to switch to iw and nl80211. + ''; + homepage = https://wireless.wiki.kernel.org/en/users/Documentation/iw; license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [ viric primeos ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 1ba463d1e9a..a1bb98b8297 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "0.18"; + version = "0.19"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; rev = version; - sha256 = "19scrkdyfj92cycirm22in1jf6rb77sy419gki4m9j8zdyapcqm9"; + sha256 = "0848r06bnx5k6wlmy425hljc3f03x9xx0r83vdvf630jryc9llmz"; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index f886fcfdc35..26fc07202bb 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -28,7 +28,7 @@ open ANSWERS, "<$ENV{KERNEL_CONFIG}" or die "Could not open answer file"; while () { chomp; s/#.*//; - if (/^\s*([A-Za-z0-9_]+)(\?)?\s+(\S+)\s*$/) { + if (/^\s*([A-Za-z0-9_]+)(\?)?\s+(.*\S)\s*$/) { $answers{$1} = $3; $requiredAnswers{$1} = !(defined $2); } elsif (!/^\s*$/) { diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 97df84f90b0..aed7c3acb78 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.137"; + version = "4.14.138"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0a72pab0zxy28i02glnzj6avzcf0a4gxxnadbdd343rh549yky4k"; + sha256 = "0yw39cqpk6g42q0xcv2aq8yyzsi0kzx9nvlfbw0iyg58wcfvsl7j"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index d8b5e2ee318..75d1bfe0f00 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.65"; + version = "4.19.66"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1pyyhr2airxzk4c6n7140yl723dc7yw7igy5i5i2ih0nd4c3k6g5"; + sha256 = "0r6vzarmi77fhivd1n6f667sgcw8zd54ykmhmp6rd52bbkhsp0f9"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 2f4bb848aee..8084599f867 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.188"; + version = "4.4.189"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1llxamm62kgqd7dig98n8m16qas8dd8rrkmwpfcdgyf8rag216ff"; + sha256 = "0nc8v62gw89m3ykqg6nqf749fzm8y1n481ns8vny4gbinyikjhlp"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 5ae8743e9ff..61f93435a06 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.188"; + version = "4.9.189"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "08p2cfc9982b804vmkapfasgipf6969g625ih7z3062xn99rhlr7"; + sha256 = "1cyhwnxkjd0qa5d48657yppjnzbi830q0p25jjv2dxs629k4bnck"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix index c7980844ed9..2c576c5922e 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.2.7"; + version = "5.2.8"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1aazhf0v8bv4py0wnqkdmiy80fchnix431l0hda2fkwsdf9njgnv"; + sha256 = "0dv91zfjkil29lp2l35lswkrhrqbc4kjh965ciaqwih1rh3cs9x1"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index e834a769c78..a61d8574cc0 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "3.1.0"; + version = "3.2.1"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "1igxqgx8q9cp15mcp1y8j564bl85ijw04jcmgb1s5bmfbg1751sd"; + sha256 = "1m633j5k700nsc3smca7fxqfhxhypxbamh18x9z60zdilj33k42z"; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 4299a8e9b37..7acee410a4e 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lxcfs-3.0.4"; + name = "lxcfs-3.1.2"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = name; - sha256 = "0wav2l8i218yma655870hvg96b5mxdcrsczjawjwv7qxcj5v98pw"; + sha256 = "195skz6wc2gfcf99f1fz1yaw29ngzg9lphnkag7yxnk3ffbhv40s"; }; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 303df98d44a..7984e357c82 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, lib, pkgconfig, utillinux, libcap, libtirpc, libevent , sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers -, python3 +, python3, buildPackages }: let @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # put it in the "lib" output, and the headers in "dev" outputs = [ "out" "dev" "lib" "man" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig buildPackages.stdenv.cc ]; buildInputs = [ libtirpc libcap libevent sqlite lvm2 diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 6acd327ef0e..e604f73de2d 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, pandoc -, ethtool, iproute, libnl, udev, python, perl +{ stdenv, fetchFromGitHub, cmake, pkgconfig, docutils +, pandoc, ethtool, iproute, libnl, udev, python, perl +, makeWrapper } : let - version = "24.0"; + version = "25.0"; in stdenv.mkDerivation { name = "rdma-core-${version}"; @@ -12,10 +13,10 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "038msip4fnd8fh6m0vhnqwsaarp86dbnc9hvf5n19aqhlqbabbdc"; + sha256 = "1r1gfps1xckky06ib1rbf6lp58v2jqpy1ipkr45rf55gpaxf93cj"; }; - nativeBuildInputs = [ cmake pkgconfig pandoc ]; + nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ]; buildInputs = [ libnl ethtool iproute udev python perl ]; cmakeFlags = [ @@ -28,6 +29,22 @@ in stdenv.mkDerivation { --replace ethtool "${ethtool}/bin/ethtool" \ --replace 'ip addr' "${iproute}/bin/ip addr" \ --replace 'ip link' "${iproute}/bin/ip link" + + substituteInPlace srp_daemon/srp_daemon.sh.in \ + --replace /bin/rm rm + ''; + + postInstall = '' + # cmake script is buggy, move file manually + mkdir -p $out/${perl.libPrefix} + mv $out/share/perl5/* $out/${perl.libPrefix} + ''; + + postFixup = '' + for pls in $out/bin/{ibfindnodesusing.pl,ibidsverify.pl}; do + echo "wrapping $pls" + wrapProgram $pls --prefix PERL5LIB : "$out/${perl.libPrefix}" + done ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 3001c8f07c5..cf1f2f242f4 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "sysdig-${version}"; - version = "0.26.1"; + version = "0.26.2"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "0mvm14s5lyxddf6fcfwrv7vd8r8vfw9z4447jl5mcvji2rnyywqz"; + sha256 = "1a74cvvy3lhilibc3lzcsvs6pwrdvdx2580qgckp1lrra9gf5hga"; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index ce2f788338e..03e11d1a8ed 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils -, perl +, perl, buildPackages , configFile ? "all" # Userspace dependencies @@ -43,53 +43,43 @@ let postPatch = optionalString buildKernel '' patchShebangs scripts + # The arrays must remain the same length, so we repeat a flag that is + # already part of the command and therefore has no effect. + substituteInPlace ./module/zfs/zfs_ctldir.c --replace '"/usr/bin/env", "umount"' '"${utillinux}/bin/umount", "-n"' \ + --replace '"/usr/bin/env", "mount"' '"${utillinux}/bin/mount", "-n"' + '' + optionalString buildUser '' + substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" \ + --replace "/bin/mount" "${utillinux}/bin/mount" + substituteInPlace ./lib/libshare/nfs.c --replace "/usr/sbin/exportfs" "${nfs-utils}/bin/exportfs" + substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" + substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" + substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc" + substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc" + substituteInPlace ./etc/systemd/system/zfs-share.service.in \ + --replace "/bin/rm " "${coreutils}/bin/rm " + + substituteInPlace ./cmd/vdev_id/vdev_id \ + --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \ + "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}" '' + optionalString stdenv.hostPlatform.isMusl '' substituteInPlace config/user-libtirpc.m4 \ --replace /usr/include/tirpc ${libtirpc}/include/tirpc ''; nativeBuildInputs = [ autoreconfHook nukeReferences ] - ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]); - buildInputs = optionals buildUser [ zlib libuuid python3 attr ] - ++ optionals (buildUser) [ openssl ] - ++ optional stdenv.hostPlatform.isMusl [ libtirpc ]; + ++ optionals buildKernel (kernel.moduleBuildDependencies ++ [ perl ]); + buildInputs = optionals buildUser [ zlib libuuid attr ] + ++ optionals (buildUser) [ openssl python3 ] + ++ optional stdenv.hostPlatform.isMusl libtirpc; # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work NIX_CFLAGS_LINK = "-lgcc_s"; hardeningDisable = [ "fortify" "stackprotector" "pic" ]; - preConfigure = '' - substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" - substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" - substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" - substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount" "${utillinux}/bin/mount" - substituteInPlace ./lib/libshare/nfs.c --replace "/usr/sbin/exportfs" "${nfs-utils}/bin/exportfs" - substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/ztest" "$out/sbin/ztest" - substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/zdb" "$out/sbin/zdb" - substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" - substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" - substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc" - substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc" - substituteInPlace ./module/Makefile.in --replace "/bin/cp" "cp" - substituteInPlace ./etc/systemd/system/zfs-share.service.in \ - --replace "/bin/rm " "${coreutils}/bin/rm " - - for f in ./udev/rules.d/* - do - substituteInPlace "$f" --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id" - done - substituteInPlace ./cmd/vdev_id/vdev_id \ - --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \ - "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}" - - ./autogen.sh - configureFlagsArray+=("--libexecdir=$out/libexec") - ''; - configureFlags = [ "--with-config=${configFile}" - "--with-python=${python3.interpreter}" + (withFeatureAs buildUser "python" python3.interpreter) ] ++ optionals buildUser [ "--with-dracutdir=$(out)/lib/dracut" "--with-udevdir=$(out)/lib/udev" @@ -97,13 +87,16 @@ let "--with-systemdpresetdir=$(out)/etc/systemd/system-preset" "--with-systemdgeneratordir=$(out)/lib/systemd/system-generator" "--with-mounthelperdir=$(out)/bin" + "--libexecdir=$(out)/libexec" "--sysconfdir=/etc" "--localstatedir=/var" "--enable-systemd" - ] ++ optionals buildKernel [ + ] ++ optionals buildKernel ([ "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - ]; + ] ++ kernel.makeFlags); + + makeFlags = optionals buildKernel kernel.makeFlags; enableParallelBuilding = true; @@ -112,9 +105,10 @@ let "DEFAULT_INITCONF_DIR=\${out}/default" ]; - postInstall = '' - # Prevent kernel modules from depending on the Linux -dev output. - nuke-refs $(find $out -name "*.ko") + postInstall = optionalString buildKernel '' + # Add reference that cannot be detected due to compressed kernel module + mkdir -p "$out/nix-support" + echo "${utillinux}" >> "$out/nix-support/extra-refs" '' + optionalString buildUser '' # Remove provided services as they are buggy rm $out/etc/systemd/system/zfs-import-*.service @@ -174,7 +168,6 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - # This is now "stable". Move to zfsStable after it's tested more. version = "0.8.1"; sha256 = "0wlbziijx08a9bmbyq4gfz4by9l5jrx44g18i99qnfm78k2q8a84"; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 4df24a6d60c..8530d8cb068 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "clickhouse-${version}"; - version = "19.6.2.11"; + version = "19.13.1.11"; src = fetchFromGitHub { owner = "yandex"; repo = "ClickHouse"; rev = "v${version}-stable"; - sha256 = "0bs38a8dm5x43klx4nc5dwkkxpab12lp2chyvc2y47c75j7rn5d7"; + sha256 = "1j9jhgl2z84id5z6rbvyal7aha5v3m8pd393cmcsf1bf0fiz8qmc"; }; nativeBuildInputs = [ cmake libtool ninja ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 7a6c9de885a..1d8896bfc10 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -30,6 +30,9 @@ unwrapped = stdenv.mkDerivation rec { sha256 = "b37ff9ceefbaa4e4527d183fb1bbb63e641d34d9889ce92715128bc1423c7ef4"; }; + # https://gitlab.labs.nic.cz/knot/knot-resolver/issues/496 + postPatch = "sed '/prefill.test.lua/d' -i modules/meson.build"; + outputs = [ "out" "dev" ]; preConfigure = '' diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index 7f14f6fff19..5da89200816 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "axis2-${version}"; - version = "1.6.4"; + version = "1.7.9"; src = fetchurl { url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${name}-bin.zip"; - sha256 = "12ir706dn95567j6lkxdwrh28vnp6292h59qwjyqjm7ckglkmgyr"; + sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac"; }; buildInputs = [ unzip apacheAnt jdk ]; diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index b677b6080d1..d367bcfd2e3 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -1,22 +1,20 @@ { stdenv, lib, fetchurl, zlib, patchelf, runtimeShell }: let - bootstrap = fetchurl { - url = "https://meteorinstall-4168.kxcdn.com/packages-bootstrap/1.5/meteor-bootstrap-os.linux.x86_64.tar.gz"; - sha256 = "0cwwqv88h1ji7g4zmfz34xsrxkn640wr11ddjq5c6b9ygcljci3p"; - }; + version = "1.8.1"; in stdenv.mkDerivation rec { - name = "meteor-${version}"; - version = "1.5"; + inherit version; + pname = "meteor"; + src = fetchurl { + url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz"; + sha256 = "1ql58j2d1pqhzpj7c9a6zrpmxxfmlgx743q7lw7g35vz2mpq34c6"; + }; - dontStrip = true; + #dontStrip = true; - unpackPhase = '' - tar xf ${bootstrap} - sourceRoot=.meteor - ''; + sourceRoot = ".meteor"; installPhase = '' mkdir $out @@ -25,7 +23,6 @@ stdenv.mkDerivation rec { chmod -R +w $out/packages cp -r package-metadata $out - chmod -R +w $out/package-metadata devBundle=$(find $out/packages/meteor-tool -name dev_bundle) ln -s $devBundle $out/dev_bundle diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix index 8dd294bcdf8..d0ce73f5410 100644 --- a/pkgs/servers/misc/airsonic/default.nix +++ b/pkgs/servers/misc/airsonic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "airsonic-${version}"; - version = "10.2.1"; + version = "10.3.1"; src = fetchurl { url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war"; - sha256 = "1gjyg9qnrckm2gmym13yhlvw0iaspl8x0534zdw558gi3mjykm4v"; + sha256 = "15y56h7zy94408605cchvf2fqg3aicylpzgd1g8fxyl42h216816"; }; buildCommand = '' diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 1f342adebaa..9803ba09e16 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "blackbox_exporter-${version}"; - version = "0.12.0"; + version = "0.14.0"; rev = version; goPackagePath = "github.com/prometheus/blackbox_exporter"; @@ -11,14 +11,16 @@ buildGoPackage rec { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "0gd3vymk3qdfjnf0rx9kwc6v0jv7f8l30igvj2v7bljar2d6hzxf"; + sha256 = "1v5n59p9jl6y1ka9mqp0ibx1kpcb3gbpl0i6bhqpbr154frmqm4x"; }; + doCheck = true; + meta = with stdenv.lib; { description = "Blackbox probing of endpoints over HTTP, HTTPS, DNS, TCP and ICMP"; - homepage = https://github.com/prometheus/blackbox_exporter; + homepage = "https://github.com/prometheus/blackbox_exporter"; license = licenses.asl20; - maintainers = with maintainers; [ globin fpletz ]; + maintainers = with maintainers; [ globin fpletz willibutz ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 94cb2f74cb0..963315f00c1 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "nginx_exporter-${version}"; - version = "0.4.1"; + version = "0.4.2"; goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter"; @@ -14,9 +14,11 @@ buildGoPackage rec { rev = "v${version}"; owner = "nginxinc"; repo = "nginx-prometheus-exporter"; - sha256 = "0c5bxl9xrd4gh2w5wyrzghmbcy9k1khydzml5cm0rsyqhwsvs8m5"; + sha256 = "023nl83w0fic7sj0yxxgj7jchyafqnmv6dq35amzz37ikx92mdcj"; }; + doCheck = true; + meta = with stdenv.lib; { description = "NGINX Prometheus Exporter for NGINX and NGINX Plus"; homepage = "https://github.com/nginxinc/nginx-prometheus-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index 1a623a3171d..a629a2a27e2 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -1,24 +1,22 @@ -{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, varnish }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, varnish }: -buildGoPackage rec { - name = "prometheus_varnish_exporter-${version}"; - version = "1.5"; - - goPackagePath = "github.com/jonnenauha/prometheus_varnish_exporter"; +buildGoModule rec { + pname = "prometheus_varnish_exporter"; + version = "1.5.1"; src = fetchFromGitHub { owner = "jonnenauha"; repo = "prometheus_varnish_exporter"; rev = version; - sha256 = "1040x7fk3s056yrn95siilhi8c9cci2mdncc1xfjf5xj87421qx8"; + sha256 = "1lvs44936n3s9z6c5169jbvx390n5g0qk4pcrmnkndg796ixjshd"; }; - goDeps = ./varnish-exporter_deps.nix; + modSha256 = "0w1zg9jc2466srx9pdckw7rzn7ma4pbd0617b1h98v364wjzgj72"; nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram $bin/bin/prometheus_varnish_exporter \ + wrapProgram $out/bin/prometheus_varnish_exporter \ --prefix PATH : "${varnish}/bin" ''; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix deleted file mode 100644 index aeacbb5cee8..00000000000 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix +++ /dev/null @@ -1,300 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cf"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "v1.0.0"; - sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.8.0"; - sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.3.0"; - sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.1.1"; - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.1"; - sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "v1.1.6"; - sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "v1.2.0"; - sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.1"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "v1.0.1"; - sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; - }; - } - { - goPackagePath = "github.com/mwitkow/go-conntrack"; - fetch = { - type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v1.0.0"; - sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fd36f4220a90"; - sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.4.1"; - sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "v0.0.2"; - sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.2.0"; - sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.3.0"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "0709b304e793"; - sha256 = "0i05s09y5pavmfh71fgih7syxg58x7a4krgd8am6d3mnahnmab5c"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "adae6a3d119a"; - sha256 = "1fx860zsgzqk28j7lmp96qsfrgb0kzbfjvr294hywswcbwdwkb01"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "37e7f081c4d4"; - sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "5ac8a444bdc5"; - sha256 = "00zdrighflwc4iyizsag184nvl1cbkk02v73kpl5miprdrvzqlr4"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } -] diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 25dfa5f47bd..9b173e538d3 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.5.6"; + version = "3.5.8"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - sha256 = "0ajkz13qsjxjflh2dlyq8w1fiacv5gakf6n98xcvj9yfcm2j4dpm"; + sha256 = "0kj92vljxdhk9pf6gr9cvd2a2ilc4myp5djjkrj3gm37f074swgg"; }; buildInputs = [ makeWrapper jre8 which gawk ]; diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix new file mode 100644 index 00000000000..1a168608bec --- /dev/null +++ b/pkgs/servers/scylladb/default.nix @@ -0,0 +1,96 @@ +{ + stdenv, + fetchgit, + python3Packages, + pkgconfig, + gcc8Stdenv, + boost, + git, + systemd, + gnutls, + cmake, + makeWrapper, + ninja, + ragel, + hwloc, + jsoncpp, + antlr3, + numactl, + protobuf, + cryptopp, + libxfs, + libyamlcpp, + libsystemtap, + lksctp-tools, + lz4, + libxml2, + zlib, + libpciaccess, + snappy, + libtool, + thrift +}: +gcc8Stdenv.mkDerivation rec { + pname = "scylladb"; + version = "3.0.5"; + + src = fetchgit { + url = "https://github.com/scylladb/scylla.git"; + rev = "403f66ecad6bc773712c69c4a80ebd172eb48b13"; + sha256 = "14mg0kzpkrxvwqyiy19ndy4rsc7s5gnv2gwd3xdwm1lx1ln8ywsi"; + fetchSubmodules = true; + }; + + patches = [ ./seastar-configure-script-paths.patch ]; + + nativeBuildInputs = [ + pkgconfig + cmake + makeWrapper + ninja + ]; + + buildInputs = [ + antlr3 + python3Packages.pyparsing + boost + git + systemd + gnutls + ragel + jsoncpp + numactl + protobuf + cryptopp + libxfs + libyamlcpp + libsystemtap + lksctp-tools + lz4 + libxml2 + zlib + libpciaccess + snappy + libtool + thrift + ]; + + postPatch = '' + patchShebangs ./configure.py + ''; + + configurePhase = '' + ./configure.py --mode=release + ''; + installPhase = '' + mkdir $out + cp -r * $out/ + ''; + meta = with stdenv.lib; { + description = "NoSQL data store using the seastar framework, compatible with Apache Cassandra"; + homepage = "https://scylladb.com"; + license = licenses.agpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.farlion ]; + }; +} diff --git a/pkgs/servers/scylladb/seastar-configure-script-paths.patch b/pkgs/servers/scylladb/seastar-configure-script-paths.patch new file mode 100644 index 00000000000..19c5c816129 --- /dev/null +++ b/pkgs/servers/scylladb/seastar-configure-script-paths.patch @@ -0,0 +1,13 @@ +diff --git a/seastar/configure.py b/seastar/configure.py +index 62d9c204..f6520635 100755 +--- a/seastar/configure.py ++++ b/seastar/configure.py +@@ -924,7 +924,7 @@ with open(buildfile, 'w') as f: + command = ragel -G2 -o $out $in && sed -i -e '1h;2,$$H;$$!d;g' -re 's/static const char _nfa[^;]*;//g' $out + description = RAGEL $out + rule gen +- command = /bin/echo -e $text > $out ++ command = echo -e $text > $out + description = GEN $out + rule swagger + command = json/json2code.py -f $in -o $out diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix new file mode 100644 index 00000000000..8785e052224 --- /dev/null +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -0,0 +1,73 @@ +{ lib, stdenv, fetchurl, bison, cmake, pkgconfig +, boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib +, numactl, perl, cctools, CoreServices, developer_cmds +}: + +let +self = stdenv.mkDerivation rec { + name = "mysql-8.0.17"; + + src = fetchurl { + url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${name}.tar.gz"; + sha256 = "1mjrlxn8vigi69r0r674j2dibdnkaar01ji5965gsyx7k60z7qy6"; + }; + + patches = [ + ./abi-check.patch + ./libutils.patch + ]; + + nativeBuildInputs = [ bison cmake pkgconfig ]; + + buildInputs = [ + boost icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib + ] ++ lib.optionals stdenv.isLinux [ + numactl + ] ++ lib.optionals stdenv.isDarwin [ + cctools CoreServices developer_cmds + ]; + + outputs = [ "out" "static" ]; + + cmakeFlags = [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12" # For std::shared_timed_mutex. + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # To run libmysql/libmysql_api_test during build. + "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin. + "-DWITH_ROUTER=OFF" # It may be packaged separately. + "-DWITH_SYSTEM_LIBS=ON" + "-DWITH_UNIT_TESTS=OFF" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DMYSQL_DATADIR=/var/lib/mysql" + "-DINSTALL_INFODIR=share/mysql/docs" + "-DINSTALL_MANDIR=share/man" + "-DINSTALL_PLUGINDIR=lib/mysql/plugin" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_DOCREADMEDIR=share/mysql" + "-DINSTALL_SUPPORTFILESDIR=share/mysql" + "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_MYSQLTESTDIR=" + "-DINSTALL_DOCDIR=share/mysql/docs" + "-DINSTALL_SHAREDIR=share/mysql" + ]; + + postInstall = '' + moveToOutput "lib/*.a" $static + so=${stdenv.hostPlatform.extensions.sharedLibrary} + ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so + ''; + + passthru = { + client = self; + connector-c = self; + server = self; + mysqlVersion = "8.0"; + }; + + meta = with lib; { + homepage = "https://www.mysql.com/"; + description = "The world's most popular open source database"; + license = licenses.gpl2; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.unix; + }; +}; in self diff --git a/pkgs/servers/sql/mysql/abi-check.patch b/pkgs/servers/sql/mysql/abi-check.patch new file mode 100644 index 00000000000..de45d9c3ea2 --- /dev/null +++ b/pkgs/servers/sql/mysql/abi-check.patch @@ -0,0 +1,18 @@ +MySQL ABI check assumes that with -nostdinc any standard #include terminates +preprocessing, but we do not provide that: +https://github.com/NixOS/nixpkgs/issues/44530 + +"#error" does not terminate preprocessing, so we #include a non-existent file instead. + +--- a/cmake/do_abi_check.cmake ++++ b/cmake/do_abi_check.cmake +@@ -68,1 +68,1 @@ FOREACH(file ${ABI_HEADERS}) +- -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${SOURCE_DIR}/include ++ -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${SOURCE_DIR}/include/nostdinc -I${SOURCE_DIR}/include +@@ -74,1 +74,1 @@ FOREACH(file ${ABI_HEADERS}) +- COMMAND sed -e "/^# /d" ++ COMMAND sed -e "/^# /d" -e "/^#include <-nostdinc>$/d" +--- /dev/null ++++ b/include/nostdinc/stdint.h +@@ -0,0 +1,1 @@ ++#include <-nostdinc> diff --git a/pkgs/servers/sql/mysql/libutils.patch b/pkgs/servers/sql/mysql/libutils.patch new file mode 100644 index 00000000000..fa1a35e12f2 --- /dev/null +++ b/pkgs/servers/sql/mysql/libutils.patch @@ -0,0 +1,5 @@ +--- a/cmake/libutils.cmake ++++ b/cmake/libutils.cmake +@@ -345 +345 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES) +- COMMAND /usr/bin/libtool -static -o $ ++ COMMAND libtool -static -o $ diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 40d08841eac..4ee23e68265 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit -, python2, makeWrapper }: +, python3, makeWrapper }: let common = { version, sha256, extraBuildInputs ? [] }: @@ -13,8 +13,8 @@ let nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pcre libxslt groff ncurses readline python2 libedit - python2.pkgs.docutils makeWrapper + pcre libxslt groff ncurses readline python3 libedit + python3.pkgs.docutils makeWrapper ] ++ extraBuildInputs; buildFlags = "localstatedir=/var/spool"; @@ -47,8 +47,8 @@ in sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq"; }; varnish6 = common { - version = "6.1.1"; - sha256 = "0gf9hzzrr1lndbbqi8cwlfasi7l517cy3nbgna88i78lm247rvp0"; - extraBuildInputs = [ python2.pkgs.sphinx ]; + version = "6.2.0"; + sha256 = "0lwfk2gq99c653h5f51fs3j37r0gh2pf0p4w5z986nm2mi9z6yn3"; + extraBuildInputs = [ python3.pkgs.sphinx ]; }; } diff --git a/pkgs/servers/web-apps/shaarli/material-theme.nix b/pkgs/servers/web-apps/shaarli/material-theme.nix index 939976b0a26..5fd941e9467 100644 --- a/pkgs/servers/web-apps/shaarli/material-theme.nix +++ b/pkgs/servers/web-apps/shaarli/material-theme.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "shaarli-material-${version}"; - version = "0.9.5"; + version = "0.10.4"; src = fetchFromGitHub { owner = "kalvn"; repo = "Shaarli-Material"; rev = "v${version}"; - sha256 = "1bxw74ksvfv46995iwc7jhvl78hd84lcq3h9iyxvs8gpkhkapv55"; + sha256 = "161kf7linyl2l2d7y60v96xz3fwa572fqm1vbm58mjgkzkfndhrv"; }; patchPhase = '' diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 8a5956161e0..a434ef7e4fb 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -4,8 +4,8 @@ let platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; - platformSha = if stdenv.isDarwin then "0w4dvkbi9jbybq7kvcgdccv8byp4ahlah45w2z8fwq961h3qnhg1" - else if stdenv.isLinux then "19dagxqvw0fpsjm6vbimqbax3bkmdm6wwifkfaq3ylrk0a9wwsrm" + platformSha = if stdenv.isDarwin then "005ax54l7752lhrvlpsyn2yywr4zh58psc7sc1qv9p86d414pmkq" + else if stdenv.isLinux then "1b3n6d2xgvqybmh61smyr415sfaymiilixlvs04yxm6ajsbnsm82" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" @@ -15,7 +15,7 @@ let platformString = if stdenv.isDarwin then "osx" in stdenv.mkDerivation rec { name = "powershell-${version}"; - version = "6.2.1"; + version = "6.2.2"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index b74b2fc43f3..e9458520bb4 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pcre }: +{ stdenv, fetchurl, ncurses, pcre, buildPackages }: let version = "5.7.1"; @@ -7,7 +7,6 @@ let url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; sha256 = "1d1r88n1gfdavx4zy3svl1gljrvzim17jb2r834hafg2a016flrh"; }; - in stdenv.mkDerivation { @@ -61,7 +60,11 @@ else fi fi EOF - $out/bin/zsh -c "zcompile $out/etc/zprofile" + ${if stdenv.hostPlatform == stdenv.buildPlatform then '' + $out/bin/zsh -c "zcompile $out/etc/zprofile" + '' else '' + ${stdenv.lib.getBin buildPackages.zsh}/bin/zsh -c "zcompile $out/etc/zprofile" + ''} mv $out/etc/zprofile $out/etc/zprofile_zwc_is_used ''; # XXX: patch zsh to take zwc if newer _or equal_ diff --git a/pkgs/tools/archivers/ctrtool/default.nix b/pkgs/tools/archivers/ctrtool/default.nix index 288a2a31ed0..97abeadffc0 100644 --- a/pkgs/tools/archivers/ctrtool/default.nix +++ b/pkgs/tools/archivers/ctrtool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ctrtool"; - version = "0.15"; + version = "0.16"; src = fetchFromGitHub { - owner = "profi200"; + owner = "jakcron"; repo = "Project_CTR"; - rev = version; - sha256 = "1l6z05x18s1crvb283yvynlwsrpa1pdx1nbijp99plw06p88h4va"; + rev = "v${version}"; + sha256 = "1n3j3fd1bqd39v5bdl9mhq4qdrcl1k4ib1yzl3qfckaz3y8bkrap"; }; sourceRoot = "source/ctrtool"; diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index 584a2dc46f7..6c587f5cc5c 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "abcm2ps-${version}"; - version = "8.14.4"; + version = "8.14.5"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "0k53yf8plkkwsgg2vk468fkhvvwxnz5jk77n1159l0g362k36p0n"; + sha256 = "1i6db49khqy8bqg21cn90b1fvyw8mh1asdswzssr6dr2g8bhdwmq"; }; configureFlags = [ diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index e9727e101a0..572c66a01d6 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2019.06.14"; + version = "2019.08.02"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "1z503k2j6504h4p205q7wjrvh5x9jhkvsapfz322m3r905l2vc2b"; + sha256 = "1iz4m86lc4nyf312qk749kgvq60g6x1zn2y70859g16ki16mk8m3"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 02b37784eaa..e5e26169b74 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "--with-logdir=/var/log/bacula" "--with-working-dir=/var/lib/bacula" "--mandir=\${out}/share/man" - ]; + ] ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "ac_cv_func_setpgrp_void=yes"; installFlags = [ "logdir=\${out}/logdir" diff --git a/pkgs/tools/backup/bdsync/default.nix b/pkgs/tools/backup/bdsync/default.nix index 2fd67765aaf..be8746932ca 100644 --- a/pkgs/tools/backup/bdsync/default.nix +++ b/pkgs/tools/backup/bdsync/default.nix @@ -1,35 +1,33 @@ -{ stdenv, fetchFromGitHub, openssl, coreutils, which }: +{ stdenv, fetchFromGitHub +, openssl +, pandoc +, which +}: stdenv.mkDerivation rec { - - name = "${pname}-${version}"; pname = "bdsync"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "TargetHolding"; repo = pname; rev = "v${version}"; - sha256 = "144hlbk3k29l7sja6piwhd2jsnzzsak13fcjbahd6m8yimxyb2nf"; + sha256 = "11grdyc6fgw93jvj965awsycqw5qbzsdys7n8farqnmya8qv8gac"; }; + nativeBuildInputs = [ pandoc which ]; + buildInputs = [ openssl ]; + postPatch = '' patchShebangs ./tests.sh patchShebangs ./tests/ ''; - buildInputs = [ openssl coreutils which ]; - doCheck = true; - checkPhase = '' - make test - ''; installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/man/man1 - cp bdsync $out/bin/ - cp bdsync.1 $out/share/man/man1/ + install -Dm755 bdsync -t $out/bin/ + install -Dm644 bdsync.1 -t $out/share/man/man1/ ''; meta = with stdenv.lib; { @@ -39,5 +37,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; }; - } diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix index 89016b3ff40..830e5f10ef6 100644 --- a/pkgs/tools/compression/zsync/default.nix +++ b/pkgs/tools/compression/zsync/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b"; }; + makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; + meta = { homepage = http://zsync.moria.org.uk/; description = "File distribution system using the rsync algorithm"; diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index 73227b3d9f0..1e89b5729c7 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "3.0.104"; + version = "3.0.105"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "057xg7zy872w4hczk9b9ckmqyah3qhgysvxddqizr204cyadicxh"; + sha256 = "0wphpdll0j4i6d4yxykaz2bamv83y0sj7j3cfv4br1zamdyprfwx"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 679704197c6..b66257f442e 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -2,7 +2,7 @@ , libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText , libXdmcp, libXau, lib, openssl }: let - version = "2.1.0"; + version = "2.1.1"; in stdenv.mkDerivation rec { name = "argyllcms-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a # while on me. It might be good to find a mirror url = "https://www.argyllcms.com/Argyll_V${version}_src.zip"; - sha256 = "02zxy6ipp84hrd1p5nspp3f9dzphr0qwlq8s557jn746cf866bv3"; + sha256 = "0zq3fipky44xg536kdhg9bchi6s9ka7n1q73fwf9ja766s8rj99m"; # The argyllcms web server doesn't like curl ... curlOpts = "--user-agent 'Mozilla/5.0'"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index 2b2cc1a3499..2ee6944eeb3 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -12,14 +12,14 @@ let in stdenv.mkDerivation rec { - name = "ibus-typing-booster-${version}"; - version = "2.6.2"; + pname = "ibus-typing-booster"; + version = "2.6.4"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - sha256 = "0013njl539knp78iciv860fkpl15bkwarjwd2vjrmr5dbb0h15yc"; + sha256 = "1k074y9439w8v6s71i7hhmkq9bgkl836y2a409rx3mb73vidadjr"; }; patches = [ ./hunspell-dirs.patch ]; diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index 2bde876c68c..930d4dfaaba 100644 --- a/pkgs/tools/misc/bonfire/default.nix +++ b/pkgs/tools/misc/bonfire/default.nix @@ -30,7 +30,12 @@ buildPythonApplication rec { --replace "data_files = *.rst, *.txt" "" ''; - buildInputs = [ httpretty pytest_3 pytestcov ]; + buildInputs = [ httpretty pytest pytestcov ]; + + preCheck = '' + # fix compatibility with pytest 4 + substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]" + ''; propagatedBuildInputs = [ arrow click keyring parsedatetime requests six termcolor ]; diff --git a/pkgs/tools/misc/fffuu/default.nix b/pkgs/tools/misc/fffuu/default.nix new file mode 100644 index 00000000000..7b275220c19 --- /dev/null +++ b/pkgs/tools/misc/fffuu/default.nix @@ -0,0 +1,51 @@ +{ mkDerivation, haskellPackages, fetchFromGitHub, lib }: + +mkDerivation rec { + pname = "fffuu"; + version = "unstable-2018-05-26"; + + src = fetchFromGitHub { + owner = "diekmann"; + repo = "Iptables_Semantics"; + rev = "e0a2516bd885708fce875023b474ae341cbdee29"; + sha256 = "1qc7p44dqja6qrjbjdc2xn7n9v41j5v59sgjnxjj5k0mxp58y1ch"; + }; + + postPatch = '' + substituteInPlace haskell_tool/fffuu.cabal \ + --replace "containers >=0.5 && <0.6" "containers >= 0.6" \ + --replace "optparse-generic >= 1.2.3 && < 1.3" "optparse-generic >= 1.2.3" + ''; + + preCompileBuildDriver = '' + cd haskell_tool + ''; + + isLibrary = false; + + isExecutable = true; + + # fails with sandbox + doCheck = false; + + libraryHaskellDepends = with haskellPackages; [ + base + containers + split + parsec + optparse-generic + ]; + + executableHaskellDepends = with haskellPackages; [ base ]; + + testHaskellDepends = with haskellPackages; [ + tasty + tasty-hunit + tasty-golden + ]; + + description = "Fancy Formal Firewall Universal Understander"; + homepage = https://github.com/diekmann/Iptables_Semantics/tree/master/haskell_tool; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.marsam ]; +} diff --git a/pkgs/tools/misc/idevicerestore/default.nix b/pkgs/tools/misc/idevicerestore/default.nix new file mode 100644 index 00000000000..a12fa04c5fc --- /dev/null +++ b/pkgs/tools/misc/idevicerestore/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, curl +, libimobiledevice +, libirecovery +, libzip +, libusbmuxd +}: + +stdenv.mkDerivation rec { + pname = "idevicerestore"; + version = "2019-02-14"; + + src = fetchFromGitHub { + owner = "libimobiledevice"; + repo = pname; + rev = "8a882038b2b1e022fbd19eaf8bea51006a373c06"; + sha256 = "17lisl7ll43ixl1zqwchn7jljrdyl2p9q99w30i6qaci71mas37m"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; + + buildInputs = [ + curl + libimobiledevice + libirecovery + libzip + libusbmuxd + # Not listing other dependencies specified in + # https://github.com/libimobiledevice/idevicerestore/blob/8a882038b2b1e022fbd19eaf8bea51006a373c06/README#L20 + # because they are inherited `libimobiledevice`. + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/libimobiledevice/idevicerestore; + description = "Restore/upgrade firmware of iOS devices"; + longDescription = '' + The idevicerestore tool allows to restore firmware files to iOS devices. + + It is a full reimplementation of all granular steps which are performed during + restore of a firmware to a device. + + In general, upgrades and downgrades are possible, however subject to + availability of SHSH blobs from Apple for signing the firmare files. + + To restore a device to some firmware, simply run the following: + $ sudo idevicerestore -l + + This will download and restore a device to the latest firmware available. + ''; + license = licenses.lgpl21Plus; + # configure.ac suggests it should work for darwin and mingw as well but not tried yet + platforms = platforms.linux; + maintainers = with maintainers; [ nh2 ]; + }; +} diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix index 760f56726fa..d79e480327c 100644 --- a/pkgs/tools/misc/tmpwatch/default.nix +++ b/pkgs/tools/misc/tmpwatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, psmisc }: stdenv.mkDerivation rec { name = "tmpwatch-2.11"; @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1m5859ngwx61l1i4s6fja2avf1hyv6w170by273w8nsin89825lk"; }; + configureFlags="--with-fuser=${psmisc}/bin/fuser"; + meta = with stdenv.lib; { homepage = https://fedorahosted.org/tmpwatch/; description = "Recursively searches through specified directories and removes files which have not been accessed in a specified period of time"; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index e571f533399..1fe58f94504 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.08.02"; + version = "2019.08.13"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "101b6jrf6ckbxrn76ppvgdyrb25p7d247kn8qgq7n476sfnkfg2p"; + sha256 = "0b94hrhbqa7jhn91pxsbphg2ylwkpkknb2y4v4sczp7rjvgmjgdj"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 6aa357dacb6..afa6cef1524 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive -, pkgconfig, gettext, libssl }: +, pkgconfig, gettext, libssl, txt2man }: stdenv.mkDerivation rec { pname = "axel"; - version = "2.17.3"; + version = "2.17.5"; src = fetchFromGitHub { owner = "axel-download-accelerator"; repo = pname; rev = "v${version}"; - sha256 = "0kdd2y92plv240ba2j3xrm0f8xygvm1ijghnric4whsnxvmgym7h"; + sha256 = "0kwfbwh9g2227icgykgwa057vll5rkgac3df0pby530bivqzzzlw"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig autoconf-archive ]; + nativeBuildInputs = [ autoreconfHook pkgconfig autoconf-archive txt2man ]; buildInputs = [ gettext libssl ]; - installFlags = [ "ETCDIR=$(out)/etc" ]; + installFlags = [ "ETCDIR=${placeholder "out"}/etc" ]; meta = with stdenv.lib; { description = "Console downloading program with some features for parallel connections for faster downloading"; diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index fbf7efb6933..d2ae24c8a71 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -3,6 +3,7 @@ let # keep this in sync with github.com/DataDog/agent-payload dependency payloadVersion = "4.7.1"; + python = pythonPackages.python; in buildGoPackage rec { name = "datadog-agent-${version}"; @@ -26,8 +27,6 @@ in buildGoPackage rec { goDeps = ./datadog-agent-deps.nix; goPackagePath = "github.com/${owner}/${repo}"; - # Explicitly set this here to allow it to be overridden. - python = pythonPackages.python; nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ systemd ]; diff --git a/pkgs/tools/networking/infiniband-diags/default.nix b/pkgs/tools/networking/infiniband-diags/default.nix deleted file mode 100644 index 81a43d672fd..00000000000 --- a/pkgs/tools/networking/infiniband-diags/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, rdma-core -, opensm, perl, makeWrapper }: - -stdenv.mkDerivation rec { - name = "infiniband-diags-${version}"; - version = "2.2.0"; - - src = fetchFromGitHub { - owner = "linux-rdma"; - repo = "infiniband-diags"; - rev = version; - sha256 = "0dhidwscvv8rffgjl6ygrz7daf61wbgabzhb6v8wh5kccml90mxi"; - }; - - nativeBuildInputs = [ autoconf automake libtool pkgconfig makeWrapper ]; - - buildInputs = [ rdma-core opensm perl ]; - - preConfigure = '' - export CFLAGS="-I${opensm}/include/infiniband" - ./autogen.sh - ''; - - configureFlags = [ "--with-perl-installdir=\${out}/${perl.libPrefix}" "--sbindir=\${out}/bin" ]; - - postInstall = '' - rmdir $out/var/run $out/var - ''; - - postFixup = '' - for pls in $out/bin/{ibfindnodesusing.pl,ibidsverify.pl}; do - echo "wrapping $pls" - wrapProgram $pls --prefix PERL5LIB : "$out/${perl.libPrefix}" - done - ''; - - meta = with stdenv.lib; { - description = "Utilities designed to help configure, debug, and maintain infiniband fabrics"; - homepage = http://linux-rdma.org/; - license = licenses.bsd2; # Or GPL 2 - maintainers = [ maintainers.aij ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/tools/networking/mcrcon/default.nix b/pkgs/tools/networking/mcrcon/default.nix index eda93c82cce..38b2aa531e6 100644 --- a/pkgs/tools/networking/mcrcon/default.nix +++ b/pkgs/tools/networking/mcrcon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mcrcon-${version}"; - version = "0.0.5"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Tiiffi"; repo = "mcrcon"; rev = "v${version}"; - sha256 = "1pwr1cjldjy8bxqpp7w03nvdpw8l4vqfnk6w6b3mf0qpap1k700z"; + sha256 = "0as60cgl8sflykmwihc6axy1hzx6gjgjav6c7mvlbsc43dv8fs51"; }; buildPhase = '' diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix new file mode 100644 index 00000000000..1e5bd6b66f5 --- /dev/null +++ b/pkgs/tools/networking/ofono/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, fetchgit +, autoreconfHook +, pkgconfig +, glib +, dbus +, ell +, systemd +, bluez +, mobile-broadband-provider-info +}: + +stdenv.mkDerivation rec { + pname = "ofono"; + version = "1.30"; + + outputs = [ "out" "dev" ]; + + src = fetchgit { + url = "git://git.kernel.org/pub/scm/network/ofono/ofono.git"; + rev = version; + sha256 = "1qzysmzpgbh6zc3x9xh931wxcazka9wwx727c2k66z9gal2n6n66"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; + + buildInputs = [ + glib + dbus + ell + systemd + bluez + mobile-broadband-provider-info + ]; + + configureFlags = [ + "--with-dbusconfdir=${placeholder ''out''}/etc/dbus-1/system.d" + "--with-systemdunitdir=${placeholder ''out''}/lib/systemd/system" + "--enable-external-ell" + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Infrastructure for building mobile telephony (GSM/UMTS) applications"; + homepage = https://01.org/ofono; + license = licenses.gpl2; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index 03270ce8788..6a97abfab59 100644 --- a/pkgs/tools/networking/pptp/default.nix +++ b/pkgs/tools/networking/pptp/default.nix @@ -1,26 +1,29 @@ -{ stdenv, fetchurl, perl, ppp, iproute, which }: +{ stdenv, fetchurl, perl, ppp, iproute }: stdenv.mkDerivation rec { - name = "pptp-${version}"; + pname = "pptp"; version = "1.10.0"; src = fetchurl { - url = "mirror://sourceforge/pptpclient/${name}.tar.gz"; + url = "mirror://sourceforge/pptpclient/${pname}-${version}.tar.gz"; sha256 = "1x2szfp96w7cag2rcvkdqbsl836ja5148zzfhaqp7kl7wjw2sjc2"; }; - patchPhase = - '' - sed -e 's/install -o root/install/' -i Makefile - ''; - preConfigure = - '' - makeFlagsArray=( IP=${iproute}/bin/ip PPPD=${ppp}/sbin/pppd \ - BINDIR=$out/sbin MANDIR=$out/share/man/man8 \ - PPPDIR=$out/etc/ppp ) - ''; + prePatch = '' + substituteInPlace Makefile --replace 'install -o root' 'install' + ''; - nativeBuildInputs = [ perl which ]; + preConfigure = '' + makeFlagsArray=( IP=${iproute}/bin/ip PPPD=${ppp}/sbin/pppd \ + BINDIR=$out/sbin MANDIR=$out/share/man/man8 \ + PPPDIR=$out/etc/ppp ) + ''; + + buildInputs = [ perl ]; + + postFixup = '' + patchShebangs $out + ''; meta = with stdenv.lib; { description = "PPTP client for Linux"; diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index 26e932fc5d5..254e5d3e5d3 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "shadowsocks-libev"; - version = "3.3.0"; + version = "3.3.1"; # Git tag includes CMake build files which are much more convenient. src = fetchFromGitHub { owner = "shadowsocks"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "0f6fk7p49b1m78v4ipacbl522nma9b3qzrvihzp2mmsa6j3cysgr"; + sha256 = "0l15mbwlzx446rn5cix9f1726by62807bhnxkzknd41j7r937vyv"; fetchSubmodules = true; }; diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index f75bf6bf162..3299ab8b63b 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}: +{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java, fetchpatch }: stdenv.mkDerivation { name = "DisnixWebService-0.8"; @@ -11,7 +11,14 @@ stdenv.mkDerivation { AXIS2_LIB = "${axis2}/lib"; AXIS2_WEBAPP = "${axis2}/webapps/axis2"; DBUS_JAVA_LIB = "${dbus_java}/share/java"; - patchPhase = '' + patches = [ + # Safe to remove once https://github.com/svanderburg/DisnixWebService/pull/1 is merged + (fetchpatch { + url = "https://github.com/mmahut/DisnixWebService/commit/cf07918b8c81b4ce01e0b489c1b5a3ef9c9a1cd6.patch"; + sha256 = "15zi1l69wzgwvvqx4492s7l444gfvc9vcm7ckgif4b6cvp837brn"; + }) + ]; + prePatch = '' sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \ -e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \ scripts/disnix-soap-client diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index 4e2c8a7b3a7..9e5a3f4d697 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/tools/package-management/reuse/default.nix @@ -1,30 +1,25 @@ -{ lib, python3Packages, fetchFromGitLab }: +{ lib, python3Packages, fetchFromGitHub }: with python3Packages; buildPythonApplication rec { pname = "reuse"; - version = "0.3.4"; + version = "0.4.1"; - src = fetchFromGitLab { - owner = "reuse"; - repo = "reuse"; + src = fetchFromGitHub { + owner = "fsfe"; + repo = "reuse-tool"; rev = "v${version}"; - sha256 = "07acv02wignrsfhym2i3dhlcs501yj426lnff2cjampl6m5cgsk3"; + sha256 = "0gwipwikhxsk0p8wvdl90xm7chfi2jywb1namzznyymifl1vsbgh"; }; - propagatedBuildInputs = [ chardet debian pygit2 ]; + propagatedBuildInputs = [ debian license-expression requests ]; - checkInputs = [ pytest jinja2 ]; - - # Some path based tests are currently broken under nix - checkPhase = '' - pytest tests -k "not test_lint_none and not test_lint_ignore_debian and not test_lint_twice_path" - ''; + checkInputs = [ pytest ]; meta = with lib; { description = "A tool for compliance with the REUSE Initiative recommendations"; - license = with licenses; [ cc-by-sa-40 cc0 gpl3 ]; + license = with licenses; [ asl20 cc-by-sa-40 cc0 gpl3 ]; maintainers = [ maintainers.FlorianFranzen ]; }; } diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 6b1d8e6c4f8..296080cbd8e 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -21,6 +21,9 @@ pythonPackages.buildPythonApplication { --replace /usr/sbin/sendmail sendmail \ --replace /usr/bin/whois whois done + + substituteInPlace config/filter.d/dovecot.conf \ + --replace dovecot.service dovecot2.service ''; doCheck = false; diff --git a/pkgs/tools/security/sequoia-tool/default.nix b/pkgs/tools/security/sequoia-tool/default.nix deleted file mode 100644 index 00472c1a3aa..00000000000 --- a/pkgs/tools/security/sequoia-tool/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchFromGitLab, rustPlatform, darwin -, pkgconfig, capnproto, clang, libclang, nettle, openssl, sqlite }: - -rustPlatform.buildRustPackage rec { - pname = "sequoia-tool"; - version = "0.9.0"; - - src = fetchFromGitLab { - owner = "sequoia-pgp"; - repo = "sequoia"; - rev = "v${version}"; - sha256 = "13dzwdzz33dy2lgnznsv8wqnw2501f2ggrkfwpqy5x6d1kgms8rj"; - }; - - nativeBuildInputs = [ pkgconfig clang libclang ]; - buildInputs = [ capnproto nettle openssl sqlite ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - - LIBCLANG_PATH = libclang + "/lib"; - - cargoBuildFlags = [ "--package=sequoia-tool" ]; - - cargoSha256 = "1zcnkpzcar3a2fk2rn3i3nb70b59ds9fpfa44f15r3aaxajsdhdi"; - - meta = with stdenv.lib; { - description = "A command-line frontend for Sequoia, an implementation of OpenPGP"; - homepage = https://sequoia-pgp.org/; - license = licenses.gpl3; - maintainers = with maintainers; [ minijackson ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix new file mode 100644 index 00000000000..5d9ffca6937 --- /dev/null +++ b/pkgs/tools/security/sequoia/default.nix @@ -0,0 +1,91 @@ +{ stdenv, fetchFromGitLab, lib, darwin +, git, nettle, llvmPackages, cargo, rustc +, rustPlatform, pkgconfig, glib +, openssl, sqlite, capnproto +, ensureNewerSourcesForZipFilesHook, pythonSupport ? true, pythonPackages ? null +}: + +assert pythonSupport -> pythonPackages != null; + +rustPlatform.buildRustPackage rec { + pname = "sequoia"; + version = "0.9.0"; + + src = fetchFromGitLab { + owner = "sequoia-pgp"; + repo = pname; + rev = "v${version}"; + sha256 = "13dzwdzz33dy2lgnznsv8wqnw2501f2ggrkfwpqy5x6d1kgms8rj"; + }; + + cargoSha256 = "1zcnkpzcar3a2fk2rn3i3nb70b59ds9fpfa44f15r3aaxajsdhdi"; + + nativeBuildInputs = [ + pkgconfig + cargo + rustc + git + llvmPackages.libclang + llvmPackages.clang + ensureNewerSourcesForZipFilesHook + ] ++ + lib.optionals pythonSupport [ pythonPackages.setuptools ] + ; + + checkInputs = lib.optionals pythonSupport [ + pythonPackages.pytest + pythonPackages.pytestrunner + ]; + + buildInputs = [ + openssl + sqlite + nettle + capnproto + ] + ++ lib.optionals pythonSupport [ pythonPackages.python pythonPackages.cffi ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ] + ; + + makeFlags = [ + "PREFIX=${placeholder ''out''}" + ]; + + buildFlags = [ + "build-release" + ]; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + postPatch = '' + # otherwise, the check fails because we delete the `.git` in the unpack phase + substituteInPlace openpgp-ffi/Makefile \ + --replace 'git grep' 'grep -R' + # Without this, the check fails + substituteInPlace openpgp-ffi/examples/Makefile \ + --replace '-O0 -g -Wall -Werror' '-g' + substituteInPlace ffi/examples/Makefile \ + --replace '-O0 -g -Wall -Werror' '-g' + ''; + + preInstall = lib.optionalString pythonSupport '' + export installFlags="PYTHONPATH=$PYTHONPATH:$out/${pythonPackages.python.sitePackages}" + '' + lib.optionalString (!pythonSupport) '' + export installFlags="PYTHON=disable" + ''; + + # Don't use buildRustPackage phases, only use it for rust deps setup + configurePhase = null; + buildPhase = null; + doCheck = true; + checkPhase = null; + installPhase = null; + + meta = with stdenv.lib; { + description = "A cool new OpenPGP implementation"; + homepage = "https://sequoia-pgp.org/"; + license = licenses.gpl3; + maintainers = with maintainers; [ minijackson doronbehar ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index e77d4487582..5c9b0292e5c 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchFromGitHub, pkgconfig, popt }: +{ stdenv, buildPackages, fetchFromGitHub, fetchurl, pkgconfig, popt }: stdenv.mkDerivation rec { name = "efivar-${version}"; @@ -12,6 +12,13 @@ stdenv.mkDerivation rec { rev = version; sha256 = "1z2dw5x74wgvqgd8jvibfff0qhwkc53kxg54v12pzymyibagwf09"; }; + patches = [ + (fetchurl { + name = "r13y.patch"; + url = "https://patch-diff.githubusercontent.com/raw/rhboot/efivar/pull/133.patch"; + sha256 = "038cwldb8sqnal5l6mhys92cqv8x7j8rgsl8i4fiv9ih9znw26i6"; + }) + ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ popt ]; diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index c1345fc9537..87306a61e0d 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FanFicFare"; - version = "3.9.0"; + version = "3.10.5"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0326fh72nihq4svgw7zvacij193ya66p102y1c7glpjq75kcx6a1"; + sha256 = "0bxz1a0ak6b6zj5xpkzwy8ikxf45kkxdj64sf4ilj43yaqicm0bw"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index 1435fd2bde0..e8e6a76a7a2 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -1,23 +1,26 @@ { buildGoPackage, fetchFromGitHub, lib }: -buildGoPackage -rec { +buildGoPackage rec { pname = "cri-tools"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { - owner = "kubernetes-incubator"; + owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "0v5i7shbn7b6av1d2z6r5czyjdll9i7xim9975lpnz1136xb6li7"; + sha256 = "03fhddncwqrdyxz43m3bak9dlrsqzibqqja3p94nic4ydk2hry62"; }; - goPackagePath = "github.com/kubernetes-incubator/cri-tools"; - subPackages = [ "cmd/crictl" "cmd/critest" ]; + goPackagePath = "github.com/kubernetes-sigs/cri-tools"; - meta = { + buildPhase = '' + pushd go/src/${goPackagePath} + make + ''; + + meta = with lib; { description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)"; homepage = https://github.com/kubernetes-sigs/cri-tools; license = lib.licenses.asl20; + maintainers = with maintainers; [ saschagrunert ]; }; } - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7283c2ce534..8c2cc75dc1b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -145,10 +145,12 @@ mapAliases ({ gupnptools = gupnp-tools; # added 2015-12-19 gutenberg = zola; # added 2018-11-17 heimdalFull = heimdal; # added 2018-05-01 + hepmc = hepmc2; # added 2019-08-05 hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25 htmlTidy = html-tidy; # added 2014-12-06 iana_etc = iana-etc; # added 2017-03-08 idea = jetbrains; # added 2017-04-03 + infiniband-diags = rdma-core; # added 2019-08-09 inotifyTools = inotify-tools; jbuilder = dune; # added 2018-09-09 joseki = apache-jena-fuseki; # added 2016-02-28 @@ -230,6 +232,7 @@ mapAliases ({ nmap_graphical = nmap-graphical; # added 2017-01-19 nologin = shadow; # added 2018-04-25 nxproxy = nx-libs; # added 2019-02-15 + nylas-mail-bin = throw "deprecated in 2019-09-11: abandoned by upstream"; opencascade_oce = opencascade; # added 2018-04-25 opencl-icd = ocl-icd; # added 2017-01-20 openexr_ctl = ctl; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13567148c8b..14e313e6c4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -273,9 +273,9 @@ in fetchhg = callPackage ../build-support/fetchhg { }; # `fetchurl' downloads a file from the network. - fetchurl = import ../build-support/fetchurl { + fetchurl = makeOverridable (import ../build-support/fetchurl) { inherit lib stdenvNoCC; - curl = buildPackages.curl.override rec { + curl = buildPackages.curl.override (old: rec { # break dependency cycles fetchurl = stdenv.fetchurlBoot; zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; }; @@ -292,7 +292,12 @@ in }; # On darwin, libkrb5 needs bootstrap_cmds which would require # converting many packages to fetchurl_boot to avoid evaluation cycles. - gssSupport = !stdenv.isDarwin && !stdenv.hostPlatform.isWindows; + # So turn gssSupport off there, and on Windows. + # On other platforms, keep the previous value. + gssSupport = + if stdenv.isDarwin || stdenv.hostPlatform.isWindows + then false + else old.gssSupport or true; # `? true` is the default libkrb5 = buildPackages.libkrb5.override { fetchurl = stdenv.fetchurlBoot; inherit pkgconfig perl openssl; @@ -304,7 +309,7 @@ in c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; }; libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; }; }; - }; + }); }; fetchRepoProject = callPackage ../build-support/fetchrepoproject { }; @@ -803,6 +808,8 @@ in git-repo-updater = python3Packages.callPackage ../development/tools/git-repo-updater { }; + git-revise = with python3Packages; toPythonApplication git-revise; + git-town = callPackage ../tools/misc/git-town { }; github-changelog-generator = callPackage ../development/tools/github-changelog-generator { }; @@ -1767,6 +1774,8 @@ in mkspiffs-presets = recurseIntoAttrs (callPackages ../tools/filesystems/mkspiffs/presets.nix { }); + mlarchive2maildir = callPackage ../applications/networking/mailreaders/mlarchive2maildir { }; + monetdb = callPackage ../servers/sql/monetdb { }; mousetweaks = callPackage ../applications/accessibility/mousetweaks { @@ -3830,6 +3839,7 @@ in ifuse = callPackage ../tools/filesystems/ifuse { }; ideviceinstaller = callPackage ../tools/misc/ideviceinstaller { }; + idevicerestore = callPackage ../tools/misc/idevicerestore { }; inherit (callPackages ../tools/filesystems/irods rec { stdenv = llvmPackages_38.libcxxStdenv; @@ -3878,8 +3888,6 @@ in inetutils = callPackage ../tools/networking/inetutils { }; - infiniband-diags = callPackage ../tools/networking/infiniband-diags { }; - inform7 = callPackage ../development/compilers/inform7 { }; infamousPlugins = callPackage ../applications/audio/infamousPlugins { }; @@ -4772,8 +4780,6 @@ in mosh = callPackage ../tools/networking/mosh { }; - motuclient = callPackage ../applications/science/misc/motu-client { }; - mpage = callPackage ../tools/text/mpage { }; mprime = callPackage ../tools/misc/mprime { }; @@ -5947,7 +5953,9 @@ in seqdiag = with python3Packages; toPythonApplication seqdiag; - sequoia-tool = callPackage ../tools/security/sequoia-tool { inherit (llvmPackages) libclang; }; + sequoia = callPackage ../tools/security/sequoia { + pythonPackages = python3Packages; + }; sewer = callPackage ../tools/admin/sewer { }; @@ -6108,6 +6116,8 @@ in stdman = callPackage ../data/documentation/stdman { }; + stm32loader = with python3Packages; toPythonApplication stm32loader; + storebrowse = callPackage ../tools/system/storebrowse { }; stubby = callPackage ../tools/networking/stubby { }; @@ -8256,6 +8266,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; + sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme {}; + sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl = callPackage ../development/compilers/sbcl {}; @@ -9010,6 +9022,8 @@ in awf = callPackage ../development/tools/misc/awf { }; + electron_6 = callPackage ../development/tools/electron/6.x.nix { }; + electron_5 = callPackage ../development/tools/electron/5.x.nix { }; electron_4 = callPackage ../development/tools/electron { }; @@ -9097,11 +9111,7 @@ in bison = bison3; yacc = bison; # TODO: move to aliases.nix - blackmagic = callPackage ../development/tools/misc/blackmagic { - stdenv = gcc6Stdenv; - gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; - binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; - }; + blackmagic = callPackage ../development/tools/misc/blackmagic { }; bloaty = callPackage ../development/tools/bloaty { }; @@ -9393,6 +9403,8 @@ in flootty = callPackage ../development/tools/flootty { }; + fffuu = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../tools/misc/fffuu { }); + flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -9697,7 +9709,9 @@ in gconf = pkgs.gnome2.GConf; }; + # NOTE: Override and set icon-lang = null to use Awk instead of Icon. noweb = callPackage ../development/tools/literate-programming/noweb { }; + nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; nrfutil = callPackage ../development/tools/misc/nrfutil { }; @@ -10249,7 +10263,7 @@ in c-blosc = callPackage ../development/libraries/c-blosc { }; - cachix = callPackage ../development/tools/cachix { }; + cachix = haskell.lib.justStaticExecutables haskellPackages.cachix; capnproto = callPackage ../development/libraries/capnproto { }; @@ -11704,6 +11718,8 @@ in inherit (darwin.apple_sdk.frameworks) AudioUnit; }; + libsystemtap = callPackage ../development/libraries/libsystemtap { }; + libgtop = callPackage ../development/libraries/libgtop {}; libLAS = callPackage ../development/libraries/libLAS { }; @@ -11822,6 +11838,8 @@ in inherit (darwin.apple_sdk.frameworks) Carbon; }; + libirecovery = callPackage ../development/libraries/libirecovery { }; + libivykis = callPackage ../development/libraries/libivykis { }; liblastfmSF = callPackage ../development/libraries/liblastfmSF { }; @@ -12030,6 +12048,8 @@ in libmodplug = callPackage ../development/libraries/libmodplug {}; + libmodule = callPackage ../development/libraries/libmodule { }; + libmpcdec = callPackage ../development/libraries/libmpcdec { }; libmp3splt = callPackage ../development/libraries/libmp3splt { }; @@ -13657,6 +13677,10 @@ in inherit (pythonPackages) twisted; }; + thrift-0_10 = callPackage ../development/libraries/thrift/0.10.nix { + inherit (pythonPackages) twisted; + }; + tidyp = callPackage ../development/libraries/tidyp { }; tinyxml = tinyxml2; @@ -14762,6 +14786,12 @@ in boost = boost159; }; + mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { + inherit (darwin) cctools developer_cmds; + inherit (darwin.apple_sdk.frameworks) CoreServices; + boost = boost169; # Configure checks for specific version. + }; + mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; mssql_jdbc = callPackage ../servers/sql/mssql/jdbc { }; @@ -16044,6 +16074,8 @@ in ofp = callPackage ../os-specific/linux/ofp { }; + ofono = callPackage ../tools/networking/ofono { }; + openpam = callPackage ../development/libraries/openpam { }; openbsm = callPackage ../development/libraries/openbsm { }; @@ -17441,6 +17473,10 @@ in cligh = python3Packages.callPackage ../development/tools/github/cligh {}; + clight = callPackage ../applications/misc/clight { }; + + clightd = callPackage ../applications/misc/clight/clightd.nix { }; + clipgrab = qt5.callPackage ../applications/video/clipgrab { }; clipmenu = callPackage ../applications/misc/clipmenu { }; @@ -17957,7 +17993,7 @@ in inherit autoconf automake editorconfig-core-c git libffi libpng pkgconfig poppler rtags w3m zlib substituteAll rustPlatform cmake llvmPackages - libtool zeromq; + libtool zeromq openssl; }; }; @@ -18344,7 +18380,7 @@ in fractal = callPackage ../applications/networking/instant-messengers/fractal { }; - freecad = callPackage ../applications/graphics/freecad { mpi = openmpi; }; + freecad = qt5.callPackage ../applications/graphics/freecad { mpi = openmpi; }; freemind = callPackage ../applications/misc/freemind { }; @@ -20076,6 +20112,10 @@ in qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { }; + qlandkartegt = libsForQt5.callPackage ../applications/misc/qlandkartegt {}; + + garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {}; + qmapshack = libsForQt5.callPackage ../applications/misc/qmapshack { }; qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { }; @@ -20447,6 +20487,10 @@ in dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { }; + maestral = callPackage ../applications/networking/maestral { }; + + maestral-gui = libsForQt5.callPackage ../applications/networking/maestral { withGui = true; }; + insync = callPackage ../applications/networking/insync { }; libstrangle = callPackage ../tools/X11/libstrangle { @@ -20738,8 +20782,6 @@ in thinkingRock = callPackage ../applications/misc/thinking-rock { }; - nylas-mail-bin = callPackage ../applications/networking/mailreaders/nylas-mail-bin { }; - thonny = callPackage ../applications/editors/thonny { }; thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { @@ -20882,6 +20924,8 @@ in unpaper = callPackage ../tools/graphics/unpaper { }; + unison-ucm = callPackage ../development/compilers/unison { }; + urh = callPackage ../applications/radio/urh { }; uuagc = haskell.lib.justStaticExecutables haskellPackages.uuagc; @@ -21930,6 +21974,8 @@ in inherit (pythonPackages) rdflib; }; + ideogram = callPackage ../applications/graphics/ideogram { }; + instead = callPackage ../games/instead { lua = lua5; }; @@ -23394,7 +23440,7 @@ in g4py = callPackage ../development/libraries/physics/geant4/g4py { }; - hepmc = callPackage ../development/libraries/physics/hepmc { }; + hepmc2 = callPackage ../development/libraries/physics/hepmc2 { }; hepmc3 = callPackage ../development/libraries/physics/hepmc3 { }; @@ -23668,6 +23714,8 @@ in epkowa = callPackage ../misc/drivers/epkowa { }; + utsushi = callPackage ../misc/drivers/utsushi { }; + idsk = callPackage ../tools/filesystems/idsk { }; igraph = callPackage ../development/libraries/igraph { }; @@ -23882,6 +23930,10 @@ in in nixosTesting.makeTest calledTest; + nixosOptionsDoc = attrs: + (import ../../nixos/lib/make-options-doc/default.nix) + ({ inherit pkgs lib; } // attrs); + nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; nixdoc = callPackage ../tools/nix/nixdoc {}; @@ -24128,6 +24180,10 @@ in sct = callPackage ../tools/X11/sct {}; + scylladb = callPackage ../servers/scylladb { + thrift = thrift-0_10; + }; + seafile-shared = callPackage ../misc/seafile-shared { }; serviio = callPackage ../servers/serviio {}; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 3b7bb5692a2..801a9c9e30b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -39,10 +39,10 @@ let }; ast = buildPecl rec { - version = "1.0.1"; + version = "1.0.3"; pname = "ast"; - sha256 = "0ja74k2lmxwhhvp9y9kc7khijd7s2dqma5x8ghbhx9ajkn0wg8iq"; + sha256 = "1sk9bkyw3ck9jgvlazxx8zl2nv6lc0gq66v1rfcby9v0zyydb7xr"; }; box = mkDerivation rec { @@ -73,12 +73,12 @@ let }; composer = mkDerivation rec { - version = "1.8.6"; + version = "1.9.0"; pname = "composer"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "0hnm7njab9nsifpb1qbwx54yfpsi00g8mzny11s13ibjvd9rnvxn"; + sha256 = "0x88bin1c749ajymz2cqjx8660a3wxvndpv4xr6w3pib16fzdpy9"; }; dontUnpack = true; @@ -143,10 +143,10 @@ let }; event = buildPecl rec { - version = "2.5.2"; + version = "2.5.3"; pname = "event"; - sha256 = "0b9zbwyyfcrzs1gcpqn2dkjq6jliw89g2m981f8ildbp84snkpcf"; + sha256 = "12liry5ldvgwp1v1a6zgfq8w6iyyxmsdj4c71bp157nnf58cb8hb"; configureFlags = [ "--with-event-libevent-dir=${pkgs.libevent.dev}" @@ -215,6 +215,23 @@ let buildInputs = with pkgs; [ cyrus_sasl zlib ]; }; + mongodb = buildPecl { + pname = "mongodb"; + version = "1.5.5"; + + sha256 = "0gpywk3wkimjrva1p95a7abvl3s8yccalf6yimn3nbkpvn2kknm6"; + + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with pkgs; [ + cyrus_sasl + icu + openssl + snappy + zlib + (if isPhp73 then pcre2 else pcre) + ] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security; + }; + oci8 = buildPecl rec { version = "2.2.0"; pname = "oci8"; @@ -450,10 +467,10 @@ let }; protobuf = buildPecl rec { - version = "3.8.0"; + version = "3.9.0"; pname = "protobuf"; - sha256 = "09zs7w9iv6432i0js44ihxymbd4pcxlprlzqkcjsxjpbprs4qpv2"; + sha256 = "1pyfxrfdbzzg5al4byyazdrvy7yad13zwq7papbb2d8gkvc3f3kh"; buildInputs = with pkgs; [ (if isPhp73 then pcre2 else pcre) ]; @@ -493,20 +510,41 @@ let }; }; - pthreads = assert (pkgs.config.php.zts or false); buildPecl rec { - version = "3.1.5"; + pthreads = if isPhp73 then pthreads32-dev else pthreads32; + + pthreads32 = assert (pkgs.config.php.zts or false); assert !isPhp73; buildPecl rec { + version = "3.2.0"; pname = "pthreads"; - sha256 = "1ziap0py3zrc7qj9lw4nzq6wx1viyj8v9y1babchizzan014x6p5"; + src = pkgs.fetchFromGitHub { + owner = "krakjoe"; + repo = "pthreads"; + rev = "v${version}"; + sha256 = "17hypm75d4w7lvz96jb7s0s87018yzmmap0l125d5fd7abnhzfvv"; + }; - meta.broken = true; + buildInputs = with pkgs; [ pcre.dev ]; + }; + + pthreads32-dev = assert (pkgs.config.php.zts or false); assert isPhp73; buildPecl rec { + version = "3.2.0-dev"; + pname = "pthreads"; + + src = pkgs.fetchFromGitHub { + owner = "krakjoe"; + repo = "pthreads"; + rev = "4d1c2483ceb459ea4284db4eb06646d5715e7154"; + sha256 = "07kdxypy0bgggrfav2h1ccbv67lllbvpa3s3zsaqci0gq4fyi830"; + }; + + buildInputs = with pkgs; [ pcre2.dev ]; }; redis = buildPecl rec { - version = "4.3.0"; + version = "5.0.2"; pname = "redis"; - sha256 = "18hvll173mlp6dk6xvgajkjf4min8f5gn809nr1ahq4r6kn4rw60"; + sha256 = "0b5pw17lzqknhijfymksvf8fm1zilppr97ypb31n599jw3mxf62f"; }; sqlsrv = buildPecl rec { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6b89401cb95..eada8bf669e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -579,6 +579,8 @@ in { filemagic = callPackage ../development/python-modules/filemagic { }; + fsspec = callPackage ../development/python-modules/fsspec { }; + fuse = callPackage ../development/python-modules/fuse-python { inherit (pkgs) fuse pkgconfig; }; @@ -984,6 +986,8 @@ in { inherit (pkgs) cmake qt5 llvmPackages; }); + simplefix = callPackage ../development/python-modules/simplefix { }; + pyside2-tools = toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake qt5; }); @@ -1158,6 +1162,8 @@ in { statistics = callPackage ../development/python-modules/statistics { }; + stm32loader = callPackage ../development/python-modules/stm32loader { }; + stumpy = callPackage ../development/python-modules/stumpy { }; sumo = callPackage ../development/python-modules/sumo { }; @@ -1491,6 +1497,8 @@ in { boltztrap2 = callPackage ../development/python-modules/boltztrap2 { }; + boolean-py = callPackage ../development/python-modules/boolean-py { }; + bumps = callPackage ../development/python-modules/bumps {}; cached-property = callPackage ../development/python-modules/cached-property { }; @@ -1928,12 +1936,6 @@ in { hypothesis = self.hypothesis.override { doCheck = false; }; }; - # Keep 3 because many test suites are not yet compatible with Pytest 4. - pytest_3 = callPackage ../development/python-modules/pytest/3.10.nix { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { doCheck = false; }; - }; - pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { }; @@ -2446,6 +2448,8 @@ in { libthumbor = callPackage ../development/python-modules/libthumbor { }; + license-expression = callPackage ../development/python-modules/license-expression { }; + lightblue = callPackage ../development/python-modules/lightblue { }; lightgbm = callPackage ../development/python-modules/lightgbm { }; @@ -2818,6 +2822,8 @@ in { django-jinja = callPackage ../development/python-modules/django-jinja2 { }; + django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { }; + django-pglocks = callPackage ../development/python-modules/django-pglocks { }; django-picklefield = callPackage ../development/python-modules/django-picklefield { }; @@ -3134,6 +3140,8 @@ in { gipc = callPackage ../development/python-modules/gipc { }; + git-revise = callPackage ../development/python-modules/git-revise { }; + git-sweep = callPackage ../development/python-modules/git-sweep { }; glances = callPackage ../development/python-modules/glances { }; @@ -4697,6 +4705,11 @@ in { seqdiag = callPackage ../development/python-modules/seqdiag { }; + sequoia = disabledIf (isPyPy || !isPy3k) (toPythonModule (pkgs.sequoia.override { + pythonPackages = self; + pythonSupport = true; + })); + safe = callPackage ../development/python-modules/safe { }; sampledata = callPackage ../development/python-modules/sampledata { }; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 108c6006fb6..eac84cfc1a8 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -163,9 +163,11 @@ in { enableShared = false; inherit libcxxabi; }; + libunwind = super.llvmPackages_8.libraries.libunwind.override { + enableShared = false; + }; }; }; python27 = super.python27.override { static = true; }; - }