diff options
135 files changed, 2493 insertions, 1543 deletions
diff --git a/doc/haskell-users-guide.xml b/doc/haskell-users-guide.xml index e3903ddd411..e0dc89cc7ce 100644 --- a/doc/haskell-users-guide.xml +++ b/doc/haskell-users-guide.xml @@ -92,18 +92,18 @@ error: attribute ‘haskellPackages’ in selection path </para> <programlisting> $ nix-env -qaP coreutils -nixos.pkgs.coreutils coreutils-8.23 +nixos.coreutils coreutils-8.23 </programlisting> <para> If your system responds like that (most NixOS installatios will), then the attribute path to <literal>haskellPackages</literal> is - <literal>nixos.pkgs.haskellPackages</literal>. Thus, if you want to + <literal>nixos.haskellPackages</literal>. Thus, if you want to use <literal>nix-env</literal> without giving an explicit <literal>-f</literal> flag, then that's the way to do it: </para> <programlisting> -$ nix-env -qaP -A nixos.pkgs.haskellPackages -$ nix-env -iA nixos.pkgs.haskellPackages.cabal-install +$ nix-env -qaP -A nixos.haskellPackages +$ nix-env -iA nixos.haskellPackages.cabal-install </programlisting> <para> Our current default compiler is GHC 7.10.x and the diff --git a/lib/modules.nix b/lib/modules.nix index 50827e18f10..a40f02dcc3d 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -285,7 +285,7 @@ rec { in opt // { value = addErrorContext "while evaluating the option `${showOption loc}':" value; - definitions = map (def: def.value) defsFinal; + definitions = map (def: def.value) res.defsFinal; files = map (def: def.file) res.defsFinal; inherit (res) isDefined; }; diff --git a/nixos/doc/manual/configuration/ad-hoc-packages.xml b/nixos/doc/manual/configuration/ad-hoc-packages.xml index e237e20c4ff..a147291c4f3 100644 --- a/nixos/doc/manual/configuration/ad-hoc-packages.xml +++ b/nixos/doc/manual/configuration/ad-hoc-packages.xml @@ -11,7 +11,7 @@ uninstall packages from the command line. For instance, to install Mozilla Thunderbird: <screen> -$ nix-env -iA nixos.pkgs.thunderbird</screen> +$ nix-env -iA nixos.thunderbird</screen> If you invoke this as root, the package is installed in the Nix profile <filename>/nix/var/nix/profiles/default</filename> and visible diff --git a/nixos/doc/manual/configuration/declarative-packages.xml b/nixos/doc/manual/configuration/declarative-packages.xml index 6de38b452e2..dc2fa715097 100644 --- a/nixos/doc/manual/configuration/declarative-packages.xml +++ b/nixos/doc/manual/configuration/declarative-packages.xml @@ -23,13 +23,13 @@ Nixpkgs will be built or downloaded as part of the system when you run <para>You can get a list of the available packages as follows: <screen> $ nix-env -qaP '*' --description -nixos.pkgs.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded +nixos.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded <replaceable>...</replaceable> </screen> The first column in the output is the <emphasis>attribute name</emphasis>, such as -<literal>nixos.pkgs.thunderbird</literal>. (The +<literal>nixos.thunderbird</literal>. (The <literal>nixos</literal> prefix allows distinguishing between different channels that you might have.)</para> diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index aedc85f3069..c50df94bfd8 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -188,6 +188,15 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.cabal-install </para> </listitem> +<listitem> + <para> + The Nix expression search path (<envar>NIX_PATH</envar>) no longer + contains <filename>/etc/nixos/nixpkgs</filename> by default. You + can override <envar>NIX_PATH</envar> by setting + <option>nix.nixPath</option>. + </para> +</listitem> + </itemizedlist> </para> diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index 01d6b21bba9..a97bae57d9b 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -1,6 +1,6 @@ { system, minimal ? false }: -let pkgs = import ./nixpkgs.nix { config = {}; inherit system; }; in +let pkgs = import ../.. { config = {}; inherit system; }; in with pkgs.lib; with import ../lib/qemu-flags.nix; diff --git a/nixos/lib/channel-expr.nix b/nixos/lib/channel-expr.nix deleted file mode 100644 index 453bdd506b8..00000000000 --- a/nixos/lib/channel-expr.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ system ? builtins.currentSystem }: - -{ pkgs = - (import nixpkgs/default.nix { inherit system; }) - // { recurseForDerivations = true; }; -} diff --git a/nixos/lib/make-channel.nix b/nixos/lib/make-channel.nix index 1c6bf0897f4..fd805f7f943 100644 --- a/nixos/lib/make-channel.nix +++ b/nixos/lib/make-channel.nix @@ -10,19 +10,15 @@ pkgs.releaseTools.makeSourceTarball { buildInputs = [ pkgs.nix ]; - expr = builtins.readFile ./channel-expr.nix; - distPhase = '' rm -rf .git echo -n $VERSION_SUFFIX > .version-suffix echo -n ${nixpkgs.rev or nixpkgs.shortRev} > .git-revision releaseName=nixos-$VERSION$VERSION_SUFFIX mkdir -p $out/tarballs - mkdir ../$releaseName - cp -prd . ../$releaseName/nixpkgs + cp -prd . ../$releaseName chmod -R u+w ../$releaseName - ln -s nixpkgs/nixos ../$releaseName/nixos - echo "$expr" > ../$releaseName/default.nix + ln -s . ../$releaseName/nixpkgs # hack to make ‘<nixpkgs>’ work NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null cd .. chmod -R u+w $releaseName diff --git a/nixos/lib/nixpkgs.nix b/nixos/lib/nixpkgs.nix deleted file mode 100644 index 10096f58c79..00000000000 --- a/nixos/lib/nixpkgs.nix +++ /dev/null @@ -1,8 +0,0 @@ -/* Terrible backward compatibility hack to get the path to Nixpkgs - from here. Usually, that's the relative path ‘../..’. However, - when using the NixOS channel, <nixos> resolves to a symlink to - nixpkgs/nixos, so ‘../..’ doesn't resolve to the top-level Nixpkgs - directory but one above it. So check for that situation. */ -if builtins.pathExists ../../.version then import ../.. -else if builtins.pathExists ../../nixpkgs then import ../../nixpkgs -else abort "Can't find Nixpkgs, please set ‘NIX_PATH=nixpkgs=/path/to/nixpkgs’." diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 6f17bd396a0..922a9cf961d 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -142,7 +142,7 @@ with lib; config = let fontconfig = config.fonts.fontconfig; fcBool = x: "<bool>" + (if x then "true" else "false") + "</bool>"; - nixosConf = '' + renderConf = '' <?xml version='1.0'?> <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> <fontconfig> @@ -169,6 +169,21 @@ with lib; </edit> </match> + ${optionalString (fontconfig.dpi != 0) '' + <match target="pattern"> + <edit name="dpi" mode="assign"> + <double>${toString fontconfig.dpi}</double> + </edit> + </match> + ''} + + </fontconfig> + ''; + genericAliasConf = '' + <?xml version='1.0'?> + <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> + <fontconfig> + <!-- Default fonts --> ${optionalString (fontconfig.defaultFonts.sansSerif != []) '' <alias> @@ -201,14 +216,6 @@ with lib; </alias> ''} - ${optionalString (fontconfig.dpi != 0) '' - <match target="pattern"> - <edit name="dpi" mode="assign"> - <double>${toString fontconfig.dpi}</double> - </edit> - </match> - ''} - </fontconfig> ''; in mkIf fontconfig.enable { @@ -219,7 +226,8 @@ with lib; environment.etc."fonts/fonts.conf".source = pkgs.makeFontsConf { fontconfig = pkgs.fontconfig_210; fontDirectories = config.fonts.fonts; }; - environment.etc."fonts/conf.d/98-nixos.conf".text = nixosConf; + environment.etc."fonts/conf.d/10-nixos-rendering.conf".text = renderConf; + environment.etc."fonts/conf.d/60-nixos-generic-alias.conf".text = genericAliasConf; # Versioned fontconfig > 2.10. Take shared fonts.conf from fontconfig. # Otherwise specify only font directories. @@ -236,7 +244,8 @@ with lib; </fontconfig> ''; - environment.etc."fonts/${pkgs.fontconfig.configVersion}/conf.d/98-nixos.conf".text = nixosConf; + environment.etc."fonts/${pkgs.fontconfig.configVersion}/conf.d/10-nixos-rendering.conf".text = renderConf; + environment.etc."fonts/${pkgs.fontconfig.configVersion}/conf.d/60-nixos-generic-alias.conf".text = genericAliasConf; environment.etc."fonts/${pkgs.fontconfig.configVersion}/conf.d/99-user.conf" = { enable = fontconfig.includeUserConf; diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix index e341eac4a81..e2202e1e17d 100644 --- a/nixos/modules/hardware/video/bumblebee.nix +++ b/nixos/modules/hardware/video/bumblebee.nix @@ -52,9 +52,9 @@ in systemd.services.bumblebeed = { description = "Bumblebee Hybrid Graphics Switcher"; wantedBy = [ "display-manager.service" ]; - script = "bumblebeed --use-syslog -g ${config.hardware.bumblebee.group}"; path = [ kernel.bbswitch bumblebee ]; serviceConfig = { + ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${config.hardware.bumblebee.group}"; Restart = "always"; RestartSec = 60; CPUSchedulingPolicy = "idle"; diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix index ca0e233f9e3..eccb19da5cb 100644 --- a/nixos/modules/installer/cd-dvd/channel.nix +++ b/nixos/modules/installer/cd-dvd/channel.nix @@ -9,18 +9,17 @@ let # We need a copy of the Nix expressions for Nixpkgs and NixOS on the # CD. These are installed into the "nixos" channel of the root - # user, as expected by nixos-rebuild/nixos-install. + # user, as expected by nixos-rebuild/nixos-install. FIXME: merge + # with make-channel.nix. channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}" - { expr = readFile ../../../lib/channel-expr.nix; } + { } '' - mkdir -p $out/nixos - cp -prd ${pkgs.path} $out/nixos/nixpkgs - ln -s nixpkgs/nixos $out/nixos/nixos + mkdir -p $out + cp -prd ${pkgs.path} $out/nixos chmod -R u+w $out/nixos - rm -rf $out/nixos/nixpkgs/.git - echo -n ${config.system.nixosVersion} > $out/nixos/nixpkgs/.version - echo -n "" > $out/nixos/nixpkgs/.version-suffix - echo "$expr" > $out/nixos/default.nix + ln -s . $out/nixos/nixpkgs + rm -rf $out/nixos/.git + echo -n ${config.system.nixosVersionSuffix} > $out/nixos/.version-suffix ''; in diff --git a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh index f9cbfffde70..4e981c074a5 100644 --- a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh +++ b/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh @@ -53,5 +53,5 @@ fi # Build a network of VMs -nix-build '<nixos/modules/installer/tools/nixos-build-vms/build-vms.nix>' \ +nix-build '<nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix>' \ --argstr networkExpr $networkExpr $noOutLinkArg $showTraceArg diff --git a/nixos/modules/installer/tools/nixos-checkout.nix b/nixos/modules/installer/tools/nixos-checkout.nix index 9cdd8a74a18..07274e139f7 100644 --- a/nixos/modules/installer/tools/nixos-checkout.nix +++ b/nixos/modules/installer/tools/nixos-checkout.nix @@ -27,7 +27,7 @@ let if [ -z "$(type -P git)" ]; then echo "installing Git..." - nix-env -iA nixos.pkgs.git || nix-env -i git + nix-env -iA nixos.git fi # Move any old nixpkgs directories out of the way. diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index b1f4772d570..f7fe6245d6d 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -256,14 +256,8 @@ NIXOS_INSTALL_GRUB=1 chroot $mountPoint \ chroot $mountPoint /nix/var/nix/profiles/system/activate -# Some systems may not be prepared to use NixOS' paths. -export PATH=/run/current-system/sw/bin:/run/current-system/sw/sbin:$PATH -export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs -export NIX_PATH=$NIX_PATH:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels - - # Ask the user to set a root password. -if [ "$(chroot $mountPoint nix-instantiate --eval '<nixpkgs/nixos>' -A config.users.mutableUsers)" = true ] && [ -t 0 ] ; then +if [ "$(chroot $mountPoint /run/current-system/sw/bin/sh -l -c "nix-instantiate --eval '<nixpkgs/nixos>' -A config.users.mutableUsers")" = true ] && [ -t 0 ] ; then echo "setting root password..." chroot $mountPoint /var/setuid-wrappers/passwd fi diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index ccafa30856c..7d0e5913cfb 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -157,9 +157,9 @@ if [ -n "$buildNix" ]; then if ! nix-build '<nixpkgs>' -A nix -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then machine="$(uname -m)" if [ "$machine" = x86_64 ]; then - nixStorePath=/nix/store/ffig6yaggbh12dh9y5pnf1grf5lqyipz-nix-1.8 + nixStorePath=/nix/store/664kxr14kfgx4dl095crvmr7pbh9xlh5-nix-1.9 elif [[ "$machine" =~ i.86 ]]; then - nixStorePath=/nix/store/lglhfp4mimfa5wzjjf1kqz6f5wlsj2mn-nix-1.8 + nixStorePath=/nix/store/p7xdvz72xx3rhm121jclsbdmmcds7xh6-nix-1.9 else echo "$0: unsupported platform" exit 1 diff --git a/nixos/modules/misc/assertions.nix b/nixos/modules/misc/assertions.nix index c42de038e61..3b50e60a0ff 100644 --- a/nixos/modules/misc/assertions.nix +++ b/nixos/modules/misc/assertions.nix @@ -30,5 +30,5 @@ with lib; }; }; - # impl of assertions is in <nixos/modules/system/activation/top-level.nix> + # impl of assertions is in <nixpkgs/nixos/modules/system/activation/top-level.nix> } diff --git a/nixos/modules/misc/extra-arguments.nix b/nixos/modules/misc/extra-arguments.nix index ff2ff7cd432..02ac6e7a59d 100644 --- a/nixos/modules/misc/extra-arguments.nix +++ b/nixos/modules/misc/extra-arguments.nix @@ -2,7 +2,7 @@ { _module.args = { - pkgs_i686 = import ../../lib/nixpkgs.nix { + pkgs_i686 = import ../../.. { system = "i686-linux"; config.allowUnfree = true; }; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index b25e3d7e40d..1e5393f26b5 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -228,6 +228,7 @@ subsonic = 204; riak = 205; shout = 206; + gateone = 207; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -434,6 +435,7 @@ subsonic = 204; riak = 205; #shout = 206; #unused + gateone = 207; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index e85e390acb6..4f9c8d4e5ba 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -60,7 +60,7 @@ in { type = types.bool; default = false; description = '' - Whether to include <filename>/nix/store<filename> in the locate database. + Whether to include <filename>/nix/store</filename> in the locate database. ''; }; diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index fb5516c953c..5eb38c510b4 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -72,7 +72,7 @@ in }; config = { - _module.args.pkgs = import ../../lib/nixpkgs.nix { + _module.args.pkgs = import ../../.. { system = config.nixpkgs.system; inherit (config.nixpkgs) config; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 212555d7efc..409f2292087 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -72,7 +72,6 @@ ./programs/ssmtp.nix ./programs/uim.nix ./programs/venus.nix - ./programs/virtualbox-host.nix ./programs/wvdial.nix ./programs/freetds.nix ./programs/zsh/zsh.nix @@ -283,6 +282,7 @@ ./services/networking/firewall.nix ./services/networking/flashpolicyd.nix ./services/networking/freenet.nix + ./services/networking/gateone.nix ./services/networking/git-daemon.nix ./services/networking/gnunet.nix ./services/networking/gogoclient.nix @@ -486,6 +486,7 @@ ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix ./virtualisation/virtualbox-guest.nix + ./virtualisation/virtualbox-host.nix ./virtualisation/vmware-guest.nix ./virtualisation/xen-dom0.nix ] diff --git a/nixos/modules/profiles/clone-config.nix b/nixos/modules/profiles/clone-config.nix index f0d60bb6c42..77d86f8d740 100644 --- a/nixos/modules/profiles/clone-config.nix +++ b/nixos/modules/profiles/clone-config.nix @@ -30,7 +30,7 @@ let relocatedModuleFiles = let relocateNixOS = path: - "<nixos" + removePrefix nixosPath (toString path) + ">"; + "<nixpkgs/nixos" + removePrefix nixosPath (toString path) + ">"; relocateOthers = null; in { nixos = map relocateNixOS partitionedModuleFiles.nixos; diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index dce757ceb62..52f6cc22111 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -23,15 +23,6 @@ in EDITOR = mkDefault "nano"; }; - environment.sessionVariables = - { NIX_PATH = - [ "/nix/var/nix/profiles/per-user/root/channels/nixos" - "nixpkgs=/etc/nixos/nixpkgs" - "nixos-config=/etc/nixos/configuration.nix" - "/nix/var/nix/profiles/per-user/root/channels" - ]; - }; - environment.profiles = [ "$HOME/.nix-profile" "/nix/var/nix/profiles/default" diff --git a/nixos/modules/services/hardware/freefall.nix b/nixos/modules/services/hardware/freefall.nix index 6e6960bac49..7867956c1ab 100644 --- a/nixos/modules/services/hardware/freefall.nix +++ b/nixos/modules/services/hardware/freefall.nix @@ -39,11 +39,14 @@ with lib; mkService = dev: assert dev != ""; let dev' = utils.escapeSystemdPath dev; in - nameValuePair "freefall-${dev'}" - { description = "Free-fall protection for ${dev}"; + nameValuePair "freefall-${dev'}" { + description = "Free-fall protection for ${dev}"; after = [ "${dev'}.device" ]; wantedBy = [ "${dev'}.device" ]; path = [ pkgs.freefall ]; + unitConfig = { + DefaultDependencies = false; + }; serviceConfig = { ExecStart = "${pkgs.freefall}/bin/freefall ${dev}"; Restart = "on-failure"; diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix index 72b706ddc5a..10a706fbd71 100644 --- a/nixos/modules/services/misc/gitit.nix +++ b/nixos/modules/services/misc/gitit.nix @@ -8,6 +8,8 @@ let homeDir = "/var/lib/gitit"; + toYesNo = b: if b then "yes" else "no"; + gititShared = with cfg.haskellPackages; gitit + "/share/" + pkgs.stdenv.system + "-" + ghc.name + "/" + gitit.pname + "-" + gitit.version; gititWithPkgs = hsPkgs: extras: hsPkgs.ghcWithPackages (self: with self; [ gitit ] ++ (extras self)); @@ -17,9 +19,6 @@ let in writeScript "gitit" '' #!${stdenv.shell} cd $HOME - export PATH="${makeSearchPath "bin" ( - [ git curl ] ++ (if cfg.pdfExport == "yes" then [texLiveFull] else []) - )}:$PATH"; export NIX_GHC="${env}/bin/ghc" export NIX_GHCPKG="${env}/bin/ghc-pkg" export NIX_GHC_DOCDIR="${env}/share/doc/ghc/html" @@ -27,11 +26,7 @@ let ${env}/bin/gitit -f ${configFile} ''; - gititOptions = let - - yesNo = types.enum [ "yes" "no" ]; - - in { + gititOptions = { enable = mkOption { type = types.bool; @@ -202,8 +197,8 @@ let }; showLhsBirdTracks = mkOption { - type = yesNo; - default = "no"; + type = types.bool; + default = false; description = '' Specifies whether to show Haskell code blocks in "bird style", with "> " at the beginning of each line. @@ -283,8 +278,8 @@ let }; tableOfContents = mkOption { - type = yesNo; - default = "yes"; + type = types.bool; + default = true; description = '' Specifies whether to print a tables of contents (with links to sections) on each wiki page. @@ -292,22 +287,18 @@ let }; plugins = mkOption { - type = types.path; + type = with types; listOf str; description = '' - Specifies a list of plugins to load. Plugins may be specified either - by their path or by their module name. If the plugin name starts + Specifies a list of plugins to load. Plugins may be specified either + by their path or by their module name. If the plugin name starts with Gitit.Plugin., gitit will assume that the plugin is an installed module and will not try to find a source file. - Examples: - plugins: plugins/DotPlugin.hs, CapitalizeEmphasisPlugin.hs - plugins: plugins/DotPlugin - plugins: Gitit.Plugin.InterwikiLinks ''; }; useCache = mkOption { - type = yesNo; - default = "no"; + type = types.bool; + default = false; description = '' Specifies whether to cache rendered pages. Note that if use-feed is selected, feeds will be cached regardless of the value of use-cache. @@ -338,14 +329,14 @@ let }; debugMode = mkOption { - type = yesNo; - default = "no"; + type = types.bool; + default = false; description = "Causes debug information to be logged while gitit is running."; }; compressResponses = mkOption { - type = yesNo; - default = "yes"; + type = types.bool; + default = true; description = "Specifies whether HTTP responses should be compressed."; }; @@ -357,16 +348,18 @@ let line of the file should contain two fields, separated by whitespace. The first field is the mime type, the second is a file extension. For example: - video/x-ms-wmx wmx +<programlisting> +video/x-ms-wmx wmx +</programlisting> If the file is not found, some simple defaults will be used. ''; }; useReCaptcha = mkOption { - type = yesNo; - default = "no"; + type = types.bool; + default = false; description = '' - If "yes", causes gitit to use the reCAPTCHA service + If true, causes gitit to use the reCAPTCHA service (http://recaptcha.net) to prevent bots from creating accounts. ''; }; @@ -471,8 +464,8 @@ let }; useFeed = mkOption { - type = yesNo; - default = "no"; + type = types.bool; + default = false; description = '' Specifies whether an ATOM feed should be enabled (for the site and for individual pages). @@ -484,19 +477,19 @@ let default = null; description = '' The base URL of the wiki, to be used in constructing feed IDs and RPX - token_urls. Set this if use-feed is 'yes' or authentication-method + token_urls. Set this if useFeed is false or authentication-method is 'rpx'. ''; }; absoluteUrls = mkOption { - type = yesNo; - default = "no"; + type = types.bool; + default = false; description = '' Make wikilinks absolute with respect to the base-url. So, for example, in a wiki served at the base URL '/wiki', on a page Sub/Page, the wikilink '[Cactus]()' will produce a link to - '/wiki/Cactus' if absolute-urls is 'yes', and a relative link to + '/wiki/Cactus' if absoluteUrls is true, and a relative link to 'Cactus' (referring to '/wiki/Sub/Cactus') if absolute-urls is 'no'. ''; }; @@ -514,10 +507,10 @@ let }; pdfExport = mkOption { - type = yesNo; - default = "no"; + type = types.bool; + default = false; description = '' - If yes, PDF will appear in export options. PDF will be created using + If true, PDF will appear in export options. PDF will be created using pdflatex, which must be installed and in the path. Note that PDF exports create significant additional server load. ''; @@ -537,10 +530,10 @@ let }; xssSanitize = mkOption { - type = yesNo; - default = "yes"; + type = types.bool; + default = true; description = '' - If yes, all HTML (including that produced by pandoc) is filtered + If true, all HTML (including that produced by pandoc) is filtered through xss-sanitize. Set to no only if you trust all of your users. ''; }; @@ -560,7 +553,7 @@ let default-page-type: ${cfg.defaultPageType} math: ${cfg.math} mathjax-script: ${cfg.mathJaxScript} - show-lhs-bird-tracks: ${cfg.showLhsBirdTracks} + show-lhs-bird-tracks: ${toYesNo cfg.showLhsBirdTracks} templates-dir: ${cfg.templatesDir} log-file: ${cfg.logFile} log-level: ${cfg.logLevel} @@ -568,16 +561,16 @@ let no-delete: ${cfg.noDelete} no-edit: ${cfg.noEdit} default-summary: ${cfg.defaultSummary} - table-of-contents: ${cfg.tableOfContents} - plugins: ${cfg.plugins} - use-cache: ${cfg.useCache} + table-of-contents: ${toYesNo cfg.tableOfContents} + plugins: ${concatStringsSep "," cfg.plugins} + use-cache: ${toYesNo cfg.useCache} cache-dir: ${cfg.cacheDir} max-upload-size: ${cfg.maxUploadSize} max-page-size: ${cfg.maxPageSize} - debug-mode: ${cfg.debugMode} - compress-responses: ${cfg.compressResponses} + debug-mode: ${toYesNo cfg.debugMode} + compress-responses: ${toYesNo cfg.compressResponses} mime-types-file: ${cfg.mimeTypesFile} - use-recaptcha: ${cfg.useReCaptcha} + use-recaptcha: ${toYesNo cfg.useReCaptcha} recaptcha-private-key: ${toString cfg.reCaptchaPrivateKey} recaptcha-public-key: ${toString cfg.reCaptchaPublicKey} access-question: ${cfg.accessQuestion} @@ -586,14 +579,14 @@ let rpx-key: ${toString cfg.rpxKey} mail-command: ${cfg.mailCommand} reset-password-message: ${cfg.resetPasswordMessage} - use-feed: ${cfg.useFeed} + use-feed: ${toYesNo cfg.useFeed} base-url: ${toString cfg.baseUrl} - absolute-urls: ${cfg.absoluteUrls} + absolute-urls: ${toYesNo cfg.absoluteUrls} feed-days: ${toString cfg.feedDays} feed-refresh-time: ${toString cfg.feedRefreshTime} - pdf-export: ${cfg.pdfExport} + pdf-export: ${toYesNo cfg.pdfExport} pandoc-user-data: ${toString cfg.pandocUserData} - xss-sanitize: ${cfg.xssSanitize} + xss-sanitize: ${toYesNo cfg.xssSanitize} ''; in @@ -608,7 +601,7 @@ in haskellPackages = mkDefault pkgs.haskellPackages; staticDir = gititShared + "/data/static"; templatesDir = gititShared + "/data/templates"; - plugins = gititShared + "/plugins/Dot.hs"; + plugins = [ ]; }; users.extraUsers.gitit = { @@ -628,8 +621,16 @@ in description = "Git and Pandoc Powered Wiki"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - - preStart = with cfg; '' + path = with pkgs; [ curl ] + ++ optional cfg.pdfExport texLiveFull + ++ optional (cfg.repositoryType == "darcs") darcs + ++ optional (cfg.repositoryType == "mercurial") mercurial + ++ optional (cfg.repositoryType == "git") git; + + preStart = let + gm = "gitit@${config.networking.hostName}"; + in + with cfg; '' chown ${uid}:${gid} -R ${homeDir} for dir in ${repositoryPath} ${staticDir} ${templatesDir} ${cacheDir} do @@ -641,14 +642,35 @@ in fi done cd ${repositoryPath} - if [ ! -d .git ] - then - ${pkgs.git}/bin/git init - ${pkgs.git}/bin/git config user.email "gitit@${config.networking.hostName}" - ${pkgs.git}/bin/git config user.name "gitit" - chown ${uid}:${gid} -R {repositoryPath} - fi - cd - + ${ + if repositoryType == "darcs" then + '' + if [ ! -d _darcs ] + then + ${pkgs.darcs}/bin/darcs initialize + echo "${gm}" > _darcs/prefs/email + '' + else if repositoryType == "mercurial" then + '' + if [ ! -d .hg ] + then + ${pkgs.mercurial}/bin/hg init + cat >> .hg/hgrc <<NAMED +[ui] +username = gitit ${gm} +NAMED + '' + else + '' + if [ ! -d .git ] + then + ${pkgs.git}/bin/git init + ${pkgs.git}/bin/git config user.email "${gm}" + ${pkgs.git}/bin/git config user.name "gitit" + ''} + chown ${uid}:${gid} -R ${repositoryPath} + fi + cd - ''; serviceConfig = { diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 4088f9ff055..4aed91c3497 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -309,6 +309,20 @@ in ''; }; + nixPath = mkOption { + type = types.listOf types.str; + default = + [ "/nix/var/nix/profiles/per-user/root/channels/nixos" + "nixos-config=/etc/nixos/configuration.nix" + "/nix/var/nix/profiles/per-user/root/channels" + ]; + description = '' + The default Nix expression search path, used by the Nix + evaluator to look up paths enclosed in angle brackets + (e.g. <literal><nixpkgs></literal>). + ''; + }; + }; }; @@ -378,7 +392,9 @@ in }; # Set up the environment variables for running Nix. - environment.sessionVariables = cfg.envVars; + environment.sessionVariables = cfg.envVars // + { NIX_PATH = concatStringsSep ":" cfg.nixPath; + }; environment.extraInit = '' diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix index 4a812167bb5..eb355151572 100644 --- a/nixos/modules/services/networking/dnsmasq.nix +++ b/nixos/modules/services/networking/dnsmasq.nix @@ -98,6 +98,7 @@ in ExecStart = "${dnsmasq}/bin/dnsmasq -k --enable-dbus --user=dnsmasq -C ${dnsmasqConf}"; ExecReload = "${dnsmasq}/bin/kill -HUP $MAINPID"; }; + restartTriggers = [ config.environment.etc.hosts.source ]; }; }; diff --git a/nixos/modules/services/networking/gateone.nix b/nixos/modules/services/networking/gateone.nix new file mode 100644 index 00000000000..b8ae5490d7b --- /dev/null +++ b/nixos/modules/services/networking/gateone.nix @@ -0,0 +1,59 @@ +{ config, lib, pkgs, ...}: +with lib; +let + cfg = config.services.gateone; +in +{ +options = { + services.gateone = { + enable = mkEnableOption "GateOne server"; + pidDir = mkOption { + default = "/run/gateone"; + type = types.path; + description = ''Path of pid files for GateOne.''; + }; + settingsDir = mkOption { + default = "/var/lib/gateone"; + type = types.path; + description = ''Path of configuration files for GateOne.''; + }; + }; +}; +config = mkIf cfg.enable { + environment.systemPackages = with pkgs.pythonPackages; [ + gateone pkgs.openssh pkgs.procps pkgs.coreutils ]; + + users.extraUsers.gateone = { + description = "GateOne privilege separation user"; + uid = config.ids.uids.gateone; + home = cfg.settingsDir; + }; + users.extraGroups.gateone.gid = config.ids.gids.gateone; + + systemd.services.gateone = with pkgs; { + description = "GateOne web-based terminal"; + path = [ pythonPackages.gateone nix openssh procps coreutils ]; + preStart = '' + if [ ! -d ${cfg.settingsDir} ] ; then + mkdir -m 0750 -p ${cfg.settingsDir} + mkdir -m 0750 -p ${cfg.pidDir} + chown -R gateone.gateone ${cfg.settingsDir} + chown -R gateone.gateone ${cfg.pidDir} + fi + ''; + #unitConfig.RequiresMountsFor = "${cfg.settingsDir}"; + serviceConfig = { + ExecStart = ''${pythonPackages.gateone}/bin/gateone --settings_dir=${cfg.settingsDir} --pid_file=${cfg.pidDir}/gateone.pid --gid=${toString config.ids.gids.gateone} --uid=${toString config.ids.uids.gateone}''; + User = "gateone"; + Group = "gateone"; + WorkingDirectory = cfg.settingsDir; + PermissionsStartOnly = true; + + }; + + wantedBy = [ "multi-user.target" ]; + requires = [ "network.target" ]; + }; +}; +} + diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index fd9589883ed..e743aa8a323 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -230,8 +230,8 @@ in ]; }; - systemd.services.cups-browsed = - { description = "Make remote CUPS printers available locally"; + systemd.services.cups-browsed = mkIf config.services.avahi.enable + { description = "CUPS Remote Printer Discovery"; wantedBy = [ "multi-user.target" ]; wants = [ "cups.service" "avahi-daemon.service" ]; diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix index a0e4bd558e0..6c4014fc4a1 100644 --- a/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/nixos/modules/virtualisation/virtualbox-guest.nix @@ -54,7 +54,7 @@ in unitConfig.ConditionVirtualization = "oracle"; - serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/sbin/VBoxService VBoxService --foreground"; + serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/bin/VBoxService VBoxService --foreground"; }; services.xserver.videoDrivers = mkOverride 50 [ "virtualbox" ]; diff --git a/nixos/modules/programs/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index fc113a08a35..fc113a08a35 100644 --- a/nixos/modules/programs/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix index a39104f603e..a8369a6d1f8 100644 --- a/nixos/tests/avahi.nix +++ b/nixos/tests/avahi.nix @@ -2,7 +2,7 @@ import ./make-test.nix ({ pkgs, ... } : { name = "avahi"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow wizeman ]; + maintainers = [ eelco chaoflow ]; }; nodes = { diff --git a/nixos/tests/check-filesystems.nix b/nixos/tests/check-filesystems.nix deleted file mode 100644 index cb9ff25f977..00000000000 --- a/nixos/tests/check-filesystems.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ nixos ? ./.. -, nixpkgs ? /etc/nixos/nixpkgs -, system ? builtins.currentSystem -}: - -with import ../lib/build-vms.nix { inherit nixos nixpkgs system; }; - -rec { - name = "check-filesystems"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; - }; - - nodes = { - share = {pkgs, config, ...}: { - services.nfs.server.enable = true; - services.nfs.server.exports = '' - /repos1 192.168.1.0/255.255.255.0(rw,no_root_squash) - /repos2 192.168.1.0/255.255.255.0(rw,no_root_squash) - ''; - services.nfs.server.createMountPoints = true; - - jobs.checkable = { - startOn = [ - config.jobs.nfs_kernel_exports.name - config.jobs.nfs_kernel_nfsd.name - ]; - respawn = true; - }; - }; - - fsCheck = {pkgs, config, ...}: { - fileSystems = - let - repos1 = { - mountPoint = "/repos1"; - autocreate = true; - device = "share:/repos1"; - fsType = "nfs"; - }; - - repos2 = { - mountPoint = "/repos2"; - autocreate = true; - device = "share:/repos2"; - fsType = "nfs"; - }; - in pkgs.lib.mkVMOverride [ - repos1 - repos1 # check remount - repos2 # check after remount - ]; - - jobs.checkable = { - startOn = "stopped ${config.jobs.filesystems.name}"; - respawn = true; - }; - }; - }; - - vms = buildVirtualNetwork { inherit nodes; }; - - test = runTests vms - '' - startAll; - - $share->waitForUnit("checkable"); - $fsCheck->waitForUnit("checkable"); - - # check repos1 - $fsCheck->succeed("test -d /repos1"); - $share->succeed("touch /repos1/test1"); - $fsCheck->succeed("test -e /repos1/test1"); - - # check repos2 (check after remount) - $fsCheck->succeed("test -d /repos2"); - $share->succeed("touch /repos2/test2"); - $fsCheck->succeed("test -e /repos2/test2"); - - # check without network - $share->block(); - $fsCheck->fail("test -e /repos1/test1"); - $fsCheck->fail("test -e /repos2/test2"); - ''; -} diff --git a/nixos/tests/containers.nix b/nixos/tests/containers.nix index c429f9c7b71..ce36a7e0588 100644 --- a/nixos/tests/containers.nix +++ b/nixos/tests/containers.nix @@ -46,7 +46,7 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null"); # Make sure we have a NixOS tree (required by ‘nixos-container create’). - $machine->succeed("PAGER=cat nix-env -qa -A nixos.pkgs.hello >&2"); + $machine->succeed("PAGER=cat nix-env -qa -A nixos.hello >&2"); # Create some containers imperatively. my $id1 = $machine->succeed("nixos-container create foo --ensure-unique-name"); diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 0db9a529644..ea18114b61c 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({pkgs, ... }: { name = "printing"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ iElectric eelco chaoflow jgeerds vcunat ]; + maintainers = [ iElectric eelco chaoflow jgeerds ]; }; nodes = { diff --git a/nixos/tests/riak.nix b/nixos/tests/riak.nix index a56f51c4e50..f36d12bdb2c 100644 --- a/nixos/tests/riak.nix +++ b/nixos/tests/riak.nix @@ -16,6 +16,6 @@ import ./make-test.nix { $master->waitForUnit("riak"); $master->sleep(20); # Hopefully this is long enough!! - $master->succeed("RIAK_DATA_DIR='/var/db/riak' RIAK_LOG_DIR='/var/log/riak' RIAK_ETC_DIR='/etc/riak' riak ping 2>&1"); + $master->succeed("riak ping 2>&1"); ''; } diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index f94d219aba6..4895eb134dc 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let #!${pkgs.stdenv.shell} -xe export PATH="${pkgs.coreutils}/bin:${pkgs.utillinux}/bin" - ${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/VBoxService + ${pkgs.linuxPackages.virtualboxGuestAdditions}/bin/VBoxService ${(attrs.vmScript or (const "")) pkgs} i=0 @@ -39,7 +39,7 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let ]; boot.initrd.extraUtilsCommands = '' - copy_bin_and_libs "${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/mount.vboxsf" + copy_bin_and_libs "${pkgs.linuxPackages.virtualboxGuestAdditions}/bin/mount.vboxsf" copy_bin_and_libs "${pkgs.utillinux}/bin/unshare" ${(attrs.extraUtilsCommands or (const "")) pkgs} ''; diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 6d585905766..50db71ea723 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.6.3"; + version = "0.7.0"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "1f0vpwq7vydldrq9fdfipbkzqqndyxlx0n81ch1i9kw81xj3sxjq"; + sha256 = "1fbi835559qsg9fxgdbdyf5z1zlzf9n8zrq0p67damb55mmigaj8"; }; buildInputs = [ libjack2 libsndfile lv2 qt4 ]; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index c3e0fc79e21..d04af37560f 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.32.3"; + version = "0.33.0"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2"; - sha256 = "1ybc5jk7fj6n8qh9ajzl1f6fzdmzab4nwjrh4fsylm94dn1jv0if"; + sha256 = "1w6dg2n0alfjsx1iy6s53783invygwxk11p1i65cc3nq3zlidcgx"; }; nativeBuildInputs = [ gettext intltool pkgconfig python ]; diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index fd3f7791c1a..544422cfaea 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.6.3"; + version = "0.7.0"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "1c62fpfl9xv93m04hfh72vzbljr0c5p409vzf3xxmvj9x610yx1w"; + sha256 = "0w1cl1vjhzzdyxfn8fcfgx5j5d4gi182w5b89f7qzg1akhmsqmfr"; }; buildInputs = [ libjack2 libsndfile lv2 qt4 ]; diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index c7ad1c7049b..b447b235bfa 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -2,11 +2,11 @@ , texLiveAggregationFun }: stdenv.mkDerivation rec { - name = "org-8.2.10"; + name = "org-8.3"; src = fetchurl { url = "http://orgmode.org/${name}.tar.gz"; - sha256 = "1xm8n8zwr3676rl4pd32k61rd7rimlihhrw5a7r4z7r154c4a2fz"; + sha256 = "0yqbl232hfppljz545jbjawwaw7qjdjsq97c0wf0cbkghgpln3wy"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index a63dd0ab9e2..d69c1e27c4a 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "macvim-${version}"; - version = "7.4.479"; + version = "7.4.648"; src = fetchurl { - url = "https://github.com/genoma/macvim/archive/g-snapshot-21.tar.gz"; - sha256 = "1s86dpb8bcxh309gikiz8gm9ygv3d2jy6i4qlnxarbvcdk65fzv4"; + url = "https://github.com/genoma/macvim/archive/g-snapshot-32.tar.gz"; + sha256 = "1wqg5sy7krgqg3sj00gb34avg90ga2kbvv09bsxv2267j7agi0iq"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 41531ed0de8..409fd0a767c 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -2,9 +2,20 @@ , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool , gsl, python, pyxml, lxml, poppler, imagemagick, libwpg, librevenge -, libvisio, libcdr, libexif +, libvisio, libcdr, libexif, unzip +, boxMakerPlugin ? false # boxmaker plugin }: +let + +boxmaker = fetchurl { + # http://www.inkscapeforum.com/viewtopic.php?f=11&t=10403 + url = "http://www.keppel.demon.co.uk/111000/files/BoxMaker0.91.zip"; + sha256 = "5c5697f43dc3a95468f61f479cb50b7e2b93379a1729abf19e4040ac9f43a1a8"; +}; + +in + stdenv.mkDerivation rec { name = "inkscape-0.91"; @@ -34,12 +45,23 @@ stdenv.mkDerivation rec { libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext makeWrapper intltool gsl poppler imagemagick libwpg librevenge libvisio libcdr libexif - ]; + ] ++ stdenv.lib.optional boxMakerPlugin unzip; enableParallelBuilding = true; doCheck = true; postInstall = '' + ${if boxMakerPlugin then " + mkdir -p $out/share/inkscape/extensions/ + # boxmaker packaged version 0.91 in a directory called 0.85 ?!?? + unzip ${boxmaker}; + cp boxmake-upd-0.85/* $out/share/inkscape/extensions/ + rm -Rf boxmake-upd-0.85 + " + else + "" + } + # Make sure PyXML modules can be found at run-time. for i in "$out/bin/"* do diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 787b5e80528..4c15ccc0428 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,11 +5,12 @@ }: stdenv.mkDerivation rec { - name = "calibre-2.31.0"; + name = "calibre-2.33.0"; + version = "2.33.0"; src = fetchurl { - url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "1414c324alvgwbiszalklck1kay41yca2wnm488imr2768fihzkz"; + url = "https://github.com/kovidgoyal/calibre/releases/download/v${version}/${name}.tar.xz"; + sha256 = "0j1micmjffi6rsn3ayblnz0wq648v05ckbn1qsiz086iaj2285q9"; }; inherit python; diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index bd0727ccab1..9d9b69f5958 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,19 +1,20 @@ { stdenv, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf, lablgl -, gtk3, openjpeg, jbig2dec, mujs, xsel }: +, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl }: let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; in stdenv.mkDerivation rec { name = "llpp-${version}"; - version = "21-git-2015-06-27"; + version = "21-git-2015-07-30"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; - rev = "843c42ef41bb78a3b1ee995fc2bab91f8796e8ad"; - sha256 = "0h8wa7f5bj5sm3sr8namcyy81s4s80hyasimyfw935lqyw2q2k60"; + rev = "e9fe06d684b145a104cc319673076e069e853cac"; + sha256 = "0x3hgn6sfjln2sqdw40ylcj943rn732a6mlfwz01llx8ykiyvsvq"; + fetchSubmodules = false; }; buildInputs = [ pkgconfig ninja makeWrapper ocaml findlib mupdf lablgl - gtk3 jbig2dec openjpeg mujs ]; + gtk3 jbig2dec openjpeg mujs openssl ]; configurePhase = '' sh configure.sh -O -F ${mupdf} diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 1b5da0763e7..96852e93cb9 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -41,7 +41,7 @@ let desktopItem = makeDesktopItem { name = "chromium"; - exec = "chromium"; + exec = "chromium %U"; icon = "${chromium.browser}/share/icons/hicolor/48x48/apps/chromium.png"; comment = "An open source web browser from Google"; desktopName = "Chromium"; diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 5bb6a93d8d7..0b0e5bd0838 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -53,7 +53,7 @@ let wvDescription = "Playback of encrypted HTML audio/video content"; wvMimeTypes = "application/x-ppapi-widevine-cdm"; wvModule = "$widevine/lib/libwidevinecdmadapter.so"; - wvInfo = "#${wvName}#${wvDescription}:${wvMimeTypes}"; + wvInfo = "#${wvName}#${wvDescription};${wvMimeTypes}"; in '' flashVersion="$( sed -n -r 's/.*"version": "([^"]+)",.*/\1/p' PepperFlash/manifest.json diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index e8ad569adbf..98445cedfdc 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -17,8 +17,6 @@ let "s,^/,," ]); - pre44 = versionOlder version "44.0.0.0"; - in stdenv.mkDerivation { name = "chromium-source-${version}"; @@ -46,9 +44,7 @@ in stdenv.mkDerivation { done ''; - patches = if pre44 - then singleton ./nix_plugin_paths_42.patch - else singleton ./nix_plugin_paths_44.patch; + patches = singleton ./nix_plugin_paths_44.patch; patchPhase = let diffmod = sym: "/^${sym} /{s/^${sym} //;${transform ""};s/^/${sym} /}"; diff --git a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_42.patch b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_42.patch deleted file mode 100644 index fb09763c997..00000000000 --- a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_42.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc -index 8a205a6..d5c24e1 100644 ---- a/chrome/common/chrome_paths.cc -+++ b/chrome/common/chrome_paths.cc -@@ -97,21 +97,14 @@ static base::LazyInstance<base::FilePath> - g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; - - // Gets the path for internal plugins. --bool GetInternalPluginsDirectory(base::FilePath* result) { --#if defined(OS_MACOSX) && !defined(OS_IOS) -- // If called from Chrome, get internal plugins from a subdirectory of the -- // framework. -- if (base::mac::AmIBundled()) { -- *result = chrome::GetFrameworkBundlePath(); -- DCHECK(!result->empty()); -- *result = result->Append("Internet Plug-Ins"); -- return true; -- } -- // In tests, just look in the module directory (below). --#endif -- -- // The rest of the world expects plugins in the module directory. -- return PathService::Get(base::DIR_MODULE, result); -+bool GetInternalPluginsDirectory(base::FilePath* result, -+ const std::string& ident) { -+ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; -+ const char* value = getenv(full_env.c_str()); -+ if (value == NULL) -+ return PathService::Get(base::DIR_MODULE, result); -+ else -+ *result = base::FilePath(value); - } - - } // namespace -@@ -248,11 +241,11 @@ bool PathProvider(int key, base::FilePath* result) { - create_dir = true; - break; - case chrome::DIR_INTERNAL_PLUGINS: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "ALL")) - return false; - break; - case chrome::DIR_PEPPER_FLASH_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) - return false; - cur = cur.Append(kPepperFlashBaseDirectory); - break; -@@ -285,7 +278,7 @@ bool PathProvider(int key, base::FilePath* result) { - cur = cur.Append(FILE_PATH_LITERAL("script.log")); - break; - case chrome::FILE_FLASH_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "FILEFLASH")) - return false; - cur = cur.Append(kInternalFlashPluginFileName); - break; -@@ -295,7 +288,7 @@ bool PathProvider(int key, base::FilePath* result) { - cur = cur.Append(chrome::kPepperFlashPluginFilename); - break; - case chrome::FILE_EFFECTS_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "FILE_EFFECTS")) - return false; - cur = cur.Append(kEffectsPluginFileName); - break; -@@ -308,7 +301,7 @@ bool PathProvider(int key, base::FilePath* result) { - // We currently need a path here to look up whether the plugin is disabled - // and what its permissions are. - case chrome::FILE_NACL_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "NACL")) - return false; - cur = cur.Append(kInternalNaClPluginFileName); - break; -@@ -343,7 +336,7 @@ bool PathProvider(int key, base::FilePath* result) { - cur = cur.DirName(); - } - #else -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PNACL")) - return false; - #endif - cur = cur.Append(FILE_PATH_LITERAL("pnacl")); -@@ -372,7 +365,7 @@ bool PathProvider(int key, base::FilePath* result) { - // In the component case, this is the source adapter. Otherwise, it is the - // actual Pepper module that gets loaded. - case chrome::FILE_WIDEVINE_CDM_ADAPTER: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "WIDEVINE")) - return false; - cur = cur.AppendASCII(kWidevineCdmAdapterFileName); - break; diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 85a92e07e66..c3cc9c3ed18 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -13,9 +13,9 @@ sha256bin64 = "14l8lka8jci1d90vbz5kpl20mk98n1ak4mw667dkz89cch5gal4s"; }; stable = { - version = "44.0.2403.125"; - sha256 = "0li483phq72xlg0bpsgfk1rlxrmldk4g45ijx1xmnfs42g38wmkq"; - sha256bin32 = "0h5a2wm13bvrq013skp3lq40bzx9519mb9kh8x3n4800lnanbjcb"; - sha256bin64 = "1p9gfqpgyihvby4pb3fdn4ibg84fh4gksy18cvyi9zq7cibww2ff"; + version = "44.0.2403.130"; + sha256 = "055lccfiqdqwcjnx9l9xgzcilm2m341rg66nfnnadqa490prnxrp"; + sha256bin32 = "0yzjhqyw2aaiwfv395c75avizcg28f3bn9zkqk2p3ifcv231w15v"; + sha256bin64 = "1dzwlrdvnqyz6rpcl3pavpvqsx6la1d04cvgca3iaanq5xcana8b"; }; } diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh index e82d22f34fd..e079762420b 100755 --- a/pkgs/applications/networking/browsers/chromium/update.sh +++ b/pkgs/applications/networking/browsers/chromium/update.sh @@ -11,22 +11,6 @@ source "$(nix-build --no-out-link "$base_path/update.nix" -A updateHelpers)"; ver_sha_table=""; # list of version:sha256 -sha_lookup() -{ - version="$1"; - - for ver_sha in $ver_sha_table; - do - if [ "x${ver_sha%:*}" = "x$version" ]; - then - echo "${ver_sha##*:}"; - return 0; - fi; - done; - - return 1; -} - sha_insert() { version="$1"; @@ -72,22 +56,15 @@ get_channel_exprs() channel="${chline%%,*}"; version="${chline##*,}"; - echo -n "Checking if sha256 of version $version is cached..." >&2; - if sha256="$(sha_lookup "$version")"; + sha256="$(get_sha256 "$channel" "$version")"; + if [ $? -ne 0 ]; then - echo " yes: $sha256" >&2; - else - echo " no." >&2; - sha256="$(get_sha256 "$channel" "$version")"; - if [ $? -ne 0 ]; - then - echo "Whoops, failed to fetch $version, trying previous" \ - "versions:" >&2; - - sha_ver="$(get_prev_sha256 "$channel" "$version")"; - sha256="${sha_ver%:*}"; - version="${sha_ver#*:}"; - fi; + echo "Whoops, failed to fetch $version, trying previous" \ + "versions:" >&2; + + sha_ver="$(get_prev_sha256 "$channel" "$version")"; + sha256="${sha_ver%:*}"; + version="${sha_ver#*:}"; fi; sha_insert "$version" "$sha256"; diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index 6f6ffd67a53..d79a5215ce2 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -30,5 +30,9 @@ stdenv.mkDerivation { platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ pSub ]; license = licenses.gpl3; + + # dwb is no longer maintained by portix and efforts to keep it alive + # were not successful, see issue #7952 for discussion. + broken = true; }; } diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 31375bd5a5b..916469f8e1c 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -3,7 +3,7 @@ , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx -, cairo, gstreamer, gst_plugins_base, icu +, cairo, gst_all_1, icu, libpng, jemalloc , enableGTK3 ? false , debugBuild ? false , # If you want the resulting program to call itself "Firefox" instead @@ -34,7 +34,8 @@ stdenv.mkDerivation rec { xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper hunspell libevent libstartup_notification libvpx cairo - gstreamer gst_plugins_base icu + gst_all_1.gstreamer gst_all_1.gst-plugins-base icu libpng + jemalloc ] ++ lib.optional enableGTK3 gtk3; @@ -48,26 +49,27 @@ stdenv.mkDerivation rec { "--with-system-nss" "--with-system-libevent" "--with-system-libvpx" - # "--with-system-png" # needs APNG support - # "--with-system-icu" # causes ‘ar: invalid option -- 'L'’ in Firefox 28.0 + "--with-system-png" # needs APNG support + "--with-system-icu" "--enable-system-ffi" "--enable-system-hunspell" "--enable-system-pixman" "--enable-system-sqlite" "--enable-system-cairo" - "--enable-gstreamer" + "--enable-gstreamer=1.0" "--enable-startup-notification" - # "--enable-content-sandbox" # available since 26.0, but not much info available - # "--enable-content-sandbox-reporter" # keeping disabled for now + "--enable-content-sandbox" # available since 26.0, but not much info available + "--disable-content-sandbox-reporter" # keeping disabled for now "--disable-crashreporter" "--disable-tests" "--disable-necko-wifi" # maybe we want to enable this at some point "--disable-installer" "--disable-updater" "--disable-pulseaudio" + "--enable-jemalloc" ] ++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3" - ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] + ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] else [ "--disable-debug" "--enable-release" "--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}" "--enable-strip" ]) diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index c330b8acfbf..f9c34fdd29d 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -9,14 +9,14 @@ let soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so"; in stdenv.mkDerivation rec { - version = "0.22.1"; + version = "0.23.0"; name = "mesos-${version}"; dontDisableStatic = true; src = fetchurl { url = "http://www.apache.org/dist/mesos/${version}/mesos-${version}.tar.gz"; - sha256 = "0ry0ppzgpab68fz5bzd7ry5rjbg8xjz73x1x4c5id42cpsqnn7x5"; + sha256 = "1v5xpn4wal4vcrvcklchx9slkpa8xlwqkdbnxzy9zkzpq5g3arxr"; }; buildInputs = [ @@ -93,13 +93,15 @@ in stdenv.mkDerivation rec { echo "export MESOS_NATIVE_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook # Inspired by: pkgs/development/python-modules/generic/default.nix + pushd src/python mkdir -p $out/lib/${python.libPrefix}/site-packages export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - ${python}/bin/${python.executable} src/python/setup.py install \ + ${python}/bin/${python.executable} setup.py install \ --install-lib=$out/lib/${python.libPrefix}/site-packages \ --old-and-unmanageable \ --prefix="$out" rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* + popd ''; postFixup = '' diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 5a37a8eb76a..c5840b93b6f 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -19,11 +19,11 @@ let # NOTE: When updating, please also update in current stable, as older versions stop working - version = "3.6.9"; + version = "3.8.5"; sha256 = { - "x86_64-linux" = "1i260mi40siwcx9b2sj4zwszxmj1l88mpmyqncsfa72k02jz22j3"; - "i686-linux" = "0qqc8qbfaighbhjq9y22ka6n6apl8b6cr80a9rkpk2qsk99k8h1z"; + "x86_64-linux" = "1r0wz2fsx2piasl04qsgwbl88bi0ajr0dm2swbslxwkf789vk18y"; + "i686-linux" = "1dvfgp9dg3frhwmchwa6fyws4im9vgicchfsv0zzflvc7rm9fcig"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = diff --git a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix index a68e0ee1104..90c8e9a7e9e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix @@ -1,28 +1,26 @@ { stdenv, fetchgit, libconfig, lua5_2, openssl, readline, zlib +, libevent, pkgconfig, python, jansson, bash }: stdenv.mkDerivation rec { - name = "telegram-cli-2014-03-04"; + name = "telegram-cli-2015-07-30"; src = fetchgit { url = "https://github.com/vysheng/tg.git"; - rev = "ac6079a00ac66bb37a3179a82af130b41ec39bc9"; - sha256 = "1rpwnyzmqk7p97n5pd00m5c6rypc39mb3hs94qxxrdcpwpgcb73q"; + sha256 = "0phn9nl0sf2fylzfwi427xq60cfrnpsvhh8bp55y1wcjkmp0fxsn"; + rev = "2052f4b381337d75e783facdbfad56b04dec1a9c"; }; - buildInputs = [ libconfig lua5_2 openssl readline zlib ]; - - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # CPPFunction - + buildInputs = [ libconfig lua5_2 openssl readline zlib libevent pkgconfig python jansson ]; installPhase = '' mkdir -p $out/bin - cp ./telegram $out/bin/telegram-wo-key - cp ./tg.pub $out/ - cat > $out/bin/telegram <<EOF - #!/usr/bin/env bash - $out/bin/telegram-wo-key -k $out/tg.pub + cp ./bin/telegram-cli $out/bin/telegram-wo-key + cp ./tg-server.pub $out/ + cat > $out/bin/telegram-cli <<EOF + #!${bash}/bin/sh + $out/bin/telegram-wo-key -k $out/tg-server.pub EOF - chmod +x $out/bin/telegram + chmod +x $out/bin/telegram-cli ''; meta = { @@ -30,5 +28,6 @@ stdenv.mkDerivation rec { homepage = https://telegram.org/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; + maintainers = stdenv.lib.maintainers.jagajaga; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index a5806b7dfe8..4dd734ed043 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation { [Desktop Entry] Type=Application Exec=$out/bin/thunderbird - Icon=$out/lib/thunderbird-bin-${version}/chrome/icons/default/default256.png + Icon=$out/usr/lib/thunderbird-bin-${version}/chrome/icons/default/default256.png Name=Thunderbird GenericName=Mail Reader Categories=Application;Network; diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 1093bbe0d02..19c2c1f2ef1 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl, zlib, openssl, tcl, readline, sqlite, withJson ? true}: stdenv.mkDerivation rec { - name = "fossil-1.32"; + name = "fossil-1.33"; src = fetchurl { urls = [ - "https://www.fossil-scm.org/fossil/tarball/Fossil-6c40678e.tar.gz?uuid=6c40678e9114c41a50f73cc43f6f942ace0408ec" - ]; + https://www.fossil-scm.org/download/fossil-src-1.33.tar.gz + ]; name = "${name}.tar.gz"; - sha256 = "0f1rvqiy630z2q1q8r3kgdd0c6sxjx8c8pm46yabn238xvf3bfnr"; + sha256 = "0gkzd9nj3xyznh9x8whv0phdnj11l5c8164rc3l0jvs5i61c95b2"; }; buildInputs = [ zlib openssl readline sqlite ]; diff --git a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix index 94c819e711b..91fe1662efe 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix @@ -21,4 +21,6 @@ stdenv.mkDerivation rec { ''; buildInputs = [ subversion apr qt4 ]; + + meta.broken = true; } diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index f30a47a78b9..c735ef4506a 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/nirvdrum/svn2git; - description = "Ruby tool for importing existing svn projects into git"; + description = "Tool for importing Subversion repositories into git"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.the-kenny ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 90583038145..c3b141cba81 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl, makeWrapper, go, lxc, sqlite, iproute, bridge-utils, devicemapper, +{ stdenv, fetchFromGitHub, makeWrapper, go, lxc, sqlite, iproute, bridge-utils, devicemapper, btrfsProgs, iptables, bash, e2fsprogs, xz}: stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.6.0"; + version = "1.7.1"; - src = fetchurl { - url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz"; - sha256 = "03nzhikxp60falshzyk6ip8g9fhrczhvnvgmzqr8bny6w8x1v84b"; + src = fetchFromGitHub { + owner = "docker"; + repo = "docker"; + rev = "v${version}"; + sha256 = "0r0j8aj1a7lbnc9piznp02h5n2gdw3v3n4q2ipmapi9ax0wj82lz"; }; buildInputs = [ makeWrapper go sqlite lxc iproute bridge-utils devicemapper btrfsProgs iptables e2fsprogs ]; @@ -17,7 +19,7 @@ stdenv.mkDerivation rec { buildPhase = '' patchShebangs . export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="03nzhikx" + export DOCKER_GITCOMMIT="786b29d4" ./hack/make.sh dynbinary ''; @@ -35,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.docker.io/; + homepage = http://www.docker.com/; description = "An open source project to pack, ship and run any application as a lightweight container"; license = licenses.asl20; maintainers = with maintainers; [ offline tailhook ]; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index b56e80eb3b6..6bf0ef2e825 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -87,9 +87,8 @@ stdenv.mkDerivation { sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all # Install binaries - mkdir -p $out/sbin - install -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/sbin/mount.vboxsf - install -m 755 sbin/VBoxService $out/sbin + install -D -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/bin/mount.vboxsf + install -D -m 755 sbin/VBoxService $out/bin/VBoxService mkdir -p $out/bin install -m 755 bin/VBoxClient $out/bin diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index 0fd3df6d5f5..713f4cdc83e 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -33,7 +33,7 @@ let grKernel = if cfg.stable then mkKernel pkgs.linux_3_14 stable-patch - else mkKernel pkgs.linux_4_0 test-patch; + else mkKernel pkgs.linux_4_1 test-patch; ## -- grsecurity configuration --------------------------------------------- diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 6f1dfae0e21..f3191e430ef 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,23 +8,23 @@ let # Annoyingly, these files are updated without a change in URL. This means that # builds will start failing every month or so, until the hashes are updated. - version = "2015-08-03"; + version = "2015-08-05"; in stdenv.mkDerivation { name = "geolite-legacy-${version}"; srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz" - "1yacbh8qcakmnpipscdh99vmsm0874g2gkq8gp8hjgkgi0zvcsnz"; + "04r1jir9xpd1h5z0a58mwdsbfdbf2kap0ac498w05i11j4vrlh5n"; srcGeoIPv6 = fetchDB "GeoIPv6.dat.gz" "GeoIPv6.dat.gz" - "038ll8142svhyffxxrg0isrr16rjbz0cnkhd14mck77f1v8z01y5"; + "0vr2a4mlqlaxq3jz8282zygb2y5hx7y660yrjcq02rpmgpmaxkrd"; srcGeoLiteCity = fetchDB "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz" - "0x5ihg7qikzc195nix9r0izvbdnj4hy4rznvaxk56rf8yqcigdyv"; + "11jpl54s1r98adlsr2f88zj4x9pg7gwxphd7hhq8jp3hwrgrwhs8"; srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz" - "0j5dq06pjrh6d94wczsg6qdys4v164nvp2a7qqrg8w4knh94qp6n"; + "1fhi5vm4drfzyl29b491pr1xr2kbsr3izp9a7k5zm3zkqags2187"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz" "04qlh6zr8m5qxl2gcysb721bqlnqrxhngh128zj1w8rhqckjndgj"; diff --git a/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix b/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix new file mode 100644 index 00000000000..c3c37c5fd76 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix @@ -0,0 +1,30 @@ +{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3 +, pkgconfig, gtk3, glib, clutter_gtk, clutter-gst_2, udev, gst_all_1, itstool +, adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2, libtool }: + +stdenv.mkDerivation rec { + name = "cheese-${gnome3.version}.1"; + + src = fetchurl { + url = "mirror://gnome/sources/cheese/${gnome3.version}/${name}.tar.xz"; + sha256 = "184hzwrjjn94ndivb54rrif4jnbr66p1j0nlqqi3nw6qsrm2yqj4"; + }; + + buildInputs = [ pkgconfig gtk3 glib intltool wrapGAppsHook gnome-video-effects itstool + gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer libxml2 + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop + gst_all_1.gst-plugins-bad clutter_gtk clutter-gst_2 + libtool libcanberra_gtk3 ]; + + enableParallelBuilding = true; + + NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Cheese; + description = "Take photos and videos with your webcam, with fun graphical effects"; + maintainers = gnome3.maintainers; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix index c62cbfe7256..e9a853c56a1 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix @@ -21,7 +21,9 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 xkeyboard_config isocodes itstool wayland gtk3 glib intltool gnome_doc_utils libxkbfile - gnome3.gsettings_desktop_schemas gobjectIntrospection ]; + gobjectIntrospection ]; + + propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix index 9c32ddf528c..8be88e42db9 100644 --- a/pkgs/desktops/gnome-3/3.16/default.nix +++ b/pkgs/desktops/gnome-3/3.16/default.nix @@ -44,6 +44,7 @@ let gnome3 = self // { recurseForDerivations = false; }; clutter = pkgs.clutter_1_22; clutter_gtk = pkgs.clutter_gtk_1_6.override { inherit clutter gtk3; }; + clutter-gst_2 = pkgs.clutter-gst; clutter-gst = pkgs.clutter-gst_3_0.override { inherit clutter; }; cogl = pkgs.cogl_1_20; gtk = gtk3; @@ -246,6 +247,8 @@ let webkitgtk = webkitgtk24x; }; + cheese = callPackage ./apps/cheese { }; + evolution = callPackage ./apps/evolution { webkitgtk = webkitgtk24x; }; @@ -330,6 +333,8 @@ let pomodoro = callPackage ./misc/pomodoro { }; + gnome-video-effects = callPackage ./misc/gnome-video-effects { }; + }; in self; # pkgsFun diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix new file mode 100644 index 00000000000..c0bd2fed3f2 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gnome3 }: + +stdenv.mkDerivation rec { + name = "gnome-video-effects-${version}"; + version = "0.4.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-video-effects/0.4/${name}.tar.xz"; + sha256 = "0jl4iny2dqpcgi3sgxzpgnbw0752i8ay3rscp2cgdjlp79ql5gil"; + }; + + buildInputs = [ pkgconfig intltool ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + }; +} diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix index df951271a31..f71cd922c10 100644 --- a/pkgs/development/compilers/ghc/7.10.2.nix +++ b/pkgs/development/compilers/ghc/7.10.2.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { - version = "7.10.1.20150630"; + version = "7.10.2"; name = "ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/7.10.2-rc2/${name}-src.tar.xz"; - sha256 = "1wxf7jkkgpvvrg3q311c4rca4vsxrqrmnrqg4j4klgj445yj82gb"; + url = "https://downloads.haskell.org/~ghc/7.10.2/${name}-src.tar.xz"; + sha256 = "1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal"; }; buildInputs = [ ghc perl ]; diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index e4288b9a2cb..9f1d3122818 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -41,22 +41,22 @@ let version = "0.1.0"; ghcjsBoot = fetchgit { url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "d3581514d0a5073f8220a2f5baafe6866faa35a0"; # 7.10 branch - sha256 = "1p13ifidpi7y1mjq5qv9229isfnsiklizci7i55sf83mp6wqdyvr"; + rev = "d435c60b62d24b7a4117493f7aaecbfa09968fe6"; # 7.10 branch + sha256 = "07vhmjz21ccnqccms003550xacmwb08pjdkhnjcwcbl2603v4na1"; fetchSubmodules = true; }; shims = fetchgit { url = git://github.com/ghcjs/shims.git; - rev = "9b196ff5ff13a24997011009b37c980c5534e24f"; # master branch - sha256 = "1zsfxka692fr3zb710il7g1sj64xwaxmasimciylb4wx84h7c30w"; + rev = "0b670ca27fff3f0bad515c37e56ccb8b4d6758fb"; # master branch + sha256 = "19zq79f2y59lw7c8m100awh3rcra5yhbsvpb5xmp3mq6grac7h08"; }; in mkDerivation (rec { pname = "ghcjs"; inherit version; src = fetchgit { url = git://github.com/ghcjs/ghcjs.git; - rev = "c1b6239b0289371dc6b8d17dfd845c14bd4dc490"; # master branch - sha256 = "0ncbk7m1l7cpdgmabm14d7f97fw3vy0hmpj4vs4kkwhhfjf6kp8s"; + rev = "fb1faa9cb0a11a8b27b0033dfdb07aafb6add35e"; # master branch + sha256 = "1vqf19059j86h3rnbvzcp55bdqd5dkw3krb5vkw5mgsmva2g8sch"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5260d508ab1..9f0b5d4599a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -11,6 +11,9 @@ self: super: { cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_4_0; zlib = self.zlib_0_5_4_2; }); cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; zlib = self.zlib_0_5_4_2; }); + # Link statically to avoid runtime dependency on GHC. + jailbreak-cabal = disableSharedExecutables super.jailbreak-cabal; + # Break infinite recursions. Dust-crypto = dontCheck super.Dust-crypto; hasql-postgres = dontCheck super.hasql-postgres; @@ -808,6 +811,7 @@ self: super: { Frames = dontDistribute super.Frames; hgeometry = dontDistribute super.hgeometry; hipe = dontDistribute super.hipe; + hsqml-datamodel-vinyl = dontDistribute super.hsqml-datamodel-vinyl; singleton-nats = dontDistribute super.singleton-nats; singletons = markBroken super.singletons; units-attoparsec = dontDistribute super.units-attoparsec; @@ -896,4 +900,7 @@ self: super: { # https://ghc.haskell.org/trac/ghc/ticket/9825 vimus = overrideCabal super.vimus (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; }); + # https://github.com/hspec/mockery/issues/6 + mockery = overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; }); + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix index 5299cefdc07..daaab9ee391 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix @@ -41,7 +41,7 @@ self: super: { unix = null; # binary is not a core library for this compiler. - binary = self.binary_0_7_5_0; + binary = self.binary_0_7_6_1; # deepseq is not a core library for this compiler. deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_1; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index a3ad255aab8..af34629e319 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -35,7 +35,7 @@ self: super: { unix = null; # binary is not a core library for this compiler. - binary = self.binary_0_7_5_0; + binary = self.binary_0_7_6_1; # deepseq is not a core library for this compiler. deepseq = self.deepseq_1_4_1_1; @@ -70,4 +70,7 @@ self: super: { # Needs hashable on pre 7.10.x compilers. nats = addBuildDepend super.nats self.hashable; + # Newer versions require bytestring >=0.10. + tar = super.tar_0_4_1_0; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index 63506bad419..1ec76e6fa19 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -41,7 +41,7 @@ self: super: { transformers = self.transformers_0_4_3_0; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_7_5_0; process = self.process_1_2_3_0; }; + Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_7_6_1; process = self.process_1_2_3_0; }; # Newer versions don't compile. Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6; @@ -70,4 +70,7 @@ self: super: { # Needs hashable on pre 7.10.x compilers. nats = addBuildDepend super.nats self.hashable; + # Newer versions require bytestring >=0.10. + tar = super.tar_0_4_1_0; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index e19a69277db..0046ad66c23 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -38,10 +38,10 @@ self: super: { transformers = self.transformers_0_4_3_0; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_7_5_0; }; + Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_7_6_1; }; # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. - cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_7_5_0; }); + cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_7_6_1; }); # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; @@ -79,4 +79,7 @@ self: super: { # Avoid depending on tasty-golden. monad-par = dontCheck super.monad-par; + # Newer versions require bytestring >=0.10. + tar = super.tar_0_4_1_0; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index a9e64935faf..dbdd0bc31b2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -40,10 +40,10 @@ self: super: { xhtml = self.xhtml_3000_2_1; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_7_5_0; }; + Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_7_6_1; }; # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. - cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_7_5_0; }); + cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_7_6_1; }); # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 9696ccddcc5..8ec10e22fa4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -85,8 +85,8 @@ self: super: { seqid-streams = super.seqid-streams_0_1_0; # Need binary >= 0.7.2, but our compiler has only 0.7.1.0. - hosc = super.hosc.overrideScope (self: super: { binary = self.binary_0_7_5_0; }); - tidal-midi = super.tidal-midi.overrideScope (self: super: { binary = self.binary_0_7_5_0; }); + hosc = super.hosc.overrideScope (self: super: { binary = self.binary_0_7_6_1; }); + tidal-midi = super.tidal-midi.overrideScope (self: super: { binary = self.binary_0_7_6_1; }); # These packages need mtl 2.2.x directly or indirectly via dependencies. amazonka = markBroken super.amazonka; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 2af3d964619..26643f075b0 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -45,7 +45,6 @@ , useCpphs ? false } @ args: -assert pkgconfigDepends != [] -> pkgconfig != null; assert editedCabalFile != null -> revision != null; let @@ -105,10 +104,13 @@ let isHaskellPkg = x: (x ? pname) && (x ? version) && (x ? env); isSystemPkg = x: !isHaskellPkg x; + allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ + optionals doCheck testPkgconfigDepends; + propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ buildTools ++ libraryToolDepends ++ executableToolDepends ++ - optionals (pkgconfigDepends != []) ([pkgconfig] ++ pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends) ++ + optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++ optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends); allBuildInputs = propagatedBuildInputs ++ otherBuildInputs; @@ -122,6 +124,9 @@ let ghcCommandCaps = toUpper ghcCommand; in + +assert allPkgconfigDepends != [] -> pkgconfig != null; + stdenv.mkDerivation ({ name = "${optionalString (hasActiveLibrary && pname != "ghcjs") "haskell-"}${pname}-${version}"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ba7bc517aa7..b6a18d7653c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -50,6 +50,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "AAI" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "AAI"; + version = "0.2.0.1"; + sha256 = "0vdq0hscpbl5a9bpf8fiykmyg2c3yvivb0mzcdy99ha0j1p4rwfh"; + buildDepends = [ base ]; + description = "Abstract Application Interface"; + license = stdenv.lib.licenses.mit; + }) {}; + "ABList" = callPackage ({ mkDerivation, base, HUnit, linear, newtype, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -665,7 +676,9 @@ self: { mkDerivation { pname = "Agda"; version = "2.4.2.3"; + revision = "1"; sha256 = "09vvipvab6bys8g7cdka1iirs0wc0jzcyynncccgb614wd2yyvdw"; + editedCabalFile = "25fe17a2302a30f23a57bedf6bc66a8966f4d5f6b10353e2502e18ba98f80eeb"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -676,7 +689,6 @@ self: { transformers-compat unordered-containers xhtml zlib ]; buildTools = [ alex cpphs emacs happy ]; - jailbreak = true; postInstall = '' $out/bin/agda -c --no-main $(find $out/share -name Primitive.agda) $out/bin/agda-mode compile @@ -754,8 +766,8 @@ self: { }: mkDerivation { pname = "Allure"; - version = "0.4.101.1"; - sha256 = "1wla31n3jiynjb2fk22shq46g365x6il270jqpy234vjz308sdvw"; + version = "0.5.0.0"; + sha256 = "0lmkfa6wk0hqin43lf6ll3227c4h7qvya7s6k6sfz8syy51ggqx7"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -2331,13 +2343,12 @@ self: { }: mkDerivation { pname = "Chart"; - version = "1.5"; - sha256 = "1h40322g9nj8hlya6iw9dgvvgzbq816v36vm2vz0lii586j0nqyx"; + version = "1.5.1"; + sha256 = "0jm1wr2nb1r8rxqc564nmnclns160y7girc7j2ihvyhm0v34p59g"; buildDepends = [ array base colour data-default-class lens mtl old-locale operational time vector ]; - jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "A library for generating 2D Charts and Plots"; license = stdenv.lib.licenses.bsd3; @@ -2349,13 +2360,12 @@ self: { }: mkDerivation { pname = "Chart-cairo"; - version = "1.5"; - sha256 = "19p4fg12r91jhhifwlda6rqm2bm0x6bz2fv3dqr2ni1y3cz7v56c"; + version = "1.5.1"; + sha256 = "1fwjgms76z2spgfw3kfmzivkgp6gdkx24mp5nb562kza4y6yjz7f"; buildDepends = [ array base cairo Chart colour data-default-class lens mtl old-locale operational time ]; - jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Cairo backend for Charts"; license = stdenv.lib.licenses.bsd3; @@ -2369,15 +2379,14 @@ self: { }: mkDerivation { pname = "Chart-diagrams"; - version = "1.5"; - sha256 = "1i6l6gvy4vlw98b2r5wr5c7dzp01jwca6c5y0pgq663fnp1pwjph"; + version = "1.5.1"; + sha256 = "1slsq9p9mq9jxlyhpd90bh32s6fqvy149p4cb7ckygzd77r1aqxz"; buildDepends = [ base blaze-markup bytestring Chart colour containers data-default-class diagrams-core diagrams-lib diagrams-postscript diagrams-svg lens lucid-svg mtl old-locale operational SVGFonts text time ]; - jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Diagrams backend for Charts"; license = stdenv.lib.licenses.bsd3; @@ -2390,8 +2399,8 @@ self: { }: mkDerivation { pname = "Chart-gtk"; - version = "1.5"; - sha256 = "1iwr31ri4f24yxnmg101y30sg3a03nrmp5nr2id2r471c0f4x2gy"; + version = "1.5.1"; + sha256 = "025snbbsnd2gsldw2j8r3vxh94jrv57h8z4qvkq3dwyh2mvq21lw"; buildDepends = [ array base cairo Chart Chart-cairo colour data-default-class gtk mtl old-locale time @@ -3543,7 +3552,9 @@ self: { mkDerivation { pname = "Diff"; version = "0.3.2"; + revision = "1"; sha256 = "13iqqmpadcm7fvqwbfrz94w030rvjh66w2bdls1253128ac2n0vz"; + editedCabalFile = "86ab9f6bcb253cabff2673437995faa4c130be7c3898df778b27a801c5361328"; buildDepends = [ array base pretty ]; description = "O(ND) diff algorithm in haskell"; license = stdenv.lib.licenses.bsd3; @@ -3699,11 +3710,10 @@ self: { ({ mkDerivation, base, containers, MonadRandom }: mkDerivation { pname = "Dist"; - version = "0.2.0.0"; - sha256 = "0w9n123rngl85qsgwm0dgqnc0v8zn9lsi2v0n4hfxdvxlhcjr3ir"; + version = "0.3.0.0"; + sha256 = "00h0cxlxk72k829w8cf2gi2y4v4qj9bdzdmvnphnvc9wz5pyiz26"; buildDepends = [ base containers MonadRandom ]; testDepends = [ base containers MonadRandom ]; - jailbreak = true; homepage = "https://github.com/wyager/Dist"; description = "A Haskell library for probability distributions"; license = stdenv.lib.licenses.mit; @@ -4047,8 +4057,8 @@ self: { }: mkDerivation { pname = "Ebnf2ps"; - version = "1.0.13"; - sha256 = "1ymfj2n23n1j37p5nw8xwhfccx4xc6wyf3372dr9gxv232jk8znz"; + version = "1.0.14"; + sha256 = "0dv7lbw3nb3wyrrq8q4wd26i445ylwiixhhzdl574sw58mw60rk3"; isLibrary = false; isExecutable = true; buildDepends = [ array base containers directory old-time unix ]; @@ -4976,8 +4986,8 @@ self: { }: mkDerivation { pname = "Frames"; - version = "0.1.2"; - sha256 = "11444jhck56y2iclgn1daj087qpi99pznk3w82vhbya3pdvrkjac"; + version = "0.1.2.1"; + sha256 = "0vw1fh0nqk3s5p08j4cnwb95jgzxk140wvszjlmr3ms9m0xcx61y"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -5473,6 +5483,21 @@ self: { license = "GPL"; }) {}; + "GeneralTicTacToe" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "GeneralTicTacToe"; + version = "0.1.0.1"; + sha256 = "0dng5shk5zs4j6lyjz971axrqziv6davpcyv509mz8fvdjn8q4kg"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base ]; + jailbreak = true; + homepage = "http://afonso.xyz"; + description = "A general TicTacToe game implementation"; + license = stdenv.lib.licenses.mit; + }) {}; + "GenericPretty" = callPackage ({ mkDerivation, base, ghc-prim, pretty }: mkDerivation { @@ -6824,8 +6849,8 @@ self: { }: mkDerivation { pname = "HList"; - version = "0.4.0.0"; - sha256 = "0f6d97vfxlml4dp6zfk95kk4la8xr5m91hiw4zj98kvwvvhb99mz"; + version = "0.4.1.0"; + sha256 = "0vbfq2jfdm3dn059flyzxrlhcw7hkni75fpi2gqcl5s6ha95ak10"; buildDepends = [ array base ghc-prim mtl profunctors tagged template-haskell ]; @@ -8357,14 +8382,12 @@ self: { ({ mkDerivation, base, doctest, hspec, parsec }: mkDerivation { pname = "HostAndPort"; - version = "0.1.0"; - revision = "1"; - sha256 = "0rykpzp3vvc81ra917vicwsh8x1mr1ykw9a597ks959nmjy06mz8"; - editedCabalFile = "5ad1783e80502877a1de17cb92308dd9e0cc003a1302c5d4c09103b1c98bd627"; + version = "0.2.0"; + sha256 = "1rjv6c7j6fdy6gnn1zr5jnfmiqiamsmjfw9h3bx119giw3sjb9hm"; buildDepends = [ base parsec ]; testDepends = [ base doctest hspec ]; homepage = "https://github.com/bacher09/hostandport"; - description = "Parser host and port pairs like localhost:22"; + description = "Parser for host and port pairs like localhost:22"; license = stdenv.lib.licenses.mit; }) {}; @@ -9074,8 +9097,8 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.5.2"; - sha256 = "07fyn0ns3g66aqpa1jg1v694yvf5idf7cknrkh30hs312lwm1sjl"; + version = "3.2.5.3"; + sha256 = "1knq5jbwggf59h8a6aa758387q71fpzcvssg8dsr84bqwqqg2dpw"; buildDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -9438,8 +9461,8 @@ self: { }: mkDerivation { pname = "LambdaHack"; - version = "0.4.101.1"; - sha256 = "065j2zyqi4adh3f01jywxqvsl45i69ky2y0bavkkpzz2klspg6zw"; + version = "0.5.0.0"; + sha256 = "0vzra6020jmir6pqs26fnw2pgap7l10160v5admk7wnrrnfr91r5"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -10293,8 +10316,8 @@ self: { }: mkDerivation { pname = "MoeDict"; - version = "0.0.2"; - sha256 = "06dhk0n1v1axj0qbx29n2g9p0nw24ix5ij2vq5nfs7jbrb9m7r0n"; + version = "0.0.3"; + sha256 = "0sf7qhw3z984mnprgq2jxqsx9z5v2q36hdb84fdn34rgjzrv3z9a"; buildDepends = [ aeson base bytestring containers text unordered-containers ]; @@ -10366,18 +10389,18 @@ self: { }) {}; "MonadCompose" = callPackage - ({ mkDerivation, base, data-default, ghc-prim, MaybeT, mmorph - , monad-products, mtl, random, transformers + ({ mkDerivation, base, data-default, ghc-prim, mmorph, monad-loops + , monad-products, mtl, parallel, random, transformers + , transformers-compat }: mkDerivation { pname = "MonadCompose"; - version = "0.8.2.0"; - sha256 = "1nzb4x8az1m4d5i75cshgjfr4xnkfi3s27rq6jkib9i67my0hsrq"; + version = "0.8.3.1"; + sha256 = "0njvbz2cwc3339h87wxhl5kzb2v1ny5skqvhrsdzp95f1k8chnxa"; buildDepends = [ - base data-default ghc-prim MaybeT mmorph monad-products mtl random - transformers + base data-default ghc-prim mmorph monad-loops monad-products mtl + parallel random transformers transformers-compat ]; - jailbreak = true; homepage = "http://alkalisoftware.net"; description = "Methods for composing monads"; license = stdenv.lib.licenses.bsd3; @@ -10663,6 +10686,21 @@ self: { license = "LGPL"; }) {}; + "MyPrimes" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "MyPrimes"; + version = "0.1.0.0"; + sha256 = "1bwq0fwhkw4i2kjx9xbdfn0y86j9s78kyrw9vlxq7zmv4pddazly"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base containers ]; + jailbreak = true; + homepage = "http://afonso.xyz"; + description = "Generate all primes"; + license = stdenv.lib.licenses.mit; + }) {}; + "NGrams" = callPackage ({ mkDerivation, base, HCL, HTTP, network, regex-compat }: mkDerivation { @@ -10794,15 +10832,14 @@ self: { }: mkDerivation { pname = "Neks"; - version = "0.4.0.0"; - sha256 = "0xi5d9wvk2xzsn500d61b6mmvwd36fs2n92l5qy4hzhww5lmkrrb"; + version = "0.5.0.0"; + sha256 = "083hkcgmrk42pyjm1xz1amdjpmccw0c72axmkk163ar6ir7aznc8"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring cereal containers directory hashable messagepack network stm vector ]; - jailbreak = true; description = "Simple networked key/value store"; license = stdenv.lib.licenses.mit; }) {}; @@ -11583,6 +11620,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "OrchestrateDB" = callPackage + ({ mkDerivation, aeson, base, bytestring, HTTP, http-conduit + , http-types, lifted-base, random + }: + mkDerivation { + pname = "OrchestrateDB"; + version = "1.0.0.3"; + sha256 = "0d12jbdgpfkzax5c8djab6n611hcwi1bkphwmn5qmny43fb3wsaz"; + buildDepends = [ + aeson base bytestring HTTP http-conduit http-types lifted-base + ]; + testDepends = [ + aeson base bytestring HTTP http-conduit http-types lifted-base + random + ]; + homepage = "https://github.com/dwd31415/Haskell-OrchestrateDB"; + description = "Unofficial Haskell Client Library for the Orchestrate.io API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "OrderedBits" = callPackage ({ mkDerivation, base, bits, primitive, QuickCheck, test-framework , test-framework-quickcheck2, test-framework-th, vector @@ -11948,6 +12005,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Phsu" = callPackage + ({ mkDerivation, acid-state, aeson, base, blaze-html, blaze-markup + , containers, curl, filepath, friendly-time, happstack-server + , happstack-server-tls, lifted-base, MissingH, monad-control, mtl + , network, network-uri, old-locale, process, regex-base, regex-pcre + , safecopy, string-conversions, temporary, text, time + }: + mkDerivation { + pname = "Phsu"; + version = "0.1.0.3"; + sha256 = "12f6hqgxyf3svr53g0irn15q69wp9py1bxfw3a5inpkqzmrs04x9"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + acid-state aeson base blaze-html blaze-markup containers curl + filepath friendly-time happstack-server happstack-server-tls + lifted-base MissingH monad-control mtl network network-uri + old-locale process regex-base regex-pcre safecopy + string-conversions temporary text time + ]; + jailbreak = true; + homepage = "localhost:9119"; + description = "Personal Happstack Server Utils"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "Pipe" = callPackage ({ mkDerivation, base, filepath, process, unix }: mkDerivation { @@ -14041,19 +14124,20 @@ self: { "Spock" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, containers, directory, hashable, hspec - , hspec-wai, http-types, list-t, monad-control, mtl, old-locale - , path-pieces, random, reroute, resource-pool, resourcet, stm - , stm-containers, text, time, transformers, transformers-base - , unordered-containers, vault, wai, wai-extra, warp + , hspec-wai, http-types, hvect, list-t, monad-control, mtl + , old-locale, path-pieces, random, reroute, resource-pool + , resourcet, stm, stm-containers, text, time, transformers + , transformers-base, unordered-containers, vault, wai, wai-extra + , warp }: mkDerivation { pname = "Spock"; - version = "0.7.10.0"; - sha256 = "0agis3cy6ijynbzgwyc2wd08db16yz0qhcjj41l6d7a6804ns8nj"; + version = "0.7.12.0"; + sha256 = "05vglqzf75dphxx2wnkxqn7aqcb19nh8g560zfpw56jrfbbmygwg"; buildDepends = [ aeson base base64-bytestring bytestring case-insensitive containers - directory hashable http-types list-t monad-control mtl old-locale - path-pieces random reroute resource-pool resourcet stm + directory hashable http-types hvect list-t monad-control mtl + old-locale path-pieces random reroute resource-pool resourcet stm stm-containers text time transformers transformers-base unordered-containers vault wai wai-extra warp ]; @@ -15117,8 +15201,8 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "Updater"; - version = "0.1"; - sha256 = "0wd6ydj6s44mxncg817f9ar4cwxjxakb9m5a4p6yxhzgkwcl7hp2"; + version = "0.2"; + sha256 = "03n2r02bgv9hzlvxypdy1mrvdmzrxlm717bf7qp9f9ky1sj3ixp4"; buildDepends = [ base stm ]; homepage = "https://github.com/yokto/Updater"; description = "Monadic FRP library based on stm"; @@ -15562,8 +15646,8 @@ self: { }: mkDerivation { pname = "Win32"; - version = "2.3.0.2"; - sha256 = "0s2hp50yb91cmj78shpp7s7v096y6lnipk4j7h3lxph3zgj06zsi"; + version = "2.3.1.0"; + sha256 = "1y9z682gmgjkrc8lijkidrlwh5pr30zgpvx2sc3gnvn8krg6jnk8"; buildDepends = [ base bytestring ]; extraLibraries = [ advapi32 gdi32 shell32 shfolder user32 winmm ]; homepage = "https://github.com/haskell/win32"; @@ -16196,6 +16280,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) readline;}; + "ZEBEDDE" = callPackage + ({ mkDerivation, base, vect }: + mkDerivation { + pname = "ZEBEDDE"; + version = "0.1.0.0"; + sha256 = "1i85pah79342ivmcg73q305awbf9fi6gw4ckg9i019d6vmdg5d17"; + buildDepends = [ base vect ]; + jailbreak = true; + description = "Polymer growth simulation method"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ZFS" = callPackage ({ mkDerivation, base, CC-delcont, containers, mtl, network, unix }: @@ -16333,8 +16429,8 @@ self: { }: mkDerivation { pname = "abcBridge"; - version = "0.12"; - sha256 = "1432hjaj0fccsd16if0wyiayp9wj66gam6c48fc1lgnqc5lvw5jj"; + version = "0.14"; + sha256 = "1ki5h3058n3kpvaspl8g1vadprw6kb3xxyadb3a4k1irkfz8lfkf"; isLibrary = true; isExecutable = true; buildDepends = [ aig base containers directory vector ]; @@ -18014,8 +18110,8 @@ self: { ({ mkDerivation, base, mtl, QuickCheck, vector }: mkDerivation { pname = "aig"; - version = "0.2.1"; - sha256 = "0wcqw5scaw2ximhbv9pnpngdlr36adci7hpqwj9haa9ql5pwqqxk"; + version = "0.2.3"; + sha256 = "0363wr5fnryz49ksj6mvwngpqi2bj7ldgyzh6hgvmvvdz5nmmxzr"; buildDepends = [ base mtl QuickCheck vector ]; description = "And-inverter graphs in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -18500,6 +18596,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "almost-fix" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "almost-fix"; + version = "0.0.2"; + sha256 = "03x715jcrsxfs2d08hsg3y5f6a4bnlzfxsmhzimvpdp9bw0psn90"; + buildDepends = [ base ]; + description = "Recurse while a predicate is satisfied"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "alms" = callPackage ({ mkDerivation, array, base, containers, directory, editline, fgl , filepath, HUnit, incremental-sat-solver, mtl, network, parsec @@ -19083,8 +19190,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ec2"; - version = "0.3.6"; - sha256 = "050gspxplhch66awd7gmxyyy3s466ca3jbzp2yq4qh32dn7n1hvi"; + version = "0.3.6.1"; + sha256 = "19gyqga1qp50jsi6pykykkivfz18357p6pd6fg84bir0j9d4vawy"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; @@ -19287,8 +19394,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53"; - version = "0.3.6"; - sha256 = "1xk44z5zp8pr2hyhdshzgwm572y33f9lvjz6yrglc4vpangslcx3"; + version = "0.3.6.1"; + sha256 = "155d4yfc96x99mw8h89n2waj7ywx4hcw8izcx1sk1x96lcd6h9mw"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 SDK"; @@ -20455,15 +20562,14 @@ self: { }: mkDerivation { pname = "applicative-fail"; - version = "1.1.0"; - sha256 = "0slxvf7iah7k8mpap6sc1kfibgah8pjls5z82zf62kf7ywzqmfkf"; + version = "1.1.1"; + sha256 = "11bk0svzdys8rgx6nzb80fkxz8mp6r0238ylmb5wzsnl8nc9y041"; buildDepends = [ base bifunctors dlist mtl transformers transformers-base ]; testDepends = [ base checkers mtl QuickCheck tasty tasty-quickcheck ]; - jailbreak = true; homepage = "https://bitbucket.org/s9gf4ult/applicative-fail"; description = "Applicative functor and monad which collects all your fails"; license = stdenv.lib.licenses.bsd3; @@ -22356,19 +22462,19 @@ self: { "avers" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, clock, containers, cryptohash, filepath, hspec - , inflections, MonadRandom, mtl, network, resource-pool - , rethinkdb-client-driver, scrypt, stm, template-haskell, text - , time, unordered-containers, vector + , inflections, MonadRandom, mtl, network, network-uri + , resource-pool, rethinkdb-client-driver, safe, scrypt, stm + , template-haskell, text, time, unordered-containers, vector }: mkDerivation { pname = "avers"; - version = "0.0.8"; - sha256 = "1wnhzkjwp6243mqfwxmw8lhs59vn5v0544hsivcfps427cqamrbq"; + version = "0.0.9"; + sha256 = "0zcgq4b20vvg2mqm9yqm4gvakafn9r8mghki8bn87xhk0w7h99km"; buildDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers - cryptohash filepath inflections MonadRandom mtl network - resource-pool rethinkdb-client-driver scrypt stm template-haskell - text time unordered-containers vector + cryptohash filepath inflections MonadRandom mtl network network-uri + resource-pool rethinkdb-client-driver safe scrypt stm + template-haskell text time unordered-containers vector ]; testDepends = [ aeson attoparsec base base16-bytestring bytestring containers @@ -22376,7 +22482,6 @@ self: { rethinkdb-client-driver scrypt stm text time unordered-containers vector ]; - jailbreak = true; description = "empty"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -23519,13 +23624,13 @@ self: { }) {}; "base-orphans" = callPackage - ({ mkDerivation, base, ghc-prim, hspec }: + ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }: mkDerivation { pname = "base-orphans"; - version = "0.4.0"; - sha256 = "06knj296mkhbmfr0b12pfvhzr0bk8p1avabh1llwmx67nnn41r5i"; + version = "0.4.2"; + sha256 = "1mfmhvb7zvyi3m5660755ph7xk4fdvhki6ssfd3i2ghzas8g1v7a"; buildDepends = [ base ghc-prim ]; - testDepends = [ base hspec ]; + testDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/haskell-compat/base-orphans#readme"; description = "Backwards-compatible orphan instances for base"; license = stdenv.lib.licenses.mit; @@ -23710,6 +23815,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "basex-client" = callPackage + ({ mkDerivation, base, network, pureMD5, utf8-string }: + mkDerivation { + pname = "basex-client"; + version = "0.1.0.0"; + sha256 = "189bmv479fmljy9w7nhc5mb7546iz8vahrmxffvgny51ywklk58n"; + buildDepends = [ base network pureMD5 utf8-string ]; + description = "A BaseX client for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "bash" = callPackage ({ mkDerivation, base, binary, bytestring, containers , hxt-regex-xmlschema, mtl, SHA, shell-escape @@ -24137,27 +24253,27 @@ self: { }) {}; "bet" = callPackage - ({ mkDerivation, aeson, base, bifunctors, bytestring, containers - , exceptions, HsOpenSSL, http-client-openssl, lens, mtl, pipes - , pipes-http, QuickCheck, semigroupoids, semigroups, test-framework - , test-framework-quickcheck2, test-framework-th, text, time + ({ mkDerivation, aeson, base, bifunctors, binary, bytestring + , containers, exceptions, HsOpenSSL, http-client + , http-client-openssl, lens, mtl, QuickCheck, semigroupoids + , semigroups, test-framework, test-framework-quickcheck2 + , test-framework-th, text, time }: mkDerivation { pname = "bet"; - version = "0.1.2.2"; - sha256 = "1sk8sgfcywxr54g25ah978k0d1x263mzi69zbx5wk67bs4sqvmds"; + version = "0.1.2.3"; + sha256 = "0gy12m81bc6vgzq4m0v134jbq5lw1210dxsq4s28c0www0kxj658"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base bifunctors bytestring containers exceptions HsOpenSSL - http-client-openssl lens mtl pipes pipes-http semigroupoids + aeson base bifunctors binary bytestring containers exceptions + HsOpenSSL http-client http-client-openssl lens mtl semigroupoids semigroups text time ]; testDepends = [ base lens QuickCheck semigroups test-framework test-framework-quickcheck2 test-framework-th ]; - jailbreak = true; homepage = "https://github.com/Noeda/bet/"; description = "Betfair API bindings. Bet on sports on betting exchanges."; license = stdenv.lib.licenses.mit; @@ -24503,15 +24619,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "binary_0_7_5_0" = callPackage + "binary_0_7_6_1" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , directory, filepath, HUnit, QuickCheck, random, test-framework , test-framework-quickcheck2 }: mkDerivation { pname = "binary"; - version = "0.7.5.0"; - sha256 = "06gg61srfva7rvzf4s63c068s838i5jf33d6cnjb9769gjmca2a7"; + version = "0.7.6.1"; + sha256 = "0rqhz349w72h1bi79lga5x1d95g59h15srlahxbhfrmy2pycm1cg"; buildDepends = [ array base bytestring containers ]; testDepends = [ array base bytestring Cabal containers directory filepath HUnit @@ -26552,8 +26668,8 @@ self: { }: mkDerivation { pname = "blaze-html"; - version = "0.8.0.2"; - sha256 = "1h3z857kqj9h87zyi84pck2rnykfk7i4amlh0vkv5wws5zn9xs74"; + version = "0.8.1.0"; + sha256 = "0cgddwdwjszhcd3grfxazvy6jwaxa90s8yw6ir9ji2apbdsw0vgv"; buildDepends = [ base blaze-builder blaze-markup bytestring text ]; testDepends = [ base blaze-builder blaze-markup bytestring containers HUnit @@ -27366,18 +27482,18 @@ self: { ({ mkDerivation, aeson, base, binary, blaze-html, bytestring , configurator, cryptohash, directory, hashtables, http-types, mtl , random, Spock, text, transformers, wai, wai-extra - , wai-middleware-static, warp, xdg-basedir + , wai-middleware-static, warp, warp-tls, xdg-basedir }: mkDerivation { pname = "breve"; - version = "0.3.0.0"; - sha256 = "14vhwicdi1cln594bfhhj65kwaxmimpzg4jh35mrycw0fpbfk6rp"; + version = "0.4.0.0"; + sha256 = "1ndzqwxj7dzff75mgjssh7sgrhxlicdwkcx8j71x52rxyav4aa0j"; isLibrary = false; isExecutable = true; buildDepends = [ aeson base binary blaze-html bytestring configurator cryptohash directory hashtables http-types mtl random Spock text transformers - wai wai-extra wai-middleware-static warp xdg-basedir + wai wai-extra wai-middleware-static warp warp-tls xdg-basedir ]; homepage = "https://github.com/rnhmjoj/breve"; description = "a url shortener"; @@ -28711,8 +28827,8 @@ self: { }: mkDerivation { pname = "cabal-helper"; - version = "0.3.6.0"; - sha256 = "1c6pdrq8ypy9halw6cqdasr0zdr0hdb76h66vs9g0qkqqbpgiyyq"; + version = "0.3.7.0"; + sha256 = "1lq8i45wvk8rqilay7j9i9iv5irhqvdg3bp96mj2xxaxrpfi7l20"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -30158,8 +30274,8 @@ self: { }: mkDerivation { pname = "cassandra-cql"; - version = "0.5.0.1"; - sha256 = "0n1w1hriscrjky3d4qwzzm3p41yg9gvnxyq9sfm3kb7lijc4xj2d"; + version = "0.5.0.2"; + sha256 = "1nk0psvmzhvxls4h0p4blrm8qjn6lyh08bdxpiagpw6nrpvbda54"; buildDepends = [ base bytestring cereal containers cryptohash Decimal hslogger MonadCatchIO-transformers mtl network resource-pool stm text time @@ -30881,21 +30997,21 @@ self: { }) {}; "cgrep" = callPackage - ({ mkDerivation, ansi-terminal, array, base, bytestring, cmdargs - , containers, directory, dlist, either, filepath, ghc-prim, mtl - , regex-posix, safe, split, stm, stringsearch, unix-compat + ({ mkDerivation, ansi-terminal, array, async, base, bytestring + , cmdargs, containers, directory, dlist, either, filepath, ghc-prim + , mtl, regex-posix, safe, split, stm, stringsearch, unix-compat , unordered-containers }: mkDerivation { pname = "cgrep"; - version = "6.4.20"; - sha256 = "1p0nm6gb7hvxvfkgrync1a66zl58s041pgnkly2vx91cpm6yavcm"; + version = "6.5.2"; + sha256 = "021cwllz5cljb9j0klh3xn4jpg2vxfqwqyjm631gkpzndc9711wr"; isLibrary = false; isExecutable = true; buildDepends = [ - ansi-terminal array base bytestring cmdargs containers directory - dlist either filepath ghc-prim mtl regex-posix safe split stm - stringsearch unix-compat unordered-containers + ansi-terminal array async base bytestring cmdargs containers + directory dlist either filepath ghc-prim mtl regex-posix safe split + stm stringsearch unix-compat unordered-containers ]; homepage = "http://awgn.github.io/cgrep/"; description = "Command line tool"; @@ -31832,30 +31948,30 @@ self: { "clafer" = callPackage ({ mkDerivation, aeson, array, base, bytestring, cmdargs - , containers, data-stringmap, directory, executable-path, filepath - , ghc, HaXml, HTTP, HUnit, json-builder, lens, lens-aeson, mtl + , containers, data-stringmap, directory, doctest, executable-path + , filepath, ghc, HTTP, HUnit, json-builder, lens, lens-aeson, mtl , network, network-uri, parsec, process, QuickCheck, split , string-conversions, tasty, tasty-hunit, tasty-th, text , transformers }: mkDerivation { pname = "clafer"; - version = "0.3.10"; - sha256 = "0f780l5nh3r93w4ikxliqjg70ih4k4j00s7f4nj1li0dv6bprc3x"; + version = "0.4.0"; + sha256 = "1xnjvqwdp7679hr6jkl6xnsrdidw494p1xr8mlng6gybflm8v9gn"; isLibrary = true; isExecutable = true; buildDepends = [ aeson array base bytestring cmdargs containers data-stringmap - directory executable-path filepath HaXml HTTP json-builder lens + directory executable-path filepath HTTP json-builder lens lens-aeson mtl network network-uri parsec process split string-conversions text transformers ]; testDepends = [ - base containers data-stringmap directory filepath ghc HaXml HUnit + base containers data-stringmap directory doctest filepath ghc HUnit lens lens-aeson mtl QuickCheck tasty tasty-hunit tasty-th ]; homepage = "http://clafer.org"; - description = "clafer compiles Clafer models to other formats, such as Alloy, XML, HTML, Dot"; + description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -31868,8 +31984,8 @@ self: { }: mkDerivation { pname = "claferIG"; - version = "0.3.10"; - sha256 = "17g4jdfla0x90y2jn54yk56h6ih3d1jk4fzdpfvh85xs6dh79n0x"; + version = "0.4.0"; + sha256 = "01ilmmhz1wd142qpclk1b5nksm6cacr07pdj5cl5prfv7y04k9nw"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -31894,8 +32010,8 @@ self: { }: mkDerivation { pname = "claferwiki"; - version = "0.3.10"; - sha256 = "0v0nad7n3m8gs3l7prv2kwqzdp93g309j4l3l3dv1ibfnf5jr2l9"; + version = "0.4.0"; + sha256 = "1in0lzph5h7v9z9b974ibzh0rq7j343q474i9zfkylmdd1aivdyh"; buildDepends = [ base clafer containers directory gitit MissingH mtl network network-uri process SHA split time transformers utf8-string @@ -31951,8 +32067,8 @@ self: { }: mkDerivation { pname = "clash-ghc"; - version = "0.5.10"; - sha256 = "02zv08mkx228fxx1hdraaqmiv1mfq6rgsr3gflh0awyf6x5g6jzn"; + version = "0.5.11"; + sha256 = "1lwc47b2iw2l7djga11gp4xdikb8gycqv4fxz1cxrf23xzkg5ggg"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -31978,8 +32094,8 @@ self: { }: mkDerivation { pname = "clash-lib"; - version = "0.5.9"; - sha256 = "1kh40vy5sqxpb2akzwyc7k7z251lg3h3a12qj2vq4vkgwx5xcqkh"; + version = "0.5.10"; + sha256 = "039j561r7kgrd5b7z55axgjniwm5yi5y1y0azps4ipmvjsvalbdl"; buildDepends = [ aeson attoparsec base bytestring clash-prelude concurrent-supply containers deepseq directory errors fgl filepath hashable lens mtl @@ -31998,8 +32114,8 @@ self: { }: mkDerivation { pname = "clash-prelude"; - version = "0.9.1"; - sha256 = "00d4ap4jfw1298g59sfywkjza33s5p5p4n2nc69anwc31lxqnss8"; + version = "0.9.2"; + sha256 = "1gl75mbqpv5g5dwg2c2vvqn36ydwhkcv7g6i8gjm41500dsrky0i"; buildDepends = [ array base data-default ghc-prim ghc-typelits-natnormalise integer-gmp lens QuickCheck singletons template-haskell th-lift @@ -33771,16 +33887,13 @@ self: { }: mkDerivation { pname = "comonad"; - version = "4.2.7"; - revision = "1"; - sha256 = "03h36hr7vgxxyxfp9yc87vahbm3d6chvrkcrjh5abxg6i42aflma"; - editedCabalFile = "70542238a847c5b973832fa7e5623a76a485df25b36d511bfd5f5116e4014619"; + version = "4.2.7.2"; + sha256 = "0arvbaxgkawzdp38hh53akkahjg2aa3kj2b4ns0ni8a5ylg2cqmp"; buildDepends = [ base containers contravariant distributive semigroups tagged transformers transformers-compat ]; testDepends = [ base directory doctest filepath ]; - jailbreak = true; homepage = "http://github.com/ekmett/comonad/"; description = "Comonads"; license = stdenv.lib.licenses.bsd3; @@ -34705,8 +34818,8 @@ self: { }: mkDerivation { pname = "conduit-combinators"; - version = "1.0.1.1"; - sha256 = "02x0n4yar1s3x73pbaxs6ghd5kihl3wz3svrvvm24xnmwv5j9aaz"; + version = "1.0.2"; + sha256 = "1yfck6syqqi5zlp41n3qs8w5ljg63jhg25m8irrcks35n9i541j5"; buildDepends = [ base base16-bytestring base64-bytestring bytestring chunked-data conduit conduit-extra filepath monad-control mono-traversable @@ -35237,8 +35350,8 @@ self: { }: mkDerivation { pname = "consumers"; - version = "0.1"; - sha256 = "0y977lhxcaxjw6c760fifmisxn62lji0qs8aqgyag6jmzmkfymdb"; + version = "1.0"; + sha256 = "1f7jn9lja9fsznjz7d3wfhbd0dc8whcx9jl74jl39mv20k2sdhib"; buildDepends = [ base containers exceptions hpqtypes lifted-base lifted-threads log monad-control mtl stm time transformers-base @@ -35444,8 +35557,8 @@ self: { }: mkDerivation { pname = "contravariant"; - version = "1.3.1.1"; - sha256 = "0kjfild3zp34w745p79658i84k45cg9qjhv154sa0plqgk2vmdfs"; + version = "1.3.2"; + sha256 = "0fb6az12604vwvfhnmvxfin68n0fb2jcvrliv3vvrmfnfq3axfjj"; buildDepends = [ base semigroups StateVar transformers transformers-compat void ]; @@ -35852,8 +35965,8 @@ self: { }: mkDerivation { pname = "coordinate"; - version = "0.0.18"; - sha256 = "0avag247d74qwy6gikcmva5k41iriba42rkxik781dsnp2caxq1f"; + version = "0.0.19"; + sha256 = "01f6dmyx2kqyzf1n06awcyx0ygqgy829snxw6bbxbvih9yhkjq2r"; buildDepends = [ base lens radian tagged transformers ]; testDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -36274,6 +36387,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cpio-conduit" = callPackage + ({ mkDerivation, base, base16-bytestring, binary, bytestring + , conduit, conduit-extra, resourcet + }: + mkDerivation { + pname = "cpio-conduit"; + version = "0.7.0"; + sha256 = "04zma03ivg9x5f1xkdpc828fk2lh6qrn7cig7gprci13id9yf2wg"; + buildDepends = [ + base base16-bytestring binary bytestring conduit conduit-extra + ]; + testDepends = [ + base base16-bytestring binary bytestring conduit conduit-extra + resourcet + ]; + homepage = "http://github.com/da-x/cpio-conduit"; + description = "Conduit-based CPIO"; + license = stdenv.lib.licenses.asl20; + }) {}; + "cplusplus-th" = callPackage ({ mkDerivation, base, bytestring, containers, process, QuickCheck , template-haskell @@ -36298,8 +36431,8 @@ self: { }: mkDerivation { pname = "cpphs"; - version = "1.19"; - sha256 = "0fiyqyy7zzzbp0jsgl3syvm5db8n42h88ps7qzayxbsycjz9fp70"; + version = "1.19.2"; + sha256 = "194hcvhjgm6rmbqp857y3j39lvl2p91mqrrgpi15jq00icnv4idv"; isLibrary = true; isExecutable = true; buildDepends = [ base directory old-locale old-time polyparse ]; @@ -36348,8 +36481,8 @@ self: { ({ mkDerivation, array, base, containers, parallel }: mkDerivation { pname = "cpsa"; - version = "2.5.1"; - sha256 = "1lgscv3jkfzr35fwx7aymsgjg3i3sszxdc0hxmrbna8ba509cizk"; + version = "2.5.2"; + sha256 = "0zm2waj17ak43rhri9rhvwy970dv22r0k42fzbm3n6gcl5h2mcq5"; isLibrary = false; isExecutable = true; buildDepends = [ array base containers parallel ]; @@ -36420,15 +36553,15 @@ self: { "cql" = callPackage ({ mkDerivation, base, bytestring, cereal, Decimal, iproute , network, QuickCheck, tasty, tasty-quickcheck, template-haskell - , text, time, transformers, uuid + , text, time, transformers, uuid, vector }: mkDerivation { pname = "cql"; - version = "3.0.4"; - sha256 = "0b4yfmfxb4j039s5il321bc65dmbcbxqvaiqk97ly4fcc8pmdld9"; + version = "3.0.5"; + sha256 = "12v5hhlji9w73chxdhazpmhbaxmjs98lw1y6cm8p29bgxdi75q61"; buildDepends = [ base bytestring cereal Decimal iproute network template-haskell - text time transformers uuid + text time transformers uuid vector ]; testDepends = [ base bytestring cereal Decimal iproute network QuickCheck tasty @@ -36448,8 +36581,8 @@ self: { }: mkDerivation { pname = "cql-io"; - version = "0.14.4"; - sha256 = "09nkp0c8brh87x93ib5ss010kh2izzs05ad7gmf7q54zw6qxask2"; + version = "0.14.5"; + sha256 = "0ks2sn3dfrr8ilvmw48hfz3140x9dsi79w6ci4vfksn1g5ndnpiy"; buildDepends = [ async auto-update base bytestring containers cql cryptohash data-default-class exceptions hashable iproute lens monad-control @@ -36707,19 +36840,19 @@ self: { "creatur" = callPackage ({ mkDerivation, array, base, binary, bytestring, cereal, cond - , directory, filepath, gray-extended, hdaemonize, hsyslog, HUnit - , MonadRandom, mtl, old-locale, process, QuickCheck, random, split - , temporary, test-framework, test-framework-hunit + , directory, exceptions, filepath, gray-extended, hdaemonize + , hsyslog, HUnit, MonadRandom, mtl, old-locale, process, QuickCheck + , random, split, temporary, test-framework, test-framework-hunit , test-framework-quickcheck2, time, transformers, unix, zlib }: mkDerivation { pname = "creatur"; - version = "5.9.7"; - sha256 = "1617whwg9f0l6ji3jmd7fcs3n650mz0jpvrw4hf97r7mqzlyfkjp"; + version = "5.9.8.2"; + sha256 = "15cjk5hb4j7ydsis8fz7gag3sa17i6yr26pfbf8aqkw7iakmjqs9"; buildDepends = [ - array base bytestring cereal cond directory filepath gray-extended - hdaemonize hsyslog MonadRandom mtl old-locale process random split - time transformers unix zlib + array base bytestring cereal cond directory exceptions filepath + gray-extended hdaemonize hsyslog MonadRandom mtl old-locale process + random split time transformers unix zlib ]; testDepends = [ array base binary cereal directory filepath hsyslog HUnit @@ -37385,8 +37518,8 @@ self: { }: mkDerivation { pname = "cryptonite"; - version = "0.5"; - sha256 = "17b2axxb9i9cmwjhji1lm5nwhqm2wikxzy1cwmk2v8h64dy0rjc5"; + version = "0.6"; + sha256 = "0lzqmhslq1pwj6pp82l3vdnnxbqvh0bqjyl02x2yp6sp72mcq5m0"; buildDepends = [ base bytestring deepseq ghc-prim integer-gmp memory ]; @@ -37465,8 +37598,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "4.8.1"; - sha256 = "0mag076inyg9hs37anq7g7545wfjaphk831h8jj1fykp8iag95l4"; + version = "4.8.2"; + sha256 = "1zhx4smvs8xnqfcv2hxhq57n16cl3sycz659viw8l6v8f36ibj5i"; buildDepends = [ base Boolean colour csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -37501,8 +37634,8 @@ self: { }: mkDerivation { pname = "csound-expression-opcodes"; - version = "0.0.2"; - sha256 = "0friwwx0ia2wk75ylmvlladswqfwhza8grsbnqfn5q8ffsjv632r"; + version = "0.0.3"; + sha256 = "0f7nwrnrpsi31q9vaxy2yihripzqjzp6683qy94ljkmxmfnm9sb5"; buildDepends = [ base csound-expression-dynamic csound-expression-typed transformers ]; @@ -37518,8 +37651,8 @@ self: { }: mkDerivation { pname = "csound-expression-typed"; - version = "0.0.7.6"; - sha256 = "01zi1hychx6vinxpqh7zdcj6jrlcpp86v7cmdzzq42z44apg8d3y"; + version = "0.0.7.7"; + sha256 = "1z9hvkgl6lqwrdhngq79425s2frhkg4llkcpsar21d5ld4fhzfdl"; buildDepends = [ base Boolean colour containers csound-expression-dynamic data-default deepseq ghc-prim stable-maps temporal-media @@ -40967,19 +41100,22 @@ self: { }) {}; "delta" = callPackage - ({ mkDerivation, base, containers, directory, filepath + ({ mkDerivation, base, containers, directory, filepath, hspec , optparse-applicative, process, sodium, time }: mkDerivation { pname = "delta"; - version = "0.2.1.1"; - sha256 = "06msfi733jmqqgxyx5p4mifjgxrgh0x8ls4j0fkcan5377sydjcv"; + version = "0.2.1.2"; + revision = "2"; + sha256 = "0r2a2vffs3rn2xp56nhanyywzbm2wph5664spgj4lbsna6zgjnfj"; + editedCabalFile = "630e85a07132fe54b49c71f855b3d633982026d78120279e00888bc95a9d14dd"; isLibrary = true; isExecutable = true; buildDepends = [ base containers directory filepath optparse-applicative process sodium time ]; + testDepends = [ base directory filepath hspec ]; homepage = "https://github.com/kryoxide/delta"; description = "A library for detecting file changes"; license = stdenv.lib.licenses.gpl3; @@ -41064,8 +41200,8 @@ self: { }: mkDerivation { pname = "dependent-sum-template"; - version = "0.0.0.3"; - sha256 = "0if3mr0cmaz3yc0hbn0fpx14kwnjsaj3hd8mw9z4va4qp85wya69"; + version = "0.0.0.4"; + sha256 = "103jxzzw3drg7pkgmh39s7258zcwr8ixg8mijm6p33b87a8wdpwr"; buildDepends = [ base dependent-sum template-haskell th-extras ]; homepage = "/dev/null"; description = "Template Haskell code to generate instances of classes in dependent-sum package"; @@ -41250,6 +41386,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "deriving-compat" = callPackage + ({ mkDerivation, base, base-compat, containers, ghc-prim, hspec + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.1"; + sha256 = "1v503lj9dds1hwnqhmw8rfbj9337gcyqqzys1d93r7s0bs3glgf3"; + buildDepends = [ base containers ghc-prim template-haskell ]; + testDepends = [ base base-compat hspec QuickCheck ]; + homepage = "https://github.com/haskell-compat/deriving-compat"; + description = "Backports of GHC deriving extensions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "derp" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -41338,8 +41489,8 @@ self: { ({ mkDerivation, base, hspec, mtl }: mkDerivation { pname = "deterministic-game-engine"; - version = "0.2.1"; - sha256 = "0igs10h0mj8xxw9z57icx4y7mb7ag6m4cg7qiqk3b41xipxqn1ig"; + version = "0.4.0"; + sha256 = "1hdwr1vxfng3yc9mdnnsraapikq9kq1c07ik16csgp2ggnhgpprs"; buildDepends = [ base mtl ]; testDepends = [ base hspec ]; homepage = "https://github.com/TGOlson/deterministic-game-engine"; @@ -41725,11 +41876,31 @@ self: { process semigroups system-filepath tagged text transformers unordered-containers ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-pandoc" = callPackage + ({ mkDerivation, base, diagrams-builder, diagrams-cairo + , diagrams-lib, directory, filepath, linear, optparse-applicative + , pandoc-types + }: + mkDerivation { + pname = "diagrams-pandoc"; + version = "0.1"; + sha256 = "02dz0w2im68667v5k1ykdnl3cijvqfd5pgb7qqdyyizkgza88pb4"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base diagrams-builder diagrams-cairo diagrams-lib directory + filepath linear optparse-applicative pandoc-types + ]; + description = "A pandoc filter to express diagrams inline using the haskell EDSL _diagrams_"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "diagrams-pdf" = callPackage ({ mkDerivation, base, cmdargs, colour, diagrams-core, diagrams-lib , filepath, HPDF, lens, monoid-extras, mtl, semigroups, split @@ -44471,18 +44642,18 @@ self: { "dump" = callPackage ({ mkDerivation, base, haskell-src-meta, hspec - , interpolatedstring-perl6, template-haskell, text + , interpolatedstring-perl6, QuickCheck, template-haskell, text }: mkDerivation { pname = "dump"; - version = "0.2.6"; - sha256 = "0rhjx4g83pbm0zfqgz8ykfccaq8wa7wspjc6k1n4d1bgcwkc617y"; + version = "0.2.8"; + sha256 = "0p0wwcxm2lgfbx82s226dprd8qa526pnrnpakxmdz5svd6ib0gh4"; buildDepends = [ base haskell-src-meta interpolatedstring-perl6 template-haskell text ]; testDepends = [ - base haskell-src-meta hspec interpolatedstring-perl6 + base haskell-src-meta hspec interpolatedstring-perl6 QuickCheck template-haskell text ]; homepage = "https://github.com/Wizek/dump"; @@ -45594,16 +45765,16 @@ self: { }) {}; "ekg" = callPackage - ({ mkDerivation, aeson, base, bytestring, ekg-core, filepath - , network, snap-core, snap-server, text, time, transformers - , unordered-containers + ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json + , filepath, network, snap-core, snap-server, text, time + , transformers, unordered-containers }: mkDerivation { pname = "ekg"; - version = "0.4.0.7"; - sha256 = "0isq39a1c8laiigxi5yqv7d6798xc828xh4p0zan0a6m6glrmygr"; + version = "0.4.0.8"; + sha256 = "0cp88b5bf4bpjd6qzib00n7j76svwsykzizk52fk1dmknfx8h12v"; buildDepends = [ - aeson base bytestring ekg-core filepath network snap-core + aeson base bytestring ekg-core ekg-json filepath network snap-core snap-server text time transformers unordered-containers ]; homepage = "https://github.com/tibbe/ekg"; @@ -45653,8 +45824,8 @@ self: { }: mkDerivation { pname = "ekg-core"; - version = "0.1.0.4"; - sha256 = "04ym37hc2l3k185dbkmfa4n7ya412cgc5zf0kynwgfvdwggjnxwh"; + version = "0.1.1.0"; + sha256 = "07h6lwig1cwb526ack1g3f6w8irmaj4kibn11ihhdffk7avix8bv"; buildDepends = [ base containers ghc-prim text unordered-containers ]; @@ -45663,6 +45834,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ekg-json" = callPackage + ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers + }: + mkDerivation { + pname = "ekg-json"; + version = "0.1.0.0"; + sha256 = "1nhqlajidg94zk6rs86ri5ar4cmkbdz04hwjp8qgam0vgpp5bi2j"; + buildDepends = [ aeson base ekg-core text unordered-containers ]; + homepage = "https://github.com/tibbe/ekg-json"; + description = "JSON encoding of ekg metrics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ekg-log" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, ekg-core , fast-logger, filepath, text, time, unix, unordered-containers @@ -46386,17 +46570,18 @@ self: { }) {}; "engine-io-wai" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, engine-io - , http-types, mtl, text, transformers, unordered-containers, wai - , wai-websockets, websockets + ({ mkDerivation, attoparsec, base, bytestring, either, engine-io + , http-types, mtl, text, transformers, transformers-compat + , unordered-containers, wai, wai-websockets, websockets }: mkDerivation { pname = "engine-io-wai"; - version = "1.0.1"; - sha256 = "0cr53x8bxfmrx97v7jsb7gw3hqb94zp9xvvnl16080zmqm0gi2rh"; + version = "1.0.3"; + sha256 = "0p296y3xnpx0wj6yd152y7i765x0pwg8rg2bpcz92hkcmz57gdz7"; buildDepends = [ - attoparsec base bytestring engine-io http-types mtl text - transformers unordered-containers wai wai-websockets websockets + attoparsec base bytestring either engine-io http-types mtl text + transformers transformers-compat unordered-containers wai + wai-websockets websockets ]; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; @@ -46796,8 +46981,8 @@ self: { }: mkDerivation { pname = "equal-files"; - version = "0.0.5.1"; - sha256 = "1rm0hk42xnzix1ba7bxfrc910v4nnhvqk3cbdrxy7avzhad31nbf"; + version = "0.0.5.2"; + sha256 = "07n9xdsi00nz9xwd0bqrdn2d03q7dzlrr13wlym5lgc15r7iwf8w"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -47158,8 +47343,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "2.2.10"; - sha256 = "0chxxcy52xrhdq7pgwzq3vk9filrrc3mdnx6j26r2ih56j1ac02l"; + version = "2.2.11"; + sha256 = "0ldgiim5d23avzqgzmpyb1nfp9xpxc51fc98f3ii8ic4mxn4bjvp"; buildDepends = [ base conduit monad-logger persistent resourcet tagged text transformers unordered-containers @@ -47395,6 +47580,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "euphoria" = callPackage + ({ mkDerivation, base, containers, data-default, deepseq, elerea + , enummapset-th, hashable, HUnit, test-framework + , test-framework-hunit, test-framework-th, transformers + , unordered-containers + }: + mkDerivation { + pname = "euphoria"; + version = "0.6.0.1"; + sha256 = "1bml75lj30y83bln5a7b36gcb9d6gci4vhmr8ins9nz6bc1l29m9"; + buildDepends = [ + base containers data-default deepseq elerea enummapset-th hashable + HUnit transformers unordered-containers + ]; + testDepends = [ + base HUnit test-framework test-framework-hunit test-framework-th + ]; + homepage = "http://github.com/tsurucapital/euphoria"; + description = "Dynamic network FRP with events and continuous values"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "eurofxref" = callPackage ({ mkDerivation, base, bytestring, conduit, containers, failure , hexpat, http-conduit, http-types, monad-control, mtl, time @@ -47534,16 +47741,16 @@ self: { }) {}; "ewe" = callPackage - ({ mkDerivation, alex, array, base, containers, happy, mtl + ({ mkDerivation, alex, array, base, containers, happy, mtl, pretty , transformers }: mkDerivation { pname = "ewe"; - version = "0.1.0.40"; - sha256 = "0r9kcpb6j2x4cmg26rvzd2gp4bjjmlsd0rbk1y2dc7vyivd0m14l"; + version = "0.1.0.44"; + sha256 = "0v313l0akvw9b3zn7xffy4ixz2c70i40k6kh4vdlrw8dvyv7zxk3"; isLibrary = false; isExecutable = true; - buildDepends = [ array base containers mtl transformers ]; + buildDepends = [ array base containers mtl pretty transformers ]; buildTools = [ alex happy ]; homepage = "http://github.com/jfcmacro/ewe"; description = "An language using in Programming Languages teaching"; @@ -47584,8 +47791,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "exact-pi"; - version = "0.2.0.0"; - sha256 = "0az47bzrkhb5xmws1rpp080kvsq2pcxjgrm0wzjqqbcqiy5pi3f9"; + version = "0.2.1.1"; + sha256 = "1f8lxdaal7m4vw8akzwlhn0j3vw5bh983f02j842g1vzs3n47x3g"; buildDepends = [ base ]; homepage = "https://github.com/dmcclean/exact-pi"; description = "Exact rational multiples of pi (and integer powers of pi)"; @@ -48170,8 +48377,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.4"; - sha256 = "1cp9vsqgjc46v1i8w8lhakdk1qj6q2bd0y365qj0madpjj7q1qi8"; + version = "1.4.1"; + sha256 = "00fhy9l2cgfwj8873jf1iyz2fmhj1b3m0qlf38i4pd1yad8sfb70"; buildDepends = [ base directory filepath process time unix ]; testDepends = [ base directory filepath QuickCheck time unix ]; homepage = "https://github.com/ndmitchell/extra#readme"; @@ -48411,8 +48618,8 @@ self: { }: mkDerivation { pname = "fast-builder"; - version = "0.0.0.0"; - sha256 = "1ga28vxsv4hk8491jv51jd8xqvafss56kkm97x2ma4naqx4v6snw"; + version = "0.0.0.2"; + sha256 = "07fnn282ldfmgkfnsdnjr11hx89jhw7waz573a7nx2a329r1p4pf"; buildDepends = [ base bytestring ghc-prim ]; testDepends = [ base bytestring process QuickCheck stm ]; homepage = "http://github.com/takano-akio/fast-builder"; @@ -48420,6 +48627,24 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "fast-digits" = callPackage + ({ mkDerivation, base, digits, integer-gmp, QuickCheck, smallcheck + , tasty, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "fast-digits"; + version = "0.1.0.0"; + sha256 = "1dhvlsjbp4qrgcr9xlzbaps59160j2zl98xl5nrz6rffypz0gi72"; + buildDepends = [ base integer-gmp ]; + testDepends = [ + base digits QuickCheck smallcheck tasty tasty-quickcheck + tasty-smallcheck + ]; + homepage = "https://github.com/Bodigrim/fast-digits"; + description = "The fast library for integer-to-digits conversion"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "fast-logger" = callPackage ({ mkDerivation, array, auto-update, base, bytestring , bytestring-builder, directory, filepath, hspec, text @@ -48443,8 +48668,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fast-math"; - version = "1.0.1"; - sha256 = "1a36mvrdr8gai4sn1s52fyc8alcl6ks6dlmr77df5dgvc2z74hhb"; + version = "1.0.2"; + sha256 = "15dyw88z9abiv6n40fz4g3jpj9v6qbxvqaf0ds32wh46igf1s425"; buildDepends = [ base ]; description = "Non IEEE-754 compliant compile-time floating-point optimisations"; license = stdenv.lib.licenses.bsd3; @@ -48503,8 +48728,8 @@ self: { }: mkDerivation { pname = "fasta"; - version = "0.7.2.0"; - sha256 = "1zsghi7883y4ygl0iammfh1dmnsnh3x4ly77jhxg8xz8saw7dbir"; + version = "0.7.2.1"; + sha256 = "1jwx8h3z3zlrnandqgmgrkam4y0awm3k1mfzljf7pn9acq6nxhs4"; buildDepends = [ base bytestring containers foldl lens parsec pipes pipes-bytestring pipes-group pipes-text split text @@ -49277,8 +49502,8 @@ self: { }: mkDerivation { pname = "fgl"; - version = "5.5.2.0"; - sha256 = "1r9vkv5v32nyqghr4fq3ijrdl2sr9bncfpj3zix53h5m2zyn7kg3"; + version = "5.5.2.1"; + sha256 = "1nfm3gkr6cccqhi1g46k2d0l99yw2vq7xjd1hxxzcci5gidp8bhc"; buildDepends = [ array base containers deepseq transformers ]; testDepends = [ base containers hspec QuickCheck ]; description = "Martin Erwig's Functional Graph Library"; @@ -49600,8 +49825,8 @@ self: { }: mkDerivation { pname = "filestore"; - version = "0.6.0.6"; - sha256 = "1lknngdg1c4a58qxbzzvpy72nx1pncm2p4akid2b3s7ydl7j96xr"; + version = "0.6.1"; + sha256 = "0mfllnnb1mqix1v65fyhd9jsvnrjbawd6l4h4012jk8401zwj280"; buildDepends = [ base bytestring containers Diff directory filepath old-locale parsec process split time utf8-string xml @@ -51820,22 +52045,23 @@ self: { }) {}; "fsnotify" = callPackage - ({ mkDerivation, async, base, containers, directory, hinotify - , system-fileio, system-filepath, tasty, tasty-hunit, temporary-rc - , text, time + ({ mkDerivation, async, base, containers, directory, filepath + , hinotify, tasty, tasty-hunit, temporary-rc, text, time + , unix-compat }: mkDerivation { pname = "fsnotify"; - version = "0.1.0.3"; - sha256 = "0m6jyg45azk377jklgwyqrx95q174cxd5znpyh9azznkh09wq58z"; + version = "0.2.1"; + sha256 = "0asl313a52qx2w6dw25g845683xsl840bwjh118nkwi5v1xipkzb"; buildDepends = [ - async base containers hinotify system-fileio system-filepath text - time + async base containers directory filepath hinotify text time + unix-compat ]; testDepends = [ - async base directory system-fileio system-filepath tasty - tasty-hunit temporary-rc + async base directory filepath tasty tasty-hunit temporary-rc + unix-compat ]; + homepage = "https://github.com/haskell-fswatch/hfsnotify"; description = "Cross platform library for file change notification"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -52274,6 +52500,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fuzzy" = callPackage + ({ mkDerivation, base, HUnit, monoid-subclasses }: + mkDerivation { + pname = "fuzzy"; + version = "0.1.0.0"; + sha256 = "1jz9arrg33x64ygipk0115b7jfchxh20cy14177iwg0na8mpl2l2"; + buildDepends = [ base monoid-subclasses ]; + testDepends = [ base HUnit ]; + homepage = "http://github.com/joom/fuzzy"; + description = "Filters a list based on a fuzzy string search"; + license = stdenv.lib.licenses.mit; + }) {}; + "fuzzy-timings" = callPackage ({ mkDerivation, base, containers, glpk-hs, HUnit, mtl, QuickCheck , random, test-framework, test-framework-hunit @@ -52315,10 +52554,8 @@ self: { }: mkDerivation { pname = "fwgl"; - version = "0.1.2.0"; - revision = "1"; - sha256 = "1b18xzxbbrnmmvjgmzhy5r4ww7rvbli76m7vh3li30fb95k1sznr"; - editedCabalFile = "d97edefc7ee59578d181dfc36d85b1a82a6e0c9ed1bb602918655a3439a5eb51"; + version = "0.1.2.2"; + sha256 = "1s4j1wgnncn6cmsarsc989zxz1qsqhsa722h7bv2k43093ww0nnh"; buildDepends = [ base hashable transformers unordered-containers vector Yampa ]; @@ -52334,10 +52571,8 @@ self: { }: mkDerivation { pname = "fwgl-glfw"; - version = "0.1.0.4"; - revision = "1"; - sha256 = "1pph1arlmi905rkcjcn3yf5ypdmk82363vgdmwg26dbrb2sb4cs8"; - editedCabalFile = "26e4026f5ac7fe57292c5df79d35894b736728c31cad845f11641d833f789fb8"; + version = "0.1.0.5"; + sha256 = "1y30mqayih5cd74dm90y7mbb9a0fw9sirzjlrmayvcm7aniyvmql"; buildDepends = [ base fwgl gl GLFW-b hashable JuicyPixels transformers unordered-containers vector Yampa @@ -52354,8 +52589,8 @@ self: { }: mkDerivation { pname = "fwgl-javascript"; - version = "0.1.0.4"; - sha256 = "1bwg6dzp2kgny5s6zygdi120pcrdclql22rgp43vhwim5aqkp9d7"; + version = "0.1.0.6"; + sha256 = "0fxnnjp7403c29pjks739j0j92a1sldrrxg3sp4nrjb1ax01nia9"; buildDepends = [ base fwgl ghcjs-base hashable unordered-containers Yampa ]; @@ -53332,23 +53567,23 @@ self: { }) {}; "getopt-generics" = callPackage - ({ mkDerivation, base, base-compat, base-orphans, generics-sop - , hspec, hspec-expectations, markdown-unlit, QuickCheck, silently - , tagged + ({ mkDerivation, base, base-compat, base-orphans, directory + , filepath, generics-sop, hspec, process, QuickCheck, silently + , tagged, temporary }: mkDerivation { pname = "getopt-generics"; - version = "0.8"; - sha256 = "0qxdr9y3dvr4w7hhbgkianaijsqfh36gfwh1blhbr1nf7cv9khmd"; + version = "0.10.0.1"; + sha256 = "0x8vh0sng1m05blxr24ijrz16bsyvryxkk70jqkdvq173x5fj8lf"; buildDepends = [ base base-compat base-orphans generics-sop tagged ]; testDepends = [ - base base-compat base-orphans generics-sop hspec hspec-expectations - markdown-unlit QuickCheck silently tagged + base base-compat base-orphans directory filepath generics-sop hspec + process QuickCheck silently tagged temporary ]; homepage = "https://github.com/zalora/getopt-generics#readme"; - description = "Simple command line argument parsing"; + description = "Create command line interfaces with ease"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -53532,12 +53767,12 @@ self: { "ghc-exactprint" = callPackage ({ mkDerivation, base, containers, directory, filemanip, filepath - , free, ghc, ghc-paths, HUnit, mtl, random, silently, syb + , free, ghc, ghc-paths, HUnit, mtl, silently, syb }: mkDerivation { pname = "ghc-exactprint"; - version = "0.3"; - sha256 = "0wgqlll95fbxnni1dzlyiyb4d7lqp3hrfw9xh5hqsnqm45smi7j1"; + version = "0.3.1"; + sha256 = "07kyifdh8s7jjp1jsm9f823hr0axgpxv54fr0vg8k3ibhdrw5dj1"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -53545,8 +53780,9 @@ self: { ]; testDepends = [ base containers directory filemanip filepath ghc ghc-paths HUnit - mtl random silently syb + mtl silently syb ]; + jailbreak = true; description = "ExactPrint for GHC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -54060,14 +54296,13 @@ self: { }) {}; "ghcjs-dom" = callPackage - ({ mkDerivation, base, glib, gtk3, mtl, text, transformers - , webkitgtk3 + ({ mkDerivation, base, glib, gtk, mtl, text, transformers, webkit }: mkDerivation { pname = "ghcjs-dom"; version = "0.1.1.3"; sha256 = "0pdxb2s7fflrh8sbqakv0qi13jkn3d0yc32xhg2944yfjg5fvlly"; - buildDepends = [ base glib gtk3 mtl text transformers webkitgtk3 ]; + buildDepends = [ base glib gtk mtl text transformers webkit ]; description = "DOM library that supports both GHCJS and WebKitGTK"; license = stdenv.lib.licenses.mit; }) {}; @@ -54218,8 +54453,8 @@ self: { }: mkDerivation { pname = "gipeda"; - version = "0.1.2"; - sha256 = "0a32q4gi0vfmgvy4ir0ng52nk2gkfxcivyybh5bfh04b3saf5ya4"; + version = "0.1.2.1"; + sha256 = "0wra67d2jdnx463vw8hf2yzzwmnkbs9791x5mgarlgc6zj68g926"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -54227,7 +54462,6 @@ self: { gitlib gitlib-libgit2 scientific shake split tagged text unordered-containers vector yaml ]; - jailbreak = true; homepage = "https://github.com/nomeata/gipeda"; description = "Git Performance Dashboard"; license = stdenv.lib.licenses.mit; @@ -54280,20 +54514,20 @@ self: { , git, gnupg, gnutls, hinotify, hslogger, http-client, http-conduit , http-types, IfElse, json, lsof, MissingH, monad-control , monad-logger, mtl, network, network-info, network-multicast - , network-protocol-xmpp, network-uri, openssh, optparse-applicative - , path-pieces, perl, persistent, persistent-sqlite - , persistent-template, process, QuickCheck, random, regex-tdfa - , resourcet, rsync, SafeSemaphore, sandi, securemem, shakespeare - , stm, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun - , template-haskell, text, time, torrent, transformers, unix - , unix-compat, utf8-string, uuid, wai, wai-extra, warp, warp-tls - , wget, which, xml-types, yesod, yesod-core, yesod-default - , yesod-form, yesod-static + , network-protocol-xmpp, network-uri, old-locale, openssh + , optparse-applicative, path-pieces, perl, persistent + , persistent-sqlite, persistent-template, process, QuickCheck + , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi + , securemem, shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck + , tasty-rerun, template-haskell, text, time, torrent, transformers + , unix, unix-compat, utf8-string, uuid, wai, wai-extra, warp + , warp-tls, wget, which, xml-types, yesod, yesod-core + , yesod-default, yesod-form, yesod-static }: mkDerivation { pname = "git-annex"; - version = "5.20150710"; - sha256 = "0q7q8ikgv3dhvs3vad04z1bfa6l92v97jrh0n4zqc0c44wx9a3wp"; + version = "5.20150731"; + sha256 = "18akv0xj4mf2ypzzd12briv0rw9ba7xw8k1qxvl10m9z4x6gvvm2"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -54303,7 +54537,7 @@ self: { edit-distance esqueleto exceptions fdo-notify feed filepath gnutls hinotify hslogger http-client http-conduit http-types IfElse json MissingH monad-control monad-logger mtl network network-info - network-multicast network-protocol-xmpp network-uri + network-multicast network-protocol-xmpp network-uri old-locale optparse-applicative path-pieces persistent persistent-sqlite persistent-template process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi securemem shakespeare stm tasty tasty-hunit @@ -54739,8 +54973,8 @@ self: { }: mkDerivation { pname = "gitit"; - version = "0.11"; - sha256 = "1833rxx3c28rvjz1h1nnm0h838zl941zr51r3dp89zn59rs72hn9"; + version = "0.11.1"; + sha256 = "06wxy4hpbkbmlwrgnsxbr47k2a791094gzqsmlqzhsq6wa1bgfr9"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -55083,8 +55317,8 @@ self: { }: mkDerivation { pname = "glib"; - version = "0.13.1.1"; - sha256 = "1wa3kfwwb7hf5g0hw1vcmrgcxd4pykvzbvc6ylx7903vxqbb9574"; + version = "0.13.2.1"; + sha256 = "1pxc2a0hnjaryf3f8d410rnhxmc7byx6lwcypgqg4zma6r3qhqwp"; buildDepends = [ base bytestring containers text utf8-string ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ glib ]; @@ -55277,9 +55511,10 @@ self: { mkDerivation { pname = "gloss-banana"; version = "0.1.0.4"; + revision = "1"; sha256 = "0zzpdryfcqvxpzv53ymsvkm2nza9ryvzqgf3n89pnvrni91avgj3"; + editedCabalFile = "232cec279cb20afd92056320c24d3d3041199b014981492ddbbe57eeff312a5a"; buildDepends = [ base gloss reactive-banana ]; - jailbreak = true; homepage = "https://github.com/Twey/gloss-banana"; description = "An Interface for gloss in terms of a reactive-banana Behavior"; license = stdenv.lib.licenses.gpl3; @@ -55405,8 +55640,8 @@ self: { ({ mkDerivation, array, base, containers, deepseq, glpk, mtl }: mkDerivation { pname = "glpk-hs"; - version = "0.3.4"; - sha256 = "0wyasd0dqi5nnh52lx980vnyhm0rwib0sd7qnpj4s9hq8rn994cm"; + version = "0.3.5"; + sha256 = "1nx0mcy009cj1h2fsz00qfpr9zawagwsp3w370251hdc5q6bw52p"; buildDepends = [ array base containers deepseq mtl ]; extraLibraries = [ glpk ]; description = "Comprehensive GLPK linear programming bindings"; @@ -56343,14 +56578,16 @@ self: { }) {}; "graphics-drawingcombinators" = callPackage - ({ mkDerivation, base, bitmap, FTGL, OpenGL, stb-image }: + ({ mkDerivation, base, bitmap, bitmap-opengl, FTGL, OpenGL + , stb-image + }: mkDerivation { pname = "graphics-drawingcombinators"; - version = "1.5"; - sha256 = "064g5zcdm0xpczyf8xwx0q0yr6jrd54461qpfxbvsh90lq0pa051"; + version = "1.5.1"; + sha256 = "0j0ilr54pdz61c78khy8bm37g89cvk1n56h5d6c55jabsv5gx3sf"; isLibrary = true; isExecutable = true; - buildDepends = [ base bitmap FTGL OpenGL stb-image ]; + buildDepends = [ base bitmap bitmap-opengl FTGL OpenGL stb-image ]; jailbreak = true; homepage = "http://github.com/luqui/graphics-drawingcombinators"; description = "A functional interface to 2D drawing in OpenGL"; @@ -56586,6 +56823,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gridland" = callPackage + ({ mkDerivation, array, astar, base, containers, grid, htiled, mtl + , random, safe, SDL, SDL-gfx, SDL-image, SDL-mixer, tuple, vector + }: + mkDerivation { + pname = "gridland"; + version = "0.1.0.3"; + sha256 = "0q5p73n6h5ngg992f1msdqzxds2baafjypdx53zf2rdhbqp4fdi9"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + array astar base containers grid htiled mtl random safe SDL SDL-gfx + SDL-image SDL-mixer tuple vector + ]; + description = "Grid-based multimedia engine"; + license = stdenv.lib.licenses.mit; + }) {}; + "grm" = callPackage ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, happy , parsec, process, syb, wl-pprint @@ -57265,8 +57520,8 @@ self: { }: mkDerivation { pname = "gtk3"; - version = "0.13.9"; - sha256 = "1zmcvp295sknc2h529nprclw11lnwp79dniyyg573wc99bdzijvr"; + version = "0.14.0"; + sha256 = "1j6nwjvjmzb144vbizraax0yf5bbkicg5hx2mm4z9ayacf58sm7c"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -57276,7 +57531,7 @@ self: { buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ gtk3 ]; homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Gtk+ graphical user interface library"; + description = "Binding to the Gtk+ 3 graphical user interface library"; license = stdenv.lib.licenses.lgpl21; }) { gtk3 = null;}; @@ -57286,8 +57541,8 @@ self: { }: mkDerivation { pname = "gtk3-mac-integration"; - version = "0.3.1.1"; - sha256 = "0j6fpzk1gq1y15cjpkq3k1azkn7xvlqiidn3m0g9czz5iy303adv"; + version = "0.3.2.0"; + sha256 = "0m7659ca92w9yhd1fnraa255sx74qjagwsavd3navl41h687bzqj"; buildDepends = [ array base containers glib gtk3 mtl ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ gtk-mac-integration-gtk3 ]; @@ -57375,8 +57630,8 @@ self: { }: mkDerivation { pname = "gtksourceview3"; - version = "0.13.1.5"; - sha256 = "15bm58pr92izhwa0sqf8vkzfcg1455947cgl29ak2kwaj3fkzbq1"; + version = "0.13.2.0"; + sha256 = "0chn0rl5kkfi7y02h1x0gfkpbm4hfcl6pxrbdpfv20jk4m88a0qj"; buildDepends = [ array base containers glib gtk3 mtl text ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ gtksourceview ]; @@ -58808,10 +59063,8 @@ self: { }: mkDerivation { pname = "hadoop-tools"; - version = "0.6"; - revision = "2"; - sha256 = "1nkkv9i0qk4k9vijabf1lylq8wsfsycllxvkza7abljii5jpj5fp"; - editedCabalFile = "31166d3ed285e22977d237a1ae42d29b33503ad7be39c11f97b5890571da19ec"; + version = "0.7.2"; + sha256 = "0grwi26xardg8fxvz7g10v9111bgph77s3pdrr58r9hqgm8lhx5v"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -59089,11 +59342,12 @@ self: { , process, QuickCheck, random, regex-base, regex-tdfa, snap-core , snap-server, system-filepath, tagsoup, test-framework , test-framework-hunit, test-framework-quickcheck2, text, time + , time-locale-compat }: mkDerivation { pname = "hakyll"; - version = "4.7.2.0"; - sha256 = "0krj7kaikdbxiqkcd5c3pyhp3zchgy74dzx336f8x1ywlja4802r"; + version = "4.7.2.2"; + sha256 = "1gy7j15qqh8m0wf8xkpb1hglahylwyy7vq6c4bm9arap3viak29c"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -59102,6 +59356,7 @@ self: { http-conduit http-types lrucache mtl network network-uri pandoc pandoc-citeproc parsec process random regex-base regex-tdfa snap-core snap-server system-filepath tagsoup text time + time-locale-compat ]; testDepends = [ base binary blaze-html blaze-markup bytestring cmdargs containers @@ -59143,6 +59398,7 @@ self: { Agda base containers directory filepath hakyll mtl pandoc transformers xhtml ]; + jailbreak = true; homepage = "https://github.com/bitonic/hakyll-agda"; description = "Wrapper to integrate literate Agda files with Hakyll"; license = stdenv.lib.licenses.bsd3; @@ -59659,6 +59915,7 @@ self: { isExecutable = true; buildDepends = [ base glib gtk3 text ]; pkgconfigDepends = [ appindicator ]; + jailbreak = true; homepage = "https://github.com/mlacorte/happindicator3"; description = "Binding to the appindicator library"; license = stdenv.lib.licenses.lgpl21; @@ -60654,17 +60911,16 @@ self: { "hashable-extras" = callPackage ({ mkDerivation, base, bifunctors, bytestring, directory, doctest - , filepath, generic-deriving, hashable, transformers + , filepath, hashable, transformers }: mkDerivation { pname = "hashable-extras"; - version = "0.2.1"; - sha256 = "02hzffyns0id9vhaqzax7ijprh1pfb8llrfi67hmji2wrh3nvmml"; + version = "0.2.2"; + sha256 = "118l23n78xs1faa0q42h996q210l2p9mzl85a73krljzsz8wkc1b"; buildDepends = [ - base bifunctors bytestring generic-deriving hashable transformers + base bifunctors bytestring hashable transformers ]; testDepends = [ base directory doctest filepath ]; - jailbreak = true; homepage = "http://github.com/analytics/hashable-extras/"; description = "Higher-rank Hashable"; license = stdenv.lib.licenses.bsd3; @@ -62209,8 +62465,8 @@ self: { }: mkDerivation { pname = "haskellscrabble"; - version = "1.0"; - sha256 = "099qhvi7v7bimjqdlnz6scmyr7xqxjk65y861630n9jr133bclnz"; + version = "1.1"; + sha256 = "1wb9ncpzsacvwk8gmh8gzxm54viwlzsikj05lk14gpyp8xwhl54h"; buildDepends = [ array arrows base containers errors mtl parsec QuickCheck random safe semigroups split transformers unordered-containers @@ -62890,26 +63146,25 @@ self: { }) {}; "haste-compiler" = callPackage - ({ mkDerivation, array, base, binary, blaze-builder, bytestring - , bzlib, containers, data-binary-ieee754, data-default, directory - , either, filepath, ghc, ghc-paths, ghc-prim, HTTP, monads-tf, mtl - , network, network-uri, process, random, shellmate, system-fileio - , tar, transformers, utf8-string, websockets + ({ mkDerivation, array, base, bin-package-db, binary, blaze-builder + , bytestring, bzlib, Cabal, containers, data-binary-ieee754 + , data-default, directory, either, filepath, ghc, ghc-paths + , ghc-prim, ghc-simple, HTTP, monads-tf, mtl, network, network-uri + , process, random, shellmate, system-fileio, tar, terminfo + , transformers, unix, utf8-string, websockets }: mkDerivation { pname = "haste-compiler"; - version = "0.4.4.4"; - revision = "1"; - sha256 = "19raiciwll7pgc73h2h704yi9wcifcn7s2gxyjrndp6d7kf1ygyy"; - editedCabalFile = "de636e39473869692b1fa1dd6047fc2987b6f63c1403a511aab6bd1dcaa98f6f"; + version = "0.5.0"; + sha256 = "18n9sl9m2fpzshpj3gqvd7wlmvz5mrgsz8awcd3imcb7136qa9s9"; isLibrary = true; isExecutable = true; buildDepends = [ - array base binary blaze-builder bytestring bzlib containers - data-binary-ieee754 data-default directory either filepath ghc - ghc-paths ghc-prim HTTP monads-tf mtl network network-uri process - random shellmate system-fileio tar transformers utf8-string - websockets + array base bin-package-db binary blaze-builder bytestring bzlib + Cabal containers data-binary-ieee754 data-default directory either + filepath ghc ghc-paths ghc-prim ghc-simple HTTP monads-tf mtl + network network-uri process random shellmate system-fileio tar + terminfo transformers unix utf8-string websockets ]; configureFlags = [ "-fportable" ]; homepage = "http://haste-lang.org/"; @@ -63897,19 +64152,19 @@ self: { }) {}; "hdocs" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , filepath, ghc, ghc-paths, haddock-api, haddock-library - , MonadCatchIO-transformers, mtl, network, process, text - , transformers + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal + , containers, filepath, ghc, ghc-paths, haddock-api + , haddock-library, MonadCatchIO-transformers, mtl, network, process + , text, transformers }: mkDerivation { pname = "hdocs"; - version = "0.4.3.0"; - sha256 = "10z4aq9f3gy6cqkhz0dxp0q3rr9625hka3c4w4cbczad2qgciiil"; + version = "0.4.4.0"; + sha256 = "153rwd1f390j6sjfxx135h3bh80pb8zb5myws9q8d0jkrx2sl198"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson aeson-pretty base bytestring containers filepath ghc + aeson aeson-pretty base bytestring Cabal containers filepath ghc ghc-paths haddock-api haddock-library MonadCatchIO-transformers mtl network process text transformers ]; @@ -63961,6 +64216,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "headergen" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory + , filepath, haskeline, time + }: + mkDerivation { + pname = "headergen"; + version = "0.2.0.0"; + sha256 = "1hc1pmbj9452k4a71iiazxg6id7caf783m08lqnf3flf77cdjxpa"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + aeson aeson-pretty base bytestring directory filepath haskeline + time + ]; + homepage = "https://github.com/aka-bash0r/headergen"; + description = "Creates a header for a haskell source file"; + license = stdenv.lib.licenses.mit; + }) {}; + "heap" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -64057,10 +64331,9 @@ self: { ({ mkDerivation, aeson, base, hedis, scientific, text, time }: mkDerivation { pname = "hedis-config"; - version = "0.0.1"; - sha256 = "1c524klmsl8n6alphxdmwm4hw05hhq3rcyb5540ksnnys77b8y2b"; + version = "0.0.2"; + sha256 = "1ism20ddgcdsypbic6ikalvajq3918wm53ppiic68zaqfzwk9gk2"; buildDepends = [ aeson base hedis scientific text time ]; - jailbreak = true; homepage = "https://bitbucket.org/s9gf4ult/hedis-config"; description = "Easy trivial configuration for Redis"; license = stdenv.lib.licenses.bsd3; @@ -64072,13 +64345,12 @@ self: { }: mkDerivation { pname = "hedis-monadic"; - version = "0.0.3"; - sha256 = "1z80kdm1cs1pk6fpbby20q49ji840zp9xwbynbry2v43g5q18lq6"; + version = "0.0.4"; + sha256 = "1540c4ra65y2kc97n7wxx7rdzf3dkaqqx7r4lwz4qpg3kzfi6q8w"; buildDepends = [ base hedis monad-control mtl transformers transformers-base transformers-compat ]; - jailbreak = true; homepage = "https://bitbucket.org/s9gf4ult/redis-monadic"; description = "A la MonadReader for Redis connection"; license = stdenv.lib.licenses.bsd3; @@ -65011,31 +65283,30 @@ self: { "heyefi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, configurator - , containers, directory, errors, exceptions, filemanip, filepath - , HandsomeSoup, hspec, HTTP, http-types, hxt, iso8601-time - , MissingH, mtl, multipart, old-locale, optparse-applicative - , random, silently, stm, tar, temporary, text, time, transformers - , unix, unordered-containers, utf8-string, wai, warp + , containers, directory, exceptions, filepath, HandsomeSoup, hspec + , http-types, hxt, iso8601-time, MissingH, mtl, multipart + , optparse-applicative, random, silently, stm, tar, temporary, text + , time, transformers, unix, unordered-containers, utf8-string, wai + , warp }: mkDerivation { pname = "heyefi"; - version = "0.1.1.0"; - sha256 = "13m66ix0kmvqwgvqh56mjdwgwpjjqi67hyr6giwhs63fr3wxw3f3"; + version = "0.1.1.1"; + sha256 = "0dm9dyn12jgpc317pk5z3rhhgw2hbmbxyfba97jzq34b5z6crz0f"; isLibrary = false; isExecutable = true; buildDepends = [ - base bytestring case-insensitive configurator directory errors - exceptions filemanip filepath HandsomeSoup HTTP http-types hxt - iso8601-time MissingH mtl multipart old-locale optparse-applicative - random stm tar temporary text time transformers unix - unordered-containers utf8-string wai warp + base bytestring case-insensitive configurator directory exceptions + filepath HandsomeSoup http-types hxt iso8601-time MissingH mtl + multipart optparse-applicative random stm tar temporary text time + transformers unix unordered-containers utf8-string wai warp ]; testDepends = [ base bytestring case-insensitive configurator containers directory - errors exceptions filemanip filepath HandsomeSoup hspec HTTP - http-types hxt iso8601-time MissingH mtl multipart old-locale - optparse-applicative random silently stm tar temporary text time - transformers unix unordered-containers utf8-string wai warp + exceptions filepath HandsomeSoup hspec http-types hxt iso8601-time + MissingH mtl multipart optparse-applicative random silently stm tar + temporary text time transformers unix unordered-containers + utf8-string wai warp ]; homepage = "https://github.com/ryantm/heyefi"; description = "A server for Eye-Fi SD cards"; @@ -65246,6 +65517,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hgearman" = callPackage + ({ mkDerivation, base, binary, bytestring, monad-control, mtl + , network, resource-pool, transformers, transformers-base + , unordered-containers + }: + mkDerivation { + pname = "hgearman"; + version = "0.1.0.2"; + sha256 = "0bfipd7s6czp3aha0jx1yjzfzn8vywiswd07k68q2207j3br8yxk"; + buildDepends = [ + base binary bytestring monad-control mtl network resource-pool + transformers transformers-base unordered-containers + ]; + description = "A Gearman client for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "hgen" = callPackage ({ mkDerivation, base, directory, filepath, hylolib, mtl, random }: mkDerivation { @@ -65612,20 +65900,21 @@ self: { }) {}; "highjson" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, hashable - , hspec, hvect, scientific, text, unordered-containers, vector + ({ mkDerivation, attoparsec, base, buffer-builder, bytestring + , containers, hashable, hspec, hvect, QuickCheck, scientific, text + , unordered-containers, vector }: mkDerivation { pname = "highjson"; - version = "0.1.0.0"; - sha256 = "1j0gcbgawimzr8vvglikmdr8q58zvvak68k8221ljydppanc30k0"; + version = "0.2.0.2"; + sha256 = "07qz7zb53vbpb9ixrw0qwn5qhvgwzvrvfkp343a1cvbb42slpmkz"; buildDepends = [ - attoparsec base bytestring containers hashable hvect scientific - text unordered-containers vector + attoparsec base buffer-builder bytestring containers hashable hvect + scientific text unordered-containers vector ]; - testDepends = [ base hspec text ]; + testDepends = [ base hspec QuickCheck text ]; homepage = "https://github.com/agrafix/highjson"; - description = "Very fast JSON parsing"; + description = "Very fast JSON serialisation and parsing library"; license = stdenv.lib.licenses.mit; }) {}; @@ -66363,8 +66652,8 @@ self: { }: mkDerivation { pname = "hjsmin"; - version = "0.1.4.7"; - sha256 = "1gw9is6piqrqxnrwp8v3vij90icmym58rxqnnklrcjfi3ai7y58f"; + version = "0.1.5.0"; + sha256 = "1mzi7czzw1b8avkfzmsl79hqg57dcrcfp6klzx15drnbl7c1zn7l"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -66376,7 +66665,7 @@ self: { language-javascript QuickCheck test-framework test-framework-hunit text ]; - homepage = "http://github.com/alanz/hjsmin"; + homepage = "http://github.com/erikd/hjsmin"; description = "Haskell implementation of a javascript minifier"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -66564,12 +66853,11 @@ self: { ({ mkDerivation, base, hledger-lib, time }: mkDerivation { pname = "hledger-diff"; - version = "0.2.0.3"; - sha256 = "0m2wbjbihv0zlz2y3khy81xhh2c261fb4wr55csqy22rds73fwy8"; + version = "0.2.0.4"; + sha256 = "1p0b2xc2axsigmbc5lhl12acsjjvn0j8gjlwp3v4ggyanwyj686r"; isLibrary = false; isExecutable = true; buildDepends = [ base hledger-lib time ]; - jailbreak = true; homepage = "https://github.com/gebner/hledger-diff"; description = "Compares the transactions in two ledger files"; license = stdenv.lib.licenses.gpl3; @@ -67145,6 +67433,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hmenu" = callPackage + ({ mkDerivation, base, MissingH, process }: + mkDerivation { + pname = "hmenu"; + version = "0.1.0.1"; + sha256 = "0ym3nzyx1jwcc7m6qj8zchs2q73rj82d7f1r2rvykhns7ca20hrp"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base MissingH process ]; + jailbreak = true; + description = "CLI fuzzy finder and launcher"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hmidi" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -68423,17 +68725,18 @@ self: { }) {}; "hothasktags" = callPackage - ({ mkDerivation, base, cmdargs, containers, cpphs, filepath - , haskell-src-exts + ({ mkDerivation, array, base, containers, cpphs, filepath + , haskell-src-exts, optparse-applicative, split }: mkDerivation { pname = "hothasktags"; - version = "0.3.3"; - sha256 = "1nyr77lm813v521fhhsd3zf7hlpad70g1aj729plrwaxj8c0cizl"; + version = "0.3.4"; + sha256 = "0pnp0xkqk2l29p5kr3kjmxl7hb8g1qd198n36vmfx1x8kc8bahdy"; isLibrary = false; isExecutable = true; buildDepends = [ - base cmdargs containers cpphs filepath haskell-src-exts + array base containers cpphs filepath haskell-src-exts + optparse-applicative split ]; homepage = "http://github.com/luqui/hothasktags"; description = "Generates ctags for Haskell, incorporating import lists and qualified imports"; @@ -68471,6 +68774,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hourglass-fuzzy-parsing" = callPackage + ({ mkDerivation, base, hourglass, parsec }: + mkDerivation { + pname = "hourglass-fuzzy-parsing"; + version = "0.1.0.1"; + sha256 = "188mw1z8n650y3qik98x2m70sr8q66x4l4pg34mirk6kg4mgzy37"; + buildDepends = [ base hourglass parsec ]; + homepage = "https://gitlab.com/doshitan/hourglass-fuzzy-parsing"; + description = "A small library for parsing more human friendly date/time formats"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hp2any-core" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , directory, filepath, network, old-locale, process, time @@ -68862,8 +69177,8 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.1.3"; - sha256 = "1fy2bnk8jlakfgvap9ma5qxyvqgl25dbqk7a7n9m4q0z8ba0s1di"; + version = "2.1.4"; + sha256 = "01848yssmpi0fgkgnlgwmcrmkmpdqc6yc19z91kj46sl187k2k8j"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -69063,8 +69378,8 @@ self: { }: mkDerivation { pname = "hreader"; - version = "0.1.0"; - sha256 = "102i17879ha49yh87i9k5lxrlrjd1fxcb8k8adidqwghbn55dyjc"; + version = "0.2.0"; + sha256 = "1a0zllljfjpz6fwq2h0l5wwl1wg1v68n6r84fs70vnny0c3wl6hg"; buildDepends = [ base exceptions hset mmorph monad-control mtl transformers-base ]; @@ -69094,15 +69409,14 @@ self: { }: mkDerivation { pname = "hruby"; - version = "0.3.1.4"; - sha256 = "0pymwdpdl1xwjcgpblsrfyyib4sz2avxwidgxzr2bac91lhf3fpm"; + version = "0.3.1.5"; + sha256 = "1x9j3rc3kk64l8idkar35ap4y5kxh4abfssd2iphp8dqnjld3jxa"; buildDepends = [ aeson attoparsec base bytestring scientific stm text unordered-containers vector ]; testDepends = [ aeson attoparsec base QuickCheck text vector ]; extraLibraries = [ ruby ]; - jailbreak = true; description = "Embed a Ruby intepreter in your Haskell program !"; license = stdenv.lib.licenses.bsd3; }) { inherit (pkgs) ruby;}; @@ -70330,25 +70644,27 @@ self: { , bin-package-db, bytestring, Cabal, containers, deepseq, directory , exceptions, filepath, fsnotify, ghc, ghc-mod, ghc-paths , haddock-api, haskell-src-exts, hdocs, hlint, HTTP, lens - , monad-loops, MonadCatchIO-transformers, mtl, network, process + , lifted-base, monad-control, monad-loops + , MonadCatchIO-transformers, mtl, network, process , regex-pcre-builtin, scientific, simple-log, system-filepath - , template-haskell, text, time, transformers, uniplate, unix - , unordered-containers, vector + , template-haskell, text, time, transformers, transformers-base + , uniplate, unix, unordered-containers, vector }: mkDerivation { pname = "hsdev"; - version = "0.1.4.0"; - sha256 = "1m7pfrzi23wq7b3bwp4fc885di96gkg453q8xmlwdip37mh2swgz"; + version = "0.1.4.1"; + sha256 = "180xrxamas2fg2366k3cpy7al8mq82d1hgjrs7i1r2s3gr877xz8"; isLibrary = true; isExecutable = true; buildDepends = [ aeson aeson-pretty array attoparsec base bin-package-db bytestring Cabal containers deepseq directory exceptions filepath fsnotify ghc ghc-mod ghc-paths haddock-api haskell-src-exts hdocs hlint HTTP - lens monad-loops MonadCatchIO-transformers mtl network process - regex-pcre-builtin scientific simple-log system-filepath - template-haskell text time transformers uniplate unix - unordered-containers vector + lens lifted-base monad-control monad-loops + MonadCatchIO-transformers mtl network process regex-pcre-builtin + scientific simple-log system-filepath template-haskell text time + transformers transformers-base uniplate unix unordered-containers + vector ]; testDepends = [ base ]; jailbreak = true; @@ -70508,8 +70824,8 @@ self: { ({ mkDerivation, base, HUnit, mtl }: mkDerivation { pname = "hset"; - version = "1.0.1"; - sha256 = "1iix3syq0cvpiwf6qr6hvcxii6qlzwqcnm416pvndcm7ymkhw04v"; + version = "1.1.0"; + sha256 = "15ls3wkk29mf2nyrm80dcmg66q0dd0srgwyv46ix3zkaxs239mbl"; buildDepends = [ base mtl ]; testDepends = [ base HUnit mtl ]; homepage = "https://bitbucket.org/s9gf4ult/hset"; @@ -70523,8 +70839,8 @@ self: { }: mkDerivation { pname = "hsexif"; - version = "0.6.0.3"; - sha256 = "02jpp2p8xmhmx6srpcm330k73x306h34ik2rdavfwpgw5mjk88hl"; + version = "0.6.0.4"; + sha256 = "0k9a6d6c2n0x5g6vls4848gydnvw790lf1nyy5piz1rdzsd6bx3k"; buildDepends = [ base binary bytestring containers iconv text time ]; @@ -71151,8 +71467,8 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.1.8"; - sha256 = "0nfg9pmlvp8gnllfx01sfslhznjs5xa432ag9s2q2r7c17bxfnwf"; + version = "2.1.10"; + sha256 = "0m51afa2n187jjx0fwarg11chakhv3z7fbmqq5rr7j60d9ix9ypq"; buildDepends = [ base hspec-core hspec-discover hspec-expectations HUnit QuickCheck transformers @@ -71197,17 +71513,13 @@ self: { }) {}; "hspec-contrib" = callPackage - ({ mkDerivation, base, hspec, hspec-core, HUnit, logging-facade - , QuickCheck - }: + ({ mkDerivation, base, hspec, hspec-core, HUnit, QuickCheck }: mkDerivation { pname = "hspec-contrib"; - version = "0.2.2"; - sha256 = "1jdiv41kf73x8rygj7439wrgm345qlfbkshhdy8ikrqs1k43grw6"; - buildDepends = [ base hspec-core HUnit logging-facade ]; - testDepends = [ - base hspec hspec-core HUnit logging-facade QuickCheck - ]; + version = "0.3.0"; + sha256 = "006syw8xagfhsx06ws9ywig1qx5lk4cgl7sq6pbid1s64c72mxn4"; + buildDepends = [ base hspec-core HUnit ]; + testDepends = [ base hspec hspec-core HUnit QuickCheck ]; homepage = "http://hspec.github.io/"; description = "Contributed functionality for Hspec"; license = stdenv.lib.licenses.mit; @@ -71221,8 +71533,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.1.8"; - sha256 = "07jhiw0492xcgiidpyizqwaqjja23m35179s12vb54gw4xbh7b6q"; + version = "2.1.10"; + sha256 = "1q0fnag7lw54zf6aj55cckcfzs5ykpc841bczap6q9gnwrvpwbk8"; buildDepends = [ ansi-terminal async base deepseq hspec-expectations HUnit QuickCheck quickcheck-io random setenv tf-random time transformers @@ -71241,8 +71553,8 @@ self: { ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { pname = "hspec-discover"; - version = "2.1.8"; - sha256 = "1pyk901rngv1yv4p502qcbbhhw6sgdsdmdwxk1f5r1s7gkvbd9n4"; + version = "2.1.10"; + sha256 = "02qs0y7nn8wczjjs606d8ivixxib0024kny2al6mgvxyp524xcgg"; isLibrary = true; isExecutable = true; buildDepends = [ base directory filepath ]; @@ -71256,8 +71568,8 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "hspec-expectations"; - version = "0.7.0"; - sha256 = "1gzjnmhi6ia2p5i5jlnj4586rkml5af8f7ijgipzs6fczpx7ds4l"; + version = "0.7.1"; + sha256 = "0n52k7qwqc5awig08fvajvymb9bb235q6pp8w0cbcb9a96rwdjmg"; buildDepends = [ base HUnit ]; homepage = "https://github.com/sol/hspec-expectations#readme"; description = "Catchy combinators for HUnit"; @@ -71718,6 +72030,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) { qt5 = null;}; + "hsqml-datamodel" = callPackage + ({ mkDerivation, base, hsqml, qt5, template-haskell, text }: + mkDerivation { + pname = "hsqml-datamodel"; + version = "0.0.0.1"; + sha256 = "16q92q00q96kyg41xh8smp5vvkvlfrps6nj7ds1y09msdqvihw9v"; + buildDepends = [ base hsqml template-haskell text ]; + pkgconfigDepends = [ qt5 ]; + homepage = "https://github.com/marcinmrotek/hsqml-datamodel"; + description = "HsQML (Qt5) data model"; + license = stdenv.lib.licenses.bsd3; + }) { qt5 = null;}; + + "hsqml-datamodel-vinyl" = callPackage + ({ mkDerivation, base, exceptions, hsqml-datamodel, type-list + , vinyl + }: + mkDerivation { + pname = "hsqml-datamodel-vinyl"; + version = "0.1.0.0"; + sha256 = "0jg3jl1h4jf92vazyf7wb88dhrl89zm9hh21hymzy3pnc5kssd91"; + buildDepends = [ base exceptions hsqml-datamodel type-list vinyl ]; + homepage = "https://github.com/marcinmrotek/hsqml-datamodel-vinyl"; + description = "HsQML DataModel instances for Vinyl Rec"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hsqml-demo-morris" = callPackage ({ mkDerivation, base, containers, deepseq, directory, hsqml , OddWord, text @@ -72204,8 +72543,8 @@ self: { }) {}; "htar" = callPackage - ({ mkDerivation, base, bytestring, bzlib, directory, filepath - , old-locale, tar, time, zlib + ({ mkDerivation, base, bytestring, bzlib, directory, filepath, tar + , time, zlib }: mkDerivation { pname = "htar"; @@ -72214,9 +72553,8 @@ self: { isLibrary = false; isExecutable = true; buildDepends = [ - base bytestring bzlib directory filepath old-locale tar time zlib + base bytestring bzlib directory filepath tar time zlib ]; - jailbreak = true; description = "Command-line tar archive utility"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -72584,8 +72922,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.4.18"; - sha256 = "0skla9kvlak482fsk21gz57jcwc568x3q62nkanxjn1pgxc1jili"; + version = "0.4.18.1"; + sha256 = "0v0mmsbh8hgzkxyg7gkn3dlq5l21ljzbxr9c3wmmz6viwhhabfv9"; buildDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie data-default-class deepseq @@ -72759,8 +73097,8 @@ self: { }: mkDerivation { pname = "http-conduit"; - version = "2.1.7.1"; - sha256 = "15caswd172i8hzwmxsd3rynnfz96v5iqg9avv1ybydikvvgbqx56"; + version = "2.1.7.2"; + sha256 = "0inw95a2vdmsffh3ns1kh8hr7xrx2pbgdrq0yv68bwf1v4sd1mfc"; buildDepends = [ base bytestring conduit http-client http-client-tls http-types lifted-base monad-control mtl resourcet transformers @@ -72904,19 +73242,20 @@ self: { }) {}; "http-link-header" = callPackage - ({ mkDerivation, attoparsec, base, errors, hspec, hspec-attoparsec - , network-uri, QuickCheck, text + ({ mkDerivation, attoparsec, base, bytestring-conversion, errors + , hspec, hspec-attoparsec, network-uri, QuickCheck, text }: mkDerivation { pname = "http-link-header"; - version = "0.1.0"; - sha256 = "1lcl0ylj8lq0i2b806k1yqvzbv9dg1m4ka9bmvmhz4z78kiahck1"; - buildDepends = [ attoparsec base errors network-uri text ]; + version = "0.2.0"; + sha256 = "0vdmb0w7ppss8lffdghn9d2vjawn6nvhx7cx1dcvl4fllxfiaihc"; + buildDepends = [ + attoparsec base bytestring-conversion errors network-uri text + ]; testDepends = [ base hspec hspec-attoparsec QuickCheck text ]; - jailbreak = true; homepage = "https://github.com/myfreeweb/http-link-header"; description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\""; - license = stdenv.lib.licenses.asl20; + license = stdenv.lib.licenses.publicDomain; }) {}; "http-media" = callPackage @@ -73150,8 +73489,8 @@ self: { }: mkDerivation { pname = "http2"; - version = "1.0.2"; - sha256 = "0wkzphzxzzvqm947l759vxnl6g60nrx7jygyxdlxfgxi51fd7gap"; + version = "1.0.3"; + sha256 = "075j4xhfmgiij431zn5mzmq6m40fj74l5f5wckqa22aq2ay19p8c"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -74511,18 +74850,17 @@ self: { }: mkDerivation { pname = "hyperloglog"; - version = "0.3.3.1"; - sha256 = "1ns0vz80byssmi39mgdkprpwy26szbmfqqzs1lb6amqf7nx4i14l"; + version = "0.3.4"; + sha256 = "122qdkg1xwyhbxll5zimp8w6j79i30102g3iqf41lrbrx0xllpag"; buildDepends = [ approximate base binary bits bytes cereal cereal-vector comonad - deepseq distributive generic-deriving hashable hashable-extras lens - reflection safecopy semigroupoids semigroups siphash tagged vector + deepseq distributive hashable hashable-extras lens reflection + safecopy semigroupoids semigroups siphash tagged vector ]; testDepends = [ base directory doctest filepath generic-deriving semigroups simple-reflect ]; - jailbreak = true; homepage = "http://github.com/analytics/hyperloglog"; description = "An approximate streaming (constant space) unique object counter"; license = stdenv.lib.licenses.bsd3; @@ -74560,14 +74898,16 @@ self: { }) {}; "hyphenation" = callPackage - ({ mkDerivation, base, containers, directory, doctest, filepath - , unordered-containers + ({ mkDerivation, base, bytestring, containers, directory, doctest + , filepath, unordered-containers, zlib }: mkDerivation { pname = "hyphenation"; - version = "0.5"; - sha256 = "10xw74d1q2kz8mv8gspa9amgax5a864iz9jxihyjcs9x1pgh762a"; - buildDepends = [ base containers unordered-containers ]; + version = "0.6"; + sha256 = "1xqj4na1gm40ssirc4k70r27bzxhg2dkiipp48a5hqwgq5k3crrg"; + buildDepends = [ + base bytestring containers unordered-containers zlib + ]; testDepends = [ base containers directory doctest filepath unordered-containers ]; @@ -74722,14 +75062,14 @@ self: { }) {}; "ib-api" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, network }: + ({ mkDerivation, attoparsec, base, bytestring, network, unix }: mkDerivation { pname = "ib-api"; - version = "0.1.0.0"; - revision = "1"; - sha256 = "1030bj90myx5x3y297qmlmnzppfnh5d3cmwglqj1s7i6nyrh86k5"; - editedCabalFile = "7cb1fe96767e6253ef55d4997404eb3f4048f1b9bfccfb9e6cca627a734c3bcd"; - buildDepends = [ attoparsec base bytestring network ]; + version = "0.1.0.1"; + sha256 = "0zswsb7mvbm8zycb14sks2kvg4jy2wn3vc7z6lb00s0alm1v0srk"; + isLibrary = true; + isExecutable = true; + buildDepends = [ attoparsec base bytestring network unix ]; jailbreak = true; homepage = "https://github.com/rbermani/ib-api"; description = "An API for the Interactive Brokers Trading Workstation written in pure Haskell"; @@ -75104,8 +75444,8 @@ self: { }: mkDerivation { pname = "ig"; - version = "0.3"; - sha256 = "1sg1dbwjvhixy7qgchg6a2nh76jyp3qlwancj3fcn7c87fmhxdqg"; + version = "0.3.1"; + sha256 = "0ggr6h5inwwxvqs9qywiagi1c5bx1vky5h0zvhz0df88nbfd3d21"; buildDepends = [ aeson base base16-bytestring bytestring conduit conduit-extra crypto-api cryptohash cryptohash-cryptoapi data-default @@ -76107,20 +76447,20 @@ self: { }) {}; "informative" = callPackage - ({ mkDerivation, base, csv, highlighting-kate, http-conduit - , monad-logger, pandoc, persistent, persistent-postgresql - , shakespeare, text, time, time-locale-compat, yesod, yesod-auth - , yesod-core, yesod-form + ({ mkDerivation, base, containers, csv, highlighting-kate + , http-conduit, monad-logger, pandoc, persistent + , persistent-postgresql, shakespeare, text, time + , time-locale-compat, yesod, yesod-auth, yesod-core, yesod-form }: mkDerivation { pname = "informative"; - version = "0.1.0.7"; - sha256 = "0xzckvbscs3946y7sscx15mixyh3xhahjmwli72311gmyxkf767y"; + version = "0.1.0.20"; + sha256 = "1xglpqwr4bc7rqaspq7w6pc9g5ilzvxfb6lfkji3inagg5xksl7n"; isLibrary = true; isExecutable = true; buildDepends = [ - base csv highlighting-kate http-conduit monad-logger pandoc - persistent persistent-postgresql shakespeare text time + base containers csv highlighting-kate http-conduit monad-logger + pandoc persistent persistent-postgresql shakespeare text time time-locale-compat yesod yesod-auth yesod-core yesod-form ]; jailbreak = true; @@ -76147,8 +76487,8 @@ self: { }: mkDerivation { pname = "inilist"; - version = "0.1.0.0"; - sha256 = "18f93kvc5x0y1wqcicrh510r3skldf52jn0n6cxyn7fk2271cc1b"; + version = "0.2.0.0"; + sha256 = "1rr71yajc6j0idsqgna8mbnawiv6iw1x8kswkv7x2l0ih89r6y3a"; buildDepends = [ base bifunctors containers safe trifecta ]; testDepends = [ base bifunctors containers deepseq HUnit safe tasty tasty-hunit @@ -76337,7 +76677,9 @@ self: { mkDerivation { pname = "instant-generics"; version = "0.5"; + revision = "1"; sha256 = "174avn0jjxv4h04m6k85gvv6x3kvrlwhcbhqg9ih0ps5mp7crmvr"; + editedCabalFile = "c69a74fef28272e5e46a0e37711bb980ac07d2f3feeed3513da1cc572a1ab6bc"; buildDepends = [ base containers syb template-haskell ]; homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics"; description = "Generic programming library with a sum of products view"; @@ -76361,8 +76703,11 @@ self: { mkDerivation { pname = "instant-zipper"; version = "0.0.0"; + revision = "1"; sha256 = "0gd5hzlm5rlmzba2dl37al711vp1nn2b30d36rvb2j8y90y8c44c"; + editedCabalFile = "a0e15510d3e3eefaa18d20fbfce7a1840519e160e2a8a8b36c498a3664b9c037"; buildDepends = [ base instant-generics mtl ]; + jailbreak = true; description = "Heterogenous Zipper in Instant Generics"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -76715,13 +77060,22 @@ self: { }) {}; "invariant" = callPackage - ({ mkDerivation, base, contravariant, hspec, QuickCheck }: + ({ mkDerivation, array, base, bifunctors, containers, contravariant + , ghc-prim, hspec, profunctors, QuickCheck, semigroups, stm, tagged + , template-haskell, transformers, transformers-compat + , unordered-containers + }: mkDerivation { pname = "invariant"; - version = "0.1.2"; - sha256 = "02p114wnpxbqxik4sz87bd9rcqfs9klgsxi9pc4v1qwyb64mb92b"; - buildDepends = [ base contravariant ]; + version = "0.2"; + sha256 = "0zxzpbha3z4z23xmsbgajjxk477ad1v28ml3rry0102lpcpvl6j1"; + buildDepends = [ + array base bifunctors containers contravariant ghc-prim profunctors + semigroups stm tagged template-haskell transformers + transformers-compat unordered-containers + ]; testDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/nfrisby/invariant-functors"; description = "Haskell 98 invariant functors"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -76841,8 +77195,8 @@ self: { }: mkDerivation { pname = "io-streams"; - version = "1.3.1.0"; - sha256 = "1fic83lgvyji75gyx8c9ik9lj6jf65wbqmzp30siqmkhdp9y1rxf"; + version = "1.3.2.0"; + sha256 = "0gqj2adc3zlwz81wy38y8x4rihvhk4zm9xb0rd04a77nn15xlc0y"; buildDepends = [ attoparsec base bytestring bytestring-builder network primitive process text time transformers vector zlib-bindings @@ -76854,7 +77208,6 @@ self: { time transformers vector zlib zlib-bindings ]; configureFlags = [ "-fnointeractivetests" ]; - jailbreak = true; description = "Simple, composable, and easy-to-use stream I/O"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -77162,15 +77515,15 @@ self: { }: mkDerivation { pname = "irc-client"; - version = "0.2.3.1"; - sha256 = "1i5wsqkz8b0h3vc4xjb1n7dqjhqqlka1pchhwax9w9lvnhw5wl9v"; + version = "0.2.4.0"; + sha256 = "137ix1x2qy92v5naaq3lz3iyvbxvf32gnsq09flddadx88d51vv6"; buildDepends = [ base bytestring conduit data-default-class irc-conduit irc-ctcp old-locale stm stm-conduit text time transformers ]; homepage = "https://github.com/barrucadu/irc-client"; description = "An IRC client library"; - license = "unknown"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -77192,15 +77545,15 @@ self: { }: mkDerivation { pname = "irc-conduit"; - version = "0.1.1.2"; - sha256 = "1ib75a7dp9f6v7zl51a5z1pvv0vpll6czf5i8zad7ajn3q9d4z3p"; + version = "0.1.2.0"; + sha256 = "1mw418frhbnk7gncilvb2c3cj4fvzm5fvafq0p28vggxisda9bkp"; buildDepends = [ async base bytestring conduit conduit-extra connection irc irc-ctcp network-conduit-tls text time tls transformers x509-validation ]; homepage = "https://github.com/barrucadu/irc-conduit"; description = "Streaming IRC message library using conduits"; - license = "unknown"; + license = stdenv.lib.licenses.mit; }) {}; "irc-core" = callPackage @@ -77234,14 +77587,12 @@ self: { ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "irc-ctcp"; - version = "0.1.2.1"; - revision = "1"; - sha256 = "1bpn9i9mqmhiif6mhw6q9nzy5cwx1x1yh81216gkqc5gi43gsc5s"; - editedCabalFile = "23e92ff7cad332b34f89273fe543e9b8b87a19b30fb1a18fad61c9c3952d0dce"; + version = "0.1.3.0"; + sha256 = "16mp9dpp57id760zc932dszd5r1ncskwwxrp0djka5r1alddjz6n"; buildDepends = [ base bytestring text ]; homepage = "https://github.com/barrucadu/irc-ctcp"; description = "A CTCP encoding and decoding library for IRC clients"; - license = "unknown"; + license = stdenv.lib.licenses.mit; }) {}; "irc-fun-color" = callPackage @@ -79287,19 +79638,22 @@ self: { }) {}; "kademlia" = callPackage - ({ mkDerivation, base, bytestring, containers, mtl, network, stm + ({ mkDerivation, base, bytestring, containers, HUnit, mtl, network + , QuickCheck, stm, tasty, tasty-hunit, tasty-quickcheck , transformers, transformers-compat }: mkDerivation { pname = "kademlia"; - version = "1.0.0.0"; - revision = "1"; - sha256 = "0f1kwflpizabzyal3x3p9sra3kxlgm2m14xfxnl4k3bndmj02sdb"; - editedCabalFile = "2553e98d53372b8d4947c115dd696e33f526f0304e9ed39566e6beec276ca641"; + version = "1.1.0.0"; + sha256 = "0wjyslrhbms6cnm495g40yl6365h3vgjcka12lka8xdy89v3c0yy"; buildDepends = [ base bytestring containers mtl network stm transformers transformers-compat ]; + testDepends = [ + base bytestring containers HUnit mtl network QuickCheck stm tasty + tasty-hunit tasty-quickcheck transformers transformers-compat + ]; homepage = "https://github.com/froozen/kademlia"; description = "An implementation of the Kademlia DHT Protocol"; license = stdenv.lib.licenses.bsd3; @@ -79887,15 +80241,14 @@ self: { , conduit-extra, containers, data-default, directory, filepath , fsnotify, hspec, http-client, http-conduit, http-reverse-proxy , http-types, HUnit, lifted-base, mtl, network, process, random - , regex-tdfa, stm, system-filepath, tar, template-haskell, text - , time, transformers, unix, unix-compat, unordered-containers - , vector, wai, wai-app-static, wai-extra, warp, warp-tls, yaml - , zlib + , regex-tdfa, stm, tar, template-haskell, text, time, transformers + , unix, unix-compat, unordered-containers, vector, wai + , wai-app-static, wai-extra, warp, warp-tls, yaml, zlib }: mkDerivation { pname = "keter"; - version = "1.4.2.1"; - sha256 = "1xwnprbmssvvymwyvcgczlsldplr2va53mzdphqs6969xhhpahh3"; + version = "1.4.3.1"; + sha256 = "0bsq6z7krisshcrkb528kixiw6liabb7chgk87088vn3gpwx048i"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -79903,9 +80256,9 @@ self: { case-insensitive conduit conduit-extra containers data-default directory filepath fsnotify http-client http-conduit http-reverse-proxy http-types lifted-base mtl network process - random regex-tdfa stm system-filepath tar template-haskell text - time transformers unix unix-compat unordered-containers vector wai - wai-app-static wai-extra warp warp-tls yaml zlib + random regex-tdfa stm tar template-haskell text time transformers + unix unix-compat unordered-containers vector wai wai-app-static + wai-extra warp warp-tls yaml zlib ]; testDepends = [ base bytestring conduit hspec HUnit transformers unix @@ -80194,14 +80547,14 @@ self: { }) {}; "kmeans-vector" = callPackage - ({ mkDerivation, base, mtl, QuickCheck, vector }: + ({ mkDerivation, base, mtl, probable, vector }: mkDerivation { pname = "kmeans-vector"; - version = "0.3"; - sha256 = "0n957b7pcq3v8kf4507crbrd172mv9g14p5hmpalfjzlpb3b5ll1"; + version = "0.3.2"; + sha256 = "1ckw3dmwwqzgbl0wcd6h435afjddqmim3y19p2wqcghxd2rk8bdv"; isLibrary = true; isExecutable = true; - buildDepends = [ base mtl QuickCheck vector ]; + buildDepends = [ base mtl probable vector ]; homepage = "http://github.com/alpmestan/kmeans-vector"; description = "An implementation of the kmeans clustering algorithm based on the vector package"; license = stdenv.lib.licenses.bsd3; @@ -80323,6 +80676,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "kraken" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client + , http-client-tls, mtl + }: + mkDerivation { + pname = "kraken"; + version = "0.0.1"; + sha256 = "1df6g65wrhzfz3kj9n4bcja09adr4qhl3kzv5vaxl37lbr9nwzr2"; + buildDepends = [ + aeson base bytestring http-client http-client-tls mtl + ]; + description = "Kraken.io API client"; + license = stdenv.lib.licenses.mit; + }) {}; + "krpc" = callPackage ({ mkDerivation, base, bencoding, bytestring, containers , data-default-class, hspec, lifted-base, monad-control @@ -80634,8 +81002,8 @@ self: { ({ mkDerivation, base, containers, mtl, read-bounded }: mkDerivation { pname = "lambda-options"; - version = "0.7.0.0"; - sha256 = "0y8q9k3lk71703qzm0bvqh30y7r5ms392gfzh2lcrqkr0mhlf89j"; + version = "0.8.0.0"; + sha256 = "1z9gmps06w458v8i3zpkalby83p367r3z9i0c312jxl0zp51q891"; buildDepends = [ base containers mtl read-bounded ]; jailbreak = true; homepage = "https://github.com/thomaseding/lambda-options"; @@ -80738,8 +81106,8 @@ self: { }: mkDerivation { pname = "lambdabot"; - version = "5.0.2.2"; - sha256 = "148s2qlwcs7g89a77xv07yjyjrcnd6x7alvghbldvv4p067f0n86"; + version = "5.0.3"; + sha256 = "1kbrmxz5604jzcx9l6j4lmbb0xqz2cmj0f30nmpzdkmzsqv1hfj2"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -80763,8 +81131,8 @@ self: { }: mkDerivation { pname = "lambdabot-core"; - version = "5.0.1"; - sha256 = "06asm62k2nb32yr0z4sw70z0r4ikakgkph6zqhjw7wj14ic2nxbk"; + version = "5.0.3"; + sha256 = "12gawsimdqch61rh4zwvzrx6pqx8yd645wqpki8dr56wnmbhbr03"; buildDepends = [ base binary bytestring containers dependent-map dependent-sum dependent-sum-template directory edit-distance filepath haskeline @@ -80789,8 +81157,8 @@ self: { }: mkDerivation { pname = "lambdabot-haskell-plugins"; - version = "5.0.2.1"; - sha256 = "06jcx3qp87fk58cvnwljr4zyvlqcsfrq0nxg2m67kd2imyg10iyd"; + version = "5.0.3"; + sha256 = "0iya4zipjjaqrld0a1v334praw1vnw186scfsi6inqdg314jc7x1"; buildDepends = [ array arrows base bytestring containers data-memocombinators directory filepath haskell-src-exts hoogle HTTP IOSpec @@ -80799,7 +81167,6 @@ self: { parsec pretty process QuickCheck regex-tdfa show split syb transformers utf8-string vector-space ]; - jailbreak = true; homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot Haskell plugins"; license = "GPL"; @@ -80813,8 +81180,8 @@ self: { }: mkDerivation { pname = "lambdabot-irc-plugins"; - version = "5.0.1"; - sha256 = "13ybjyx5x84g0w7l2yyni5yary59j4kpaqc4pl1942bp6y7lbfrp"; + version = "5.0.3"; + sha256 = "1v4zh2yjdgy9ix6dmxdh8j5iqyrixaln78c5jgpiyjcwgi17blrw"; buildDepends = [ base bytestring containers directory filepath lambdabot-core lifted-base mtl network SafeSemaphore split time @@ -80854,8 +81221,8 @@ self: { }: mkDerivation { pname = "lambdabot-novelty-plugins"; - version = "5.0.2.1"; - sha256 = "07zx59jfsdq7lbfmfq9l3xbbdm0fhzidi5vcripfp5wry8xshn5y"; + version = "5.0.3"; + sha256 = "086y8p92a8g2zjjkxj1ny4s1dlza2dz1v64g3jg7p0dz1n1s1jpy"; buildDepends = [ base binary brainfuck bytestring containers dice directory lambdabot-core misfortune process random-fu regex-tdfa unlambda @@ -80873,13 +81240,12 @@ self: { }: mkDerivation { pname = "lambdabot-reference-plugins"; - version = "5.0.2.1"; - sha256 = "0xg70m58n03lym8z3lsf0mh634xwb48sj39cfydsacdn5gx0i8kc"; + version = "5.0.3"; + sha256 = "1yw1l0jl4iym2q2lfgzcmxm8865av37kf7zji0f7in2phqs3r1zz"; buildDepends = [ base bytestring containers HTTP lambdabot-core mtl network network-uri oeis process regex-tdfa split tagsoup utf8-string ]; - jailbreak = true; homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot reference plugins"; license = "GPL"; @@ -80988,8 +81354,8 @@ self: { }: mkDerivation { pname = "lambdacms-media"; - version = "0.3.0.1"; - sha256 = "074bghfbi3m4ffla34z0yq2qgbw3ps81fq2cm8ibqry3bps511xp"; + version = "0.4.0.0"; + sha256 = "0vq32qppnasc24jrjh6c19hr2pxby65c5m5k90fk7afyms307b5c"; buildDepends = [ base directory filepath lambdacms-core persistent shakespeare text time yesod yesod-form @@ -81554,8 +81920,8 @@ self: { }: mkDerivation { pname = "language-javascript"; - version = "0.5.13.3"; - sha256 = "069spax169v0qq5axwccgxdmiyjlnjg1bhzqh09dp5yx9w5fk47x"; + version = "0.5.14.2"; + sha256 = "0inm6yncl5dv9ij3fyk38c6mad8fm1vqs70rpqi1a7w2n5cbv1ia"; buildDepends = [ array base blaze-builder bytestring containers mtl utf8-string ]; @@ -81565,7 +81931,7 @@ self: { utf8-string ]; buildTools = [ alex happy ]; - homepage = "http://github.com/alanz/language-javascript"; + homepage = "http://github.com/erikd/language-javascript"; description = "Parser for JavaScript"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -81836,14 +82202,19 @@ self: { }) {}; "language-thrift" = callPackage - ({ mkDerivation, base, mtl, parsers, text, trifecta }: + ({ mkDerivation, base, hspec, hspec-discover, mtl, parsers + , QuickCheck, text, trifecta, wl-pprint + }: mkDerivation { pname = "language-thrift"; - version = "0.2.0.0"; - sha256 = "01wvpm4aa222ic8z6wg0wdjyfnkd8gh2kqsda7qfckcyxs9679qw"; - buildDepends = [ base mtl parsers text trifecta ]; + version = "0.4.0.0"; + sha256 = "0al6a9j9hwla8kyfw30m9ylw4wzxv0nr3nvri8w9wnh6ckaf5j2w"; + buildDepends = [ base mtl parsers text trifecta wl-pprint ]; + testDepends = [ + base hspec hspec-discover QuickCheck text trifecta wl-pprint + ]; homepage = "https://github.com/abhinav/language-thrift"; - description = "Parser for the Thrift IDL format"; + description = "Parser and pretty printer for the Thrift IDL format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -82382,6 +82753,7 @@ self: { leksah-server ltk monad-loops QuickCheck stm text transformers webkitgtk3 ]; + jailbreak = true; homepage = "http://www.leksah.org"; description = "Haskell IDE written in Haskell"; license = "GPL"; @@ -82449,10 +82821,8 @@ self: { }: mkDerivation { pname = "lens"; - version = "4.12.1"; - revision = "1"; - sha256 = "0rzi0z5vz78v99f1hk8izixhxf3linz3xjkancg8x65g03brwl33"; - editedCabalFile = "fedce7a783a5a622bb19e00145e775ff8ea7d797f71fd22c9eb2257672b7f741"; + version = "4.12.3"; + sha256 = "0898z1ws9sy77yfhvx5did0pibpp81yxz0jg418gdx3znd39vyj8"; buildDepends = [ array base base-orphans bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim @@ -82682,8 +83052,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "0.1.2.7"; - sha256 = "1g3if2y41li6wyg7ffvpybqvbywiq8bf5b5fb6pz499hinzahb9d"; + version = "0.1.3.1"; + sha256 = "19zjwkj9is5fdayvwf6w8r42z0lyrbj2lqqw822zr87xaq96r2g2"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -83280,13 +83650,13 @@ self: { }) {}; "libpafe" = callPackage - ({ mkDerivation, base, bytestring, iconv, pafe }: + ({ mkDerivation, base, bytestring, iconv, pafe, transformers }: mkDerivation { pname = "libpafe"; - version = "0.1.0.0"; - sha256 = "1qb67zb7fh582ws1j1hi704dkzp7am0jjxjnab29kpm6i3xmzprk"; - buildDepends = [ base ]; - testDepends = [ base bytestring iconv ]; + version = "0.1.1.0"; + sha256 = "1l2s98y805mgxnwy2jvrab65gz1aq5zf48rqk88nclb97w04lnws"; + buildDepends = [ base transformers ]; + testDepends = [ base bytestring iconv transformers ]; extraLibraries = [ pafe ]; jailbreak = true; description = "Wrapper for libpafe"; @@ -83483,10 +83853,9 @@ self: { ({ mkDerivation, base, bytestring, cpu }: mkDerivation { pname = "libvorbis"; - version = "0.1.0.0"; - sha256 = "1rl8hqbidxj34j3m8nwy32a9fnbzand726zvyljkgpjfkg1mfb2c"; + version = "0.1.0.1"; + sha256 = "0ykv2jv559yalypadwnvpzv87rksn24b4h8qi9x1x6r2x4kbwvrl"; buildDepends = [ base bytestring cpu ]; - jailbreak = true; homepage = "https://github.com/the-real-blackh/libvorbis"; description = "Haskell binding for libvorbis, for decoding Ogg Vorbis audio files"; license = stdenv.lib.licenses.bsd3; @@ -85132,6 +85501,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "located-base" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "located-base"; + version = "0.1.0.0"; + sha256 = "0jb4ziagvbvgaihgw9ajsni0nylqbh5hw3q4dw561qmx2msjjfpj"; + buildDepends = [ base ]; + jailbreak = true; + homepage = "http://github.com/gridaphobe/located-base"; + description = "Location-aware variants of partial functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "locators" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, cryptohash , hspec, hspec-expectations, HUnit, QuickCheck @@ -85247,18 +85629,16 @@ self: { }: mkDerivation { pname = "log-domain"; - version = "0.10.1.1"; - sha256 = "084mzaha7g00yxxy4hgl2dia73hzch91961gjvrb20wv6zxf8f7g"; + version = "0.10.2"; + sha256 = "0v91xilbgw0cym43fn5abz5ljrxz8anfj1w5x6nzp1qcqcwgwcg4"; buildDepends = [ - base binary bytes cereal comonad deepseq distributive - generic-deriving hashable hashable-extras safecopy semigroupoids - semigroups vector + base binary bytes cereal comonad deepseq distributive hashable + hashable-extras safecopy semigroupoids semigroups vector ]; testDepends = [ base directory doctest filepath generic-deriving semigroups simple-reflect ]; - jailbreak = true; homepage = "http://github.com/analytics/log-domain/"; description = "Log-domain arithmetic"; license = stdenv.lib.licenses.bsd3; @@ -85849,6 +86229,7 @@ self: { base Cabal containers filepath ghc glib gtk3 mtl parsec pretty text transformers ]; + jailbreak = true; homepage = "http://www.leksah.org"; description = "Leksah tool kit"; license = "GPL"; @@ -86224,6 +86605,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) { inherit (pkgs) lzma;}; + "lzma-streams" = callPackage + ({ mkDerivation, base, bytestring, HUnit, io-streams, lzma + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "lzma-streams"; + version = "0.0.0.0"; + sha256 = "0klgi097b8mky989hfzn3kk3r25yq1p0sjna4r68k7z9y143yzm2"; + buildDepends = [ base bytestring io-streams ]; + testDepends = [ + base bytestring HUnit io-streams QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + extraLibraries = [ lzma ]; + homepage = "https://github.com/hvr/lzma-streams"; + description = "IO-Streams interface for lzma/xz compression"; + license = stdenv.lib.licenses.bsd3; + }) { inherit (pkgs) lzma;}; + "maam" = callPackage ({ mkDerivation, base, Cabal, containers, directory, ghc , template-haskell, text @@ -86575,8 +86976,8 @@ self: { ({ mkDerivation, base, containers, srcloc, text }: mkDerivation { pname = "mainland-pretty"; - version = "0.4.0.0"; - sha256 = "1nym3qiyjgag6jpra1cfm8b722h8ghi0f2dv74y6migzqh768myl"; + version = "0.4.1.0"; + sha256 = "0r8xhlbpws6wq305dv3z074d7492jif9dsscz4sjbwvh5dk4x1zl"; buildDepends = [ base containers srcloc text ]; homepage = "http://www.cs.drexel.edu/~mainland/"; description = "Pretty printing designed for printing source code"; @@ -88507,31 +88908,59 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microformats2-parser" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, containers + , data-default, either, hspec, html-conduit, microformats2-types + , network, options, pcre-heavy, raw-strings-qq, safe, scotty + , streaming-commons, stringable, template-haskell, text, time + , wai-extra, warp, xml-lens, xss-sanitize + }: + mkDerivation { + pname = "microformats2-parser"; + version = "0.1.1"; + sha256 = "0n4clyzaw2a9vi0qcf6f2pdp7wckl3z84sfjqdj8k4dbp1qnwl55"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base blaze-html blaze-markup containers data-default either + html-conduit microformats2-types network options pcre-heavy safe + scotty streaming-commons stringable text time wai-extra warp + xml-lens xss-sanitize + ]; + testDepends = [ + base data-default hspec html-conduit microformats2-types + raw-strings-qq template-haskell time xml-lens + ]; + homepage = "https://github.com/myfreeweb/microformats2-parser"; + description = "A Microformats 2 parser"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "microformats2-types" = callPackage ({ mkDerivation, aeson, base, data-default-class, pandoc-types , setters, text, time }: mkDerivation { pname = "microformats2-types"; - version = "0.4.0"; - sha256 = "020193sbvg5arha9pvbc88wqrqyvshy19kz02knkh5kv0dzqngf6"; + version = "0.4.1"; + sha256 = "1p2s2g78bnqbcf0www0x11pz5nyxjfac7q7sbd2qfn1v777ylv7b"; buildDepends = [ aeson base data-default-class pandoc-types setters text time ]; homepage = "https://github.com/myfreeweb/microformats2-types"; description = "Microformats 2 types (with Aeson instances)"; - license = "unknown"; + license = stdenv.lib.licenses.publicDomain; }) {}; "microlens" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "microlens"; - version = "0.1.0.0"; - sha256 = "173ak9flxdpck7q5b3r38bpgbiv9mzmiz89y3f1wn0wz3q957p44"; + version = "0.1.3.0"; + sha256 = "1ryjxc3qa583ryp9sig3rjjr3dpv9sx2ybag4qrlkwja1dz8r2dm"; buildDepends = [ base ]; homepage = "http://github.com/aelve/microlens"; - description = "A tiny part of the ‘lens’ library which you can depend upon"; + description = "A tiny part of the lens library which you can depend upon"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -88548,12 +88977,16 @@ self: { }) {}; "microlens-mtl" = callPackage - ({ mkDerivation, base, microlens, mtl }: + ({ mkDerivation, base, microlens, mtl, transformers + , transformers-compat + }: mkDerivation { pname = "microlens-mtl"; - version = "0.1.0.0"; - sha256 = "0wz61g71c0w12apwziww2b6snbmyhfhm2f1304rw4gasify9q5s8"; - buildDepends = [ base microlens mtl ]; + version = "0.1.2.0"; + sha256 = "1jvw9pspnr24rh7bvl6q7hv7x0g6vwy2a5xl19pxf36rl8wlfm9v"; + buildDepends = [ + base microlens mtl transformers transformers-compat + ]; homepage = "http://github.com/aelve/microlens"; description = "microlens support for Reader/Writer/State from mtl"; license = stdenv.lib.licenses.bsd3; @@ -88563,11 +88996,11 @@ self: { ({ mkDerivation, base, containers, microlens, template-haskell }: mkDerivation { pname = "microlens-th"; - version = "0.1.0.0"; - sha256 = "0balhqdlj8ighzda5g9qz8s634jlf4pjxs3hvgaqp2rw56jc4i12"; + version = "0.2.0.0"; + sha256 = "048q6ridxvg7zi272q01k6ds0f411kg27p5whgj63qgg3k9w72sp"; buildDepends = [ base containers microlens template-haskell ]; homepage = "http://github.com/aelve/microlens"; - description = "Automatic generation of record lenses for 'microlens'"; + description = "Automatic generation of record lenses for microlens"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -89576,6 +90009,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "moesocks" = callPackage + ({ mkDerivation, aeson, attoparsec, base, binary, bytestring + , containers, cryptohash, hslogger, HsOpenSSL, lens, mtl, network + , optparse-applicative, random, safe, text, transformers, unix + , unordered-containers + }: + mkDerivation { + pname = "moesocks"; + version = "0.1.0.8"; + sha256 = "1f09sf41kbza3mci2yps0b38xi2j5gakjqx9hmi7lfzga4dkqgg0"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + aeson attoparsec base binary bytestring containers cryptohash + hslogger HsOpenSSL lens mtl network optparse-applicative random + safe text transformers unix unordered-containers + ]; + homepage = "https://github.com/nfjinjing/moesocks"; + description = "moe for all"; + license = stdenv.lib.licenses.asl20; + }) {}; + "mohws" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , directory, explicit-exception, filepath, html, HTTP, network @@ -89745,8 +90200,8 @@ self: { }: mkDerivation { pname = "monad-extras"; - version = "0.5.9"; - sha256 = "1y24yz635brllfygia1mbln4d8xiwb0pq0izh5pil7511gijhs0s"; + version = "0.5.11"; + sha256 = "0rq44dk1fvfqkhng2yczyyz7jh6d6m0kjy58k02ady28f7j2r5vn"; buildDepends = [ base mmorph monad-control stm transformers transformers-base ]; @@ -90758,12 +91213,11 @@ self: { }: mkDerivation { pname = "monoidal-containers"; - version = "0.1.2.1"; - sha256 = "1n76vjh785yzirfkh63nlrpi9y1bb9z1r3v514150wfxjn3n723j"; + version = "0.1.2.2"; + sha256 = "06yam4ljp4lm2rjaccykg8zx4hnmn0ly3fs24xjm4q45ldz7gwyb"; buildDepends = [ base containers deepseq hashable lens newtype unordered-containers ]; - jailbreak = true; homepage = "http://github.com/bgamari/monoidal-containers"; description = "Containers with monoidal accumulation"; license = stdenv.lib.licenses.bsd3; @@ -90968,8 +91422,8 @@ self: { }: mkDerivation { pname = "morte"; - version = "1.2.0"; - sha256 = "0mr2aaf4r15ysmymqixd592z5w56973qv8ww1d7vkyvj851gfm01"; + version = "1.2.1"; + sha256 = "15zvk50qpp3ywkwqgpm4phdcspfszzwipxcf07lnxpk98i7ybc4g"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -91458,6 +91912,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mtl-unleashed" = callPackage + ({ mkDerivation, base, mtl }: + mkDerivation { + pname = "mtl-unleashed"; + version = "0.2.2"; + sha256 = "0ih03zznq8mf8c76ic43j3vana6127bh6hxfz549g5kv9h54y83h"; + buildDepends = [ base mtl ]; + homepage = "https://github.com/seereason/mtl-unleashed"; + description = "MTL classes without the functional dependency"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mtlparse" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -92434,6 +92900,27 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "myo" = callPackage + ({ mkDerivation, aeson, base, containers, inline-c, lens-family + , lens-family-th, scientific, tasty, tasty-hunit, template-haskell + , text, vector, websockets + }: + mkDerivation { + pname = "myo"; + version = "0.1.0.0"; + sha256 = "0sn3ic3h94ff57igs61l2cq82y6xxz87qflm8dykwwy721swq1qn"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base containers inline-c lens-family lens-family-th + scientific template-haskell text vector websockets + ]; + testDepends = [ base tasty tasty-hunit ]; + homepage = "http://github.com/adinapoli/myo"; + description = "Haskell binding to the Myo armband"; + license = stdenv.lib.licenses.mit; + }) {}; + "mysnapsession" = callPackage ({ mkDerivation, base, bytestring, cereal, clientsession , containers, mtl, random, regex-posix, snap, snap-core, time @@ -92885,8 +93372,8 @@ self: { }: mkDerivation { pname = "nationstates"; - version = "0.1.0.2"; - sha256 = "0h01dxf8f2h18cx6ag67370l492jvyqh15ijipxzr1gwmkmnymrl"; + version = "0.2.0.0"; + sha256 = "07rs7c5pvq6x8icg5pzk613vazcnnl3rfrcsf3zw6i8gaxh0dq48"; buildDepends = [ base bytestring clock containers http-client http-client-tls http-types multiset transformers xml @@ -93311,8 +93798,8 @@ self: { }: mkDerivation { pname = "nested-routes"; - version = "3.1.0"; - sha256 = "128i669x31c4jagnamzlsv3z584rpijpmc832hr96004qkwr692n"; + version = "3.2.0"; + sha256 = "02mj54a797h9ywa0985xw8pspl953xgn813r6mz2apx0mk6gp1xg"; buildDepends = [ aeson attoparsec base blaze-html bytestring clay composition constraints containers http-media http-types lucid mtl poly-arity @@ -93855,10 +94342,8 @@ self: { ({ mkDerivation, base, bytestring, network, text, time, vector }: mkDerivation { pname = "network-carbon"; - version = "1.0.3"; - revision = "1"; - sha256 = "0wk3rds1d2c6nr9gdz9qgpqhmkqkdkk0rqxzj3rznv0n9m9sylcr"; - editedCabalFile = "6500f60c0b037a1e680ef3356ce43e27f145efe2cf85f63cb2e670cb344a926d"; + version = "1.0.5"; + sha256 = "0kb3gz8545dgi93ys9pk240vap7zjnl2npn1xryng2ijl7ssn9li"; buildDepends = [ base bytestring network text time vector ]; homepage = "http://github.com/ocharles/network-carbon"; description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)"; @@ -95603,8 +96088,8 @@ self: { }: mkDerivation { pname = "nvim-hs"; - version = "0.0.1"; - sha256 = "1zma19lb4kzzfiabkx55ffgvdqrycijpm2yz3jszm1m6m58khif5"; + version = "0.0.2"; + sha256 = "0f551qr7dgn6p4slr0yyfw7v2c6j6w1haqzgc7n7phrgmnhvrhzp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -96221,6 +96706,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye-sqlite" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, direct-sqlite + , pretty, product-profunctors, profunctors, QuickCheck, semigroups + , sqlite-simple, text, time, time-locale-compat, transformers, uuid + , void + }: + mkDerivation { + pname = "opaleye-sqlite"; + version = "0.0.1.0"; + sha256 = "0r3ij02wkxq50hl70wn53fdr1qi5gigg4x3y0vabm53gabgxdbxq"; + buildDepends = [ + base base16-bytestring bytestring case-insensitive contravariant + direct-sqlite pretty product-profunctors profunctors semigroups + sqlite-simple text time time-locale-compat transformers uuid void + ]; + testDepends = [ + base containers contravariant product-profunctors profunctors + QuickCheck semigroups sqlite-simple time + ]; + homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; + description = "An SQL-generating DSL targeting SQLite"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "open-browser" = callPackage + ({ mkDerivation, base, process }: + mkDerivation { + pname = "open-browser"; + version = "0.2.0.0"; + sha256 = "093i475l9gyb5jyk2m6fdz1dw2jm545rlrbmwqz3vfdfy2ikcks3"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base process ]; + description = "Open a web browser from Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "open-pandoc" = callPackage ({ mkDerivation, base, bytestring, containers, directory , extensible-exceptions, filepath, HTTP, mtl, network, old-time @@ -96330,6 +96853,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "openflow" = callPackage + ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers + , deepseq-generics, hashable, network + }: + mkDerivation { + pname = "openflow"; + version = "0.3.0"; + sha256 = "0dhg34s4imr1v6wlc567qg5929wa82my7jbhxm9hqq0882vb0sb2"; + buildDepends = [ + aeson base bimap binary bytestring containers deepseq-generics + hashable network + ]; + jailbreak = true; + homepage = "https://github.com/AndreasVoellmy/openflow"; + description = "OpenFlow"; + license = "unknown"; + }) {}; + "opengles" = callPackage ({ mkDerivation, base, bytestring, distributive, EGL , future-resource, ghc-prim, GLESv2, lens, linear, packer, vector @@ -96531,8 +97072,8 @@ self: { ({ mkDerivation, base, opentheory-primitive, QuickCheck }: mkDerivation { pname = "opentheory"; - version = "1.199"; - sha256 = "1il1lyjmv7ij7clnbc57ajpfwlg5a5ld3m619hxylpafyrbr4v5y"; + version = "1.200"; + sha256 = "0fdxrpsw3c4p1y80xfab0cl5zhkjcp9dlylgxywzq5kcpqv07ifh"; buildDepends = [ base opentheory-primitive QuickCheck ]; testDepends = [ base opentheory-primitive QuickCheck ]; homepage = "http://opentheory.gilith.com/?pkg=base"; @@ -96552,6 +97093,7 @@ self: { base opentheory opentheory-primitive opentheory-probability QuickCheck ]; + jailbreak = true; homepage = "http://opentheory.gilith.com/?pkg=natural-bits"; description = "Natural number to bit-list conversions"; license = stdenv.lib.licenses.mit; @@ -96569,6 +97111,7 @@ self: { base opentheory opentheory-bits opentheory-primitive opentheory-probability QuickCheck ]; + jailbreak = true; homepage = "http://opentheory.gilith.com/?pkg=byte"; description = "Bytes"; license = stdenv.lib.licenses.mit; @@ -96599,8 +97142,8 @@ self: { }: mkDerivation { pname = "opentheory-divides"; - version = "1.62"; - sha256 = "182c14c1j9m82pnx6crxgrry02yvixziap9ikhavx7krr52vdwbv"; + version = "1.63"; + sha256 = "1jax8103yhgmbwfzbpnis4nj6f90n3wizb2znvafd4pw2afs5mkv"; buildDepends = [ base opentheory opentheory-primitive QuickCheck ]; testDepends = [ base opentheory opentheory-primitive QuickCheck ]; homepage = "http://opentheory.gilith.com/?pkg=natural-divides"; @@ -96608,6 +97151,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "opentheory-fibonacci" = callPackage + ({ mkDerivation, base, opentheory, opentheory-primitive + , opentheory-stream, QuickCheck + }: + mkDerivation { + pname = "opentheory-fibonacci"; + version = "1.69"; + sha256 = "09rqz7fixh1k4ya1aci7v0wy0sz2m7j5cj66plcbvpv6p03yq1vv"; + buildDepends = [ + base opentheory opentheory-primitive opentheory-stream QuickCheck + ]; + testDepends = [ + base opentheory opentheory-primitive opentheory-stream QuickCheck + ]; + description = "Fibonacci numbers"; + license = stdenv.lib.licenses.mit; + }) {}; + "opentheory-parser" = callPackage ({ mkDerivation, base, opentheory, opentheory-primitive, QuickCheck }: @@ -96617,6 +97178,7 @@ self: { sha256 = "0325g7m5z64dg8sihmcgi9rmkms6r76hf1d7927v08dl5xh4dlhi"; buildDepends = [ base opentheory opentheory-primitive QuickCheck ]; testDepends = [ base opentheory opentheory-primitive QuickCheck ]; + jailbreak = true; homepage = "http://opentheory.gilith.com/?pkg=parser"; description = "Stream parsers"; license = stdenv.lib.licenses.mit; @@ -96638,6 +97200,7 @@ self: { base opentheory opentheory-divides opentheory-primitive opentheory-stream QuickCheck ]; + jailbreak = true; homepage = "http://opentheory.gilith.com/?pkg=natural-prime"; description = "Prime natural numbers"; license = stdenv.lib.licenses.mit; @@ -96664,6 +97227,7 @@ self: { version = "1.49"; sha256 = "0dszjszjdabgafpvxiailpgzm7y96f4a8zhjfhin3m36f3lb0dmy"; buildDepends = [ base opentheory opentheory-primitive QuickCheck ]; + jailbreak = true; homepage = "http://opentheory.gilith.com/?pkg=probability"; description = "Probability"; license = stdenv.lib.licenses.mit; @@ -96674,8 +97238,8 @@ self: { }: mkDerivation { pname = "opentheory-stream"; - version = "1.45"; - sha256 = "0gl7svhyrvi6bznfmc3jfar6hzlrywni6f7pvaykjzkf80xzljbr"; + version = "1.46"; + sha256 = "0p27hvxxxl6x6g97llls8kry5vlmpi5b02x9x96v24m4clxj55wa"; buildDepends = [ base opentheory opentheory-primitive QuickCheck ]; homepage = "http://opentheory.gilith.com/?pkg=stream"; description = "Infinite stream types"; @@ -96699,6 +97263,7 @@ self: { base opentheory opentheory-bits opentheory-byte opentheory-parser opentheory-primitive opentheory-probability QuickCheck ]; + jailbreak = true; homepage = "http://opentheory.gilith.com/?pkg=char"; description = "Unicode characters"; license = stdenv.lib.licenses.mit; @@ -97773,17 +98338,18 @@ self: { }) {}; "pandoc-placetable" = callPackage - ({ mkDerivation, base, explicit-exception, pandoc-types - , spreadsheet + ({ mkDerivation, base, bytestring, explicit-exception, http-conduit + , pandoc-types, spreadsheet }: mkDerivation { pname = "pandoc-placetable"; - version = "0.1.1"; - sha256 = "196x22f76mvd072yzj6vcynrp459zmlg84l42rwx4syhnvn1ca8d"; + version = "0.1.2"; + sha256 = "0vq94j5jsq60p0wbml50hwqa2zpidbzx92cbb7d2ialqj7816zwb"; isLibrary = false; isExecutable = true; buildDepends = [ - base explicit-exception pandoc-types spreadsheet + base bytestring explicit-exception http-conduit pandoc-types + spreadsheet ]; homepage = "https://github.com/mb21/pandoc-placetable"; description = "Pandoc filter to include CSV files"; @@ -99968,15 +100534,17 @@ self: { }: mkDerivation { pname = "pgdl"; - version = "8.2"; - sha256 = "04yydjvwnjilyxwqwrbwg5c2mph58728bacz2q8pbd0084lp77nd"; + version = "8.3"; + revision = "2"; + sha256 = "0kbx9dgmy9pvcgcpsjplrpnqlk8x3icfpr0flincmzqkzxxzcaq5"; + editedCabalFile = "9d6e976e130869b6761d870380b867c2501c43a1318a5f385687608c13a0ef72"; isLibrary = false; isExecutable = true; buildDepends = [ array base bytestring Cabal configurator directory filepath HTTP network-uri process tagsoup text vty vty-ui ]; - description = "simply download a video from webpage and play it"; + description = "simply download a video (or a file) from a webpage and xdg-open it"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -100419,10 +100987,8 @@ self: { }: mkDerivation { pname = "pipes"; - version = "4.1.5"; - revision = "1"; - sha256 = "1c19am4dr6na9xpx4h7yngvbml0ghc1dbym8988hjhw84gq4lhfx"; - editedCabalFile = "c23c260bff1178965d87e6fc9f7263877b5f2adc4c0e4c1bd59c55971fff9eb4"; + version = "4.1.6"; + sha256 = "0dbl9sa0ryclyxwm0zfmqvpx7ljmpnfccmnihxia35q471h50sid"; buildDepends = [ base mmorph mtl transformers ]; testDepends = [ base mtl QuickCheck test-framework test-framework-quickcheck2 @@ -100450,6 +101016,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-async" = callPackage + ({ mkDerivation, base, hspec, lifted-async, lifted-base + , monad-control, pipes, pipes-safe, stm, transformers-base + }: + mkDerivation { + pname = "pipes-async"; + version = "0.1.1"; + sha256 = "1b0l3fnblfgwgcbd5brs5iwix4wix1ijx10ppwb8yb1wbqbmh8z2"; + buildDepends = [ + base lifted-async lifted-base monad-control pipes pipes-safe stm + transformers-base + ]; + testDepends = [ + base hspec lifted-async lifted-base monad-control pipes pipes-safe + stm transformers-base + ]; + homepage = "https://github.com/jwiegley/pipes-async"; + description = "A higher-level interface to using concurrency with pipes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, mmorph, pipes , pipes-parse, tasty, tasty-hunit, text, transformers @@ -100947,13 +101534,17 @@ self: { }) {}; "pipes-safe" = callPackage - ({ mkDerivation, base, containers, exceptions, pipes, transformers + ({ mkDerivation, base, containers, exceptions, monad-control, mtl + , pipes, transformers, transformers-base }: mkDerivation { pname = "pipes-safe"; - version = "2.2.2"; - sha256 = "1sp0fw5w4kcf5llxx2qqzx8n5ps8qw1jx5asqg7al89mqr38am05"; - buildDepends = [ base containers exceptions pipes transformers ]; + version = "2.2.3"; + sha256 = "19wr3q6skwdyd68k1r33w2mipfsgsg2982027faq7rnfw9lq2yyi"; + buildDepends = [ + base containers exceptions monad-control mtl pipes transformers + transformers-base + ]; description = "Safety for the pipes ecosystem"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -101316,8 +101907,8 @@ self: { ({ mkDerivation, base, glib, gtk3, hmatrix, mtl, plot, process }: mkDerivation { pname = "plot-gtk3"; - version = "0.1"; - sha256 = "0dw6ypnwr3xnjl1cvr55x3j182vchjhinc9fxsnd5z7ciraqvnv0"; + version = "0.1.0.1"; + sha256 = "0x7s9wb8r2sds25q9k6h8mvpfzgi90v497ccxskvb3qd0a1jv24f"; buildDepends = [ base glib gtk3 hmatrix mtl plot process ]; homepage = "http://code.haskell.org/plot"; description = "GTK3 plots and interaction with GHCi"; @@ -101904,8 +102495,8 @@ self: { }: mkDerivation { pname = "pontarius-xmpp"; - version = "0.4.2.1"; - sha256 = "14jhxmccj9ywhxz2rkd4vdwhzz6ciq070ml8vl282hz8k3dr1va9"; + version = "0.4.2.2"; + sha256 = "1krbr0vdza3s6w4sa119x591i5ryq9bmqfnacy665xr5si4bkzcv"; buildDepends = [ attoparsec base base64-bytestring binary bytestring conduit containers crypto-api crypto-random cryptohash cryptohash-cryptoapi @@ -102212,8 +102803,8 @@ self: { }: mkDerivation { pname = "posix-paths"; - version = "0.2.0.5"; - sha256 = "046y5i4hw4a326r3145yrfd1p6sn3b9xsn6rdk73nv74ks4wrn5v"; + version = "0.2.1.0"; + sha256 = "187sq0rcdg06h64kkjdgqg32s8s51hd4cgf6hvajj1pgd9pyd1i0"; buildDepends = [ base bytestring unix ]; testDepends = [ base bytestring doctest HUnit QuickCheck unix ]; description = "POSIX filepath/directory functionality"; @@ -102332,8 +102923,8 @@ self: { }: mkDerivation { pname = "postgresql-config"; - version = "0.0.2"; - sha256 = "1b7rppzarnmndmgwkcahcrcnxzigfldm50iqd81vj0zkii6w0i43"; + version = "0.1.0"; + sha256 = "1p5kzj2wsd3kigi9qavsqkxv9kfk4qbl809wqbdk4pd7y34ajab4"; buildDepends = [ aeson base bytestring monad-control mtl postgresql-simple resource-pool time @@ -102370,8 +102961,8 @@ self: { ({ mkDerivation, base, bytestring, postgresql }: mkDerivation { pname = "postgresql-libpq"; - version = "0.9.0.2"; - sha256 = "1x1nmzl1j6vc3vy746ch6ps4wy6hwqm78yl9cq9fvkpllh0a2dnw"; + version = "0.9.1.1"; + sha256 = "0waqg245ly017j1qml4sc24896ax645bv8a2fghwwa46zvbsx0z4"; buildDepends = [ base bytestring ]; extraLibraries = [ postgresql ]; homepage = "http://github.com/lpsmith/postgresql-libpq"; @@ -103462,12 +104053,11 @@ self: { }: mkDerivation { pname = "probable"; - version = "0.1.0.0"; - sha256 = "1269cajfjnfrqacs874v6zczrb497474hqhid5wmm8f9fmhiy0wz"; + version = "0.1.1"; + sha256 = "1n6p7pharcq2cmfabh2ngfsy9mfqqs6qh57m0kygq13lbzwyy8wr"; buildDepends = [ base mtl mwc-random primitive statistics transformers vector ]; - jailbreak = true; homepage = "http://github.com/alpmestan/probable"; description = "Easy and reasonably efficient probabilistic programming and random generation"; license = stdenv.lib.licenses.bsd3; @@ -104099,8 +104689,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "2.6.0"; - sha256 = "1q9l5bp7sg9lciz8c5qzxmwnfb7b195f8zgdcvzfcx50i3hpxxad"; + version = "2.7.0"; + sha256 = "12pfrv6n61bsg4cyylfr0kw82x36mwvnyvzdkr2lrka79i5l9a5w"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -104257,8 +104847,8 @@ self: { }: mkDerivation { pname = "protocol-buffers"; - version = "2.1.3"; - sha256 = "1ys0291js4mdfxqjk09lrmf33g7dh4rzq562f471ac98zwc5q588"; + version = "2.1.4"; + sha256 = "0sn92mf0dl7w6cg25rhm492sl58pssshjyipadis4w4ww0kyp4md"; buildDepends = [ array base binary bytestring containers directory filepath mtl parsec syb utf8-string @@ -104273,8 +104863,8 @@ self: { ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; - version = "2.1.3"; - sha256 = "04iw8bfq9i89xvx2dn16cwv4w9zv3ljgngm6aac6imp7za4mvjzf"; + version = "2.1.4"; + sha256 = "1m07l890465ks53acmk9g3fzbm2h5l2pdfhp16hcmvvzxlaz2zvy"; buildDepends = [ base bytestring containers protocol-buffers ]; homepage = "https://github.com/k-bx/protocol-buffers"; description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; @@ -104469,15 +105059,13 @@ self: { }) {}; "publicsuffix" = callPackage - ({ mkDerivation, base, bytestring, filepath, hspec - , template-haskell, text - }: + ({ mkDerivation, base, filepath, hspec, template-haskell }: mkDerivation { pname = "publicsuffix"; - version = "0.20150507"; - sha256 = "1n1wns0n48rqva5zz4kyj84rw0lf7ih612cp0dhsdk9jgc1kapsj"; - buildDepends = [ base bytestring filepath template-haskell text ]; - testDepends = [ base hspec text ]; + version = "0.20150804"; + sha256 = "06b311vdwihqhdwf2zr0akndgyaxycli7lymzzyfbn0rhhx1g2kn"; + buildDepends = [ base filepath template-haskell ]; + testDepends = [ base hspec ]; homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; description = "The publicsuffix list exposed as proper Haskell types"; license = stdenv.lib.licenses.mit; @@ -104866,8 +105454,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.7.1.0"; - sha256 = "1hnrqs1dkcrwa1xrnrikcymm65inxfh9jznfb2xqczd9vyn8j518"; + version = "0.7.2.0"; + sha256 = "0drx0n1ac0sjnma7c15hsld1n6rwwl7r8fzcdibk73k5pfyz9a6k"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -104890,6 +105478,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) nodejs;}; + "purescript-bundle-fast" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , optparse-applicative, text, vector + }: + mkDerivation { + pname = "purescript-bundle-fast"; + version = "0.1.0.1"; + sha256 = "0s9db4nb5ppr3yznay7jlgydq68hcdn525cwnxkj41h8fv9sflfw"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base containers directory filepath optparse-applicative text vector + ]; + homepage = "https://github.com/bitc/purescript-bundle-fast"; + description = "A fast alternative to Purescript's `psc-bundle` to be used during development"; + license = stdenv.lib.licenses.mit; + }) {}; + "push-notify" = callPackage ({ mkDerivation, aeson, async, attoparsec-conduit, base , base16-bytestring, bytestring, cereal, certificate, conduit @@ -105758,8 +106364,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "quiver"; - version = "0.0.0.6"; - sha256 = "0g9qfspzamxxn8zvl698g9f8y3alm4js7i7k9wa737pgv47lzqbz"; + version = "0.0.0.11"; + sha256 = "1pxnxdm84fqmxvv0l312q8nynpaiyf43jksa2qg1wkl53n0mm2fa"; buildDepends = [ base ]; homepage = "https://github.com/zadarnowski/quiver"; description = "Quiver finite stream processing library"; @@ -105770,8 +106376,8 @@ self: { ({ mkDerivation, base, bytestring, quiver }: mkDerivation { pname = "quiver-bytestring"; - version = "0.0.0.1"; - sha256 = "03lw2yi4a3d5nd7xqlcs4pmf0rcbfw3n4s36wgaxy4wn3bhh3300"; + version = "0.0.0.2"; + sha256 = "17wjj1fg60g3km9d4kxfz7lk9bf4sfz0brsg8pb0h2xlw0zvm3wl"; buildDepends = [ base bytestring quiver ]; homepage = "https://github.com/zadarnowski/quiver-bytestring"; description = "Quiver combinators for bytestring streaming"; @@ -105782,8 +106388,8 @@ self: { ({ mkDerivation, base, data-cell, quiver }: mkDerivation { pname = "quiver-cell"; - version = "0.0.0.1"; - sha256 = "1bz74xigj99v9hh4i6m6z4h9f0l09rnbs108npnl953v0bqi44qi"; + version = "0.0.0.2"; + sha256 = "10p11ljmwp7szw46saxa972xpjiyr5r19kia6ivaq98jqwcvi5af"; buildDepends = [ base data-cell quiver ]; homepage = "https://github.com/zadarnowski/quiver-cell"; description = "Quiver combinators for cellular data processing"; @@ -105796,8 +106402,8 @@ self: { }: mkDerivation { pname = "quiver-csv"; - version = "0.0.0.1"; - sha256 = "0s5m6qhpir5i1n3ifrcr4if4ysk52cwi9pxm354mdw1859h5lmx9"; + version = "0.0.0.3"; + sha256 = "19wb16lbv0wr7w2qba6g2cdmzdhpyyjx1bjvrnz0cqbb4di9yscj"; buildDepends = [ base bytestring data-cell quiver quiver-bytestring ]; @@ -105807,6 +106413,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "quiver-enumerator" = callPackage + ({ mkDerivation, base, enumerator, quiver }: + mkDerivation { + pname = "quiver-enumerator"; + version = "0.0.0.1"; + sha256 = "0k0822yzlxkb6b46834hm3bad3x1gma1gqcjl9ryxpqsl73nc4mp"; + buildDepends = [ base enumerator quiver ]; + homepage = "https://github.com/zadarnowski/quiver-enumerator"; + description = "Bridge between Quiver and Iteratee paradigms"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "quoridor-hs" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , directory, dlist, exceptions, filepath, hex, HUnit, mtl, network @@ -106675,8 +107293,8 @@ self: { }: mkDerivation { pname = "react-haskell"; - version = "2.0.0"; - sha256 = "016bpbci89b6grkwnq1yqjm5y50di1hmjlf2mkxjc0wyi82c7say"; + version = "2.0.1"; + sha256 = "0kjbicrvriliy50gy82b7rsrfk5p3iv20wwnhiaq9i16mbh2zj8j"; buildDepends = [ aeson base deepseq lens-family monads-tf text transformers unordered-containers void @@ -107222,10 +107840,8 @@ self: { }: mkDerivation { pname = "reddit"; - version = "0.1.0.0"; - revision = "1"; - sha256 = "1g18lfl9hvz13f3i5h819pfh724i5lhgqfvyy2r06ni7hjfylzj4"; - editedCabalFile = "84c6e65809dcd5c4fed83d64c71c6465a6ee1fe6e913c637dc2db608c6cc5870"; + version = "0.1.1.0"; + sha256 = "1flsawdld5a4bs5crs352zc1r9ag3yn1indbzw7vgs2mmyiavg7k"; buildDepends = [ aeson api-builder base bytestring data-default http-conduit http-types network stm text time transformers unordered-containers @@ -107235,6 +107851,7 @@ self: { api-builder base bytestring Cabal hspec http-conduit text time transformers ]; + jailbreak = true; homepage = "https://github.com/intolerable/reddit"; description = "Library for interfacing with Reddit's API"; license = stdenv.lib.licenses.bsd2; @@ -107439,8 +108056,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "refact"; - version = "0.2.0.0"; - sha256 = "1ixbji328bxdz4rblb0s7hp6vbckj4yj03a8a8sa756igj988v8f"; + version = "0.3.0.1"; + sha256 = "0nmlhx35g3kb5if6qnkmabgi5dj4b446vkd1n5df1vsiyaf65w11"; buildDepends = [ base ]; description = "Specify refactorings to perform with apply-refact"; license = stdenv.lib.licenses.bsd3; @@ -107571,17 +108188,21 @@ self: { "reflex" = callPackage ({ mkDerivation, base, containers, dependent-map, dependent-sum - , mtl, primitive, ref-tf, semigroups, template-haskell, these + , exception-transformers, MemoTrie, mtl, primitive, ref-tf + , semigroups, template-haskell, these, transformers + , transformers-compat }: mkDerivation { pname = "reflex"; - version = "0.2"; - revision = "1"; - sha256 = "0mq5249dhx26z02jzjr5bxxsgyhg7npd3q7v3l4ipxxxgixg1vdv"; - editedCabalFile = "4454a0c57f83e4490729fe4b1ce95197be989aa2a0f8b384afddcb1ad71817de"; + version = "0.3"; + sha256 = "1aw4pz0y0rpf7klsb232q0zi4zqcpkwrw0s3zrkq5iyhzaswfnyd"; buildDepends = [ - base containers dependent-map dependent-sum mtl primitive ref-tf - semigroups template-haskell these + base containers dependent-map dependent-sum exception-transformers + mtl primitive ref-tf semigroups template-haskell these transformers + transformers-compat + ]; + testDepends = [ + base containers dependent-map MemoTrie mtl ref-tf ]; homepage = "https://github.com/ryantrinkle/reflex"; description = "Higher-order Functional Reactive Programming"; @@ -107589,23 +108210,26 @@ self: { }) {}; "reflex-dom" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, data-default - , dependent-map, dependent-sum, ghcjs-dom, glib, gtk3, lens, mtl - , ref-tf, reflex, safe, semigroups, text, these, time, transformers - , webkitgtk3, webkitgtk3-javascriptcore + ({ mkDerivation, aeson, base, bifunctors, bytestring, containers + , data-default, dependent-map, dependent-sum + , dependent-sum-template, directory, exception-transformers + , ghcjs-dom, glib, gtk3, lens, mtl, ref-tf, reflex, safe + , semigroups, text, these, time, transformers, webkitgtk3 + , webkitgtk3-javascriptcore }: mkDerivation { pname = "reflex-dom"; - version = "0.1.1"; - sha256 = "1fzk7x0iwgdsb4fmhx399xvq200pz4sh2g1n0n8a76q9sy6j82hs"; + version = "0.2"; + sha256 = "1pc6mz9c6nr4s5b2mhlyxjzzffh85cv1bgvyycmq04s6dmg0ndgx"; buildDepends = [ - aeson base bytestring containers data-default dependent-map - dependent-sum ghcjs-dom glib gtk3 lens mtl ref-tf reflex safe - semigroups text these time transformers webkitgtk3 + aeson base bifunctors bytestring containers data-default + dependent-map dependent-sum dependent-sum-template directory + exception-transformers ghcjs-dom glib gtk3 lens mtl ref-tf reflex + safe semigroups text these time transformers webkitgtk3 webkitgtk3-javascriptcore ]; jailbreak = true; - description = "Glitch-free Functional Reactive Web Apps"; + description = "Functional Reactive Web Apps with Reflex"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -108301,8 +108925,8 @@ self: { }: mkDerivation { pname = "rei"; - version = "0.1.0.1"; - sha256 = "15xq2aj77y7l4frxkariw1z0c3y324iz697im8ynlzm88z2iixs6"; + version = "0.2.0.0"; + sha256 = "17ldmx351b54fxmiw3z89v7cs6p33x09k2aav7jphqgv2520phyv"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -109095,19 +109719,21 @@ self: { }) {}; "reroute" = callPackage - ({ mkDerivation, base, deepseq, graph-core, hashable, hspec, mtl - , path-pieces, regex-compat, text, transformers + ({ mkDerivation, base, deepseq, graph-core, hashable, hspec, hvect + , mtl, path-pieces, regex-compat, text, transformers , unordered-containers, vector }: mkDerivation { pname = "reroute"; - version = "0.2.3.0"; - sha256 = "1wyr54kllh3cfwl9i291ymmpmmk8vv8y4i3k1kwa8b0zv5kky1px"; + version = "0.3.0.2"; + sha256 = "14xkkcgqbg7bddln849h2k0xrrj9hfvw2ikai81snz7dsf3mcnb8"; buildDepends = [ - base deepseq graph-core hashable mtl path-pieces regex-compat text - transformers unordered-containers vector + base deepseq graph-core hashable hvect mtl path-pieces regex-compat + text transformers unordered-containers vector + ]; + testDepends = [ + base hspec hvect mtl text unordered-containers vector ]; - testDepends = [ base hspec mtl text unordered-containers vector ]; homepage = "http://github.com/agrafix/reroute"; description = "abstract implementation of typed and untyped web routing"; license = stdenv.lib.licenses.mit; @@ -109248,8 +109874,8 @@ self: { }: mkDerivation { pname = "resourcet"; - version = "1.1.5"; - sha256 = "063v7xfhwqgf1yvdiidg4anx38nfvgcwb0sqim5rcbqhz0fmkypy"; + version = "1.1.6"; + sha256 = "0zhsaaa4n8ry76vjih519a8npm2hrzk10d5asrgllcwpzmifl41y"; buildDepends = [ base containers exceptions lifted-base mmorph monad-control mtl transformers transformers-base transformers-compat @@ -110536,6 +111162,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "roundtrip-aeson" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, lens + , lens-aeson, roundtrip, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "roundtrip-aeson"; + version = "0.2.0.0"; + sha256 = "0m96447l2m0y4aapil077xpnzlkjla0yp2bzajfijik9gkjbiih4"; + buildDepends = [ + aeson base bytestring containers lens lens-aeson roundtrip + scientific text unordered-containers vector + ]; + testDepends = [ + aeson base bytestring lens-aeson roundtrip text vector + ]; + jailbreak = true; + homepage = "https://github.com/anchor/roundtrip-aeson"; + description = "Un-/parse JSON with roundtrip invertible syntax definitions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "roundtrip-string" = callPackage ({ mkDerivation, base, mtl, parsec, roundtrip }: mkDerivation { @@ -110878,6 +111526,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) rubberband;}; + "ruby-marshal" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, hspec, mtl + , string-conv, vector + }: + mkDerivation { + pname = "ruby-marshal"; + version = "0.1.0"; + sha256 = "1dmlgks7wfs82k9dxkgi35q4sa0a7ljpcw86j25k85vbclzpyp7j"; + buildDepends = [ + base bytestring cereal containers mtl string-conv vector + ]; + testDepends = [ + base bytestring cereal containers hspec mtl string-conv vector + ]; + homepage = "https://github.com/filib/ruby-marshal"; + description = "Parse a subset of Ruby objects serialised with Marshal.dump."; + license = stdenv.lib.licenses.mit; + }) {}; + "ruby-qq" = callPackage ({ mkDerivation, base, bytestring, haskell-src-exts , haskell-src-meta, pcre-light, process, template-haskell, trifecta @@ -111303,15 +111970,14 @@ self: { }: mkDerivation { pname = "saltine"; - version = "0.0.0.3"; - sha256 = "1xjpjblxlpziyyz74ldaqh04shvy2qi34sc6b3232wpc0kyl5s8y"; + version = "0.0.0.4"; + sha256 = "1n74qk8yb0ylj6gns68rak5g030yjsaycn96x0hvk1cx7qwym887"; buildDepends = [ base bytestring profunctors ]; testDepends = [ base bytestring QuickCheck test-framework test-framework-quickcheck2 vector ]; extraLibraries = [ libsodium ]; - jailbreak = true; description = "Cryptography that's easy to digest (NaCl/libsodium bindings)"; license = stdenv.lib.licenses.mit; }) { inherit (pkgs) libsodium;}; @@ -113575,8 +114241,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.4.3.1"; - sha256 = "1lbnd4mmn7q0bb091il18g1y8ixsi81s64q8lpfpm5sq4dsn1x6l"; + version = "0.4.4"; + sha256 = "1v0n194gj2cy16scfgs94q2vcb2baryp0rl1s21zwww1kfgmpffj"; buildDepends = [ aeson attoparsec base bytestring bytestring-conversion case-insensitive http-media http-types network-uri @@ -113592,12 +114258,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-JuicyPixels" = callPackage + ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant + , servant-server, wai, warp + }: + mkDerivation { + pname = "servant-JuicyPixels"; + version = "0.1.0.0"; + sha256 = "1fnlyk6848nzby0nxdrvm4d0vvisdx6pmlzjnh6y1q5q8wq4m48j"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bytestring http-media JuicyPixels servant servant-server wai + warp + ]; + homepage = "https://github.com/tvh/servant-JuicyPixels"; + description = "servant-JuicyPixels"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "servant-blaze" = callPackage ({ mkDerivation, base, blaze-html, http-media, servant }: mkDerivation { pname = "servant-blaze"; - version = "0.4.3.1"; - sha256 = "017y41z82smy848y6a73232rlidiimdxawb048lnrs9z53ai46cn"; + version = "0.4.4"; + sha256 = "140sgy7hcp6pxjrh7zk5i59sq79swqgg76gakgdnvkg7zz0a150s"; buildDepends = [ base blaze-html http-media servant ]; homepage = "http://haskell-servant.github.io/"; description = "Blaze-html support for servant"; @@ -113613,8 +114298,8 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.4.3.1"; - sha256 = "15b6aww76bw87zps3n3sv5zl4q1h9l9ds72r9g8kn0r53r3vw6ig"; + version = "0.4.4"; + sha256 = "0m5aw8pb6iga2rf8m3mnx58xh6jnh33rvvkdzbmb3s6vplsqh6vz"; buildDepends = [ aeson attoparsec base bytestring either exceptions http-client http-client-tls http-media http-types network-uri safe servant @@ -113637,8 +114322,8 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.4.3.1"; - sha256 = "0kzk4089xnr22gw929babknc9rnjq3wp1rk9fq881l49z8pvvl4r"; + version = "0.4.4"; + sha256 = "0kp5346jxakjz8x92wvayz7c3f2xcvnpsgg9dxgb41imvww2pyfc"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -113682,8 +114367,8 @@ self: { }: mkDerivation { pname = "servant-examples"; - version = "0.4.3.1"; - sha256 = "1ypsdpmp8rx6qcwvbw5scc0y41c1jnpn96wxy6wcik1rkc2zjxfq"; + version = "0.4.4"; + sha256 = "1qzrlkqwfv4w7d3sjbvz3s4kgx0x6zn0hh07hm955vvlfksgwjym"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -113704,8 +114389,8 @@ self: { }: mkDerivation { pname = "servant-jquery"; - version = "0.4.3.1"; - sha256 = "13ngnbpip7nps3c8i2r9220i9i9kgf5s5w8s0wjkhb25xfbmnwwx"; + version = "0.4.4"; + sha256 = "04j2cnxrx2hljxnha94nbmql61zw3apz7n32mf23vf749svjcmvd"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -113724,8 +114409,8 @@ self: { ({ mkDerivation, base, http-media, lucid, servant }: mkDerivation { pname = "servant-lucid"; - version = "0.4.3.1"; - sha256 = "1pgvd3khap4gnnpsi2rrp64rz0182xyy9bqglsvg7f7nfmyprgpq"; + version = "0.4.4"; + sha256 = "1vy9vdd1jkvx7nzcw6a83az4p351ds98x7wasn496h3bwk23bbhr"; buildDepends = [ base http-media lucid servant ]; homepage = "http://haskell-servant.github.io/"; description = "Servant support for lucid"; @@ -113734,17 +114419,18 @@ self: { "servant-pandoc" = callPackage ({ mkDerivation, base, bytestring, http-media, lens, pandoc-types - , semigroupoids, servant-docs, text, unordered-containers + , servant-docs, text, unordered-containers }: mkDerivation { pname = "servant-pandoc"; - version = "0.4.1"; - sha256 = "1kfs45z6pja2v4dambivc5cxx8dfr7vrjx38w0cfpmhyi5xz5jdp"; + version = "0.4.1.1"; + revision = "1"; + sha256 = "00clyv651fyz0dx9b4g5c0z5z3bgybgg93x4s1b1lciwsin8i6nk"; + editedCabalFile = "ee2eff37865c8a5c246021f6d05aae5f075ba5910cac6d650312aafb2f4bf091"; buildDepends = [ - base bytestring http-media lens pandoc-types semigroupoids - servant-docs text unordered-containers + base bytestring http-media lens pandoc-types servant-docs text + unordered-containers ]; - jailbreak = true; description = "Use Pandoc to render servant API documentation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -113821,8 +114507,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.4.3.1"; - sha256 = "1qdsv7zr9byjrm7yir8alm1zv0ckb81r6akwdvqfa88a581yz7jx"; + version = "0.4.4"; + sha256 = "0byxply71jv558bs33i1j9whrfgfa1iygdjsxap7wiq9f27iyaa9"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -113836,7 +114522,6 @@ self: { network parsec QuickCheck servant string-conversions temporary text transformers wai wai-extra warp ]; - jailbreak = true; homepage = "http://haskell-servant.github.io/"; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; @@ -114104,6 +114789,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "set-with" = callPackage + ({ mkDerivation, base, containers, invariant, QuickCheck + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "set-with"; + version = "0.0.1"; + sha256 = "0mkc44gkhjibq3zhxgiw3c7nfy03jmjmrafdr8x9f5ak4l9ns0h4"; + buildDepends = [ base containers invariant ]; + testDepends = [ + base QuickCheck quickcheck-instances tasty tasty-hunit + tasty-quickcheck + ]; + description = "Set of elements sorted by a different data type"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "setdown" = callPackage ({ mkDerivation, alex, array, base, bytestring, cmdargs, containers , directory, filepath, happy, mtl, split, text, uuid @@ -114427,8 +115129,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.15.4"; - sha256 = "189qyxvy6rxlkgmssy2v66f7anp4q9xjmwqcpwxq86h0pj7vr3i9"; + version = "0.15.5"; + sha256 = "18vkyc8h7dpz5d3snfdssfqd1cfp22wnpv63ckrik9p8r4j6i01c"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -114501,8 +115203,8 @@ self: { ({ mkDerivation, base, bytestring, css-text, hjsmin, shake, text }: mkDerivation { pname = "shake-minify"; - version = "0.1.3"; - sha256 = "1634dm4rzpp5bkxczj5bbnzcn1mcaxkqbvg08x9gib1nyi2m6zzb"; + version = "0.1.4"; + sha256 = "17q0xzjj6xl9h3s6dlxgkxxz2dd4ycbh918ali1lrq2dq9gig3ir"; buildDepends = [ base bytestring css-text hjsmin shake text ]; homepage = "https://github.com/LukeHoersten/shake-minify"; description = "Shake Minify Rules"; @@ -114865,8 +115567,8 @@ self: { }: mkDerivation { pname = "shelly"; - version = "1.6.3.1"; - sha256 = "1yd54i4ac1h23b4l4mz9ixpkhj0zxnb8gamk5jdhzgsd809cqy9q"; + version = "1.6.3.3"; + sha256 = "173aypf9dcrkhnaz5gfcpicw9ha6cgs7javds3s7m2qr2vdj8rhs"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -114949,8 +115651,8 @@ self: { ({ mkDerivation, base, text }: mkDerivation { pname = "shortcut-links"; - version = "0.3.0.0"; - sha256 = "14g1s2gb1jc52zifn00n1w35qckv7p620rqhpn7rfhymlz6b07rz"; + version = "0.4.0.0"; + sha256 = "1i9a5hgzw9w9fqg7vjixc90ck49ag0ikm9bjl2xc30gvjslpy3r8"; buildDepends = [ base text ]; homepage = "http://github.com/aelve/shortcut-links"; description = "Link shortcuts for use in text markup"; @@ -115447,6 +116149,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-genetic-algorithm-mr" = callPackage + ({ mkDerivation, base, deepseq, MonadRandom, parallel, random + , transformers + }: + mkDerivation { + pname = "simple-genetic-algorithm-mr"; + version = "0.4.0.0"; + sha256 = "193n24n5dpmdha85h4vn0kx846hppyzbc9f75wgndc7y7vm1qagy"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base deepseq MonadRandom parallel random transformers + ]; + homepage = "http://eax.me/haskell-genetic-algorithm/"; + description = "Simple parallel genetic algorithm implementation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simple-get-opt" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -115807,15 +116527,15 @@ self: { }) {}; "simpleirc" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec, HUnit, knob - , network, old-locale, time + ({ mkDerivation, base, bytestring, connection, containers, hspec + , HUnit, knob, network, old-locale, time }: mkDerivation { pname = "simpleirc"; - version = "0.3.0"; - sha256 = "045rbiz06zpqvkfh4hxsxz7fr338zmr3mgk2xpaqhh8pp2v14h59"; + version = "0.3.1"; + sha256 = "1mwhqa5gby38hlbq0shjbff4whhblw00x8wksqbh47jd6i6ihww5"; buildDepends = [ - base bytestring containers network old-locale time + base bytestring connection containers network old-locale time ]; testDepends = [ base bytestring hspec HUnit knob ]; homepage = "http://github.com/dom96/SimpleIRC"; @@ -116643,8 +117363,8 @@ self: { ({ mkDerivation, aeson, base, linear, text, vector }: mkDerivation { pname = "smoothie"; - version = "0.4.0.1"; - sha256 = "1h501mcgfwak586gakqsjhmrdkq2mmfi8gwalb7wbsp57bchfg67"; + version = "0.4.0.2"; + sha256 = "1g2lk58p8rbhi45j6q3r0w4103bxi6pn9i3c5i3525s8brl4y8ni"; buildDepends = [ aeson base linear text vector ]; homepage = "https://github.com/phaazon/smoothie"; description = "Smooth curves via several interpolation modes"; @@ -116981,24 +117701,22 @@ self: { ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring , case-insensitive, configurator, containers, data-default , digestive-functors, digestive-functors-heist - , digestive-functors-snap, directory-tree, errors, filepath, heist - , jmacro, lens, mtl, pcre-light, QuickCheck, readable, safe, snap + , digestive-functors-snap, directory-tree, filepath, heist, jmacro + , lens, mtl, pcre-light, QuickCheck, readable, safe, snap , snap-core, tasty, tasty-hunit, tasty-quickcheck, text, time , transformers, wl-pprint-text, xmlhtml }: mkDerivation { pname = "snap-extras"; - version = "0.11"; - revision = "1"; - sha256 = "1s6qdl149x22six61kgm7xnqfyys8z7zh0waajmzip1q4ivxqnij"; - editedCabalFile = "b0332fedd9b65e483e28c08dc1e76473dc4ab7cee457c69195069aca91d24c46"; + version = "0.11.0.1"; + sha256 = "1747qvwbn1rlrjk085rj1780nrsqw4ps78c13si3kkk697k4wcbm"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base blaze-builder blaze-html bytestring case-insensitive configurator containers data-default digestive-functors digestive-functors-heist digestive-functors-snap directory-tree - errors filepath heist jmacro lens mtl pcre-light readable safe snap + filepath heist jmacro lens mtl pcre-light readable safe snap snap-core text time transformers wl-pprint-text xmlhtml ]; testDepends = [ @@ -117975,6 +118693,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sneathlane-haste" = callPackage + ({ mkDerivation, base, haste-compiler }: + mkDerivation { + pname = "sneathlane-haste"; + version = "1"; + sha256 = "0m6281a1hvwbhv02vpdd01vm0jvccvq1kvy26dfncv0a8158y6wj"; + buildDepends = [ base haste-compiler ]; + jailbreak = true; + homepage = "http://sneathlane.com"; + description = "A compositional web UI library, which draws to a Canvas element"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "snippet-extractor" = callPackage ({ mkDerivation, base, parsec }: mkDerivation { @@ -119569,8 +120300,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "srcloc"; - version = "0.5.0.2"; - sha256 = "0r7fgplyys8335bjrdmcx4m0z0xark0f174lrh2hsmzyii37x6jc"; + version = "0.5.1.0"; + sha256 = "1zssd6jxdhzl5wcygbmzq1s82i7m7rav6nm1m6kl5b68g77gc7g6"; buildDepends = [ base ]; homepage = "http://www.cs.drexel.edu/~mainland/"; description = "Data types for managing source code locations"; @@ -120837,8 +121568,8 @@ self: { ({ mkDerivation, array, base, containers, mtl, stm }: mkDerivation { pname = "stm-io-hooks"; - version = "1.0.1"; - sha256 = "079q34wyiv4c8cn92bagh1axdvl7b03amlgygqm0ln9khni0lkg4"; + version = "1.1.0"; + sha256 = "0dg2za2p7h9wb9lbs2yb07pdhq9sn4mdxxfmq179d9kinq94009m"; buildDepends = [ array base containers mtl stm ]; description = "STM with IO hooks"; license = stdenv.lib.licenses.bsd3; @@ -120970,8 +121701,8 @@ self: { }: mkDerivation { pname = "stomp-conduit"; - version = "0.0.3"; - sha256 = "0i2fz5hcqjhrnnqkfzpizn1w9iyqy966yny2anl3glwi6nqyam0s"; + version = "0.1.0"; + sha256 = "1qzr5fkffs96clxkvm7lf7kfafijv8fsri6k0j85wrarx3qdgapa"; buildDepends = [ base conduit mime mtl resourcet stomp-queue stompl ]; @@ -120986,8 +121717,8 @@ self: { }: mkDerivation { pname = "stomp-patterns"; - version = "0.0.1"; - sha256 = "0wa07y1ks581fvlkfzv23vb0r96iwr5x0r95j9bmcsh0ln405nrn"; + version = "0.1.0"; + sha256 = "0rdk9h7blj7j5kiwy7zq2kb4wxxs19xk3lg73c0srrvbclb0qgbw"; buildDepends = [ base bytestring containers mime mtl split stomp-queue stompl time ]; @@ -121020,8 +121751,8 @@ self: { }: mkDerivation { pname = "stompl"; - version = "0.2.0"; - sha256 = "1p583n14q2iqwhw2n6942zcav261119i1g8h2rca5ankpp227a2z"; + version = "0.3.0"; + sha256 = "1ip50w8f26362h1s3kb0qzv15dq264j0vbmqw5v0s40gbwmpv2aj"; buildDepends = [ attoparsec base bytestring mime split text utf8-string ]; @@ -121344,8 +122075,11 @@ self: { mkDerivation { pname = "strict-concurrency"; version = "0.2.4.1"; + revision = "1"; sha256 = "128sbh5fnv02v2xdjlk7cb525bfckqyj7fyz5399nfycs0nj2f89"; + editedCabalFile = "e9b8d4599f2eae037bb3b6008284513dbb50af7d3ab42e617b76577bdea656a1"; buildDepends = [ base deepseq ]; + jailbreak = true; homepage = "http://code.haskell.org/~dons/code/strict-concurrency"; description = "Strict concurrency abstractions"; license = stdenv.lib.licenses.bsd3; @@ -122579,22 +123313,31 @@ self: { "sync-mht" = callPackage ({ mkDerivation, array, base, base16-bytestring, byteable - , bytestring, cereal, containers, cryptohash, directory, filepath - , io-streams, mtl, process, text, transformers, unix + , bytestring, Cabal, cereal, containers, cryptohash, directory + , exceptions, filepath, io-streams, mtl, process, random + , regex-compat, temporary, text, time, transformers, unix, zlib }: mkDerivation { pname = "sync-mht"; - version = "0.2.1.0"; - sha256 = "1yrpsh676ajcqlaq0vdrdzkdi27l4ih0m2jm7r1wdz3yzw4mrr20"; + version = "0.3.5.0"; + sha256 = "1mkrap2qhfhnisz28vb4hjl5fmfi8r48n1igvv4c0qf9nclhfbhd"; isLibrary = false; isExecutable = true; buildDepends = [ - array base base16-bytestring byteable bytestring cereal containers - cryptohash directory filepath io-streams mtl process text - transformers unix + array base base16-bytestring byteable bytestring Cabal cereal + containers cryptohash directory exceptions filepath io-streams mtl + process random regex-compat temporary text time transformers unix + zlib + ]; + testDepends = [ + array base base16-bytestring byteable bytestring Cabal cereal + containers cryptohash directory exceptions filepath io-streams mtl + process random regex-compat temporary text time transformers unix + zlib ]; jailbreak = true; - description = "Fast incremental file transfer using Merke-Hash-Trees"; + homepage = "https://github.com/ekarayel/sync-mht"; + description = "Fast incremental file transfer using Merkle-Hash-Trees"; license = stdenv.lib.licenses.mit; }) {}; @@ -123925,7 +124668,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tar" = callPackage + "tar_0_4_1_0" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, time }: mkDerivation { pname = "tar"; @@ -123936,14 +124679,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "tar_0_4_2_0" = callPackage + "tar" = callPackage ({ mkDerivation, array, base, bytestring, directory, filepath , old-time, QuickCheck, tasty, tasty-quickcheck, time }: mkDerivation { pname = "tar"; - version = "0.4.2.0"; - sha256 = "00z0bdj29hrhxwwj1drsn137ny1ia5rl0f64m876f10fr4p5j2c3"; + version = "0.4.2.1"; + sha256 = "102hjlrqfb9d0mvz2bdrj0wg7hvhvzbv4f8gsvxz0wfnq7k0mb9g"; buildDepends = [ array base bytestring directory filepath time ]; testDepends = [ array base bytestring directory filepath old-time QuickCheck tasty @@ -125448,8 +126191,8 @@ self: { }: mkDerivation { pname = "text"; - version = "1.2.1.1"; - sha256 = "0l4lrpa216dblm1qk0qpykmx56a28h0hjgccq18sn1mr7n3wyhl8"; + version = "1.2.1.3"; + sha256 = "0gzqx5cpkdhshbz9xss51mpyq23pnf8dwjz4h3irbv2ryaa4qdlq"; buildDepends = [ array base binary bytestring deepseq ghc-prim integer-gmp ]; @@ -126049,20 +126792,23 @@ self: { "th-context" = callPackage ({ mkDerivation, array, base, bytestring, containers, data-default - , deepseq, ghc-prim, haskell-src-exts, hspec, hspec-core, mtl, syb - , template-haskell, text, th-desugar, th-orphans, th-reify-many + , deepseq, ghc-prim, haskell-src-exts, hspec, hspec-core, lens, mtl + , mtl-unleashed, syb, template-haskell, text, th-desugar + , th-orphans, th-reify-many, th-typegraph }: mkDerivation { pname = "th-context"; - version = "0.13"; - sha256 = "0i5392x1x06fk8ld7k6y8kj4hdi3s9gdf2lqj8f6vkwlcnj8cjwh"; + version = "0.22"; + sha256 = "0zzrb5dzxcn2dxhqniv3nx4kasgpx7mck730y9hgjink58wqsdx4"; buildDepends = [ - base containers data-default haskell-src-exts mtl syb - template-haskell th-desugar th-orphans + base containers data-default haskell-src-exts lens mtl + mtl-unleashed syb template-haskell th-desugar th-orphans + th-typegraph ]; testDepends = [ array base bytestring containers deepseq ghc-prim hspec hspec-core - mtl syb template-haskell text th-desugar th-orphans th-reify-many + lens mtl mtl-unleashed syb template-haskell text th-desugar + th-orphans th-reify-many th-typegraph ]; homepage = "https://github.com/seereason/th-context"; description = "Test instance context"; @@ -126253,15 +126999,14 @@ self: { }: mkDerivation { pname = "th-printf"; - version = "0.3.0.0"; - sha256 = "10kq1x8klgny6k5aq8h23fnrja3wfmva58j5kpjwzkz0xzr83biq"; + version = "0.3.1"; + sha256 = "089grlpavvqv90graa9rdwg9x1ph484g5bj7sfjklqy8mgwwqg7a"; buildDepends = [ attoparsec base bytestring template-haskell text transformers ]; testDepends = [ base bytestring hspec HUnit QuickCheck template-haskell text ]; - jailbreak = true; homepage = "https://github.com/joelteon/th-printf"; description = "Compile-time printf"; license = stdenv.lib.licenses.mit; @@ -126299,21 +127044,21 @@ self: { "th-typegraph" = callPackage ({ mkDerivation, array, base, base-compat, bytestring, containers , data-default, deepseq, ghc-prim, haskell-src-exts, hspec - , hspec-core, lens, mtl, set-extra, syb, template-haskell, text - , th-desugar, th-orphans, th-reify-many + , hspec-core, lens, mtl, mtl-unleashed, set-extra, syb + , template-haskell, text, th-desugar, th-orphans, th-reify-many }: mkDerivation { pname = "th-typegraph"; - version = "0.21"; - sha256 = "1w4k466snhkcdg30kzzc2vwiz2p46ybks1bbyf3nazc322zxryq0"; + version = "0.27"; + sha256 = "1v7vic9kfig9flcnqcpzazd1s4wgqiz3mj9gcyc1ijkrd4y83cdr"; buildDepends = [ base base-compat containers data-default haskell-src-exts lens mtl - set-extra syb template-haskell th-desugar th-orphans + mtl-unleashed set-extra syb template-haskell th-desugar th-orphans ]; testDepends = [ array base bytestring containers data-default deepseq ghc-prim - hspec hspec-core lens mtl syb template-haskell text th-desugar - th-orphans th-reify-many + hspec hspec-core lens mtl mtl-unleashed syb template-haskell text + th-desugar th-orphans th-reify-many ]; homepage = "https://github.com/seereason/th-typegraph"; description = "Graph of the subtype relation"; @@ -126622,8 +127367,8 @@ self: { }: mkDerivation { pname = "threepenny-gui"; - version = "0.6.0.2"; - sha256 = "0ghcf6p7i39ss63snmk6hn20cw4hyi3agr05rdh7n60fyf9afs4c"; + version = "0.6.0.3"; + sha256 = "04qrwvzz705s8aqb8f5vgakh78rv1w64ldv2mvm6fg3llfl5nlfd"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -126821,8 +127566,8 @@ self: { }: mkDerivation { pname = "tidal"; - version = "0.5.2"; - sha256 = "0ll65q5fi8qfi50q9lqxdq9nsr7gizbh2xrsxgvj09nacdnwfwv0"; + version = "0.5.3"; + sha256 = "09bq5ng0wvl1rcaaaw0p2b84f9sddpmabaf9c72ifw3z9k35cfyw"; buildDepends = [ base binary bytestring colour containers hashable hmt hosc mersenne-random-pure64 mtl parsec process text time transformers @@ -126834,15 +127579,16 @@ self: { }) {}; "tidal-midi" = callPackage - ({ mkDerivation, alsa-core, alsa-seq, base, containers, hashable - , hosc, process, tidal + ({ mkDerivation, base, bytestring, containers, hashable, hosc + , PortMidi, process, tidal, time }: mkDerivation { pname = "tidal-midi"; - version = "0.0.1"; - sha256 = "0j2smcjbnsa6ksrgfmcjbm6sjq9ps0l8fqzaib60pgi34b6dnzv8"; + version = "0.0.2"; + sha256 = "0q3g4qgzpd8p4z3l1npcs0gy14967l3yn4xqingdbcq22xasim6q"; buildDepends = [ - alsa-core alsa-seq base containers hashable hosc process tidal + base bytestring containers hashable hosc PortMidi process tidal + time ]; homepage = "http://tidal.lurk.org/"; description = "MIDI support for tidal"; @@ -127385,12 +128131,11 @@ self: { ({ mkDerivation, base, old-locale, time }: mkDerivation { pname = "timestamper"; - version = "1.0"; - sha256 = "14b9zg2lyd8lja9agy73vpscjbkv5nwk6h780wl0xk6m4md9vyj3"; + version = "1.0.3"; + sha256 = "1qpzk3047ky0lx5riivv9fa418qhwsa5iyy1fb9l7az6ri094qys"; isLibrary = false; isExecutable = true; buildDepends = [ base old-locale time ]; - jailbreak = true; homepage = "https://github.com/kisom/timestamper"; description = "Read standard input and prepend each line with a timestamp"; license = stdenv.lib.licenses.mit; @@ -129454,15 +130199,14 @@ self: { }: mkDerivation { pname = "twitter-feed"; - version = "0.2.0.1"; - sha256 = "19j10mbvmmdni136b0sdyr0isdhslxcvgabvdqrd3if6cizpmndn"; + version = "0.2.0.2"; + sha256 = "19kwhk0bvwnyhychvfzc09w00ix7z9fmvrb4vv56vxdg20rni3fk"; buildDepends = [ aeson authenticate-oauth base bytestring http-conduit ]; testDepends = [ base containers HUnit test-framework test-framework-hunit ]; - jailbreak = true; homepage = "https://github.com/stackbuilders/twitter-feed"; description = "Client for fetching Twitter timeline via Oauth"; license = stdenv.lib.licenses.mit; @@ -130526,10 +131270,9 @@ self: { ({ mkDerivation, base, io-streams, unagi-chan }: mkDerivation { pname = "unagi-streams"; - version = "0.1.2"; - sha256 = "0fhs55bap2dkp9lismq4df4sy8878f52xawr4an4cl0v1yj12cq0"; + version = "0.1.3"; + sha256 = "0m8x1sw925xwj2yd2ji0nk54gw1gqqz1zy0bk9z3c3sgbcy364m6"; buildDepends = [ base io-streams unagi-chan ]; - jailbreak = true; description = "Unagi Chan IO-Streams"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -130577,17 +131320,17 @@ self: { }) {}; "unbound-generics" = callPackage - ({ mkDerivation, base, containers, contravariant, mtl, profunctors - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, containers, contravariant, deepseq, mtl + , profunctors, QuickCheck, tasty, tasty-hunit, tasty-quickcheck , template-haskell, transformers, transformers-compat }: mkDerivation { pname = "unbound-generics"; - version = "0.1.2.1"; - sha256 = "0vwqbq3xmacc9fa95wvy2l6r4h831a8g6w1pbxbip2bgqmybsfvk"; + version = "0.2"; + sha256 = "0wmr7ylczkaqyf1yrcp9d9gmw8hv7v2yip9v96zlqx02m9j57s99"; buildDepends = [ - base containers contravariant mtl profunctors template-haskell - transformers transformers-compat + base containers contravariant deepseq mtl profunctors + template-haskell transformers transformers-compat ]; testDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck @@ -130885,17 +131628,21 @@ self: { }) {}; "uniform-io" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, data-default-class - , iproute, network, openssl, transformers, word8 + ({ mkDerivation, attoparsec, base, bytestring, Cabal + , data-default-class, iproute, network, openssl, transformers + , word8 }: mkDerivation { pname = "uniform-io"; - version = "0.1.0.0"; - sha256 = "1xb934jvj3gk6lw2xdm22p8yayybqk823pk0ssly7kz2dyzrqzz7"; + version = "0.1.1.0"; + revision = "1"; + sha256 = "0i9sdf2nnaf099r79mdrqa1hbbqyb874fk8dsqqzb1582m6czikk"; + editedCabalFile = "4f0651eff7cbdde40b49b5fcf90e8adf5c403a7c150ac318f0f5280b454b19f9"; buildDepends = [ attoparsec base bytestring data-default-class iproute network transformers word8 ]; + testDepends = [ base Cabal ]; extraLibraries = [ openssl ]; homepage = "https://sealgram.com/git/haskell/uniform-io"; description = "Uniform IO over files, network, watever"; @@ -132376,14 +133123,14 @@ self: { "uuid" = callPackage ({ mkDerivation, base, binary, bytestring, cryptohash, HUnit , network-info, QuickCheck, random, tasty, tasty-hunit - , tasty-quickcheck, time, uuid-types + , tasty-quickcheck, text, time, uuid-types }: mkDerivation { pname = "uuid"; - version = "1.3.10"; - sha256 = "0csq2y8rzdy8cnag4piqvxa742jasxqcq07qgrp4kmdkbnbqvyvy"; + version = "1.3.11"; + sha256 = "1m8lk12ls4c5xx1y3wm2n2spm2c5slwb27k6zrdibja8z397c637"; buildDepends = [ - base binary bytestring cryptohash network-info random time + base binary bytestring cryptohash network-info random text time uuid-types ]; testDepends = [ @@ -132431,13 +133178,15 @@ self: { "uuid-types" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, hashable, HUnit - , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck + , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "uuid-types"; - version = "1.0.1"; - sha256 = "1brws1nq3pmd3sq786kig2raaxdcx2s8anwsn9f1jj92i5r7y7jb"; - buildDepends = [ base binary bytestring deepseq hashable random ]; + version = "1.0.2"; + sha256 = "019f9w1jvqacbxmq828wsn6zpwp5yw7bkhyj34a4cc2zq3bfkijn"; + buildDepends = [ + base binary bytestring deepseq hashable random text + ]; testDepends = [ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; @@ -132825,6 +133574,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "varying" = callPackage + ({ mkDerivation, base, time }: + mkDerivation { + pname = "varying"; + version = "0.1.0.3"; + sha256 = "1y7mf2q1lawx3f8hdd9b70fa3hrmabm9lmi2rhxvr1dq5r5yh5q7"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base time ]; + homepage = "https://github.com/schell/varying"; + description = "Automaton based varying values, event streams and tweening"; + license = stdenv.lib.licenses.mit; + }) {}; + "vault" = callPackage ({ mkDerivation, base, containers, hashable, unordered-containers }: @@ -132930,8 +133693,8 @@ self: { }) {}; "vcsgui" = callPackage - ({ mkDerivation, base, directory, filepath, gtk3, mtl, process - , text, vcswrapper + ({ mkDerivation, base, directory, filepath, gtk, mtl, process, text + , vcswrapper }: mkDerivation { pname = "vcsgui"; @@ -132940,7 +133703,7 @@ self: { isLibrary = true; isExecutable = true; buildDepends = [ - base directory filepath gtk3 mtl process text vcswrapper + base directory filepath gtk mtl process text vcswrapper ]; homepage = "https://github.com/forste/haskellVCSGUI"; description = "GUI library for source code management systems"; @@ -133398,6 +134161,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "verbosity" = callPackage + ({ mkDerivation, base, binary, data-default-class, deepseq }: + mkDerivation { + pname = "verbosity"; + version = "0.2.0.0"; + sha256 = "0vwv4f5ni6dzvj3jbgxcy8b2hmal6c8xbdin16pifqrn55d52pa9"; + buildDepends = [ base binary data-default-class deepseq ]; + homepage = "https://github.com/trskop/verbosity"; + description = "Simple enum that encodes application verbosity"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "verilog" = callPackage ({ mkDerivation, alex, array, base, happy }: mkDerivation { @@ -133512,8 +134287,8 @@ self: { }: mkDerivation { pname = "vimeta"; - version = "0.2.0.0"; - sha256 = "14xzqhykw963ja6wsnrbq8dh9wbk63aramzj4n210srwxy6yqc05"; + version = "0.2.1.0"; + sha256 = "0sc5mlv4d9srgv6rj43ddn27rindpyrz2mwz2i5rmm8y4ixn7jrq"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -133866,6 +134641,7 @@ self: { buildDepends = [ base glib gtk3 pango ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ vte ]; + jailbreak = true; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the VTE library"; license = stdenv.lib.licenses.lgpl21; @@ -133882,8 +134658,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.2.9"; - sha256 = "013bha8b30q7ax2qyv315hmdxhzfqgc2bw2wyz1q53qw0mxyhbjr"; + version = "5.2.10"; + sha256 = "0wl4qfag8hkhsbm66cgxs55nq3fgmxdxzcvjvcbcm42pcyikvx9y"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -134165,8 +134941,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.9"; - sha256 = "19rnkqg4x6n2w2313naxbkcp2hyj4bj6d6kx3rwakk8wmdy70r04"; + version = "3.0.10"; + sha256 = "0dqvfwqzkr3g030s24lzy9l9vaws27m0cs0aq771p7f22w9g6fjh"; buildDepends = [ ansi-terminal base base64-bytestring blaze-builder bytestring case-insensitive containers cookie data-default-class deepseq @@ -134853,17 +135629,18 @@ self: { "wai-routes" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers - , http-types, mtl, path-pieces, random, template-haskell, text, wai + , http-types, monad-loops, mtl, path-pieces, random + , template-haskell, text, wai }: mkDerivation { pname = "wai-routes"; - version = "0.7.1"; - sha256 = "053bgiw2abwjlc6ap9ka4kdg410gxxmyqdfzsxiva94sp3w816xx"; + version = "0.7.2"; + sha256 = "05f8524q9rb5y4d8fryhv4jjkcgqygbckg4pkklvs86s5zlg9nsa"; buildDepends = [ - aeson base blaze-builder bytestring containers http-types mtl - path-pieces random template-haskell text wai + aeson base blaze-builder bytestring containers http-types + monad-loops mtl path-pieces random template-haskell text wai ]; - homepage = "https://github.com/ajnsit/wai-routes"; + homepage = "https://ajnsit.github.io/wai-routes/"; description = "Typesafe URLs for Wai applications"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -135107,8 +135884,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.1.0"; - sha256 = "1lx1fbcf8bkr5g6j0flk6mplnvs289lkyds5hv31naa450wbca62"; + version = "3.1.2"; + sha256 = "1ya8mfvb18p9d5bj0ijnlbd7m04mj7f1z9ld82a8vry37sdifidq"; buildDepends = [ array auto-update base blaze-builder bytestring case-insensitive containers ghc-prim hashable http-date http-types http2 iproute @@ -135658,10 +136435,13 @@ self: { mkDerivation { pname = "webcrank-dispatch"; version = "0.1"; + revision = "1"; sha256 = "1w4kfcm2d6iw4d45ywg2g6iysxl2iywk3nbk5ac6p6500y6hh97k"; + editedCabalFile = "50b6b56e1fccc20a2986ea93b04410b8131ea5f2f4df94df538c6b2369400fa8"; buildDepends = [ base bytestring mtl path-pieces reroute text unordered-containers ]; + jailbreak = true; homepage = "https://github.com/webcrank/webcrank-dispatch.hs"; description = "A simple request dispatcher"; license = stdenv.lib.licenses.bsd3; @@ -135846,6 +136626,7 @@ self: { buildDepends = [ base bytestring cairo glib gtk3 mtl pango text ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ webkit ]; + jailbreak = true; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; @@ -135862,6 +136643,7 @@ self: { buildDepends = [ base glib gtk3 webkitgtk3 ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ webkit ]; + jailbreak = true; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; }) { inherit (pkgs) webkit;}; @@ -137500,8 +138282,8 @@ self: { }: mkDerivation { pname = "xhb"; - version = "0.5.2014.4.10"; - sha256 = "1r5z92p98jn8pdcqmdiv0hriq7y8743q4sxfjfds602rr4qf97gz"; + version = "0.6.2015.8.1"; + sha256 = "1rq6g96v1fs66kdmnkvlkcxrv614ha77czclm3sfw274f7q2r2kb"; buildDepends = [ base binary byteorder bytestring containers network parsec stm Xauth @@ -137713,8 +138495,8 @@ self: { }: mkDerivation { pname = "xlsx"; - version = "0.1.0.4"; - sha256 = "1zri5wan5h3nyizfrfmnw9mz2cwapi4wrc3srxqns5w12v866p3a"; + version = "0.1.0.5"; + sha256 = "0zd3p0dkb4v9gcd3mvp6g64z1gr1m5x0pf2zyj3w7ab0dgz4gzsz"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -137726,7 +138508,6 @@ self: { base containers HUnit old-time smallcheck tasty tasty-hunit tasty-smallcheck time ]; - jailbreak = true; homepage = "https://github.com/qrilka/xlsx"; description = "Simple and incomplete Excel file parser/writer"; license = stdenv.lib.licenses.mit; @@ -138710,8 +139491,8 @@ self: { }: mkDerivation { pname = "xss-sanitize"; - version = "0.3.5.5"; - sha256 = "05qmhd50bdy5z0nvqvrm25ax4i642gv6gkdn678flg6sckshr4s2"; + version = "0.3.5.6"; + sha256 = "1j2qrn2dbfx01m7zyk9ilgnp9zjwq9mk62b0rdal4zkg4vh212h0"; buildDepends = [ attoparsec base containers css-text network-uri tagsoup text utf8-string @@ -139718,8 +140499,8 @@ self: { }: mkDerivation { pname = "yesod-bin"; - version = "1.4.13"; - sha256 = "0rqwmvl2pl05fp7xyfcpmpjkki8ww47rhifcclasaxvj109hvj1k"; + version = "1.4.13.1"; + sha256 = "1vnqiibdjvkja80b8i352afrhphx8v6nihylgxaywch20b2fbkrc"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -139737,6 +140518,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-bootstrap" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, conduit + , conduit-extra, containers, either, email-validate + , lens-family-core, lens-family-th, MonadRandom, mtl, persistent + , shakespeare, text, time, transformers, yesod-core, yesod-form + , yesod-markdown + }: + mkDerivation { + pname = "yesod-bootstrap"; + version = "0.1.0.0"; + sha256 = "19hzc1k0ssmsi9k4r5bxmngr1h8a42qhaxcl5y99fbf6khpndxzg"; + buildDepends = [ + base blaze-html blaze-markup conduit conduit-extra containers + either email-validate lens-family-core lens-family-th MonadRandom + mtl persistent shakespeare text time transformers yesod-core + yesod-form yesod-markdown + ]; + description = "Bootstrap widgets for yesod"; + license = stdenv.lib.licenses.mit; + }) {}; + "yesod-comments" = callPackage ({ mkDerivation, base, bytestring, directory, friendly-time , gravatar, old-locale, persistent, template-haskell, text, time @@ -140110,6 +140912,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yesod-lucid" = callPackage + ({ mkDerivation, base, lucid, monads-tf, text, yesod-core }: + mkDerivation { + pname = "yesod-lucid"; + version = "0.1"; + sha256 = "1ymmpi9g3pjl23ymdjwiv748lnq1hyjq24la2ffgwrm4b6f41xip"; + buildDepends = [ base lucid monads-tf text yesod-core ]; + description = "Lucid support for Yesod"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yesod-mangopay" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra , containers, country-codes, data-default, directory, fast-logger @@ -140143,18 +140956,18 @@ self: { "yesod-markdown" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring - , directory, pandoc, persistent, shakespeare, texmath, text + , directory, hspec, pandoc, persistent, shakespeare, texmath, text , xss-sanitize, yesod-core, yesod-form }: mkDerivation { pname = "yesod-markdown"; - version = "0.9.4"; - sha256 = "1mam4ibbnzvi1ljlj8kzz24s8jxk3f3xvvicmcygklz0n9pmaw66"; + version = "0.10.0"; + sha256 = "0n9rcpf8s89swj0pz86xddl5zjbkkw1fa1h292wvs15y77lrl0zi"; buildDepends = [ base blaze-html blaze-markup bytestring directory pandoc persistent shakespeare texmath text xss-sanitize yesod-core yesod-form ]; - jailbreak = true; + testDepends = [ base blaze-html hspec text ]; homepage = "http://github.com/pbrisbin/yesod-markdown"; description = "Tools for using markdown in a yesod application"; license = stdenv.lib.licenses.gpl2; @@ -140650,8 +141463,8 @@ self: { }: mkDerivation { pname = "yesod-table"; - version = "1.0.2"; - sha256 = "0rrc9cfjl1g8if0ncs2xzpb1hnaa4hi3w62q16gwir0l79vfj7b9"; + version = "1.0.3"; + sha256 = "02w7ddyi0zzcvhlj1b01p3zjii2g7bn2f7wcgrdidk8dlg9hrgj5"; buildDepends = [ base containers contravariant text yesod-core ]; homepage = "https://github.com/andrewthad/yesod-table"; description = "HTML tables for Yesod"; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 792b6d2e4db..1a8cb233b77 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -1,14 +1,16 @@ -{stdenv, fetchurl, pkgconfig, libsoup, glib, libxml2}: +{ stdenv, fetchurl, pkgconfig, libsoup, glib }: stdenv.mkDerivation { - name = "gssdp-0.12.2.1"; + name = "gssdp-0.14.11"; src = fetchurl { - url = mirror://gnome/sources/gssdp/0.14/gssdp-0.14.6.tar.xz; - sha256 = "1kgakr0rpdpm7nkp4ycka12nndga16wmzim79v1nbcc0j2wxxkws"; + url = mirror://gnome/sources/gssdp/0.14/gssdp-0.14.11.tar.xz; + sha256 = "0njkqr2y7c6linnw4wkc4y2vq5dfkpryqcinbzn0pzhr46psxxbv"; }; - buildInputs = [pkgconfig libsoup glib libxml2]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsoup ]; + propagatedBuildInputs = [ glib ]; meta = { description = "GObject-based API for handling resource discovery and announcement over SSDP"; diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix index 2dcd5b11c38..789fdcd9c2a 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchurl, gupnp, pkgconfig }: +{ stdenv, fetchurl, pkgconfig, gupnp, glib, libxml2 }: stdenv.mkDerivation rec { name = "gupnp-av-${version}"; majorVersion = "0.12"; - version = "${majorVersion}.4"; + version = "${majorVersion}.7"; + src = fetchurl { - url = "mirror://gnome/sources/gupnp-av/${majorVersion}/gupnp-av-${version}.tar.xz"; - sha256 = "0nvsvpiyfslz54j4hjh2gsdjkbi2qj2f4k0aw8s7f05kibprr2jl"; + url = "mirror://gnome/sources/gupnp-av/${majorVersion}/${name}.tar.xz"; + sha256 = "35e775bc4f7801d65dcb710905a6b8420ce751a239b5651e6d830615dc906ea8"; }; - buildInputs = [ gupnp pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gupnp glib libxml2 ]; meta = { homepage = http://gupnp.org/; description = "A collection of helpers for building AV (audio/video) applications using GUPnP"; - longDescription = "GUPnP implements the UPnP specification: resource announcement and discovery, description, control, event notification, and presentation (GUPnP includes basic web server functionality through libsoup). GUPnP does not include helpers for construction or control of specific standardized resources (e.g. MediaServer); this is left for higher level libraries utilizing the GUPnP framework."; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index 20a5f2d9c94..182905e9546 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, glib, gupnp, python, pygobject }: +{ stdenv, fetchurl, pkgconfig, glib, gupnp }: stdenv.mkDerivation rec { - name = "gupnp-igd-0.2.1"; + name = "gupnp-igd-${version}"; + majorVersion = "0.2"; + version = "${majorVersion}.4"; src = fetchurl { - url = https://launchpad.net/ubuntu/+archive/primary/+files/gupnp-igd_0.2.1.orig.tar.gz; - sha256 = "18ia8l24hbylz3dnbg2jf848bmbx0hjkq4fkwzzfn57z021f0fh2"; + url = "mirror://gnome/sources/gupnp-igd/${majorVersion}/${name}.tar.xz"; + sha256 = "38c4a6d7718d17eac17df95a3a8c337677eda77e58978129ad3182d769c38e44"; }; - propagatedBuildInputs = [ gupnp ]; - - buildInputs = [ glib python pygobject ]; - nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ glib gupnp ]; meta = { homepage = http://www.gupnp.org/; + license = stdenv.lib.licenses.lgpl21; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index e278980e1e1..6145c8c4947 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -1,24 +1,23 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, libuuid }: +{ stdenv, fetchurl, pkgconfig, glib, gssdp, libsoup, libxml2, libuuid }: stdenv.mkDerivation rec { name = "gupnp-${version}"; majorVersion = "0.20"; - version = "${majorVersion}.9"; + version = "${majorVersion}.14"; + src = fetchurl { url = "mirror://gnome/sources/gupnp/${majorVersion}/gupnp-${version}.tar.xz"; - sha256 = "0vicydn3f72x1rqql7857ans85mg7dfap7n7h8xrfyb9whxhlrb1"; + sha256 = "77ffb940ba77c4a6426d09d41004c75d92652dcbde86c84ac1c847dbd9ad59bd"; }; - propagatedBuildInputs = [ libxml2 libsoup gssdp ]; - buildInputs = [ glib libuuid ]; - nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ glib gssdp libsoup libxml2 libuuid ]; - postInstall = '' - cp -r ${libsoup}/include/libsoup-2.4/libsoup $out/include - cp -r ${gssdp}/include/gssdp-1.0/libgssdp $out/include - cp -r ${libxml2}/include/libxml2/libxml $out/include - ''; + postInstall = '' + ln -sv ${libsoup}/include/*/libsoup $out/include + ln -sv ${libxml2}/include/*/libxml $out/include + ln -sv ${gssdp}/include/*/libgssdp $out/include + ''; meta = { homepage = http://www.gupnp.org/; diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index bcc9e9f673f..2784cd90a5c 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -1,23 +1,16 @@ -{ stdenv, fetchgit, autoconf, automake, libtool, -pkgconfig, perl, git, libevent, openssl}: +{ stdenv, fetchurl, cmake, pkgconfig, libevent, openssl}: stdenv.mkDerivation { - name = "libcouchbase-2.4.4"; - src = fetchgit { - url = "https://github.com/couchbase/libcouchbase.git"; - rev = "4410eebcd813844b6cd6f9c7eeb4ab3dfa2ab8ac"; - sha256 = "02lzv5l6fvnqr2l9bqfha0pzkzlzjfddn3w5zcbjz36kw4p2p4h9"; - leaveDotGit = true; + name = "libcouchbase-2.5.2"; + src = fetchurl { + url = "https://github.com/couchbase/libcouchbase/archive/2.5.2.tar.gz"; + sha256 = "0ka1hix38a2kdhxz6n8frssyznf78ra0irga9d8lr5683y73xw24"; }; - preConfigure = '' - patchShebangs ./config/ - ./config/autorun.sh - ''; + cmakeFlags = "-DLCB_NO_MOCK=ON"; - configureFlags = "--disable-couchbasemock"; - - buildInputs = [ autoconf automake libtool pkgconfig perl git libevent openssl]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libevent openssl]; meta = { description = "C client library for Couchbase"; diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index 4ccb7d4df8b..003b2acc920 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gstreamer, gst_plugins_base }: +{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gst_all_1 }: stdenv.mkDerivation rec { - name = "libnice-0.1.4"; + name = "libnice-0.1.13"; src = fetchurl { url = "http://nice.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "0mxzr3y91hkjxdz1mzhxwi59la86hw2rzmd3y9c32801kkg1gra4"; + sha256 = "1q8rhklbz1zla67r4mw0f7v3m5b32maj0prnr0kshcz97fgjs4b1"; }; - buildInputs = [ pkgconfig glib gupnp_igd gstreamer gst_plugins_base ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; + propagatedBuildInputs = [ glib gupnp_igd ]; meta = { homepage = http://nice.freedesktop.org/wiki/; diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix index 3cb9629e3e1..8f46d1c0bfd 100644 --- a/pkgs/development/libraries/liboauth/default.nix +++ b/pkgs/development/libraries/liboauth/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, nss, openssl, pkgconfig }: +{ fetchurl, stdenv, nss, nspr, pkgconfig }: stdenv.mkDerivation rec { @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "07w1aq8y8wld43wmbk2q8134p3bfkp2vma78mmsfgw2jn1bh3xhd"; }; - buildInputs = [ nss openssl ]; + buildInputs = [ pkgconfig nss nspr ]; + + configureFlags = [ "--enable-nss" ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index 2a523793559..3071aa3fdfc 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -3,11 +3,11 @@ assert !(stdenv ? cross) -> zlib != null; stdenv.mkDerivation rec { - name = "libpng-1.2.52"; + name = "libpng-1.2.53"; src = fetchurl { url = "mirror://sourceforge/libpng/${name}.tar.xz"; - sha256 = "1h0fa67x4bh7gcdh7qx87m4xpkdfqa7ihd4h678dcyh52jzhzyyl"; + sha256 = "02jwfqk1ahqfvbs9gdyb5v0123by9ws6m7jnfvainig7i7v4jpml"; }; propagatedBuildInputs = [ zlib ]; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 17820fa8188..53777a0c56f 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, zlib, apngSupport ? false }: +{ stdenv, fetchurl, zlib, apngSupport ? true }: assert zlib != null; let - version = "1.6.16"; - sha256 = "0q5ygy15jkpqbj5701ywrjzqp4nl5yz3r4g58h2p0kiycggm9xs2"; + version = "1.6.18"; + sha256 = "0qq96rf31483kxz32h6l6921hy6p2v2pfqfvc74km229g4xw241f"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz"; - sha256 = "1sf27a5gvwvcm4wsf2pyq87d3g4l2fym8cirq9sli54bi753ikbh"; + sha256 = "0g2ljh2vhclas1hacys1c4gk6l6hyy6sngb2yvdsnjz50nyq16kv"; }; whenPatched = stdenv.lib.optionalString apngSupport; diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 3065af0fd15..0b7069ab67d 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -36,7 +36,7 @@ in buildPythonPackage rec { six ]; - # Tests are in <nixos/tests/blivet.nix>. + # Tests are in <nixpkgs/nixos/tests/blivet.nix>. doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index f5c6a9bcd1a..f0698de5c7e 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "6.8.1"; + version = "6.8.2"; name = "checkstyle-${version}"; src = fetchurl { url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz"; - sha256 = "12da8msz5459ra0g5smr8daqh88mfa653nn475acjp1ycsm395hv"; + sha256 = "1r0wb8iqvmhvgxk1ya39x8b4ayd549bfxmnw26i84870hnqr179c"; }; installPhase = '' diff --git a/pkgs/development/tools/build-managers/apache-maven/builder.sh b/pkgs/development/tools/build-managers/apache-maven/builder.sh index 03e4a041402..8d06352b135 100644 --- a/pkgs/development/tools/build-managers/apache-maven/builder.sh +++ b/pkgs/development/tools/build-managers/apache-maven/builder.sh @@ -2,16 +2,16 @@ source $stdenv/setup unpackPhase -mkdir -p $out -cp -r $name/* $out +mkdir -p $out/maven +cp -r $name/* $out/maven -wrapProgram $out/bin/mvn --set JAVA_HOME "$jdk" +makeWrapper $out/maven/bin/mvn $out/bin/mvn --set JAVA_HOME "$jdk" # Add the maven-axis and JIRA plugin by default when using maven 1.x -if [ -e $out/bin/maven ] +if [ -e $out/maven/bin/maven ] then export OLD_HOME=$HOME export HOME=. - $out/bin/maven plugin:download -DgroupId=maven-plugins -DartifactId=maven-axis-plugin -Dversion=0.7 + $out/maven/bin/maven plugin:download -DgroupId=maven-plugins -DartifactId=maven-axis-plugin -Dversion=0.7 export HOME=OLD_HOME fi diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix index 778019ea541..99a11e9fbf7 100644 --- a/pkgs/development/tools/build-managers/boot/default.nix +++ b/pkgs/development/tools/build-managers/boot/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jdk }: stdenv.mkDerivation rec { - version = "2.0.0"; + version = "2.2.0"; name = "boot-${version}"; src = fetchurl { url = "https://github.com/boot-clj/boot/releases/download/${version}/boot.sh"; - sha256 = "0hvznr0z5ck32wpaqhjv2fr9365b8h0h8brnsmwijpv699l0rf1c"; + sha256 = "0czavpdhmpgp20vywf326ix1f94dky51mqiwyblrmrd33d89qz9f"; }; inherit jdk; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 3bff9d59e7f..fd99437630c 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -pv $out - cp -rv lib $out + mkdir -pv $out/gradle + cp -rv lib $out/gradle - gradle_launcher_jar=$(echo $out/lib/gradle-launcher-*.jar) + gradle_launcher_jar=$(echo $out/gradle/lib/gradle-launcher-*.jar) test -f $gradle_launcher_jar makeWrapper ${jdk}/bin/java $out/bin/gradle \ --set JAVA_HOME ${jdk} \ diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 0762d175e89..f41969ebb43 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -42,6 +42,11 @@ stdenv.mkDerivation { EOF chmod +x $out/bin/g++ fi + for executable in $(ls ${gcc.cc}/bin); do + if [ ! -x "$out/bin/$executable" ]; then + ln -s ${gcc.cc}/bin/$executable $out/bin/$executable + fi + done ''); }; diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 487c57c5484..8f3818fb6b4 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "fswatch-${version}"; - version = "1.4.7"; + version = "1.5.0"; src = fetchFromGitHub { owner = "emcrisostomo"; repo = "fswatch"; rev = version; - sha256 = "0f6aa14v31gy3j7qx563ml37r8mylpbqfjrz2v5g44zrrg6086w7"; + sha256 = "09np75m9df2nk7lc5y9wgq467ca6jsd2p5666d5rkzjvy6s0a51n"; }; buildInputs = [ autoreconfHook gettext libtool makeWrapper texinfo ]; diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix new file mode 100644 index 00000000000..8ef68f93a2f --- /dev/null +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, + bison2, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg, libpng, perl, python, ruby, sqlite +}: + +stdenv.mkDerivation rec { + name = "phantomjs-${version}"; + version = "2.0.0-20150528"; + + src = fetchurl { + url = "https://github.com/bprodoehl/phantomjs/archive/v2.0.0-20150528.tar.gz"; + sha256 = "18h37bxxg25lacry9k3vb5yim057bqcxmsifw97jrjp7gzfx56v5"; + }; + + buildInputs = [ bison2 flex fontconfig freetype gperf icu openssl libjpeg libpng perl python ruby sqlite ]; + + patchPhase = '' + patchShebangs . + sed -i -e 's|/bin/pwd|pwd|' src/qt/qtbase/configure + ''; + + buildPhase = "./build.sh --confirm"; + + installPhase = '' + mkdir -p $out/share/doc/phantomjs + cp -a bin $out + cp -a ChangeLog examples LICENSE.BSD README.md third-party.txt $out/share/doc/phantomjs + ''; + + meta = { + description = "Headless WebKit with JavaScript API"; + longDescription = '' + PhantomJS2 is a headless WebKit with JavaScript API. + It has fast and native support for various web standards: + DOM handling, CSS selector, JSON, Canvas, and SVG. + + PhantomJS is an optimal solution for: + - Headless Website Testing + - Screen Capture + - Page Automation + - Network Monitoring + ''; + + homepage = http://phantomjs.org/; + license = stdenv.lib.licenses.bsd3; + + maintainers = [ stdenv.lib.maintainers.aflatter ]; + platforms = with stdenv.lib.platforms; darwin ++ linux; + }; +} diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix index e8658e09183..d6072484669 100644 --- a/pkgs/development/web/iojs/default.nix +++ b/pkgs/development/web/iojs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }: let - version = "2.5.0"; + version = "3.0.0"; inherit (stdenv.lib) optional maintainers licenses platforms; in stdenv.mkDerivation { name = "iojs-${version}"; src = fetchurl { url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz"; - sha256 = "0jj0xqwpq7s45bycs406ml12xyknxgad4vyw9k84al3551m5y2wd"; + sha256 = "0maxxmr6y7z3y3r88nhcnfzmpvbhs5p8knyz886bh2shgzd6nzqf"; }; prePatch = '' diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index d173b0ac406..61d76a6c42f 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -6,18 +6,20 @@ let - version = "3.15.7"; + # Version 3.15.7 breaks certain (but not all) PCL-based printers: + # https://github.com/NixOS/nixpkgs/commit/b0e46fc3ead209ef24ed6214bd41ef6e604af54f + version = "3.15.6"; name = "hplip-${version}"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "17flpl89lgwlbsy9mka910g530nnvlwqqnif8a9hyq7k90q9046k"; + sha256 = "1jbnjw7vrn1qawrjfdv8j58w69q8ki1qkzvlh0nk8nxacpp17i9h"; }; plugin = fetchurl { url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "0fblh5m43jnws4vkwks0b4m9k3jg9kspaj1l8bic0r5swy97s41m"; + sha256 = "1rymxahz12s1s37rri5qyvka6q0yi0yai08kgspg24176ry3a3fx"; }; hplip_state = @@ -75,23 +77,25 @@ stdenv.mkDerivation { {} + ''; - configureFlags = '' - --with-cupsfilterdir=$(out)/lib/cups/filter - --with-cupsbackenddir=$(out)/lib/cups/backend - --with-icondir=$(out)/share/applications - --with-systraydir=$(out)/xdg/autostart - --with-mimedir=$(out)/etc/cups - --enable-policykit - ''; - - makeFlags = '' - halpredir=$(out)/share/hal/fdi/preprobe/10osvendor - rulesdir=$(out)/etc/udev/rules.d - policykit_dir=$(out)/share/polkit-1/actions - policykit_dbus_etcdir=$(out)/etc/dbus-1/system.d - policykit_dbus_sharedir=$(out)/share/dbus-1/system-services - hplip_confdir=$(out)/etc/hp - hplip_statedir=$(out)/var/lib/hp + preConfigure = '' + export configureFlags="$configureFlags + --with-cupsfilterdir=$out/lib/cups/filter + --with-cupsbackenddir=$out/lib/cups/backend + --with-icondir=$out/share/applications + --with-systraydir=$out/xdg/autostart + --with-mimedir=$out/etc/cups + --enable-policykit + " + + export makeFlags=" + halpredir=$out/share/hal/fdi/preprobe/10osvendor + rulesdir=$out/etc/udev/rules.d + policykit_dir=$out/share/polkit-1/actions + policykit_dbus_etcdir=$out/etc/dbus-1/system.d + policykit_dbus_sharedir=$out/share/dbus-1/system-services + hplip_confdir=$out/etc/hp + hplip_statedir=$out/var/lib/hp + " ''; enableParallelBuilding = true; @@ -175,6 +179,6 @@ stdenv.mkDerivation { then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ]; - maintainers = with maintainers; [ ttuegel jgeerds nckx ]; + maintainers = with maintainers; [ jgeerds nckx ]; }; } diff --git a/pkgs/misc/emulators/wine/builder-wow.sh b/pkgs/misc/emulators/wine/builder-wow.sh index c7d9ed55a3f..cf6cc59a6da 100644 --- a/pkgs/misc/emulators/wine/builder-wow.sh +++ b/pkgs/misc/emulators/wine/builder-wow.sh @@ -1,5 +1,7 @@ #!/bin/sh +## build described at http://wiki.winehq.org/Wine64 + source $stdenv/setup unpackPhase diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix index 4714834fbcb..2775150385d 100644 --- a/pkgs/misc/emulators/wine/versions.nix +++ b/pkgs/misc/emulators/wine/versions.nix @@ -1,7 +1,7 @@ { unstable = { - wineVersion = "1.7.47"; - wineSha256 = "0bmvgcag0kv0671dj6fbfdz86ij91rb2kp2dssqw83a0xidgfx5s"; + wineVersion = "1.7.48"; + wineSha256 = "13kcjirif57p8mg4yhzxf0hjpghlwc18iskz66dx94i0dvjmrxg3"; geckoVersion = "2.36"; geckoSha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g"; gecko64Version = "2.36"; @@ -18,13 +18,10 @@ gecko64Sha256 = "0grc86dkq90i59zw43hakh62ra1ajnk11m64667xjrlzi7f0ndxw"; monoVersion = "4.5.6"; monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c"; - ## TESTME wine stable should work with most recent mono - #monoVersion = "0.0.8"; - #monoSha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x"; }; staging = { - version = "1.7.47"; - sha256 = "0m47v4jbc70b7qxj0lqnc7an1xlcb81b6k7dwzjyk3pv3ixp2snp"; + version = "1.7.48"; + sha256 = "06p1h92vaqlzk09aj4na6z7k3a81y9nw19rfg9q2szpcqjdd437w"; }; winetricks = { version = "20150706"; diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix new file mode 100644 index 00000000000..ad3df25df58 --- /dev/null +++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit, autoreconfHook, pkgconfig, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }: + +stdenv.mkDerivation rec { + name = "ima-evm-utils-${version}"; + version = "1.0.0"; + + src = fetchgit { + url = "git://git.code.sf.net/p/linux-ima/ima-evm-utils"; + rev = "4b56112c095cb5cc34dc35abac37ebfc6eadba65"; + sha256 = "6f1ef4e84b9214448ea4a530a562a20ad1ba5a7cfefd7ddda90a56e2404f3a87"; + }; + + buildInputs = [ autoreconfHook pkgconfig openssl attr keyutils asciidoc libxslt ]; + + buildPhase = "make prefix=$out MANPAGE_DOCBOOK_XSL=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"; + + meta = { + description = "evmctl utility to manage digital signatures of the Linux kernel integrity subsystem (IMA/EVM)"; + homepage = "http://sourceforge.net/projects/linux-ima/"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ tstrobel ]; + }; +} diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 7063017b3a8..386004dad43 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -141,6 +141,8 @@ with stdenv.lib; # Video configuration. # Enable KMS for devices whose X.org driver supports it. DRM_I915_KMS y + # Allow specifying custom EDID on the kernel command line + DRM_LOAD_EDID_FIRMWARE y ${optionalString (versionOlder version "3.9") '' DRM_RADEON_KMS? y ''} diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 3d2b683ee72..0d3bfbefcca 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.84"; + version = "3.10.85"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "042cybswcxxzi22h96i4h73a4hcb4drhifs6l9jqlqamdn6xabd3"; + sha256 = "1zn8113m6y1wqmnr6gjzrr7ly2l8860fp2kr4q9di3c2vmnmd9v9"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index e34eccadda6..e6e04b7db53 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.44"; + version = "3.12.45"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "05fyb49ibijq2iv4x25m5a77n8609b4lz8x8n8wfkdywm13479h8"; + sha256 = "01p3zbhngqnkmzw38xmxd0lf97kf2h7ihgss6bgdnkpqrbzb1pqf"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 377f0271aea..c4171948436 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.48"; + version = "3.14.49"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "098a7kjfw4jf0f7h6z57f2719jfz3y3jjlcd8y6d95xvhy7xxyw9"; + sha256 = "1x9p6z195c0nv7hsjcwzmr89yag35v3pyrs0081k2d8dykbl70zs"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix index 8607bcf70cf..eee052ad3bb 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.0.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.0.8"; - # Remember to update grsecurity! + version = "4.0.9"; extraMeta.branch = "4.0"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1cggqi5kdan818xw5g5wmapcsf501f5m9bympsy6a2cpphknfdmn"; + sha256 = "0k42blafzd954fncc0b78vi9x1h2k0jhfvkjqxmpv64i7xwwdhsx"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix index 031b0d549d9..e8534656349 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.1.3"; + version = "4.1.4"; + # Remember to update grsecurity! extraMeta.branch = "4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "02z3palvki31qimmycz4y4wl4lb46n662qql46iah224k0q2rpcn"; + sha256 = "17whsim5l9i486y5kchfpm9jhbr9lak4a1gdqygp5kwfrfyz5qiy"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 0c31c558c47..216f74caa34 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.2-rc2"; - modDirVersion = "4.2.0-rc2"; + version = "4.2-rc5"; + modDirVersion = "4.2.0-rc5"; extraMeta.branch = "4.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "068g71ns8d2j66hppmnssilf185p33w7argb0r2w9kplqq2ac99w"; + sha256 = "1ir3g5in53qq50ygnwgkzjkl1pzb12ar8k1zvfzcxapddvnhayr0"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index a8fc0166508..f3e33047e8b 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -65,17 +65,17 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.48"; - revision = "201507111210"; + { kversion = "3.14.49"; + revision = "201508032312"; branch = "stable"; - sha256 = "0phmqlkx6vqlv79ppf6g4wsx7rwsvwpakpkm9xsq8qazffk7s9qk"; + sha256 = "09x0rb4pgmghcp6sdz57lwhawlb3bzrc3rg372xknhv6993ainjc"; }; grsecurity_unstable = grsecPatch - { kversion = "4.0.8"; - revision = "201507111211"; + { kversion = "4.1.4"; + revision = "201508032312"; branch = "test"; - sha256 = "1p9ym8hbwaan9pgxgn8k4rm3n33wl8ag1fzmyr5f4mxs634wgwgx"; + sha256 = "16p1wq98qgwksav0ry6b5jyyi26s404v1k0cwpj7l7n86hxig67i"; }; grsec_fix_path = diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index 8d160fc958c..871b3524f42 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yaws-${version}"; - version = "1.99"; + version = "2.0"; src = fetchurl { url = "http://yaws.hyber.org/download/${name}.tar.gz"; - sha256 = "057ymg84ji4pfi3xai6kis3mk8zks2ynbiam0x68cb4cb1yfzwcl"; + sha256 = "1gwk44a07n7yvg900yrlfc6qpvjl64k2h2hddd1jaaay8lgpcch6"; }; # The tarball includes a symlink yaws -> yaws-1.95, which seems to be diff --git a/pkgs/servers/nosql/riak/2.1.1.nix b/pkgs/servers/nosql/riak/2.1.1.nix index 74cf03a1ca8..c62cea180be 100644 --- a/pkgs/servers/nosql/riak/2.1.1.nix +++ b/pkgs/servers/nosql/riak/2.1.1.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { postPatch = '' sed -i deps/node_package/priv/base/env.sh \ - -e 's@{{platform_data_dir}}@$RIAK_DATA_DIR@' \ + -e 's@{{platform_data_dir}}@''${RIAK_DATA_DIR:-/var/db/riak}@' \ -e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \ -e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \ - -e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=$RIAK_ETC_DIR@' \ - -e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=$RIAK_LOG_DIR@' + -e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=''${RIAK_ETC_DIR:-/etc/riak}@' \ + -e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=''${RIAK_LOG_DIR:-/var/log}@' ''; preBuild = '' diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index f53bed62e44..0283c48add9 100644 --- a/pkgs/shells/ipython/default.nix +++ b/pkgs/shells/ipython/default.nix @@ -13,12 +13,13 @@ assert qtconsoleSupport == true -> pyqt4 != null; assert pylabQtSupport == true -> pyqt4 != null; buildPythonPackage rec { - name = "ipython-3.1.0"; + name = "ipython-${version}"; + version = "3.2.1"; namePrefix = ""; src = fetchurl { url = "https://pypi.python.org/packages/source/i/ipython/${name}.tar.gz"; - sha256 = "092nilrkr76l1mklnslgbw1cz7z1xabp1hz5s7cb30kgy39r482k"; + sha256 = "c913adee7ae5b338055274c51a7d2b3cea468b5b316046fa520cd8a434b09177"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix index 910fe332d25..edda974281e 100644 --- a/pkgs/tools/backup/obnam/default.nix +++ b/pkgs/tools/backup/obnam/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonPackage rec { name = "obnam-${version}"; - version = "1.12"; + version = "1.13"; namePrefix = ""; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz"; - sha256 = "09b9j2mygv1dsrq424j535c92wvlbzpwgzcgg7x922dxrnsdsxpr"; + sha256 = "13a9icgp7kvxaw700sdhxll0in00ghk0aacg26s4kxmxc85w92i4"; }; buildInputs = [ pythonPackages.sphinx attr ]; diff --git a/pkgs/tools/filesystems/ceph/0.94-pre.nix b/pkgs/tools/filesystems/ceph/0.94-pre.nix new file mode 100644 index 00000000000..fcf57526fd1 --- /dev/null +++ b/pkgs/tools/filesystems/ceph/0.94-pre.nix @@ -0,0 +1,13 @@ +{ callPackage, fetchgit, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "0.94.3"; + + src = fetchgit { + url = "https://github.com/wkennington/ceph.git"; + rev = "6218aa41e04533f0d6e62b5c7be591c2e99716ec"; + sha256 = "0cyl5i1q6lap5a6vk8fjxfpikhxzwm9zkybg37nibahi2bwjr7rr"; + }; + + patches = [ ./fix-pgrefdebugging.patch ]; +}) diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index dca6d930020..8b9cefdbf23 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -164,50 +164,55 @@ stdenv.mkDerivation { ''; configureFlags = [ - (mkOther "exec_prefix" "\${out}") - (mkOther "sysconfdir" "/etc") - (mkOther "localstatedir" "/var") - (mkOther "libdir" "\${lib}/lib") - (mkOther "includedir" "\${lib}/include") - (mkWith true "rbd" null) - (mkWith true "cephfs" null) - (mkWith hasRadosgw "radosgw" null) - (mkWith true "radosstriper" null) - (mkWith hasServer "mon" null) - (mkWith hasServer "osd" null) - (mkWith hasServer "mds" null) - (mkEnable true "client" null) - (mkEnable hasServer "server" null) - (mkWith (cryptoStr == "cryptopp") "cryptopp" null) - (mkWith (cryptoStr == "nss") "nss" null) - (mkEnable false "root-make-check" null) - (mkWith false "profiler" null) - (mkWith false "debug" null) - (mkEnable false "coverage" null) - (mkWith (optFuse != null) "fuse" null) - (mkWith (malloc == optJemalloc) "jemalloc" null) - (mkWith (malloc == optGperftools) "tcmalloc" null) - (mkEnable false "pgrefdebugging" null) - (mkEnable false "cephfs-java" null) - (mkEnable hasXio "xio" null) - (mkWith (optLibatomic_ops != null) "libatomic-ops" null) - (mkWith true "ocf" null) - (mkWith hasKinetic "kinetic" null) - (mkWith hasRocksdb "librocksdb" null) - (mkWith false "librocksdb-static" null) + (mkOther "exec_prefix" "\${out}") + (mkOther "sysconfdir" "/etc") + (mkOther "localstatedir" "/var") + (mkOther "libdir" "\${lib}/lib") + (mkOther "includedir" "\${lib}/include") + (mkWith true "rbd" null) + (mkWith true "cephfs" null) + (mkWith hasRadosgw "radosgw" null) + (mkWith true "radosstriper" null) + (mkWith hasServer "mon" null) + (mkWith hasServer "osd" null) + (mkWith hasServer "mds" null) + (mkEnable true "client" null) + (mkEnable hasServer "server" null) + (mkWith (cryptoStr == "cryptopp") "cryptopp" null) + (mkWith (cryptoStr == "nss") "nss" null) + (mkEnable false "root-make-check" null) + (mkWith false "profiler" null) + (mkWith false "debug" null) + (mkEnable false "coverage" null) + (mkWith (optFuse != null) "fuse" null) + (mkWith (malloc == optJemalloc) "jemalloc" null) + (mkWith (malloc == optGperftools) "tcmalloc" null) + (mkEnable false "pgrefdebugging" null) + (mkEnable false "cephfs-java" null) + (mkEnable hasXio "xio" null) + (mkWith (optLibatomic_ops != null) "libatomic-ops" null) + (mkWith true "ocf" null) + (mkWith hasKinetic "kinetic" null) + (mkWith hasRocksdb "librocksdb" null) + (mkWith false "librocksdb-static" null) ] ++ optional stdenv.isLinux [ - (mkWith (optLibaio != null) "libaio" null) - (mkWith (optLibxfs != null) "libxfs" null) - (mkWith (optZfs != null) "libzfs" null) + (mkWith (optLibaio != null) "libaio" null) + (mkWith (optLibxfs != null) "libxfs" null) + (mkWith (optZfs != null) "libzfs" null) + ] ++ optional (versionAtLeast version "0.94.3") [ + (mkWith false "tcmalloc-minimal" null) ] ++ optional (versionAtLeast version "9.0.1") [ - (mkWith false "tcmalloc-minimal" null) - (mkWith false "valgrind" null) + (mkWith false "valgrind" null) ] ++ optional (versionAtLeast version "9.0.2") [ - (mkWith true "man-pages" null) - (mkWith true "systemd-libexec-dir" "\${TMPDIR}") + (mkWith true "man-pages" null) + (mkWith true "systemd-libexec-dir" "\${out}/libexec") ] ++ optional (versionOlder version "10.0.0") [ - (mkWith (optLibs3 != null) "system-libs3" null) - (mkWith true "rest-bench" null) + (mkWith (optLibs3 != null) "system-libs3" null) + (mkWith true "rest-bench" null) + ] ++ optional (versionAtLeast version "10.0.0") [ + (mkWith true "rgw-user" "rgw") + (mkWith true "rgw-group" "rgw") + (mkWith true "systemd-unit-dir" "\${out}/etc/systemd/system") ]; preBuild = optionalString (versionAtLeast version "9.0.0") '' diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix index 8ae137bbd89..72656d2969d 100644 --- a/pkgs/tools/misc/cpulimit/default.nix +++ b/pkgs/tools/misc/cpulimit/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://limitcpu.sourceforge.net/"; description = "A tool to throttle the CPU usage of programs"; - platforms = with platforms; linux ++ freebsd ++ darwin; + platforms = with platforms; linux ++ freebsd; license = licenses.gpl2; maintainer = [maintainers.rycee]; }; diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 84709010118..2b9c2297af2 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -3,10 +3,10 @@ }: stdenv.mkDerivation rec { - name = "gparted-0.22.0"; + name = "gparted-0.23.0"; src = fetchurl { - sha256 = "09vg5lxvh81x54ps5ayfjd4jl84wprn42i1wifnfmj44dqd5wxda"; + sha256 = "0m57bni3nkbbqq920ydzvasy2qc5j6w6bdssyn12jk4157gxvlbz"; url = "mirror://sourceforge/gparted/${name}.tar.bz2"; }; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { partitions. GParted enables you to change the partition organization while preserving the partition contents. ''; - homepage = http://gparted.sourceforge.net; + homepage = http://gparted.org; license = licenses.gpl2Plus; - platforms = with platforms; linux; + platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index f8f0f088079..2880666e8db 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -20,7 +20,7 @@ let canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems); inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.x-2015-07-05"; + version = "2.x-2015-07-27"; unifont_bdf = fetchurl { url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { src = fetchFromSavannah { repo = "grub"; - rev = "0d7c7f751dc5a8338497bef8b38f78153c4f0464"; - sha256 = "1vkd7na3kp9ri4xsd3zznvnrjzz1qsz62fycg941pm2k18r3m7xd"; + rev = "72fc110d95129410443b898e931ff7a1db75312e"; + sha256 = "0l2hws8h1jhww5s0m8pkwdggacpqb7fvz2jx83syg7ynczpgzbxs"; }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix index 418afee8135..92cc800d83d 100644 --- a/pkgs/tools/misc/screenfetch/default.nix +++ b/pkgs/tools/misc/screenfetch/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, makeWrapper -, coreutils, gawk, procps, gnused, findutils, xdpyinfo, xprop +, coreutils, gawk, procps, gnused, findutils, xdpyinfo, xprop, gnugrep }: stdenv.mkDerivation { @@ -28,6 +28,7 @@ stdenv.mkDerivation { --prefix PATH : "${findutils}/bin" \ --prefix PATH : "${xdpyinfo}/bin" \ --prefix PATH : "${xprop}/bin" \ + --prefix PATH : "${gnugrep}/bin" ''; meta = { diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 7752338c6bb..0e905bb6547 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -11,11 +11,11 @@ let ]); in stdenv.mkDerivation rec { - name = "dnsmasq-2.73"; + name = "dnsmasq-2.75"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; - sha256 = "1xnqfaw2l78f4zw4z9sgr9nl9yc233gxc3sd7hxapz2k7q883zqb"; + sha256 = "1wa1d4if9q6k3hklv8xi06a59k3aqb7pik8rhi2l53i99hflw334"; }; preBuild = '' diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 9df8045a2e9..0787cb9f29b 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -2,7 +2,7 @@ , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl , pkgconfig, zlib }: -let version = "0.5.9-34-g95c4582"; in +let version = "0.5.9-71-g77445f8"; in stdenv.mkDerivation { name = "netsniff-ng-${version}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; - rev = "95c4582b742fd4fa58e5f14971164b941b0f730d"; - sha256 = "0anai392n8zx8vcjbjg776lbiwrv95x2dbd8rypbqfzmj8nhzric"; + rev = "77445f81d451eef6b78b79a2bcc24d21d4be4178"; + sha256 = "0ny9bph070mny6i9r0i3wsx2bsl53135n439ab6r9qk710xjz91j"; }; buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 7a9edef5004..784ebb2bb7f 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook -, curl, trousers, sqlite +, curl, trousers, sqlite, iptables, libxml2, openresolv , enableTNC ? false }: stdenv.mkDerivation rec { @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { dontPatchELF = true; buildInputs = - [ gmp pkgconfig python autoreconfHook ] - ++ stdenv.lib.optionals enableTNC [ curl trousers sqlite ]; + [ gmp pkgconfig python autoreconfHook iptables ] + ++ stdenv.lib.optionals enableTNC [ curl trousers sqlite libxml2 ]; patches = [ ./ext_auth-path.patch @@ -22,14 +22,27 @@ stdenv.mkDerivation rec { ./updown-path.patch ]; + postPatch = '' + substituteInPlace src/libcharon/plugins/resolve/resolve_handler.c --replace "/sbin/resolvconf" "${openresolv}/sbin/resolvconf" + ''; + configureFlags = - [ "--enable-swanctl" "--enable-cmd" ] + [ "--enable-swanctl" "--enable-cmd" + "--enable-farp" "--enable-dhcp" + "--enable-eap-sim" "--enable-eap-sim-file" "--enable-eap-simaka-pseudonym" + "--enable-eap-simaka-reauth" "--enable-eap-identity" "--enable-eap-md5" + "--enable-eap-gtc" "--enable-eap-aka" "--enable-eap-aka-3gpp2" + "--enable-eap-mschapv2" "--enable-xauth-eap" "--enable-ext-auth" + "--enable-forecast" "--enable-connmark" "--enable-acert" + "--enable-aesni" "--enable-af-alg" "--enable-rdrand" ] + ++ stdenv.lib.optional (stdenv.system == "i686-linux") "--enable-padlock" ++ stdenv.lib.optionals enableTNC [ "--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf" - "--enable-curl" "--enable-openssl" "--enable-eap-identity" "--enable-eap-md5" "--enable-eap-mschapv2" + "--enable-curl" "--enable-openssl" "--enable-eap-tnc" "--enable-eap-ttls" "--enable-eap-dynamic" "--enable-tnccs-20" "--enable-tnc-imc" "--enable-imc-os" "--enable-imc-attestation" "--enable-tnc-imv" "--enable-imv-attestation" + "--enable-tnc-ifmap" "--enable-tnc-imc" "--enable-tnc-imv" "--with-tss=trousers" "--enable-aikgen" "--enable-sqlite" ]; diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index 1386f7133e5..5d8971e5c6f 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -1,24 +1,33 @@ -{ stdenv, fetchurl, nettools, libgcrypt, perl, gawk, makeWrapper }: +{ stdenv, fetchsvn, nettools, libgcrypt, openssl, openresolv, perl, gawk, makeWrapper }: stdenv.mkDerivation rec { - name = "vpnc-0.5.3"; - src = fetchurl { - url = "http://www.unix-ag.uni-kl.de/~massar/vpnc/${name}.tar.gz"; - sha256 = "1128860lis89g1s21hqxvap2nq426c9j4bvgghncc1zj0ays7kj6"; + name = "vpnc-rev550"; + src = fetchsvn { + url = "http://svn.unix-ag.uni-kl.de/vpnc"; + rev = "550"; + sha256 = "0x4ckfv9lpykwmh28v1kyzz91y1j2v48fi8q5nsawrba4q0wlrls"; }; - patches = [ ./makefile.patch ./vpnc-script.patch ]; + postUnpack = '' + mv $sourceRoot/trunk/* $sourceRoot/. + rm -r $sourceRoot/{trunk,branches,tags} + ''; + + patches = [ ./makefile.patch ]; # The `etc/vpnc/vpnc-script' script relies on `which' and on # `ifconfig' as found in net-tools (not GNU Inetutils). propagatedBuildInputs = [ nettools ]; - buildInputs = [libgcrypt perl makeWrapper]; + buildInputs = [libgcrypt perl makeWrapper openssl ]; preConfigure = '' - substituteInPlace "vpnc-script.in" \ + sed -i 's|^#OPENSSL|OPENSSL|g' Makefile + + substituteInPlace "vpnc-script" \ --replace "which" "type -P" \ - --replace "awk" "${gawk}/bin/awk" + --replace "awk" "${gawk}/bin/awk" \ + --replace "/sbin/resolvconf" "${openresolv}/bin/resolvconf" substituteInPlace "config.c" \ --replace "/etc/vpnc/vpnc-script" "$out/etc/vpnc/vpnc-script" diff --git a/pkgs/tools/networking/vpnc/vpnc-script.patch b/pkgs/tools/networking/vpnc/vpnc-script.patch deleted file mode 100644 index 67a86d5d58f..00000000000 --- a/pkgs/tools/networking/vpnc/vpnc-script.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ubr vpnc-0.5.3-orig/vpnc-script.in vpnc-0.5.3/vpnc-script.in ---- vpnc-0.5.3-orig/vpnc-script.in 2012-02-29 23:03:35.289636602 +0100 -+++ vpnc-0.5.3/vpnc-script.in 2012-02-29 23:03:59.597307445 +0100 -@@ -116,7 +116,7 @@ - - if [ -n "$IPROUTE" ]; then - fix_ip_get_output () { -- sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g' -+ sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g;s/ipid 0x....//g' - } - - set_vpngateway_route() { diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix index 2ad826b928b..c8b5131bf75 100644 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -17,13 +17,13 @@ let in pythonPackages.buildPythonPackage rec { - name = "nixops-1.3pre1486_7489764"; + name = "nixops-1.3pre-cefcd9ba"; namePrefix = ""; src = fetchgit { url = https://github.com/NixOS/nixops; - rev = "5c7663dfe1e2af9c0396c5c86d995452ef2efc8a"; - sha256 = "01n2ykszrnqr3kqqdg1n2l8wm38yhri7r3d7b0abklsslz9dlvmy"; + rev = "cefcd9bae9a4d3bac83f188460619d18972321a8"; + sha256 = "1jwkbnfwics2j0m6mr75rz914vg0z46d2xv0z1717c1ac5rki0l2"; }; buildInputs = [ /* libxslt */ pythonPackages.nose pythonPackages.coverage ]; diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix index 73004091a42..dd9dbed2995 100644 --- a/pkgs/tools/package-management/nixui/default.nix +++ b/pkgs/tools/package-management/nixui/default.nix @@ -2,7 +2,7 @@ , profilePaths ? (config.nixui.profilePaths or ["/nix/var/nix/profiles"]) , dataDir ? (config.nixui.dataDir or "/tmp") , configurations ? (config.nixui.configurations or ["/etc/nixos/configuration.nix"]) -, NIX_PATH ? (config.nixui.NIX_PATH or "/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs:nixos-config=/etc/nixos/configuration.nix") }: +, NIX_PATH ? (config.nixui.NIX_PATH or "/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix") }: let version = "0.1.2"; src = fetchgit { diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 21de5705e4f..02eee4d7e36 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,23 +1,25 @@ { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: stdenv.mkDerivation rec { - version = "1.4.19"; + version = "1.4.20"; name = "ccid-${version}"; src = fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/c/ccid/ccid_${version}.orig.tar.bz2"; - sha256 = "1q9lx5ci8kikwk9mhbjl6m3zk4id209zfna5wgpqjrp5nhmjrjyc"; + url = "https://alioth.debian.org/frs/download.php/file/4140/ccid-1.4.20.tar.bz2"; + sha256 = "1g0w4pv6q30d8lhs3kd6nywkhh34nhf9fbcbcvbxdvk3pdjvh320"; }; patchPhase = '' - sed -i 's,/usr/bin/env perl,${perl}/bin/perl,' src/*.pl + patchShebangs . substituteInPlace src/Makefile.in --replace /bin/echo echo ''; + preConfigure = '' - configureFlags="$configureFlags --enable-usbdropdir=$out/pcsc/drivers" + configureFlagsArray+=("--enable-usbdropdir=$out/pcsc/drivers") ''; - buildInputs = [ pcsclite pkgconfig libusb1 ]; + nativeBuildInputs = [ pkgconfig perl ]; + buildInputs = [ pcsclite libusb1 ]; meta = with stdenv.lib; { description = "ccid drivers for pcsclite"; diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 0b6a8712661..6ec0cb23864 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -1,23 +1,22 @@ { stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl }: stdenv.mkDerivation rec { - name = "pcsclite-1.8.13"; + name = "pcsclite-1.8.14"; src = fetchurl { - url = "https://alioth.debian.org/frs/download.php/file/4126/pcsc-lite-1.8.13.tar.bz2"; - sha256 = "0fxwzckbjsckfp1f01yp3x6y1wlaaivhy12a5hka6qwdh1z085gk"; + url = "https://alioth.debian.org/frs/download.php/file/4138/pcsc-lite-1.8.14.tar.bz2"; + sha256 = "0kik09dif6hih09vvprd7zvj31lnrclrbrh5y10mlca2c209f7xr"; }; - # The OS should care on preparing the drivers into this location configureFlags = [ + # The OS should care on preparing the drivers into this location "--enable-usbdropdir=/var/lib/pcsc/drivers" - "--with-systemdsystemunitdir=$out/etc/systemd/system" - "--enable-confdir=$out/etc" + "--with-systemdsystemunitdir=\${out}/etc/systemd/system" + "--enable-confdir=/etc" ]; - buildInputs = [ udev dbus_libs perl ]; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig perl ]; + buildInputs = [ udev dbus_libs ]; meta = with stdenv.lib; { description = "Middleware to access a smart card using SCard API (PC/SC)"; diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index 1acc395dc06..0626ec84fbe 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml }: stdenv.mkDerivation rec { - name = "hevea-2.23"; + name = "hevea-2.25"; src = fetchurl { url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz"; - sha256 = "1f9pj48518ixhjxbviv2zx27v4anp92zgg3x704g1s5cki2w33nv"; + sha256 = "0kn99v92xsfy12r9gfvwgs0xf3s9s6frfg86a8q6damj1dampiz4"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 518890ebb3d..a97d45a9896 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1066,6 +1066,7 @@ let libceph = ceph.lib; ceph-0_80 = callPackage ../tools/filesystems/ceph/0.80.nix { }; ceph-0_94 = callPackage ../tools/filesystems/ceph/0.94.nix { }; + ceph-0_94-pre = callPackage ../tools/filesystems/ceph/0.94-pre.nix { }; ceph = callPackage ../tools/filesystems/ceph { }; ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { }); ceph-git = lowPrio (callPackage ../tools/filesystems/ceph/git.nix { }); @@ -4000,7 +4001,7 @@ let haskell = callPackage ./haskell-packages.nix { }; - haskellPackages = haskell.packages.ghc7101.override { + haskellPackages = haskell.packages.ghc7102.override { overrides = config.haskellPackageOverrides or (self: super: {}); }; @@ -5676,6 +5677,8 @@ let phantomjs = callPackage ../development/tools/phantomjs { }; + phantomjs2 = callPackage ../development/tools/phantomjs2 { }; + pmccabe = callPackage ../development/tools/misc/pmccabe { }; /* Make pkgconfig always return a nativeDrv, never a proper crossDrv, @@ -9587,6 +9590,8 @@ let ifplugd = callPackage ../os-specific/linux/ifplugd { }; + ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { }; + iomelt = callPackage ../os-specific/linux/iomelt { }; iotop = callPackage ../os-specific/linux/iotop { }; @@ -11000,7 +11005,7 @@ let }; docker = callPackage ../applications/virtualization/docker { - go = go_1_3; + go = go_1_4; }; doodle = callPackage ../applications/search/doodle { }; @@ -11404,6 +11409,7 @@ let firefox = callPackage ../applications/networking/browsers/firefox { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; + libpng = libpng_apng; enableGTK3 = false; }; @@ -11487,14 +11493,13 @@ let gitAndTools = recurseIntoAttrs (import ../applications/version-management/git-and-tools { inherit pkgs; }); - git = gitAndTools.git; - gitFull = gitAndTools.gitFull; + + inherit (gitAndTools) git gitFull gitSVN git-cola svn2git; + gitMinimal = git.override { withManual = false; pythonSupport = false; }; - gitSVN = gitAndTools.gitSVN; - git-cola = gitAndTools.git-cola; gitRepo = callPackage ../applications/version-management/git-repo { python = python27; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index d023470c48f..cc6e8710335 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -74,7 +74,6 @@ releaseTools.sourceTarball rec { mkdir -p $out/tarballs mkdir ../$releaseName cp -prd . ../$releaseName - echo nixpkgs > ../$releaseName/channel-name (cd .. && tar cfa $out/tarballs/$releaseName.tar.xz $releaseName) || false ''; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6eaa7e11a11..7b2b0a95712 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1632,17 +1632,18 @@ let self = _self // overrides; _self = with self; { }; ConfigMVP = buildPerlPackage { - name = "Config-MVP-2.200007"; + name = "Config-MVP-2.200010"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200007.tar.gz; - sha256 = "10hc8v22mv56wqi6drpl4pw3r8y3xrgh80ayrb2gir80ah9s5bvi"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200010.tar.gz; + sha256 = "bfb5870452a12ead4d3fd485045d1fa92b2a11741c3b93b61eb43f3dcbd6099b"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ ClassLoad Moose MooseXOneArgNew ParamsUtil RoleHasMessage RoleIdentifiable Throwable TieIxHash TryTiny ]; + propagatedBuildInputs = [ ClassLoad ModulePluggable Moose MooseXOneArgNew ParamsUtil RoleHasMessage RoleIdentifiable Throwable TieIxHash TryTiny ]; meta = { - homepage = https://github.com/rjbs/config-mvp; + homepage = https://github.com/rjbs/Config-MVP; description = "Multivalue-property package-oriented configuration"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; @@ -7507,18 +7508,19 @@ let self = _self // overrides; _self = with self; { }; }; - PerlCritic = buildPerlPackage { - name = "Perl-Critic-1.121"; + PerlCritic = buildPerlModule { + name = "Perl-Critic-1.125"; src = fetchurl { - url = mirror://cpan/authors/id/T/TH/THALJEF/Perl-Critic-1.121.tar.gz; - sha256 = "1y2bxjwzlp6ix51h36a5g3dqpaviaajij1rn22hpvcqxh4hh6car"; + url = mirror://cpan/authors/id/T/TH/THALJEF/Perl-Critic-1.125.tar.gz; + sha256 = "503b718356b14d4c00ed486b66a0f622f4bef2b206be406ee7922c8270463fa1"; }; buildInputs = [ TestDeep ]; - propagatedBuildInputs = [ BKeywords ConfigTiny EmailAddress ExceptionClass IOString ListMoreUtils PPI PPIxRegexp PPIxUtilities PerlTidy PodSpell Readonly StringFormat TaskWeaken ]; + propagatedBuildInputs = [ BKeywords ConfigTiny EmailAddress ExceptionClass FileHomeDir FileWhich IOString ListMoreUtils ModulePluggable PPI PPIxRegexp PPIxUtilities PerlTidy PodSpell Readonly StringFormat TaskWeaken ]; meta = { homepage = http://perlcritic.com; description = "Critique Perl source code for best-practices"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; @@ -7703,18 +7705,24 @@ let self = _self // overrides; _self = with self; { }; PPI = buildPerlPackage { - name = "PPI-1.215"; + name = "PPI-1.220"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/PPI-1.215.tar.gz; - sha256 = "db238e84da705b952b69f25554019ce70124079a0ad43713d0638aa14ba54878"; + url = mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.220.tar.gz; + sha256 = "1e15be50e7d95a36d351af8bf5074f6695a2c72165e586d93e616183e7602b83"; }; buildInputs = [ ClassInspector FileRemove TestNoWarnings TestObject TestSubCalls ]; propagatedBuildInputs = [ Clone IOString ListMoreUtils ParamsUtil TaskWeaken ]; + + # Remove test that fails due to unexpected shebang after + # patchShebang. + preCheck = "rm t/03_document.t"; + meta = { + homepage = https://github.com/adamkennedy/PPI; description = "Parse, Analyze and Manipulate Perl (without perl)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; - doCheck = false; }; PPIxRegexp = buildPerlPackage { @@ -7860,17 +7868,18 @@ let self = _self // overrides; _self = with self; { }; PodElementalPerlMunger = buildPerlPackage { - name = "Pod-Elemental-PerlMunger-0.093332"; + name = "Pod-Elemental-PerlMunger-0.200003"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-PerlMunger-0.093332.tar.gz; - sha256 = "fc4c4ef76d2b557c590b998d08393b189a2af969d4d195439f37e7d7d466d062"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-PerlMunger-0.200003.tar.gz; + sha256 = "94b3abe6894c96b7990cb324a3789af05489dc2b5d1ec8961d37309cc6e8c243"; }; buildInputs = [ Moose PodElemental ]; - propagatedBuildInputs = [ ListMoreUtils Moose PPI PodElemental namespaceautoclean ]; + propagatedBuildInputs = [ ListMoreUtils Moose PPI ParamsUtil PodElemental namespaceautoclean ]; meta = { - homepage = https://github.com/rjbs/pod-elemental-perlmunger; + homepage = https://github.com/rjbs/Pod-Elemental-PerlMunger; description = "A thing that takes a string of Perl and rewrites its documentation"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 03259dde82d..bfd741ccb4b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -102,11 +102,11 @@ let self = with self; { composer = pkgs.stdenv.mkDerivation rec { name = "composer-${version}"; - version = "1.0.0-alpha9"; + version = "1.0.0-alpha10"; src = pkgs.fetchurl { - url = "https://getcomposer.org/download/1.0.0-alpha9/composer.phar"; - sha256 = "1x7i9xs9xggq0qq4kzrwh2pky8skax0l829zwwsy3hcvch3irvrk"; + url = "https://getcomposer.org/download/${version}/composer.phar"; + sha256 = "0a26zlsr2jffcqlz8z6l8s6c6nlyfj2gxqfgx76knx5wch1psb4z"; }; phases = [ "installPhase" ]; @@ -123,7 +123,7 @@ let self = with self; { description = "Dependency Manager for PHP"; license = licenses.mit; homepage = https://getcomposer.org/; - maintainers = with maintainers; [offline]; + maintainers = with maintainers; [ globin offline ]; }; }; }; in self diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9800d6adda4..01f78483311 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3432,6 +3432,24 @@ let }; }; + gateone = buildPythonPackage rec { + name = "gateone-1.2-0d57c3"; + disabled = ! isPy27; + src = pkgs.fetchFromGitHub { + rev = "11ed97c663b3e8c1b8eba473b5cf8362b10d57c3"; + owner= "liftoff"; + repo = "GateOne"; + sha256 ="0zp9vfs6sqbx4d0g45kkjinfmsl9zqwa6bhp3xd81wx3ph9yr1hq"; + }; + propagatedBuildInputs = with pkgs.pythonPackages; [tornado futures html5lib readline pkgs.openssl]; + meta = { + homepage = https://liftoffsoftware.com/; + description = "GateOne is a web-based terminal emulator and SSH client"; + maintainers = with maintainers; [ tomberek ]; + + }; + }; + gcutil = buildPythonPackage rec { name = "gcutil-1.16.1"; meta.maintainers = with maintainers; [ phreedom ]; @@ -5541,6 +5559,7 @@ let pyfribidi = buildPythonPackage rec { version = "0.11.0"; name = "pyfribidi-${version}"; + disabled = isPy3k; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyfribidi/${name}.zip"; @@ -9236,10 +9255,10 @@ let pgcli = buildPythonPackage rec { name = "pgcli-${version}"; - version = "0.18.0"; + version = "0.19.1"; src = pkgs.fetchFromGitHub { - sha256 = "1ydi1725ryz9by770kyx06cwrvyvixbg3502brkf5hvbjd8ddzrl"; + sha256 = "1r34bbqbd4h72cl0cxi9w6q2nwx806wpxq220mzyiy8g45xv0ghj"; rev = "v${version}"; repo = "pgcli"; owner = "amjith"; @@ -9249,10 +9268,6 @@ let click configobj prompt_toolkit psycopg2 pygments sqlparse ]; - postPatch = '' - substituteInPlace setup.py --replace "==" ">=" - ''; - meta = { inherit version; description = "Command-line interface for PostgreSQL"; @@ -9552,10 +9567,10 @@ let prompt_toolkit = buildPythonPackage rec { name = "prompt_toolkit-${version}"; - version = "0.43"; + version = "0.45"; src = pkgs.fetchurl { - sha256 = "1z5fap8c7q27p0s82jn11i6fwg0g9zm2zy5na8is53kgbhl10fdr"; + sha256 = "19lp15rc0rq4jqaacg2a38cdgfy2avhf5v97yanasx4n2swx4gsm"; url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz"; }; @@ -11588,19 +11603,19 @@ let }; repocheck = buildPythonPackage rec { - name = "repocheck-2015-06-27"; + name = "repocheck-2015-08-05"; disabled = isPy26 || isPy27; src = pkgs.fetchFromGitHub { - sha256 = "0psihwph10sx07xc2gfch739laz7x1kwl5c991cci8cfn5jzy8bp"; - rev = "231e05b4fa55955ef8492581a15f508ffa0037d4"; + sha256 = "1jc4v5zy7z7xlfmbfzvyzkyz893f5x2k6kvb3ni3rn2df7jqhc81"; + rev = "ee48d0e88d3f5814d24a8d1f22d5d83732824688"; repo = "repocheck"; owner = "kynikos"; }; meta = { + inherit (src.meta) homepage; description = "Check the status of code repositories under a root directory"; - homepage = https://github.com/kynikos/repocheck; license = licenses.gpl3Plus; maintainers = with maintainers; [ nckx ]; }; @@ -12297,14 +12312,14 @@ let }; sigal = buildPythonPackage rec { - name = "sigal-0.7.0"; + name = "sigal-0.9.2"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/sigal/${name}.tar.gz"; - md5 = "d2386706ac8543378aebde1ea4edeba4"; + sha256 = "0mk3bzaxn9snx9lc0pj9zvgdgdyhkza6b8z5x91772mlv84sfw6c"; }; - propagatedBuildInputs = with self; [ jinja2 markdown pillow pilkit clint argh pytest ]; + propagatedBuildInputs = with self; [ jinja2 markdown pillow pilkit clint click pytest blinker ]; meta = { description = "Yet another simple static gallery generator"; |