diff --git a/doc/language-support.xml b/doc/language-support.xml index 5fb123ddfc1..f2b64c93d22 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -612,15 +612,45 @@ sed -i '/ = data_files/d' setup.py
Ruby - For example, to package yajl-ruby package, use gem-nix: + There currently is support to bundle applications that are packaged as Ruby gems. The utility "bundix" allows you to write a Gemfile, let bundler create a Gemfile.lock, and then convert + this into a nix expression that contains all Gem dependencies automatically. + + For example, to package sensu, we did: -$ nix-env -i gem-nix -$ gem-nix --no-user-install --nix-file=pkgs/development/interpreters/ruby/generated.nix yajl-ruby -$ nix-build -A rubyPackages.yajl-ruby - -
+ Gemfile +source 'https://rubygems.org' +gem 'sensu' +$ bundler package --path /tmp/vendor/bundle +$ $(nix-build '&nixpkgs>' -A bundix)/bin/bundix +$ cat > default.nix +{ lib, bundlerEnv, ruby }: +bundlerEnv { + name = "sensu-0.17.1"; + + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = with lib; { + description = "A monitoring framework that aims to be simple, malleable, +and scalable."; + homepage = http://sensuapp.org/; + license = with licenses; mit; + maintainers = with maintainers; [ theuni ]; + platforms = platforms.unix; + }; +}]]> + + +Please check in the Gemfile, Gemfile.lock and the gemset.nix so future updates can be run easily. + + +
Go diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 05fbad6634a..57afda9f93e 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -54,6 +54,7 @@ copumpkin = "Dan Peebles "; coroa = "Jonas Hörsch "; cstrahan = "Charles Strahan "; + cwoac = "Oliver Matthews "; DamienCassou = "Damien Cassou "; davidrusu = "David Rusu "; dbohdan = "Danyil Bohdan "; @@ -102,6 +103,7 @@ jirkamarsik = "Jirka Marsik "; joachifm = "Joachim Fasting "; joamaki = "Jussi Maki "; + joelmo = "Joel Moberg "; joelteon = "Joel Taylor "; jpbernardy = "Jean-Philippe Bernardy "; jwiegley = "John Wiegley "; @@ -153,6 +155,7 @@ pjones = "Peter Jones "; pkmx = "Chih-Mao Chen "; plcplc = "Philip Lykke Carlsen "; + pmahoney = "Patrick Mahoney "; prikhi = "Pavan Rikhi "; pSub = "Pascal Wittmann "; puffnfresh = "Brian McKenna "; @@ -189,6 +192,7 @@ tailhook = "Paul Colomiets "; thammers = "Tobias Hammerschmidt "; the-kenny = "Moritz Ulrich "; + theuni = "Christian Theune "; thoughtpolice = "Austin Seipp "; titanous = "Jonathan Rudenberg "; tomberek = "Thomas Bereknyei "; diff --git a/lib/modules.nix b/lib/modules.nix index d0b8f90e5ce..dcede0c46c6 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -9,25 +9,69 @@ rec { /* Evaluate a set of modules. The result is a set of two attributes: ‘options’: the nested set of all option declarations, - and ‘config’: the nested set of all option values. */ - evalModules = { modules, prefix ? [], args ? {}, check ? true }: + and ‘config’: the nested set of all option values. + !!! Please think twice before adding to this argument list! The more + that is specified here instead of in the modules themselves the harder + it is to transparently move a set of modules to be a submodule of another + config (as the proper arguments need to be replicated at each call to + evalModules) and the less declarative the module set is. */ + evalModules = { modules + , prefix ? [] + , # This would be remove in the future, Prefer _module.args option instead. + args ? {} + , # This would be remove in the future, Prefer _module.check option instead. + check ? true + }: let - args' = args // { lib = import ./.; } // result; - closed = closeModules modules args'; + # This internal module declare internal options under the `_module' + # attribute. These options are fragile, as they are used by the + # module system to change the interpretation of modules. + internalModule = rec { + _file = ./modules.nix; + + key = _file; + + options = { + _module.args = mkOption { + type = types.attrsOf types.unspecified; + internal = true; + description = "Arguments passed to each module."; + }; + + _module.check = mkOption { + type = types.uniq types.bool; + internal = true; + default = check; + description = "Whether to check whether all option definitions have matching declarations."; + }; + }; + + config = { + _module.args = args; + }; + }; + + closed = closeModules (modules ++ [ internalModule ]) { inherit config options; lib = import ./.; }; + # Note: the list of modules is reversed to maintain backward # compatibility with the old module system. Not sure if this is # the most sensible policy. options = mergeModules prefix (reverseList closed); + # Traverse options and extract the option values into the final # config set. At the same time, check whether all option # definitions have matching declarations. + # !!! _module.check's value can't depend on any other config values + # without an infinite recursion. One way around this is to make the + # 'config' passed around to the modules be unconditionally unchecked, + # and only do the check in 'result'. config = yieldConfig prefix options; yieldConfig = prefix: set: let res = removeAttrs (mapAttrs (n: v: if isOption v then v.value else yieldConfig (prefix ++ [n]) v) set) ["_definedNames"]; in - if check && set ? _definedNames then + if options._module.check.value && set ? _definedNames then fold (m: res: fold (name: res: if set ? ${name} then res else throw "The option `${showOption (prefix ++ [name])}' defined in `${m.file}' does not exist.") @@ -43,7 +87,7 @@ rec { let toClosureList = file: parentKey: imap (n: x: if isAttrs x || isFunction x then - unifyModuleSyntax file "${parentKey}:anon-${toString n}" (applyIfFunction x args) + unifyModuleSyntax file "${parentKey}:anon-${toString n}" (unpackSubmodule applyIfFunction x args) else unifyModuleSyntax (toString x) (toString x) (applyIfFunction (import x) args)); in @@ -74,7 +118,39 @@ rec { config = removeAttrs m ["key" "_file" "require" "imports"]; }; - applyIfFunction = f: arg: if isFunction f then f arg else f; + applyIfFunction = f: arg@{ config, options, lib }: if isFunction f then + let + # Module arguments are resolved in a strict manner when attribute set + # deconstruction is used. As the arguments are now defined with the + # config._module.args option, the strictness used on the attribute + # set argument would cause an infinite loop, if the result of the + # option is given as argument. + # + # To work-around the strictness issue on the deconstruction of the + # attributes set argument, we create a new attribute set which is + # constructed to satisfy the expected set of attributes. Thus calling + # a module will resolve strictly the attributes used as argument but + # not their values. The values are forwarding the result of the + # evaluation of the option. + requiredArgs = builtins.attrNames (builtins.functionArgs f); + extraArgs = builtins.listToAttrs (map (name: { + inherit name; + value = config._module.args.${name}; + }) requiredArgs); + in f (extraArgs // arg) + else + f; + + /* We have to pack and unpack submodules. We cannot wrap the expected + result of the function as we would no longer be able to list the arguments + of the submodule. (see applyIfFunction) */ + unpackSubmodule = unpack: m: args: + if isType "submodule" m then + { _file = m.file; } // (unpack m.submodule args) + else unpack m args; + + packSubmodule = file: m: + { _type = "submodule"; file = file; submodule = m; }; /* Merge a list of modules. This will recurse over the option declarations in all modules, combining them into a single set. @@ -106,12 +182,9 @@ rec { else [] ) configs); nrOptions = count (m: isOption m.options) decls; - # Process mkMerge and mkIf properties. - defns' = concatMap (m: - if m.config ? ${name} - then map (m': { inherit (m) file; value = m'; }) (dischargeProperties m.config.${name}) - else [] - ) configs; + # Extract the definitions for this loc + defns' = map (m: { inherit (m) file; value = m.config.${name}; }) + (filter (m: m.config ? ${name}) configs); in if nrOptions == length decls then let opt = fixupOptionType loc (mergeOptionDecls loc decls); @@ -156,15 +229,12 @@ rec { current option declaration as the file use for the submodule. If the submodule defines any filename, then we ignore the enclosing option file. */ options' = toList opt.options.options; - addModuleFile = m: - if isFunction m then args: { _file = opt.file; } // (m args) - else { _file = opt.file; } // m; coerceOption = file: opt: - if isFunction opt then args: { _file = file; } // (opt args) - else { _file = file; options = opt; }; + if isFunction opt then packSubmodule file opt + else packSubmodule file { options = opt; }; getSubModules = opt.options.type.getSubModules or null; submodules = - if getSubModules != null then map addModuleFile getSubModules ++ res.options + if getSubModules != null then map (packSubmodule opt.file) getSubModules ++ res.options else if opt.options ? options then map (coerceOption opt.file) options' ++ res.options else res.options; in opt.options // res // @@ -177,27 +247,17 @@ rec { config value. */ evalOptionValue = loc: opt: defs: let - # Process mkOverride properties, adding in the default - # value specified in the option declaration (if any). - defsFinal' = filterOverrides - ((if opt ? default then [{ file = head opt.declarations; value = mkOptionDefault opt.default; }] else []) ++ defs); - # Sort mkOrder properties. - defsFinal = - # Avoid sorting if we don't have to. - if any (def: def.value._type or "" == "order") defsFinal' - then sortProperties defsFinal' - else defsFinal'; + # Add in the default value for this option, if any. + defs' = (optional (opt ? default) + { file = head opt.declarations; value = mkOptionDefault opt.default; }) ++ defs; + + # Handle properties, check types, and merge everything together + inherit (mergeDefinitions loc opt.type defs') isDefined defsFinal mergedValue; files = map (def: def.file) defsFinal; - # Type-check the remaining definitions, and merge them if - # possible. merged = - if defsFinal == [] then - throw "The option `${showOption loc}' is used but not defined." - else - fold (def: res: - if opt.type.check def.value then res - else throw "The option value `${showOption loc}' in `${def.file}' is not a ${opt.type.name}.") - (opt.type.merge loc defsFinal) defsFinal; + if isDefined then mergedValue + else throw "The option `${showOption loc}' is used but not defined."; + # Finally, apply the ‘apply’ function to the merged # value. This allows options to yield a value computed # from the definitions. @@ -205,10 +265,42 @@ rec { in opt // { value = addErrorContext "while evaluating the option `${showOption loc}':" value; definitions = map (def: def.value) defsFinal; - isDefined = defsFinal != []; - inherit files; + inherit isDefined files; }; + # Merge definitions of a value of a given type + mergeDefinitions = loc: type: defs: rec { + defsFinal = + let + # Process mkMerge and mkIf properties + processIfAndMerge = defs: concatMap (m: + map (value: { inherit (m) file; inherit value; }) (dischargeProperties m.value) + ) defs; + + # Process mkOverride properties + processOverride = defs: filterOverrides defs; + + # Sort mkOrder properties + processOrder = defs: + # Avoid sorting if we don't have to. + if any (def: def.value._type or "" == "order") defs + then sortProperties defs + else defs; + in + processOrder (processOverride (processIfAndMerge defs)); + + # Type-check the remaining definitions, and merge them + mergedValue = fold (def: res: + if type.check def.value then res + else throw "The option value `${showOption loc}' in `${def.file}' is not a ${type.name}.") + (type.merge loc defsFinal) defsFinal; + + isDefined = defsFinal != []; + optionalValue = + if isDefined then { value = mergedValue; } + else {}; + }; + /* Given a config set, expand mkMerge properties, and push down the other properties into the children. The result is a list of config sets that do not have properties at top-level. For diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 58231a35636..66c6f560fbe 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -57,13 +57,17 @@ checkConfigError() { fi } +# Check boolean option. checkConfigOutput "false" config.enable ./declare-enable.nix checkConfigError 'The option .* defined in .* does not exist.' config.enable ./define-enable.nix + +# Check mkForce without submodules. set -- config.enable ./declare-enable.nix ./define-enable.nix checkConfigOutput "true" "$@" checkConfigOutput "false" "$@" ./define-force-enable.nix checkConfigOutput "false" "$@" ./define-enable-force.nix +# Check mkForce with option and submodules. checkConfigError 'attribute .*foo.* .* not found' config.loaOfSub.foo.enable ./declare-loaOfSub-any-enable.nix checkConfigOutput 'false' config.loaOfSub.foo.enable ./declare-loaOfSub-any-enable.nix ./define-loaOfSub-foo.nix set -- config.loaOfSub.foo.enable ./declare-loaOfSub-any-enable.nix ./define-loaOfSub-foo-enable.nix @@ -73,6 +77,7 @@ checkConfigOutput 'false' "$@" ./define-loaOfSub-force-foo-enable.nix checkConfigOutput 'false' "$@" ./define-loaOfSub-foo-force-enable.nix checkConfigOutput 'false' "$@" ./define-loaOfSub-foo-enable-force.nix +# Check overriding effect of mkForce on submodule definitions. checkConfigError 'attribute .*bar.* .* not found' config.loaOfSub.bar.enable ./declare-loaOfSub-any-enable.nix ./define-loaOfSub-foo.nix checkConfigOutput 'false' config.loaOfSub.bar.enable ./declare-loaOfSub-any-enable.nix ./define-loaOfSub-foo.nix ./define-loaOfSub-bar.nix set -- config.loaOfSub.bar.enable ./declare-loaOfSub-any-enable.nix ./define-loaOfSub-foo.nix ./define-loaOfSub-bar-enable.nix @@ -82,6 +87,26 @@ checkConfigError 'attribute .*bar.* .* not found' "$@" ./define-loaOfSub-force-f checkConfigOutput 'true' "$@" ./define-loaOfSub-foo-force-enable.nix checkConfigOutput 'true' "$@" ./define-loaOfSub-foo-enable-force.nix +# Check mkIf with submodules. +checkConfigError 'attribute .*foo.* .* not found' config.loaOfSub.foo.enable ./declare-enable.nix ./declare-loaOfSub-any-enable.nix +set -- config.loaOfSub.foo.enable ./declare-enable.nix ./declare-loaOfSub-any-enable.nix +checkConfigError 'attribute .*foo.* .* not found' "$@" ./define-if-loaOfSub-foo-enable.nix +checkConfigError 'attribute .*foo.* .* not found' "$@" ./define-loaOfSub-if-foo-enable.nix +checkConfigError 'attribute .*foo.* .* not found' "$@" ./define-loaOfSub-foo-if-enable.nix +checkConfigOutput 'false' "$@" ./define-loaOfSub-foo-enable-if.nix +checkConfigOutput 'true' "$@" ./define-enable.nix ./define-if-loaOfSub-foo-enable.nix +checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-if-foo-enable.nix +checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-foo-if-enable.nix +checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-foo-enable-if.nix + +# Check _module.args. +checkConfigOutput "true" config.enable ./declare-enable.nix ./custom-arg-define-enable.nix + +# Check _module.check. +set -- config.enable ./declare-enable.nix ./define-enable.nix ./define-loaOfSub-foo.nix +checkConfigError 'The option .* defined in .* does not exist.' "$@" +checkConfigOutput "true" "$@" ./define-module-check.nix + cat <"]); getSubModules = elemType.getSubModules; substSubModules = m: attrsOf (elemType.substSubModules m); @@ -150,10 +157,7 @@ rec { attrOnly = attrsOf elemType; in mkOptionType { name = "list or attribute set of ${elemType.name}s"; - check = x: - if isList x then listOnly.check x - else if isAttrs x then attrOnly.check x - else false; + check = x: isList x || isAttrs x; merge = loc: defs: attrOnly.merge loc (imap convertIfList defs); getSubOptions = prefix: elemType.getSubOptions (prefix ++ [""]); getSubModules = elemType.getSubModules; @@ -194,7 +198,11 @@ rec { let coerce = def: if isFunction def then def else { config = def; }; modules = opts' ++ map (def: { _file = def.file; imports = [(coerce def.value)]; }) defs; - in (evalModules { inherit modules; args.name = last loc; prefix = loc; }).config; + in (evalModules { + inherit modules; + args.name = last loc; + prefix = loc; + }).config; getSubOptions = prefix: (evalModules { modules = opts'; inherit prefix; # FIXME: hack to get shit to evaluate. diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml index 06e7b4a9847..7ad1be1ec10 100644 --- a/nixos/doc/manual/man-nixos-install.xml +++ b/nixos/doc/manual/man-nixos-install.xml @@ -25,6 +25,22 @@ root + + + + + + number + + + + number + + + + name + value + @@ -96,6 +112,37 @@ it. + + + + Sets the maximum number of build jobs that Nix will + perform in parallel to the specified number. The default is 1. + A higher value is useful on SMP systems or to exploit I/O latency. + + + + + + + Sets the value of the NIX_BUILD_CORES + environment variable in the invocation of builders. Builders can + use this variable at their discretion to control the maximum amount + of parallelism. For instance, in Nixpkgs, if the derivation + attribute enableParallelBuilding is set to + true, the builder passes the + flag to GNU Make. + The value 0 means that the builder should use all + available CPU cores in the system. + + + + name value + + Set the Nix configuration option + name to value. + + + diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 08adcf3a007..adacbd0863e 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -2,27 +2,51 @@ # configuration object (`config') from which we can retrieve option # values. -{ system ? builtins.currentSystem -, pkgs ? null -, baseModules ? import ../modules/module-list.nix -, extraArgs ? {} +# !!! Please think twice before adding to this argument list! +# Ideally eval-config.nix would be an extremely thin wrapper +# around lib.evalModules, so that modular systems that have nixos configs +# as subcomponents (e.g. the container feature, or nixops if network +# expressions are ever made modular at the top level) can just use +# types.submodule instead of using eval-config.nix +{ # !!! system can be set modularly, would be nice to remove + system ? builtins.currentSystem +, # !!! is this argument needed any more? The pkgs argument can + # be set modularly anyway. + pkgs ? null +, # !!! what do we gain by making this configurable? + baseModules ? import ../modules/module-list.nix +, # !!! See comment about args in lib/modules.nix + extraArgs ? {} , modules -, check ? true +, # !!! See comment about check in lib/modules.nix + check ? true , prefix ? [] +, lib ? import ../../lib }: let extraArgs_ = extraArgs; pkgs_ = pkgs; system_ = system; extraModules = let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH"; in if e == "" then [] else [(import (builtins.toPath e))]; +in + +let + pkgsModule = rec { + _file = ./eval-config.nix; + key = _file; + config = { + nixpkgs.system = lib.mkDefault system_; + _module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_); + }; + }; + in rec { # Merge the option definitions in all modules, forming the full # system configuration. - inherit (pkgs.lib.evalModules { - inherit prefix; - modules = modules ++ extraModules ++ baseModules; + inherit (lib.evalModules { + inherit prefix check; + modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ]; args = extraArgs; - check = check && options.environment.checkConfigurationOptions.value; }) config options; # These are the extra arguments passed to every module. In @@ -33,40 +57,8 @@ in rec { # the 64-bit package anyway. However, it would be cleaner to respect # nixpkgs.config here. extraArgs = extraArgs_ // { - inherit pkgs modules baseModules; - modulesPath = ../modules; - pkgs_i686 = import ./nixpkgs.nix { system = "i686-linux"; config.allowUnfree = true; }; - utils = import ./utils.nix pkgs; + inherit modules baseModules; }; - # Import Nixpkgs, allowing the NixOS option nixpkgs.config to - # specify the Nixpkgs configuration (e.g., to set package options - # such as firefox.enableGeckoMediaPlayer, or to apply global - # overrides such as changing GCC throughout the system), and the - # option nixpkgs.system to override the platform type. This is - # tricky, because we have to prevent an infinite recursion: "pkgs" - # is passed as an argument to NixOS modules, but the value of "pkgs" - # depends on config.nixpkgs.config, which we get from the modules. - # So we call ourselves here with "pkgs" explicitly set to an - # instance that doesn't depend on nixpkgs.config. - pkgs = - if pkgs_ != null - then pkgs_ - else import ./nixpkgs.nix ( - let - system = if nixpkgsOptions.system != "" then nixpkgsOptions.system else system_; - nixpkgsOptions = (import ./eval-config.nix { - inherit system extraArgs modules prefix; - # For efficiency, leave out most NixOS modules; they don't - # define nixpkgs.config, so it's pointless to evaluate them. - baseModules = [ ../modules/misc/nixpkgs.nix ../modules/config/no-x-libs.nix ]; - pkgs = import ./nixpkgs.nix { system = system_; config = {}; }; - check = false; - }).config.nixpkgs; - in - { - inherit system; - inherit (nixpkgsOptions) config; - }); - + inherit (config._module.args) pkgs; } diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix index 5ad546e9534..b2409c6006b 100644 --- a/nixos/lib/make-iso9660-image.nix +++ b/nixos/lib/make-iso9660-image.nix @@ -1,4 +1,4 @@ -{ stdenv, perl, cdrkit, pathsFromGraph +{ stdenv, perl, pathsFromGraph, xorriso, syslinux , # The file name of the resulting ISO image. isoName ? "cd.iso" @@ -22,12 +22,18 @@ , # Whether this should be an efi-bootable El-Torito CD. efiBootable ? false +, # Wheter this should be an hybrid CD (bootable from USB as well as CD). + usbBootable ? false + , # The path (in the ISO file system) of the boot image. bootImage ? "" , # The path (in the ISO file system) of the efi boot image. efiBootImage ? "" +, # The path (outside the ISO file system) of the isohybrid-mbr image. + isohybridMbrImage ? "" + , # Whether to compress the resulting ISO image with bzip2. compressImage ? false @@ -38,13 +44,14 @@ assert bootable -> bootImage != ""; assert efiBootable -> efiBootImage != ""; +assert usbBootable -> isohybridMbrImage != ""; stdenv.mkDerivation { name = "iso9660-image"; builder = ./make-iso9660-image.sh; - buildInputs = [perl cdrkit]; + buildInputs = [perl xorriso syslinux]; - inherit isoName bootable bootImage compressImage volumeID pathsFromGraph efiBootImage efiBootable; + inherit isoName bootable bootImage compressImage volumeID pathsFromGraph efiBootImage efiBootable isohybridMbrImage usbBootable; # !!! should use XML. sources = map (x: x.source) contents; diff --git a/nixos/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh index 675b5bb3514..c9a37379469 100644 --- a/nixos/lib/make-iso9660-image.sh +++ b/nixos/lib/make-iso9660-image.sh @@ -13,6 +13,20 @@ stripSlash() { if test "${res:0:1}" = /; then res=${res:1}; fi } +# Escape potential equal signs (=) with backslash (\=) +escapeEquals() { + echo "$1" | sed -e 's/\\/\\\\/g' -e 's/=/\\=/g' +} + +# Queues an file/directory to be placed on the ISO. +# An entry consists of a local source path (2) and +# a destination path on the ISO (1). +addPath() { + target="$1" + source="$2" + echo "$(escapeEquals "$target")=$(escapeEquals "$source")" >> pathlist +} + stripSlash "$bootImage"; bootImage="$res" @@ -31,11 +45,20 @@ if test -n "$bootable"; then fi done - bootFlags="-b $bootImage -c .boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table" + isoBootFlags="-eltorito-boot ${bootImage} + -eltorito-catalog .boot.cat + -no-emul-boot -boot-load-size 4 -boot-info-table" +fi + +if test -n "$usbBootable"; then + usbBootFlags="-isohybrid-mbr ${isohybridMbrImage}" fi if test -n "$efiBootable"; then - bootFlags="$bootFlags -eltorito-alt-boot -e $efiBootImage -no-emul-boot" + efiBootFlags="-eltorito-alt-boot + -e $efiBootImage + -no-emul-boot + -isohybrid-gpt-basdat" fi touch pathlist @@ -44,14 +67,14 @@ touch pathlist # Add the individual files. for ((i = 0; i < ${#targets_[@]}; i++)); do stripSlash "${targets_[$i]}" - echo "$res=${sources_[$i]}" >> pathlist + addPath "$res" "${sources_[$i]}" done # Add the closures of the top-level store objects. storePaths=$(perl $pathsFromGraph closure-*) for i in $storePaths; do - echo "${i:1}=$i" >> pathlist + addPath "${i:1}" "$i" done @@ -59,7 +82,7 @@ done # nix-store --load-db. if [ -n "$object" ]; then printRegistration=1 perl $pathsFromGraph closure-* > nix-path-registration - echo "nix-path-registration=nix-path-registration" >> pathlist + addPath "nix-path-registration" "nix-path-registration" fi @@ -70,22 +93,39 @@ for ((n = 0; n < ${#objects[*]}; n++)); do if test "$symlink" != "none"; then mkdir -p $(dirname ./$symlink) ln -s $object ./$symlink - echo "$symlink=./$symlink" >> pathlist + addPath "$symlink" "./$symlink" fi done -# !!! what does this do? -cat pathlist | sed -e 's/=\(.*\)=\(.*\)=/\\=\1=\2\\=/' | tee pathlist.safer - - mkdir -p $out/iso -genCommand="genisoimage -iso-level 4 -r -J $bootFlags -hide-rr-moved -graft-points -path-list pathlist.safer ${volumeID:+-V $volumeID}" -if test -z "$compressImage"; then - $genCommand -o $out/iso/$isoName -else - $genCommand | bzip2 > $out/iso/$isoName.bz2 + +xorriso="xorriso + -as mkisofs + -iso-level 3 + -volid ${volumeID} + -appid nixos + -publisher nixos + -graft-points + -full-iso9660-filenames + ${isoBootFlags} + ${usbBootFlags} + ${efiBootFlags} + -r + -path-list pathlist + --sort-weight 0 / + --sort-weight 1 /isolinux" # Make sure isolinux is near the beginning of the ISO + +$xorriso -output $out/iso/$isoName + +if test -n "$usbBootable"; then + echo "Making image hybrid..." + isohybrid --uefi $out/iso/$isoName fi +if test -n "$compressImage"; then + echo "Compressing image..." + bzip2 $out/iso/$isoName +fi mkdir -p $out/nix-support echo $system > $out/nix-support/system diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 85c2bfa88e1..e0791692d3e 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -37,6 +37,10 @@ sub new { if defined $args->{hda}; $startCommand .= "-cdrom $args->{cdrom} " if defined $args->{cdrom}; + $startCommand .= "-device piix3-usb-uhci -drive id=usbdisk,file=$args->{usb},if=none,readonly -device usb-storage,drive=usbdisk " + if defined $args->{usb}; + $startCommand .= "-bios $args->{bios} " + if defined $args->{bios}; $startCommand .= $args->{qemuFlags} || ""; } else { $startCommand = Cwd::abs_path $startCommand; diff --git a/nixos/modules/config/fonts/fontconfig-ultimate.nix b/nixos/modules/config/fonts/fontconfig-ultimate.nix index 853f253ff9b..02568f9de51 100644 --- a/nixos/modules/config/fonts/fontconfig-ultimate.nix +++ b/nixos/modules/config/fonts/fontconfig-ultimate.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: -with pkgs.lib; +with lib; let fcBool = x: if x then "true" else "false"; in diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 47393c9d3f5..13477337bda 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -27,6 +27,6 @@ with lib; fonts.fontconfig.enable = false; nixpkgs.config.packageOverrides = pkgs: - { dbus = pkgs.dbus.override { useX11 = false; }; }; + { dbus = pkgs.dbus.override { x11Support = false; }; }; }; } diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix index 3b6ccd380c7..e83562a8356 100644 --- a/nixos/modules/config/sysctl.nix +++ b/nixos/modules/config/sysctl.nix @@ -64,6 +64,6 @@ in # # Removed under grsecurity. boot.kernel.sysctl."kernel.kptr_restrict" = - if config.security.grsecurity.enable then null else 1; + if (config.boot.kernelPackages.kernel.features.grsecurity or false) then null else 1; }; } diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index db87f9fd0b1..9d48edf2f26 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -110,7 +110,7 @@ let shell = mkOption { type = types.str; - default = "/run/current-system/sw/sbin/nologin"; + default = "/run/current-system/sw/bin/nologin"; description = "The path to the user's shell."; }; diff --git a/nixos/modules/hardware/ksm.nix b/nixos/modules/hardware/ksm.nix new file mode 100644 index 00000000000..d6ac69b5d65 --- /dev/null +++ b/nixos/modules/hardware/ksm.nix @@ -0,0 +1,18 @@ +{ config, lib, ... }: + +{ + options.hardware.enableKSM = lib.mkEnableOption "Kernel Same-Page Merging"; + + config = lib.mkIf config.hardware.enableKSM { + systemd.services.enable-ksm = { + description = "Enable Kernel Same-Page Merging"; + wantedBy = [ "multi-user.target" ]; + after = [ "systemd-udev-settle.service" ]; + script = '' + if [ -e /sys/kernel/mm/ksm ]; then + echo 1 > /sys/kernel/mm/ksm/run + fi + ''; + }; + }; +} diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 209310bec99..2ea0cd69384 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -13,7 +13,10 @@ let # driver. nvidiaForKernel = kernelPackages: if elem "nvidia" drivers then - kernelPackages.nvidia_x11 + if versionAtLeast kernelPackages.kernel.version "4.0" then + kernelPackages.nvidia_x11_beta + else + kernelPackages.nvidia_x11 else if elem "nvidiaLegacy173" drivers then kernelPackages.nvidia_x11_legacy173 else if elem "nvidiaLegacy304" drivers then diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index b723a91e4f3..4896eee2908 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -36,6 +36,9 @@ with lib; # EFI booting isoImage.makeEfiBootable = true; + # USB booting + isoImage.makeUsbBootable = true; + # Add Memtest86+ to the CD. boot.loader.grub.memtest86.enable = true; diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 8f17e720aca..d9d7254aba2 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -7,53 +7,65 @@ with lib; let + # Timeout in syslinux is in units of 1/10 of a second. + # 0 is used to disable timeouts. + syslinuxTimeout = if config.boot.loader.timeout == null then + 0 + else + max (config.boot.loader.timeout * 10) 1; - # The Grub image. - grubImage = pkgs.runCommand "grub_eltorito" {} + + max = x: y: if x > y then x else y; + + # The configuration file for syslinux. + + # Notes on syslinux configuration and UNetbootin compatiblity: + # * Do not use '/syslinux/syslinux.cfg' as the path for this + # configuration. UNetbootin will not parse the file and use it as-is. + # This results in a broken configuration if the partition label does + # not match the specified config.isoImage.volumeID. For this reason + # we're using '/isolinux/isolinux.cfg'. + # * Use APPEND instead of adding command-line arguments directly after + # the LINUX entries. + # * COM32 entries (chainload, reboot, poweroff) are not recognized. They + # result in incorrect boot entries. + + baseIsolinuxCfg = '' - ${pkgs.grub2}/bin/grub-mkimage -p /boot/grub -O i386-pc -o tmp biosdisk iso9660 help linux linux16 chain png jpeg echo gfxmenu reboot - cat ${pkgs.grub2}/lib/grub/*/cdboot.img tmp > $out - ''; # */ + SERIAL 0 38400 + TIMEOUT ${builtins.toString syslinuxTimeout} + UI vesamenu.c32 + MENU TITLE NixOS + MENU BACKGROUND /isolinux/background.png + DEFAULT boot - - # The configuration file for Grub. - grubCfg = - '' - set default=${builtins.toString config.boot.loader.grub.default} - set timeout=${builtins.toString config.boot.loader.grub.timeout} - - if loadfont /boot/grub/unicode.pf2; then - set gfxmode=640x480 - insmod gfxterm - insmod vbe - terminal_output gfxterm - - insmod png - if background_image /boot/grub/splash.png; then - set color_normal=white/black - set color_highlight=black/white - else - set menu_color_normal=cyan/blue - set menu_color_highlight=white/blue - fi - - fi - - ${config.boot.loader.grub.extraEntries} + LABEL boot + MENU LABEL NixOS ${config.system.nixosVersion} Installer + LINUX /boot/bzImage + APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} + INITRD /boot/initrd ''; + isolinuxMemtest86Entry = '' + LABEL memtest + MENU LABEL Memtest86+ + LINUX /boot/memtest.bin + APPEND ${toString config.boot.loader.grub.memtest86.params} + ''; + + isolinuxCfg = baseIsolinuxCfg + (optionalString config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry); # The efi boot image efiDir = pkgs.runCommand "efi-directory" {} '' - mkdir -p $out/efi/boot - cp -v ${pkgs.gummiboot}/lib/gummiboot/gummiboot${targetArch}.efi $out/efi/boot/boot${targetArch}.efi + mkdir -p $out/EFI/boot + cp -v ${pkgs.gummiboot}/lib/gummiboot/gummiboot${targetArch}.efi $out/EFI/boot/boot${targetArch}.efi mkdir -p $out/loader/entries echo "title NixOS LiveCD" > $out/loader/entries/nixos-livecd.conf echo "linux /boot/bzImage" >> $out/loader/entries/nixos-livecd.conf echo "initrd /boot/initrd" >> $out/loader/entries/nixos-livecd.conf echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" >> $out/loader/entries/nixos-livecd.conf echo "default nixos-livecd" > $out/loader/loader.conf - echo "timeout 5" >> $out/loader/loader.conf + echo "timeout ${builtins.toString config.boot.loader.gummiboot.timeout}" >> $out/loader/loader.conf ''; efiImg = pkgs.runCommand "efi-image_eltorito" { buildInputs = [ pkgs.mtools pkgs.libfaketime ]; } @@ -163,6 +175,22 @@ in ''; }; + isoImage.makeUsbBootable = mkOption { + default = false; + description = '' + Whether the ISO image should be bootable from CD as well as USB. + ''; + }; + + isoImage.splashImage = mkOption { + default = pkgs.fetchurl { + url = https://raw.githubusercontent.com/NixOS/nixos-artwork/5729ab16c6a5793c10a2913b5a1b3f59b91c36ee/ideas/grub-splash/grub-nixos-1.png; + sha256 = "43fd8ad5decf6c23c87e9026170a13588c2eba249d9013cb9f888da5e2002217"; + }; + description = '' + The splash image to use in the bootloader. + ''; + }; }; @@ -176,7 +204,7 @@ in # !!! Hack - attributes expected by other modules. system.boot.loader.kernelFile = "bzImage"; - environment.systemPackages = [ pkgs.grub2 ]; + environment.systemPackages = [ pkgs.grub2 pkgs.syslinux ]; # In stage 1 of the boot, mount the CD as the root FS by label so # that we don't need to know its device. We pass the label of the @@ -226,7 +254,7 @@ in options = "allow_other,cow,nonempty,chroot=/mnt-root,max_files=32768,hide_meta_files,dirs=/nix/.rw-store=rw:/nix/.ro-store=ro"; }; - boot.initrd.availableKernelModules = [ "squashfs" "iso9660" ]; + boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "usb-storage" ]; boot.initrd.kernelModules = [ "loop" ]; @@ -246,15 +274,12 @@ in # Individual files to be included on the CD, outside of the Nix # store on the CD. isoImage.contents = - [ { source = grubImage; - target = "/boot/grub/grub_eltorito"; - } - { source = pkgs.substituteAll { - name = "grub.cfg"; - src = pkgs.writeText "grub.cfg-in" grubCfg; + [ { source = pkgs.substituteAll { + name = "isolinux.cfg"; + src = pkgs.writeText "isolinux.cfg-in" isolinuxCfg; bootRoot = "/boot"; }; - target = "/boot/grub/grub.cfg"; + target = "/isolinux/isolinux.cfg"; } { source = config.boot.kernelPackages.kernel + "/bzImage"; target = "/boot/bzImage"; @@ -262,51 +287,44 @@ in { source = config.system.build.initialRamdisk + "/initrd"; target = "/boot/initrd"; } - { source = "${pkgs.grub2}/share/grub/unicode.pf2"; - target = "/boot/grub/unicode.pf2"; - } - { source = config.boot.loader.grub.splashImage; - target = "/boot/grub/splash.png"; - } { source = config.system.build.squashfsStore; target = "/nix-store.squashfs"; } + { source = "${pkgs.syslinux}/share/syslinux"; + target = "/isolinux"; + } + { source = config.isoImage.splashImage; + target = "/isolinux/background.png"; + } ] ++ optionals config.isoImage.makeEfiBootable [ { source = efiImg; target = "/boot/efi.img"; } - { source = "${efiDir}/efi"; - target = "/efi"; + { source = "${efiDir}/EFI"; + target = "/EFI"; } { source = "${efiDir}/loader"; target = "/loader"; } - ] ++ mapAttrsToList (n: v: { source = v; target = "/boot/${n}"; }) config.boot.loader.grub.extraFiles; - - # The Grub menu. - boot.loader.grub.extraEntries = - '' - menuentry "NixOS ${config.system.nixosVersion} Installer" { - linux /boot/bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} - initrd /boot/initrd + ] ++ optionals config.boot.loader.grub.memtest86.enable [ + { source = "${pkgs.memtest86plus}/memtest.bin"; + target = "/boot/memtest.bin"; } + ]; - menuentry "Boot from hard disk" { - set root=(hd0) - chainloader +1 - } - ''; - - boot.loader.grub.timeout = 10; + boot.loader.timeout = 10; # Create the ISO image. system.build.isoImage = import ../../../lib/make-iso9660-image.nix ({ - inherit (pkgs) stdenv perl cdrkit pathsFromGraph; + inherit (pkgs) stdenv perl pathsFromGraph xorriso syslinux; inherit (config.isoImage) isoName compressImage volumeID contents; bootable = true; - bootImage = "/boot/grub/grub_eltorito"; + bootImage = "/isolinux/isolinux.bin"; + } // optionalAttrs config.isoImage.makeUsbBootable { + usbBootable = true; + isohybridMbrImage = "${pkgs.syslinux}/share/syslinux/isohdpfx.bin"; } // optionalAttrs config.isoImage.makeEfiBootable { efiBootable = true; efiBootImage = "boot/efi.img"; diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 8f3de10c613..1ccd6547df5 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -28,9 +28,14 @@ chrootCommand=(/run/current-system/sw/bin/bash) while [ "$#" -gt 0 ]; do i="$1"; shift 1 case "$i" in - -I) - given_path="$1"; shift 1 - extraBuildFlags+=("$i" "$given_path") + --max-jobs|-j|--cores|-I) + j="$1"; shift 1 + extraBuildFlags+=("$i" "$j") + ;; + --option) + j="$1"; shift 1 + k="$1"; shift 1 + extraBuildFlags+=("$i" "$j" "$k") ;; --root) mountPoint="$1"; shift 1 diff --git a/nixos/modules/misc/check-config.nix b/nixos/modules/misc/check-config.nix deleted file mode 100644 index e9803de2196..00000000000 --- a/nixos/modules/misc/check-config.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ lib, ... }: - -with lib; - -{ - options = { - environment.checkConfigurationOptions = mkOption { - type = types.bool; - default = true; - description = '' - Whether to check the validity of the entire configuration. - ''; - }; - }; -} diff --git a/nixos/modules/misc/extra-arguments.nix b/nixos/modules/misc/extra-arguments.nix new file mode 100644 index 00000000000..c2c8903546d --- /dev/null +++ b/nixos/modules/misc/extra-arguments.nix @@ -0,0 +1,14 @@ +{ lib, pkgs, config, ... }: + +{ + _module.args = { + modulesPath = ../.; + + pkgs_i686 = import ../../lib/nixpkgs.nix { + system = "i686-linux"; + config.allowUnfree = true; + }; + + utils = import ../../lib/utils.nix pkgs; + }; +} diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index b03107610fe..c2523a3cc32 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -212,6 +212,8 @@ uptimed = 184; zope2 = 185; ripple-data-api = 186; + mediatomb = 187; + rdnssd = 188; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -401,6 +403,8 @@ #uptimed = 184; # unused #zope2 = 185; # unused #ripple-data-api = 186; #unused + mediatomb = 187; + #rdnssd = 188; # unused # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index f41c8817ba4..395ba82f2d1 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -60,6 +60,7 @@ in nixpkgs.system = mkOption { type = types.str; + default = builtins.currentSystem; description = '' Specifies the Nix platform type for which NixOS should be built. If unset, it defaults to the platform type of your host system. @@ -71,6 +72,10 @@ in }; config = { - nixpkgs.system = mkDefault pkgs.stdenv.system; + _module.args.pkgs = import ../../lib/nixpkgs.nix { + system = config.nixpkgs.system; + + inherit (config.nixpkgs) config; + }; }; } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index cca1c1a73d3..17717c5988d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -29,6 +29,7 @@ ./hardware/all-firmware.nix ./hardware/cpu/amd-microcode.nix ./hardware/cpu/intel-microcode.nix + ./hardware/ksm.nix ./hardware/network/b43.nix ./hardware/network/intel-2100bg.nix ./hardware/network/intel-2200bg.nix @@ -43,8 +44,8 @@ ./installer/tools/nixos-checkout.nix ./installer/tools/tools.nix ./misc/assertions.nix - ./misc/check-config.nix ./misc/crashdump.nix + ./misc/extra-arguments.nix ./misc/ids.nix ./misc/lib.nix ./misc/locate.nix @@ -146,6 +147,7 @@ ./services/desktops/telepathy.nix ./services/games/ghost-one.nix ./services/games/minecraft-server.nix + ./services/games/minetest-server.nix ./services/hardware/acpid.nix ./services/hardware/amd-hybrid-graphics.nix ./services/hardware/bluetooth.nix @@ -191,6 +193,7 @@ ./services/misc/gitlab.nix ./services/misc/gitolite.nix ./services/misc/gpsd.nix + ./services/misc/mediatomb.nix ./services/misc/mesos-master.nix ./services/misc/mesos-slave.nix ./services/misc/nix-daemon.nix @@ -223,6 +226,7 @@ ./services/monitoring/smartd.nix ./services/monitoring/statsd.nix ./services/monitoring/systemhealth.nix + ./services/monitoring/teamviewer.nix ./services/monitoring/ups.nix ./services/monitoring/uptime.nix ./services/monitoring/zabbix-agent.nix diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix index 5c2ea07c554..895ecb122cb 100644 --- a/nixos/modules/programs/shadow.nix +++ b/nixos/modules/programs/shadow.nix @@ -100,7 +100,7 @@ in chgpasswd = { rootOK = true; }; }; - security.setuidPrograms = [ "passwd" "chfn" "su" "newgrp" + security.setuidPrograms = [ "passwd" "chfn" "su" "sg" "newgrp" "newuidmap" "newgidmap" # new in shadow 4.2.x ]; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index e820b2cb9ce..d90cffbd967 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -107,7 +107,6 @@ in zipModules ([] ++ obsolete [ "services" "sshd" "permitRootLogin" ] [ "services" "openssh" "permitRootLogin" ] ++ obsolete [ "services" "xserver" "startSSHAgent" ] [ "services" "xserver" "startOpenSSHAgent" ] ++ obsolete [ "services" "xserver" "startOpenSSHAgent" ] [ "programs" "ssh" "startAgent" ] -++ obsolete [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "xbmc" ] # VirtualBox ++ obsolete [ "services" "virtualbox" "enable" ] [ "services" "virtualboxGuest" "enable" ] @@ -136,6 +135,12 @@ in zipModules ([] ++ obsolete [ "services" "mysql55" ] [ "services" "mysql" ] +++ obsolete [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ] + +# XBMC +++ obsolete [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ] +++ obsolete [ "services" "xserver" "desktopManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ] + # Options that are obsolete and have no replacement. ++ obsolete' [ "boot" "loader" "grub" "bootDevice" ] ++ obsolete' [ "boot" "initrd" "luks" "enable" ] diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 8cd40093348..35974f6890e 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -44,53 +44,41 @@ in config = { mode = mkOption { - type = types.str; + type = types.enum [ "auto" "custom" ]; default = "auto"; - example = "custom"; description = '' grsecurity configuration mode. This specifies whether grsecurity is auto-configured or otherwise completely - manually configured. Can either be - custom or auto. - - auto is recommended. + manually configured. ''; }; priority = mkOption { - type = types.str; + type = types.enum [ "security" "performance" ]; default = "security"; - example = "performance"; description = '' grsecurity configuration priority. This specifies whether the kernel configuration should emphasize speed or - security. Can either be security or - performance. + security. ''; }; system = mkOption { - type = types.str; - default = ""; - example = "desktop"; + type = types.enum [ "desktop" "server" ]; + default = "desktop"; description = '' - grsecurity system configuration. This specifies whether - the kernel configuration should be suitable for a Desktop - or a Server. Can either be server or - desktop. + grsecurity system configuration. ''; }; virtualisationConfig = mkOption { - type = types.str; - default = "none"; - example = "host"; + type = types.nullOr (types.enum [ "host" "guest" ]); + default = null; description = '' grsecurity virtualisation configuration. This specifies the virtualisation role of the machine - that is, whether it will be a virtual machine guest, a virtual machine - host, or neither. Can be one of none, - host, or guest. + host, or neither. ''; }; @@ -106,17 +94,10 @@ in }; virtualisationSoftware = mkOption { - type = types.str; - default = ""; - example = "kvm"; + type = types.nullOr (types.enum [ "kvm" "xen" "vmware" "virtualbox" ]); + default = null; description = '' - grsecurity virtualisation software. Set this to the - specified virtual machine technology if the machine is - running as a guest, or a host. - - Can be one of kvm, - xen, vmware or - virtualbox. + Configure grsecurity for use with this virtualisation software. ''; }; @@ -262,25 +243,13 @@ in && config.boot.kernelPackages.kernel.features.grsecurity; message = "grsecurity enabled, but kernel doesn't have grsec support"; } - { assertion = elem cfg.config.mode [ "auto" "custom" ]; - message = "grsecurity mode must either be 'auto' or 'custom'."; - } - { assertion = cfg.config.mode == "auto" -> elem cfg.config.system [ "desktop" "server" ]; - message = "when using auto grsec mode, system must be either 'desktop' or 'server'"; - } - { assertion = cfg.config.mode == "auto" -> elem cfg.config.priority [ "performance" "security" ]; - message = "when using auto grsec mode, priority must be 'performance' or 'security'."; - } - { assertion = cfg.config.mode == "auto" -> elem cfg.config.virtualisationConfig [ "host" "guest" "none" ]; - message = "when using auto grsec mode, 'virt' must be 'host', 'guest' or 'none'."; - } - { assertion = (cfg.config.mode == "auto" && (elem cfg.config.virtualisationConfig [ "host" "guest" ])) -> + { assertion = (cfg.config.mode == "auto" && (cfg.config.virtualisationConfig != null)) -> cfg.config.hardwareVirtualisation != null; message = "when using auto grsec mode with virtualisation, you must specify if your hardware has virtualisation extensions"; } - { assertion = (cfg.config.mode == "auto" && (elem cfg.config.virtualisationConfig [ "host" "guest" ])) -> - elem cfg.config.virtualisationSoftware [ "kvm" "xen" "virtualbox" "vmware" ]; - message = "virtualisation software must be 'kvm', 'xen', 'vmware' or 'virtualbox'"; + { assertion = (cfg.config.mode == "auto" && (cfg.config.virtualisationConfig != null)) -> + cfg.config.virtualisationSoftware != null; + message = "grsecurity configured for virtualisation but no virtualisation software specified"; } ]; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index e81278a95d5..631e8317cb4 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -6,8 +6,9 @@ with lib; let + parentConfig = config; - pamOpts = args: { + pamOpts = { config, name, ... }: let cfg = config; in let config = parentConfig; in { options = { @@ -180,8 +181,8 @@ let }; - config = let cfg = args.config; in { - name = mkDefault args.name; + config = { + name = mkDefault name; setLoginUid = mkDefault cfg.startSession; limits = mkDefault config.security.pam.loginLimits; diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index d42a8c7f7d2..bced2a6ed75 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -77,7 +77,7 @@ in root ALL=(ALL) SETENV: ALL # Users in the "wheel" group can do anything. - %wheel ALL=(ALL) ${if cfg.wheelNeedsPassword then "" else "NOPASSWD: ALL, "}SETENV: ALL + %wheel ALL=(ALL:ALL) ${if cfg.wheelNeedsPassword then "" else "NOPASSWD: ALL, "}SETENV: ALL ${cfg.extraConfig} ''; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 1e2400d84b3..05b13492052 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -8,7 +8,7 @@ let mysql = cfg.package; - is55 = mysql.mysqlVersion == "5.5"; + atLeast55 = versionAtLeast mysql.mysqlVersion "5.5"; pidFile = "${cfg.pidDir}/mysqld.pid"; @@ -22,7 +22,7 @@ let port = ${toString cfg.port} ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"} ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"} - ${optionalString (cfg.replication.role == "slave" && !is55) + ${optionalString (cfg.replication.role == "slave" && !atLeast55) '' master-host = ${cfg.replication.masterHost} master-user = ${cfg.replication.masterUser} @@ -73,7 +73,7 @@ in }; pidDir = mkOption { - default = "/var/run/mysql"; + default = "/run/mysqld"; description = "Location of the file which stores the PID of the MySQL server"; }; @@ -178,6 +178,10 @@ in mkdir -m 0700 -p ${cfg.pidDir} chown -R ${cfg.user} ${cfg.pidDir} + + # Make the socket directory + mkdir -m 0700 -p /run/mysqld + chown -R ${cfg.user} /run/mysqld ''; serviceConfig.ExecStart = "${mysql}/bin/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}"; @@ -186,7 +190,7 @@ in '' # Wait until the MySQL server is available for use count=0 - while [ ! -e /tmp/mysql.sock ] + while [ ! -e /run/mysqld/mysqld.sock ] do if [ $count -eq 30 ] then @@ -220,7 +224,7 @@ in fi '') cfg.initialDatabases} - ${optionalString (cfg.replication.role == "slave" && is55) + ${optionalString (cfg.replication.role == "slave" && atLeast55) '' # Set up the replication master diff --git a/nixos/modules/services/games/minetest-server.nix b/nixos/modules/services/games/minetest-server.nix new file mode 100644 index 00000000000..996e313386f --- /dev/null +++ b/nixos/modules/services/games/minetest-server.nix @@ -0,0 +1,104 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.minetest-server; + flag = val: name: if val != null then "--${name} ${val} " else ""; + flags = [ + (flag cfg.gameId "gameid") + (flag cfg.world "world") + (flag cfg.configPath "config") + (flag cfg.logPath "logfile") + (flag cfg.port "port") + ]; +in +{ + options = { + services.minetest-server = { + enable = mkOption { + type = types.bool; + default = false; + description = "If enabled, starts a Minetest Server."; + }; + + gameId = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Id of the game to use. To list available games run + `minetestserver --gameid list`. + + If only one game exists, this option can be null. + ''; + }; + + world = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Name of the world to use. To list available worlds run + `minetestserver --world list`. + + If only one world exists, this option can be null. + ''; + }; + + configPath = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to the config to use. + + If set to null, the config of the running user will be used: + `~/.minetest/minetest.conf`. + ''; + }; + + logPath = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to logfile for logging. + + If set to null, logging will be output to stdout which means + all output will be catched by systemd. + ''; + }; + + port = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + Port number to bind to. + + If set to null, the default 30000 will be used. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + users.extraUsers.minetest = { + description = "Minetest Server Service user"; + home = "/var/lib/minetest"; + createHome = true; + uid = config.ids.uids.minetest; + }; + + systemd.services.minetest-server = { + description = "Minetest Server Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig.Restart = "always"; + serviceConfig.User = "minetest"; + + script = '' + cd /var/lib/minetest + + exec ${pkgs.minetest}/bin/minetestserver ${concatStrings flags} + ''; + }; + }; +} diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index a775aed0fda..50588e44958 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -237,7 +237,10 @@ in system.activationScripts.udevd = '' - echo "" > /proc/sys/kernel/hotplug + # The deprecated hotplug uevent helper is not used anymore + if [ -e /proc/sys/kernel/hotplug ]; then + echo "" > /proc/sys/kernel/hotplug + fi # Regenerate the hardware database /var/lib/udev/hwdb.bin # whenever systemd changes. diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix new file mode 100644 index 00000000000..23227548039 --- /dev/null +++ b/nixos/modules/services/misc/mediatomb.nix @@ -0,0 +1,282 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + uid = config.ids.uids.mediatomb; + gid = config.ids.gids.mediatomb; + cfg = config.services.mediatomb; + + mtConf = pkgs.writeText "config.xml" '' + + + + + + + + + ${cfg.serverName} + uuid:${cfg.uuid} + ${cfg.dataDir} + ${pkgs.mediatomb}/share/mediatomb/web + + + mediatomb.db + + + + ${if cfg.dsmSupport then '' + + + + + redsonic.com + 105 + '' else ""} + ${if cfg.tg100Support then '' + 101 + '' else ""} + + + * + + video + + + + + + + /nix/store/cngbzn39vidd6jm4wgzxfafqll74ybfa-mediatomb-0.12.1/share/mediatomb/js/common.js + /nix/store/cngbzn39vidd6jm4wgzxfafqll74ybfa-mediatomb-0.12.1/share/mediatomb/js/playlists.js + + /nix/store/cngbzn39vidd6jm4wgzxfafqll74ybfa-mediatomb-0.12.1/share/mediatomb/js/import.js + + + + + + + + + + + + + + + + + + + + + + + + ${if cfg.ps3Support then '' + + '' else ""} + ${if cfg.dsmSupport then '' + + '' else ""} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + audio/L16 + no + yes + no + + + + + video/mpeg + yes + yes + yes + + + + + + + ''; + +in { + + + ###### interface + + options = { + + services.mediatomb = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable the mediatomb DLNA server. + ''; + }; + + serverName = mkOption { + type = types.string; + default = "mediatomb"; + description = '' + How to identify the server on the network. + ''; + }; + + ps3Support = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable ps3 specific tweaks. + WARNING: incompatible with DSM 320 support. + ''; + }; + + dsmSupport = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable D-Link DSM 320 specific tweaks. + WARNING: incompatible with ps3 support. + ''; + }; + + tg100Support = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable Telegent TG100 specific tweaks. + ''; + }; + + transcoding = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable transcoding. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/mediatomb"; + description = '' + The directory where mediatomb stores its state, data, etc. + ''; + }; + + user = mkOption { + default = "mediatomb"; + description = "User account under which mediatomb runs."; + }; + + group = mkOption { + default = "mediatomb"; + description = "Group account under which mediatomb runs."; + }; + + port = mkOption { + default = 49152; + description = '' + The network port to listen on. + ''; + }; + + uuid = mkOption { + default = "fdfc8a4e-a3ad-4c1d-b43d-a2eedb03a687"; + description = '' + A unique (on your network) to identify the server by. + ''; + }; + + customCfg = mkOption { + type = types.bool; + default = false; + description = '' + Allow mediatomb to create and use its own config file inside ${cfg.dataDir}. + ''; + }; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + systemd.services.mediatomb = { + description = "MediaTomb media Server"; + after = [ "local-fs.target" "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.mediatomb ]; + serviceConfig.ExecStart = "${pkgs.mediatomb}/bin/mediatomb -p ${toString cfg.port} ${if cfg.customCfg then "" else "-c ${mtConf}"} -m ${cfg.dataDir}"; + serviceConfig.User = "${cfg.user}"; + }; + + users.extraGroups = optionalAttrs (cfg.group == "mediatomb") (singleton { + name = "mediatomb"; + gid = gid; + }); + + users.extraUsers = optionalAttrs (cfg.user == "mediatomb") (singleton { + name = "mediatomb"; + isSystemUser = true; + group = cfg.group; + home = "${cfg.dataDir}"; + createHome = true; + description = "Mediatomb DLNA Server User"; + }); + + networking.firewall = { + allowedUDPPorts = [ 1900 cfg.port ]; + allowedTCPPorts = [ cfg.port ]; + }; + }; +} diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 2da84c031a7..6d25fef4576 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -379,9 +379,6 @@ in /nix/var/nix/gcroots/per-user \ /nix/var/nix/profiles/per-user \ /nix/var/nix/gcroots/tmp - - ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/ - ln -sf /nix/var/nix/manifests /nix/var/nix/gcroots/ ''; }; diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index c0d7885280a..f73c4102cfe 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -3,7 +3,7 @@ # of the virtual consoles. The latter is useful for the installation # CD. -{ config, lib, pkgs, baseModules, ... } @ extraArgs: +{ config, lib, pkgs, baseModules, ... }: with lib; @@ -18,7 +18,7 @@ let eval = evalModules { modules = [ versionModule ] ++ baseModules; - args = (removeAttrs extraArgs ["config" "options"]) // { modules = [ ]; }; + args = (config._module.args) // { modules = [ ]; }; }; manual = import ../../../doc/manual { diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 8558c4ff8e4..31afa859e25 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -34,7 +34,7 @@ let cap=$(sed -nr 's/.*#%#\s+capabilities\s*=\s*(.+)/\1/p' $file) wrapProgram $file \ - --set PATH "/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/sbin" \ + --set PATH "/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/bin" \ --set MUNIN_LIBDIR "${pkgs.munin}/lib" \ --set MUNIN_PLUGSTATE "/var/run/munin" @@ -194,7 +194,7 @@ in mkdir -p /etc/munin/plugins rm -rf /etc/munin/plugins/* - PATH="/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/sbin" ${pkgs.munin}/sbin/munin-node-configure --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${muninPlugins} --servicedir=/etc/munin/plugins 2>/dev/null | ${pkgs.bash}/bin/bash + PATH="/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/bin" ${pkgs.munin}/sbin/munin-node-configure --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${muninPlugins} --servicedir=/etc/munin/plugins 2>/dev/null | ${pkgs.bash}/bin/bash ''; serviceConfig = { ExecStart = "${pkgs.munin}/sbin/munin-node --config ${nodeConf} --servicedir /etc/munin/plugins/"; diff --git a/nixos/modules/services/monitoring/teamviewer.nix b/nixos/modules/services/monitoring/teamviewer.nix new file mode 100644 index 00000000000..beba5dcd1b0 --- /dev/null +++ b/nixos/modules/services/monitoring/teamviewer.nix @@ -0,0 +1,45 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.teamviewer; + +in + +{ + + ###### interface + + options = { + + services.teamviewer.enable = mkEnableOption "teamviewer daemon"; + + }; + + ###### implementation + + config = mkIf (cfg.enable) { + + environment.systemPackages = [ pkgs.teamviewer ]; + + systemd.services.teamviewerd = { + description = "TeamViewer remote control daemon"; + + wantedBy = [ "graphical.target" ]; + after = [ "NetworkManager-wait-online.service" "network.target" ]; + + serviceConfig = { + Type = "forking"; + ExecStart = "${pkgs.teamviewer}/bin/teamviewerd -d"; + PIDFile = "/run/teamviewerd.pid"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + Restart = "on-abort"; + StartLimitInterval = "60"; + StartLimitBurst = "10"; + }; + }; + }; + +} diff --git a/nixos/modules/services/network-filesystems/drbd.nix b/nixos/modules/services/network-filesystems/drbd.nix index b914724abfe..1bd67206444 100644 --- a/nixos/modules/services/network-filesystems/drbd.nix +++ b/nixos/modules/services/network-filesystems/drbd.nix @@ -44,7 +44,7 @@ let cfg = config.services.drbd; in boot.extraModprobeConfig = '' - options drbd usermode_helper=/run/current-system/sw/sbin/drbdadm + options drbd usermode_helper=/run/current-system/sw/bin/drbdadm ''; environment.etc = singleton diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix index 34bddf90873..0bfd3b74348 100644 --- a/nixos/modules/services/networking/btsync.nix +++ b/nixos/modules/services/networking/btsync.nix @@ -4,6 +4,9 @@ with lib; let cfg = config.services.btsync; + + bittorrentSync = cfg.package; + listenAddr = cfg.httpListenAddr + ":" + (toString cfg.httpListenPort); boolStr = x: if x then "true" else "false"; @@ -57,7 +60,7 @@ let '' { "device_name": "${cfg.deviceName}", - "storage_path": "/var/lib/btsync/", + "storage_path": "${cfg.storagePath}", "listening_port": ${toString cfg.listeningPort}, "use_gui": false, @@ -195,6 +198,24 @@ in ''; }; + package = mkOption { + type = types.package; + default = pkgs.bittorrentSync14; + example = literalExample "pkgs.bittorrentSync20"; + description = '' + Branch of bittorrent sync to use. + ''; + }; + + storagePath = mkOption { + type = types.path; + default = "/var/lib/btsync"; + example = "/var/lib/btsync"; + description = '' + Where to store the bittorrent sync files. + ''; + }; + apiKey = mkOption { type = types.str; default = ""; @@ -258,7 +279,7 @@ in users.extraUsers.btsync = { description = "Bittorrent Sync Service user"; - home = "/var/lib/btsync"; + home = cfg.storagePath; createHome = true; uid = config.ids.uids.btsync; group = "btsync"; @@ -292,6 +313,6 @@ in }; }; - environment.systemPackages = [ pkgs.bittorrentSync ]; + environment.systemPackages = [ cfg.package ]; }; } diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 3a64d3f09e0..f00c5d1f701 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -183,6 +183,9 @@ in { { source = "${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name"; target = "NetworkManager/VPN/nm-pptp-service.name"; } + { source = "${networkmanager_l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name"; + target = "NetworkManager/VPN/nm-l2tp-service.name"; + } ] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == []) { source = overrideNameserversScript; target = "NetworkManager/dispatcher.d/02overridedns"; @@ -197,6 +200,7 @@ in { networkmanager_vpnc networkmanager_openconnect networkmanager_pptp + networkmanager_l2tp modemmanager ]; @@ -240,6 +244,7 @@ in { networkmanager_vpnc networkmanager_openconnect networkmanager_pptp + networkmanager_l2tp modemmanager ]; diff --git a/nixos/modules/services/networking/rdnssd.nix b/nixos/modules/services/networking/rdnssd.nix index 4c1891816e3..95833d31e99 100644 --- a/nixos/modules/services/networking/rdnssd.nix +++ b/nixos/modules/services/networking/rdnssd.nix @@ -4,7 +4,12 @@ { config, lib, pkgs, ... }: with lib; - +let + mergeHook = pkgs.writeScript "rdnssd-merge-hook" '' + #! ${pkgs.stdenv.shell} -e + ${pkgs.openresolv}/bin/resolvconf -u + ''; +in { ###### interface @@ -30,18 +35,39 @@ with lib; config = mkIf config.services.rdnssd.enable { - jobs.rdnssd = - { description = "RDNSS daemon"; + systemd.services.rdnssd = { + description = "RDNSS daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; - # Start before the network interfaces are brought up so that - # the daemon receives RDNSS advertisements from the kernel. - startOn = "starting network-interfaces"; + preStart = '' + # Create the proper run directory + mkdir -p /run/rdnssd + touch /run/rdnssd/resolv.conf + chown -R rdnssd /run/rdnssd - # !!! Should write to /var/run/rdnssd/resolv.conf and run the daemon under another uid. - exec = "${pkgs.ndisc6}/sbin/rdnssd --resolv-file /etc/resolv.conf -u root"; + # Link the resolvconf interfaces to rdnssd + rm -f /run/resolvconf/interfaces/rdnssd + ln -s /run/rdnssd/resolv.conf /run/resolvconf/interfaces/rdnssd + ${mergeHook} + ''; - daemonType = "fork"; + postStop = '' + rm -f /run/resolvconf/interfaces/rdnssd + ${mergeHook} + ''; + + serviceConfig = { + ExecStart = "@${pkgs.ndisc6}/bin/rdnssd rdnssd -p /run/rdnssd/rdnssd.pid -r /run/rdnssd/resolv.conf -u rdnssd -H ${mergeHook}"; + Type = "forking"; + PIDFile = "/run/rdnssd/rdnssd.pid"; }; + }; + + users.extraUsers.rdnssd = { + description = "RDNSSD Daemon User"; + uid = config.ids.uids.rdnssd; + }; }; diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 928f16c9448..d40f7d6d05d 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -130,6 +130,9 @@ in config.system.path ]; + # Don't restart dbus-daemon. Bad things tend to happen if we do. + systemd.services.dbus.reloadIfChanged = true; + environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ]; }; diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 9165658a7be..998bcd354c5 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -19,7 +19,7 @@ in # E.g., if KDE is enabled, it supersedes xterm. imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde5.nix - ./e19.nix ./gnome3.nix ./xbmc.nix ./kodi.nix + ./e19.nix ./gnome3.nix ./kodi.nix ]; options = { diff --git a/nixos/modules/services/x11/desktop-managers/xbmc.nix b/nixos/modules/services/x11/desktop-managers/xbmc.nix deleted file mode 100644 index 97e966ca019..00000000000 --- a/nixos/modules/services/x11/desktop-managers/xbmc.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.xserver.desktopManager.xbmc; -in - -{ - options = { - services.xserver.desktopManager.xbmc = { - enable = mkOption { - default = false; - example = true; - description = "Enable the xbmc multimedia center."; - }; - }; - }; - - config = mkIf cfg.enable { - services.xserver.desktopManager.session = [{ - name = "xbmc"; - start = '' - ${pkgs.xbmc}/bin/xbmc --lircdev /var/run/lirc/lircd --standalone & - waitPID=$! - ''; - }]; - - environment.systemPackages = [ pkgs.xbmc ]; - }; -} \ No newline at end of file diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index e7ddb7ff254..6a7b810261d 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -55,7 +55,7 @@ let [UserList] minimum-uid=500 hidden-users=${concatStringsSep " " dmcfg.hiddenUsers} - hidden-shells=/run/current-system/sw/sbin/nologin + hidden-shells=/run/current-system/sw/bin/nologin ''; lightdmConf = writeText "lightdm.conf" diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index c14c13b1cba..c44383cc611 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -26,7 +26,7 @@ let [Users] MaximumUid=${toString config.ids.uids.nixbld} HideUsers=${concatStringsSep "," dmcfg.hiddenUsers} - HideShells=/run/current-system/sw/sbin/nologin + HideShells=/run/current-system/sw/bin/nologin [XDisplay] MinimumVT=${toString xcfg.tty} diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index ce36bac2bdc..7aa4b12a654 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -384,9 +384,13 @@ system("@systemd@/bin/systemctl", "reset-failed"); # Make systemd reload its units. system("@systemd@/bin/systemctl", "daemon-reload") == 0 or $res = 3; -# Signal dbus to reload its configuration before starting other units. -# Other units may rely on newly installed policy files under /etc/dbus-1 -system("@systemd@/bin/systemctl", "reload-or-restart", "dbus.service"); +# Reload units that need it. This includes remounting changed mount +# units. +if (scalar(keys %unitsToReload) > 0) { + print STDERR "reloading the following units: ", join(", ", sort(keys %unitsToReload)), "\n"; + system("@systemd@/bin/systemctl", "reload", "--", sort(keys %unitsToReload)) == 0 or $res = 4; + unlink($reloadListFile); +} # Restart changed services (those that have to be restarted rather # than stopped and started). @@ -407,14 +411,6 @@ print STDERR "starting the following units: ", join(", ", @unitsToStartFiltered) system("@systemd@/bin/systemctl", "start", "--", sort(keys %unitsToStart)) == 0 or $res = 4; unlink($startListFile); -# Reload units that need it. This includes remounting changed mount -# units. -if (scalar(keys %unitsToReload) > 0) { - print STDERR "reloading the following units: ", join(", ", sort(keys %unitsToReload)), "\n"; - system("@systemd@/bin/systemctl", "reload", "--", sort(keys %unitsToReload)) == 0 or $res = 4; - unlink($reloadListFile); -} - # Print failed and new units. my (@failed, @new, @restarting); diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 6d9871a2f6f..29c449d4d0b 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, utils, ... }: -with lib; with utils; +with lib; with import ./systemd-unit-options.nix { inherit config lib; }; let diff --git a/nixos/modules/virtualisation/amazon-config.nix b/nixos/modules/virtualisation/amazon-config.nix index e816ed2d183..a27e52a8e68 100644 --- a/nixos/modules/virtualisation/amazon-config.nix +++ b/nixos/modules/virtualisation/amazon-config.nix @@ -1,5 +1,3 @@ -{ config, pkgs, modulesPath, ... }: - { - imports = [ "${modulesPath}/virtualisation/amazon-image.nix" ]; + imports = [ ./amazon-image.nix ]; } diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 22d14aa57a0..cb1c200ab47 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -57,6 +57,7 @@ in rec { (all nixos.tests.installer.simple) (all nixos.tests.installer.simpleLabels) (all nixos.tests.installer.simpleProvided) + (all nixos.tests.installer.swraid) (all nixos.tests.installer.btrfsSimple) (all nixos.tests.installer.btrfsSubvols) (all nixos.tests.installer.btrfsSubvolDefault) diff --git a/nixos/release.nix b/nixos/release.nix index f84501d741a..375b65d040e 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -260,6 +260,7 @@ in rec { tests.installer.simple = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simple.test); tests.installer.simpleLabels = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simpleLabels.test); tests.installer.simpleProvided = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simpleProvided.test); + tests.installer.swraid = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).swraid.test); tests.installer.btrfsSimple = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).btrfsSimple.test); tests.installer.btrfsSubvols = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).btrfsSubvols.test); tests.installer.btrfsSubvolDefault = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).btrfsSubvolDefault.test); @@ -297,6 +298,7 @@ in rec { # TODO: put in networking.nix after the test becomes more complete tests.networkingProxy = callTest tests/networking-proxy.nix {}; tests.nfs3 = callTest tests/nfs.nix { version = 3; }; + tests.nfs4 = callTest tests/nfs.nix { version = 4; }; tests.nsd = callTest tests/nsd.nix {}; tests.openssh = callTest tests/openssh.nix {}; tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); @@ -308,8 +310,12 @@ in rec { tests.simple = callTest tests/simple.nix {}; tests.tomcat = callTest tests/tomcat.nix {}; tests.udisks2 = callTest tests/udisks2.nix {}; - tests.virtualbox = callTest tests/virtualbox.nix {}; + tests.virtualbox = hydraJob (import tests/virtualbox.nix { system = "x86_64-linux"; }); tests.xfce = callTest tests/xfce.nix {}; + tests.bootBiosCdrom = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootBiosCdrom); + tests.bootBiosUsb = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootBiosUsb); + tests.bootUefiCdrom = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootUefiCdrom); + tests.bootUefiUsb = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootUefiUsb); /* Build a bunch of typical closures so that Hydra can keep track of diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix new file mode 100644 index 00000000000..2fdbb0c00b8 --- /dev/null +++ b/nixos/tests/boot.nix @@ -0,0 +1,63 @@ +{ system ? builtins.currentSystem }: + +with import ../lib/testing.nix { inherit system; }; +with import ../lib/qemu-flags.nix; +with pkgs.lib; + +let + + iso = + (import ../lib/eval-config.nix { + inherit system; + modules = + [ ../modules/installer/cd-dvd/installation-cd-minimal.nix + ../modules/testing/test-instrumentation.nix + { key = "serial"; + boot.loader.grub.timeout = mkOverride 0 0; + + # The test cannot access the network, so any sources we + # need must be included in the ISO. + isoImage.storeContents = + [ pkgs.glibcLocales + pkgs.sudo + pkgs.docbook5 + pkgs.docbook5_xsl + pkgs.grub + pkgs.perlPackages.XMLLibXML + pkgs.unionfs-fuse + pkgs.gummiboot + ]; + } + ]; + }).config.system.build.isoImage; + + makeBootTest = name: machineConfig: + makeTest { + inherit iso; + name = "boot-" + name; + nodes = { }; + testScript = + '' + my $machine = createMachine({ ${machineConfig}, qemuFlags => '-m 768' }); + $machine->start; + $machine->waitForUnit("multi-user.target"); + $machine->shutdown; + ''; + }; +in { + bootBiosCdrom = makeBootTest "bios-cdrom" '' + cdrom => glob("${iso}/iso/*.iso") + ''; + bootBiosUsb = makeBootTest "bios-usb" '' + usb => glob("${iso}/iso/*.iso") + ''; + bootUefiCdrom = makeBootTest "uefi-cdrom" '' + cdrom => glob("${iso}/iso/*.iso"), + bios => '${pkgs.OVMF}/FV/OVMF.fd' + ''; + bootUefiUsb = makeBootTest "uefi-usb" '' + usb => glob("${iso}/iso/*.iso"), + bios => '${pkgs.OVMF}/FV/OVMF.fd' + ''; + } + diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 368d0e43c46..026433fc7ee 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -109,7 +109,12 @@ import ./make-test.nix ( $machine->waitUntilSucceeds("${xdo "check-startup" '' search --sync --onlyvisible --name "startup done" # close first start help popup - key Escape + key -delay 1000 Escape + # XXX: This is to make sure the popup is closed, but we better do + # screenshots to detect visual changes. + key -delay 2000 Escape + key -delay 3000 Escape + key -delay 4000 Escape windowfocus --sync windowactivate --sync ''}"); diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index c7815bde3f5..af87705b927 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -327,12 +327,12 @@ in { $machine->succeed( "parted /dev/vda --" . " mklabel msdos" - . " mkpart primary ext2 1M 30MB" # /boot - . " mkpart extended 30M -1s" - . " mkpart logical 31M 1531M" # md0 (root), first device - . " mkpart logical 1540M 3040M" # md0 (root), second device - . " mkpart logical 3050M 3306M" # md1 (swap), first device - . " mkpart logical 3320M 3576M", # md1 (swap), second device + . " mkpart primary ext2 1M 100MB" # /boot + . " mkpart extended 100M -1s" + . " mkpart logical 102M 1602M" # md0 (root), first device + . " mkpart logical 1603M 3103M" # md0 (root), second device + . " mkpart logical 3104M 3360M" # md1 (swap), first device + . " mkpart logical 3361M 3617M", # md1 (swap), second device "udevadm settle", "ls -l /dev/vda* >&2", "cat /proc/partitions >&2", diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix index 5ed805a1695..216fea7784a 100644 --- a/nixos/tests/nfs.nix +++ b/nixos/tests/nfs.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ version, ... }: +import ./make-test.nix ({ version ? 4, ... }: let diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index febe0923ba2..827481879a3 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -244,6 +244,7 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let for (my $i = 0; $i <= 120; $i += 10) { $machine->sleep(10); return if checkRunning_${name}; + eval { $_[0]->() } if defined $_[0]; } die "VirtualBox VM didn't start up within 2 minutes"; } @@ -335,7 +336,9 @@ in { $machine->screenshot("gui_manager_started"); $machine->sendKeys("ret"); $machine->screenshot("gui_manager_sent_startup"); - waitForStartup_simple; + waitForStartup_simple (sub { + $machine->sendKeys("ret"); + }); $machine->screenshot("gui_started"); waitForVMBoot_simple; $machine->screenshot("gui_booted"); diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 2d96100fffc..0e98e234214 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec{ version = "0.10.0"; src = fetchurl { - url = "https://bitcoin.org/bin/bitcoin-core-0.10.0/bitcoin-${version}.tar.gz"; + url = [ "https://bitcoin.org/bin/bitcoin-core-0.10.0/bitcoin-${version}.tar.gz" + "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-0.10.0/bitcoin-${version}.tar.gz" + ]; sha256 = "a516cf6d9f58a117607148405334b35d3178df1ba1c59229609d2bcd08d30624"; }; diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index d695150bf31..6ecdc1f98d4 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; buildInputs = [ qtscriptgenerator stdenv.cc.libc gettext curl - libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi + libxml2 mysql.lib taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi soprano qca2 libmtp liblastfm libgpod pkgconfig qjson ffmpeg libofa nepomuk_core ]; cmakeFlags = "-DKDE4_BUILD_TESTS=OFF"; diff --git a/pkgs/applications/audio/faust-compiler/default.nix b/pkgs/applications/audio/faust-compiler/default.nix deleted file mode 100644 index f4bf9d4c659..00000000000 --- a/pkgs/applications/audio/faust-compiler/default.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ fetchgit, stdenv, unzip, pkgconfig, makeWrapper, libsndfile, libmicrohttpd, vim }: - -stdenv.mkDerivation rec { - - version = "8-1-2015"; - name = "faust-compiler-${version}"; - src = fetchgit { - url = git://git.code.sf.net/p/faudiostream/code; - rev = "4db76fdc02b6aec8d15a5af77fcd5283abe963ce"; - sha256 = "f1ac92092ee173e4bcf6b2cb1ac385a7c390fb362a578a403b2b6edd5dc7d5d0"; - }; - - # this version has a bug that manifests when doing faust2jack: - /*version = "0.9.67";*/ - /*name = "faust-compiler-${version}";*/ - /*src = fetchurl {*/ - /*url = "http://downloads.sourceforge.net/project/faudiostream/faust-${version}.zip";*/ - /*sha256 = "068vl9536zn0j4pknwfcchzi90rx5pk64wbcbd67z32w0csx8xm1";*/ - /*};*/ - - buildInputs = [ unzip pkgconfig makeWrapper libsndfile libmicrohttpd vim]; - - - makeFlags="PREFIX = $(out)"; - FPATH="$out"; # <- where to search - - patchPhase = '' - sed -i 's@?= $(shell uname -s)@:= Linux@g' architecture/osclib/oscpack/Makefile - sed -i 's@faust/misc.h@../../architecture/faust/misc.h@g' tools/sound2faust/sound2faust.cpp - sed -i 's@faust/gui/@../../architecture/faust/gui/@g' architecture/faust/misc.h - ''; - - buildPhase = '' - make -C compiler -f Makefile.unix - make -C architecture/osclib - g++ -O3 tools/sound2faust/sound2faust.cpp `pkg-config --cflags --static --libs sndfile` -o tools/sound2faust/sound2faust - make httpd - - ''; - - installPhase = '' - - echo install faust itself - mkdir -p $out/bin/ - mkdir -p $out/include/ - mkdir -p $out/include/faust/ - mkdir -p $out/include/faust/osc/ - install compiler/faust $out/bin/ - - echo install architecture and faust library files - mkdir -p $out/lib/faust - cp architecture/*.lib $out/lib/faust/ - cp architecture/*.cpp $out/lib/faust/ - - echo install math documentation files - cp architecture/mathdoctexts-*.txt $out/lib/faust/ - cp architecture/latexheader.tex $out/lib/faust/ - - echo install additional binary libraries: osc, http - ([ -e architecture/httpdlib/libHTTPDFaust.a ] && cp architecture/httpdlib/libHTTPDFaust.a $out/lib/faust/) || echo libHTTPDFaust not available - cp architecture/osclib/*.a $out/lib/faust/ - cp -r architecture/httpdlib/html/js $out/lib/faust/js - ([ -e architecture/httpdlib/src/hexa/stylesheet ] && cp architecture/httpdlib/src/hexa/stylesheet $out/lib/faust/js/stylesheet.js) || echo stylesheet not available - ([ -e architecture/httpdlib/src/hexa/jsscripts ] && cp architecture/httpdlib/src/hexa/jsscripts $out/lib/faust/js/jsscripts.js) || echo jsscripts not available - - echo install includes files for architectures - cp -r architecture/faust $out/include/ - - echo install additional includes files for binary libraries: osc, http - cp architecture/osclib/faust/faust/OSCControler.h $out/include/faust/gui/ - cp architecture/osclib/faust/faust/osc/*.h $out/include/faust/osc/ - cp architecture/httpdlib/src/include/*.h $out/include/faust/gui/ - - - echo patch header and cpp files - find $out/include/ -name "*.h" -type f | xargs sed "s@#include \"faust/@#include \"$out/include/faust/@g" -i - find $out/lib/faust/ -name "*.cpp" -type f | xargs sed "s@#include \"faust/@#include \"$out/include/faust/@g" -i - sed -i "s@../../architecture/faust/gui/@$out/include/faust/gui/@g" $out/include/faust/misc.h - - wrapProgram $out/bin/faust \ - --set FAUSTLIB $out/lib/faust \ - --set FAUST_LIB_PATH $out/lib/faust \ - --set FAUSTINC $out/include/ - ''; - - meta = with stdenv.lib; { - description = "A functional programming language for realtime audio signal processing"; - longDescription = '' - FAUST (Functional Audio Stream) is a functional programming - language specifically designed for real-time signal processing - and synthesis. FAUST targets high-performance signal processing - applications and audio plug-ins for a variety of platforms and - standards. - The Faust compiler translates DSP specifications into very - efficient C++ code. Thanks to the notion of architecture, - FAUST programs can be easily deployed on a large variety of - audio platforms and plugin formats (jack, alsa, ladspa, maxmsp, - puredata, csound, supercollider, pure, vst, coreaudio) without - any change to the FAUST code. - This package has just the compiler. Install faust for the full - set of faust2somethingElse tools. - ''; - homepage = http://faust.grame.fr/; - downloadPage = http://sourceforge.net/projects/faudiostream/files/; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.magnetophon ]; - }; -} - diff --git a/pkgs/applications/audio/faust/default.nix b/pkgs/applications/audio/faust/default.nix index 96258cefca3..722c762b7b4 100644 --- a/pkgs/applications/audio/faust/default.nix +++ b/pkgs/applications/audio/faust/default.nix @@ -1,100 +1,209 @@ -{ fetchgit, stdenv, bash, alsaLib, atk, cairo, faust-compiler, fontconfig, freetype -, gcc, gdk_pixbuf, glib, gtk, jack2, makeWrapper, opencv, pango, pkgconfig, unzip -, gtkSupport ? true -, jackaudioSupport ? true +{ stdenv +, coreutils +, fetchgit +, makeWrapper +, pkgconfig }: -stdenv.mkDerivation rec { +with stdenv.lib.strings; + +let version = "8-1-2015"; - name = "faust-${version}"; + src = fetchgit { url = git://git.code.sf.net/p/faudiostream/code; rev = "4db76fdc02b6aec8d15a5af77fcd5283abe963ce"; sha256 = "f1ac92092ee173e4bcf6b2cb1ac385a7c390fb362a578a403b2b6edd5dc7d5d0"; }; - # this version has a bug that manifests when doing faust2jack: - /*version = "0.9.67";*/ - /*name = "faust-${version}";*/ - /*src = fetchurl {*/ - /*url = "http://downloads.sourceforge.net/project/faudiostream/faust-${version}.zip";*/ - /*sha256 = "068vl9536zn0j4pknwfcchzi90rx5pk64wbcbd67z32w0csx8xm1";*/ - /*};*/ - - buildInputs = [ bash unzip faust-compiler gcc makeWrapper pkgconfig ] - ++ stdenv.lib.optionals gtkSupport [ - alsaLib atk cairo fontconfig freetype gdk_pixbuf glib gtk pango - ] - ++ stdenv.lib.optional jackaudioSupport jack2 - ; - - makeFlags="PREFIX=$(out)"; - FPATH="$out"; # <- where to search - - phases = [ "unpackPhase installPhase postInstall" ]; - - installPhase = '' - sed -i 23,24d tools/faust2appls/faust2jack - mkdir $out/bin - install tools/faust2appls/faust2alsaconsole $out/bin - install tools/faust2appls/faustpath $out/bin - install tools/faust2appls/faustoptflags $out/bin - install tools/faust2appls/faust2alsa $out/bin - install tools/faust2appls/faust2jack $out/bin - - patchShebangs $out/bin - - wrapProgram $out/bin/faust2alsaconsole \ - --prefix PKG_CONFIG_PATH : ${alsaLib}/lib/pkgconfig \ - --set FAUSTLIB ${faust-compiler}/lib/faust \ - --set FAUSTINC ${faust-compiler}/include/ - - GTK_PKGCONFIG_PATHS=${gtk}/lib/pkgconfig:${pango}/lib/pkgconfig:${glib}/lib/pkgconfig:${cairo}/lib/pkgconfig:${gdk_pixbuf}/lib/pkgconfig:${atk}/lib/pkgconfig:${freetype}/lib/pkgconfig:${fontconfig}/lib/pkgconfig - - wrapProgram $out/bin/faust2alsa \ - --prefix PKG_CONFIG_PATH : ${alsaLib}/lib/pkgconfig:$GTK_PKGCONFIG_PATHS \ - --set FAUSTLIB ${faust-compiler}/lib/faust \ - --set FAUSTINC ${faust-compiler}/include/ \ - - - wrapProgram $out/bin/faust2jack \ - --prefix PKG_CONFIG_PATH : ${jack2}/lib/pkgconfig:${opencv}/lib/pkgconfig:$GTK_PKGCONFIG_PATHS \ - --set FAUSTLIB ${faust-compiler}/lib/faust \ - --set FAUSTINC ${faust-compiler}/include/ \ - - '' - + stdenv.lib.optionalString (!gtkSupport) "rm $out/bin/faust2alsa" - + stdenv.lib.optionalString (!gtkSupport || !jackaudioSupport) "rm $out/bin/faust2jack" - ; - postInstall = '' - sed -e "s@\$FAUST_INSTALL /usr/local /usr /opt /opt/local@${faust-compiler}@g" -i $out/bin/faustpath - sed -i "s@/bin/bash@${bash}/bin/bash@g" $out/bin/faustoptflags - find $out/bin/ -name "*faust2*" -type f | xargs sed "s@pkg-config@${pkgconfig}/bin/pkg-config@g" -i - find $out/bin/ -name "*faust2*" -type f | xargs sed "s@CXX=g++@CXX=${gcc}/bin/g++@g" -i - find $out/bin/ -name "*faust2*" -type f | xargs sed "s@faust -i -a @${faust-compiler}/bin/faust -i -a ${faust-compiler}/lib/faust/@g" -i - ''; - meta = with stdenv.lib; { - description = "A functional programming language for realtime audio signal processing"; - longDescription = '' - FAUST (Functional Audio Stream) is a functional programming - language specifically designed for real-time signal processing - and synthesis. FAUST targets high-performance signal processing - applications and audio plug-ins for a variety of platforms and - standards. - The Faust compiler translates DSP specifications into very - efficient C++ code. Thanks to the notion of architecture, - FAUST programs can be easily deployed on a large variety of - audio platforms and plugin formats (jack, alsa, ladspa, maxmsp, - puredata, csound, supercollider, pure, vst, coreaudio) without - any change to the FAUST code. - ''; homepage = http://faust.grame.fr/; downloadPage = http://sourceforge.net/projects/faudiostream/files/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.magnetophon ]; + maintainers = with maintainers; [ magnetophon pmahoney ]; }; -} + faust = stdenv.mkDerivation { + + name = "faust-${version}"; + + inherit src; + + buildInputs = [ makeWrapper ]; + + passthru = { + inherit wrap wrapWithBuildEnv; + }; + + preConfigure = '' + makeFlags="$makeFlags prefix=$out" + + # The faust makefiles use 'system ?= $(shell uname -s)' but nix + # defines 'system' env var, so undefine that so faust detects the + # correct system. + unset system + ''; + + # Remove most faust2appl scripts since they won't run properly + # without additional paths setup. See faust.wrap, + # faust.wrapWithBuildEnv. + postInstall = '' + # syntax error when eval'd directly + pattern="faust2!(svg)" + (shopt -s extglob; rm "$out"/bin/$pattern) + ''; + + postFixup = '' + # Set faustpath explicitly. + substituteInPlace "$out"/bin/faustpath \ + --replace "/usr/local /usr /opt /opt/local" "$out" + + # The 'faustoptflags' is 'source'd into other faust scripts and + # not used as an executable, so patch 'uname' usage directly + # rather than use makeWrapper. + substituteInPlace "$out"/bin/faustoptflags \ + --replace uname "${coreutils}/bin/uname" + + # wrapper for scripts that don't need faust.wrap* + for script in "$out"/bin/faust2*; do + wrapProgram "$script" \ + --prefix PATH : "$out"/bin + done + ''; + + meta = meta // { + description = "A functional programming language for realtime audio signal processing"; + longDescription = '' + FAUST (Functional Audio Stream) is a functional programming + language specifically designed for real-time signal processing + and synthesis. FAUST targets high-performance signal processing + applications and audio plug-ins for a variety of platforms and + standards. + The Faust compiler translates DSP specifications into very + efficient C++ code. Thanks to the notion of architecture, + FAUST programs can be easily deployed on a large variety of + audio platforms and plugin formats (jack, alsa, ladspa, maxmsp, + puredata, csound, supercollider, pure, vst, coreaudio) without + any change to the FAUST code. + + This package has just the compiler, libraries, and headers. + Install faust2* for specific faust2appl scripts. + ''; + }; + + }; + + # Default values for faust2appl. + faust2ApplBase = + { baseName + , dir ? "tools/faust2appls" + , scripts ? [ baseName ] + , ... + }@args: + + args // { + name = "${baseName}-${version}"; + + inherit src; + + configurePhase = ":"; + + buildPhase = ":"; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" + for script in ${concatStringsSep " " scripts}; do + cp "${dir}/$script" "$out/bin/" + done + + runHook postInstall + ''; + + postInstall = '' + # For the faust2appl script, change 'faustpath' and + # 'faustoptflags' to absolute paths. + for script in "$out"/bin/*; do + substituteInPlace "$script" \ + --replace ". faustpath" ". '${faust}/bin/faustpath'" \ + --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'" + done + ''; + + meta = meta // { + description = "The ${baseName} script, part of faust functional programming language for realtime audio signal processing"; + }; + }; + + # Some 'faust2appl' scripts, such as faust2alsa, run faust to + # generate cpp code, then invoke the c++ compiler to build the code. + # This builder wraps these scripts in parts of the stdenv such that + # when the scripts are called outside any nix build, they behave as + # if they were running inside a nix build in terms of compilers and + # paths being configured (e.g. rpath is set so that compiled + # binaries link to the libs inside the nix store) + # + # The function takes two main args: the appl name (e.g. + # 'faust2alsa') and an optional list of propagatedBuildInputs. It + # returns a derivation that contains only the bin/${appl} script, + # wrapped up so that it will run as if it was inside a nix build + # with those build inputs. + # + # The build input 'faust' is automatically added to the + # propagatedBuildInputs. + wrapWithBuildEnv = + { baseName + , propagatedBuildInputs ? [ ] + , ... + }@args: + + stdenv.mkDerivation ((faust2ApplBase args) // { + + buildInputs = [ makeWrapper pkgconfig ]; + + propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; + + postFixup = '' + + # export parts of the build environment + for script in "$out"/bin/*; do + wrapProgram "$script" \ + --set FAUST_LIB_PATH "${faust}/lib/faust" \ + --prefix PATH : "$PATH" \ + --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ + --set NIX_CFLAGS_COMPILE "\"$NIX_CFLAGS_COMPILE\"" \ + --set NIX_LDFLAGS "\"$NIX_LDFLAGS\"" + done + ''; + }); + + # Builder for 'faust2appl' scripts, such as faust2firefox that + # simply need to be wrapped with some dependencies on PATH. + # + # The build input 'faust' is automatically added to the PATH. + wrap = + { baseName + , runtimeInputs ? [ ] + , ... + }@args: + + let + + runtimePath = concatStringsSep ":" (map (p: "${p}/bin") ([ faust ] ++ runtimeInputs)); + + in stdenv.mkDerivation ((faust2ApplBase args) // { + + buildInputs = [ makeWrapper ]; + + postFixup = '' + for script in "$out"/bin/*; do + wrapProgram "$script" --prefix PATH : "${runtimePath}" + done + ''; + + }); + +in faust diff --git a/pkgs/applications/audio/faust/faust2alqt.nix b/pkgs/applications/audio/faust/faust2alqt.nix new file mode 100644 index 00000000000..8ac26e488b3 --- /dev/null +++ b/pkgs/applications/audio/faust/faust2alqt.nix @@ -0,0 +1,15 @@ +{ faust +, alsaLib +, qt4 +}: + +faust.wrapWithBuildEnv { + + baseName = "faust2alqt"; + + propagatedBuildInputs = [ + alsaLib + qt4 + ]; + +} diff --git a/pkgs/applications/audio/faust/faust2alsa.nix b/pkgs/applications/audio/faust/faust2alsa.nix new file mode 100644 index 00000000000..2fe03d73a23 --- /dev/null +++ b/pkgs/applications/audio/faust/faust2alsa.nix @@ -0,0 +1,29 @@ +{ faust +, alsaLib +, atk +, cairo +, fontconfig +, freetype +, gdk_pixbuf +, glib +, gtk +, pango +}: + +faust.wrapWithBuildEnv { + + baseName = "faust2alsa"; + + propagatedBuildInputs = [ + alsaLib + atk + cairo + fontconfig + freetype + gdk_pixbuf + glib + gtk + pango + ]; + +} diff --git a/pkgs/applications/audio/faust/faust2csound.nix b/pkgs/applications/audio/faust/faust2csound.nix new file mode 100644 index 00000000000..eb5e5831cdd --- /dev/null +++ b/pkgs/applications/audio/faust/faust2csound.nix @@ -0,0 +1,20 @@ +{ faust +, csound +}: + +faust.wrapWithBuildEnv { + + baseName = "faust2csound"; + + propagatedBuildInputs = [ + csound + ]; + + # faust2csound generated .cpp files have + # #include "csdl.h" + # but that file is in the csound/ subdirectory + preFixup = '' + NIX_CFLAGS_COMPILE="$(printf '%s' "$NIX_CFLAGS_COMPILE" | sed 's%${csound}/include%${csound}/include/csound%')" + ''; + +} diff --git a/pkgs/applications/audio/faust/faust2firefox.nix b/pkgs/applications/audio/faust/faust2firefox.nix new file mode 100644 index 00000000000..b2cc6f46457 --- /dev/null +++ b/pkgs/applications/audio/faust/faust2firefox.nix @@ -0,0 +1,14 @@ +{ faust +, xdg_utils +}: + +# This just runs faust2svg, then attempts to open a browser using +# 'xdg-open'. + +faust.wrap { + + baseName = "faust2firefox"; + + runtimeInputs = [ xdg_utils ]; + +} diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix new file mode 100644 index 00000000000..bec523ad021 --- /dev/null +++ b/pkgs/applications/audio/faust/faust2jack.nix @@ -0,0 +1,23 @@ +{ faust +, gtk +, jack2 +, opencv +}: + +faust.wrapWithBuildEnv { + + baseName = "faust2jack"; + + scripts = [ + "faust2jack" + "faust2jackinternal" + "faust2jackconsole" + ]; + + propagatedBuildInputs = [ + gtk + jack2 + opencv + ]; + +} diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix new file mode 100644 index 00000000000..3590bc6860d --- /dev/null +++ b/pkgs/applications/audio/faust/faust2jaqt.nix @@ -0,0 +1,22 @@ +{ faust +, jack2 +, opencv +, qt4 +}: + +faust.wrapWithBuildEnv { + + baseName = "faust2jaqt"; + + scripts = [ + "faust2jaqt" + "faust2jackserver" + ]; + + propagatedBuildInputs = [ + jack2 + opencv + qt4 + ]; + +} diff --git a/pkgs/applications/audio/faust/faust2lv2.nix b/pkgs/applications/audio/faust/faust2lv2.nix new file mode 100644 index 00000000000..4d11395e738 --- /dev/null +++ b/pkgs/applications/audio/faust/faust2lv2.nix @@ -0,0 +1,11 @@ +{ faust +, lv2 +}: + +faust.wrapWithBuildEnv { + + baseName = "faust2lv2"; + + propagatedBuildInputs = [ lv2 ]; + +} diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix new file mode 100644 index 00000000000..c9746590566 --- /dev/null +++ b/pkgs/applications/audio/gnaural/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, pkgconfig, gtk2, libsndfile, portaudio }: + +stdenv.mkDerivation rec { + name = "gnaural-1.0.20110606"; + buildInputs = [ pkgconfig gtk2 libsndfile portaudio ]; + src = fetchurl { + url = "mirror://sourceforge/gnaural/Gnaural/${name}.tar.gz"; + sha256 = "0p9rasz1jmxf16vnpj17g3vzdjygcyz3l6nmbq6wr402l61f1vy5"; + }; + meta = with stdenv.lib; + { description = "Auditory binaural-beat generator"; + homepage = http://gnaural.sourceforge.net/; + licenses = licenses.gpl2; + maintainers = [ maintainers.emery ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 6a46681c12f..58a64758c35 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { name = "kid3-${version}"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { url = "http://downloads.sourceforge.net/project/kid3/kid3/${version}/${name}.tar.gz"; - sha256 = "0mr617k712zpd99rgsy313jrb6jcjn1malj4lirzqhp7307wsf34"; + sha256 = "0ik2bxg2im7nwcgi85g2dj148n80mfhks20rsxnzazl7afk9fl08"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/applications/audio/mopidy-moped/default.nix b/pkgs/applications/audio/mopidy-moped/default.nix index c50a1798b47..a96a5c9d898 100644 --- a/pkgs/applications/audio/mopidy-moped/default.nix +++ b/pkgs/applications/audio/mopidy-moped/default.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-moped-${version}"; - version = "0.3.3"; + version = "0.5.0"; src = fetchurl { url = "https://github.com/martijnboland/moped/archive/v${version}.tar.gz"; - sha256 = "19f3asqx7wmla53nhrxzdwj6qlkjv2rcwh34jxp27bz7nkhn0ihv"; + sha256 = "1bkx0c4yi48nxm1vzacdil9scn0ilwkbd1rgiga34p77lcg16qb2"; }; propagatedBuildInputs = [ mopidy ]; diff --git a/pkgs/applications/audio/mopidy-mopify/default.nix b/pkgs/applications/audio/mopidy-mopify/default.nix index 715fd111536..2dd4c19f0e0 100644 --- a/pkgs/applications/audio/mopidy-mopify/default.nix +++ b/pkgs/applications/audio/mopidy-mopify/default.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-mopify-${version}"; - version = "0.1.6"; + version = "1.4.1"; src = fetchurl { url = "https://github.com/dirkgroenen/mopidy-mopify/archive/${version}.tar.gz"; - sha256 = "3581de6b0b42d2ece63bc153dcdba0594fbbeaacf695f2cd1e5d199670d83775"; + sha256 = "1i752vnkgqfps5vym63rbsh1xm141z8r68d80bi076zr6zbzdjj9"; }; propagatedBuildInputs = [ mopidy ]; diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix index b16e63dc421..14818e60cca 100644 --- a/pkgs/applications/audio/mopidy-spotify/default.nix +++ b/pkgs/applications/audio/mopidy-spotify/default.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-spotify-${version}"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz"; - sha256 = "1fgxakylsx0nggis11v6bxfy8h3dl1n1v86liyfcj0xazb1mx69m"; + sha256 = "0pwgg9xw86sjhv6w735fm0k81v0lv3gqlidgw90hr47hc4wajnzx"; }; propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ]; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index b261508438f..08ccfc13302 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -5,11 +5,11 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-${version}"; - version = "0.19.4"; + version = "1.0.0"; src = fetchurl { url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz"; - sha256 = "13dyn9pgq0jns6915diizviqyn64yfysb08k77xsmxrr4bhm1156"; + sha256 = "15cz6mqw8ihqxhlssnbbssl3bi1xxbmq7krf3hv0zmmdj73ilsd6"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix new file mode 100644 index 00000000000..f49f756ce3a --- /dev/null +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchurl, scons, boost, ladspaH, pkgconfig }: + +stdenv.mkDerivation rec { + version = "0.2-2"; + name = "nova-filters-${version}"; + + src = fetchurl { + url = http://klingt.org/~tim/nova-filters/nova-filters_0.2-2.tar.gz; + sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i"; + }; + + buildInputs = [ scons boost ladspaH pkgconfig ]; + + patchPhase = '' + # remove TERM: + sed -i -e '4d' SConstruct + sed -i "s@mfpmath=sse@mfpmath=sse -I ${boost.dev}/include@g" SConstruct + sed -i "s@ladspa.h@${ladspaH}/include/ladspa.h@g" filters.cpp + sed -i "s/= check/= detail::filter_base::check/" nova/source/dsp/filter.hpp + ''; + + buildPhase = '' + scons + ''; + + installPhase = '' + scons $sconsFlags "prefix=$out" install + ''; + + meta = { + homepage = http://klingt.org/~tim/nova-filters/; + description = "LADSPA plugins based on filters of nova"; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix new file mode 100644 index 00000000000..f7f5998846b --- /dev/null +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, intltool, itstool, libxml2, brasero +, libcanberra_gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes +, makeWrapper }: + +let + major = "3.15"; + minor = "92"; + GST_PLUGIN_PATH = stdenv.lib.makeSearchPath "lib/gstreamer-1.0" [ + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-libav ]; + +in stdenv.mkDerivation rec { + version = "${major}.${minor}"; + name = "sound-juicer-${version}"; + + src = fetchurl { + url = "http://download.gnome.org/sources/sound-juicer/${major}/${name}.tar.xz"; + sha256 = "b1420f267a4c553f6ca242d3b6082b60682c3d7b431ac3c979bd1ccfbf2687dd"; + }; + + buildInputs = [ pkgconfig gtk3 intltool itstool libxml2 brasero libcanberra_gtk3 + gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes + makeWrapper gnome3.dconf + gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad ]; + + preFixup = '' + for f in $out/bin/* $out/libexec/*; do + wrapProgram "$f" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \ + --prefix GST_PLUGIN_PATH : "${GST_PLUGIN_PATH}" + done + ''; + + postInstall = '' + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = with stdenv.lib; { + description = "A Gnome CD Ripper"; + homepage = https://wiki.gnome.org/Apps/SoundJuicer; + maintainers = [ maintainers.bdimcheff ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index eb26e2b66c4..60e66b9f591 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig, attica, boost, gnutls, libechonest -, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qca2_ossl, qjson, qt4 +, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qjson, qt4 , qtkeychain, quazip, sparsehash, taglib, websocketpp, makeWrapper , enableXMPP ? true, libjreen ? null @@ -38,7 +38,6 @@ in stdenv.mkDerivation rec { postInstall = let pluginPath = stdenv.lib.concatStringsSep ":" [ "${phonon_backend_vlc}/lib/kde4/plugins" - "${qca2_ossl}/lib/qt4/plugins" ]; in '' for i in "$out"/bin/*; do diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index 171fefc8a09..2ae6b2aeb26 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -26,20 +26,17 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" ] ++ stdenv.lib.optional useGTK2 "--with-gtk2"; - installFlags = [ "DESTDIR=\${out}" ]; + installFlags = [ + "localstatedir=\${TMPDIR}" + "sysconfdir=\${out}/etc" + ]; postInstall = '' - mv $out/$out/* $out - DIR=$out/$out - while rmdir $DIR 2>/dev/null; do - DIR="$(dirname "$DIR")" - done - - substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \ - --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter" - wrapProgram "$out/sbin/lightdm-gtk-greeter" \ - --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share" - ''; + substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \ + --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter" + wrapProgram "$out/sbin/lightdm-gtk-greeter" \ + --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share" + ''; meta = with stdenv.lib; { homepage = http://launchpad.net/lightdm-gtk-greeter; diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index ac4d4d83c7b..79163945c0c 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -27,16 +27,10 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt" ++ stdenv.lib.optional (qt5 != null) "--enable-liblightdm-qt5"; - installFlags = [ "DESTDIR=\${out}" ]; - - # Correct for the nested nix folder tree - postInstall = '' - mv $out/$out/* $out - DIR=$out/$out - while rmdir $DIR 2>/dev/null; do - DIR="$(dirname "$DIR")" - done - ''; + installFlags = [ + "sysconfdir=\${out}/etc" + "localstatedir=\${TMPDIR}" + ]; meta = with stdenv.lib; { homepage = http://launchpad.net/lightdm; diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 737576a1da0..4e8e6079ff1 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,26 +1,61 @@ -{stdenv, fetchgit +{ stdenv, fetchurl, fetchgit , autoconf, automake, pkgconfig, shared_mime_info, intltool -, glib, mono, gtk-sharp, gnome-sharp +, glib, mono, gtk-sharp, gnome, gnome-sharp, unzip }: stdenv.mkDerivation rec { - version = "5.1.4.0"; - revision = "7d45bbe2ee22625f125d0c52548524f02d005cca"; + version = "5.7.0.660"; + revision = "6a74f9bdb90d9415b597064d815c9be38b401fee"; name = "monodevelop-${version}"; - src = fetchgit { - url = https://github.com/mono/monodevelop.git; - rev = revision; - sha256 = "0qy12zdvb0jiic3pq1w9mcsz2wwxrn0m92abd184q06yg5m48g1b"; - }; + + srcs = [ + (fetchurl { + url = "http://download.mono-project.com/sources/monodevelop/${name}.tar.bz2"; + sha256 = "0i9fpjkcys991dhxh02zf9imar3aj6fldk9ymy09vmr10f4d7vbf"; + }) + (fetchurl { + url = "https://launchpadlibrarian.net/153448659/NUnit-2.6.3.zip"; + sha256 = "0vzbziq44zy7fyyhb44mf9ypfi7gvs17rxpg8c9d9lvvdpkshhcp"; + }) + (fetchurl { + url = "https://launchpadlibrarian.net/68057829/NUnit-2.5.10.11092.zip"; + sha256 = "0k5h5bz1p2v3d0w0hpkpbpvdkcszgp8sr9ik498r1bs72w5qlwnc"; + }) + (fetchgit { + url = "https://github.com/mono/nuget-binary.git"; + rev = "ecb27dd49384d70b6c861d28763906f2b25b7c8"; + sha256 = "0dj0yglgwn07xw2crr66vl0vcgnr6m041pynyq0kdd0z8nlp92ki"; + }) + ]; + + sourceRoot = "monodevelop-5.7"; + + postPatch = '' + # From https://bugzilla.xamarin.com/show_bug.cgi?id=23696#c19 + + # it seems parts of MonoDevelop 5.2+ need NUnit 2.6.4, which isn't included + # (?), so download it and put it in the right place in the tree + mkdir -v -p packages/NUnit.2.6.3/lib + cp -vfR ../NUnit-2.6.3/bin/framework/* packages/NUnit.2.6.3/lib + mkdir -v -p packages/NUnit.Runners.2.6.3/tools/lib + cp -vfR ../NUnit-2.6.3/bin/lib/* packages/NUnit.Runners.2.6.3/tools/lib + + # cecil needs NUnit 2.5.10 - this is also missing from the tar + cp -vfR ../NUnit-2.5.10.11092/bin/net-2.0/framework/* external/cecil/Test/libs/nunit-2.5.10 + + # the tar doesn't include the nuget binary, so grab it from github and copy it + # into the right place + cp -vfR ../nuget-binary-*/* external/nuget-binary/ + ''; buildInputs = [ autoconf automake pkgconfig shared_mime_info intltool - mono gtk-sharp gnome-sharp + mono gtk-sharp gnome-sharp unzip ]; preConfigure = "patchShebangs ./configure"; preBuild = '' - cat > ./main/buildinfo < ./buildinfo < export MONO_GAC_PREFIX=${gtk-sharp}:\$MONO_GAC_PREFIX + > export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp}:\$MONO_GAC_PREFIX > export PATH=${mono}/bin:\$PATH - > export LD_LIBRARY_PATH=${glib}/lib:${gnome-sharp}/lib:${gtk-sharp}/lib:${gtk-sharp.gtk}/lib:\$LD_LIBRARY_PATH + > export LD_LIBRARY_PATH=${glib}/lib:${gnome.libgnomeui}/lib:${gnome.gnome_vfs}/lib:${gnome-sharp}/lib:${gtk-sharp}/lib:${gtk-sharp.gtk}/lib:\$LD_LIBRARY_PATH > EOF done @@ -43,5 +78,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; + maintainers = with maintainers; [ obadz ]; }; } diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index dbfb98b087f..9d6a74d942a 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -3,7 +3,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; let - build = "3065"; + build = "3083"; libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo pango]; in let # package with just the binaries @@ -13,15 +13,15 @@ in let src = if stdenv.system == "i686-linux" then fetchurl { - name = "sublimetext-3.0.65.tar.bz2"; + name = "sublimetext-3.0.83.tar.bz2"; url = "http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${build}_x32.tar.bz2"; - sha256 = "e25f84fe0d0c02ce71274d334fd42ce6313adcd4ec1d588b165d25f5e93ad78d"; + sha256 = "0r9irk2gdwdx0dk7lgssr4krfvf3lf71pzaz5hyjc704zaxf5s49"; } else fetchurl { - name = "sublimetext-3.0.65.tar.bz2"; + name = "sublimetext-3.0.83.tar.bz2"; url = "http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${build}_x64.tar.bz2"; - sha256 = "fe548e6d86d72cd7e90eee9d5396b590ae6e8f8b0dfc661d86c814214e60faea"; + sha256 = "1vhlrqz7xscmjnxpz60mdpvflanl26d7673ml7psd75n0zvcfra5"; }; dontStrip = true; diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 16335a55065..4df2dc8cac1 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, popplerQt4, zlib, pkgconfig, poppler}: +{ stdenv, fetchurl, qt4, poppler_qt4, zlib, pkgconfig, poppler}: stdenv.mkDerivation rec { pname = "texmaker"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1h5rxdq6f05wk3lnlw96fxwrb14k77cx1mwy648127h2c8nsgw4z"; }; - buildInputs = [ qt4 popplerQt4 zlib ]; + buildInputs = [ qt4 poppler_qt4 zlib ]; nativeBuildInputs = [ pkgconfig poppler ]; diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index cd7f0b78c23..5cb31af797d 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, popplerQt4, zlib}: +{ stdenv, fetchurl, qt4, poppler_qt4, zlib}: stdenv.mkDerivation rec { pname = "texstudio"; @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "167d78nfk265jjvl129nr70v8ladb2rav2qyhw7ngr6m54gak831"; }; - buildInputs = [ qt4 popplerQt4 zlib ]; + buildInputs = [ qt4 poppler_qt4 zlib ]; preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${popplerQt4}/include/poppler/qt4) " + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${poppler_qt4}/include/poppler/qt4) " qmake PREFIX=$out texstudio.pro ''; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 35e12e8a8c7..7ae24b38c01 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { (mkEnable (libcl != null) "opencl") (mkWith true "modules") (mkWith true "gcc-arch=${arch}") - (mkEnable true "hdri") + #(mkEnable true "hdri") This breaks some dependencies (mkWith (perl != null) "perl") (mkWith (jemalloc != null) "jemalloc") (mkWith true "frozenpaths") @@ -79,6 +79,18 @@ stdenv.mkDerivation rec { libxml2 ]; + propagatedBuildInputs = [] + ++ (stdenv.lib.optional (lcms2 != null) lcms2) + ++ (stdenv.lib.optional (liblqr1 != null) liblqr1) + ++ (stdenv.lib.optional (fftw != null) fftw) + ++ (stdenv.lib.optional (libtool != null) libtool) + ++ (stdenv.lib.optional (jemalloc != null) jemalloc) + ++ (stdenv.lib.optional (libXext != null) libXext) + ++ (stdenv.lib.optional (libX11 != null) libX11) + ++ (stdenv.lib.optional (libXt != null) libXt) + ++ (stdenv.lib.optional (bzip2 != null) bzip2) + ; + postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)''; meta = with stdenv.lib; { diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index e498533d63d..6200048c41d 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -1,13 +1,13 @@ -{stdenv, fetchurl, fetchurlGnome, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext +{stdenv, fetchurl, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext , python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl , withGNOME ? false, libgnomeui }: stdenv.mkDerivation rec { - name = src.pkgname; + name = "dia-${minVer}.3"; + minVer = "0.97"; - src = fetchurlGnome { - project = "dia"; - major = "0"; minor = "97"; patchlevel = "3"; extension = "xz"; + src = fetchurl { + url = "mirror://gnome/sources/dia/${minVer}/${name}.tar.xz"; sha256 = "0d3x6w0l6fwd0l8xx06y1h56xf8ss31yzia3a6xr9y28xx44x492"; }; diff --git a/pkgs/applications/graphics/digikam/2.nix b/pkgs/applications/graphics/digikam/2.nix index be991772d39..c239827633f 100644 --- a/pkgs/applications/graphics/digikam/2.nix +++ b/pkgs/applications/graphics/digikam/2.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw - opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql ]; + opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql.lib ]; # Make digikam find some FindXXXX.cmake KDEDIRS="${marble}:${qjson}"; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 5ace07f827b..70966196b07 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost eigen gettext jasper kdelibs kdepimlibs lcms lensfun libgphoto2 libjpeg libkdcraw libkexiv2 libkipi liblqr1 libpgf - libtiff marble mysql opencv phonon qca2 qimageblitz qjson qt4 + libtiff marble mysql.lib opencv phonon qca2 qimageblitz qjson qt4 shared_desktop_ontologies soprano ]; diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 9f7643ad1c0..83f409457fb 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -28,12 +28,13 @@ stdenv.mkDerivation rec { #configureFlags = [ "--disable-print" ]; # "screenshot" needs this. - NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib"; + NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib" + + stdenv.lib.optionalString stdenv.isDarwin " -lintl"; meta = { description = "The GNU Image Manipulation Program"; homepage = http://www.gimp.org/; license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index 737baf375d1..c9f1fc91328 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -1,33 +1,32 @@ { stdenv, fetchurl, xulrunner }: stdenv.mkDerivation rec { - name = "pencil-2.0.5"; + version = "2.0.8"; + name = "pencil-${version}"; src = fetchurl { - url = "http://evoluspencil.googlecode.com/files/${name}.tar.gz"; - sha256 = "0rn5nb08p8wph5s5gajkil6y06zgrm86p4gnjdgv76czx1fqazm0"; + url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz"; + sha256 = "3426d0222b213649e448b06384556718c833667394f442682ff66da3cda1b881"; }; - # Pre-built package - buildPhase = "true"; + buildPhase = ""; installPhase = '' mkdir -p "$out" cp -r usr/* "$out" - cp COPYING "$out/share/pencil" sed -e "s|/usr/bin/xulrunner|${xulrunner}/bin/xulrunner|" \ - -e "s|/usr/share/pencil|$out/share/pencil|" \ + -e "s|/usr/share/evolus-pencil|$out/share/evolus-pencil|" \ -i "$out/bin/pencil" sed -e "s|/usr/bin/pencil|$out/bin/pencil|" \ - -e "s|Icon=.*|Icon=$out/share/pencil/skin/classic/icon.svg|" \ + -e "s|Icon=.*|Icon=$out/share/evolus-pencil/skin/classic/icon.svg|" \ -i "$out/share/applications/pencil.desktop" ''; meta = with stdenv.lib; { description = "GUI prototyping/mockup tool"; - homepage = http://pencil.evolus.vn/; + homepage = http://github.com/prikhi/pencil; license = licenses.gpl2; # Commercial license is also available - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor prikhi ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix new file mode 100644 index 00000000000..b47a8215fd4 --- /dev/null +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, cairo, colord, glib, gtk3, intltool, itstool, libxml2 +, makeWrapper, pkgconfig, saneBackends, systemd, vala }: + +let version = "3.16.0.1"; in +stdenv.mkDerivation rec { + name = "simple-scan-${version}"; + + src = fetchurl { + sha256 = "0p1knmbrdwrnjjk5x0szh3ja2lfamaaynj2ai92zgci2ma5xh2ma"; + url = "https://launchpad.net/simple-scan/3.16/${version}/+download/${name}.tar.xz"; + }; + + meta = with stdenv.lib; { + description = "Simple scanning utility"; + longDescription = '' + A really easy way to scan both documents and photos. You can crop out the + bad parts of a photo and rotate it if it is the wrong way round. You can + print your scans, export them to pdf, or save them in a range of image + formats. Basically a frontend for SANE - which is the same backend as + XSANE uses. This means that all existing scanners will work and the + interface is well tested. + ''; + homepage = https://launchpad.net/simple-scan; + license = with licenses; gpl3Plus; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + buildInputs = [ cairo colord glib gtk3 intltool itstool libxml2 makeWrapper + pkgconfig saneBackends systemd vala ]; + + enableParallelBuilding = true; + + doCheck = true; + + preFixup = '' + wrapProgram "$out/bin/simple-scan" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; +} diff --git a/pkgs/applications/kde-apps-14.12/default.nix b/pkgs/applications/kde-apps-14.12/default.nix index 00f84896a0b..96f1aea6875 100644 --- a/pkgs/applications/kde-apps-14.12/default.nix +++ b/pkgs/applications/kde-apps-14.12/default.nix @@ -107,7 +107,7 @@ let OggVorbis = libvorbis; OpenAL = openal; OpenEXR = openexr; - Poppler = poppler.poppler_qt4; + Poppler = poppler_qt4; Prison = prison; PulseAudio = pulseaudio; PythonLibrary = python; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 27eced335dc..5e746716119 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation rec { - name = "blender-2.73a"; + name = "blender-2.74"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "114ipidrja6ryi6wv0w55wmh10ikazy24r8js596g7b9fpkzpymc"; + sha256 = "178i19pz7jl79b4wn92869j6qymawsa0kaw1dxaprbjnqsvcx8qc"; }; patches = [ ./sm52.patch ]; diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index da3b364f3eb..8ceb7f41c4e 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -1,10 +1,10 @@ { stdenv, cmake, fetchurl, pkgconfig, qt4, zlib, bzip2 }: stdenv.mkDerivation rec { - name = "doomseeker-0.12.2b"; + name = "doomseeker-1.0"; src = fetchurl { url = "http://doomseeker.drdteam.org/files/${name}_src.tar.bz2"; - sha256 = "1bcrxc3g9c6b4d8dbm2rx0ldxkqc5fc91jndkwiaykf8hajm0jnr"; + sha256 = "172ybxg720r64hp6aah0hqvxklqv1cf8v7kwx0ng5ap0h20jydbw"; }; cmakeFlags = '' diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 2638594d7e5..0f7b85e055b 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, buildPythonPackage, pythonPackages, slowaes }: buildPythonPackage rec { - namePrefix = ""; name = "electrum-${version}"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "https://download.electrum.org/Electrum-${version}.tar.gz"; - sha256 = "1kzrbnkl5jps0kf0420vzpiqjk3v1jxvlrxwhc0f58xbqyc7l4mj"; + sha256 = "0q9vrrzy2iypfg2zvs3glzvqyq65dnwn1ijljvfqfwrkpvpp0zxp"; }; propagatedBuildInputs = with pythonPackages; [ @@ -24,16 +23,21 @@ buildPythonPackage rec { tlslite ]; - postPatch = '' + preInstall = '' mkdir -p $out/share sed -i 's@usr_share = .*@usr_share = os.getenv("out")+"/share"@' setup.py ''; - meta = { - description = "Bitcoin thin-wallet"; - long-description = "Electrum is an easy to use Bitcoin client. It protects you from losing coins in a backup mistake or computer failure, because your wallet can be recovered from a secret phrase that you can write on paper or learn by heart. There is no waiting time when you start the client, because it does not download the Bitcoin blockchain."; - homepage = "https://electrum.org"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ "emery@vfemail.net" stdenv.lib.maintainers.joachifm ]; + meta = with stdenv.lib; { + description = "Bitcoin thin-client"; + longDescription = '' + An easy-to-use Bitcoin client featuring wallets generated from + mnemonic seeds (in addition to other, more advanced, wallet options) + and the ability to perform transactions without downloading a copy + of the blockchain. + ''; + homepage = https://electrum.org; + license = licenses.gpl3; + maintainers = with maintainers; [ emery joachifm ]; }; } diff --git a/pkgs/applications/misc/evopedia/default.nix b/pkgs/applications/misc/evopedia/default.nix index 5ad82c9239c..b7403d4826b 100644 --- a/pkgs/applications/misc/evopedia/default.nix +++ b/pkgs/applications/misc/evopedia/default.nix @@ -1,12 +1,13 @@ {stdenv, fetchgit, bzip2, qt4, libX11}: stdenv.mkDerivation rec { - name = "evopedia-0.4.2"; + name = "evopedia-${version}"; + version = "0.4.4"; src = fetchgit { - url = git://gitorious.org/evopedia/evopedia.git; - rev = "v0.4.2" ; - md5 = "a2f19ed6e4d936c28cee28d44387b682"; + url = https://github.com/evopedia/evopedia_qt; + rev = "refs/tags/v${version}"; + sha256 = "1biq9zaj8nhxx1pixidsn97iwp9qy1yslgl0znpa4d4p35jcg48g"; }; configurePhase = '' @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { description = "Offline Wikipedia Viewer"; homepage = http://www.evopedia.info; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [ qknight ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/garmin-plugin/default.nix b/pkgs/applications/misc/garmin-plugin/default.nix new file mode 100644 index 00000000000..613c56efcfd --- /dev/null +++ b/pkgs/applications/misc/garmin-plugin/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, garmintools, libgcrypt, libusb, pkgconfig, tinyxml, zlib }: +stdenv.mkDerivation { + name = "garmin-plugin-0.3.26"; + src = fetchurl { + url = https://github.com/adiesner/GarminPlugin/archive/V0.3.26.tar.gz; + sha256 = "15gads1fj4sj970m5960dgnhys41ksi4cm53ldkf67wn8dc9i4k0"; + }; + sourceRoot = "GarminPlugin-0.3.26/src"; + buildInputs = [ garmintools libusb libgcrypt pkgconfig tinyxml zlib ]; + configureFlags = [ + "--with-libgcrypt-prefix=${libgcrypt}" + "--with-garmintools-incdir=${garmintools}/include" + "--with-garmintools-libdir=${garmintools}/lib" + ]; + installPhase = '' + mkdir -p $out/lib/mozilla/plugins + cp npGarminPlugin.so $out/lib/mozilla/plugins + ''; + meta = { + homepage = http://www.andreas-diesner.de/garminplugin; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.ocharles ]; + }; +} diff --git a/pkgs/applications/misc/grass/default.nix b/pkgs/applications/misc/grass/default.nix index 291ce723aab..9875b3abf01 100644 --- a/pkgs/applications/misc/grass/default.nix +++ b/pkgs/applications/misc/grass/default.nix @@ -87,10 +87,10 @@ a.composableDerivation.composableDerivation {} (fix: { // wwf { name = "mysql"; enable = { - buildInputs = [ a.mysql ]; + buildInputs = [ a.mysql.lib ]; configureFlags = [ - "--with-mysql-libs=${a.mysql}/lib/mysql" - "--with-mysql-includes=${a.mysql}/include/mysql" + "--with-mysql-libs=${a.mysql.lib}/lib/mysql" + "--with-mysql-includes=${a.mysql.lib}/include/mysql" ]; }; } diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index dcb83d7a79d..51b7b90ca4e 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, kdelibs, libXtst, libfakekey, makeWrapper, pkgconfig, qca2, qca2_ossl +{ stdenv, fetchurl, gettext, kdelibs, libXtst, libfakekey, makeWrapper, pkgconfig, qca2 , qjson }: @@ -11,11 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1vrr047bq5skxvibv5pb9ch9dxh005zmar017jzbyb9hilxr8kg4"; }; - buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper pkgconfig qca2 qca2_ossl qjson ]; - - postInstall = '' - wrapProgram $out/lib/kde4/libexec/kdeconnectd --prefix QT_PLUGIN_PATH : ${qca2_ossl}/lib/qt4/plugins - ''; + buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper pkgconfig qca2 qjson ]; meta = with stdenv.lib; { description = "A tool to connect and sync your devices with KDE"; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 5b41d21985f..de83cf22e04 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = http://mediaarea.net/; license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.devhell ]; }; } diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index efe8785654a..4f2c2fba97c 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake boost file gettext glib glibc libgnome_keyring gtk gtkmm intltool libctemplate libglade libgnome libiodbc libsigcxx libtool libuuid libxml2 libzip lua makeWrapper mesa - mysql paramiko pcre pexpect pkgconfig pycrypto python sqlite ]; + mysql.lib paramiko pcre pexpect pkgconfig pycrypto python sqlite ]; preConfigure = '' substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc}/bin/catchsegv" diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index 0845a379685..1cf6d76b892 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt4, pkgconfig, popplerQt4, djvulibre, libspectre, cups +{stdenv, fetchurl, qt4, pkgconfig, poppler_qt4, djvulibre, libspectre, cups , file, ghostscript }: let @@ -11,7 +11,7 @@ let sha256 = "15d88xzqvrcp9szmz8d1lj65yrdx90j6fp78gia5c8kra2z8bik9"; }; buildInputs = [ - qt4 popplerQt4 pkgconfig djvulibre libspectre cups file ghostscript + qt4 poppler_qt4 pkgconfig djvulibre libspectre cups file ghostscript ]; in stdenv.mkDerivation { diff --git a/pkgs/applications/misc/rxvt_unicode/wrapper.nix b/pkgs/applications/misc/rxvt_unicode/wrapper.nix index 140113de64a..2f68e4ec5f1 100644 --- a/pkgs/applications/misc/rxvt_unicode/wrapper.nix +++ b/pkgs/applications/misc/rxvt_unicode/wrapper.nix @@ -21,6 +21,8 @@ let fi wrapProgram $out/bin/urxvt \ --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" + wrapProgram $out/bin/urxvtd \ + --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" ''; }; -in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) \ No newline at end of file +in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 727bb048605..1bd3b73ff49 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = with perlPackages; [ perl makeWrapper which - EncodeLocale MathClipper ExtUtilsXSpp BoostGeometryUtils + EncodeLocale MathClipper ExtUtilsXSpp MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus ImportInto XMLSAX ExtUtilsMakeMaker OpenGL WxGLCanvas @@ -69,6 +69,5 @@ stdenv.mkDerivation rec { license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor the-kenny ]; - broken = true; # requires Perl 5.14 }; } diff --git a/pkgs/applications/misc/stardict/stardict.nix b/pkgs/applications/misc/stardict/stardict.nix index d4c41edde30..600642f488a 100644 --- a/pkgs/applications/misc/stardict/stardict.nix +++ b/pkgs/applications/misc/stardict/stardict.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { sha256 = "0wrb8xqy6x9piwrn0vw5alivr9h3b70xlf51qy0jpl6d7mdhm8cv"; }; - buildInputs = [ pkgconfig gtk glib zlib libxml2 intltool gnome_doc_utils libgnomeui scrollkeeper mysql pcre which libxslt]; + buildInputs = [ pkgconfig gtk glib zlib libxml2 intltool gnome_doc_utils libgnomeui scrollkeeper mysql.lib pcre which libxslt]; postPatch = '' # mysql hacks: we need dynamic linking as there is no libmysqlclient.a - substituteInPlace tools/configure --replace '/usr/local/include/mysql' '${mysql}/include/mysql/' + substituteInPlace tools/configure --replace '/usr/local/include/mysql' '${mysql.lib}/include/mysql/' substituteInPlace tools/configure --replace 'AC_FIND_FILE([libmysqlclient.a]' 'AC_FIND_FILE([libmysqlclient.so]' - substituteInPlace tools/configure --replace '/usr/local/lib/mysql' '${mysql}/lib/mysql/' + substituteInPlace tools/configure --replace '/usr/local/lib/mysql' '${mysql.lib}/lib/mysql/' substituteInPlace tools/configure --replace 'for y in libmysqlclient.a' 'for y in libmysqlclient.so' substituteInPlace tools/configure --replace 'libmysqlclient.a' 'libmysqlclient.so' diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix index de1abff9c16..4ff838db653 100644 --- a/pkgs/applications/misc/xkblayout-state/default.nix +++ b/pkgs/applications/misc/xkblayout-state/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { - name = "xkblayout-state"; + name = "xkblayout-state-${version}"; version = "1b"; src = fetchurl { diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 3365e62f8be..1caa78d580d 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig }: stdenv.mkDerivation rec { - name = "xterm-312"; + name = "xterm-317"; src = fetchurl { url = "ftp://invisible-island.net/xterm/${name}.tgz"; - sha256 = "0vpkhls3i12ly4r68igz91vh6s9179wihjkdy0gvwr752hdqxm7s"; + sha256 = "0v9mirqws1vb8wxbdgn1w166ln7xmapg1913c7kzjs3mwkdv1rfj"; }; buildInputs = @@ -13,12 +13,16 @@ stdenv.mkDerivation rec { ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit ]; - configureFlags = - '' - --enable-wide-chars --enable-256-color - --enable-load-vt-fonts --enable-i18n --enable-doublechars --enable-luit - --enable-mini-luit --with-tty-group=tty - ''; + configureFlags = [ + "--enable-wide-chars" + "--enable-256-color" + "--enable-load-vt-fonts" + "--enable-i18n" + "--enable-doublechars" + "--enable-luit" + "--enable-mini-luit" + "--with-tty-group=tty" + ]; # Work around broken "plink.sh". NIX_LDFLAGS = "-lXmu -lXt -lICE -lX11 -lfontconfig"; diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/1.4.x.nix similarity index 100% rename from pkgs/applications/networking/bittorrentsync/default.nix rename to pkgs/applications/networking/bittorrentsync/1.4.x.nix diff --git a/pkgs/applications/networking/bittorrentsync/2.0.x.nix b/pkgs/applications/networking/bittorrentsync/2.0.x.nix new file mode 100644 index 00000000000..9a7c07c322e --- /dev/null +++ b/pkgs/applications/networking/bittorrentsync/2.0.x.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, patchelf }: + +let + arch = if stdenv.system == "x86_64-linux" then "x64" + else if stdenv.system == "i686-linux" then "i386" + else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; + + sha256 = if stdenv.system == "x86_64-linux" then "cbce76f73f47c23d9073644504fa454976629450d008354bd8faef1bddf368fd" + else if stdenv.system == "i686-linux" then "d3e8583c8a54cbeb34ea3621daf0498316a959d944b30f24aa4e518a851ecdeb" + else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; + + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; +in +stdenv.mkDerivation rec { + name = "btsync-${version}"; + version = "2.0.93"; + + src = fetchurl { + url = "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz"; + inherit sha256; + }; + + dontStrip = true; # Don't strip, otherwise patching the rpaths breaks + sourceRoot = "."; + buildInputs = [ patchelf ]; + + installPhase = '' + mkdir -p "$out/bin/" + cp -r "btsync" "$out/bin/" + + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${libPath} "$out/bin/btsync" + ''; + + meta = { + description = "Automatically sync files via secure, distributed technology"; + homepage = "http://www.bittorrent.com/sync"; + license = stdenv.lib.licenses.unfreeRedistributable; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ iElectric thoughtpolice cwoac ]; + }; +} diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index de69560338f..4978ba0faeb 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,185 +4,185 @@ # ruby generate_source.rb > source.nix { - version = "36.0.4"; + version = "37.0.1"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha1 = "07c101a98019482c61d81f08bd27219a96bd1f25"; } - { locale = "ach"; arch = "linux-x86_64"; sha1 = "f8c6b9d816c22c70f8241f8b8f508eb1e521c5e7"; } - { locale = "af"; arch = "linux-i686"; sha1 = "6933a5a4e5320f54cf5d8f17f1b0905d6ca54736"; } - { locale = "af"; arch = "linux-x86_64"; sha1 = "f0cc0f14a46abc0d56a25e4dcd128d0fa60619a0"; } - { locale = "an"; arch = "linux-i686"; sha1 = "1d931bef5349e885d847d31a80d9b432e61c5a22"; } - { locale = "an"; arch = "linux-x86_64"; sha1 = "6d6bf623959c0f24e0f0b81b7c99672083a31f3e"; } - { locale = "ar"; arch = "linux-i686"; sha1 = "96a1f898449c62dec9e9970972d78d42484d4c4b"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "3e10f2aef47f239c4fef828b1d72f2f7f549d94a"; } - { locale = "as"; arch = "linux-i686"; sha1 = "6ede4616158426d22adc49daf86cce9411215e3c"; } - { locale = "as"; arch = "linux-x86_64"; sha1 = "71c7d80f995fd1afe4b345d32ed10faa95a52ca2"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "17ccfe25f83845281827df64c046ee26b694ef6c"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "f10c7b5ec1f803bec50156b179bb688747772ff1"; } - { locale = "az"; arch = "linux-i686"; sha1 = "5439ded3fc618d45fdcc8e817b54b6da62f4a9f4"; } - { locale = "az"; arch = "linux-x86_64"; sha1 = "74f9d283000d7b7fe7524ed06c335447346908c7"; } - { locale = "be"; arch = "linux-i686"; sha1 = "c1279eeaac489b432a8f1068c7bc1d4d9a8550c9"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "d22bba42c1ffe3d4a5c70d06aa71bdf5904c9d18"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "0cc9b6b3f9a8b6caea713e4e42dd3a0a95a204e4"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "b6d2f2971545a6e669b0ecb970d774ac45cb84e9"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "a1d3d7909152be32058f3f1e9c180daf96656a13"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "2df28cf71cd712fd95afbbe86c4f4fb5166c8a34"; } - { locale = "bn-IN"; arch = "linux-i686"; sha1 = "ebc9f6b69bc497dc5419b3bd6d67c42ca2c8de8a"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "c2db141bfb5627439344126edd4e93353329aab7"; } - { locale = "br"; arch = "linux-i686"; sha1 = "1b77d4806267e153d1f6d1d4b90076d47edba8db"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "9901af094c845b9ca9a4759d2a0ba4a241aa663a"; } - { locale = "bs"; arch = "linux-i686"; sha1 = "ce38623e0307c94a6b78f7387862c9cb0541ced7"; } - { locale = "bs"; arch = "linux-x86_64"; sha1 = "08040f7ed45174a53d8f46384781b940c41cee1c"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "3e167560bc466dc24e450cff886d4041495a7064"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "e312e2005d302cb390a72062d6314b9243d77b51"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "8ece365b6670826bd8bed8285c0e4d518c7fc97e"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "8bbf5abd8b43213c2b07ef0541c004c88483876a"; } - { locale = "cy"; arch = "linux-i686"; sha1 = "84be0b6dc586bec5a05e43f349cf37c6bd9c0b41"; } - { locale = "cy"; arch = "linux-x86_64"; sha1 = "3dc843146b4bd9d938a84ac5d4543c68e2674003"; } - { locale = "da"; arch = "linux-i686"; sha1 = "35dc75cdca3b923d3ea55ad31ecc896546b1a311"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "d7fb80133739c30a474d380542b8d66ed0e0cb03"; } - { locale = "de"; arch = "linux-i686"; sha1 = "11ef8ef607250e8fc7ffb490499d42ee78985f97"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "51ed94bb05e362453390e43b67a58b3ca5caed26"; } - { locale = "dsb"; arch = "linux-i686"; sha1 = "31360bcbb170b748bb0e56b9487988c1b620a7c0"; } - { locale = "dsb"; arch = "linux-x86_64"; sha1 = "9876f83cd680a8a9a1c7b30254f49cc81cfe0f96"; } - { locale = "el"; arch = "linux-i686"; sha1 = "1a25c11af8adc49ddacf23373ef227b4a7a54024"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "ac44f6191a4f78a4e390b7733d7333e026580155"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "2d9b564832107409a064620cbeccbffb4cd417fb"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "e9732da9758c7cb443d9b23a1e816042828a9719"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "b814bab9571355758dc55c2b1322f09ad2877a71"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "ca70cafbc9ab89704ef2b6b786b9c8c0bba3ff83"; } - { locale = "en-ZA"; arch = "linux-i686"; sha1 = "7317e2078b969d0c8af60d756a1e9c622e6a059b"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "5011dfbf020af2ed2a8986bd6976c9964b91fdbc"; } - { locale = "eo"; arch = "linux-i686"; sha1 = "035f427d83e0d847c7a08e33d73f2c28d73bf533"; } - { locale = "eo"; arch = "linux-x86_64"; sha1 = "3dfd3dbbde050591dbee842e64f7bab497028a05"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "f84fff5f42c0ab50a50ea561fdcd998846255812"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "31c485c5aebe893fbf4a1ece7ed0f4eda7c300e3"; } - { locale = "es-CL"; arch = "linux-i686"; sha1 = "efa700b585a9e0e04a8fc01dd465288dc1b9caca"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "8a55a229924d71c602019382209eb78f972018ae"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "8f467c3603088f757f46d37b8138b70c63cfd514"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "a82f3188718c8166ec4cc7ac6c4e84c7f63e670b"; } - { locale = "es-MX"; arch = "linux-i686"; sha1 = "5d767c2e65390380ed49e76634f5a4e2fd37ebde"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "a84e26d375d15f9d019187eed28b5c9cb3f60fbd"; } - { locale = "et"; arch = "linux-i686"; sha1 = "5b2eb8e425c30563f59293a1eba56215938eb161"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "fc63eb3f960c2b2ddd6f12e387976e08fe78209b"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "0969053a42449e957e8d05fc8526b92c5a49a5da"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "64a9c961b0246333d6fd55026d547ec77befab2e"; } - { locale = "fa"; arch = "linux-i686"; sha1 = "f00fc446dc3aca2d50cced0a13ff0aaaa54f1716"; } - { locale = "fa"; arch = "linux-x86_64"; sha1 = "afd6a5aba5c1e48eb8ec6909797214b87f755764"; } - { locale = "ff"; arch = "linux-i686"; sha1 = "88daf24a927723587904c76bfe30b93086adfc02"; } - { locale = "ff"; arch = "linux-x86_64"; sha1 = "21459a4cf6827fce2fe9476a8100ac19457dd052"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "31035303cd31cdeb9b73a308b913292ca8923ea9"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "af8e942824f8f2a64b1930ff1cfb96b070551288"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "a55bcd868b5f485e6ed0a999337e3b7e2b27838c"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "633a8328de12be374378b9193e3008ef0fde6dcc"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "21e9e6619ed54ce1cc0eefe694e5ef2880f9169a"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "28746f0b1ea9cf0368a130329d37731ebfe3bf92"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "6699599d8a79991422c64d7fee39bce0af33cfff"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "efd72597e9dd9857484bf46ca286985871a32852"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "35fe3bd410d244245e5d4a89afa3b72e5cd2664a"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "db0722b10c92ae4e7645df6b331abf420d6b6c8f"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "6abe5f9d2d275f3fea7dfdf7398dae5dfc8cbdb9"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "dd401355463f06e85de467310f6585ab1136df9f"; } - { locale = "gu-IN"; arch = "linux-i686"; sha1 = "e101f80e3df8558e017361aadfafc26071122200"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "030047ebd6f2b9a320ed552d199cacc83800b4d7"; } - { locale = "he"; arch = "linux-i686"; sha1 = "d6a94c95668245aa92616fd93ea31890a9f7dc02"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "304be29ae0cdf623f8d87b841551bacb8b3fe496"; } - { locale = "hi-IN"; arch = "linux-i686"; sha1 = "a4dbb31547c675102173d8e52e27cce6546a1946"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "a92c5e441bccb6f35e77d1e35f1943637a47c26b"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "743ba73288965b960b7f7db5ee14437515548811"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "1bc8197e674e9e0839ebad4d1eca03fef450566f"; } - { locale = "hsb"; arch = "linux-i686"; sha1 = "26bc907a7d9c084732885711c90b63790ad4f094"; } - { locale = "hsb"; arch = "linux-x86_64"; sha1 = "1da9080e67ccfd687a132c42bbbe431610928cf9"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "9693b4971de85ff12953d726af2c28333461460c"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "27fa6940ba4244f4c78a6463b1b6f8e744dcf64d"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "2af42b9776d43d688af74d749fede31ac33b09b0"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "4a75e6a1ca0c1f2f4901a37196e1da6af13d755a"; } - { locale = "id"; arch = "linux-i686"; sha1 = "2807b1f819c9cefb9375595ceb435897d7e4a7dd"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "3825a6b08fe710871c7a2a20faf8386a1b30d3c2"; } - { locale = "is"; arch = "linux-i686"; sha1 = "0c19a8f1e80e3acccfdcd9b3dde86580e39238c6"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "5684deb431acf6e18fdc7f025ed5f323484ad120"; } - { locale = "it"; arch = "linux-i686"; sha1 = "abbaeb2915f098098fe94976dfad17aab7e48775"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "3a2be07826e851625c02623a04e80cb5bcc8a7b4"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "303f525a2f3c0afa28cdeecb3648813dff77e40b"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "d3ef3b46ad3530fa0a748dbf76d306984f834192"; } - { locale = "kk"; arch = "linux-i686"; sha1 = "7d9edcbef8effbcb2b542a86dc5f6efd961fdddc"; } - { locale = "kk"; arch = "linux-x86_64"; sha1 = "29bf7048bf23a698484e56f62e2293e9defc1abe"; } - { locale = "km"; arch = "linux-i686"; sha1 = "1df85a1ff74b55096b6386e931c0a3ce6013496b"; } - { locale = "km"; arch = "linux-x86_64"; sha1 = "a8ed53f03435c971b4d1fca8d41cf0ec2b55c83a"; } - { locale = "kn"; arch = "linux-i686"; sha1 = "46ce48f57d28b04c7dbe888a8d0faa1bb7f1630e"; } - { locale = "kn"; arch = "linux-x86_64"; sha1 = "264d2ec87d2e46d9116e4ddb8cbb7fddf2ef9f75"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "3972269f7fadcf92938bf3f3819360839dd8307b"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "b8c0ddad810850fbbb0acab1ec2ecf983cdabfa8"; } - { locale = "lij"; arch = "linux-i686"; sha1 = "5bcf38287b5a350539b169b5069a608bd6d53fd4"; } - { locale = "lij"; arch = "linux-x86_64"; sha1 = "bc86889a61e7252a2d9951a39e371d237990c7fb"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "9bffa4628d1c79013abf94d9d123a93435fc3dd3"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "eaf685b6e1147679b6b27f11bcbd6f0458e9998c"; } - { locale = "lv"; arch = "linux-i686"; sha1 = "fe874c7d3c26858585a8e9abe8a8acf1d0a642f0"; } - { locale = "lv"; arch = "linux-x86_64"; sha1 = "e730200d162c2bc46a307389243a444577390c55"; } - { locale = "mai"; arch = "linux-i686"; sha1 = "f91a082128370d7eb067cef5fa32cf3d15269f75"; } - { locale = "mai"; arch = "linux-x86_64"; sha1 = "a7c6a211c87e7acc48a6a33db9350f735356c9c4"; } - { locale = "mk"; arch = "linux-i686"; sha1 = "58d107b05fd47300dca824f93ba04635ed75d98d"; } - { locale = "mk"; arch = "linux-x86_64"; sha1 = "bb7523230a97e5952451cfe47c25bd4103fb3acf"; } - { locale = "ml"; arch = "linux-i686"; sha1 = "e26a244f689f9a0f2cf95fb47851bb00f66180c6"; } - { locale = "ml"; arch = "linux-x86_64"; sha1 = "9a6e38907666c610d5a9e4b9af50d3997e83b088"; } - { locale = "mr"; arch = "linux-i686"; sha1 = "9fa8d90c58006c70a8454457dc321c01dce0aa3a"; } - { locale = "mr"; arch = "linux-x86_64"; sha1 = "39ccd12f257d5a1d87bdb63afc9a9f02a9b5b957"; } - { locale = "ms"; arch = "linux-i686"; sha1 = "e81c3b825aa74e8e15de274b3b5b39aa1a271968"; } - { locale = "ms"; arch = "linux-x86_64"; sha1 = "1ffd3e73c3ee6952d34fe857395027e54fa8e99f"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "6e0a18d5eb0f460d3d81e75c682e8d49efe681c1"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "24eb88d2caeeb1ed129f5fbf4b5d2eadb1453717"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "d69104fca536e2ecf71cd8899ee93057c2c968e4"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "85cb1c316bb3379fd2a5ff90e50d9a310b8dea8d"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "ca64cdb415adbaf5e91bb5b4e18b35a61444246e"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "ecaa3bda5e705e30b00af9d2cf04dd919dfff50e"; } - { locale = "or"; arch = "linux-i686"; sha1 = "7c733f7d65346eb9e6ecc6ac6d3e3645a1eb9bd2"; } - { locale = "or"; arch = "linux-x86_64"; sha1 = "7c4d1d5ff0473892cff420e5737f746591cb1de7"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "f797a2fbb789ee586d7a9aa3288caa982be4dee5"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "b06d4dc6e42eacf8d8c5960d208230b3ff1f95e1"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "f479e63503d3d6513a18059ced2aeb56266da49b"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "87ea570c3ceb3d7e79ce24789dfc1702dbe387ea"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "1c023fe72c192df118c727ab6646a5882650ef32"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "d69ef0da3084fc4c12c057fa2892dbeb83d666dd"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "fca9b7f61c1e1d19358805bf1a31b81a9d246df9"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "896626a8269084cfa35080cde367ba20d38a7e06"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "c4fcdb7fe19362d0dc68bf89f3ecc5c5de5f7f7f"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "69e7381d36c187ad7823cebdbd0d1f7df49c049a"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "a45f1f9858e0bcff7e071d3e92173283c8038417"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "a0bb823fc0a0d4891b71edc4c2cc2fc315d56617"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "daaee48142a463180a9b94468039d5231e315a4c"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "886417d5f361a57af0209de6731e3d6f7e8cb437"; } - { locale = "si"; arch = "linux-i686"; sha1 = "eb1a0a28d8c5fe6f789340b5d53da63c3f67ff87"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "e63f4b81e21f3a9c1b706afcf28410dd0b469205"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "edad04ac1d8afc92190b78567d79fa745854306b"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "56cda6a10e26f2f958f24ab09e1b34c1591da0c5"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "78e28912b586b922821faf76785df8d56fc85460"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "92ee5a8d02c6bada618b309c1fab09fc764716c4"; } - { locale = "son"; arch = "linux-i686"; sha1 = "a8f48e23c63143fdfa4dba4b569e45f06f50ccca"; } - { locale = "son"; arch = "linux-x86_64"; sha1 = "f6e52004d060f268fdfc25d4de1fad68ebd4b250"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "597cf559e7466f9b40cd93f125fde29636a414c1"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "8d2d5ed7a8b4abc67d3dc96456a3625ba9b8ae2e"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "1ac71db3fdc95942e58e93038c606b8f4156db16"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "956cd3579ad1e000e3519050122443424c691e46"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "df0651f4d830d1127db54b34accb6b7e61da4c07"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "ad21f011767c133b8f9fb6270e79405f96aea7ae"; } - { locale = "ta"; arch = "linux-i686"; sha1 = "37453def3951e2ce5d8cd242d0513fbe0b081f90"; } - { locale = "ta"; arch = "linux-x86_64"; sha1 = "e09dfe3e79e85f3a37150df79f64e3285a73db10"; } - { locale = "te"; arch = "linux-i686"; sha1 = "5d329ecfe87772d85e4f57329cd1505e73ea1d09"; } - { locale = "te"; arch = "linux-x86_64"; sha1 = "83ade2a74e54204a7155d52695f6bd41f350c627"; } - { locale = "th"; arch = "linux-i686"; sha1 = "9e435d3a244f6602546549fd3a64e8229fcc8b17"; } - { locale = "th"; arch = "linux-x86_64"; sha1 = "0ba7a20912068fad8224d59b70c44f124e876199"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "5be128415171825123bfd6c09affd5adbd65fc0a"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "2803083c7c064ec5b6f2810fa56f86cfa884171a"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "eb94ca07d84bdcc4f2609b87a9742ed7007d5136"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "9167b85241f15911c42d4310961b80659ffb1989"; } - { locale = "uz"; arch = "linux-i686"; sha1 = "216554e565e0527c1aff13a2abb733093b1aa0f6"; } - { locale = "uz"; arch = "linux-x86_64"; sha1 = "c89dca50e3d2fb3d1340791b7932d8ef6008333a"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "6893ef973ead9bd97d0e98bfa71bd5fe7fb4c7b6"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "8f521aa6ef56fa26d97d751391b94a9e648a3727"; } - { locale = "xh"; arch = "linux-i686"; sha1 = "c5ecc1b8aa8dfe3ea5611e3194e719c79012cab0"; } - { locale = "xh"; arch = "linux-x86_64"; sha1 = "346e508474653a9493936995e3ad224a94d2fcad"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "5e50c358a8a38d1fa106373d0ab71b716ad75915"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "8c170bf247a667ea513306b2d79b95c066c4c6d4"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "ea4bd309c940d87433d96e8d5c77e7578fbd4fd7"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "26f3b0500593e6a8aae3ab7f415f929d39466911"; } + { locale = "ach"; arch = "linux-i686"; sha1 = "179a537f1260b8e30b7449c5505b94b37f0d41e3"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "ae21b72d13a77cb0e573dc22ab3db0c5ed2fffec"; } + { locale = "af"; arch = "linux-i686"; sha1 = "b30cae46606cb15a631e30cf546784ae5bbe6ae1"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "7877dbf9eb3326065396cf89d6915d2e4ede8df3"; } + { locale = "an"; arch = "linux-i686"; sha1 = "7b6162cb4cdc708be730342d302663bba9bfd599"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "d9e94f06d3ce3d8effeb1621f34409e55394d355"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "df11def71fa21f35c56850d8e2f78d4613e6b3d9"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "992c0493f14b560fae2abeedbc89947af5e77b01"; } + { locale = "as"; arch = "linux-i686"; sha1 = "48cc7960eb1b7359dcb2ef764e7e46de1af7d764"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "fc352ac4830922c958def4a4a15440958435f396"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "43a11793cb0ccb23414d6a512d1482a484704794"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "8606132de8acc56a78a2f6453f154c77f2f30384"; } + { locale = "az"; arch = "linux-i686"; sha1 = "b437824b2bdebf7b776fa79630c774c2d4e20929"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "1cf7549ab160f5bdce07d69f16e79ed687ed9520"; } + { locale = "be"; arch = "linux-i686"; sha1 = "289bccea6a881fbd8df27cf97864019fd5ef2cd9"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "ea4eb7de6639c45f4890555d893213051bdb9a7a"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "3117f051ec7c13726d058559239845703be18fa4"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "f1803a5012b336b245bffb03ca5b2020b8173373"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "c99b3170636d5010e9a1392d0038d491766b9612"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "60c696a3a99ab7d3b632025994f807eef230fb88"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "7cce3dfd5433b5d84eab3fa66fd053be799dc12e"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "fe100cbdb83edb573397c7d9e1fe4c025bd0e44f"; } + { locale = "br"; arch = "linux-i686"; sha1 = "ec0ae6c4aad9cb9387a2250e983658bc900364ce"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "8e9ffba6ffe45ee90e0496807832fcb67f953417"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "158719e9e4c1d3cb7409e3cdd976b93e69157521"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "92d0be401e919366029c45f6c2faf06716a42b95"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "2107d600ef72ced48fa9c57356eeceb745ad3f4b"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "7bd119c52b7f15ed309250bee3c9e950be973373"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "21fb6a32d8812e33cae87c57a734a388dcaab659"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "d5a380fa2b03f94913c8286635582f448bb10f18"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "c5da1b20a262a4047d68ec5fa918ed0c34fd9319"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "afcf20e60c3e009e2fb4b63067794a5e10b3125c"; } + { locale = "da"; arch = "linux-i686"; sha1 = "29b13a3c401d23e7fc3e53c771c09a1646f1c2bd"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "fa2b458839cd002f29196fb011d898eb31f39591"; } + { locale = "de"; arch = "linux-i686"; sha1 = "3264268b5e8cae1e19db0270414a2124c6aa37c0"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "efd1ca985a514e706b8f6cacf067834539e01687"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "b439d609b77bc8471b1225772431d0045250872a"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "2541f627b0d70a0e82048fcd5d27314f2570e57e"; } + { locale = "el"; arch = "linux-i686"; sha1 = "f83a2c3b182850f0a42bb23bd59b3e0cd010f4a4"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "11152704a3317a8643765971081fd164a1fd412b"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "1fa9ecc9fca6843c43d7acf10f747ad7bccad1af"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "b0780f9ba0bd6192ac7bfb646221d1354044992d"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "78a696320ac627c92cdf8002d2ee64fc9ff91298"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "6cdef8a3ecf19adba73dff406a6e2347773145ea"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "6549568f0ccc153c9054f79eb3333c4a767b9acc"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "f606267a84ed0283faeed88984998a8b345ad2b7"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "8599d080063494131520abac51b8fe36015da47e"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "5bc6516b5bbcbc350c638facf02c48cb6422d4f3"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "affd50b2b4faedea658c054b15c68c30a101abd6"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "f968320f1e03edff75551832fc100f8926ab2cda"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "2d29f0f0e3c1a7cbdf9152a90a23f382f3ff33fc"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "1655f713a798ac64e208bc645892ac1a9730c42f"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "394fb56f9fe9e92d8d0462d26c1f23100cdfbbcb"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "3102debd55fdf4460a53e044628045296264fb26"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "1ff59b283608606766fc3f8170fed562990e28ef"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "faedfce978aaa04bc6b5b3e531307c2bf6911d92"; } + { locale = "et"; arch = "linux-i686"; sha1 = "383294c3debd1171cecbe7b9e69db918477057d3"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "be5c77971bea3a0ba520656264eafe23693d04eb"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "0e7dabd66975d5e8212da141c2eb36625ad8c583"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "d6d5cdf2c9a05916158016817f84229c6a24307b"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "6c066ba7a4bb05445bb4ce82e9515aeeaf25dab7"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "c343770fea544d5221d8af5899f0b8e6ad8f657a"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "264e2396bebafb6ab6a41481c7f33e3270769dff"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "78b2060ebabce282ed5bf7655ee9faf1696268c7"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "9c1a45b22d8fef51e101e4789200305cb38422a4"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "be45b36bf6bf913cee472d511e8bb6bfa03cb6d1"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "5d0caa1dd35e0388f70966b74582efb36bd290c1"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "3a5cc6d7f59e8e62d065edc4e6db3290228d067c"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "a35e82ebcf94bf9df32628c3d5e38ac1bf322f25"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "c02ab4bf770fe5bb1118aa7b6c826bd707255e79"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "4cd407afbb5f117e54da4749d75da9e604314f3b"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "c01a19d7beab0cb221197ad9d441e6858bb7c3d4"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "11d4ad74f036dc24537623fe6b756679dfffa065"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "9e06f955e80fbf3f39f7b0e96aef0278c3d6cde3"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "6f2a82aae2d23a8f61413ad0db962498ce270015"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "03172a2c69014f3f6f1f2f3e1d5a911a765b7f63"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "39b2be58e0f86f8a63d64bca60e0e49d8cf269ba"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "8221c5423b6de5f8db50cdf452c6cb7c05213940"; } + { locale = "he"; arch = "linux-i686"; sha1 = "a39006387ad757f704e3630fca2569d1d287d05a"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "ef6ee8fa645fb2b4c6513b09b3b989589ac82148"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "69cd720b5783c30588ae1d8de6dd8adf4457f6d7"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "484b891931cfe7f5612b2b996cf71803da79ebae"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "da5d22d99afd0555a3e63bd42338fc1b819cdba7"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "95461441c10107f9bec5e3876ebb904a095d65c5"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "b55f4b75c3d2237728d368fe7257231de1d43e62"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "c8cfd162a1e59ff05a16f1426aee7142cbe4c55c"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "f0036a02921312d219fe77fb9ecc3fbbf1252796"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "1e322d3e0f113e03f3c2aaa4b324b5e26401a2a8"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "d1dfc555a751e48ecc9c91a98cd9e4b8df9cc66f"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "3275da78c36df0ca6f1fc4754c2139d74fafea4d"; } + { locale = "id"; arch = "linux-i686"; sha1 = "63744d3b0e9eaa4d0e93f7b378882329e8f75c97"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "c36ae3ae88e3e7f6e0ab6e18648b2b165ac5a330"; } + { locale = "is"; arch = "linux-i686"; sha1 = "a65b62900cb3d0e24eff5d429995a01064b3aae2"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "092428e22d92d7f056339e3e79eb53463f01021b"; } + { locale = "it"; arch = "linux-i686"; sha1 = "79b528e45efc78b086a6d50789a4fc5e3c3ab0b9"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "ea0451cf50efe053e53a08085fa28de422f95c02"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "5ed262b081e2ac9bebf04a5b573a1260492263cb"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "ff41ad0691963bb19890905a4863d787725d2631"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "748146b26ed457344f9221c1cd9e58d59db6bf80"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "3758b66e89576150b4895256a3906a928fe69a20"; } + { locale = "km"; arch = "linux-i686"; sha1 = "b65a6e7e928c8d52cd2a78c94ded54a56d3c91cf"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "6dc34498250dea567811a8db9a0c52ebbc6fce35"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "90e6721fdfd1309d03c7ec7f8a083f555a33e535"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "6cafee1e4db15da7c291b0ce097c69258c664bf2"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "0af800c16d56132c57aa0f33e653e02ed6f1a8f8"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "ab2b7b49b970f2c6f5609d3874af5f7c9e0be28f"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "f0e53f8bc7b45bfdc4701f9cf7db245b648759cd"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "0463eddc64c8c85caf93b03d98ac39ee6f98ebab"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "aeca5283a62d0f7f13a9f58f9217fb97b7866b78"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "43a5ef9908a7141a710275e369dab51b08081673"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "c356c78e037807077161350b922d5a19357ec57f"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "d482e599c1de50bb99d819c9fa591fedc7d7f842"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "7b53ad61f5c0753307088053948459ac33e9f85d"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "ef7612a38e11aaa665eff285001bfb28f291471a"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "3f2d34b946dd8faaac6ffc4ad30a7df97d4a8ebf"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "222da5ce6f403935cbeff6162d28ba9d2b2f29bc"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "a86756be94c91d4a68010ec8ef150a8ff6203b66"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "a1f8f2f7205152c1fa14da8929ed8448d6aeaf9a"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "f6fb36516e34fdc3b768bec7183ebceea692608a"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "3b963c905a3c8236866fd5434e886aac79211831"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "1115c894abb78dfd344ca47754fed1d6b491f7b9"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "abf7305a7ab69b4b030e66d2893f092cf61b1497"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "7ac1d330dbe7eed29bf84d3bcb6f96092fdf1f3d"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "1acb6fb37b2b14b5516a5f156100afd21b29490f"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "119b92b8553aaa5cb568631cdb36127d27768de3"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "3495b2263d92763975ddf4c643774295c9066e22"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "da9628a56892b5b254326f5fc06ffa144871cbb4"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "dfc0931bc426e1230a3efd1d33e22f2fd3e1849a"; } + { locale = "or"; arch = "linux-i686"; sha1 = "87508f44b0b94e4a5565d7d78463ad9a38ff2686"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "b0fc5e86738ff973766671e34916f6a7d824b971"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "daa29d6040d813fa5218bb419a5cf68358dd477b"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "614f733bfeb6ec6bbcc2cad1e1ff107fc9e2edab"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "751738d7a999293e45f41876d9ce9df019b14552"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "814968337f9f0f8b115d6d5415c48486c321a5bc"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "7b4f7dd33edd25e70de793772f9c9072baf351d5"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "8c243f2e0dc99400aed67c761dfd80a2f500f749"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "8edad0149c5a69515be113a399a9ea94459acb54"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "fb946da0f7620122aa31b8d16de54ce76d46ad42"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "43cdec3845b7051f36c432d48f20863ab2526272"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "46149817fe93b954acb284431d03b60cb91913b8"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "57c08ee9dfa72e15572ca6a698562b23a76b098e"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "79da06ee88fab7f6b947a14ee5eac79b0f8c9e6e"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "b91f1723e7811d89cc35a8b765dc69eee57a0655"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "55d456daa6525500d5e75a84d3206c395ebfa130"; } + { locale = "si"; arch = "linux-i686"; sha1 = "260cefb8b0057551b7b57e7b8c3bae2745a661b7"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "b9746f9bee2bbb166f165652207ab6820154947d"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "a2de5c4f49ea17a1ccda856ab44ad4dcb4d81bf2"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "aaaaa26ca608a519fc9f4176209b8c97d5993322"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "25582122ff73ced434f4e8f5a2c36eac2fef3d9b"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "d3f04f7942dd6d7013441fdbc2ff344a805c8e13"; } + { locale = "son"; arch = "linux-i686"; sha1 = "0a0e84c24d653e2931a24086518b09c88e9eaaec"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "60055d988359074dd464d1c5a58aad5bf77d363c"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "929f66a3e0789ea364af2dd50b23bf8b3eb2dc2e"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "c39f6fd009055f452a383f4fca0ec584de149488"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "782bf37d1f9de7c2453b6eac8531e50a011ef9fe"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "f9487559d2d958c7adc75d7a5004ee41b220ba3e"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "55934039ec798ae48b722c53b0556764e02f01fa"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "d3208d099c0f91a7bd51dc658ff92b686062aae4"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "6907ec5b393467d4025a771191ab8e8a5aa6c60d"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "3d982f8acca0983ace02ed50cf7705613aa4a4bc"; } + { locale = "te"; arch = "linux-i686"; sha1 = "463653494603fe52b078df637821cdfee275d7df"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "01319af6358d4acecf364c9c291cab8aa0d87245"; } + { locale = "th"; arch = "linux-i686"; sha1 = "16155e79b6bfdd08917e97d1fe362f1e1bba5d20"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "726bff6d145a8f7584b8da90e27649a0da8bcbc9"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "27c67d2697e2b3d30ea8b241329eee79a03dc698"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "0f7f67506517dd1196a9ca6f8cb66a78e87e32e9"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "40f2ae51e1f29511b7e7d97e92a5369ba392ac93"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "85ad767ada8a472b373dae5a0b72219860ca5cab"; } + { locale = "uz"; arch = "linux-i686"; sha1 = "b0c41b4ac658b137505438fc79b4fba2518026ce"; } + { locale = "uz"; arch = "linux-x86_64"; sha1 = "4192ad7e58ee26da69e7f634a272bf16c13b0f88"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "05d301387623e73ff8e47c55862b5a282a1da4bd"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "9db1bb46e9dd1326f1396c9f29a4607a9e0fd3ee"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "9fefd4b8b9082a7793d7e1a79d70ad85ea7a7b5e"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "1cd465d67089c9a85c18228a3f831e1359d16179"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "5a197ab692ecfa0e665cf3c03a29ff452c7dcad3"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "7637c196d5a8be4eefd805c088ef3ff33825603f"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "490b8af899c762e03608f37116293717b29e08f9"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "021ec599c4c9fc15dd88d4a7f5cc67ea5add17eb"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 111a704cec7..03316b3ee71 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -15,14 +15,14 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null; -let version = "37.0"; in +let version = "37.0.1"; in stdenv.mkDerivation rec { name = "firefox-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "c23a3d36603edd9d2fbac51afe7a4825c0ac15d8"; + sha1 = "8bbffaa3cb81916bb44e11773d3f05fc4f2b9f36"; }; buildInputs = diff --git a/pkgs/applications/networking/browsers/mozilla/builder.sh b/pkgs/applications/networking/browsers/mozilla/builder.sh deleted file mode 100644 index 483585dd170..00000000000 --- a/pkgs/applications/networking/browsers/mozilla/builder.sh +++ /dev/null @@ -1,51 +0,0 @@ -source $stdenv/setup - -preConfigure() { - cat > .mozconfig < source.nix { - version = "31.5.0"; + version = "31.6.0"; sources = [ - { locale = "ar"; arch = "linux-i686"; sha1 = "d36881e451b6a2f37d915aad58d05a21bb87f7d7"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "21274f27a373bfbef19be027e5d29072ca60c9a1"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "b01f2b2b84fec43aa53b72eb1298b502f7fe710f"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "9ca6a14bd622b10e4a44d3aec496f610752c1e87"; } - { locale = "be"; arch = "linux-i686"; sha1 = "194a8808c66a48bf7da08ff119a7000088fe6cc5"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "4c2b3ee21c098894aea655b428459ae06f9d62ea"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "bc218d49b4e43fd3f05b7c4c8906b3da88e828d9"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "8bb02681a93dd6f0607b6a0b9ed53051fc628fa1"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "c5cfd8d422751908cab17b741f4ed964de65a4f4"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "80a5486d4150cdc140fc7c215927b9a49de7753c"; } - { locale = "br"; arch = "linux-i686"; sha1 = "401a491875fc0bc8d80650d83f7c70e6650c99df"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "0a76c907d2bcdf877a73fb098a7a0d269e40a624"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "4da40bb96d58d1465fab3cb23825d298140c81a2"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "c9e792e8d871b942e67c7d8b7471a7c40dc1d1de"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "a0da8667faf948049adee23a8c68320eb0af0d4c"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "de9c5cb34defca191cba287a3088179b52385e51"; } - { locale = "da"; arch = "linux-i686"; sha1 = "2a4c69398a3aa4dfe2c3d79330021e243893a660"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "2a24cc02c39be286de1c0407b5187effb3f74cad"; } - { locale = "de"; arch = "linux-i686"; sha1 = "292c4de929c96302d10b235788b985281ed1a36c"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "30ff8eacbe14d0b7d0fe4c8854d0b20af1fdbddb"; } - { locale = "el"; arch = "linux-i686"; sha1 = "1092950cb1e9297a976b1e81a53b20bfa908c27f"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "8eb096336f0a585922c31905534e8314dbe69f05"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "3c18093229125d47078da68cfbf785c96d8bdcc1"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "7c9546c119585111c20bf9f0a7da38c1359e8bae"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "9a8c3ddf64900335a0da340da67e291fd9135c78"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "e00004d79733ba311f7b3586228c4c481935f9e6"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "c5a60aaf75baf0cfc56575cd40bb61594c66dad0"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "e95dad323e8e6c1eb401b9528f16825b6d4defef"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "66adbf58ccd65b6b60ef4196e13cf1b246151c6e"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "35ecf91137560f06445007bbee54cbf8c5b9c438"; } - { locale = "et"; arch = "linux-i686"; sha1 = "d7ab0d4874a95cb2234b076906eeba14d9a76507"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "82f944cbc95eeb10e6b46a20d8bd5b031800c87b"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "1494e4dfdb95d0e6d62265536016601501277b7a"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "ca36606b18739f155a18637f6ce392bf466ba666"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "dce9299b7bc905377566caa7e0289620e2d7e84f"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "6477fab8e95032bc57faecbb2240844a8d0314d5"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "e8fbd234f3e35d8dcb0acb2d3fbdd2b03d9c06e1"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "e2fb441f96c407371ed02e86d42b63e7e38107fa"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "2798b02de295269ee7a0792bc89c6c9f809bfab0"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "ee398047c681098af9c5ad17101d34fe1699d038"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "739d34bf1b8ab785194b6c591e636bc4826b908a"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "518bce26ebb68021c4dc6a8472e3f267648746c4"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "5791da2bc93aa945f8f21b2896b80ae3b88f1bf6"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "f576688726132e0c0b8b07f37dda5dfdac0dddd7"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "95bff6f384ae2821857b3ae71b76aa5440ddd3e2"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "7237149162123580592769f66b48be83ad358df5"; } - { locale = "he"; arch = "linux-i686"; sha1 = "8bf0ba0630601e8773eb4117ea800a2d32e5c920"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "de5ab889e9ccc204f7abfb7e3e52e4ec6edbcc47"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "3a6030ec8f310e5b1b154e0cfd9b75142df4c282"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "0af6b30a39141e887b5ad14fb16bb71047dbd28e"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "bc84640dcf855612668a0c457a01ee0239440447"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "a96c48529e7f4a50840903d212d9cacacd5d5d94"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "5ae8b3ad145fd1fe9d83b450b588ae85f3371489"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "6c911464a02b65f84da08717cface89029e9a2cf"; } - { locale = "id"; arch = "linux-i686"; sha1 = "19b98a36c5b64a1ac6db72b6d21e6b3c9919b3bb"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "88bbe2609b8e84050dfab1c6ae313b4ac5c1f619"; } - { locale = "is"; arch = "linux-i686"; sha1 = "24cf25824357b570ddf99445ed6ce5e02f61ac2f"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "f6cd888e6ae5c67cf35a811f087ace294ca80883"; } - { locale = "it"; arch = "linux-i686"; sha1 = "5fbeb845a3e9237b61a77e552927fd1cf41eb369"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "77015135696730a9412a2ef180564e53bfc41074"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "df807e1255871ecaa6487853798fb86e4228745c"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "cdfaf85e81edad783059b2a7b6a5af19ec48e8f3"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "3cd01ce359c500db39edefa75275bbd42244f344"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "52918cadfa61a4f3903f35e34583b9554446ad98"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "ade54d46de66db43de1490523e23434c9cb69103"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "52cd293a4329b51b40ff8d992dd2f980f6e8a7cd"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "693b2d513df0a0f6b31adf9349c6627816b5c14b"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "be7c2f7a4988998ad19d5a87c28dbe2b06dc7d75"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "3920a26c7ac2f66ab7d2ea5d37d58471d9cea804"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "f034ad4e4c347d6e2d4893b932c969c581cd51ad"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "23e21892a7b08fb320c2af2711bbb44347de07e8"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "6177e5dca5ee9b703e585489610b874ab16b67d3"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "ab89eca3573f847ce9c4757910303ec3647d010e"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "4ccde5395018e719bd5f0d835ead47a272578685"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "b1d15bc7c70deb8e00bf458082a8c2a4577ec6e2"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "fd146e4fb01ca78bcfe6ca2cd560a8252c37e561"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "bb63c5a778ab9c819b742393bdd67e347b18943b"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "c619bec7acc717dc3fe7718c5b9b27a0aab2bb86"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "42c13c4381d1046d8982f2891e45cc13becc5eab"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "610d59c9b8e8bbb61937a205db70605cf99b4684"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "349481180512c188a1114e7c9c5aea6f39793137"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "b3bb61a6e2bc36af8521b1be44330f348e6019ab"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "211ef0e28c892f069c79be028cead4f484224977"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "9868443f482a00cdd0d68106afcdd002f74d8232"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "1b722932dd8b3b517c61ec50588a917bc7a5d934"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "9465eded1480ddf1e807de2ee8b2d10e7bcf9f0f"; } - { locale = "si"; arch = "linux-i686"; sha1 = "ddf30543b88f0dbab951ef76f93d4e9cef47bc00"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "5e0ecf9899cdbc63530e0b0bc72e585abb721863"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "38d6815aa5837005dfcb78cf25057a1f04b52da4"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "c5e2a1c6d67e41c318b13e81cdc7b6dc36d1798a"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "6bc59e32db280aa2300b649b175330c7d503776d"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "39f5965ead13d55c0b84f633dff645e8bc2111c0"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "a06151bcacbc504da1351cda4f84539a2ce9afc8"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "e453d23bb265d4d5e729fb7f4f65553ec8d72250"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "6c6f0e1bc7e2327d05484628298a204897b379bd"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "2044a84b1fdcae2aa2ae5aec9132543ed10792ed"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "ecd19886aed7b721172be2a030e3b9d1a752a648"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "904ed03d02ceebed11505f95ccf158aa022d6aa5"; } - { locale = "ta-LK"; arch = "linux-i686"; sha1 = "4f9ec99fdb826957ef109a7665a97fe223a88d50"; } - { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "0bae36b2aac4e06bdf4b0b210f3179d15a074e8e"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "e0ab549d8f4df80f8b7dc4fa978142935f103140"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "2c0b7ca57916bac4846ec1702094c02452a05a0d"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "80af6c1ad5a226249f91b9ad40aa1fa2fae4e4c8"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "6a2de95d4e501fa0eed932d36e7e667746e89af5"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "7246575cd970737c8dd9ad84ad28316efcb37b7d"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "84f798a483558b24cfcbfe44af8c9d1c0acffc28"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "dda34b5b7026ffcd37b982968ac0815f02c082e2"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "6a63ad1c758f639aaa8ee20b3153811514810425"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "a3b378d077ef57ed52130df662c5b68208527cc1"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "857cb387742c175e8b31a0b2171de5ab27531141"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "4c0c50d5c315f438d09b8bf2ba821c7148552076"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "d0361df60873c787ebcb487acb65e9e4e7bf6c97"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "84e0ab9f62afbf1c673383a6c6c0d07ce369b360"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "b590ca477b00dd2080a887ee4451d06d59da5e6c"; } + { locale = "be"; arch = "linux-i686"; sha1 = "06812c96cbd62c07180062fca293171cf4177d77"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "1cf6501aa77adfa41ad48316f471201f2c2e1976"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "322654ebdf12a9d60738e0a5f30dfde77e095951"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "00fa9855d81a59f7340d69ef25389503b3374c5b"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "efd6f1afc8787295071f1577e043fe8ed4824604"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "0163078b1edc17b3df86d9d80d2dcf1b14e289c5"; } + { locale = "br"; arch = "linux-i686"; sha1 = "1051e4faa171ea762dd0d4c79d1f7b6d59fa1343"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "cad5ff8a920a90e79c1e343022aba0d95347a9a6"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "1801969f47164e9e40fe611b2b11c664541ea619"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "8427fdbf5149c7e0a96e6037f3b7690cc43684f1"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "8ae6c4b5e97b1a129c178c17ddb787b8a499bbbf"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "422d73aa8d853afd219c4be983e9d0b0c165d3a7"; } + { locale = "da"; arch = "linux-i686"; sha1 = "ee6239de012bb2d581c42e4271736b3565932d2d"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "3e24c6d239e5d55ffefdecab5c280668d36f3c14"; } + { locale = "de"; arch = "linux-i686"; sha1 = "474f1b4ce9b6cf635c60ab32dc99268f30bd906b"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "7327c84c0b447cbeb00a57790334dbd4df02441a"; } + { locale = "el"; arch = "linux-i686"; sha1 = "a1cced1eb8d290f8f7668839af68a42b47172fda"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "c7a41b26bee1bcf1a1012ab122036983c42223ed"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "73309ee5d0304762b24b040fea3be934b0193b76"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "79466a14532bac1c5db7de4f1aacd97538b12ccd"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "1886939dd4fa0bd720f209a9280bdd48f2805144"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "18090d7adbb45350d47d796ee0d4a52da68629b4"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "6d5b993c8c5f9a311e128520a2eb1115a1004d72"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "04afb8826d04dc6511a77377d78f9dcdd67bb73f"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "c49c2175842d40698128da293305317c5d986561"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "65e6d24657a47d69cec4820fc699b948ef7235df"; } + { locale = "et"; arch = "linux-i686"; sha1 = "4a066d35ab922587ed1000b770becbaeafb91d39"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "fad64bc6cdf1bbc03ef0e6fd4fac96e0ddd26578"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "ac90f02584bedfe3b958020c37d3677b2312b203"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "7152187af874799ca22dffca1d85afc0346a5f7c"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "797c494042986578e79290a827056ee56ad32526"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "5fec8fc94b8296c5189be29fdc0f43f074c88722"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "2f90216459e8bd24fe775bc84f3d3371c64c705e"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "07176c2825be793521e11dde8a73ead970c58385"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "0e7f95afef9fc01667b0e2ee33e2620069662b4b"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "ff9a84cb2ca4e222a6d75b5591e5337b3b5e3b3b"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "a392c2287a3907b5b79c443c67dfb4d8e6624ebf"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "766035560552bb26b1d9a6c98357acab515153e3"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "5f9dcab41f522ca84833cf5dc566ee9679efcc01"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "46ced4f5c67f560b15341db70dc04d1a19e176cc"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "66f1b772f981ce5bbd3c7c2a73d260d2243887a9"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "2c087b2ba065f06aa4e4e491d92864ef679f14c2"; } + { locale = "he"; arch = "linux-i686"; sha1 = "b157e04413ee246304f30b0dc68eeed3e00d5cf3"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "72e77175705052c6102405897edc1c5887f94c58"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "f515c41dda71a69974b67d70ca1980987ab895ba"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "9b560bc16985e8610d11c1aa1df6a8b29a650528"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "24b0e2555617b1b0e7dcb601b3f7a8c54bf64524"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "a1cf5c244fd98a024b2987b72b95671a90c7e0f9"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "20a07254d51cc94be8153426e472d8c7b077a014"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "3e5c41c5239da37ee52070c043b5de2f16859055"; } + { locale = "id"; arch = "linux-i686"; sha1 = "bbbc669ead8c716725ad162247dbb35f6b6d3376"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "30c73fff969d9d94e6a24b27fa5b03285104ed38"; } + { locale = "is"; arch = "linux-i686"; sha1 = "d8ede481d0f04237b1a36356880d76a5439e6796"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "d5c70452102f0c1f513a45b3b05339b171e7e149"; } + { locale = "it"; arch = "linux-i686"; sha1 = "00bad56fb3a4bcc4032b204471a66dc64a9976e9"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "cd15137766f9bdb693743401d14e69c4c990aeab"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "eb51ca9c4d5d22ff178c45c99ba35270d9f006d1"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "ec7bdce8ecba50aa4c6f0495ec4737b032e85688"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "ce2a6f518fe69b6cf87ba6a2d5ff7e32f676e516"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "614808276829835d81f6a330154c3dbf617109e2"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "95da07c69121bf0e22b480f3e4df9db3e7676a8b"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "02dee38474393cf86c78aacfb2c546bfd2130e0a"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "cd8b7dc6eda97de0ec1c8a5dde36f4afd60b720a"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "748030706822a80156e5ffcfbaed413b3905280a"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "eafd2b7fa376f58fd5320a8e67bd76c9eb17819e"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "f04672081b0281dec909fd110f1c1dc8f340cc40"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "c51c6a23f5e99181cd2aa6e324165a523c7e7c41"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "29adc20bbdb3b1de7b0c1a325ded1159f7627478"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "b94fc235c3644455ca19238aed9e2e4cff4ce7d2"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "78bd45bf21196cc4bb400d10d19151931e390681"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "0b921d11a43968bc12a31be48baa962fb084be3d"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "b975d958fdb152c942cf68ed6dbde8df6b6cfe09"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "5384bc8f899d1ba75c96b11276dd98cb5049896a"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "dbd5db203127f01b1ec46259f9b668aa2dec8d63"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "eb6590aecd509ee02b02fd6d39aec32a77616b59"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "750f9d25164f2aae4d5bb3147738cb604c131b94"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "5dc246fc1c661d5a965da6eed7d0b57dacbcc643"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "ca3d7a76564552cab92cf1c3f2098bbb740e6315"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "ceb0264ab40dc437c2a44fa03c2f9a3ff18b667c"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "d2200d241c26059136169850a5ad4f702c273301"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "678bae69497e2ab6c4d895192b5093a0d120ddc1"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "9ca3af62babeeda8a46609ffd265ff0cc059349a"; } + { locale = "si"; arch = "linux-i686"; sha1 = "46376507d77af110a63de24a7a136c43b2d6cb1b"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "d43e51c5e504bfa1a0f7370e1cea3bda247b81e0"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "e97bc9017953f91f4fc9a158dca36ae1217a8a97"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "f80a0473ff265295f3eaa8ed8b8fe99a0a71b049"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "449cf3770e4eaa4289bac9abbf7f655bbdcdf8ca"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "ef1092cdef4dd2d4ebf62b29654da4ad08c7a6e0"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "0d856fdb66ca1208a08eef5073744f66de7c94f5"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "346888cbc1428897df1b50651a263ae5cc449475"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "3252ea6a0706813d4c536cab9251ec707a46fe47"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "ea55159965bc8b5fb5c692efc1a30ac3ddd74a48"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "5191f311d6324e1fbc98763e80316bb7584999ba"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "4c8387f5db87776ae6ba322fa81983f7bab14690"; } + { locale = "ta-LK"; arch = "linux-i686"; sha1 = "e1fa5437760c8964aa312ed296454c0736009479"; } + { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "1e277512366a60745cfdc409530943e42bb62b11"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "8907cb5f77b0dafd6c2c69d63b6f9b72ab58d7d1"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "b101b37f7fe86686db1813786cbf2ee994bf33c3"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "ab0e84cd69808d12efa28f5062372ba8983b8c42"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "bce4718c183c9fc62f38025f7f9329999ba1f8a4"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "7a05e5dd98215dab96746166fe46c96592e8768a"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "c2c54c1831199ac8b5ba0bbebb564e9dc2ff2563"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "3c2a7f6096eb16a00451d1ec71f6ff382910bf43"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "e3d43d6aa007419d057da99d06fdd200faf8d9c5"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "97bc53d2216eb24ad6c0496fed4698da4e481c38"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "3e5fcc5058646ee326f4b6b1ef885999222ab0b8"; } ]; } diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index cb8d168c7db..430ab70caa1 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,12 +4,12 @@ with goPackages; buildGoPackage rec { name = "syncthing-${version}"; - version = "0.10.29"; + version = "0.10.30"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "0zpjcl4gr0r8c0qygvks58ly1k7gp2ngd4dn2d85ci4dddvmmxvj"; + sha256 = "bd554d42586c85e0a5e766b6a6e87ccc6047f30e189753a1e68e44fd54ca506a"; }; subPackages = [ "cmd/syncthing" ]; @@ -27,6 +27,6 @@ buildGoPackage rec { description = "Replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized"; license = with lib.licenses; mit; maintainers = with lib.maintainers; [ matejc ]; - platforms = with lib.platforms; linux; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index fdd02aac0b5..11681cfefd0 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -7,11 +7,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "znc-1.4"; + name = "znc-1.6.0"; src = fetchurl { url = "http://znc.in/releases/${name}.tar.gz"; - sha256 = "0lkv58pq4d5lzcyx8v8anzinx0sx0zw0js4jij13jb8qxp88zsc6"; + sha256 = "df622aeae34d26193c738dff6499e56ad669ec654484e19623738d84cc80aba7"; }; buildInputs = [ openssl pkgconfig ] diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index ac3072f62b5..00f27bfc93c 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa , kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2 -, fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, popplerQt4 +, fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, poppler_qt4 , libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular , libvisio, kactivities, mysql, postgresql, freetds, xbase, openexr, ilmbase , libodfgen, opencolorio, openjpeg, pstoedit, librevenge @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype - sqlite icu libwpd libwpg popplerQt4 libkdcraw libxslt fftw glew gsl + sqlite icu libwpd libwpg poppler_qt4 libkdcraw libxslt fftw glew gsl shared_desktop_ontologies okular libodfgen opencolorio openjpeg - libvisio kactivities mysql postgresql freetds xbase openexr pstoedit + libvisio kactivities mysql.lib postgresql freetds xbase openexr pstoedit librevenge ]; diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix new file mode 100644 index 00000000000..5f32077104e --- /dev/null +++ b/pkgs/applications/office/jabref/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, makeWrapper, makeDesktopItem, ant, jdk, jre }: + +stdenv.mkDerivation rec { + version = "2.10"; + name = "jabref-${version}"; + src = fetchurl { + url = "mirror://sourceforge/jabref/${version}/JabRef-${version}-src.tar.bz2"; + sha256 = "09b57afcfeb1730b58a887dc28f0f4c803e9c00fade1f57245ab70e2a98ce6ad"; + }; + + desktopItem = makeDesktopItem { + comment = meta.description; + name = "jabref"; + desktopName = "JabRef"; + genericName = "Bibliography manager"; + categories = "Application;Office;"; + icon = "jabref"; + exec = "jabref"; + }; + + buildInputs = [ ant jdk makeWrapper ]; + + buildPhase = ''ant''; + + installPhase = '' + mkdir -p $out/bin $out/share/java $out/share/icons + cp -r ${desktopItem}/share/applications $out/share/ + cp build/lib/JabRef-${version}.jar $out/share/java/ + cp src/images/JabRef-icon-mac.svg $out/share/icons/jabref.svg + makeWrapper ${jre}/bin/java $out/bin/jabref \ + --add-flags "-jar $out/share/java/JabRef-${version}.jar" + ''; + + meta = with stdenv.lib; { + description = "Open source bibliography reference manager"; + homepage = http://jabref.sourceforge.net; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.gebner ]; + }; +} diff --git a/pkgs/applications/office/kbibtex/default.nix b/pkgs/applications/office/kbibtex/default.nix index ba0d719a049..b3e62b8e051 100644 --- a/pkgs/applications/office/kbibtex/default.nix +++ b/pkgs/applications/office/kbibtex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kdelibs, libxslt, popplerQt4 }: +{ stdenv, fetchurl, kdelibs, libxslt, poppler_qt4 }: stdenv.mkDerivation rec { pname = "kbibtex"; @@ -14,5 +14,5 @@ stdenv.mkDerivation rec { sed -e '25i#include ' -i src/gui/preferences/settingsabstractwidget.h ''; - buildInputs = [ kdelibs libxslt popplerQt4 ]; + buildInputs = [ kdelibs libxslt poppler_qt4 ]; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 896ac0a71a0..464b0016764 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -24,7 +24,7 @@ let langsSpaces = stdenv.lib.concatStringsSep " " langs; major = "4"; minor = "4"; - patch = "1"; + patch = "2"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; @@ -61,7 +61,7 @@ let ("Error: update liborcus version inside LO expression") (import ./libreoffice-srcs.nix)); - buildInputs = [ boost mdds pkgconfig zlib libixion ]; + buildInputs = [ boost mdds pkgconfig zlib /*libixion*/ ]; configureFlags = [ "--with-boost=${boost.dev}" ]; }; @@ -80,14 +80,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0a1p9jd9lgb1mxnj4c55yrlc7q2dsm5s9cyax6cwaya2q5m5xhnk"; + sha256 = "0m1a09vzgh5mz0dgx2ji3fwmsqr7xymr0hhrrhf75nd1dr0blv2s"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "042xp6xz3gb75k332xclwfjyik63zgcw5135967nclim1sl8rgh7"; + sha256 = "06i2c143dpqm4w1a9nba0gn1ayrvrhdrcm2kydzapvljgljqswkh"; }; }; @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0pa7gf29sgsl6kxs7j1x1zl4ycv682wrj1dg22qc0kb7aijhpm2f"; + sha256 = "0dif783zbh9qb4636mm055clwwsv8j6pmb8msi9lr183drnaw73x"; }; # Openoffice will open libcups dynamically, so we link it directly @@ -235,6 +235,8 @@ stdenv.mkDerivation rec { "--without-system-libpagemaker" "--without-system-coinmp" "--without-system-libgltf" + + "--without-system-orcus" ]; checkPhase = '' @@ -253,10 +255,10 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-base neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler python3 sablotron saneBackends tcsh unzip vigra which zip zlib - mdds bluez5 glibc libixion + mdds bluez5 glibc /*libixion*/ libxshmfence libatomic_ops graphite2 harfbuzz librevenge libe-book libmwaw glm glew - liborcus libodfgen + /*liborcus*/ libodfgen ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 8d532a342ec..174dfe8f2b2 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { name = "abc-verifier-${version}"; - version = "140509"; # YYMMDD + version = "20150406"; src = fetchhg { url = "https://bitbucket.org/alanmi/abc"; - rev = "03e221443d71e49e56cbc37f1907ee3b0ff3e7c9"; - sha256 = "0ahrqg718y7xpv939f6x8w1kqh7wsja4pw8hca7j67j0qjdgb4lm"; + rev = "7d9c50a17d8676ad0c9792bb87102d7cb4b10667"; + sha256 = "1gg5jjfjjnv0fl7jsz37hzd9dpv58r8p0q8qvms0r289fcdxalcx"; }; buildInputs = [ readline ]; preBuild = '' - export buildFlags="CC=$CC CXX=$CXX LD=$LD" + export buildFlags="CC=$CC CXX=$CXX LD=$CXX" ''; enableParallelBuilding = true; installPhase = '' diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix index 4d97f0480bb..7d5724967c1 100644 --- a/pkgs/applications/science/logic/twelf/default.nix +++ b/pkgs/applications/science/logic/twelf/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - rsync -av bin/* $out/bin/ + rsync -av bin/{*,.heap} $out/bin/ + bin/.mkexec ${smlnj}/bin/sml $out/ twelf-server twelf-server mkdir -p $out/share/emacs/site-lisp/twelf/ rsync -av emacs/ $out/share/emacs/site-lisp/twelf/ diff --git a/pkgs/applications/science/logic/verit/default.nix b/pkgs/applications/science/logic/verit/default.nix new file mode 100644 index 00000000000..16a45cca644 --- /dev/null +++ b/pkgs/applications/science/logic/verit/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, gmp, flex, bison }: + +stdenv.mkDerivation rec { + name = "veriT-${version}"; + version = "201410"; + + src = fetchurl { + url = "http://www.verit-solver.org/distrib/${name}.tar.gz"; + sha256 = "0b31rl3wjn3b09jpka93lx83d26m8a5pixa216vq8pmjach8q5a3"; + }; + + buildInputs = [ gmp flex bison ]; + + enableParallelBuilding = false; + + makeFlags = [ + "EXTERN=" # use system copy of gmp + ]; + + installPhase = '' + install -D -m0755 veriT $out/bin/veriT + ''; + + meta = with stdenv.lib; { + description = "An open, trustable and efficient SMT-solver"; + homepage = http://www.verit-solver.org/; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = [ maintainers.gebner ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 65a9679576e..1ea9d967cd1 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,7 +9,7 @@ }: let - version = "2.3.4"; + version = "2.3.5"; svn = subversionClient.override { perlBindings = true; }; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "15fv155skjy80j7sv7x4kxlj3m8i334bic4q2qmb6zvr04hjpslp"; + sha256 = "0nk4q7r6dj5a2my10483z9wmzv3zw465ck8ydp2b8hcdllj16wfp"; }; patches = [ diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index bd35ebb5266..a9fbd89f3fa 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -2,7 +2,7 @@ , guiSupport ? false, tk ? null, curses }: let - version = "3.3.2"; + version = "3.3.3"; name = "mercurial-${version}"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "1yi72lv05p6hr8ngplz56rncs9wv6c16z8ki6f96yw5c833igik7"; + sha256 = "04xfzwb7jabzsfv2r18c3w6vwag7cjrl79xzg5i3mbyb1mzkcid4"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index f296ca3edcf..0b18705e6fb 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { libmpeg2 libsamplerate libmad libogg libvorbis flac libxslt systemd lzo libcdio libmodplug libass libbluray - sqlite mysql nasm avahi libdvdcss lame + sqlite mysql.lib nasm avahi libdvdcss lame curl bzip2 zip unzip glxinfo xdpyinfo ] ++ lib.optional dbusSupport dbus_libs diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 74d4196e47c..01d96542c2e 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -18,12 +18,12 @@ assert withGUI -> wxGTK != null; stdenv.mkDerivation rec { - version = "7.7.0"; + version = "7.8.0"; name = "mkvtoolnix-${version}"; src = fetchurl { url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz"; - sha256 = "0a602d5jvq0ap4pa64p80al8nmyp37a380bi5i4sqdpvp298h78r"; + sha256 = "0m7y9115bkfsm95hv2nq0hnd9w73jymsm071jm798w11vdskm8af"; }; buildInputs = [ diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix new file mode 100644 index 00000000000..87e3047ed19 --- /dev/null +++ b/pkgs/applications/video/obs-studio/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchurl +, cmake +, ffmpeg +, jansson +, libxkbcommon +, qt5 +, libv4l +, x264 +}: + +stdenv.mkDerivation rec { + name = "obs-studio-${version}"; + version = "0.9.1"; + + src = fetchurl { + url = "https://github.com/jp9000/obs-studio/archive/${version}.tar.gz"; + sha256 = "198ymfdrg58i3by58fs68df835rkpnpagnvyzlilmn9ypvpa8h81"; + }; + + buildInputs = [ cmake + ffmpeg + jansson + libv4l + libxkbcommon + qt5 + x264 + ]; + + # obs attempts to dlopen libobs-opengl, it fails unless we make sure + # DL_OPENGL is an explicit path. Not sure if there's a better way + # to handle this. + cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-DDL_OPENGL=\\\"$(out)/lib/libobs-opengl.so\\\"" ]; + + meta = with stdenv.lib; { + description = "Free and open source software for video recording and live streaming"; + longDescription = '' + This project is a rewrite of what was formerly known as "Open Broadcaster + Software", software originally designed for recording and streaming live + video content, efficiently + ''; + homepage = "https://obsproject.com"; + maintainers = with maintainers; [ jb55 ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/video/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch b/pkgs/applications/video/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch deleted file mode 100644 index 91811194c9b..00000000000 --- a/pkgs/applications/video/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9f1e45a10860dd23239de35673643e9e0e4a74f8 Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp -Date: Tue, 28 Oct 2014 14:52:16 +0100 -Subject: [PATCH 5/8] [CEC] renamed the iDoubleTapTimeoutMs in the new libCEC - for clarity. does not change binary compatibility - ---- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index 1d068dc..ad123d9 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -1347,8 +1347,13 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) - m_configuration.bPowerOffOnStandby = iStandbyAction == 13011 ? 1 : 0; - m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0; - -+#if defined(CEC_DOUBLE_TAP_TIMEOUT_MS_OLD) - // double tap prevention timeout in ms -- m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); -+ m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50; -+#else -+ // backwards compatibility. will be removed once the next major release of libCEC is out -+ m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); -+#endif - } - - void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses) --- -2.1.2 - diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix deleted file mode 100644 index 7a6840baee3..00000000000 --- a/pkgs/applications/video/xbmc/default.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ stdenv, lib, fetchurl, makeWrapper -, pkgconfig, cmake, gnumake, yasm, pythonFull -, boost, avahi, libdvdcss, lame, autoreconfHook -, gettext, pcre, yajl, fribidi, which -, openssl, gperf, tinyxml2, taglib, libssh, swig, jre -, libX11, xproto, inputproto, libxml2 -, libXt, libXmu, libXext, xextproto -, libXinerama, libXrandr, randrproto -, libXtst, libXfixes, fixesproto, systemd -, SDL, SDL_image, SDL_mixer, alsaLib -, mesa, glew, fontconfig, freetype, ftgl -, libjpeg, jasper, libpng, libtiff -, ffmpeg, libmpeg2, libsamplerate, libmad -, libogg, libvorbis, flac, libxslt -, lzo, libcdio, libmodplug, libass, libbluray -, sqlite, mysql, nasm, gnutls, libva -, curl, bzip2, zip, unzip, glxinfo, xdpyinfo -, dbus_libs ? null, dbusSupport ? true -, udev, udevSupport ? true -, libusb ? null, usbSupport ? false -, samba ? null, sambaSupport ? true -, libmicrohttpd -# TODO: would be nice to have nfsSupport (needs libnfs library) -, rtmpdump ? null, rtmpSupport ? true -, libvdpau ? null, vdpauSupport ? true -, pulseaudio ? null, pulseSupport ? true -, libcec ? null, cecSupport ? true -}: - -assert dbusSupport -> dbus_libs != null; -assert udevSupport -> udev != null; -assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable -assert sambaSupport -> samba != null; -assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport; -assert pulseSupport -> pulseaudio != null; -assert cecSupport -> libcec != null; - -stdenv.mkDerivation rec { - name = "xbmc-13.2"; - - src = fetchurl { - url = "https://github.com/xbmc/xbmc/archive/13.2-Gotham.tar.gz"; - sha256 = "11g5a3h6kxz1vmnhagfjhg9nqf11wy0wzqqf4h338jh3lgzmvgxc"; - }; - - buildInputs = [ - makeWrapper libxml2 gnutls - pkgconfig cmake gnumake yasm pythonFull - boost libmicrohttpd autoreconfHook - gettext pcre yajl fribidi libva - openssl gperf tinyxml2 taglib libssh swig jre - libX11 xproto inputproto which - libXt libXmu libXext xextproto - libXinerama libXrandr randrproto - libXtst libXfixes fixesproto - SDL SDL_image SDL_mixer alsaLib - mesa glew fontconfig freetype ftgl - libjpeg jasper libpng libtiff - ffmpeg libmpeg2 libsamplerate libmad - libogg libvorbis flac libxslt systemd - lzo libcdio libmodplug libass libbluray - sqlite mysql nasm avahi libdvdcss lame - curl bzip2 zip unzip glxinfo xdpyinfo - ] - ++ lib.optional dbusSupport dbus_libs - ++ lib.optional udevSupport udev - ++ lib.optional usbSupport libusb - ++ lib.optional sambaSupport samba - ++ lib.optional vdpauSupport libvdpau - ++ lib.optional pulseSupport pulseaudio - ++ lib.optional cecSupport libcec - ++ lib.optional rtmpSupport rtmpdump; - - dontUseCmakeConfigure = true; - - patches = [ ./0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch ]; - - preConfigure = '' - substituteInPlace xbmc/linux/LinuxTimezone.cpp \ - --replace 'usr/share/zoneinfo' 'etc/zoneinfo' - ./bootstrap - ''; - - configureFlags = [ - "--enable-external-libraries" - ] - ++ lib.optional (! sambaSupport) "--disable-samba" - ++ lib.optional vdpauSupport "--enable-vdpau" - ++ lib.optional pulseSupport "--enable-pulse" - ++ lib.optional rtmpSupport "--enable-rtmp"; - - postInstall = '' - for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p \ - --prefix PATH ":" "${pythonFull}/bin" \ - --prefix PATH ":" "${glxinfo}/bin" \ - --prefix PATH ":" "${xdpyinfo}/bin" \ - --prefix LD_LIBRARY_PATH ":" "${curl}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${systemd}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${libmad}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${libcec}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${rtmpdump}/lib" - done - ''; - - meta = with stdenv.lib; { - homepage = http://xbmc.org/; - description = "Media center"; - license = stdenv.lib.licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.iElectric maintainers.titanous ]; - }; -} diff --git a/pkgs/applications/video/xbmc/plugins.nix b/pkgs/applications/video/xbmc/plugins.nix deleted file mode 100644 index f1d4d50f37d..00000000000 --- a/pkgs/applications/video/xbmc/plugins.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ stdenv, fetchFromGitHub, xbmc }: - -let - - pluginDir = "/lib/xbmc/plugin"; - - mkXBMCPlugin = { plugin, namespace, version, src, meta, ... }: - stdenv.lib.makeOverridable stdenv.mkDerivation rec { - inherit src meta; - name = "xbmc-plugin-${plugin}-${version}"; - passthru = { - xbmcPlugin = pluginDir; - namespace = namespace; - }; - dontStrip = true; - installPhase = '' - d=$out${pluginDir}/${namespace} - mkdir -p $d - sauce="." - [ -d ${namespace} ] && sauce=${namespace} - cp -R $sauce/* $d - ''; - }; - -in -{ - - advanced-launcher = mkXBMCPlugin rec { - - plugin = "advanced-launcher"; - namespace = "plugin.program.advanced.launcher"; - version = "2.5.7"; - - src = fetchFromGitHub { - owner = "Angelscry"; - repo = namespace; - rev = "f6f7980dc66d041e1635bb012d79aa8b3a8790ba"; - sha256 = "0wk41lpd6fw504q5x1h76hc99vw4jg4vq44bh7m21ism85ds0r47"; - }; - - meta = with stdenv.lib; { - homepage = "http://forum.xbmc.org/showthread.php?tid=85724"; - description = "A program launcher for XBMC"; - longDescription = '' - Advanced Launcher allows you to start any Linux, Windows and - OS X external applications (with command line support or not) - directly from the XBMC GUI. Advanced Launcher also give you - the possibility to edit, download (from Internet resources) - and manage all the meta-data (informations and images) related - to these applications. - ''; - platforms = platforms.all; - maintainers = with maintainers; [ edwtjo ]; - }; - - }; - - genesis = mkXBMCPlugin rec { - - plugin = "genesis"; - namespace = "plugin.video.genesis"; - version = "2.1.3"; - - src = fetchFromGitHub { - owner = "lambda81"; - repo = "lambda-xbmc-addons"; - rev = "f8aa34064bf31fffbb3c264af32c66bbdaf0a59e"; - sha256 = "0d197fd6n3m9knpg38frnmfhqyabvh00ridpmikyw4vzk3hx11km"; - }; - - meta = with stdenv.lib; { - homepage = "http://forums.tvaddons.ag/forums/148-lambda-s-xbmc-addons"; - description = "The origins of streaming"; - platforms = platforms.all; - maintainers = with maintainers; [ edwtjo ]; - }; - - }; - - svtplay = mkXBMCPlugin rec { - - plugin = "svtplay"; - namespace = "plugin.video.svtplay"; - version = "4.0.9"; - - src = fetchFromGitHub { - owner = "nilzen"; - repo = "xbmc-" + plugin; - rev = "29a754e49584d1ca32f0c07b87304669cf266bb0"; - sha256 = "0k7mwaknw4h1jlq7ialbzgxxpb11j8bk29dx2gimp40lvnyw4yhz"; - }; - - meta = with stdenv.lib; { - homepage = "http://forum.xbmc.org/showthread.php?tid=67110"; - description = "Watch content from SVT Play"; - longDescription = '' - With this addon you can stream content from SVT Play - (svtplay.se). The plugin fetches the video URL from the SVT - Play website and feeds it to the XBMC video player. HLS (m3u8) - is the preferred video format by the plugin. - ''; - platforms = platforms.all; - maintainers = with maintainers; [ edwtjo ]; - }; - - }; - -} \ No newline at end of file diff --git a/pkgs/applications/video/xbmc/wrapper.nix b/pkgs/applications/video/xbmc/wrapper.nix deleted file mode 100644 index 90413c1769a..00000000000 --- a/pkgs/applications/video/xbmc/wrapper.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, lib, makeWrapper, xbmc, plugins }: - -let - - p = builtins.parseDrvName xbmc.name; - -in - -stdenv.mkDerivation { - - name = "xbmc-" + p.version; - version = p.version; - - buildInputs = [ makeWrapper ]; - - buildCommand = '' - mkdir -p $out/share/xbmc/addons/packages - ${stdenv.lib.concatMapStrings - (plugin: "ln -s ${plugin.out - + plugin.xbmcPlugin - + "/" + plugin.namespace - } $out/share/xbmc/addons/.;") plugins} - $(for plugin in ${xbmc}/share/xbmc/addons/* - do - $(ln -s $plugin/ $out/share/xbmc/addons/.) - done) - $(for share in ${xbmc}/share/xbmc/* - do - $(ln -s $share $out/share/xbmc/.) - done) - $(for passthrough in icons xsessions applications - do - ln -s ${xbmc}/share/$passthrough $out/share/ - done) - $(for exe in xbmc{,-standalone} - do - makeWrapper ${xbmc}/bin/$exe $out/bin/$exe \ - --prefix XBMC_HOME : $out/share/xbmc; - done) - ''; - - preferLocalBuilds = true; - - meta = with xbmc.meta; { - inherit license homepage; - description = description - + " (with plugins: " - + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) plugins)) - + ")"; - - }; - -} \ No newline at end of file diff --git a/pkgs/applications/video/zdfmediathk/default.nix b/pkgs/applications/video/zdfmediathk/default.nix index 74a203dc919..06342075182 100644 --- a/pkgs/applications/video/zdfmediathk/default.nix +++ b/pkgs/applications/video/zdfmediathk/default.nix @@ -5,7 +5,7 @@ with stdenv; mkDerivation rec { version = "9"; - name = "zdfmediathk"; + name = "zdfmediathk-${version}"; src = fetchurl { url = "http://downloads.sourceforge.net/project/zdfmediathk/Mediathek/Mediathek%209/MediathekView_${version}.zip"; sha256 = "1wff0igr33z9p1mjw7yvb6658smdwnp22dv8klz0y8qg116wx7a4"; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index af0d5c7fffb..842985dce5b 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -14,7 +14,7 @@ with stdenv.lib; let buildType = "release"; - version = "4.3.24"; # changes ./guest-additions as well + version = "4.3.26"; # changes ./guest-additions as well forEachModule = action: '' for mod in \ @@ -35,13 +35,13 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "98716"; + extpackRevision = "98988"; extensionPack = requireFile rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; # IMPORTANT: Hash must be base16 encoded because it's used as an input to # VBoxExtPackHelperApp! # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.10/SHA256SUMS - sha256 = "c6b61774e323b70da0d4f5677ef56f1c53990eccef859d3c720d814f98a01f8d"; + sha256 = "4e39a6d0da23799a31c3f6a4022b144ef3ddfe30c523e51b21bf7d9ebade62ce"; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) by downloading the related binaries from: @@ -60,7 +60,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "e2123c9b6100fdd52a9b436fe29aa7215fce17c26904583977c1160b11b170cc"; + sha256 = "e2949c250a1de30997e658de9e3d8545e71318a9844d80536137d76db4f08961"; }; buildInputs = diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 56fe2b1083c..e63f69ca230 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "df4385aaa80f322ee2acda0657a53d9ca5c489e695ee5f9776574b67c649c960"; + sha256 = "c5e46533a6ff8df177ed5c9098624f6cec46ca392bab16de2017195580088670"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; diff --git a/pkgs/applications/virtualization/virtualbox/hardened.patch b/pkgs/applications/virtualization/virtualbox/hardened.patch index aad9171b68e..3df41228ae5 100644 --- a/pkgs/applications/virtualization/virtualbox/hardened.patch +++ b/pkgs/applications/virtualization/virtualbox/hardened.patch @@ -60,19 +60,21 @@ index 2760306..0ce6c92 100644 * * The way this work is that it will spawn a detached / backgrounded / diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp -index c39d2f7..cd19186 100644 +index c39d2f7..896b352 100644 --- a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp +++ b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp -@@ -1415,7 +1415,7 @@ static int supR3HardenedVerifyFsObject(PCSUPR3HARDENEDFSOBJSTATE pFsObjState, bo +@@ -1415,18 +1415,19 @@ static int supR3HardenedVerifyFsObject(PCSUPR3HARDENEDFSOBJSTATE pFsObjState, bo NOREF(fRelaxed); #else NOREF(fRelaxed); - bool fBad = true; + bool fBad = !(fDir && pFsObjState->Stat.st_mode & S_ISVTX && !suplibHardenedStrCmp(pszPath, "/nix/store")); #endif - if (fBad) +- if (fBad) ++ if (fBad && suplibHardenedStrCmp(pszPath, "/nix/store")) return supR3HardenedSetError3(VERR_SUPLIB_WRITE_NON_SYS_GROUP, pErrInfo, -@@ -1424,9 +1424,10 @@ static int supR3HardenedVerifyFsObject(PCSUPR3HARDENEDFSOBJSTATE pFsObjState, bo + "An unknown (and thus untrusted) group has write access to '", pszPath, + "' and we therefore cannot trust the directory content or that of any subdirectory"); } /* diff --git a/pkgs/applications/window-managers/stumpwm/contrib.nix b/pkgs/applications/window-managers/stumpwm/contrib.nix deleted file mode 100644 index dc707983811..00000000000 --- a/pkgs/applications/window-managers/stumpwm/contrib.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchgit }: - -let - tag = "0.9.8"; -in - -stdenv.mkDerivation rec { - name = "stumpwmContrib-${tag}"; - - src = fetchgit { - url = "https://github.com/stumpwm/stumpwm"; - rev = "refs/tags/${tag}"; - sha256 = "0a0lwwlly4hlmb30bk6dmi6bsdsy37g4crvv1z24gixippyv1qzm"; - }; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out/bin - cp -a $src/contrib $out/ - cp -a $src/contrib/stumpish $out/bin - ''; - - meta = with stdenv.lib; { - description = "Extension modules for the StumpWM"; - homepage = https://github.com/stumpwm/; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ _1126 ]; - platforms = platforms.linux; - }; -} \ No newline at end of file diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 3ed68412b37..fe62b8250ae 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -1,46 +1,75 @@ -{ stdenv, pkgs, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4, makeWrapper, stumpwmContrib }: +{ stdenv, pkgs, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4 +, makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop +, extraModulePaths ? [] }: let - tag = "0.9.9"; + version = "0.9.9"; + contrib = (fetchgit { + url = "https://github.com/stumpwm/stumpwm-contrib.git"; + rev = "e139885fffcedaeba4b263e4575daae4364cad52"; + sha256 = "fe75bb27538a56f2d213fb21e06a8983699e129a10da7014ddcf6eed5cd965f8"; + }); in - stdenv.mkDerivation rec { - name = "stumpwm-${tag}"; + name = "stumpwm-${version}"; - src = fetchgit { - url = "https://github.com/stumpwm/stumpwm"; - rev = "refs/tags/${tag}"; - sha256 = "05fkng2wlmhy3kb9zhrrv9zpa16g2p91p5y0wvmwkppy04cw04ps"; - }; + src = fetchgit { + url = "https://github.com/stumpwm/stumpwm"; + rev = "refs/tags/${version}"; + sha256 = "05fkng2wlmhy3kb9zhrrv9zpa16g2p91p5y0wvmwkppy04cw04ps"; + }; - buildInputs = [ texinfo4 autoconf lispPackages.clx lispPackages.cl-ppcre sbcl makeWrapper stumpwmContrib ]; + buildInputs = [ + texinfo4 makeWrapper autoconf + sbcl + lispPackages.clx + lispPackages.cl-ppcre + xdpyinfo + ]; - phases = [ "unpackPhase" "preConfigurePhase" "configurePhase" "installPhase" ]; + # NOTE: The patch needs an update for the next release. + # `(stumpwm:set-module-dir "@MODULE_DIR@")' needs to be in it. + patches = [ ./fix-module-path.patch ]; - preConfigurePhase = '' - $src/autogen.sh - mkdir -pv $out/bin - ''; + # Stripping destroys the generated SBCL image + dontStrip = true; - configurePhase = '' - ./configure --prefix=$out --with-contrib-dir=${stumpwmContrib}/contrib - ''; + configurePhase = '' + ./autogen.sh + ./configure --prefix=$out --with-module-dir=$out/share/stumpwm/modules + ''; - installPhase = '' - make - make install - # For some reason, stumpwmContrib is not retained as a runtime - # dependency (probably because $out/bin/stumpwm is compressed or - # obfuscated in some way). Thus we add an explicit reference here. - mkdir $out/nix-support - echo ${stumpwmContrib} > $out/nix-support/stumpwm-contrib - ''; + preBuild = '' + cp -r --no-preserve=mode ${contrib} modules + ''; + + installPhase = '' + mkdir -pv $out/bin + make install + + mkdir -p $out/share/stumpwm/modules + cp -r modules/* $out/share/stumpwm/modules/ + for d in ${stdenv.lib.concatStringsSep " " extraModulePaths}; do + cp -r --no-preserve=mode "$d" $out/share/stumpwm/modules/ + done + + # Copy stumpish; + cp $out/share/stumpwm/modules/util/stumpish/stumpish $out/bin/ + chmod +x $out/bin/stumpish + wrapProgram $out/bin/stumpish \ + --prefix PATH ":" "${rlwrap}/bin:${gnused}/bin:${gnugrep}/bin:${coreutils}/bin:${xprop}/bin" + + # Paths in the compressed image $out/bin/stumpwm are not + # recognized by Nix. Add explicit reference here. + mkdir $out/nix-support + echo ${xdpyinfo} > $out/nix-support/xdpyinfo + ''; meta = with stdenv.lib; { description = "A tiling window manager for X11"; homepage = https://github.com/stumpwm/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ _1126 ]; + maintainers = with maintainers; [ _1126 the-kenny ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/stumpwm/fix-module-path.patch b/pkgs/applications/window-managers/stumpwm/fix-module-path.patch new file mode 100644 index 00000000000..79bfaad3dec --- /dev/null +++ b/pkgs/applications/window-managers/stumpwm/fix-module-path.patch @@ -0,0 +1,16 @@ +diff --git a/make-image.lisp.in b/make-image.lisp.in +index 121e9d6..2210242 100644 +--- a/make-image.lisp.in ++++ b/make-image.lisp.in +@@ -2,7 +2,10 @@ + + (load "load-stumpwm.lisp") + +-#-ecl (stumpwm:set-module-dir "@CONTRIB_DIR@") ++(setf asdf::*immutable-systems* ++ (uiop:list-to-hash-set (asdf:already-loaded-systems))) ++ ++#-ecl (stumpwm:set-module-dir "@MODULE_DIR@") + + #+sbcl + (sb-ext:save-lisp-and-die "stumpwm" :toplevel (lambda () diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index f8130b423a2..cb6059e00cd 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -92,4 +92,4 @@ in (postprocess (let super = defaults self // args self; self = super // extension self super; in self)); -} \ No newline at end of file +} diff --git a/pkgs/build-support/fetchgitlocal/default.nix b/pkgs/build-support/fetchgitlocal/default.nix index 04e6aafc8a1..43fc4b1179d 100644 --- a/pkgs/build-support/fetchgitlocal/default.nix +++ b/pkgs/build-support/fetchgitlocal/default.nix @@ -1,6 +1,19 @@ -{ runCommand, git }: src: +{ runCommand, git, nix }: src: -runCommand "local-git-export" {} '' +let hash = import (runCommand "head-hash.nix" + { dummy = builtins.currentTime; + preferLocalBuild = true; } +'' + cd ${toString src} + (${git}/bin/git show && ${git}/bin/git diff) > $out + hash=$(${nix}/bin/nix-hash $out) + echo "\"$hash\"" > $out +''); in + +runCommand "local-git-export" + { dummy = hash; + preferLocalBuild = true; } +'' cd ${toString src} mkdir -p "$out" for file in $(${git}/bin/git ls-files); do diff --git a/pkgs/build-support/fetchurl/gnome.nix b/pkgs/build-support/fetchurl/gnome.nix deleted file mode 100644 index 258b11d850e..00000000000 --- a/pkgs/build-support/fetchurl/gnome.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ fetchurl }: - -{ project, major, minor, patchlevel ? null, extension ? "bz2", sha256 }: - -let - baseVersion = "${major}.${minor}"; - version = baseVersion + (if patchlevel != null then ".${patchlevel}" else ""); - name = "${project}-${version}"; -in - -(fetchurl { - url = "mirror://gnome/sources/${project}/${baseVersion}/${name}.tar.${extension}"; - inherit sha256; -}) // { - inherit major minor patchlevel baseVersion version; - pkgname = name; -} diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index 7bafd78d76a..e82792be033 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -50,14 +50,14 @@ let "GRKERNSEC_CONFIG_SERVER y"; grsecVirtCfg = - if cfg.config.virtualisationConfig == "none" then + if cfg.config.virtualisationConfig == null then "GRKERNSEC_CONFIG_VIRT_NONE y" else if cfg.config.virtualisationConfig == "host" then "GRKERNSEC_CONFIG_VIRT_HOST y" else "GRKERNSEC_CONFIG_VIRT_GUEST y"; - grsecHwvirtCfg = if cfg.config.virtualisationConfig == "none" then "" else + grsecHwvirtCfg = if cfg.config.virtualisationConfig == null then "" else if cfg.config.hardwareVirtualisation == true then "GRKERNSEC_CONFIG_VIRT_EPT y" else @@ -66,7 +66,7 @@ let grsecVirtswCfg = let virtCfg = opt: "GRKERNSEC_CONFIG_VIRT_"+opt+" y"; in - if cfg.config.virtualisationConfig == "none" then "" + if cfg.config.virtualisationConfig == null then "" else if cfg.config.virtualisationSoftware == "xen" then virtCfg "XEN" else if cfg.config.virtualisationSoftware == "kvm" then virtCfg "KVM" else if cfg.config.virtualisationSoftware == "vmware" then virtCfg "VMWARE" diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c index 4afed3add75..4e0a8245ac1 100644 --- a/pkgs/build-support/libredirect/libredirect.c +++ b/pkgs/build-support/libredirect/libredirect.c @@ -102,3 +102,10 @@ int __xstat(int ver, const char * path, struct stat * st) char buf[PATH_MAX]; return __xstat_real(ver, rewrite(path, buf), st); } + +int * access(const char * path, int mode) +{ + int * (*access_real) (const char *, int mode) = dlsym(RTLD_NEXT, "access"); + char buf[PATH_MAX]; + return access_real(rewrite(path, buf), mode); +} diff --git a/pkgs/data/fonts/symbola/default.nix b/pkgs/data/fonts/symbola/default.nix index 478c72a865c..d70fe3ca3f8 100644 --- a/pkgs/data/fonts/symbola/default.nix +++ b/pkgs/data/fonts/symbola/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "symbola-7.19"; + name = "symbola-7.21"; src = fetchurl { url = "http://users.teilar.gr/~g1951d/Symbola.zip"; - sha256 = "1g7ngcxffrb9vqnmb0w9jmp349f48s0gsbi69b3g108vs8cacrmd"; + sha256 = "0sqmvq8c8wn4xq0p25gd2jfyjqi8jhiycqah19wzq1gqkaaw94nq"; }; docs_pdf = fetchurl { url = "http://users.teilar.gr/~g1951d/Symbola.pdf"; - sha256 = "16f37fsi2zyy3ka409g3m5d9c09l0ba3rqkz912j90p4588dvk85"; + sha256 = "0jjjydb6c0glfb6krvdyi9kh5bsx9gz5w66j378bdqgkrvspl0d2"; }; buildInputs = [ unzip ]; diff --git a/pkgs/data/misc/geolite-legacy/builder.sh b/pkgs/data/misc/geolite-legacy/builder.sh new file mode 100644 index 00000000000..1886d144e48 --- /dev/null +++ b/pkgs/data/misc/geolite-legacy/builder.sh @@ -0,0 +1,19 @@ +#!/bin/sh -e + +source "$stdenv/setup" + +mkdir -p $out/share/GeoIP +cd $out/share/GeoIP + +# Iterate over all environment variable names beginning with "src": +for var in "${!src@}"; do + # Store the value of the variable with name $var in $src: + eval src="\$$var" + + # Copy $src to current directory, removing Nix hash from the filename: + dest="${src##*/}" + dest="${dest#*-}" + cp "$src" "$dest" +done + +gunzip -v *.gz diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix new file mode 100644 index 00000000000..c36e6f83106 --- /dev/null +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl }: + +# 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. +let version = "2015-03-26"; in +stdenv.mkDerivation { + name = "geolite-legacy-${version}"; + + srcGeoIP = fetchurl { + url = https://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz; + sha256 = "01xw896n9wcm1pv7sixfbh4gv6isl6m1i6lwag1c2bbcx6ci1zvr"; + }; + srcGeoIPv6 = fetchurl { + url = https://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz; + sha256 = "07l10hd7fkgk1nbw5gx4hjp61kdqqgri97fidn78dlk837rb02d0"; + }; + srcGeoLiteCity = fetchurl { + url = https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz; + sha256 = "1xqjyz9xnga3dvhj0f38hf78wv781jflvqkxm6qni3sj781nfr4a"; + }; + srcGeoLiteCityv6 = fetchurl { + url = https://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz; + sha256 = "03s41ffc5a13qy5kgx8jqya97jkw2qlvdkak98hab7xs0i17z9pd"; + }; + srcGeoIPASNum = fetchurl { + url = https://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz; + sha256 = "1h766l8dsfgzlrz0q76877xksaf5qf91nwnkqwb6zl1gkczbwy6p"; + }; + srcGeoIPASNumv6 = fetchurl { + url = https://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz; + sha256 = "0dwi9b3amfpmpkknf9ipz2r8aq05gn1j2zlvanwwah3ib5cgva9d"; + }; + + meta = with stdenv.lib; { + description = "GeoLite Legacy IP geolocation databases"; + homepage = https://geolite.maxmind.com/download/geoip; + license = with licenses; cc-by-sa-30; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + builder = ./builder.sh; +} diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index cc676d0b35d..6adb4575839 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://sethwklein.net/projects/iana-etc/; description = "IANA protocol and port number assignments (/etc/protocols and /etc/services)"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index 45f29496f62..754a3ce68f6 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurlGnome, pkgconfig, glib, libIDL, libintlOrEmpty }: +{ stdenv, fetchurl, pkgconfig, glib, libIDL, libintlOrEmpty }: stdenv.mkDerivation rec { - name = src.pkgname; - - src = fetchurlGnome { - project = "ORBit2"; - major = "2"; minor = "14"; patchlevel = "19"; + name = "ORBit2-${minVer}.19"; + minVer = "2.14"; + + src = fetchurl { + url = "mirror://gnome/sources/ORBit2/${minVer}/${name}.tar.bz2"; sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam"; }; diff --git a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix b/pkgs/desktops/gnome-2/platform/gconfmm/default.nix index 045f60e8b60..356d4df9d1d 100644 --- a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/gconfmm/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurlGnome, pkgconfig, GConf, gtkmm, glibmm }: +{ stdenv, fetchurl, pkgconfig, GConf, gtkmm, glibmm }: stdenv.mkDerivation rec { - name = src.pkgname; + name = "gconfmm-${minVer}.3"; + minVer = "2.28"; - src = fetchurlGnome { - project = "gconfmm"; - major = "2"; minor = "28"; patchlevel = "3"; extension = "bz2"; + src = fetchurl { + url = "mirror://gnome/sources/gconfmm/${minVer}/${name}.tar.bz2"; sha256 = "a5e0092bb73371a3ca76b2ecae794778f3a9409056fee9b28ec1db072d8e6108"; }; - nativeBuildInputs = [pkgconfig]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ GConf gtkmm glibmm ]; diff --git a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix index dba47b6e541..6cb8ff336a0 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, fetchurlGnome, which }: +{ stdenv, fetchurl, which }: stdenv.mkDerivation rec { - name = src.pkgname; + name = "gnome-common-${minVer}.0"; + minVer = "2.34"; - src = fetchurlGnome { - project = "gnome-common"; - major = "2"; minor = "34"; patchlevel = "0"; + src = fetchurl { + url = "mirror://gnome/sources/gnome-common/${minVer}/${name}.tar.bz2"; sha256 = "1pz13mpp09q5s3bikm8ml92s1g0scihsm4iipqv1ql3mp6d4z73s"; }; diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index dd8b7822858..69223393060 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurlGnome, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib +{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib , glib, fam, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: stdenv.mkDerivation rec { - name = src.pkgname; + name = "gnome-vfs-${minVer}.4"; + minVer = "2.24"; - src = fetchurlGnome { - project = "gnome-vfs"; - major = "2"; minor = "24"; patchlevel = "4"; + src = fetchurl { + url = "mirror://gnome/sources/gnome-vfs/${minVer}/${name}.tar.bz2"; sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2"; }; diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix index 4ce51844a51..bf09bd93eeb 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurlGnome, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf }: +{ stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf }: stdenv.mkDerivation rec { - name = src.pkgname; + name = "gtkglextmm-${minVer}.0"; + minVer = "1.2"; - src = fetchurlGnome { - project = "gtkglextmm"; - major = "1"; minor = "2"; patchlevel = "0"; extension = "bz2"; + src = fetchurl { + url = "mirror://gnome/sources/gtkglextmm/${minVer}/${name}.tar.bz2"; sha256 = "6cd4bd2a240e5eb1e3a24c5a3ebbf7ed905b522b888439778043fdeb58771fea"; }; diff --git a/pkgs/desktops/gnome-2/platform/libIDL/default.nix b/pkgs/desktops/gnome-2/platform/libIDL/default.nix index 73b4fb9cc49..1fc78002606 100644 --- a/pkgs/desktops/gnome-2/platform/libIDL/default.nix +++ b/pkgs/desktops/gnome-2/platform/libIDL/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurlGnome, flex, bison, pkgconfig, glib, gettext}: +{stdenv, fetchurl, flex, bison, pkgconfig, glib, gettext}: stdenv.mkDerivation rec { - name = src.pkgname; + name = "libIDL-${minVer}.14"; + minVer = "0.8"; - src = fetchurlGnome { - project = "libIDL"; - major = "0"; minor = "8"; patchlevel = "14"; + src = fetchurl { + url = "mirror://gnome/sources/libIDL/${minVer}/${name}.tar.bz2"; sha256 = "08129my8s9fbrk0vqvnmx6ph4nid744g5vbwphzkaik51664vln5"; }; diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix index d9867f25a4c..add013e64cd 100644 --- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurlGnome, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt +{ stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt , intltool, ORBit2, procps }: stdenv.mkDerivation rec { - name = src.pkgname; - - src = fetchurlGnome { - project = "libbonobo"; - major = "2"; minor = "32"; patchlevel = "1"; + name = "libbonobo-${minVer}.1"; + minVer = "2.32"; + + src = fetchurl { + url = "mirror://gnome/sources/libbonobo/${minVer}/${name}.tar.bz2"; sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i"; }; diff --git a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix index 00a0c4763a1..efdc28aac42 100644 --- a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurlGnome, bison, pkgconfig, popt, libxml2, gtk, libtool +{ stdenv, fetchurl, bison, pkgconfig, popt, libxml2, gtk, libtool , intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }: stdenv.mkDerivation rec { - name = src.pkgname; - - src = fetchurlGnome { - project = "libbonoboui"; - major = "2"; minor = "24"; patchlevel = "5"; + name = "libbonoboui-${minVer}.5"; + minVer = "2.24"; + + src = fetchurl { + url = "mirror://gnome/sources/libbonoboui/${minVer}/${name}.tar.bz2"; sha256 = "1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index edcd868b2f3..4612e6aee6f 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurlGnome, pkgconfig, glib, popt, zlib, libcanberra +{ stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra , intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool, libogg }: stdenv.mkDerivation rec { - name = src.pkgname; + name = "libgnome-${minVer}.1"; + minVer = "2.32"; - src = fetchurlGnome { - project = "libgnome"; - major = "2"; minor = "32"; patchlevel = "1"; + src = fetchurl { + url = "mirror://gnome/sources/libgnome/${minVer}/${name}.tar.bz2"; sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix index 8a1b7706409..8c12754f112 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurlGnome, pkgconfig, gtk, intltool, libart_lgpl, libglade }: +{ stdenv, fetchurl, pkgconfig, gtk, intltool, libart_lgpl, libglade }: stdenv.mkDerivation rec { - name = src.pkgname; - - src = fetchurlGnome { - project = "libgnomecanvas"; - major = "2"; minor = "30"; patchlevel = "3"; + name = "libgnomecanvas-${minVer}.3"; + minVer = "2.30"; + + src = fetchurl { + url = "mirror://gnome/sources/libgnomecanvas/${minVer}/${name}.tar.bz2"; sha256 = "0h6xvswbqspdifnyh5pm2pqq55yp3kn6yrswq7ay9z49hkh7i6w5"; }; - + buildInputs = [ libglade ]; nativeBuildInputs = [ pkgconfig intltool ]; propagatedBuildInputs = [ libart_lgpl gtk ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index 125a4507275..d230d19d588 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurlGnome, pkgconfig, libxml2, xlibs, glib, pango +{ stdenv, fetchurl, pkgconfig, libxml2, xlibs, glib, pango , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool , gnome_vfs, libgnome_keyring, libglade }: stdenv.mkDerivation rec { - name = src.pkgname; - - src = fetchurlGnome { - project = "libgnomeui"; - major = "2"; minor = "24"; patchlevel = "5"; + name = "libgnomeui-${minVer}.5"; + minVer = "2.24"; + + src = fetchurl { + url = "mirror://gnome/sources/libgnomeui/${minVer}/${name}.tar.bz2"; sha256 = "03rwbli76crkjl6gp422wrc9lqpl174k56cp9i96b7l8jlj2yddf"; }; - + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ xlibs.xlibs libxml2 GConf pango glib libgnome_keyring libglade libtool ]; diff --git a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix index 8a89425a696..5779b6d0480 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1xzmw9n9zbkaasl8xi7s5h49wiv5dq4qf8hr2pzjkack3ai5j6gk"; }; - buildInputs = [ pkgconfig atk cairo glib gtk3 pango + propagatedBuildInputs = [ gtk3 ]; + + buildInputs = [ pkgconfig atk cairo glib pango libxml2Python perl intltool gettext ]; preBuild = '' diff --git a/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix index e5f6a0aa9b8..1875c1491f9 100644 --- a/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 glib ]; meta = with stdenv.lib; { - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix index 13ea6bb391c..f3de70e10a1 100644 --- a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace src/libtracker-sparql/Makefile.am --replace "shared-library=" "shared-library=$out/lib/" + sed -i -e 's,glib/poppler.h,poppler.h,' src/tracker-extract/tracker-extract-pdf.c ''; buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2 diff --git a/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch b/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch index f0811d335a7..7436b6112d5 100644 --- a/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch +++ b/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch @@ -1,13 +1,16 @@ ---- smokegen-4.10.5.orig/CMakeLists.txt 2013-06-28 17:14:50.000000000 +0000 -+++ smokegen-4.10.5/CMakeLists.txt 2013-07-31 19:15:17.000000000 +0000 -@@ -36,6 +36,10 @@ - set (CMAKE_SKIP_BUILD_RPATH FALSE) - set (CMAKE_SKIP_RPATH FALSE) - +diff -Naur smokegen-4.14.3-upstream/CMakeLists.txt smokegen-4.14.3/CMakeLists.txt +--- smokegen-4.14.3-upstream/CMakeLists.txt 2014-09-15 13:23:01.000000000 -0430 ++++ smokegen-4.14.3/CMakeLists.txt 2015-03-29 16:41:59.295598992 -0430 +@@ -32,9 +32,9 @@ + type.cpp + ) + +-# force RPATH so that the binary is usable from within the build tree +-set (CMAKE_SKIP_BUILD_RPATH FALSE) +-set (CMAKE_SKIP_RPATH FALSE) +# add the automatically determined parts of the RPATH +# which point to directories outside the build tree to the install RPATH -+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -+ ++set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY ) - - add_executable(smokegen ${generator_SRC}) \ No newline at end of file + diff --git a/pkgs/desktops/kde-4.14/kdegraphics/okular.nix b/pkgs/desktops/kde-4.14/kdegraphics/okular.nix index 092833388a7..de7b7799993 100644 --- a/pkgs/desktops/kde-4.14/kdegraphics/okular.nix +++ b/pkgs/desktops/kde-4.14/kdegraphics/okular.nix @@ -1,11 +1,11 @@ -{ stdenv, chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2 +{ stdenv, chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, poppler_qt4, qca2 , qimageblitz, libtiff, kactivities, pkgconfig, libkexiv2 }: kde { # TODO: package activeapp, qmobipocket - buildInputs = [ kdelibs chmlib djvulibre ebook_tools libspectre popplerQt4 + buildInputs = [ kdelibs chmlib djvulibre ebook_tools libspectre poppler_qt4 qca2 qimageblitz libtiff kactivities libkexiv2 ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix b/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix index 48f535549ce..6068516ba2b 100644 --- a/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix +++ b/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix @@ -1,8 +1,8 @@ -{ stdenv, kde, kdelibs, pkgconfig, doxygen, popplerQt4, taglib, exiv2, ffmpeg }: +{ stdenv, kde, kdelibs, pkgconfig, doxygen, poppler_qt4, taglib, exiv2, ffmpeg }: kde { buildInputs = [ - kdelibs popplerQt4 taglib exiv2 ffmpeg + kdelibs poppler_qt4 taglib exiv2 ffmpeg ]; nativeBuildInputs = [ pkgconfig doxygen ]; diff --git a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix index d90e1455ce9..526ac069e61 100644 --- a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix +++ b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix @@ -1,4 +1,4 @@ -{ stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4 +{ stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, poppler_qt4 , pkgconfig, doxygen, ebook_tools }: @@ -8,7 +8,7 @@ kde { buildInputs = [ kdelibs soprano shared_desktop_ontologies taglib exiv2 ffmpeg - popplerQt4 ebook_tools + poppler_qt4 ebook_tools ]; nativeBuildInputs = [ pkgconfig doxygen ]; diff --git a/pkgs/desktops/plasma-5.2/default.nix b/pkgs/desktops/plasma-5.2/default.nix index 0b70e816c20..d399c64afae 100644 --- a/pkgs/desktops/plasma-5.2/default.nix +++ b/pkgs/desktops/plasma-5.2/default.nix @@ -38,7 +38,7 @@ let { LibBlueDevil = pkgs.libbluedevil; PolkitQt5-1 = pkgs.polkit_qt5.override { inherit qt5; }; - PopplerQt5 = (pkgs.poppler.override { inherit qt5; }).poppler_qt5; + PopplerQt5 = pkgs.poppler_qt5.override { inherit qt5; }; } // # packages from nixpkgs (with pkgs; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 86d4aa30267..0958ce7b1c9 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -15,10 +15,12 @@ , libelf # optional, for link-time optimizations (LTO) , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null -, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null +, zip ? null, unzip ? null, pkgconfig ? null +, gtk ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null +, x11Support ? langJava , gnatboot ? null , enableMultilib ? false , enablePlugin ? true # whether to support user-supplied plug-ins @@ -91,7 +93,7 @@ let version = "4.8.4"; xproto renderproto xextproto inputproto randrproto ]; - javaAwtGtk = langJava && gtk != null; + javaAwtGtk = langJava && x11Support; /* Platform flags */ platformFlags = let @@ -200,7 +202,7 @@ let version = "4.8.4"; in # We need all these X libraries when building AWT with GTK+. -assert gtk != null -> (filter (x: x == null) xlibs) == []; +assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; diff --git a/pkgs/development/compilers/ghc/7.10.1.nix b/pkgs/development/compilers/ghc/7.10.1.nix index 629ac69d36f..5bec1fa3f55 100644 --- a/pkgs/development/compilers/ghc/7.10.1.nix +++ b/pkgs/development/compilers/ghc/7.10.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }: +{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv }: let @@ -13,6 +13,13 @@ let ''} ''; + # We patch Cabal for GHCJS. See: https://github.com/haskell/cabal/issues/2454 + # This should be removed when GHC includes Cabal > 1.22.2.0 + cabalPatch = fetchpatch { + url = https://github.com/haskell/cabal/commit/f11b7c858bb25be78b81413c69648c87c446859e.patch; + sha256 = "1z56yyc7lgc78g847qf19f5n1yk054pzlnc2i178dpsj0mgjppyb"; + }; + in stdenv.mkDerivation rec { @@ -28,9 +35,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # We patch Cabal for GHCJS. See: https://github.com/haskell/cabal/issues/2454 + postPatch = '' + pushd libraries/Cabal + patch -p1 < ${cabalPatch} + popd + ''; + preConfigure = '' - sed -i 's/HcPkg.useSingleFileDb = .*/HcPkg.useSingleFileDb = False/' libraries/Cabal/Cabal/Distribution/Simple/GHCJS.hs echo >mk/build.mk "${buildMK}" sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 4cde21dbcc2..45bb4342088 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -17,14 +17,14 @@ let in stdenv.mkDerivation rec { - version = "7.11.20150118"; + version = "7.11.20150402"; name = "ghc-${version}"; - rev = "6ff3db92140e3ac8cbda50d1a4aab976350ac8c4"; + rev = "47f821a1a24553dc29b9581b1a259a9b1394c955"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "1a1r3nw7x5rd8563770zcg1phm55vi3sxs2zwr91ik026n8jjba6"; + sha256 = "111a2z6bgn966g04a9n2ns9n2a401rd0zqgndznn2w4fv8a4qzgj"; }; postUnpack = '' diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix new file mode 100644 index 00000000000..5d9ca621648 --- /dev/null +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchurl, pkgconfig, libtool, zip, libffi, libsigsegv, readline, gmp, +gnutls, gnome, cairo, SDL, sqlite, emacsSupport ? false, emacs ? null }: + +assert emacsSupport -> (emacs != null); + +let # The gnu-smalltalk project has a dependency to the libsigsegv library. + # The project ships with sources for this library, but deprecated this option. + # Using the vanilla libsigsegv library results in error: "cannot relocate [...]" + # Adding --enable-static=libsigsegv to the gnu-smalltalk configuration flags + # does not help, the error still occurs. The only solution is to build a + # shared version of libsigsegv. + libsigsegv-shared = stdenv.lib.overrideDerivation libsigsegv (oldAttrs: { + configureFlags = [ "--enable-shared" ]; + }); + +in stdenv.mkDerivation rec { + + version = "3.2.5"; + name = "gnu-smalltalk-${version}"; + + src = fetchurl { + url = "mirror://gnu/smalltalk/smalltalk-${version}.tar.xz"; + sha256 = "1k2ssrapfzhngc7bg1zrnd9n2vyxp9c9m70byvsma6wapbvib6l1"; + }; + + # The dependencies and their justification are explained at + # http://smalltalk.gnu.org/download + buildInputs = [ + pkgconfig libtool zip libffi libsigsegv-shared readline gmp gnutls gnome.gtk + cairo SDL sqlite + ] + ++ stdenv.lib.optional emacsSupport emacs; + + configureFlags = stdenv.lib.optional (!emacsSupport) "--without-emacs"; + + installFlags = stdenv.lib.optional emacsSupport "lispdir=$(out)/share/emacs/site-lisp"; + + # For some reason the tests fail if executated with nix-build, but pass if + # executed within nix-shell --pure. + doCheck = false; + + meta = with stdenv.lib; { + description = "A free implementation of the Smalltalk-80 language"; + longDescription = '' + GNU Smalltalk is a free implementation of the Smalltalk-80 language. It + runs on most POSIX compatible operating systems (including GNU/Linux, of + course), as well as under Windows. Smalltalk is a dynamic object-oriented + language, well-versed to scripting tasks. + ''; + homepage = http://smalltalk.gnu.org/; + license = with licenses; [ gpl2 lgpl2 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ skeidel ]; + }; +} diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index e38c37360f0..72bdabb4349 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { gmp libyaml libedit libvpx imagemagick fribidi ]; - enableParallelBuilding = true; + enableParallelBuilding = false; dontUseCmakeBuildDir = true; NIX_LDFLAGS = "-lpam -L${pam}/lib"; MYSQL_INCLUDE_DIR="${mariadb}/include/mysql"; diff --git a/pkgs/development/compilers/llvm/3.4/dragonegg.nix b/pkgs/development/compilers/llvm/3.4/dragonegg.nix index 8704d996424..2ebdc10654b 100644 --- a/pkgs/development/compilers/llvm/3.4/dragonegg.nix +++ b/pkgs/development/compilers/llvm/3.4/dragonegg.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric shlevy]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index 8137b2a3ab3..a9e0dd89e84 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -6,10 +6,10 @@ let in stdenv.mkDerivation rec { name = "mono-${version}"; - version = "3.8.0"; + version = "3.12.1"; src = fetchurl { url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2"; - sha256 = "0jraxsjn7ra6z02n4wjpbj21mxm2w50iqviqvfl0ajikbxahvf3i"; + sha256 = "03dn68vignknzxy1rx75p16qx1ild27hixgvr5mw0j19mx9z332x"; }; buildInputs = [bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib]; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { homepage = http://mono-project.com/; description = "Cross platform, open source .NET development framework"; platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice ]; + maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz ]; license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ? }; } diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 32a73b68d5e..d76a59c8dec 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.2.9"; + version = "1.2.10"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0pws10ylnsxj17dagqcdv0l36k3ax5k3hkc6c91n9yxh2nziagk0"; + sha256 = "11gn25knjk0zdyi3s6w0blcnrxjgyj4iifg5h07pv2r7hm83s92m"; }; buildInputs = [ which ] diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index b3a29a1e1c7..aa8ea9012c1 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -1,29 +1,30 @@ { stdenv, fetchurl }: let - version = "110.76"; + version = "110.78"; baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}"; sources = map fetchurl [ - { url = "${baseurl}/config.tgz"; sha256 = "0mx5gib1jq5hl3j6gvkkfh60x2hx146xiisclaz4jgy452ywikj1"; } - { url = "${baseurl}/cm.tgz"; sha256 = "14y1pqqw5p5va3rvpk2jddx2gcm37z5hwp5zdm43z02afscq37jk"; } - { url = "${baseurl}/compiler.tgz"; sha256 = "10gn7cwqzbnh4k3l6brb9hp59k9vz2m9fcaarv2fw1gilfw5a9rj"; } - { url = "${baseurl}/runtime.tgz"; sha256 = "0zqajizayzrlrxm47q492mqgfxya7rwqrq4faafai8qfwga6q27n"; } - { url = "${baseurl}/system.tgz"; sha256 = "0dys0f0cdgnivk1niam9g736c3mzrjf9r29051g0579an8yi8slg"; } - { url = "${baseurl}/MLRISC.tgz"; sha256 = "00n1zk65cwf2kf669mn09lp0ya6bfap1czhyq0nfza409vm4v54x"; } - { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "1mx1vjxbpfgcq6fkmh2qirjfqzn3wcnjf4a9ijr7k2bwgnh99sc1"; } - { url = "${baseurl}/ckit.tgz"; sha256 = "1fqdxs2cgzffj0i9rmzv1aljwnhx98hyvj3c2kivw3ligxp4wly4"; } - { url = "${baseurl}/nlffi.tgz"; sha256 = "08dmvs95xmbas3hx7n0csxxl0d0bmhxg7gav1ay02gy9n8iw3g87"; } - { url = "${baseurl}/cml.tgz"; sha256 = "1qc1hs2k2xmn03ldyz2zf0pzbryd1n4bwix226ch8z9pnfimglyb"; } - { url = "${baseurl}/eXene.tgz"; sha256 = "01z69rgmshh694wkcwrzi72z5d5glpijj7mqxb17yz106xyzmgim"; } - { url = "${baseurl}/ml-lpt.tgz"; sha256 = "13gw4197ivzvd6qcbg5pzclhv1f2jy2c433halh021d60qjv4w4r"; } - { url = "${baseurl}/ml-lex.tgz"; sha256 = "0sqa533zca1l7p79qhkb7lspvhk4k2r3839745sci32fzwy1804x"; } - { url = "${baseurl}/ml-yacc.tgz"; sha256 = "1kzi0dpybd9hkklk460mgbwfkixjhav225kkmwnk3jxby3zgflci"; } - { url = "${baseurl}/ml-burg.tgz"; sha256 = "0kjrba8l0v6jn3g6gv9dvrklpvxx9x57b7czwnrrd33pi28sv7fm"; } - { url = "${baseurl}/pgraph.tgz"; sha256 = "174n22m7zibgk68033qql86kyk6mxjni4j0kcadafs0g2xmh6i6z"; } - { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "1pq4wwx5ad7zx1306ka06lqwnjv446zz6ndpq6s9ak6ha79f2s9p"; } - { url = "${baseurl}/heap2asm.tgz"; sha256 = "0p91fzwkfr7hng7c026gy5ggl5l9isxpm007iq6ivpjrfjy547wc"; } - { url = "${baseurl}/smlnj-c.tgz"; sha256 = "0vra4gi91w0cjsw3rm162hgz5xsqbr7yds44q7zhs27kccsirpqc"; } - { url = "${baseurl}/boot.x86-unix.tgz"; sha256 = "0qcvdhlvpr02c1ssk4jz6175lb9pkdg7zrfscqz6f7crnsgmc5nx"; } + { url = "${baseurl}/config.tgz"; sha256 = "018c6iflpm3im6679via1wshw2sls4jgiqrc30pqkb80kfrh1pg2"; } + { url = "${baseurl}/cm.tgz"; sha256 = "0id37j6lj4b3qczn4949gvc8hys9j3h7nk9kc9fxv4rv1g7i328x"; } + { url = "${baseurl}/compiler.tgz"; sha256 = "1m299lzc8l9mixb2l9scvilz27v16db3igzwca19alsrvldnmpg2"; } + { url = "${baseurl}/runtime.tgz"; sha256 = "1pwbv1bnh8dz4w62cx19c56z4y57krbpr1ziayyycg7lj44pb7sy"; } + { url = "${baseurl}/system.tgz"; sha256 = "1jdilm3wcjxcnnbd3g8rcd1f5nsb5ffzfjqcsdcpqd9mnx81fca9"; } + { url = "${baseurl}/MLRISC.tgz"; sha256 = "0ibqwkkqd4c62p3q1jbgqyh7k78sms01igl7ibk6jyrhy9n7vw0v"; } + { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "1lxnwp8q3xw0wqqrv3hlk3fjancrfz862fy9j504s38ljhdjc3jr"; } + { url = "${baseurl}/ckit.tgz"; sha256 = "1nqw40vjxy40ckif5d480g5mf7b91lmwcs7m689gs9n2dj3gbwnp"; } + { url = "${baseurl}/nlffi.tgz"; sha256 = "1cks1xifb32wya2flw7h7cvcdnkxv7ngk8y7xv29888r7xbdr3h0"; } + { url = "${baseurl}/cml.tgz"; sha256 = "0qfaj6vsagsnh9di94cxvn77f91zfwsnn95rz8ig5dz5zmq77ghz"; } + { url = "${baseurl}/eXene.tgz"; sha256 = "1nlkb2y48m702qplxkqphvb9nbj433300j7yrdbsj39j6vvp8pmw"; } + { url = "${baseurl}/ml-lpt.tgz"; sha256 = "02b2gdl1qdwilhls3ssa04wcyg3aswndn1bh85008rqj85ppddiq"; } + { url = "${baseurl}/ml-lex.tgz"; sha256 = "0l1sddd5wfpqgmyw1g3iwv2p27fbkpjkm10db2qd2pid9r95dxz5"; } + { url = "${baseurl}/ml-yacc.tgz"; sha256 = "0ln790ydb43sxbjjymbd6jnnzfygrc0lr50k81p5cazzzy1yfim6"; } + { url = "${baseurl}/ml-burg.tgz"; sha256 = "03anyy2gdkgfprmahx489hxg9zjh9lydq3gkzrlyw51yzvgp3f92"; } + { url = "${baseurl}/pgraph.tgz"; sha256 = "19hbcav11a6fv0xmzgin0v5dl4m08msk1vsmw26kpqiqkvkh7j39"; } + { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "0awssg3vgj3sp85kdfjcp28zaq815zr55k9z6v79zs9gll02ghlk"; } + { url = "${baseurl}/heap2asm.tgz"; sha256 = "1vkmxbm6x37l1wqvilvvw662pdvg6mkbvcfvya8ggsihz4c1z0jg"; } + { url = "${baseurl}/smlnj-c.tgz"; sha256 = "08b8acd5vwhz1gg7960rha00qhwk7l7p01vvgwzmdiqlcd3fcj1d"; } + { url = "${baseurl}/doc.tgz"; sha256 = "1pbsvc8nmnjwq239wrylb209drr4xv9a66r0fjm126b6nw1slrbq"; } + { url = "${baseurl}/boot.x86-unix.tgz"; sha256 = "19wd273k4ldnxndq6cqr7xv387ynbviz6jlgxmlld7nxf549kn5a"; } ]; in stdenv.mkDerivation { name = "smlnj-${version}"; @@ -53,14 +54,17 @@ in stdenv.mkDerivation { mkdir -pv $out cp -rv bin lib $out - for i in $out/bin/*; do + cd $out/bin + for i in *; do sed -i "2iSMLNJ_HOME=$out/" $i done ''; meta = { description = "Standard ML of New Jersey, a compiler"; - homepage = http://smlnj.org; - license = stdenv.lib.licenses.bsd3; + homepage = http://smlnj.org; + license = stdenv.lib.licenses.bsd3; + platforms = [ "i686-linux" ]; + maintainers = stdenv.lib.maintainers.thoughtpolice; }; } diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix index ce3f805bec3..d2b9ec63a73 100644 --- a/pkgs/development/compilers/uhc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -5,13 +5,13 @@ let wrappedGhc = ghcWithPackages ( self: [hashable mtl network uhc-util uulib] ); in stdenv.mkDerivation rec { - version = "1.1.8.7"; + version = "1.1.8.10"; name = "uhc-${version}"; src = fetchgit { url = "https://github.com/UU-ComputerScience/uhc.git"; - rev = "0dec07e9cb60e78bbca63fc101f8fec6e249269f"; - sha256 = "0isz3qz23ihbn0rg54x8ddzwpsqlmmpkvaa66b7srfly7nciv8gl"; + rev = "449d9578e06af1362d7f746798f0aed57ab6ca88"; + sha256 = "0f8abhl9idbc2qlnb7ynrb11yvm3y07vksyzs1yg6snjvlhfj5az"; }; postUnpack = "sourceRoot=\${sourceRoot}/EHC"; @@ -41,6 +41,13 @@ in stdenv.mkDerivation rec { homepage = "http://www.cs.uu.nl/wiki/UHC"; description = "Utrecht Haskell Compiler"; maintainers = [ maintainers.phausmann ]; - platforms = stdenv.lib.platforms.unix; + + # UHC i686 support is broken, see + # https://github.com/UU-ComputerScience/uhc/issues/52 + # + # Darwin build is broken as well at the moment. + # On Darwin, the GNU libtool is used, which does not + # support the -static flag and thus breaks the build. + platforms = ["x86_64-linux"]; }; } diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 71271ee7ed8..6d5b49da066 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { '' export CC="${stdenv.cc}/bin/gcc"; export CCARGS="-I$out/include \ - -L${mysql}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib"; + -L${mysql.lib}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib"; export PGHEADER="${postgresql}/include/libpq-fe.h"; - export MSHEADER="${mysql}/include/mysql/mysql.h"; + export MSHEADER="${mysql.lib}/include/mysql/mysql.h"; export SQHEADER="${sqlite}/include/sqlite3.h"; ''; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bf26413103a..e8e2119b5c7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -26,16 +26,13 @@ self: super: { hslua = super.hslua.override { lua = pkgs.lua5_1; }; # Use the default version of mysql to build this package (which is actually mariadb). - mysql = super.mysql.override { inherit (pkgs) mysql; }; + mysql = super.mysql.override { mysql = pkgs.mysql.lib; }; # Please also remove optparse-applicative special case from # cabal2nix/hackage2nix.hs when removing the following. elm-make = super.elm-make.override { optparse-applicative = self.optparse-applicative_0_10_0; }; elm-package = super.elm-package.override { optparse-applicative = self.optparse-applicative_0_10_0; }; - # https://github.com/acid-state/safecopy/issues/17 - safecopy = dontCheck super.safecopy; - # Link the proper version. zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; }; @@ -65,7 +62,25 @@ self: super: { al = appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL"; # Depends on code distributed under a non-free license. + accelerate-cublas = dontDistribute super.accelerate-cublas; + accelerate-cuda = dontDistribute super.accelerate-cuda; + accelerate-cufft = dontDistribute super.accelerate-cufft; + accelerate-examples = dontDistribute super.accelerate-examples; + accelerate-fft = dontDistribute super.accelerate-fft; + accelerate-fourier-benchmark = dontDistribute super.accelerate-fourier-benchmark; + AttoJson = markBroken super.AttoJson; bindings-yices = dontDistribute super.bindings-yices; + cublas = dontDistribute super.cublas; + cufft = dontDistribute super.cufft; + gloss-accelerate = dontDistribute super.gloss-accelerate; + gloss-raster-accelerate = dontDistribute super.gloss-raster-accelerate; + GoogleTranslate = dontDistribute super.GoogleTranslate; + GoogleDirections = dontDistribute super.GoogleDirections; + libnvvm = dontDistribute super.libnvvm; + manatee-all = dontDistribute super.manatee-all; + manatee-ircclient = dontDistribute super.manatee-ircclient; + Obsidian = dontDistribute super.Obsidian; + patch-image = dontDistribute super.patch-image; yices = dontDistribute super.yices; yices-easy = dontDistribute super.yices-easy; yices-painless = dontDistribute super.yices-painless; @@ -97,8 +112,10 @@ self: super: { # Cannot compile its own test suite: https://github.com/haskell/network-uri/issues/10. network-uri = dontCheck super.network-uri; + # Agda-2.4.2.2 needs these overrides to compile. + Agda = super.Agda.override { equivalence = self.equivalence_0_2_5; cpphs = self.cpphs_1_18_9; }; + # The Haddock phase fails for one reason or another. - Agda = dontHaddock super.Agda; attoparsec-conduit = dontHaddock super.attoparsec-conduit; blaze-builder-conduit = dontHaddock super.blaze-builder-conduit; bytestring-progress = dontHaddock super.bytestring-progress; @@ -170,15 +187,16 @@ self: super: { ''; }); - # Does not compile: . - base_4_7_0_2 = markBroken super.base_4_7_0_2; + # Does not compile: "fatal error: ieee-flpt.h: No such file or directory" + base_4_8_0_0 = markBroken super.base_4_8_0_0; # Obsolete: https://github.com/massysett/prednote/issues/1. prednote-test = markBrokenVersion "0.26.0.4" super.prednote-test; - # Doesn't compile: . - integer-gmp_0_5_1_0 = markBroken super.integer-gmp_0_5_1_0; + # Doesn't compile: "Setup: can't find include file ghc-gmp.h" + integer-gmp_1_0_0_0 = markBroken super.integer-gmp_1_0_0_0; + # Obsolete. lushtags = markBrokenVersion "0.0.1" super.lushtags; # https://github.com/haskell/bytestring/issues/41 @@ -197,6 +215,13 @@ self: super: { glib = addBuildDepends super.glib [pkgs.pkgconfig pkgs.glib]; gtk3 = super.gtk3.override { inherit (pkgs) gtk3; }; gtk = addBuildDepends super.gtk [pkgs.pkgconfig pkgs.gtk]; + gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; }; + + # Need WebkitGTK, not just webkit. + webkit = super.webkit.override { webkit = pkgs.webkitgtk24x; }; + webkitgtk3 = super.webkitgtk3.override { webkit = pkgs.webkitgtk24x; }; + webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; }; + websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; }; # https://github.com/jgm/zip-archive/issues/21 zip-archive = addBuildTool super.zip-archive pkgs.zip; @@ -237,6 +262,7 @@ self: super: { hakyll = dontCheck super.hakyll; Hclip = dontCheck super.Hclip; HList = dontCheck super.HList; + marquise = dontCheck super.marquise; # https://github.com/anchor/marquise/issues/69 memcached-binary = dontCheck super.memcached-binary; persistent-zookeeper = dontCheck super.persistent-zookeeper; pocket-dns = dontCheck super.pocket-dns; @@ -430,15 +456,26 @@ self: super: { # https://github.com/bos/snappy/issues/1 snappy = dontCheck super.snappy; - # Needs llvm to compile. - bytestring-arbitrary = addBuildTool super.bytestring-arbitrary self.llvm; - # Expect to find sendmail(1) in $PATH. mime-mail = appendConfigureFlag super.mime-mail "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\""; # Help the test suite find system timezone data. tz = overrideCabal super.tz (drv: { preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; }); + # Deprecated upstream and doesn't compile. + BASIC = dontDistribute super.BASIC; + bytestring-arbitrary = dontDistribute (addBuildTool super.bytestring-arbitrary self.llvm); + llvm = dontDistribute super.llvm; + llvm-base = markBroken super.llvm-base; + llvm-base-util = dontDistribute super.llvm-base-util; + llvm-extra = dontDistribute super.llvm-extra; + llvm-tf = dontDistribute super.llvm-tf; + objectid = dontDistribute super.objectid; + saltine-quickcheck = dontDistribute super.saltine-quickcheck; + stable-tree = dontDistribute super.stable-tree; + synthesizer-llvm = dontDistribute super.synthesizer-llvm; + optimal-blocks = dontDistribute super.optimal-blocks; + # https://ghc.haskell.org/trac/ghc/ticket/9625 vty = dontCheck super.vty; @@ -577,6 +614,8 @@ self: super: { # Build fails, but there seems to be no issue tracker available. :-( hmidi = markBrokenVersion "0.2.1.0" super.hmidi; padKONTROL = markBroken super.padKONTROL; + Bang = dontDistribute super.Bang; + launchpad-control = dontDistribute super.launchpad-control; # Upstream provides no issue tracker and no contact details. vivid = markBroken super.vivid; @@ -584,6 +623,12 @@ self: super: { # Test suite wants to connect to $DISPLAY. hsqml = dontCheck (super.hsqml.override { qt5 = pkgs.qt53; }); + # https://github.com/lookunder/RedmineHs/issues/4 + Redmine = markBroken super.Redmine; + + # HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence) + unlambda = dontHyperlinkSource super.unlambda; + # https://github.com/megantti/rtorrent-rpc/issues/1 rtorrent-rpc = markBroken super.rtorrent-rpc; @@ -596,6 +641,9 @@ self: super: { # https://github.com/junjihashimoto/test-sandbox-compose/issues/2 test-sandbox-compose = dontCheck super.test-sandbox-compose; + # https://github.com/jgm/pandoc/issues/2045 + pandoc = dontCheck super.pandoc; + # Broken by GLUT update. Monadius = markBroken super.Monadius; @@ -603,10 +651,6 @@ self: super: { haroonga = markBroken super.haroonga; haroonga-httpd = markBroken super.haroonga-httpd; - # Cannot find pkg-config data for "webkit-1.0". - webkit = markBroken super.webkit; - websnap = markBroken super.websnap; - # Build is broken and no contact info available. hopenpgp-tools = markBroken super.hopenpgp-tools; @@ -629,6 +673,7 @@ self: super: { # https://github.com/meteficha/Hipmunk/issues/8 Hipmunk = markBroken super.Hipmunk; HipmunkPlayground = dontDistribute super.HipmunkPlayground; + click-clack = dontDistribute super.click-clack; # https://github.com/prowdsponsor/esqueleto/issues/93 esqueleto = dontCheck super.esqueleto; @@ -639,11 +684,6 @@ self: super: { # https://github.com/fumieval/audiovisual/issues/1 audiovisual = markBroken super.audiovisual; - # https://github.com/cdupont/Nomyx/issues/85 - Nomyx-Core = markBroken super.Nomyx-Core; - Nomyx-Web = dontDistribute super.Nomyx-Web; - Nomyx = dontDistribute super.Nomyx; - # https://github.com/alephcloud/hs-stm-queue-extras/issues/2 stm-queue-extras = overrideCabal super.stm-queue-extras (drv: { editedCabalFile = null; }); @@ -652,6 +692,28 @@ self: super: { postUnpack = "rm -v ${drv.pname}-${drv.version}/Setup.hs"; }); + # https://github.com/haskell/haddock/issues/378 + haddock-library = dontCheck super.haddock-library; + + # Already fixed in upstream darcs repo. + xmonad-contrib = overrideCabal super.xmonad-contrib (drv: { + patchPhase = '' + sed -i -e '24iimport Control.Applicative' XMonad/Util/Invisible.hs + sed -i -e '22iimport Control.Applicative' XMonad/Hooks/DebugEvents.hs + ''; + }); + + # https://github.com/anton-k/csound-expression-dynamic/issues/1 + csound-expression-dynamic = dontHaddock super.csound-expression-dynamic; + + # Hardcoded include path + poppler = overrideCabal super.poppler (drv: { + patchPhase = '' + sed -i -e 's,glib/poppler.h,poppler.h,' poppler.cabal + sed -i -e 's,glib/poppler.h,poppler.h,' Graphics/UI/Gtk/Poppler/Structs.hsc + ''; + }); + } // { # Not on Hackage. @@ -660,8 +722,8 @@ self: super: { version = "20150318"; src = pkgs.fetchgit { url = "http://github.com/NixOS/cabal2nix.git"; - rev = "d131b2b2db1bc37a10bbc40c3adea3f006633a5e"; - sha256 = "0s92mdkgjqkqby6b1lrxs5dh9ja49sj5jpdc56g5v8g03h3g9m0a"; + rev = "b56cc6de2c4900fb0d1dc3617591a2f536aca60d"; + sha256 = "0pza9j3x1mfjqrzcqq6ndg0jiqx85mg0sw8n9fmq18fk5g4hzhis"; deepClone = true; }; isLibrary = false; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 82566d2a8db..d93b84be004 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -33,6 +33,107 @@ self: super: { unix = null; xhtml = null; + # should be fixed in versions > 0.6 + pandoc-citeproc = overrideCabal super.pandoc-citeproc (drv: { + patches = [ + (pkgs.fetchpatch { + url = "https://github.com/jgm/pandoc-citeproc/commit/4e4f9c2.patch"; + sha256 = "18b08k56g5q4zz6jxczkrddblyn52vmd0811n1icfdpzqhgykn4p"; + }) + (pkgs.fetchpatch { + url = "https://github.com/jgm/pandoc-citeproc/commit/34cc147.patch"; + sha256 = "09vrdvg5w14qckn154zlxvk6i2ikmmhpsl9mxycxkql3rl4dqam3"; + }) + (pkgs.fetchpatch { + url = "https://github.com/jgm/pandoc-citeproc/commit/8242c70.patch"; + sha256 = "1lqpwxzz2www81w4mym75z36bsavqfj67hyvzn20ffvxq42yw7ry"; + }) + (pkgs.fetchpatch { + url = "https://github.com/jgm/pandoc-citeproc/commit/e59f88d.patch"; + sha256 = "05699hj3qa2vrfdnikj7rzmc2ajrkd7p8yd4cjlhmqq9asq90xzb"; + }) + (pkgs.fetchpatch { + url = "https://github.com/jgm/pandoc-citeproc/commit/ae6ca86.patch"; + sha256 = "19cag39k5s7iqagpvss9c2ny5g0lwnrawaqcc0labihc1a181k8l"; + }) + (pkgs.fetchpatch { + url = "https://github.com/jgm/pandoc-citeproc/commit/f5a9fc7.patch"; + sha256 = "08lsinh3mkjpz3cqj5i1vcnzkyl07jp38qcjcwcw7m2b7gsjbpvm"; + }) + (pkgs.fetchpatch { + url = "https://github.com/jgm/pandoc-citeproc/commit/780a554.patch"; + sha256 = "1kfn0mcp3vp32c9w8gyz0p0jv0xn90as9mxm8a2lmjng52jlzvy4"; + }) + ]; + }); + + # should be fixed in versions > 1.13.2 + pandoc = overrideCabal super.pandoc (drv: { + patches = [ + (pkgs.fetchpatch { + url = "https://github.com/jgm/pandoc/commit/693f9ab.patch"; + sha256 = "1niyrigs47ia1bhk6yrnzf0sq7hz5b7xisc8ph42wkp5sl8x9h1y"; + }) + (pkgs.fetchpatch { + url = "https://github.com/jgm/pandoc/commit/9c68017.patch"; + sha256 = "0zccb6l5vmfyq7p8ii88fgggfhrff32hj43f5pp3w88l479f1qlh"; + }) + (pkgs.fetchpatch { + url = "https://github.com/jgm/pandoc/commit/dbe1b38.patch"; + sha256 = "0d80692liyjx2y56w07k23adjcxb57w6vzcylmc4cfswzy8agrgy"; + }) + (pkgs.fetchpatch { + url = "https://github.com/jgm/pandoc/commit/5ea3856.patch"; + sha256 = "1z15lc0ix9fv278v1xmfw3a6gl85ydahgs8kz61sfvh4jdiacabw"; + }) + (pkgs.fetchpatch { + url = "https://github.com/jgm/pandoc/commit/c80c9ac.patch"; + sha256 = "0fk3j53zx0x88jmh0ism0aghs2w5qf87zcp9cwbfcgg5izh3b344"; + }) + (pkgs.fetchpatch { + url = "https://github.com/jgm/pandoc/commit/8b9bded.patch"; + sha256 = "0f1dh1jmhq55mlv4dawvx3ck330y82qmys06bfkqcpl0jsyd9x1a"; + }) + (pkgs.fetchpatch { + url = "https://github.com/jgm/pandoc/commit/e4c7894.patch"; + sha256 = "1rfdaq6swrl3m9bmbf6yhqq57kv3l3f4927xya3zq29dpvkmmi4z"; + }) + (pkgs.fetchpatch { + url = "https://github.com/jgm/pandoc/commit/2a6f68f.patch"; + sha256 = "0sbh2x9jqvis9ln8r2dr6ihkjdn480mjskm4ny91870vg852228c"; + }) + (pkgs.fetchpatch { + url = "https://github.com/jgm/pandoc/commit/4e3281c.patch"; + sha256 = "0zafhxxijli2mf1h0j7shp7kd7fxqbvlswm1m8ikax3aknvjxymi"; + }) + (pkgs.fetchpatch { + url = "https://github.com/jgm/pandoc/commit/cd5b1fe.patch"; + sha256 = "0nxq7c0gpdiycgdrcj3llbfwxdni6k7hqqniwsbn2ha3h03i8hg1"; + }) + (pkgs.fetchpatch { + url = "https://github.com/jgm/pandoc/commit/ed7606d.patch"; + sha256 = "0gchm46ziyj7vw6ibn3kk49cjzsc78z2lm8k7892g79q2livlc1f"; + }) + (pkgs.fetchpatch { + url = "https://github.com/jgm/pandoc/commit/b748833.patch"; + sha256 = "03gj4qn9c5zyqrxyrw4xh21xlvbx9rbvw6gh8msgf5xk53ibs68b"; + }) + (pkgs.fetchpatch { + url = "https://github.com/jgm/pandoc/commit/10d5398.patch"; + sha256 = "1nhp5b07vywk917bfap6pzahhqnwvvlbbfg5336a2nvb0c8iq6ih"; + }) + (pkgs.fetchpatch { + url = "https://github.com/jgm/pandoc/commit/f18ceb1.patch"; + sha256 = "1vxsy5fn4nscvim9wcx1n78q7yh05x0z8p812csi3v3z79lbabhq"; + }) + ]; + # jailbreak-cabal omits part of the file + # https://github.com/peti/jailbreak-cabal/issues/9 + postPatch = '' + sed -i '420i\ \ \ \ \ \ \ \ \ \ \ \ buildable: False' pandoc.cabal + ''; + }); + # Cabal_1_22_1_1 requires filepath >=1 && <1.4 cabal-install = dontCheck (super.cabal-install.override { Cabal = null; }); @@ -107,7 +208,6 @@ self: super: { # but refused to do anything about it because he "doesn't want to # support a moving target". Go figure. barecheck = doJailbreak super.barecheck; - cartel = overrideCabal super.cartel (drv: { doCheck = false; patchPhase = "sed -i -e 's|base >= .*|base|' cartel.cabal"; }); syb-with-class = appendPatch super.syb-with-class (pkgs.fetchpatch { url = "https://github.com/seereason/syb-with-class/compare/adc86a9...719e567.patch"; @@ -132,19 +232,6 @@ self: super: { haskell-src-meta = overrideCabal (doJailbreak (appendPatch super.haskell-src-meta ./haskell-src-meta-ghc710.patch)) (drv: { prePatch = "sed -i -e 's|template-haskell [^,]\\+|template-haskell|' haskell-src-meta.cabal && cat haskell-src-meta.cabal"; }); - foldl = appendPatch super.foldl (pkgs.fetchpatch { - url = "https://github.com/Gabriel439/Haskell-Foldl-Library/pull/30.patch"; - sha256 = "0q4gs3xkazh644ff7qn2mp2q1nq3jq71x82g7iaacxclkiv0bphx"; - }); - persistent-template = appendPatch super.persistent-template (pkgs.fetchpatch { - url = "https://github.com/yesodweb/persistent/commit/4d34960bc421ec0aa353d69fbb3eb0c73585db97.patch"; - sha256 = "1gphl0v87y2fjwkwp6j0bnksd0d9dr4pis6aw97rij477bm5mrvw"; - stripLen = 1; - }); - stringsearch = appendPatch super.stringsearch (pkgs.fetchpatch { - url = "https://bitbucket.org/api/2.0/repositories/dafis/stringsearch/pullrequests/3/patch"; - sha256 = "1j2a327m3bjl8k4dipc52nlh2ilg94gdcj9hdmdq62yh2drslvgx"; - }); mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch { url = "https://github.com/snoyberg/mono-traversable/pull/68.patch"; sha256 = "11hqf6hi3sc34wl0fn4rpigdf7wfklcjv6jwp8c3129yphg8687h"; @@ -153,14 +240,9 @@ self: super: { url = "https://github.com/fpco/conduit-combinators/pull/16.patch"; sha256 = "0jpwpi3shdn5rms3lcr4srajbhhfp5dbwy7pl23c9kmlil3d9mk3"; }); - wai-extra = appendPatch super.wai-extra (pkgs.fetchpatch { - url = "https://github.com/yesodweb/wai/pull/339.patch"; - sha256 = "1rmz1ijfch143v7jg4d5r50lqq9r46zhcmdafq8p9g9pjxlyc590"; - stripLen = 1; - }); - yesod-auth = appendPatch super.yesod-auth (pkgs.fetchpatch { - url = "https://github.com/yesodweb/yesod/pull/941.patch"; - sha256 = "1fycvjfr1l9wa03k30bnppl3ns99lffh9kmp9r7sr8b6yiydcajq"; + yesod-bin = appendPatch super.yesod-bin (pkgs.fetchpatch { + url = "https://github.com/yesodweb/yesod/pull/966.patch"; + sha256 = "0mm4swyn7qh30hw7ya8ykz5qvsd4ni4vmipq364yqbsi9ysrc6nb"; stripLen = 1; }); 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 d853e9265ba..5285484d2ff 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -70,4 +70,7 @@ self: super: { contravariant = addBuildDepend super.contravariant self.tagged; reflection = dontHaddock (addBuildDepend super.reflection self.tagged); + # The compat library is empty in the presence of mtl 2.2.x. + mtl-compat = dontHaddock super.mtl-compat; + } 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 e53ea6fc4c8..e9bdec89bd0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -43,15 +43,20 @@ self: super: { # Configure build for mtl 2.1.x. mtl-compat = addBuildDepend (enableCabalFlag super.mtl-compat "two-point-one") self.transformers-compat; + # haddock-api 2.16 requires ghc>=7.10 + haddock-api = super.haddock-api_2_15_0_2; + # Idris requires mtl 2.2.x. idris = overrideCabal (super.idris.overrideScope (self: super: { mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; }); + blaze-markup = self.blaze-markup_0_6_2_0; + blaze-html = self.blaze-html_0_7_0_3; + haskeline = self.haskeline_0_7_2_1; + lens = self.lens_4_7_0_1; + mtl = super.mtl_2_2_1; transformers = super.transformers_0_4_3_0; transformers-compat = disableCabalFlag super.transformers-compat "three"; - haskeline = self.haskeline_0_7_2_1; - mtl = super.mtl_2_2_1; })) (drv: { - jailbreak = true; # idris is scared of lens 4.7 patchPhase = "find . -name '*.hs' -exec sed -i -s 's|-Werror||' {} +"; }); # warning: "Module ‘Control.Monad.Error’ is deprecated" @@ -66,12 +71,15 @@ self: super: { # Newer versions require mtl 2.2.x. mtl-prelude = self.mtl-prelude_1_0_3; + equivalence = super.equivalence_0_2_5; # required by Agda # The test suite pulls in mtl 2.2.x command-qq = dontCheck super.command-qq; # Doesn't support GHC < 7.10.x. + bound-gen = dontDistribute super.bound-gen; ghc-exactprint = dontDistribute super.ghc-exactprint; + ghc-typelits-natnormalise = dontDistribute super.ghc-typelits-natnormalise; # Newer versions require transformers 0.4.x. seqid = super.seqid_0_1_0; @@ -101,4 +109,7 @@ self: super: { wai-middleware-preprocessor = dontCheck super.wai-middleware-preprocessor; incremental-computing = dontCheck super.incremental-computing; + # Newer versions require base > 4.7 + gloss = super.gloss_1_9_2_1; + } diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 30109b9a249..baefedf5a74 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -55,8 +55,9 @@ let isGhcjs = ghc.isGhcjs or false; + newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal"; newCabalFile = fetchurl { - url = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal"; + url = newCabalFileUrl; sha256 = editedCabalFile; name = "${pname}-${version}-r${revision}.cabal"; }; @@ -71,7 +72,7 @@ let hasActiveLibrary = isLibrary && (enableStaticLibraries || enableSharedLibraries || enableLibraryProfiling); - enableParallelBuilding = versionOlder "7.8" ghc.version && !hasActiveLibrary; + enableParallelBuilding = versionOlder "7.10" ghc.version || (versionOlder "7.8" ghc.version && !hasActiveLibrary); defaultConfigureFlags = [ "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid" @@ -134,17 +135,17 @@ stdenv.mkDerivation ({ LANG = "en_US.UTF-8"; # GHC needs the locale configured during the Haddock phase. prePatch = optionalString (editedCabalFile != null) '' - echo "Replacing Cabal file with edited version ${newCabalFile}." + echo "Replace Cabal file with edited version from ${newCabalFileUrl}." cp ${newCabalFile} ${pname}.cabal '' + optionalString jailbreak '' - echo "Running jailbreak-cabal to lift version restrictions on build inputs." + echo "Run jailbreak-cabal to lift version restrictions on build inputs." ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal '' + prePatch; setupCompilerEnvironmentPhase = '' runHook preSetupCompilerEnvironment - echo "Building with ${ghc}." + echo "Build with ${ghc}." export PATH="${ghc}/bin:$PATH" ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"} @@ -266,12 +267,6 @@ stdenv.mkDerivation ({ export NIX_GHC_DOCDIR="${ghcEnv}/share/doc/ghc/html" export NIX_GHC_LIBDIR="${ghcEnv}/lib/${ghcEnv.name}" ''; - buildCommand = '' - echo >&2 "" - echo >&2 "*** Haskell 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" - echo >&2 "" - exit 1 - ''; }; }; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 9fa2b6bc12c..2feb9f0326b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -649,7 +649,9 @@ self: { mkDerivation { pname = "Agda"; version = "2.4.2.2"; + revision = "1"; sha256 = "1hxvapnvlkx6imifswc70ng869zll0zfsygivhc2mjyhaiv10i13"; + editedCabalFile = "b604adb3c6609d27384834ce1d9483841245ac3d59e07571bc1ec114a080dcf3"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -904,7 +906,6 @@ self: { homepage = "http://github.com/konn/AttoJSON"; description = "Simple lightweight JSON parser, generator & manipulator based on ByteString"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Attrac" = callPackage @@ -973,7 +974,6 @@ self: { buildDepends = [ base containers llvm random timeit ]; description = "Embedded BASIC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BNFC" = callPackage @@ -1044,7 +1044,6 @@ self: { homepage = "https://github.com/5outh/Bang/"; description = "A Drum Machine DSL for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Barracuda" = callPackage @@ -2069,6 +2068,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Cabal-ide-backend" = callPackage + ({ mkDerivation, array, base, binary, bytestring, Cabal, containers + , deepseq, directory, extensible-exceptions, filepath, HUnit + , old-time, pretty, process, QuickCheck, regex-posix + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , time, unix + }: + mkDerivation { + pname = "Cabal-ide-backend"; + version = "1.23.0.0"; + sha256 = "07s9gkq2d4sz8nrjayrnb3gbjm58sp7gfl3hnl8n1gsxsfbl2cgw"; + buildDepends = [ + array base binary bytestring containers deepseq directory filepath + pretty process time unix + ]; + testDepends = [ + base bytestring Cabal containers directory extensible-exceptions + filepath HUnit old-time process QuickCheck regex-posix + test-framework test-framework-hunit test-framework-quickcheck2 unix + ]; + homepage = "http://www.haskell.org/cabal/"; + description = "A framework for packaging Haskell software"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "CabalSearch" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, HDBC , HDBC-sqlite3, process, unix @@ -2531,6 +2556,18 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "Concurrential" = callPackage + ({ mkDerivation, async, base }: + mkDerivation { + pname = "Concurrential"; + version = "0.1.0.0"; + sha256 = "1fsqqc4nrfaq2r9vvvy7rjkahb92vn0bxyygbygqidbp2pbrfshi"; + buildDepends = [ async base ]; + homepage = "http://github.com/avieth/Concurrential"; + description = "Mix concurrent and sequential computation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Condor" = callPackage ({ mkDerivation, base, binary, Cabal, containers, directory , filepath, glider-nlp, HUnit, text @@ -3516,8 +3553,8 @@ self: { }: mkDerivation { pname = "DocTest"; - version = "0.2.0"; - sha256 = "1jp68chgg0n3wy4ryc0l71ynfv4pmnazxc2a8gfbw7fbbn8898ag"; + version = "0.2.0.1"; + sha256 = "1w9r50cyiz31fn4dmlh3qmmpv9qapxgg70c10a86m6sxdl75q827"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -3595,8 +3632,8 @@ self: { ({ mkDerivation, base, cmdargs, containers, parsec }: mkDerivation { pname = "Dung"; - version = "1.0.0.1"; - sha256 = "12dlx4m3vqyc458bwjlh2i85b8k65wx5panibqc79p2ax5fvf2wz"; + version = "1.1"; + sha256 = "1higdpqg599lfc92m7dd4zy98l9vjg5xr4n4qjv0wifszj8lrsgb"; isLibrary = true; isExecutable = true; buildDepends = [ base cmdargs containers parsec ]; @@ -4917,14 +4954,13 @@ self: { }: mkDerivation { pname = "GLUtil"; - version = "0.8.5"; - sha256 = "1jawv5fhfsxyil6hzg57bnrdcrichg03z239rs23rq31j668pqzv"; + version = "0.8.6"; + sha256 = "15z6l1r4dn8jp5b7awzw16zxd3lh297iwab712ah0dx8m3hk0df3"; buildDepends = [ array base bytestring containers directory filepath JuicyPixels linear OpenGL OpenGLRaw transformers vector ]; buildTools = [ cpphs ]; - jailbreak = true; description = "Miscellaneous OpenGL utilities"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -5039,8 +5075,8 @@ self: { }: mkDerivation { pname = "Gamgine"; - version = "0.4.1"; - sha256 = "180s8ly7i9lg8fyh6p7xkinxrac876938wkyzam9h6ildvik2qdd"; + version = "0.5"; + sha256 = "131pgif3x61agk6an27p33bnqi45zlyiwxivxkxdbzi82wckr0w0"; buildDepends = [ array base bytestring composition cpphs data-lens directory filepath GLFW-b ListZipper mtl OpenGLRaw parsec pretty-show @@ -5319,7 +5355,6 @@ self: { homepage = "https://github.com/favilo/GoogleDirections.git"; description = "Haskell Interface to Google Directions API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GoogleSB" = callPackage @@ -5359,7 +5394,6 @@ self: { buildDepends = [ AttoJson base bytestring dataenc download-curl ]; description = "Interface to Google Translate API"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GotoT-transformers" = callPackage @@ -5783,8 +5817,8 @@ self: { }: mkDerivation { pname = "HDBC"; - version = "2.4.0.0"; - sha256 = "1zwkrr0pbgxi2y75n2sjr3xs8xa3pxbmnqg3phqkjqcz3j4gcq6y"; + version = "2.4.0.1"; + sha256 = "1bfjffn44n8w0bvznjiqm4ckfs28nipachip98f125p784ff4gks"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -5832,8 +5866,8 @@ self: { }: mkDerivation { pname = "HDBC-postgresql"; - version = "2.3.2.2"; - sha256 = "0x42lf429dxjkz22jn5fybimlixxs20zq01ap40344qlwh01hd90"; + version = "2.3.2.3"; + sha256 = "1jv43rv3a0x7b7q5vzp07xffaf690gijx3rqnfv19fk63a7075j3"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -7251,8 +7285,8 @@ self: { }: mkDerivation { pname = "HaTeX"; - version = "3.16.1.0"; - sha256 = "0nnrfqgb0ndi1j3nrbj1alv4cq49prxsv3z5jk84qh6ny6hxm486"; + version = "3.16.1.1"; + sha256 = "0xi89wclnkrl17jl3ymvsvg802aj201m4lp0rg9adgmrrdgz042p"; buildDepends = [ base bytestring containers matrix parsec QuickCheck text transformers wl-pprint-extras @@ -7880,10 +7914,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "HoleyMonoid"; - version = "0.1"; - sha256 = "01gyw3imcn18g005rradgxbsh6b7niqi46914pcvz5cbkhf7whsd"; + version = "0.1.1"; + sha256 = "1z3d80r6w8n7803q52xlp8mzpk87q1pr3mnz6dswp39q3gygr9fr"; buildDepends = [ base ]; - homepage = "http://code.google.com/p/monoid-cont/"; + homepage = "https://github.com/MedeaMelana/HoleyMonoid"; description = "Monoids with holes"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -8143,8 +8177,8 @@ self: { ({ mkDerivation, base, bytestring, HsOpenSSL, unix }: mkDerivation { pname = "HsOpenSSL-x509-system"; - version = "0.1.0.1"; - sha256 = "06i40ng2f0q3rrhp9i30b4q38klf5k9vn1m91b1mpf5hf30iz6qg"; + version = "0.1.0.2"; + sha256 = "16r82d6mk5l1pb0vvc16d1cn5pi4wg9k83y7vr9gl9ackz345jgc"; buildDepends = [ base bytestring HsOpenSSL unix ]; homepage = "https://github.com/redneb/HsOpenSSL-x509-system"; description = "Use the system's native CA certificate store with HsOpenSSL"; @@ -8376,14 +8410,15 @@ self: { }: mkDerivation { pname = "IPv6Addr"; - version = "0.6.0.0"; - sha256 = "1vrvjj3kvlrf8mgfxdz8rs3f0b5my82zncddyqzs8b2sccgiya12"; + version = "0.6.0.1"; + sha256 = "199pgv4y3932i585ak4sa78zvy1w49699lcs18836brvy10b2ch0"; buildDepends = [ attoparsec base iproute network network-info random text ]; testDepends = [ base HUnit test-framework test-framework-hunit text ]; + jailbreak = true; homepage = "https://github.com/MichelBoucey/IPv6Addr"; description = "Library to deal with IPv6 address text representations"; license = stdenv.lib.licenses.gpl3; @@ -8697,8 +8732,8 @@ self: { }: mkDerivation { pname = "JsonGrammar"; - version = "1.0"; - sha256 = "0pw2syqzv0z4l7rvghidp4l7zi006pm49rd9b0pk6hih7jbmar7c"; + version = "1.0.1"; + sha256 = "0y29199vjs1rxpsl0af66696y1awfhslqq30x4ps2ajs9zhhfkn2"; buildDepends = [ aeson attoparsec base bytestring containers hashable language-typescript mtl semigroups stack-prism template-haskell @@ -8708,7 +8743,6 @@ self: { aeson base HUnit language-typescript stack-prism test-framework test-framework-hunit text ]; - jailbreak = true; homepage = "https://github.com/MedeaMelana/JsonGrammar2"; description = "Combinators for bidirectional JSON parsing"; license = stdenv.lib.licenses.bsd3; @@ -8720,8 +8754,8 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.3"; - sha256 = "0nfq6c1kgmw1jj20686bp4rf52vpb8qc3whmz3jh0pwk489b2lwm"; + version = "3.2.3.1"; + sha256 = "1lq0v5z0kr2vbhj7xv07vygb6xqvp49sz8m9c20v394d2p5i2ai1"; buildDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -8842,8 +8876,8 @@ self: { ({ mkDerivation, base, hmatrix }: mkDerivation { pname = "Kalman"; - version = "0.1.0.0"; - sha256 = "0l4z7l90s14z24rlzdpl1rh7vjgpk7adbavza6k3144p1an5rfqp"; + version = "0.1.0.1"; + sha256 = "1mzdaj6h21is3fwnckzq5zcxd4zqahsdppsx65bv5vdplsiadrw5"; buildDepends = [ base hmatrix ]; homepage = "https://github.com/idontgetoutmuch/Kalman"; description = "A slightly extended Kalman filter"; @@ -9066,8 +9100,8 @@ self: { }: mkDerivation { pname = "LambdaHack"; - version = "0.4.100.0"; - sha256 = "15v3aagwsh180603an3wd7rfgbjzgamdw270ciw2m03v8pkg9d28"; + version = "0.4.101.0"; + sha256 = "1ilp54w8659rdbspsz4adw697v06498z9akvylfis3c1am2ja39q"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -9341,10 +9375,8 @@ self: { }: mkDerivation { pname = "ListLike"; - version = "4.1.1"; - revision = "1"; - sha256 = "00xap58zfcwndjnmciff8d65pgb7j08pa9gmpk4cqi50vmphaf5i"; - editedCabalFile = "390eff2095f519c59ac828108509047f29313ca894bc3355e6d79e943a035b50"; + version = "4.2.0"; + sha256 = "1ih0kjr3n576l6abasa8pnjajml27rj8h7nx3kqv2fdm7l6lk6zg"; buildDepends = [ array base bytestring containers dlist fmlist text vector ]; @@ -10014,12 +10046,16 @@ self: { }) {}; "MonadRandom" = callPackage - ({ mkDerivation, base, mtl, random, transformers }: + ({ mkDerivation, base, mtl, random, transformers + , transformers-compat + }: mkDerivation { pname = "MonadRandom"; - version = "0.3.0.1"; - sha256 = "0bbj6rkxskrvl14lngpggql4q41pw21cj4z8h592mizrxjfa3rj0"; - buildDepends = [ base mtl random transformers ]; + version = "0.3.0.2"; + sha256 = "18gajibgypy8hl0slh3lyjjwqqkayxrk7vwwk26nfdkq9yixxbvi"; + buildDepends = [ + base mtl random transformers transformers-compat + ]; description = "Random-number generation monad"; license = "unknown"; }) {}; @@ -10843,7 +10879,6 @@ self: { homepage = "https://github.com/svenssonjoel/Obsidian"; description = "Embedded language for GPU Programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Octree" = callPackage @@ -11026,8 +11061,8 @@ self: { ({ mkDerivation, base, mesa, transformers }: mkDerivation { pname = "OpenGLRaw"; - version = "2.4.0.0"; - sha256 = "09l42mmx49046k29svgckcili0rxcb5pdfq0267bnijgqg0y08m2"; + version = "2.4.1.0"; + sha256 = "0xikg3jvmh1q514r2vnabw6d481h4qj93zpkp157wd155c7b0vjl"; buildDepends = [ base transformers ]; extraLibraries = [ mesa ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; @@ -11926,14 +11961,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "QuickCheck_2_8" = callPackage + "QuickCheck_2_8_1" = callPackage ({ mkDerivation, base, containers, random, template-haskell , test-framework, tf-random, transformers }: mkDerivation { pname = "QuickCheck"; - version = "2.8"; - sha256 = "04xs6mq22bcnkpi616qrbm7jlivh9csnhmvjgp1ifq52an1wr4rx"; + version = "2.8.1"; + sha256 = "0fvnfl30fxmj5q920l13641ar896d53z0z6z66m7c1366lvalwvh"; buildDepends = [ base containers random template-haskell tf-random transformers ]; @@ -12331,8 +12366,8 @@ self: { }: mkDerivation { pname = "Rasterific"; - version = "0.5.1"; - sha256 = "1h3sfgxkr002n4sb0rrc5562mbpwrjndkjl3ab4wfsm5zh6q3gl2"; + version = "0.5.2"; + sha256 = "0d7s2p3lis7mndsjw2v4jkn9s9sicq6dwmg4l3hd361d7paxkqb4"; buildDepends = [ base dlist FontyFruity free JuicyPixels mtl primitive vector vector-algorithms @@ -12359,17 +12394,18 @@ self: { "Redmine" = callPackage ({ mkDerivation, aeson, base, bytestring, connection, containers - , HTTP, http-client-tls, http-conduit, HUnit, MissingH, network - , old-locale, old-time, resourcet, text, time, transformers + , HTTP, http-client-tls, http-conduit, http-types, HUnit, MissingH + , network, old-locale, old-time, resourcet, text, time + , transformers }: mkDerivation { pname = "Redmine"; - version = "0.0.3"; - sha256 = "09bgg4q8140vxb4qv6i9mwj79dbwp8m4zcri6kxwkabb8z4l84hl"; + version = "0.0.6"; + sha256 = "10lq9lhz3yyzkzwbi8rx060hmwh0c8cplydrfzdmd1653x8267z8"; buildDepends = [ aeson base bytestring connection containers HTTP http-client-tls - http-conduit MissingH network old-locale old-time resourcet text - time transformers + http-conduit http-types MissingH network old-locale old-time + resourcet text time transformers ]; testDepends = [ aeson base bytestring connection containers http-client-tls @@ -12401,8 +12437,8 @@ self: { }: mkDerivation { pname = "RefSerialize"; - version = "0.3.1.3"; - sha256 = "0qrca0jismpvjy7i4xx19ljrj72gqcmwqg47a51ykncsvci0fjrm"; + version = "0.3.1.4"; + sha256 = "1hl1jxdarqp59fs1sjvxpyhcazrnlm4iywysgkf3iqm56jfp2f6w"; buildDepends = [ base binary bytestring containers hashtables stringsearch ]; @@ -12736,14 +12772,20 @@ self: { }) {}; "SHA" = callPackage - ({ mkDerivation, array, base, binary, bytestring }: + ({ mkDerivation, array, base, binary, bytestring, directory + , QuickCheck, test-framework, test-framework-quickcheck2 + }: mkDerivation { pname = "SHA"; - version = "1.6.4.1"; - sha256 = "03fwpl8hrl9q197w8v1glqi5g1d51c7hz4m8zi5s8x1yvpbwcfvl"; + version = "1.6.4.2"; + sha256 = "134ajm87fm4lpsw86m9q8apv20dw4bpk46raa389zr6bcdpifw64"; isLibrary = true; isExecutable = true; - buildDepends = [ array base binary bytestring ]; + buildDepends = [ array base binary bytestring directory ]; + testDepends = [ + array base binary bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; description = "Implementations of the SHA suite of message digest functions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -13067,8 +13109,8 @@ self: { }: mkDerivation { pname = "ShellCheck"; - version = "0.3.5"; - sha256 = "0x4rvhpzrjkn9a9fsmp9iwv9g21hkrd8fgq05iy4wgv8nfhgv2cj"; + version = "0.3.6"; + sha256 = "0313i6h9m57g1ly5jviczvgbcvv8wdy0fi6hrws879zb745rb7zi"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -14107,6 +14149,7 @@ self: { buildDepends = [ base containers matrix random ]; description = "Game for Lounge Marmelade"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Top" = callPackage @@ -14434,16 +14477,16 @@ self: { }) {}; "Unixutils" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, process - , pureMD5, regex-tdfa, unix, zlib + ({ mkDerivation, base, bytestring, directory, exceptions, filepath + , mtl, process, process-extras, pureMD5, regex-tdfa, unix, zlib }: mkDerivation { pname = "Unixutils"; - version = "1.52.4"; - sha256 = "10s665gspadqn2735npidvf4l5wg383nj11za094ibhq7hd8i304"; + version = "1.53"; + sha256 = "0gh8fii9kc2nah5l0gv1pzlxdxgw962vgr1w9kc5wksf85hgyplr"; buildDepends = [ - base bytestring directory filepath process pureMD5 regex-tdfa unix - zlib + base bytestring directory exceptions filepath mtl process + process-extras pureMD5 regex-tdfa unix zlib ]; homepage = "https://github.com/seereason/haskell-unixutils.git"; description = "A crude interface between Haskell and Unix-like operating systems"; @@ -14897,10 +14940,9 @@ self: { ({ mkDerivation, base, text, Win32, Win32-errors }: mkDerivation { pname = "Win32-dhcp-server"; - version = "0.2.1"; - sha256 = "1y2war9adqkwc3zy2g45nvg7ccp4axdbjkn54mnhf34q6n4dwwg8"; + version = "0.3"; + sha256 = "03mhf1w8672jknz2v5cijgwqhc6q0bj0k6pxfnqj8wi98fzbibfy"; buildDepends = [ base text Win32 Win32-errors ]; - jailbreak = true; homepage = "http://github.com/mikesteele81/win32-dhcp-server"; description = "Win32 DHCP Server Management API"; license = stdenv.lib.licenses.bsd3; @@ -14911,8 +14953,8 @@ self: { ({ mkDerivation, base, template-haskell, text, Win32 }: mkDerivation { pname = "Win32-errors"; - version = "0.2.2"; - sha256 = "158p8130x1dmis08zaqm8zdhdhj0xjdmli5gn2w3f7rsz748rhvw"; + version = "0.2.2.1"; + sha256 = "1v7gm7vll1lq6d7d0y8vza7ilcw6i95jkprhy906awhqlhv3z031"; buildDepends = [ base template-haskell text Win32 ]; homepage = "http://github.com/mikesteele81/win32-errors"; description = "Alternative error handling for Win32 foreign calls"; @@ -14938,8 +14980,8 @@ self: { ({ mkDerivation, base, text, Win32, Win32-errors }: mkDerivation { pname = "Win32-junction-point"; - version = "0.2.1"; - sha256 = "0d2hpzrbcvqfaw6vp03n56k5zjs6kk582hr3pd25j93g3rcyc8mf"; + version = "0.2.1.1"; + sha256 = "1pvlvhdp4wcz8kn5nldhrkryz03dmzyzvjbm8x1ri9kwq1icd941"; buildDepends = [ base text Win32 Win32-errors ]; homepage = "http://github.com/mikesteele81/Win32-junction-point"; description = "Support for manipulating NTFS junction points"; @@ -14961,13 +15003,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Win32-security" = callPackage + ({ mkDerivation, base, text, Win32, Win32-errors }: + mkDerivation { + pname = "Win32-security"; + version = "0.1.1"; + sha256 = "0dh4z7a0mxwpqhx1cxvwwjc7w24mcrqc0bmg7bp86kd6zqz6rjly"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base text Win32 Win32-errors ]; + homepage = "https://github.com/anton-dessiatov/Win32-security"; + description = "Haskell bindings to a security-related functions of the Windows API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Win32-services" = callPackage - ({ mkDerivation, Advapi32, base, errors, Win32 }: + ({ mkDerivation, Advapi32, base, Win32 }: mkDerivation { pname = "Win32-services"; - version = "0.2.4"; - sha256 = "006aiikccdgbv6m84z3wkkd3g5yn6zy85lb25b6c7r3rwxqm34d1"; - buildDepends = [ base errors Win32 ]; + version = "0.2.5.1"; + sha256 = "1biirmn4fmw9zdhvbwzj5lrw2ac5wn6zz2zvzqi4b0gz8hlywzr7"; + buildDepends = [ base Win32 ]; extraLibraries = [ Advapi32 ]; homepage = "http://github.com/mikesteele81/win32-services"; description = "Windows service applications"; @@ -15038,7 +15095,6 @@ self: { homepage = "https://github.com/gbgar/Wordlint"; description = "Plaintext prose redundancy linter"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Workflow" = callPackage @@ -15265,7 +15321,6 @@ self: { pkgconfigDepends = [ libXau ]; description = "A binding to the X11 authentication library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs.xlibs) libXau;}; "Xec" = callPackage @@ -15393,8 +15448,8 @@ self: { ({ mkDerivation, base, random }: mkDerivation { pname = "Yampa"; - version = "0.9.6"; - sha256 = "0a1m0sb0i3kkxbp10vpqd6iw83ksm4alavrg04arzrv71p3skyg0"; + version = "0.9.6.1"; + sha256 = "14nssljqgpirdjl6rxb1x4xxl6rpq2rhldhcvsvc0qx31mb01df1"; buildDepends = [ base random ]; homepage = "http://www.haskell.org/haskellwiki/Yampa"; description = "Library for programming hybrid systems"; @@ -15525,8 +15580,8 @@ self: { }: mkDerivation { pname = "Zora"; - version = "1.1.21"; - sha256 = "145mn0d9610hnc6p489s7b6ar63shbcm2rs83ij3ravdnp52ykjn"; + version = "1.1.22"; + sha256 = "0m49xfyxk92ddmh222h6drys05vncq7y374gnpgwpi4hrmzd0jbb"; buildDepends = [ base bytestring containers directory fgl graphviz random shelly text @@ -15803,7 +15858,6 @@ self: { homepage = "http://code.haskell.org/~thielema/accelerate-cublas/"; description = "Basic Linear Algebra using native CUBLAS library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-cuda" = callPackage @@ -15829,7 +15883,6 @@ self: { homepage = "https://github.com/AccelerateHS/accelerate-cuda/"; description = "Accelerate backend for NVIDIA GPUs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-cufft" = callPackage @@ -15849,7 +15902,6 @@ self: { homepage = "http://code.haskell.org/~thielema/accelerate-cufft/"; description = "Accelerate frontend to the CUFFT library (Fourier transform)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-examples" = callPackage @@ -15867,7 +15919,6 @@ self: { homepage = "https://github.com/AccelerateHS/accelerate-examples"; description = "Examples using the Accelerate library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-fft" = callPackage @@ -15882,7 +15933,6 @@ self: { homepage = "https://github.com/AccelerateHS/accelerate-fft"; description = "FFT using the Accelerate library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-fftw" = callPackage @@ -15938,10 +15988,10 @@ self: { accelerate accelerate-cuda accelerate-cufft accelerate-fftw accelerate-fourier base criterion ]; + jailbreak = true; homepage = "http://code.haskell.org/~thielema/accelerate-fourier-benchmark/"; description = "Compare different implementations of the Fast Fourier Transform"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-io" = callPackage @@ -16025,8 +16075,8 @@ self: { }: mkDerivation { pname = "acid-state"; - version = "0.12.3"; - sha256 = "099n8a5qxrjzhw0jgmshcpkvynkj2v4a8a6lwy9fvg586nhcy9j1"; + version = "0.12.4"; + sha256 = "0mb2p29pi9dhby2bwn6zkg1nn3sf6vr7xzf6npx3738ffj3b2bad"; buildDepends = [ array base bytestring cereal containers directory extensible-exceptions filepath mtl network safecopy stm @@ -16202,7 +16252,6 @@ self: { homepage = "https://github.com/llelf/acme-lolcat"; description = "LOLSPEAK translator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "acme-lookofdisapproval" = callPackage @@ -16405,15 +16454,14 @@ self: { }: mkDerivation { pname = "active"; - version = "0.1.0.18"; - sha256 = "1q2j7mx8a3mwsb809iyrr2d66bwn4na3y7hmisy6dq8jx4ajfrbk"; + version = "0.1.0.19"; + sha256 = "1zzzrjpfwxzf0zbz8vcnpfqi7djvrfxglhkvw1s6yj5gcblg2rcw"; buildDepends = [ array base newtype semigroupoids semigroups vector-space ]; testDepends = [ array base newtype QuickCheck semigroupoids semigroups vector-space ]; - jailbreak = true; description = "Abstractions for animation"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -16781,6 +16829,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "aeson-diff" = callPackage + ({ mkDerivation, aeson, base, bytestring, edit-distance-vector + , hashable, mtl, optparse-applicative, QuickCheck + , quickcheck-instances, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "aeson-diff"; + version = "0.1.1.1"; + sha256 = "102fa65xnma0d1g7gyhjagybzjys93m32gwxc9zliz3wbbpyarp3"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base bytestring edit-distance-vector hashable mtl + optparse-applicative scientific text unordered-containers vector + ]; + testDepends = [ + aeson base QuickCheck quickcheck-instances text + unordered-containers vector + ]; + homepage = "https://github.com/thsutton/aeson-diff"; + description = "Extract and apply patches to JSON documents"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-lens" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, lens, text , unordered-containers, vector @@ -16867,8 +16940,8 @@ self: { }: mkDerivation { pname = "aeson-schema"; - version = "0.3.0.0"; - sha256 = "0glnx168klmfhq2rsp3h149hyafym2rlw9n00vja13kxs557k8s6"; + version = "0.3.0.3"; + sha256 = "1cb09lq21mb4471w3k3gjhhq7g081wkpnx39bqy15lj6alpbqvd2"; buildDepends = [ aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck regex-base regex-compat regex-pcre scientific syb template-haskell @@ -16883,7 +16956,6 @@ self: { homepage = "https://github.com/timjb/aeson-schema"; description = "Haskell JSON schema validator and parser generator"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-serialize" = callPackage @@ -17168,8 +17240,8 @@ self: { ({ mkDerivation, array, base, containers, mtl, random, vector }: mkDerivation { pname = "aivika"; - version = "3.1"; - sha256 = "0q9w4lwf2k6r36vb452z2ykkdz4z4xcc7x4kgjrjfcxfca7m0l50"; + version = "4.0.1"; + sha256 = "0vhpv55wcljywh8rvv829c69wam0w505p6gf8bs5680spwc4z4y0"; buildDepends = [ array base containers mtl random vector ]; homepage = "http://github.com/dsorokin/aivika"; description = "A multi-paradigm simulation library"; @@ -17283,12 +17355,12 @@ self: { }) {}; "al" = callPackage - ({ mkDerivation, base, c2hs, openal }: + ({ mkDerivation, base, c2hs, mtl, openal }: mkDerivation { pname = "al"; - version = "0.1.1.3"; - sha256 = "09ppkvzkka3c5hiawkz7lcrwp6sa8bhbg10m9hfp9rk4g9339czy"; - buildDepends = [ base ]; + version = "0.1.2"; + sha256 = "1vni9rbpngdgn530n5d9rvmj8j0nad54nw7njk1gd8krbnbgfy9k"; + buildDepends = [ base mtl ]; buildTools = [ c2hs ]; extraLibraries = [ openal ]; homepage = "http://github.com/phaazon/al"; @@ -17364,8 +17436,8 @@ self: { }: mkDerivation { pname = "alfred"; - version = "0.3.1"; - sha256 = "1nsa3d9mza81rqdg2vbvf4x2318j96l5px6zx7hhc28ril62971a"; + version = "0.4"; + sha256 = "1zmjllvcpj42cp01n1p2f2kzzx2ik4fql2vwbzlkaay9v9pskjk0"; buildDepends = [ aeson base bytestring hexpat HTTP network-uri text xmlgen ]; @@ -17888,7 +17960,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Auto Scaling SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudformation" = callPackage @@ -17901,7 +17972,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFormation SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudfront" = callPackage @@ -17914,7 +17984,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFront SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudhsm" = callPackage @@ -17927,7 +17996,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudHSM SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudsearch" = callPackage @@ -17940,7 +18008,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudsearch-domains" = callPackage @@ -17953,7 +18020,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch Domain SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudtrail" = callPackage @@ -17966,7 +18032,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudTrail SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudwatch" = callPackage @@ -17991,7 +18056,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Logs SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codedeploy" = callPackage @@ -18004,7 +18068,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeDeploy SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cognito-identity" = callPackage @@ -18017,7 +18080,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cognito-sync" = callPackage @@ -18030,7 +18092,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Sync SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-config" = callPackage @@ -18043,7 +18104,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Config SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-core" = callPackage @@ -18085,7 +18145,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Data Pipeline SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-directconnect" = callPackage @@ -18098,7 +18157,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Direct Connect SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-dynamodb" = callPackage @@ -18111,7 +18169,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ec2" = callPackage @@ -18124,7 +18181,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ecs" = callPackage @@ -18149,7 +18205,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon ElastiCache SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elasticbeanstalk" = callPackage @@ -18162,7 +18217,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Beanstalk SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elastictranscoder" = callPackage @@ -18175,7 +18229,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Transcoder SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elb" = callPackage @@ -18188,7 +18241,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-emr" = callPackage @@ -18201,7 +18253,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic MapReduce SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-glacier" = callPackage @@ -18226,7 +18277,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Identity and Access Management SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-importexport" = callPackage @@ -18239,7 +18289,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kinesis" = callPackage @@ -18252,7 +18301,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kms" = callPackage @@ -18277,7 +18325,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-opsworks" = callPackage @@ -18290,7 +18337,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-rds" = callPackage @@ -18303,7 +18349,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Relational Database Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-redshift" = callPackage @@ -18316,7 +18361,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Redshift SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-route53" = callPackage @@ -18329,7 +18373,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-route53-domains" = callPackage @@ -18342,7 +18385,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 Domains SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-s3" = callPackage @@ -18355,7 +18397,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sdb" = callPackage @@ -18368,7 +18409,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon SimpleDB SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ses" = callPackage @@ -18381,7 +18421,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Email Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sns" = callPackage @@ -18394,7 +18433,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Notification Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sqs" = callPackage @@ -18407,7 +18445,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Queue Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ssm" = callPackage @@ -18432,7 +18469,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Storage Gateway SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sts" = callPackage @@ -18445,7 +18481,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Security Token Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-support" = callPackage @@ -18458,7 +18493,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Support SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-swf" = callPackage @@ -18471,7 +18505,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ampersand" = callPackage @@ -18555,7 +18588,6 @@ self: { buildDepends = [ base deepseq parsec ]; description = "Interpreter for AM"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "analyze-client" = callPackage @@ -18989,16 +19021,23 @@ self: { "api-builder" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring - , either, HTTP, http-conduit, http-types, text, transformers + , Cabal, containers, datetime, either, hspec, HTTP, http-client + , http-conduit, http-types, text, transformers }: mkDerivation { pname = "api-builder"; - version = "0.5.0.0"; - sha256 = "1lf70k7cb90jzj3nz31d17zbgsmi3fg3lwzdh9fqkjclhgk3al8y"; + version = "0.6.0.0"; + sha256 = "1ljc81zxh5zi8k7ccp6mh1kr3wmsp6z9df17zpymqjh2mgc6kswb"; buildDepends = [ - aeson attoparsec base bifunctors bytestring either HTTP + aeson attoparsec base bifunctors bytestring either HTTP http-client http-conduit http-types text transformers ]; + testDepends = [ + aeson base bytestring Cabal containers datetime hspec http-conduit + text transformers + ]; + jailbreak = true; + homepage = "https://github.com/intolerable/api-builder"; description = "Library for easily building REST API wrappers in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -19062,6 +19101,7 @@ self: { base bytestring http-types HUnit mtl tasty tasty-hunit tasty-quickcheck wai wai-extra ]; + jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "Simple and type safe web framework that generate web API documentation"; license = stdenv.lib.licenses.mit; @@ -19123,7 +19163,6 @@ self: { apiary base blaze-builder blaze-html bytestring cookie time types-compat wai web-routing ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "Cookie support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -19578,8 +19617,8 @@ self: { }: mkDerivation { pname = "arbtt"; - version = "0.9"; - sha256 = "1076fy65b0qzjind3zm170ws8dq76f34n4b0gjn98v4a0nsk60xw"; + version = "0.9.0.2"; + sha256 = "0ab5qrsrp6fcc2p1a4idbqazs7yrh957bfagdmw6b7rrydpig1lc"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -19769,6 +19808,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "arion" = callPackage + ({ mkDerivation, base, containers, directory, filemanip, fsnotify + , hspec, process, regex-posix, safe, split, system-filepath, text + , time, transformers + }: + mkDerivation { + pname = "arion"; + version = "0.1.0.8"; + sha256 = "107rbbzmqg0zrgv3qb0pr8svmzh25a63dm0kn0hhyirkjzdyjgqw"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base containers directory filemanip fsnotify process regex-posix + safe split system-filepath text transformers + ]; + testDepends = [ + base containers directory filemanip fsnotify hspec process + regex-posix safe split system-filepath text time + ]; + homepage = "http://github.com/karun012/arion"; + description = "Watcher and runner for Hspec"; + license = stdenv.lib.licenses.mit; + }) {}; + "arith-encode" = callPackage ({ mkDerivation, arithmoi, array, base, binary, Cabal, containers , fgl, hashable, HUnit-Plus, unordered-containers @@ -19808,15 +19871,13 @@ self: { }: mkDerivation { pname = "arithmoi"; - version = "0.4.1.1"; - revision = "2"; - sha256 = "02wrm24dpcsdsjaic30416axad5s4y822si1am4smb2qvrhps9ix"; - editedCabalFile = "8bf01e402d887e4d95dad0189e75420b125c15bc6234784929535a08c471298a"; + version = "0.4.1.2"; + sha256 = "0i0cndldf426cc8dv6swqfnljv9lgba9vp1ac4xk0vdbmbwqan9m"; buildDepends = [ array base containers ghc-prim integer-gmp mtl random ]; configureFlags = [ "-f-llvm" ]; - homepage = "https://bitbucket.org/dafis/arithmoi"; + homepage = "https://github.com/cartazio/arithmoi"; description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms."; license = stdenv.lib.licenses.mit; }) {}; @@ -19882,6 +19943,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "array-primops" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "array-primops"; + version = "0.1.0.0"; + sha256 = "11qwgs06ivfjhcjhihchg46hvpcrwmc7zz36630v9qyy2611q66x"; + buildDepends = [ base ghc-prim ]; + description = "Extra foreign primops for primitive arrays"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "array-utils" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -20417,7 +20489,6 @@ self: { ]; description = "A modified version of async that supports worker groups and many-to-many task dependencies"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asynchronous-exceptions" = callPackage @@ -20684,7 +20755,9 @@ self: { mkDerivation { pname = "atto-lisp"; version = "0.2.2"; + revision = "1"; sha256 = "13lhdalam4gn9faa58c3c7nssdwp2y0jsfl1lnnvr3dx6wzp0jhc"; + editedCabalFile = "feb39753d89c58abac767ed3fe5644428b5d15d83c69f7b26b282f3b9969f2fa"; buildDepends = [ attoparsec base blaze-builder blaze-textual bytestring containers deepseq text @@ -20705,8 +20778,8 @@ self: { }: mkDerivation { pname = "attoparsec"; - version = "0.12.1.3"; - sha256 = "1m5sk60k9x4hs0qpglj5adr3n5zwpvarpylkjkx2xx63p74cj82f"; + version = "0.12.1.6"; + sha256 = "1a06vhg0ykix94q7qxvmh30v017fjl9j2i1b860wjb937a6bc2yf"; buildDepends = [ array base bytestring containers deepseq scientific text ]; @@ -21056,8 +21129,10 @@ self: { }: mkDerivation { pname = "auto"; - version = "0.2.0.6"; - sha256 = "1k0nzhkn32jypf1yqjqadmqwq9ckyax23lmvwzz110fx657j1nhi"; + version = "0.4.1.0"; + revision = "1"; + sha256 = "00l7dxcg6xx63vkwa8kx4k8bcpvxdyhmb4gvffnwkf1dg4kqd9qd"; + editedCabalFile = "5170b5e4efc880cae0dc3275adf79a0b8491ebe32fd54e42116c863f9e76df50"; buildDepends = [ base bytestring cereal containers deepseq MonadRandom profunctors random semigroups transformers @@ -21104,8 +21179,8 @@ self: { }: mkDerivation { pname = "autonix-deps-kf5"; - version = "0.2.0.0"; - sha256 = "11s723xz3n761kr1i09sd1cvbqg2rcm15dhfaxfs7qq4kka2ahhp"; + version = "0.2.0.1"; + sha256 = "11azj8cl5g8fz0bzdh1z1alv9ljdzhgvkb8qr5y0dfsjbbyhz5v0"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -21162,8 +21237,8 @@ self: { }: mkDerivation { pname = "avers"; - version = "0.0.2"; - sha256 = "1wbsxr15jqq6fn158qglpzhx98ybgba8xxahlqjmi845iq3qys63"; + version = "0.0.3"; + sha256 = "0y58qixd9kjm0wp5spachm581mshp15pcvlyv48nsrabrzssn3ng"; buildDepends = [ aeson attoparsec base base16-bytestring bytestring containers cryptohash inflections influxdb MonadRandom mtl network @@ -21172,6 +21247,7 @@ self: { ]; description = "empty"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "avl-static" = callPackage @@ -21259,7 +21335,9 @@ self: { mkDerivation { pname = "aws"; version = "0.11.3"; + revision = "1"; sha256 = "02p3dn380qj8wg6alm7yqw4svwwkw9ln9rjd6shbk4jz8gsaka8l"; + editedCabalFile = "e4265585066ef7d7cb3473938a62d6c996084ba1a9e05f9efbfa60057760efac"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -21374,17 +21452,17 @@ self: { "aws-general" = callPackage ({ mkDerivation, aeson, attoparsec, aws, base, base16-bytestring , blaze-builder, byteable, bytestring, case-insensitive, charset - , cryptohash, directory, either, errors, hashable, http-types - , old-locale, parsers, QuickCheck, quickcheck-instances, tagged - , tasty, tasty-quickcheck, text, time, transformers + , cryptohash, deepseq, directory, either, errors, hashable + , http-types, old-locale, parsers, QuickCheck, quickcheck-instances + , tagged, tasty, tasty-quickcheck, text, time, transformers }: mkDerivation { pname = "aws-general"; - version = "0.2.1"; - sha256 = "11wfg657za7mbr7fkgwhv4nag2m6j245rj3rldy2fj4s0vhpi6l3"; + version = "0.2.2"; + sha256 = "08sy37w162zqd6dqi8kkg0782nv00jsp48bnrmhwhmkhnd2arfrj"; buildDepends = [ aeson attoparsec base base16-bytestring blaze-builder byteable - bytestring case-insensitive cryptohash hashable http-types + bytestring case-insensitive cryptohash deepseq hashable http-types old-locale parsers QuickCheck quickcheck-instances text time transformers ]; @@ -21400,19 +21478,20 @@ self: { "aws-kinesis" = callPackage ({ mkDerivation, aeson, aws, aws-general, base, base64-bytestring - , blaze-builder, bytestring, conduit, conduit-extra, errors - , http-conduit, http-types, mtl, parsers, QuickCheck + , blaze-builder, bytestring, conduit, conduit-extra, deepseq + , errors, http-conduit, http-types, mtl, parsers, QuickCheck , quickcheck-instances, resourcet, tagged, tasty, tasty-quickcheck , text, time, transformers }: mkDerivation { pname = "aws-kinesis"; - version = "0.1.4"; - sha256 = "0k0p7ivs6z6zqm45yjhlwcmrhqz83a66fi2f6i6p1a5r7c107dji"; + version = "0.1.5"; + sha256 = "0npiff5zrcs552y8lq3q6fgnwffqy11dvgs3yaygy0m99mgiaaiz"; buildDepends = [ aeson aws aws-general base base64-bytestring blaze-builder - bytestring conduit conduit-extra http-conduit http-types parsers - QuickCheck quickcheck-instances resourcet text time transformers + bytestring conduit conduit-extra deepseq http-conduit http-types + parsers QuickCheck quickcheck-instances resourcet text time + transformers ]; testDepends = [ aeson aws aws-general base bytestring errors mtl QuickCheck tagged @@ -22176,26 +22255,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "base_4_7_0_2" = callPackage - ({ mkDerivation, ghc-prim, integer-gmp, rts }: + "base_4_8_0_0" = callPackage + ({ mkDerivation, ghc-prim, rts }: mkDerivation { pname = "base"; - version = "4.7.0.2"; - sha256 = "09rp0syv5arj7wmyksmn07g7vps1kwh2k4z1ar1dp7jsav8gxsjp"; - buildDepends = [ ghc-prim integer-gmp rts ]; + version = "4.8.0.0"; + sha256 = "1mf5s7niw0zmm1db7sr6kdpln8drcy77fn44h6sspima8flwcp44"; + buildDepends = [ ghc-prim rts ]; + jailbreak = true; description = "Basic libraries"; license = stdenv.lib.licenses.bsd3; }) {}; "base-compat" = callPackage - ({ mkDerivation, base, errorcall-eq-instance, hspec, QuickCheck - , setenv - }: + ({ mkDerivation, base, ghc-prim, hspec, QuickCheck, setenv }: mkDerivation { pname = "base-compat"; - version = "0.5.0"; - sha256 = "1zlpfpfnaqf8rrha19arh882bc560dcw2zwi4j3qrn3lzyh8s1d1"; - buildDepends = [ base errorcall-eq-instance setenv ]; + version = "0.7.0"; + sha256 = "1i52zamyalcyaq0sg38m7m5f1667yzdxi6shsf9rw7vr820pnbn4"; + buildDepends = [ base ghc-prim setenv ]; testDepends = [ base hspec QuickCheck ]; description = "A compatibility layer for base"; license = stdenv.lib.licenses.mit; @@ -22217,8 +22295,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "base-prelude"; - version = "0.1.16"; - sha256 = "1k7rbbmw6qjqql7408vaj3mcymlk66hyrd0l2xhksyalh1h4sbps"; + version = "0.1.19"; + sha256 = "00mk7zpm3yb804h0gngvpjxhb2a6nds8qb8mwpn80s20x72083wb"; buildDepends = [ base ]; homepage = "https://github.com/nikita-volkov/base-prelude"; description = "The most complete prelude formed from only the \"base\" package"; @@ -22386,8 +22464,8 @@ self: { }: mkDerivation { pname = "basic-prelude"; - version = "0.3.11.1"; - sha256 = "057sq6jm8vskw9d9maqc6a85x45lslyiw3j1q7kaczl3851zaxl3"; + version = "0.3.12"; + sha256 = "1qmwxd8wfszawhfncqhcnbc2h1a47jcqa4zj4pfwybhy3xnn0yns"; buildDepends = [ base bytestring containers hashable lifted-base ReadArgs safe system-filepath text transformers unordered-containers vector @@ -23207,8 +23285,8 @@ self: { }: mkDerivation { pname = "binary-list"; - version = "1.0.1.0"; - sha256 = "1d83ka79nnq5pw4djs6x3ccgygkq89q9wakgykx4wvyf7l0xj7d9"; + version = "1.1.0.2"; + sha256 = "006a46yw1jcdw2yhpwimbjcpls0vrhzrhiylxh6vc136w2kb6qcd"; buildDepends = [ base binary bytestring deepseq phantom-state transformers ]; @@ -24372,7 +24450,6 @@ self: { homepage = "https://github.com/acfoltzer/bit-vector"; description = "Simple bit vectors for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bitarray" = callPackage @@ -24757,7 +24834,6 @@ self: { homepage = "https://github.com/bitemyapp/blacktip"; description = "Decentralized, k-ordered unique ID generator"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blakesum" = callPackage @@ -24870,7 +24946,6 @@ self: { version = "0.1.0.0"; sha256 = "1q1gwjg8xfp20lrlrlkdprny7j437fsnm5c9p5rv4549nyam7prw"; buildDepends = [ base blaze-html text ]; - jailbreak = true; homepage = "http://github.com/agrafix/blaze-bootstrap"; description = "Blaze helper functions for bootstrap pages"; license = stdenv.lib.licenses.mit; @@ -24921,14 +24996,17 @@ self: { "blaze-builder-enumerator" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, enumerator - , transformers + , streaming-commons, transformers }: mkDerivation { pname = "blaze-builder-enumerator"; - version = "0.2.0.6"; - sha256 = "0pdw18drvikb465qh43b8wjyvpqj3wcilyczc21fri5ma4mxdkyp"; + version = "0.2.1.0"; + revision = "1"; + sha256 = "15mz4dfnngll61b1xv3hfazvzjfd8g9ym0hps1qiks1hl4c2kxah"; + editedCabalFile = "28796d33301d22cfca6188f54699d9efd7721802bc5e9c88a394bec14c9c4fae"; buildDepends = [ - base blaze-builder bytestring enumerator transformers + base blaze-builder bytestring enumerator streaming-commons + transformers ]; homepage = "https://github.com/meiersi/blaze-builder-enumerator"; description = "Enumeratees for the incremental conversion of builders to bytestrings"; @@ -24949,7 +25027,47 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-html_0_7_0_3" = callPackage + ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring + , containers, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-html"; + version = "0.7.0.3"; + sha256 = "1jn3vvrxb3ifxb5yzs76pjlk8c366xg1sab7qlw9a4kwmigvl6vx"; + buildDepends = [ base blaze-builder blaze-markup bytestring text ]; + testDepends = [ + base blaze-builder blaze-markup bytestring containers HUnit + QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast HTML combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "blaze-html" = callPackage + ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring + , containers, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-html"; + version = "0.7.1.0"; + sha256 = "0krvyik9hdizvyx3r499vah34b1jnnv4ivm9h1ij7rgh9xjw34ja"; + buildDepends = [ base blaze-builder blaze-markup bytestring text ]; + testDepends = [ + base blaze-builder blaze-markup bytestring containers HUnit + QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast HTML combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "blaze-html_0_8_0_2" = callPackage ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring , containers, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, text @@ -24964,6 +25082,7 @@ self: { QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; + jailbreak = true; homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast HTML combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -25016,7 +25135,67 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-json" = callPackage + ({ mkDerivation, aeson, base, bytestring, bytestring-builder + , containers, data-default-class, doctest, QuickCheck, scientific + , tasty, tasty-quickcheck, text, unordered-containers, vector + }: + mkDerivation { + pname = "blaze-json"; + version = "0.2.1"; + sha256 = "1jqrvv485qyscjppgq2kh6cvhd2lwwqq7gd69ynmrp3qllsc8x83"; + buildDepends = [ + base bytestring bytestring-builder containers data-default-class + text + ]; + testDepends = [ + aeson base doctest QuickCheck scientific tasty tasty-quickcheck + text unordered-containers vector + ]; + homepage = "https://github.com/philopon/blaze-json"; + description = "tiny library for encoding json"; + license = stdenv.lib.licenses.mit; + }) {}; + + "blaze-markup_0_6_2_0" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-markup"; + version = "0.6.2.0"; + sha256 = "034aqkvxw0g6ry4d82bkvxky7w6yx4q6bp1wn4ydj9rqw8yh6m08"; + buildDepends = [ base blaze-builder bytestring text ]; + testDepends = [ + base blaze-builder bytestring containers HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast markup combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "blaze-markup" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-markup"; + version = "0.6.3.0"; + sha256 = "1x057jlp89js6xbbyp4ky7xf5wq1ckl516b8bzp4y3knz50jshll"; + buildDepends = [ base blaze-builder bytestring text ]; + testDepends = [ + base blaze-builder bytestring containers HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast markup combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "blaze-markup_0_7_0_2" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit , QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, text @@ -25274,19 +25453,20 @@ self: { "blunt" = callPackage ({ mkDerivation, aeson, array, base, bytestring, clay, containers - , haskell-src-exts, http-types, jmacro, lucid, pointful, text - , transformers, wai, warp, wl-pprint-text + , flow, haskell-src-exts, http-types, jmacro, lucid, pointful, text + , transformers, wai, wai-extra, wai-websockets, warp, websockets + , wl-pprint-text }: mkDerivation { pname = "blunt"; - version = "0.0.13"; - sha256 = "1mawchdfywhs7gqfy1p91drfc4l31c2m2v8nkma5bg9i5zb81kyr"; + version = "0.0.16"; + sha256 = "03pradwal8ncrpj7gin9ri753hsi78lpfj8zsihf26dli79g5vmk"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson array base bytestring clay containers haskell-src-exts - http-types jmacro lucid pointful text transformers wai warp - wl-pprint-text + aeson array base bytestring clay containers flow haskell-src-exts + http-types jmacro lucid pointful text transformers wai wai-extra + wai-websockets warp websockets wl-pprint-text ]; homepage = "https://blunt.herokuapp.com"; description = "Point-free Haskell as a service"; @@ -25499,6 +25679,7 @@ self: { homepage = "https://github.com/anchor/borel-core"; description = "Metering System for OpenStack metrics provided by Vaultaire"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bot" = callPackage @@ -25549,6 +25730,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bound-gen" = callPackage + ({ mkDerivation, base, bound, monad-gen, mtl }: + mkDerivation { + pname = "bound-gen"; + version = "0.1.0.2"; + sha256 = "1il4vb497d0195mhvra5djkn3mbdzd8dmcnffpqh1pv1pj8n8hwp"; + buildDepends = [ base bound monad-gen mtl ]; + jailbreak = true; + description = "Unwrap Scope's with globally fresh values"; + license = stdenv.lib.licenses.mit; + }) {}; + "bounded-tchan" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -25929,8 +26122,8 @@ self: { }: mkDerivation { pname = "buildbox"; - version = "2.1.4.3"; - sha256 = "01zhhw9fqijzn63z63bgg1l2p3wjiarfrsnids18n4vam4yjyvn2"; + version = "2.1.6.1"; + sha256 = "15ddnbnm6wqm5dqf6f2qmxlxy5az0sxvml4rwghivcj0609lfc6i"; buildDepends = [ base bytestring containers directory mtl old-locale pretty process random stm time @@ -26130,7 +26323,6 @@ self: { ]; description = "Draw sequence diagrams of D-Bus traffic"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bv" = callPackage @@ -26256,8 +26448,8 @@ self: { ({ mkDerivation, base, bytestring, deepseq }: mkDerivation { pname = "bytestring-builder"; - version = "0.10.4.1.2"; - sha256 = "0gp0ymz551qhxx3n3lxjhrr1fwcyd2qpn2y690k8qi6nc09sn14y"; + version = "0.10.6.0.0"; + sha256 = "1mkg24zl0rapb3gqzkyj5ibp07wx3yzd72hmfczssl0is63rjhww"; buildDepends = [ base bytestring deepseq ]; description = "The new bytestring builder, packaged outside of GHC"; license = stdenv.lib.licenses.bsd3; @@ -26411,8 +26603,8 @@ self: { ({ mkDerivation, base, bytestring, terminal-progress-bar, time }: mkDerivation { pname = "bytestring-progress"; - version = "1.0.3"; - sha256 = "1v9cl7d4fcchbdrpbgjj4ilg79cj241vzijiifdsgkq30ikv2yxs"; + version = "1.0.5"; + sha256 = "02j9gmvncap4xzvvmj0s84bkhf4xh8plw5saakiljxf6zi7hpdwq"; buildDepends = [ base bytestring terminal-progress-bar time ]; homepage = "http://github.com/acw/bytestring-progress"; description = "A library for tracking the consumption of a lazy ByteString"; @@ -26425,8 +26617,8 @@ self: { }: mkDerivation { pname = "bytestring-read"; - version = "0.2.1"; - sha256 = "1g0i5ibk399kjdw8vmmv33bjw74z941hnj33fp0ch2by7z9fhgnn"; + version = "0.3.0"; + sha256 = "19bq478066chy35fnfjq5bg2f196zl6qi2dssqwlr9bivgvk434g"; buildDepends = [ base bytestring types-compat ]; testDepends = [ base bytestring doctest tasty tasty-quickcheck ]; homepage = "https://github.com/philopon/bytestring-read"; @@ -26460,6 +26652,7 @@ self: { jailbreak = true; description = "Backport copy of ShortByteString"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-show" = callPackage @@ -26482,8 +26675,8 @@ self: { ({ mkDerivation, base, binary, bytestring }: mkDerivation { pname = "bytestring-trie"; - version = "0.2.4"; - sha256 = "1fv3xh52hqhzdbq78c3lrgx5vd49cabwp9ww5ki1888zlq29pyck"; + version = "0.2.4.1"; + sha256 = "0qqklrvdcprchnl4bxr6w7zf6k5gncincl3kysm34gd04sszxr1g"; buildDepends = [ base binary bytestring ]; homepage = "http://code.haskell.org/~wren/"; description = "An efficient finite map from (byte)strings to values"; @@ -26605,7 +26798,6 @@ self: { buildDepends = [ base c0parser ]; description = "Simple C0 Syntax Check"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "c0parser" = callPackage @@ -26617,7 +26809,6 @@ self: { buildDepends = [ base parsec ]; description = "Simple C0 Parser"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "c10k" = callPackage @@ -26663,8 +26854,8 @@ self: { }: mkDerivation { pname = "c2hs"; - version = "0.24.1"; - sha256 = "0625lpilklch3sifp2vmllq5z0vbksln9kvs86dqsx4x4hnc66yk"; + version = "0.25.2"; + sha256 = "0d1rgcwvz49v3h511dibiv6m06v8s179pg4sw386z17pz3a2hghm"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -26745,8 +26936,8 @@ self: { }: mkDerivation { pname = "cabal-bounds"; - version = "0.9.2"; - sha256 = "162h4fcr5n6k2l20vxhlnrqfh2x6dvka14zibj0xq1g12ik8dz4j"; + version = "0.9.3"; + sha256 = "0r8ayxsfx7z4hivknshj2sybssn3hjwprxpyqw4yv3w26gv7d82j"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -26769,8 +26960,8 @@ self: { }: mkDerivation { pname = "cabal-cargs"; - version = "0.7.6"; - sha256 = "0f2ji0bvz6rdld1vgnpr5cfrkfjdg2nzk1adncyb0h8dmvzbki9c"; + version = "0.7.7"; + sha256 = "08f3fpfsjj4kk5flxgpjvqffifhfkhnf7i4n23adkf7w1rdw4nlz"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -26822,21 +27013,26 @@ self: { "cabal-debian" = callPackage ({ mkDerivation, base, Cabal, containers, data-default, debian - , deepseq, Diff, directory, filepath, hsemail, HUnit, lens, memoize - , mtl, network-uri, parsec, pretty, prettyclass, process, pureMD5 - , regex-tdfa, set-extra, syb, text, unix, Unixutils, utf8-string + , deepseq, Diff, directory, exceptions, filepath, hsemail, HUnit + , lens, memoize, mtl, network-uri, parsec, pretty, prettyclass + , process, pureMD5, regex-tdfa, set-extra, syb, text, unix + , Unixutils, utf8-string }: mkDerivation { pname = "cabal-debian"; - version = "4.24.6"; - sha256 = "0v7l8pnh8gqcxbqy02635il0di21i82g8p97lydkfvjsj4c1w8sv"; + version = "4.26"; + sha256 = "1imglja5b8q5z1l7na2h4b9cd9kbfjdqclgx12vzasan9gagl0k1"; isLibrary = true; isExecutable = true; buildDepends = [ base Cabal containers data-default debian deepseq Diff directory - filepath hsemail HUnit lens memoize mtl network-uri parsec pretty - prettyclass process pureMD5 regex-tdfa set-extra syb text unix - Unixutils utf8-string + exceptions filepath hsemail HUnit lens memoize mtl network-uri + parsec pretty prettyclass process pureMD5 regex-tdfa set-extra syb + text unix Unixutils utf8-string + ]; + testDepends = [ + base Cabal containers debian Diff filepath hsemail HUnit lens + pretty prettyclass process text ]; homepage = "https://github.com/ddssff/cabal-debian"; description = "Create a Debianization for a Cabal package"; @@ -26945,22 +27141,55 @@ self: { "cabal-helper" = callPackage ({ mkDerivation, base, bytestring, Cabal, data-default, directory - , filepath, mtl, process, template-haskell, temporary, transformers + , filepath, ghc-prim, mtl, process, template-haskell, temporary + , transformers }: mkDerivation { pname = "cabal-helper"; - version = "0.2.0.0"; - sha256 = "0p0p5f786y50gc54w8x25hkdi5dz7y63rrkq17h36p0jxjggmipm"; + version = "0.3.1.0"; + sha256 = "1hfprys4q4azfgqcv2xcyn14y8nybmvrl8y3z3ckx0v5r13ss75n"; isLibrary = true; isExecutable = true; buildDepends = [ - base bytestring Cabal data-default directory filepath mtl process - template-haskell temporary transformers + base bytestring Cabal data-default directory filepath ghc-prim mtl + process template-haskell temporary transformers ]; description = "Simple interface to Cabal's configuration state used by ghc-mod"; license = stdenv.lib.licenses.agpl3; }) {}; + "cabal-install_1_18_0_8" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, containers + , directory, filepath, HTTP, HUnit, mtl, network, network-uri + , pretty, process, QuickCheck, random, stm, test-framework + , test-framework-hunit, test-framework-quickcheck2, time, unix + , zlib + }: + mkDerivation { + pname = "cabal-install"; + version = "1.18.0.8"; + sha256 = "1yx7vgyi2hs934z4ln7d8m2yrsakidb551ib01l9hxnmc3jbskwi"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + array base bytestring Cabal containers directory filepath HTTP mtl + network network-uri pretty process random stm time unix zlib + ]; + testDepends = [ + array base bytestring Cabal containers directory filepath HTTP + HUnit mtl network network-uri pretty process QuickCheck stm + test-framework test-framework-hunit test-framework-quickcheck2 time + unix zlib + ]; + postInstall = '' + mkdir $out/etc + mv bash-completion $out/etc/bash_completion.d + ''; + homepage = "http://www.haskell.org/cabal/"; + description = "The command-line interface for Cabal and Hackage"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cabal-install" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , directory, extensible-exceptions, filepath, HTTP, HUnit, mtl @@ -27061,8 +27290,8 @@ self: { ({ mkDerivation, base, Cabal, lens, unordered-containers }: mkDerivation { pname = "cabal-lenses"; - version = "0.4.4"; - sha256 = "13gggbbzcq5allf2b76rgxmilrzkvvr3srshfpzh4xavdlm8wmch"; + version = "0.4.5"; + sha256 = "1v09n4mah5azb1hmc14ygiqwwm2an6ff2z2f9hw2c7jddbmays5n"; buildDepends = [ base Cabal lens unordered-containers ]; jailbreak = true; description = "Lenses and traversals for the Cabal library"; @@ -27094,8 +27323,8 @@ self: { }: mkDerivation { pname = "cabal-meta"; - version = "0.4.1.2"; - sha256 = "17ln9j0n9rb0kbnp37fi9yaf932dacrdmf3jrp301r886kh2a7kk"; + version = "0.4.1.3"; + sha256 = "14k8nv2kg8n9ssz6jivvin56jjazsvp4xg7zi0z6hcawfmcdmzd6"; isLibrary = true; isExecutable = true; buildDepends = [ base shelly system-fileio system-filepath text ]; @@ -27105,6 +27334,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-mon" = callPackage + ({ mkDerivation, base, containers, directory, filepath, process + , simple-get-opt, vty + }: + mkDerivation { + pname = "cabal-mon"; + version = "1.0.1"; + sha256 = "1wngmf73dqyyf9nfbpwyg3mvbp32rqrhhp4kf9nylhawwkv7c8v0"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base containers directory filepath process simple-get-opt vty + ]; + description = "A monitor for cabal builds"; + license = stdenv.lib.licenses.mit; + }) {}; + "cabal-nirvana" = callPackage ({ mkDerivation, base, bytestring, containers, directory, HTTP , process, tar @@ -27308,9 +27554,10 @@ self: { ({ mkDerivation, base, Cabal, QuickCheck }: mkDerivation { pname = "cabal-test-quickcheck"; - version = "0.1.4"; - sha256 = "012pl06x5jjiyhc98x5245zj1lcgkr9wcyv3rjc6z59y8mynv7ri"; + version = "0.1.6"; + sha256 = "0rffvz3khxdfbl9rfk1q47xqv013dwmd4sy8cy7y833175j2zibi"; buildDepends = [ base Cabal QuickCheck ]; + jailbreak = true; homepage = "https://github.com/zmthy/cabal-test-quickcheck"; description = "QuickCheck for Cabal"; license = stdenv.lib.licenses.mit; @@ -27752,16 +27999,15 @@ self: { ({ mkDerivation, base, containers, haskeline, parsec, QuickCheck }: mkDerivation { pname = "calculator"; - version = "0.3.0.1"; - sha256 = "067rnx1ixdnhqan2kwscqh6325ml523km7dg2apx1ksm51hl3gvc"; + version = "0.3.0.2"; + sha256 = "14fcb4zfx7pk0ha3hvlpj84mxp82jpn1ywyjnfmczm3ic4mq98m9"; isLibrary = false; isExecutable = true; buildDepends = [ base containers haskeline parsec ]; testDepends = [ base containers parsec QuickCheck ]; homepage = "https://github.com/sumitsahrawat/calculator"; - description = "A calculator repl"; + description = "A calculator repl, with variables, functions & Mathematica like dynamic plots"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "caldims" = callPackage @@ -27969,8 +28215,8 @@ self: { }: mkDerivation { pname = "caramia"; - version = "0.7.2.0"; - sha256 = "0jndbw3xr5h9r0f8z4fplqxw02icfakr4j41yvfsw398yb94i8f0"; + version = "0.7.2.1"; + sha256 = "01l6i8cb2q73vc4w6fbn90mkx7sxxsnwzhj0jg4yjhnrg4js0hlh"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -28045,8 +28291,8 @@ self: { }: mkDerivation { pname = "cartel"; - version = "0.14.2.4"; - sha256 = "14xsvy0s4bz8lfbiwys90iz3bvcd5f6np2pspz3p6camzfl2xdyp"; + version = "0.14.2.6"; + sha256 = "05m4b8gi5ysx73yzlhl27fx9i8fnlihxwsyh6a0702kzwgn40icc"; isLibrary = true; isExecutable = true; buildDepends = [ base directory filepath time transformers ]; @@ -28273,17 +28519,17 @@ self: { "cassava" = callPackage ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring - , containers, deepseq, ghc-prim, HUnit, QuickCheck, test-framework + , containers, deepseq, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, text , unordered-containers, vector }: mkDerivation { pname = "cassava"; - version = "0.4.2.2"; - sha256 = "0apprj3qqxhwkplfzmhsi9x0a2acg8crxm28r3wl0vrk58rczvrf"; + version = "0.4.2.3"; + sha256 = "13fhim3ylxhkr7wy5dss3m1k3cqlhrvknzbqsi1yclfkvp4wzc2f"; buildDepends = [ array attoparsec base blaze-builder bytestring containers deepseq - ghc-prim text unordered-containers vector + text unordered-containers vector ]; testDepends = [ attoparsec base bytestring HUnit QuickCheck test-framework @@ -28422,8 +28668,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "catamorphism"; - version = "0.3.0.0"; - sha256 = "1bjvnac5kyc70czx8vdld8whkgnygqz3i5yhfl315mall1xw7h1w"; + version = "0.4.0.0"; + sha256 = "00gyb84jfb19n4g0igm4sikqk2bl96wj9293g82rjxgrk9m19iq7"; buildDepends = [ base template-haskell ]; homepage = "http://github.com/frerich/catamorphism"; description = "A package exposing a helper function for generating catamorphisms"; @@ -28513,8 +28759,8 @@ self: { }: mkDerivation { pname = "cayley-client"; - version = "0.1.2.0"; - sha256 = "14ly2sfdk3gjxv2s4r9pfvaq4fdpz4xir4zglpjnqsik4bhwbk69"; + version = "0.1.2.1"; + sha256 = "0c2n37p8530awkpwnygrpz7zssv22ycjjml2623f61x7q8ilb8p6"; buildDepends = [ aeson attoparsec base bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers @@ -28533,8 +28779,8 @@ self: { }: mkDerivation { pname = "cblrepo"; - version = "0.14.0"; - sha256 = "0nki3pdpzykjcczrmikzi9c81yprq7y0hqqgd610dqp8p00pf754"; + version = "0.15.0"; + sha256 = "1a7bhy3yvrmnirh7nmlz6d1nyxs5dng2ap17h8585yhx9k1a5n68"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -28542,6 +28788,7 @@ self: { filepath mtl optparse-applicative process safe tar unix Unixutils utf8-string zlib ]; + jailbreak = true; description = "Tool to maintain a database of CABAL packages and their dependencies"; license = "unknown"; }) {}; @@ -28889,8 +29136,8 @@ self: { }: mkDerivation { pname = "cgi"; - version = "3001.2.2.0"; - sha256 = "0zl1ib0i0sh6ll3mrakaargjxyr3v2kxzzdfqpjnr57pg7isrjx9"; + version = "3001.2.2.1"; + sha256 = "1cpljh62mw2fim5gwpd0ag9ais9953iyiiwqfbd2nb6swy5k1z1m"; buildDepends = [ base bytestring containers exceptions mtl multipart network network-uri old-locale old-time parsec xhtml @@ -29075,8 +29322,8 @@ self: { }: mkDerivation { pname = "charset"; - version = "0.3.7"; - sha256 = "1x912dx5650x8ql3ivhpiwmxd6kv7zghark3s8ljvl1g3qr1pxd6"; + version = "0.3.7.1"; + sha256 = "1gn0m96qpjww8hpp2g1as5yy0wcwy4iq73h3kz6g0yxxhcl5sh9x"; buildDepends = [ array base bytestring containers semigroups unordered-containers ]; @@ -29238,7 +29485,6 @@ self: { aeson base blaze-html bytestring containers data-default http-types mtl syb text uniplate wai wai-extra xss-sanitize ]; - jailbreak = true; homepage = "http://github.com/jgm/cheapskate"; description = "Experimental markdown processor"; license = stdenv.lib.licenses.bsd3; @@ -29333,8 +29579,8 @@ self: { ({ mkDerivation, base, chell, QuickCheck, random }: mkDerivation { pname = "chell-quickcheck"; - version = "0.2.4"; - sha256 = "0ys6aks97y5h0n8n8dmwx8jrai4bjlnr7n69s259664y694054wd"; + version = "0.2.5"; + sha256 = "02bkcnx5k6r5csdnnkvk4wfd0l36nxb87i1463ynw17n7ym9s4cs"; buildDepends = [ base chell QuickCheck random ]; homepage = "https://john-millikin.com/software/chell/"; description = "QuickCheck support for the Chell testing library"; @@ -29790,7 +30036,6 @@ self: { homepage = "http://istitutocolli.org/repos/citeproc-hs/"; description = "A Citation Style Language implementation in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "citeproc-hs-pandoc-filter" = callPackage @@ -30118,7 +30363,7 @@ self: { "classy-prelude" = callPackage ({ mkDerivation, base, basic-prelude, bifunctors, bytestring - , chunked-data, containers, enclosed-exceptions, exceptions + , chunked-data, containers, dlist, enclosed-exceptions, exceptions , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl , mutable-containers, old-locale, primitive, QuickCheck, semigroups , stm, system-filepath, text, time, transformers @@ -30126,11 +30371,11 @@ self: { }: mkDerivation { pname = "classy-prelude"; - version = "0.10.5"; - sha256 = "1s9hydjs7x522w9hgrxjzx1d2zir80g140y4vdqd7mizv0yzisy3"; + version = "0.11.1"; + sha256 = "001anap27s3h04xkzyl1bnvf9fmrxvhqpjxyjkv1s77sdvaf19ii"; buildDepends = [ base basic-prelude bifunctors bytestring chunked-data containers - enclosed-exceptions exceptions ghc-prim hashable lifted-base + dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base mono-traversable mtl mutable-containers old-locale primitive semigroups stm system-filepath text time transformers unordered-containers vector vector-instances @@ -30150,8 +30395,8 @@ self: { }: mkDerivation { pname = "classy-prelude-conduit"; - version = "0.10.5"; - sha256 = "1dy9jj260hn571z1wdm0v5zpgalwgij99clmh541b41h6pjbism2"; + version = "0.11.1"; + sha256 = "0rjm8kzx34m1x3yndm9i2ybvw9lfddgaab1n51n8psml3yxckqic"; buildDepends = [ base bytestring classy-prelude conduit conduit-combinators monad-control resourcet system-fileio transformers void @@ -30171,8 +30416,8 @@ self: { }: mkDerivation { pname = "classy-prelude-yesod"; - version = "0.10.5"; - sha256 = "0phaczjsn3blca3y6cwnqwhd9wrl7im1r2kh4i6a83c9kirsa5cx"; + version = "0.11.1"; + sha256 = "1481cs7l0bf4jy9q2rg35aw0pfzdhnj7kc22ll2n7jb2wg1xvcv3"; buildDepends = [ aeson base classy-prelude classy-prelude-conduit data-default http-conduit http-types persistent yesod yesod-newsfeed @@ -30483,6 +30728,7 @@ self: { homepage = "https://github.com/tanakh/cless"; description = "Colorized LESS"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clevercss" = callPackage @@ -30530,7 +30776,6 @@ self: { jailbreak = true; description = "Toy game (tetris on billiard board). Hipmunk in action."; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clientsession" = callPackage @@ -30634,6 +30879,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clist" = callPackage + ({ mkDerivation, base, base-unicode-symbols, peano }: + mkDerivation { + pname = "clist"; + version = "0.1.0.0"; + sha256 = "1jvkv6dwx2gm59vczmiagpxb0614fz63jzqrqm81bdai8yb0gpzd"; + buildDepends = [ base base-unicode-symbols peano ]; + jailbreak = true; + homepage = "https://github.com/strake/clist.hs"; + description = "Counted list"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clock" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -30900,12 +31159,13 @@ self: { }) {}; "cmark" = callPackage - ({ mkDerivation, base, mtl, text }: + ({ mkDerivation, base, HUnit, text }: mkDerivation { pname = "cmark"; - version = "0.3.0.1"; - sha256 = "1n73ya2r5dbsadmx9y6l931k7nhppqa69qqyv15pnm3w7823njj8"; - buildDepends = [ base mtl text ]; + version = "0.3.1"; + sha256 = "18z50pbxxir4ca7v6zpkdv3anadg2z1lwhllilag3a592ka3hdrb"; + buildDepends = [ base text ]; + testDepends = [ base HUnit text ]; homepage = "https://github.com/jgm/commonmark-hs"; description = "Fast, accurate CommonMark (Markdown) parser and renderer"; license = stdenv.lib.licenses.bsd3; @@ -32031,8 +32291,8 @@ self: { }: mkDerivation { pname = "comptrans"; - version = "0.1.0.4"; - sha256 = "01yv0j405ninkvmfx7r4cwzvxdhcdivncds46086s1v0qmp2zag0"; + version = "0.1.0.5"; + sha256 = "05r07900bniy1gazvgj3wj4g07j33h493885bhh7gq1n1xilqgkm"; buildDepends = [ base compdata containers deepseq deepseq-generics ghc-prim lens template-haskell th-expand-syns @@ -32080,8 +32340,8 @@ self: { }: mkDerivation { pname = "conceit"; - version = "0.2.2.0"; - sha256 = "0h477bn361b0g3iq1nzx88pii8zhkc41vk1f0ggndhidnzddrlb8"; + version = "0.2.2.1"; + sha256 = "0phr04cp36n5r137la3vh92v7wbc5a56grpfynn2vjiyacmrw0b4"; buildDepends = [ base bifunctors exceptions mtl semigroupoids transformers void ]; @@ -32465,6 +32725,7 @@ self: { homepage = "http://github.com/mtolly/conduit-audio"; description = "conduit-audio interface to the LAME MP3 library"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) { mp3lame = null;}; "conduit-audio-samplerate" = callPackage @@ -32482,6 +32743,7 @@ self: { homepage = "http://github.com/mtolly/conduit-audio"; description = "conduit-audio interface to the libsamplerate resampling library"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) { samplerate = null;}; "conduit-audio-sndfile" = callPackage @@ -32653,6 +32915,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "config-value" = callPackage + ({ mkDerivation, alex, array, base, happy, pretty, text + , transformers + }: + mkDerivation { + pname = "config-value"; + version = "0.4.0.1"; + sha256 = "0d9g6ih1rl0z4a2gf285f408vz7iysxwvw6kav280nvx99k2msb7"; + buildDepends = [ array base pretty text transformers ]; + buildTools = [ alex happy ]; + homepage = "https://github.com/glguy/config-value"; + description = "Simple, layout-based value language similar to YAML or JSON"; + license = stdenv.lib.licenses.mit; + }) {}; + "configifier" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring , case-insensitive, containers, either, hspec, hspec-discover, mtl @@ -32751,15 +33028,14 @@ self: { }: mkDerivation { pname = "confsolve"; - version = "0.5.3"; - sha256 = "10x3ykg76imw8vgd9jh6zn8cdi8aamdqqwmsjc3qqmy30jqff2ls"; + version = "0.5.4"; + sha256 = "0984gcahddrzlvzsfsrkr8i8jijjg7j2m5namfv8zhdlkrny8h11"; isLibrary = false; isExecutable = true; buildDepends = [ attoparsec base cmdargs process system-fileio system-filepath text time unordered-containers ]; - jailbreak = true; description = "A command line tool for resolving conflicts of file synchronizers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -32970,6 +33246,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "consul-haskell" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , http-client, HUnit, network, tasty, tasty-hunit, text + , transformers + }: + mkDerivation { + pname = "consul-haskell"; + version = "0.1"; + sha256 = "0i6xq7xd4bikb46mrcabiwwfga25wqcg7z45bh2hbqhf7yq8xjm6"; + buildDepends = [ + aeson base base64-bytestring bytestring http-client network text + transformers + ]; + testDepends = [ base http-client HUnit network tasty tasty-hunit ]; + homepage = "https://github.com/alphaHeavy/consul-haskell"; + description = "A consul client for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "container-classes" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -33062,8 +33358,8 @@ self: { }: mkDerivation { pname = "context-free-grammar"; - version = "0.0.1"; - sha256 = "11xns7rfxb9s9adzkd2v1s46s8lay6yd32r83p63k96z570ccpj2"; + version = "0.1.0"; + sha256 = "11s6v8h39iq0wy4p4y8cwpr8fjhphql07s38rgbm8qsq1hj9f3a1"; buildDepends = [ array base containers control-monad-omega dlist mtl pretty template-haskell @@ -33073,7 +33369,6 @@ self: { template-haskell test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://github.com/nedervold/context-free-grammar"; description = "Basic algorithms on context-free grammars"; license = stdenv.lib.licenses.bsd3; @@ -33229,7 +33524,6 @@ self: { homepage = "http://pepeiborra.github.com/control-monad-exception"; description = "Explicitly typed, checked exceptions with stack traces"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "control-monad-exception-monadsfd" = callPackage @@ -33246,7 +33540,6 @@ self: { homepage = "http://pepeiborra.github.com/control-monad-exception"; description = "Monads-fd instances for the EMT exceptions monad transformer"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "control-monad-exception-monadstf" = callPackage @@ -33263,7 +33556,6 @@ self: { homepage = "http://pepeiborra.github.com/control-monad-exception"; description = "Monads-tf instances for the EMT exceptions monad transformer"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "control-monad-exception-mtl" = callPackage @@ -33956,7 +34248,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cpphs" = callPackage + "cpphs_1_18_9" = callPackage ({ mkDerivation, base, directory, old-locale, old-time, polyparse }: mkDerivation { @@ -33971,6 +34263,21 @@ self: { license = "LGPL"; }) {}; + "cpphs" = callPackage + ({ mkDerivation, base, directory, old-locale, old-time, polyparse + }: + mkDerivation { + pname = "cpphs"; + version = "1.19"; + sha256 = "0fiyqyy7zzzbp0jsgl3syvm5db8n42h88ps7qzayxbsycjz9fp70"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base directory old-locale old-time polyparse ]; + homepage = "http://projects.haskell.org/cpphs/"; + description = "A liberalised re-implementation of cpp, the C pre-processor"; + license = "LGPL"; + }) {}; + "cprng-aes" = callPackage ({ mkDerivation, base, byteable, bytestring, cipher-aes , crypto-random @@ -34085,8 +34392,8 @@ self: { }: mkDerivation { pname = "cql"; - version = "3.0.1"; - sha256 = "02jgr0mm95hka82n2f3kg6ipyadz7gqgj2n4f7qxw27s5nszmz24"; + version = "3.0.2"; + sha256 = "0arp3nf6w7rqb1jxv2j20k4hps3zmdbz97qz500n7h5xx2s8p5c3"; buildDepends = [ base bytestring cereal Decimal iproute network template-haskell text time transformers uuid @@ -34095,6 +34402,7 @@ self: { base bytestring cereal Decimal iproute network QuickCheck tasty tasty-quickcheck text time uuid ]; + jailbreak = true; homepage = "https://github.com/twittner/cql/"; description = "Cassandra CQL binary protocol"; license = "unknown"; @@ -34108,8 +34416,8 @@ self: { }: mkDerivation { pname = "cql-io"; - version = "0.13.1"; - sha256 = "18vnwncpf18076bjqajrh6n0pkr9bmpcspf7v0s31df1lm6kxhcf"; + version = "0.13.2"; + sha256 = "155vz9ndwf6d7z94iq9kshbpxcqyf82lszg03x8qflmkn21i85kg"; buildDepends = [ async auto-update base bytestring containers cql data-default-class exceptions hashable iproute lens monad-control mtl mwc-random @@ -34120,7 +34428,6 @@ self: { homepage = "https://github.com/twittner/cql-io/"; description = "Cassandra CQL client"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cqrs" = callPackage @@ -34281,6 +34588,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) { crack = null;}; + "crackNum" = callPackage + ({ mkDerivation, base, data-binary-ieee754, ieee754 }: + mkDerivation { + pname = "crackNum"; + version = "1.1"; + sha256 = "12sr5dqm4cgmc2hk4fhn5zd4dqnhjzzb5hqldmj4s75xhpsnws10"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base data-binary-ieee754 ieee754 ]; + description = "Crack various integer, floating-point data formats"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "craftwerk" = callPackage ({ mkDerivation, base, colour, mtl, vector-space }: mkDerivation { @@ -34476,23 +34796,23 @@ self: { "criterion" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring - , cassava, containers, deepseq, directory, either, filepath, Glob - , hastache, HUnit, mtl, mwc-random, optparse-applicative, parsec - , QuickCheck, statistics, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers, vector - , vector-algorithms + , cassava, containers, deepseq, directory, filepath, Glob, hastache + , HUnit, mtl, mwc-random, optparse-applicative, parsec, QuickCheck + , statistics, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , transformers-compat, vector, vector-algorithms }: mkDerivation { pname = "criterion"; - version = "1.0.2.0"; - sha256 = "02mcb49hiv0gijj5343gffdd3r8hjf4d52llv2gradaijz4zdqhx"; + version = "1.1.0.0"; + sha256 = "0f1d8lxb9jhrhcm0gbqqimmq52q36b5h1nqznmjmxa75nqdx9vaw"; isLibrary = true; isExecutable = true; buildDepends = [ aeson ansi-wl-pprint base binary bytestring cassava containers - deepseq directory either filepath Glob hastache mtl mwc-random + deepseq directory filepath Glob hastache mtl mwc-random optparse-applicative parsec statistics text time transformers - vector vector-algorithms + transformers-compat vector vector-algorithms ]; testDepends = [ base bytestring HUnit QuickCheck statistics test-framework @@ -35043,8 +35363,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "4.3"; - sha256 = "11qy08pc1h83yj6qaw529bxrynzs8453ddih6qn2cqs9m35hy9vs"; + version = "4.4.1"; + sha256 = "03l7gbbiqs1djizda16hhi24pqgmqpdsfgl0dxvpzpvz703imfg5"; buildDepends = [ base Boolean colour csound-expression-opcodes csound-expression-typed data-default process @@ -35060,8 +35380,8 @@ self: { }: mkDerivation { pname = "csound-expression-dynamic"; - version = "0.1.0"; - sha256 = "0vbvah8icjnc2bjp8w21x8a48ijy598q09wgx68al4d4nya7fj4v"; + version = "0.1.2"; + sha256 = "05x9fbsm8ah2s7p81xzqmfvkxs81iplg1r334j6djcyab1waqa9i"; buildDepends = [ array base Boolean containers data-default data-fix data-fix-cse transformers wl-pprint @@ -35093,8 +35413,8 @@ self: { }: mkDerivation { pname = "csound-expression-typed"; - version = "0.0.6.1"; - sha256 = "1wqzh0gvb53410ingfvvja0yw4wbzn21sypmi0b13nssacbv1y7q"; + version = "0.0.7.1"; + sha256 = "163jkx5x3mnlcj0zxx9595i4bpp29lz60fgcdkx07vmqky7hb1ng"; buildDepends = [ base Boolean colour containers csound-expression-dynamic data-default deepseq ghc-prim stable-maps transformers wl-pprint @@ -35108,8 +35428,8 @@ self: { ({ mkDerivation, base, csound-expression, transformers }: mkDerivation { pname = "csound-sampler"; - version = "0.0.3.2"; - sha256 = "02gzrsqh0pvjdc5q33jm0psxr1yf7n81q73x200r2k416g0a5p7s"; + version = "0.0.4.0"; + sha256 = "03mymb5yk4hlf6nsmakxw0nyspvrs7882dmpx9r65lkpsvgnaxyp"; buildDepends = [ base csound-expression transformers ]; homepage = "https://github.com/anton-k/csound-sampler"; description = "A musical sampler based on Csound"; @@ -35373,7 +35693,6 @@ self: { homepage = "https://github.com/bmsherman/cublas"; description = "FFI bindings to the CUDA CUBLAS and CUSPARSE libraries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { cublas = null; cusparse = null;}; "cuboid" = callPackage @@ -35393,8 +35712,8 @@ self: { ({ mkDerivation, base, bytestring, c2hs, pretty }: mkDerivation { pname = "cuda"; - version = "0.6.6.0"; - sha256 = "0xa8wfqrgc0br7cr3g5j0i30kna07bci7vx05iw46fv445rhjv5y"; + version = "0.6.6.2"; + sha256 = "10c2nn0qhhznajpkjvmxivz3w6zr96fpsych53hnvpi2g6a332k1"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring pretty ]; @@ -35402,7 +35721,6 @@ self: { homepage = "https://github.com/tmcdonell/cuda"; description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cudd" = callPackage @@ -35434,7 +35752,6 @@ self: { homepage = "http://github.com/robeverest/cufft"; description = "Haskell bindings for the CUFFT library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "curl" = callPackage @@ -36534,6 +36851,7 @@ self: { base lazysmallcheck prelude-safeenum QuickCheck reflection smallcheck tagged ]; + jailbreak = true; homepage = "http://code.haskell.org/~wren/"; description = "Finite totally ordered sets"; license = stdenv.lib.licenses.bsd3; @@ -36555,8 +36873,8 @@ self: { ({ mkDerivation, base, containers, data-fix, transformers }: mkDerivation { pname = "data-fix-cse"; - version = "0.0.1"; - sha256 = "1jrkphyw1npj4f2vy7n6xap1v2h6glw0gwzjg0iyjnflhjgnfl2m"; + version = "0.0.2"; + sha256 = "1xn6qnir5dss23y8d71dsy78sdk7hczwprxir8v6la15c43rf9p2"; buildDepends = [ base containers data-fix transformers ]; homepage = "https://github.com/anton-k/data-fix-cse"; description = "Common subexpression elimination for the fixploint types"; @@ -36871,8 +37189,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "data-partition"; - version = "0.2.0.1"; - sha256 = "1pgl8xr91kscqpx2bgvgy7qcdl17pkw9m1xdy9k075jvammlfxk7"; + version = "0.3.0.0"; + sha256 = "05i8fg9q7fpc9jalhwbqpw6pfki2flqj4nqwgs3yfi0hvasvgjjb"; buildDepends = [ base containers ]; homepage = "https://github.com/luqui/data-partition"; description = "A pure disjoint set (union find) data structure"; @@ -37371,8 +37689,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "0.10.9.2"; - sha256 = "0xz1iajg8rmv1n21b0iifp3c6gywm75m4x4bir991m9j7v88ij6l"; + version = "0.10.10"; + sha256 = "0s14yb2bbi5n9m3xkznm4nbb0hpj9hmiwl0ppqqiml5s7xhwas6d"; buildDepends = [ base bytestring cereal containers libxml-sax network parsec random text transformers unix vector xml-types @@ -38700,6 +39018,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dgim" = callPackage + ({ mkDerivation, base, Cabal, QuickCheck }: + mkDerivation { + pname = "dgim"; + version = "0.0.3"; + sha256 = "1brffyfawrdgr2659hbda42mpn9jiiq474a0yd57kj7z0dzq25f6"; + buildDepends = [ base ]; + testDepends = [ base Cabal QuickCheck ]; + jailbreak = true; + homepage = "https://github.com/musically-ut/haskell-dgim"; + description = "Implementation of DGIM algorithm"; + license = stdenv.lib.licenses.mit; + }) {}; + "dgs" = callPackage ({ mkDerivation, base, HTTP, mtl, network, split }: mkDerivation { @@ -38766,8 +39098,8 @@ self: { }: mkDerivation { pname = "diagrams-builder"; - version = "0.6.0.3"; - sha256 = "1wcdn6hgacn0lmz7ivgz08fg02fscrbf0zz8785yq5mcssyq0r70"; + version = "0.6.0.4"; + sha256 = "11zpl1zk1cn71as8n86mg4c1whr59h9qaddkq7pfw7ni5whx0k3n"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -38792,15 +39124,14 @@ self: { }: mkDerivation { pname = "diagrams-cairo"; - version = "1.2.0.6"; - sha256 = "058sg89a3jlcr83azjkv7c9g1ylmkpnspyzflwrb3vwzz6glhh0a"; + version = "1.2.0.7"; + sha256 = "0z87qrp2z4j2x5zwwczrjw7kps7izcyb045665319kp9yp0dbzjk"; buildDepends = [ base bytestring cairo colour containers data-default-class diagrams-core diagrams-lib directory filepath hashable JuicyPixels lens mtl old-time optparse-applicative pango process split statestack time transformers unix vector ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams"; description = "Cairo backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -38814,14 +39145,13 @@ self: { }: mkDerivation { pname = "diagrams-canvas"; - version = "0.3.0.3"; - sha256 = "1qxqkj1chmr305mpgyafy79sdypis559xbjaaflxblq0m9890zyr"; + version = "0.3.0.4"; + sha256 = "1jc47y739rg51czny0z17pspskim4ss2jraw6h5gyhnr8f50rv5w"; buildDepends = [ base blank-canvas cmdargs containers data-default-class diagrams-core diagrams-lib lens mtl NumInstances optparse-applicative statestack text vector-space ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -38837,8 +39167,8 @@ self: { }: mkDerivation { pname = "diagrams-contrib"; - version = "1.1.2.5"; - sha256 = "1d7f9jjmfamqg9v6yrr23xw9qq55kk6n8wr51af7rjz09l3fgb3q"; + version = "1.1.2.6"; + sha256 = "0bkil4klkdx30q6hwdcag20fbgx04vcn9kl7196mccl7yhh1msi0"; buildDepends = [ arithmoi base circle-packing colour containers data-default data-default-class diagrams-core diagrams-lib force-layout lens @@ -38849,7 +39179,6 @@ self: { base containers diagrams-lib HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Collection of user contributions to diagrams EDSL"; license = stdenv.lib.licenses.bsd3; @@ -38862,13 +39191,12 @@ self: { }: mkDerivation { pname = "diagrams-core"; - version = "1.2.0.5"; - sha256 = "11h5k6r69b55lpl56265kqhcd66n0r6232il3cv8q30ad12azbcw"; + version = "1.2.0.6"; + sha256 = "1i8h7arzhq2qzkv9hjldz3vymcns7y1w3wn56w57k2sbx3vx0zls"; buildDepends = [ base containers dual-tree lens MemoTrie monoid-extras newtype semigroups vector-space vector-space-points ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams"; description = "Core libraries for diagrams EDSL"; license = stdenv.lib.licenses.bsd3; @@ -38895,8 +39223,8 @@ self: { }: mkDerivation { pname = "diagrams-haddock"; - version = "0.2.2.13"; - sha256 = "0113598w5vqp7ywd1d074sjxyvj7l25jajnx55hvr32f9slz6zwh"; + version = "0.2.2.14"; + sha256 = "0j2flbirqxvgvyv8s3d8cwiqz9w3p864g2wg5hsya8r30jmlyycl"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -38909,7 +39237,6 @@ self: { base containers haskell-src-exts lens parsec QuickCheck tasty tasty-quickcheck ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Preprocessor for embedding diagrams in Haddock documentation"; license = stdenv.lib.licenses.bsd3; @@ -38944,15 +39271,14 @@ self: { }: mkDerivation { pname = "diagrams-lib"; - version = "1.2.0.8"; - sha256 = "1g9z1ww2f2f6gq8q2aa362568632c5dnayhanx4vl2qdc7j1sz8f"; + version = "1.2.0.9"; + sha256 = "1naamjx7i9k3jwbvrz5jwhsfmri3jgjxqwalckyc473pclf6y4k9"; buildDepends = [ active array base colour containers data-default-class diagrams-core dual-tree filepath fingertree hashable intervals JuicyPixels lens MemoTrie monoid-extras optparse-applicative semigroups tagged vector-space vector-space-points ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; license = stdenv.lib.licenses.bsd3; @@ -38985,14 +39311,13 @@ self: { }: mkDerivation { pname = "diagrams-postscript"; - version = "1.1.0.4"; - sha256 = "02a1b68b25id7g70gcq508miibp3wxljxza9zh6g7ad44as8yy5q"; + version = "1.1.0.5"; + sha256 = "1nriv964zmzlcyqxb3drfbxsimg786n4bsyyy1020rchf3df8rp5"; buildDepends = [ base containers data-default-class diagrams-core diagrams-lib dlist filepath hashable lens monoid-extras mtl semigroups split vector-space ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Postscript backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -39019,15 +39344,14 @@ self: { }: mkDerivation { pname = "diagrams-rasterific"; - version = "0.1.0.7"; - sha256 = "180ip125phg6q7wvmsq57pdwfc8fq8a5vfadizcqfmc6ng6xzd88"; + version = "0.1.0.8"; + sha256 = "08a80w466hz89xp82n5yqqisd2vkd1876z4hw2p99bg22qr8b87k"; buildDepends = [ base bytestring containers data-default-class diagrams-core diagrams-lib directory filepath FontyFruity JuicyPixels lens mtl old-time optparse-applicative process Rasterific split statestack time unix ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Rasterific backend for diagrams"; license = stdenv.lib.licenses.bsd3; @@ -39053,15 +39377,14 @@ self: { }: mkDerivation { pname = "diagrams-svg"; - version = "1.1.0.4"; - sha256 = "11adbfvj5a8yzlbkqs433qgr7884n1vlff9vr6h9w1n0nc1amzpl"; + version = "1.1.0.5"; + sha256 = "0n4ljdym9cbq4n7ynx5caxlr26ai5ifzv9x0yvqydhczmm0n35xf"; buildDepends = [ base base64-bytestring blaze-markup blaze-svg bytestring colour containers diagrams-core diagrams-lib directory filepath hashable JuicyPixels lens monoid-extras mtl old-time process split time unix vector-space ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "SVG backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -39271,7 +39594,6 @@ self: { base blaze-bootstrap blaze-html digestive-functors digestive-functors-blaze http-types text ]; - jailbreak = true; description = "Speed up form designing using digestive functors and bootstrap"; license = stdenv.lib.licenses.mit; }) {}; @@ -40086,8 +40408,8 @@ self: { }: mkDerivation { pname = "distributed-process-p2p"; - version = "0.1.3.1"; - sha256 = "00dbw4p60lbfjfhi9xzyh1jjdndygw00xpirzcnl5f20370hdikh"; + version = "0.1.3.2"; + sha256 = "13m283cwlas0xzqxlrmnwmwimwy29hbvymavyqffd1b0k2m6ag31"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -40305,6 +40627,7 @@ self: { homepage = "https://github.com/jeremyjh/distributed-process-zookeeper"; description = "A Zookeeper back-end for Cloud Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-static" = callPackage @@ -41449,8 +41772,8 @@ self: { ({ mkDerivation, base, monoid-extras, newtype, semigroups }: mkDerivation { pname = "dual-tree"; - version = "0.2.0.5"; - sha256 = "077njr9m6x9n2id0419rn6v4xwb9nvxshrmas9pkknp52va4ljg5"; + version = "0.2.0.6"; + sha256 = "0zdmycfr7b2gf63r2w48ylhcywphz9v3z79im33q1wb7p7pjiacv"; buildDepends = [ base monoid-extras newtype semigroups ]; description = "Rose trees with cached and accumulating monoidal annotations"; license = stdenv.lib.licenses.bsd3; @@ -41636,8 +41959,8 @@ self: { }: mkDerivation { pname = "dynamic-cabal"; - version = "0.3.4"; - sha256 = "080hynvyrc5jbfm4v5l04iby70rf6fqa3ynbpj1njdh6xjc4wnlv"; + version = "0.3.5"; + sha256 = "0fkr3hps3v0ygcah4dpzfqyfxm0rj4knivbbarllzv86h042vwxw"; buildDepends = [ base containers data-default directory filepath ghc ghc-paths haskell-generate haskell-src-exts time void @@ -41657,13 +41980,12 @@ self: { }: mkDerivation { pname = "dynamic-graph"; - version = "0.1.0.5"; - sha256 = "002i8ck0xhgh6kd2z8hyw0c16d10sbc444n2kwgdb0mj4qsss8mn"; + version = "0.1.0.6"; + sha256 = "0ikyszx122amlg6vp6jvz16y2qndy4plwh2hq1xhi83xicjkc0x1"; buildDepends = [ base bytestring cairo colour deepseq either GLFW-b GLUtil OpenGL pango pipes transformers ]; - jailbreak = true; homepage = "https://github.com/adamwalker/dynamic-graph"; description = "Draw and update graphs in real time with OpenGL"; license = stdenv.lib.licenses.bsd3; @@ -42041,8 +42363,8 @@ self: { }: mkDerivation { pname = "ede"; - version = "0.2.7"; - sha256 = "0b632c476md2wrz0mcxbkc9c8crz2dgl58nfz25zjagqhqylslk6"; + version = "0.2.8"; + sha256 = "1pzqjs7560xkw51aqpivm6sgysnxs6c5jy4fnalvds79gk37yryh"; buildDepends = [ aeson ansi-wl-pprint base bifunctors bytestring comonad directory filepath free lens mtl parsers scientific semigroups text @@ -42054,7 +42376,6 @@ self: { homepage = "http://github.com/brendanhay/ede"; description = "Templating language with similar syntax and features to Liquid or Jinja2"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "edenmodules" = callPackage @@ -42135,6 +42456,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "edit-distance-vector" = callPackage + ({ mkDerivation, base, QuickCheck, quickcheck-instances, vector }: + mkDerivation { + pname = "edit-distance-vector"; + version = "1.0.0.1"; + sha256 = "1whpv0qm00fn0p8v6pgjy9kk04rw9p6ngwan4nrgi4kca0hvf8id"; + buildDepends = [ base vector ]; + testDepends = [ base QuickCheck quickcheck-instances vector ]; + homepage = "https://github.com/thsutton/edit-distance-vector"; + description = "Calculate edit distances and edit scripts between vectors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "edit-lenses" = callPackage ({ mkDerivation, base, containers, data-default, lattices, mtl }: mkDerivation { @@ -42194,8 +42528,8 @@ self: { }: mkDerivation { pname = "effect-handlers"; - version = "0.1.0.4"; - sha256 = "1qsr8xsv3hhk3m97zlzmpspjx9b4aghg0axyriwfy5mkbl3kqy93"; + version = "0.1.0.6"; + sha256 = "0i7glghwh35pfyzznzabaf8fnadk00lpajmasw5h5ndjl2dmqzy9"; buildDepends = [ base free kan-extensions mtl ]; testDepends = [ base hspec hspec-discover HUnit QuickCheck ]; homepage = "https://github.com/edofic/effect-handlers"; @@ -42553,6 +42887,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ekg-push" = callPackage + ({ mkDerivation, base, bytestring, ekg-core, text, time + , unordered-containers + }: + mkDerivation { + pname = "ekg-push"; + version = "0.0.2"; + sha256 = "1z41x3i7hvrnca3clrrz62kah3a4lik0f3gxhw3vnyqgszzb46l5"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bytestring ekg-core text time unordered-containers + ]; + homepage = "https://github.com/adarqui/ekg-push"; + description = "Small framework to push metric deltas to a broadcast channel using the ekg-core library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ekg-rrd" = callPackage ({ mkDerivation, base, directory, ekg-core, HUnit, mtl, process , test-framework, test-framework-hunit, text, time @@ -42645,8 +42997,8 @@ self: { ({ mkDerivation, base, extensible, transformers }: mkDerivation { pname = "elevator"; - version = "0.2.2"; - sha256 = "1rnxvhyxgjb9ma680d713i0cqbsq0y8s1d57z2zx5qyq10jshcnm"; + version = "0.2.3"; + sha256 = "1m509dh5k9ci87g22gd2j8lfg4hm4wn156gvd86p3r636c5hbdw2"; buildDepends = [ base extensible transformers ]; homepage = "https://github.com/fumieval/elevator"; description = "Immediately lifts to a desired level"; @@ -43400,8 +43752,8 @@ self: { }: mkDerivation { pname = "epic"; - version = "0.9.3.2"; - sha256 = "1l73absns4ci20brkdjg1r1l9p4xxx88vax736diqik7rl7zrx9h"; + version = "0.9.3.3"; + sha256 = "0ap8jr11sk8v2sdi03pahjhaxx3mc4ba7qbh3m8nsg0g5wr4962m"; isLibrary = true; isExecutable = true; buildDepends = [ array base Cabal directory mtl process ]; @@ -43555,7 +43907,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "equivalence" = callPackage + "equivalence_0_2_5" = callPackage ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans , template-haskell, test-framework, test-framework-quickcheck2 }: @@ -43573,6 +43925,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "equivalence" = callPackage + ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans + , template-haskell, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "equivalence"; + version = "0.3"; + sha256 = "1fp8zyhl93jndk9xqb5qxsn5hab5xiipilng2n0wcpaqii3rzka0"; + buildDepends = [ base containers mtl STMonadTrans ]; + testDepends = [ + base containers mtl QuickCheck STMonadTrans template-haskell + test-framework test-framework-quickcheck2 + ]; + jailbreak = true; + homepage = "https://bitbucket.org/paba/equivalence/"; + description = "Maintaining an equivalence relation implemented as union-find using STT"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "erd" = callPackage ({ mkDerivation, base, bytestring, containers, graphviz, parsec , text @@ -43746,12 +44117,12 @@ self: { }) {}; "errorcall-eq-instance" = callPackage - ({ mkDerivation, base, hspec, QuickCheck }: + ({ mkDerivation, base, base-compat, hspec, QuickCheck }: mkDerivation { pname = "errorcall-eq-instance"; - version = "0.1.0"; - sha256 = "1sr2wxbdqzpdawcivvd01nwpki0xbcxylz5qv95b96sq6b296gkk"; - buildDepends = [ base ]; + version = "0.2.0.1"; + sha256 = "0df2w882bnm9khkwvs8f1p8svaqjz5vpsidgwx5dd01ypjqkzzq5"; + buildDepends = [ base base-compat ]; testDepends = [ base hspec QuickCheck ]; description = "An orphan Eq instance for ErrorCall"; license = stdenv.lib.licenses.mit; @@ -43857,8 +44228,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "2.1.2.1"; - sha256 = "0lynhkbrxxrngvdj5d4xlmi92s4m3dzdpd7gs1k408slil2i7r7i"; + version = "2.1.2.2"; + sha256 = "1sklvl3fl7sq64i5k5jrhc6xvfa4a1a6dfbnzl2alq65x73jzna6"; buildDepends = [ base conduit monad-logger persistent resourcet tagged text transformers unordered-containers @@ -44142,8 +44513,8 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "0.7.0.0"; - sha256 = "1nc5y2j6yrns3nyy3jhp99qvkzfm0r36snbcy4982b5p21kgpi98"; + version = "0.7.0.1"; + sha256 = "1k94kh1wgskhh51by522sz58lzxpgv8qddfalwjmy845dfivbswg"; buildDepends = [ aeson async base bytestring cereal containers network protobuf random sodium text time uuid @@ -44248,13 +44619,12 @@ self: { }: mkDerivation { pname = "exception-monads-tf"; - version = "0.3.0.3"; - sha256 = "1smmbdiqp2qxa13sv2j7sqyakvsv1g7g9mh9z65b756ss672913x"; + version = "0.4"; + sha256 = "0k9ada0g4nxwxggarpfcfdzg2zvxqdg9bkb4hv5v3qqanjmvb9hg"; buildDepends = [ base exception-transformers monads-tf transformers ]; jailbreak = true; - homepage = "http://www.cs.drexel.edu/~mainland/"; description = "Exception monad transformer instances for monads-tf classes"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -44263,27 +44633,26 @@ self: { ({ mkDerivation, base, exception-transformers, mtl, transformers }: mkDerivation { pname = "exception-mtl"; - version = "0.3.0.5"; - sha256 = "1rqrh1wbm67w9rbh1gg5zsavlsw9nfw0hnbs9q2djglh73pq3iqj"; + version = "0.4"; + sha256 = "1ya2xxl25afj2rxl2vziifrc91nzyg47vs06s0b65qjd7yz533j3"; buildDepends = [ base exception-transformers mtl transformers ]; - homepage = "http://www.cs.drexel.edu/~mainland/"; - description = "Exception monad transformer instances for mtl2 classes"; + description = "Exception monad transformer instances for mtl classes"; license = stdenv.lib.licenses.bsd3; }) {}; "exception-transformers" = callPackage ({ mkDerivation, base, HUnit, stm, test-framework - , test-framework-hunit, transformers + , test-framework-hunit, transformers, transformers-compat }: mkDerivation { pname = "exception-transformers"; - version = "0.3.0.4"; - sha256 = "1m4mwgzynymdjvrrrvl90q468pgwik07yy2lsff9spxhcd43w2ra"; - buildDepends = [ base stm transformers ]; + version = "0.4.0.1"; + sha256 = "1ay46wawrrsvii3b4kqxi2cg3b6r7wfw0l7d66il195qa6hh4sfq"; + buildDepends = [ base stm transformers transformers-compat ]; testDepends = [ base HUnit test-framework test-framework-hunit transformers + transformers-compat ]; - homepage = "http://www.cs.drexel.edu/~mainland/"; description = "Type classes and monads for unchecked extensible exceptions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -44378,13 +44747,19 @@ self: { }) {}; "exp-pairs" = callPackage - ({ mkDerivation, base, matrix, memoize, QuickCheck, smallcheck }: + ({ mkDerivation, base, ghc-prim, matrix, memoize, QuickCheck + , random, smallcheck, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck + }: mkDerivation { pname = "exp-pairs"; - version = "0.1.1.0"; - sha256 = "1n44vr6lan90z9vgcs25rgjkpz5b27sacr0g669igkb2c3prcbkf"; - buildDepends = [ base matrix memoize ]; - testDepends = [ base matrix memoize QuickCheck smallcheck ]; + version = "0.1.2.0"; + sha256 = "0iz22m8m4pk87xnpdgklw9d6ycf8s3sblyz8g78ykyvf0bf347zs"; + buildDepends = [ base ghc-prim memoize ]; + testDepends = [ + base matrix memoize QuickCheck random smallcheck tasty tasty-hunit + tasty-quickcheck tasty-smallcheck + ]; homepage = "https://github.com/Bodigrim/exp-pairs"; description = "Linear programming over exponent pairs"; license = stdenv.lib.licenses.gpl3; @@ -44428,10 +44803,8 @@ self: { }: mkDerivation { pname = "expiring-cache-map"; - version = "0.0.5.3"; - revision = "1"; - sha256 = "0ihyfhkqdr29pmcb2pylrj6p2xmfgfz9qw6dabxxy8dbcg38ppvf"; - editedCabalFile = "e3990400b7a0fc202dd68fb9d4fea926af9fdaeb34d2e9cf7e04eb3c2a03da4c"; + version = "0.0.5.4"; + sha256 = "0wbx9qp9ki9gwrc9qafpflkmyj1yiryak1di163mz0i3dv2w73h8"; buildDepends = [ base containers hashable unordered-containers ]; testDepends = [ base bytestring containers hashable time unordered-containers @@ -44642,6 +45015,7 @@ self: { version = "0.2.0"; sha256 = "1dg9zvqszlg5v3mygazzgm84qlkcmpryv3vv4x3zwrzi1g0idq72"; buildDepends = [ base constraints ghc-prim tagged ]; + jailbreak = true; homepage = "github.com/ian-mi/extended-categories"; description = "Extended Categories"; license = stdenv.lib.licenses.bsd3; @@ -44671,8 +45045,8 @@ self: { ({ mkDerivation, base, binary, constraints, template-haskell }: mkDerivation { pname = "extensible"; - version = "0.3.1"; - sha256 = "09vz1z2v2jgn0lrnb8pkgr3r5xbcqmpww671q75nyi74f308zn2n"; + version = "0.3.2"; + sha256 = "1fb027d14100s384mhl0g09jpjxqam85g6yh0pnwcn3g4fzq0fln"; buildDepends = [ base binary constraints template-haskell ]; homepage = "https://github.com/fumieval/extensible"; description = "Extensible, efficient, lens-friendly data types"; @@ -44971,10 +45345,12 @@ self: { mkDerivation { pname = "farmhash"; version = "0.1.0.2"; + revision = "1"; sha256 = "0k2x3si0px55widz3kgfdrm6y39lkwfahfqlfyr001vv6h4my0mq"; + editedCabalFile = "cd08b430fb52fb06590611fdcc555d9056c2d982e8f3c7d6be7b17b0c4b19865"; buildDepends = [ base bytestring ]; testDepends = [ base bytestring hspec QuickCheck ]; - homepage = "https://github.com/abhinav/haskell-farmhash"; + homepage = "https://github.com/abhinav/farmhash"; description = "Fast hash functions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -44985,8 +45361,8 @@ self: { }: mkDerivation { pname = "fast-logger"; - version = "2.3.0"; - sha256 = "1ii4wkpsi5w2230bzhnzcpgckd5gkawckws2vyggw78b91dw9dc5"; + version = "2.3.1"; + sha256 = "02smmj62jir0c4ix929xy7zsd03djp53hxps0wgqga1f123gksri"; buildDepends = [ array auto-update base bytestring bytestring-builder directory filepath text @@ -45137,31 +45513,29 @@ self: { "fay" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default - , directory, filepath, ghc-paths, haskell-names, haskell-packages - , haskell-src-exts, language-ecmascript, mtl, mtl-compat - , optparse-applicative, process, safe, sourcemap, split, spoon, syb - , text, time, transformers, transformers-compat, uniplate - , unordered-containers, utf8-string, vector + , data-lens-light, directory, filepath, ghc-paths, haskell-src-exts + , language-ecmascript, mtl, mtl-compat, optparse-applicative + , process, safe, sourcemap, split, spoon, syb, text, time + , transformers, transformers-compat, traverse-with-class, type-eq + , uniplate, unordered-containers, utf8-string, vector }: mkDerivation { pname = "fay"; - version = "0.23.1.1"; - sha256 = "1g16j84yp348n12mgyry6qz3m5b1iz7hiv3ri3kp95577w9baxqp"; + version = "0.23.1.4"; + sha256 = "1l8r7d4iwwkq0m9cskwfv38i89cr8sqxidrc59z62yp05ilcs5r6"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base bytestring containers data-default directory filepath - ghc-paths haskell-names haskell-packages haskell-src-exts - language-ecmascript mtl mtl-compat optparse-applicative process - safe sourcemap split spoon syb text time transformers - transformers-compat uniplate unordered-containers utf8-string - vector + aeson base bytestring containers data-default data-lens-light + directory filepath ghc-paths haskell-src-exts language-ecmascript + mtl mtl-compat optparse-applicative process safe sourcemap split + spoon syb text time transformers transformers-compat + traverse-with-class type-eq uniplate unordered-containers + utf8-string vector ]; - jailbreak = true; homepage = "https://github.com/faylang/fay/wiki"; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-base" = callPackage @@ -45174,7 +45548,6 @@ self: { homepage = "https://github.com/faylang/fay/"; description = "The base package for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-builder" = callPackage @@ -45183,14 +45556,13 @@ self: { }: mkDerivation { pname = "fay-builder"; - version = "0.2.0.3"; - sha256 = "1kkx6abrvbd2cdwpgdx7cpwyfqpk31zwrxfw9kr1ngayf7sgzc9s"; + version = "0.2.0.4"; + sha256 = "0x1y9d2hgi3ky7f7ydc43dyd54dsmqcgxj6g8n2x3yfrcjkljq05"; buildDepends = [ base Cabal data-default directory fay filepath safe split text ]; description = "Compile Fay code on cabal install, and ad-hoc recompile during development"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-dom" = callPackage @@ -45203,7 +45575,6 @@ self: { homepage = "https://github.com/faylang/fay-dom"; description = "DOM FFI wrapper library for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-hsx" = callPackage @@ -45230,7 +45601,6 @@ self: { homepage = "https://github.com/faylang/fay-jquery"; description = "jQuery bindings for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-ref" = callPackage @@ -45243,7 +45613,6 @@ self: { homepage = "https://github.com/A1kmm/fay-ref"; description = "Like IORef but for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-text" = callPackage @@ -45256,7 +45625,6 @@ self: { homepage = "https://github.com/faylang/fay-text"; description = "Fay Text type represented as JavaScript strings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-uri" = callPackage @@ -45269,7 +45637,6 @@ self: { homepage = "https://github.com/faylang/fay-uri"; description = "Persistent FFI bindings for using jsUri in Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fb" = callPackage @@ -45425,10 +45792,9 @@ self: { ({ mkDerivation, base, text }: mkDerivation { pname = "feature-flags"; - version = "0.1.0.0"; - sha256 = "1xkmzpdc7920vjkz3v77ds1wf2c896rkxykdd36my6aw85qg9pa6"; + version = "0.1.0.1"; + sha256 = "1lssjgksq0k2dd7l5lmzxnr9f5zk3gbh386zfmcqgc4iczdzfk0f"; buildDepends = [ base text ]; - jailbreak = true; homepage = "https://github.com/iand675/feature-flags"; description = "A simple library for dynamically enabling and disabling functionality"; license = stdenv.lib.licenses.mit; @@ -45657,8 +46023,8 @@ self: { ({ mkDerivation, base, containers, regex-compat }: mkDerivation { pname = "fez-conf"; - version = "1.0.2"; - sha256 = "08rhkfwh7dq7x42g9mnil5naamvxn5p2mihssmqyhj8g84safrja"; + version = "1.0.3"; + sha256 = "1gssbkwg9lqm3ajqkkcjnxjz8nhz855ki2hi5n2di3dappr73f0b"; buildDepends = [ base containers regex-compat ]; homepage = "http://ui3.info/d/proj/fez-conf.html"; description = "Simple functions for loading config files"; @@ -45944,15 +46310,16 @@ self: { }) {}; "filecache" = callPackage - ({ mkDerivation, base, directory, hashable, hinotify, lens, mtl - , stm, strict-base-types, temporary, unordered-containers + ({ mkDerivation, base, directory, exceptions, hashable, hinotify + , lens, mtl, stm, strict-base-types, temporary + , unordered-containers }: mkDerivation { pname = "filecache"; - version = "0.2.5"; - sha256 = "0yx255yl8v8knhbnzahx2v606y23nmgh5hs65dqcxmhyh53wawda"; + version = "0.2.8"; + sha256 = "0dkdjj29dqgdywzxc24l54v8xqxrqy65l43ig2qr3l381mqi87lf"; buildDepends = [ - base hashable hinotify lens mtl stm strict-base-types + base exceptions hashable hinotify lens mtl stm strict-base-types unordered-containers ]; testDepends = [ base directory temporary unordered-containers ]; @@ -45961,6 +46328,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "filediff" = callPackage + ({ mkDerivation, base, data-default, data-memocombinators + , directory, either, mtl, tasty, tasty-hunit, text, time + , transformers, Zora + }: + mkDerivation { + pname = "filediff"; + version = "0.1.0.3"; + sha256 = "1z52hv2s0rh8z9m4jnh3zqhbplsqf3i8pcq2gnf561hgkqjh8pqi"; + buildDepends = [ + base data-default data-memocombinators directory either mtl tasty + tasty-hunit text time transformers Zora + ]; + testDepends = [ + base directory either mtl tasty tasty-hunit text time transformers + ]; + homepage = "https://github.com/bgwines/filediff"; + description = "Diffing and patching module"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "filelock" = callPackage ({ mkDerivation, base, unix }: mkDerivation { @@ -46038,8 +46426,8 @@ self: { }: mkDerivation { pname = "filestore"; - version = "0.6.0.4"; - sha256 = "1b3ymdqwcn84m8kkybshx10bfylby49i0yhbassvlgf0n096lp12"; + version = "0.6.0.6"; + sha256 = "1lknngdg1c4a58qxbzzvpy72nx1pncm2p4akid2b3s7ydl7j96xr"; buildDepends = [ base bytestring containers Diff directory filepath old-locale parsec process split time utf8-string xml @@ -46110,10 +46498,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "filtrable"; - version = "0.1.0.0"; - sha256 = "0hxnfjmwv1p1izxr5h7qrd5zdynj2c8k4zh198pinav5skf6v3kd"; + version = "0.1.0.2"; + sha256 = "0dfw08pqw4wlja1iavb8zz0rkr97hd7fg1v2akng8n7shmjhgbl5"; buildDepends = [ base ]; - jailbreak = true; + homepage = "https://github.com/strake/filtrable.hs"; description = "Class of filtrable containers"; license = "unknown"; }) {}; @@ -46162,8 +46550,8 @@ self: { }: mkDerivation { pname = "fingertree"; - version = "0.1.0.1"; - sha256 = "02448wi1z0zxiin749w00z55pjm8d1wkhx53rmmfwq2vjzr8akvx"; + version = "0.1.0.2"; + sha256 = "1krsymv66lnz30hv3j2427vl1wh7vczjb66qviq8mfxgfxf2q8z6"; buildDepends = [ base ]; testDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -46357,6 +46745,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fixed-length" = callPackage + ({ mkDerivation, base, non-empty, utility-ht }: + mkDerivation { + pname = "fixed-length"; + version = "0.1"; + sha256 = "115j7bc6s45qn87hamy4w1ih247cxhyhrzaz244sw4qfkxypigkj"; + buildDepends = [ base non-empty utility-ht ]; + homepage = "http://code.haskell.org/~thielema/fixed-length/"; + description = "Lists with statically known length based on non-empty package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fixed-list" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -46440,12 +46840,12 @@ self: { }) {}; "fixed-vector" = callPackage - ({ mkDerivation, base, doctest, filemanip, primitive }: + ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: mkDerivation { pname = "fixed-vector"; - version = "0.7.0.3"; - sha256 = "119302bbv2v3k77kr158bp8sd6zhqzsyslcyq1vncng1ay0vzf8g"; - buildDepends = [ base primitive ]; + version = "0.8.0.0"; + sha256 = "1hlg0rbi2phk7qr7nvjnazg344jqp5p13c3m8v5n01vw9bvjbnir"; + buildDepends = [ base deepseq primitive ]; testDepends = [ base doctest filemanip primitive ]; description = "Generic vectors with statically known size"; license = stdenv.lib.licenses.bsd3; @@ -46506,6 +46906,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fixedwidth-hs" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, text }: + mkDerivation { + pname = "fixedwidth-hs"; + version = "0.3.0.0"; + sha256 = "0azqjz559vrz4l65ylvnlihlfvblycwnbb9w0rq7kpcfb4rj2iic"; + isLibrary = true; + isExecutable = true; + buildDepends = [ aeson attoparsec base bytestring text ]; + homepage = "https://github.com/michaelochurch/fixedwidth-hs"; + description = "Quick parsing of fixed-width data formats"; + license = stdenv.lib.licenses.mit; + }) {}; + "fixhs" = callPackage ({ mkDerivation, attoparsec, attoparsec-enumerator, base , bytestring, containers, deepseq, dlist, enumerator, HaXml @@ -46582,8 +46996,8 @@ self: { }: mkDerivation { pname = "flaccuraterip"; - version = "0.3.3"; - sha256 = "0l6lh7ji8qp11jj4cc29b1f5lmr2cqb76krccc8p9jfizdxia8fl"; + version = "0.3.4"; + sha256 = "0vx4fn1d8i2qh0q20vijhp7yc0zcvjdwk1v7f7ra0kbm4ygmi38h"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -46808,6 +47222,18 @@ self: { license = "unknown"; }) {}; + "flow" = callPackage + ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: + mkDerivation { + pname = "flow"; + version = "1.0.0"; + sha256 = "15vr7d1fyabr9v9r9vnh9m2x0r2i0ggg714cc7r6zxhjbrrc9rbn"; + buildDepends = [ base ]; + testDepends = [ base doctest QuickCheck template-haskell ]; + description = "Functions and operators for more understandable Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "flow2dot" = callPackage ({ mkDerivation, base, containers, mtl, parsec, QuickCheck , utf8-string @@ -46942,8 +47368,8 @@ self: { }: mkDerivation { pname = "fluent-logger"; - version = "0.2.2.0"; - sha256 = "0gg9nhfmhi7qz79i4jbqixyw032sk394gmcjcb3hna09jqas71ab"; + version = "0.2.3.0"; + sha256 = "1zmkb36ki30chvjfabm1vn4xzixf8dk2y5ryy72as5c9n6xnkkkq"; buildDepends = [ base bytestring cereal containers messagepack network network-socket-options random stm text time vector @@ -47020,8 +47446,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "focus"; - version = "0.1.3"; - sha256 = "11l6rlr22m0z41c9fynpisj0cnx70zzcxhsakz9b09ap8wj0raqy"; + version = "0.1.4"; + sha256 = "0h6q48ybcch1p15f4x56ya4d8mn4dwzbfjx573dy6z3x12v7qi2n"; buildDepends = [ base ]; homepage = "https://github.com/nikita-volkov/focus"; description = "A general abstraction for manipulating elements of container data structures"; @@ -47034,8 +47460,8 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.0.8"; - sha256 = "1v8g1n17lwjwr2d1r3zam44qlm3jrr5j30d4cs4n4gf5pgxlrzvp"; + version = "1.0.9"; + sha256 = "10y9r4h6a6na0gpf5sy5mm34k94swisv6wbj2k210zyfvnrx9r36"; buildDepends = [ base bytestring containers primitive text transformers vector ]; @@ -47198,13 +47624,12 @@ self: { }: mkDerivation { pname = "force-layout"; - version = "0.3.0.10"; - sha256 = "0s3q1az0fvx1kn79nsz3d7d4gampcz4yyp9nmqj9baip1lws6k36"; + version = "0.3.0.11"; + sha256 = "01cjj30xf34j7c8nk0pbrsy7zp1pyl9qwq3mvnvbikrjqbhdylhh"; buildDepends = [ base containers data-default-class lens vector-space vector-space-points ]; - jailbreak = true; description = "Simple force-directed layout"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -47223,6 +47648,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "forecast-io" = callPackage + ({ mkDerivation, aeson, base, text }: + mkDerivation { + pname = "forecast-io"; + version = "0.1.0.0"; + sha256 = "0z2hv8lv75zij9arvxdircc0db0r0m86fgk5496hh1gvxxd5pqw6"; + buildDepends = [ aeson base text ]; + homepage = "https://github.com/stormont/forecast-io"; + description = "A Haskell library for working with forecast.io data."; + license = stdenv.lib.licenses.bsd3; + }) {}; + "foreign-storable-asymmetric" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -48758,8 +49195,8 @@ self: { ({ mkDerivation, base, GConf, glib, gtk2hs-buildtools, text }: mkDerivation { pname = "gconf"; - version = "0.13.0.1"; - sha256 = "13api4n1jagbminbz4k55x5ryyxgk01r77mwhr6542awc54brpy1"; + version = "0.13.0.2"; + sha256 = "0xyxia19bfpi4pd118d33z8gi5cnyygs3idrby7zrmj69rnwj2lk"; buildDepends = [ base glib text ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ GConf ]; @@ -49004,10 +49441,8 @@ self: { }: mkDerivation { pname = "generic-aeson"; - version = "0.2.0.2"; - revision = "1"; - sha256 = "1x58c7xgdc1asg4n61fpikn7jvspyqawykq4q49xhsp5dp11lzzh"; - editedCabalFile = "51683167451b51086821ec0cb41902f0471a2444aa81a5cf66cc68838f47f99d"; + version = "0.2.0.4"; + sha256 = "1h5vj66dx25iais9yia33ia95nr0ywxsbnrcm71v50jvj73ywhbx"; buildDepends = [ aeson attoparsec base generic-deriving mtl tagged text unordered-containers vector @@ -49096,6 +49531,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-pretty" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers + , tasty, tasty-hunit, text, vector + }: + mkDerivation { + pname = "generic-pretty"; + version = "0.1.0"; + sha256 = "0mg7mdbxf3va0xl2j0kz5wzy3mg6nvxv68axfjvx1zij1yjlamn7"; + buildDepends = [ + ansi-wl-pprint base bytestring containers text vector + ]; + testDepends = [ + base bytestring containers tasty tasty-hunit text vector + ]; + jailbreak = true; + homepage = "https://github.com/tanakh/generic-pretty"; + description = "Pretty printing for Generic value"; + license = stdenv.lib.licenses.mit; + }) {}; + "generic-server" = callPackage ({ mkDerivation, base, bytestring, network }: mkDerivation { @@ -49173,8 +49628,8 @@ self: { ({ mkDerivation, base, ghc-prim, template-haskell }: mkDerivation { pname = "generics-sop"; - version = "0.1.1.1"; - sha256 = "1g532p1k8df7vfwfh4zwj4s020k4c9ncvc68xy0hniijy61ncc5n"; + version = "0.1.1.2"; + sha256 = "1r9icxwyh4pg952yaywk4nfj4j21klzf361z9z24avd6vw89p6v7"; buildDepends = [ base ghc-prim template-haskell ]; description = "Generic Programming using True Sums of Products"; license = stdenv.lib.licenses.bsd3; @@ -49398,6 +49853,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "geoip2" = callPackage + ({ mkDerivation, base, binary, bytestring, bytestring-mmap + , containers, iproute, reinterpret-cast, text + }: + mkDerivation { + pname = "geoip2"; + version = "0.1.0.0"; + sha256 = "11vpk32kbsgvzq45brpmy6hn5ibcmpgjh2lqxp1s2y87fx6g9y6h"; + buildDepends = [ + base binary bytestring bytestring-mmap containers iproute + reinterpret-cast text + ]; + description = "Pure haskell interface to MaxMind GeoIP database"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "geojson" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, doctest , filepath, hlint, lens, QuickCheck, semigroups, text, transformers @@ -49452,6 +49923,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "getopt-generics" = callPackage + ({ mkDerivation, base, generics-sop, hspec, safe, silently }: + mkDerivation { + pname = "getopt-generics"; + version = "0.1.1"; + sha256 = "1cf1mhc7wf8s0sbnq0a3xn8v5w1aw2py78flzanj9slz7cr02gqb"; + buildDepends = [ base generics-sop safe ]; + testDepends = [ base generics-sop hspec silently ]; + description = "Simple command line argument parsing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "getopt-simple" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -49539,7 +50022,6 @@ self: { homepage = "http://github.com/vincenthz/ghc-core-html"; description = "Core to HTML display"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-datasize" = callPackage @@ -49884,12 +50366,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-prim_0_3_1_0" = callPackage + "ghc-prim_0_4_0_0" = callPackage ({ mkDerivation, rts }: mkDerivation { pname = "ghc-prim"; - version = "0.3.1.0"; - sha256 = "1726hddr7lyklagni1f7m27yak35ailn1zy6401ripppj3m0f03b"; + version = "0.4.0.0"; + sha256 = "1w3hkl1xyfi67kh65gqn99pinxrfqjl2s08yg0010r907w3qys31"; buildDepends = [ rts ]; description = "GHC primitives"; license = stdenv.lib.licenses.bsd3; @@ -49910,10 +50392,8 @@ self: { ({ mkDerivation, array, base, containers, ghc, hpc }: mkDerivation { pname = "ghc-srcspan-plugin"; - version = "0.2.0.0"; - revision = "1"; - sha256 = "14p2c20xsng1h7129fadvhxs2yy2c865x19vybmzsj5ibjrzrqk2"; - editedCabalFile = "540c5844d127af020f38cde32f12c531f2c4953fca5e896faf2a25f33d2a3e94"; + version = "0.2.1.0"; + sha256 = "1cb669zhgibv9x7c924333kyzqa728031invr0smdnv0a2mgi2wi"; buildDepends = [ array base containers ghc hpc ]; description = "Generic GHC Plugin for annotating Haskell code with source location data"; license = stdenv.lib.licenses.bsd3; @@ -49959,6 +50439,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-typelits-natnormalise" = callPackage + ({ mkDerivation, base, ghc, tasty, tasty-hunit }: + mkDerivation { + pname = "ghc-typelits-natnormalise"; + version = "0.1"; + sha256 = "0c4kl0sz7dvyzf3hcwclcgxi631gvdmyr227d4p0v3zd4p2bs75k"; + buildDepends = [ base ghc ]; + testDepends = [ base tasty tasty-hunit ]; + jailbreak = true; + homepage = "http://www.clash-lang.org/"; + description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "ghc-vis" = callPackage ({ mkDerivation, base, cairo, containers, deepseq, fgl , ghc-heap-view, graphviz, gtk, mtl, svgcairo, text, transformers @@ -50107,7 +50601,6 @@ self: { buildDepends = [ base glib gtk3 mtl text transformers webkitgtk3 ]; description = "DOM library that supports both GHCJS and WebKitGTK"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-dom-hello" = callPackage @@ -50122,7 +50615,6 @@ self: { homepage = "https://github.com/ghcjs/ghcjs-dom-hello"; description = "GHCJS DOM Hello World, an example package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghclive" = callPackage @@ -50227,8 +50719,8 @@ self: { }: mkDerivation { pname = "gio"; - version = "0.13.0.4"; - sha256 = "1g2nwllgrckgg8kcgmripx8wqc664601kv4r7h4qq3v6hghvhdja"; + version = "0.13.1.0"; + sha256 = "1qxbdjznxz56jw108cc78lzwh1r4g8l2jcaz2bh2akc1nwhv2x5j"; buildDepends = [ array base bytestring containers glib mtl ]; buildTools = [ gtk2hs-buildtools ]; homepage = "http://projects.haskell.org/gtk2hs/"; @@ -50243,15 +50735,14 @@ self: { }: mkDerivation { pname = "gipeda"; - version = "0.1.0.1"; - sha256 = "1za5pgnkyq0lf7fj5fdajz326kjvribd719ba21nzn2ixfzp7lri"; + version = "0.1.0.2"; + sha256 = "0d3pbssndmlzmhk88214mz77jmgqh3ca2l8si9fr5v9wi0v5d8yz"; isLibrary = false; isExecutable = true; buildDepends = [ aeson base bytestring cassava containers directory filepath shake split text unordered-containers vector yaml ]; - jailbreak = true; homepage = "https://github.com/nomeata/gipeda"; description = "Git Performance Dashboard"; license = stdenv.lib.licenses.mit; @@ -50316,8 +50807,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "5.20150317"; - sha256 = "1n57h97z6jw1pqxmkgfy7s24f88ypskgvsw3gcfyah9inkx1rhr5"; + version = "5.20150327"; + sha256 = "1yhqb6iig5ny90dg5ql0wbpdjza0qn8l6005d20k9dkyc9k98c0y"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -50390,7 +50881,6 @@ self: { homepage = "https://github.com/singpolyma/git-date-haskell"; description = "Bindings to the date parsing from Git"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "git-embed" = callPackage @@ -50676,6 +51166,18 @@ self: { license = "unknown"; }) {}; + "github-utils" = callPackage + ({ mkDerivation, base, basic-prelude, github, text }: + mkDerivation { + pname = "github-utils"; + version = "0.1.0"; + sha256 = "1d7g1rzaqg19bc41vqvcdxdi37z9h7ajy3khsqa4pwbfavj412a5"; + buildDepends = [ base basic-prelude github text ]; + homepage = "https://github.com/greenrd/github-utils"; + description = "Useful functions that use the GitHub API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gitignore" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , http-conduit, network, safe, text @@ -50707,8 +51209,8 @@ self: { }: mkDerivation { pname = "gitit"; - version = "0.10.6.1"; - sha256 = "1l6zra0yiwrmiycblp25b5yd1yrz94537l8zkspkf7z6wc8vdkn0"; + version = "0.10.6.2"; + sha256 = "0n4g4v6mdqml83vz5gz48l58747xnzz1h645kj6pwygfg4s48nza"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -50720,7 +51222,6 @@ self: { random recaptcha safe SHA split syb tagsoup text time uri url utf8-string uuid xhtml xml xss-sanitize zlib ]; - jailbreak = true; homepage = "http://gitit.net"; description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; @@ -50941,8 +51442,8 @@ self: { }: mkDerivation { pname = "gl"; - version = "0.7.3"; - sha256 = "009xn7f65dahjy6qadc7c1h45gvkpv30yd5s3i6scs79cgaw9kb6"; + version = "0.7.4"; + sha256 = "08b7mayd1qfalqrr2zh8ra7mm05l2inifjamvxn84697mnvxhjg7"; buildDepends = [ base containers directory filepath fixed half hxt split transformers @@ -51130,7 +51631,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "gloss" = callPackage + "gloss_1_9_2_1" = callPackage ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim , gloss-rendering, GLUT, OpenGL }: @@ -51147,6 +51648,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss" = callPackage + ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim + , gloss-rendering, GLUT, OpenGL + }: + mkDerivation { + pname = "gloss"; + version = "1.9.3.1"; + sha256 = "01a4l164f7ffwskd626q10z9klsbn6dkh3nbik3iq68426jryvns"; + buildDepends = [ + base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL + ]; + jailbreak = true; + homepage = "http://gloss.ouroborus.net"; + description = "Painless 2D vector graphics, animations and simulations"; + license = stdenv.lib.licenses.mit; + }) {}; + "gloss-accelerate" = callPackage ({ mkDerivation, accelerate, accelerate-cuda, base, gloss }: mkDerivation { @@ -51159,16 +51677,16 @@ self: { jailbreak = true; description = "Extras to interface Gloss and Accelerate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-algorithms" = callPackage ({ mkDerivation, base, containers, ghc-prim, gloss }: mkDerivation { pname = "gloss-algorithms"; - version = "1.9.2.1"; - sha256 = "1cmjzwajn1y01p68fb8wvx7ld5ildkjzdzbmymlifcvw9csy3n2r"; + version = "1.9.3.1"; + sha256 = "1fdbjnrc1f42jxzgi362wccdx8fdhb1ws6bg3ds7cfanffkkf6an"; buildDepends = [ base containers ghc-prim gloss ]; + jailbreak = true; homepage = "http://gloss.ouroborus.net"; description = "Data structures and algorithms for working with 2D graphics"; license = stdenv.lib.licenses.mit; @@ -51205,8 +51723,8 @@ self: { }: mkDerivation { pname = "gloss-examples"; - version = "1.9.2.1"; - sha256 = "0pl0p5g0vn5dw5f16dj2qyn39qln48a9kiaxznhy2hxjqp1in3jz"; + version = "1.9.3.1"; + sha256 = "0d9wh50n2n6ia9vds2pnd8p9wdyxl423c7s135bbjx1iwrsvyq11"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -51214,6 +51732,7 @@ self: { gloss-algorithms gloss-raster gloss-rendering random repa repa-algorithms repa-io vector ]; + jailbreak = true; homepage = "http://gloss.ouroborus.net"; description = "Examples using the gloss library"; license = stdenv.lib.licenses.mit; @@ -51253,12 +51772,13 @@ self: { }: mkDerivation { pname = "gloss-raster"; - version = "1.9.2.1"; - sha256 = "0vz03hw9rck9vcbh1lvy7dncij9ykgh7mslb3hwsz8z570dbnacw"; + version = "1.9.3.1"; + sha256 = "1siwsmx8n0yaalcbm0c2dwxfxk5im1gpddbc2nkbf9br5yvn7py5"; buildDepends = [ base containers ghc-prim gloss gloss-rendering repa ]; extraLibraries = [ llvm ]; + jailbreak = true; homepage = "http://gloss.ouroborus.net"; description = "Parallel rendering of raster images"; license = stdenv.lib.licenses.mit; @@ -51280,15 +51800,14 @@ self: { jailbreak = true; description = "Parallel rendering of raster images using Accelerate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-rendering" = callPackage ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: mkDerivation { pname = "gloss-rendering"; - version = "1.9.2.1"; - sha256 = "05wdiadwjykz8x0fimznp3q1drm4v3vnv6cv6wjkj1xsclmhb99k"; + version = "1.9.3.1"; + sha256 = "1ns9x9fwkvxy0dwgdd3apv3p0d4857h3mkb3dx0rg9rs3wbapyzy"; buildDepends = [ base bmp bytestring containers GLUT OpenGL ]; jailbreak = true; description = "Gloss picture data types and rendering functions"; @@ -51436,8 +51955,8 @@ self: { }: mkDerivation { pname = "gnuplot"; - version = "0.5.2.2"; - sha256 = "0l5hi346bhs9w11i3z6yy4mcr3k50xcp3j31g6wza9grxlfqc5av"; + version = "0.5.3.1"; + sha256 = "03q226k7dhlc9mvfkkw3p00h7fh55s7l5hxgb2aarlz6q3rnjrcb"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -51892,8 +52411,8 @@ self: { }: mkDerivation { pname = "graph-core"; - version = "0.2.1.0"; - sha256 = "0xx99p2i1ng79rph0hkb2dp5r9y77s0y4v8njsywxyq4kbl3ly7f"; + version = "0.2.2.0"; + sha256 = "0czqcdg7w7al7gl339b9l15kn5n79zmdjbic3gn9mblnjb1666r9"; buildDepends = [ base containers deepseq hashable mtl QuickCheck safe unordered-containers vector @@ -52651,7 +53170,6 @@ self: { homepage = "http://github.com/iand675/growler"; description = "A revised version of the scotty library that attempts to be simpler and more performant"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gruff" = callPackage @@ -52717,7 +53235,6 @@ self: { buildDepends = [ base hierarchical-clustering ]; description = "Generic implementation of Gerstein/Sonnhammer/Chothia weighting"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gsl-random" = callPackage @@ -52821,8 +53338,8 @@ self: { }: mkDerivation { pname = "gtk"; - version = "0.13.4"; - sha256 = "1xfcwj37jy3w9gkap1p7mw8ix9xsvpc1268nrpilp2wkch2gs7qp"; + version = "0.13.6"; + sha256 = "1xj3vafk6rhy5nifixsp72n88i0idlknggcq1w626jfszx5anx2c"; buildDepends = [ array base bytestring cairo containers gio glib mtl pango text ]; @@ -53096,8 +53613,8 @@ self: { }: mkDerivation { pname = "gtk3"; - version = "0.13.4"; - sha256 = "041yg1h7g7mm3iy6wz8mp74ximw63vc4x918gpha5lpj6l2fxaqh"; + version = "0.13.6"; + sha256 = "12fsbl56gf8inxvg7jqad2j689gpwp4bwznyz153y6xzgqs7vaq0"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -53190,8 +53707,8 @@ self: { }: mkDerivation { pname = "gtksourceview2"; - version = "0.13.1.2"; - sha256 = "1s9ighkkqrc4f3w5ij5v3dwx7pp5cmd9arfk0rld0vpskx0x4vax"; + version = "0.13.1.3"; + sha256 = "1ji8sfkjggjxl4yrazm6n8gp74hlh3h28kjc9nfxka062bjmxfhf"; buildDepends = [ array base containers glib gtk mtl text ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ gtksourceview ]; @@ -53206,15 +53723,14 @@ self: { }: mkDerivation { pname = "gtksourceview3"; - version = "0.13.1.2"; - sha256 = "1jgvj1r7vibcf5gnx29b27q209l7dcn42zffyxbsy0507ka6394q"; + version = "0.13.1.3"; + sha256 = "1h23wy26mjivr4wmdscsnjzsija1g560a1bgcxvmrl4k1x9799d0"; buildDepends = [ array base containers glib gtk3 mtl text ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ gtksourceview ]; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs.gnome) gtksourceview;}; "guarded-rewriting" = callPackage @@ -53531,15 +54047,16 @@ self: { }) {}; "hPushover" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-conduit, network }: + ({ mkDerivation, aeson, base, bytestring, http-conduit, network + , text + }: mkDerivation { pname = "hPushover"; - version = "0.1.1"; - sha256 = "1qz1hd05fhh9vfjxmmnl9qs29hjl2qdyvfi9h687dp1dvk36j7ns"; - buildDepends = [ aeson base bytestring http-conduit network ]; - jailbreak = true; - homepage = "https://github.com/WJWH/hPushover"; - description = "Pushover.net API functions."; + version = "0.2"; + sha256 = "14k3sdy2c0anfsw0hdir0l107ixlsnr90miwxrxdsckh40kz3ad3"; + buildDepends = [ aeson base bytestring http-conduit network text ]; + homepage = "tot"; + description = "Pushover.net API functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -54142,7 +54659,9 @@ self: { mkDerivation { pname = "hackage-mirror"; version = "0.1.0.0"; + revision = "1"; sha256 = "1iaaxdn4lsfrjksax8c9pawrjwj4sb6irqd4sfkdm3k9l2f8nqvg"; + editedCabalFile = "848ea26073e706a9303ec1baf811a74b65859ae649731a3b799b4fb8c558c1bc"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -54153,7 +54672,6 @@ self: { template-haskell temporary text thyme transformers unordered-containers ]; - jailbreak = true; homepage = "http://fpcomplete.com"; description = "Simple mirroring utility for Hackage"; license = stdenv.lib.licenses.mit; @@ -54351,8 +54869,8 @@ self: { }: mkDerivation { pname = "hackport"; - version = "0.4.4"; - sha256 = "02mif1k12aq2incn8rjgn48c7rpjmxlgncyr5l7w1k1mav0p02hd"; + version = "0.4.5"; + sha256 = "18sv8kwhg0frsn6phg47hsm5vv84yaxxvk47sazgrb5hjl3qiam7"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -54407,8 +54925,8 @@ self: { }: mkDerivation { pname = "haddock"; - version = "2.15.0.2"; - sha256 = "07mbdjjr0q7k6f86xdlx4a998ly4g8c44m54am1a5jl07cwv9fxx"; + version = "2.16.0"; + sha256 = "1afb96w1vv3gmvha2f1h3p8zywpdk8dfk6bgnsa307ydzsmsc3qa"; isLibrary = false; isExecutable = true; buildDepends = [ base haddock-api ]; @@ -54419,7 +54937,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haddock-api" = callPackage + "haddock-api_2_15_0_2" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , deepseq, directory, filepath, ghc, ghc-paths, haddock-library , xhtml @@ -54437,6 +54955,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haddock-api" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, containers + , deepseq, directory, filepath, ghc, ghc-paths, haddock-library + , xhtml + }: + mkDerivation { + pname = "haddock-api"; + version = "2.16.0"; + sha256 = "0hk42w6fbr6xp8xcpjv00bhi9r75iig5kp34vxbxdd7k5fqxr1hj"; + buildDepends = [ + array base bytestring Cabal containers deepseq directory filepath + ghc ghc-paths haddock-library xhtml + ]; + jailbreak = true; + homepage = "http://www.haskell.org/haddock/"; + description = "A documentation-generation tool for Haskell libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haddock-leksah" = callPackage ({ mkDerivation, array, base, Cabal, containers, directory , filepath, ghc, ghc-paths, pretty @@ -54474,6 +55011,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haddock-library_1_2_0" = callPackage + ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec + , QuickCheck, transformers + }: + mkDerivation { + pname = "haddock-library"; + version = "1.2.0"; + sha256 = "0kf8qihkxv86phaznb3liq6qhjs53g3iq0zkvz5wkvliqas4ha56"; + buildDepends = [ base bytestring deepseq transformers ]; + testDepends = [ + base base-compat bytestring deepseq hspec QuickCheck transformers + ]; + homepage = "http://www.haskell.org/haddock/"; + description = "Library exposing some functionality of Haddock"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haddocset" = callPackage ({ mkDerivation, base, Cabal, conduit, conduit-extra, exceptions , ghc, haddock-api, mtl, optparse-applicative, process, resourcet @@ -54907,6 +55461,7 @@ self: { version = "0.1.0.3"; sha256 = "0mkbsivifggi64k97ssxb0dskzwf7h0sny4m8gmkdsvwqjhfdjam"; buildDepends = [ base hakyll hyphenation split tagsoup ]; + jailbreak = true; homepage = "https://bitbucket.org/rvlm/hakyll-contrib-hyphenation"; description = "automatic hyphenation for Hakyll"; license = stdenv.lib.licenses.mit; @@ -55215,8 +55770,8 @@ self: { }: mkDerivation { pname = "handsy"; - version = "0.0.13"; - sha256 = "0v79p5gcz9b0s2x910ddhcpxxagiyx59zajxndikp9a0nxx8x0l5"; + version = "0.0.14"; + sha256 = "1a2yzpj883wsn013cy2jvn6wjsqqyf5xn91nkw6f5cg4sd9znzmy"; buildDepends = [ base bytestring data-default-class operational process-extras retry shell-escape split transformers @@ -55484,7 +56039,6 @@ self: { safecopy text time unordered-containers web-routes web-routes-happstack ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Happstack Authentication Library"; license = stdenv.lib.licenses.bsd3; @@ -55647,7 +56201,6 @@ self: { homepage = "http://www.happstack.com/"; description = "Support for using Fay with Happstack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-foundation" = callPackage @@ -55744,7 +56297,6 @@ self: { homepage = "http://www.happstack.com/"; description = "Support for using HSP templates in Happstack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-hstringtemplate" = callPackage @@ -55861,8 +56413,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.4.2"; - sha256 = "0fwxc3i0ghv0acasrpzvvbji679wg614kmpdka8p0g3cmhlrpfrg"; + version = "7.4.3"; + sha256 = "0ij359i1lmxs1gpzl6spli94s0mpp6mbbhjcf4jrbxkpavdg8g73"; buildDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -56128,16 +56680,14 @@ self: { }: mkDerivation { pname = "haroonga"; - version = "0.1.7.0"; - sha256 = "1v2pxl08588ii5syp9ym1dn7bmvj76w5dx1p594lissf7f2cm3bd"; + version = "0.1.7.1"; + sha256 = "0j4668611qazzwb4w05v0xliw1w0a7kmlz0g2z9ixz0kywbfim2g"; buildDepends = [ base bindings-DSL monad-control resourcet transformers ]; pkgconfigDepends = [ groonga ]; - jailbreak = true; description = "Low level bindings for Groonga"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) { groonga = null;}; "haroonga-httpd" = callPackage @@ -56146,8 +56696,8 @@ self: { }: mkDerivation { pname = "haroonga-httpd"; - version = "0.1.0.0"; - sha256 = "15236s7289mckymapnvs6fx31lp6j68d8c38882qh6wwk9z71d5j"; + version = "0.1.1.0"; + sha256 = "1745b7khz1dn7n9w3z89na01jap62vbg1mb6c7i9n2mgwkkrys5g"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -56390,11 +56940,10 @@ self: { ({ mkDerivation, base, hashable, time }: mkDerivation { pname = "hashable-time"; - version = "0.1.0.0"; - sha256 = "0n6cp5amc0385qaii7xi54a3l0znnycrbn4zixidm5nixiig9sq3"; + version = "0.1.0.1"; + sha256 = "1137cc7jyyn293g3nx9bs4mw4r8i7k9cq0rz5f5rs7j8997gkmbf"; buildDepends = [ base hashable time ]; - homepage = "https://github.com/w3rs/hashable-time"; - description = "Hashable instances for Data.Time types and Fixed"; + description = "Hashable instances for Data.Time"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -56879,6 +57428,7 @@ self: { text unordered-containers ]; testDepends = [ base ]; + jailbreak = true; homepage = "http://github.com/chrisdone/haskell-docs"; description = "A program to find and display the docs and type of a name"; license = stdenv.lib.licenses.bsd3; @@ -57215,16 +57765,16 @@ self: { }) {}; "haskell-spacegoo" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, mtl - , network-conduit, pretty, pretty-show, text, vector, vector-space + ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra + , mtl, pretty, pretty-show, text, vector, vector-space }: mkDerivation { pname = "haskell-spacegoo"; - version = "0.2"; - sha256 = "1qa9nh0c38az7ssssziz0hdbdd8i78sp6yv00393v9mrycj4f2qi"; + version = "0.2.0.1"; + sha256 = "0g6ximrv5jwibklkyr74vy3qkx8mv4xbpc7f6w1qg9gnlylzmcqy"; buildDepends = [ - aeson base bytestring conduit mtl network-conduit pretty - pretty-show text vector vector-space + aeson base bytestring conduit conduit-extra mtl pretty pretty-show + text vector vector-space ]; description = "Client API for Rocket Scissor Spacegoo"; license = stdenv.lib.licenses.mit; @@ -58387,15 +58937,15 @@ self: { }: mkDerivation { pname = "hasql"; - version = "0.7.2"; - sha256 = "1gxigzmsrn3kpp6nf4my3yz2215sgmr9021qnpvsq6mqnl6vqddg"; + version = "0.7.3"; + sha256 = "0a8wcncqz2k1lj2cad96rg9xi9116q0x209jfbpkcp8sbi3n3rb8"; buildDepends = [ attoparsec base base-prelude either hasql-backend list-t mmorph monad-control mtl resource-pool template-haskell text transformers transformers-base vector ]; testDepends = [ - base base-prelude either hasql-backend hasql-postgres hspec + base-prelude either hasql-backend hasql-postgres hspec monad-control mtl-prelude slave-thread text vector ]; homepage = "https://github.com/nikita-volkov/hasql"; @@ -58404,16 +58954,15 @@ self: { }) {}; "hasql-backend" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, either, free - , list-t, text, transformers, vector + ({ mkDerivation, base-prelude, bytestring, either, free, list-t + , text, transformers, vector }: mkDerivation { pname = "hasql-backend"; - version = "0.4.0"; - sha256 = "15jzz01lmh4s6y70b01yc7ffzbicm7nxna30krra8vlp0w32lnys"; + version = "0.4.1"; + sha256 = "037ibla582gwsi17fsfrwlc0azh54iyyfawvy0nlabzg6lc38snm"; buildDepends = [ - base base-prelude bytestring either free list-t text transformers - vector + base-prelude bytestring either free list-t text transformers vector ]; homepage = "https://github.com/nikita-volkov/hasql-backend"; description = "API for backends of \"hasql\""; @@ -58430,10 +58979,10 @@ self: { }: mkDerivation { pname = "hasql-postgres"; - version = "0.10.2"; - sha256 = "0nw1xq9wfdhcm40qfx8d883nvgk7bfhwbwwb1r9jx7zlspx15vq5"; + version = "0.10.3"; + sha256 = "12452z4li3b30zw1ar4x2r14q93vx06165g3rdj9s1wxjzsnsr4w"; buildDepends = [ - aeson attoparsec base base-prelude bytestring either free hashable + aeson attoparsec base-prelude bytestring either free hashable hashtables hasql-backend list-t loch-th mmorph placeholders postgresql-binary postgresql-libpq scientific template-haskell text time transformers uuid vector @@ -58450,15 +58999,14 @@ self: { }) {}; "hasql-postgres-options" = callPackage - ({ mkDerivation, base, base-prelude, hasql-postgres - , optparse-applicative + ({ mkDerivation, base-prelude, hasql-postgres, optparse-applicative }: mkDerivation { pname = "hasql-postgres-options"; - version = "0.1.3"; - sha256 = "05l38fm1s5n2vsqmxx8pywq0bpbwhc9hks381a70dqdas3jvv3cp"; + version = "0.1.4"; + sha256 = "19jsi8r63phyjcwgvbbs30idl944dnl0iw15i0q2d501sa51ksf4"; buildDepends = [ - base base-prelude hasql-postgres optparse-applicative + base-prelude hasql-postgres optparse-applicative ]; homepage = "https://github.com/nikita-volkov/hasql-postgres-options"; description = "An \"optparse-applicative\" parser for \"hasql-postgres\""; @@ -58572,7 +59120,6 @@ self: { homepage = "https://github.com/agocorona/haste-perch"; description = "Create, navigate and modify the DOM tree with composable syntax, with the haste compiler"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hat" = callPackage @@ -58608,7 +59155,6 @@ self: { base blaze-html directory filepath HaTeX parsec text time transformers ]; - jailbreak = true; description = "HaTeX User's Guide"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -59416,7 +59962,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hdf"; description = "HDF: Uniform Rate Audio Signal Processing in Haskell"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hdigest" = callPackage @@ -59492,21 +60037,23 @@ self: { "hdocs" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , filepath, ghc, ghc-paths, haddock-api, MonadCatchIO-transformers - , mtl, network, process, text, transformers + , filepath, ghc, ghc-paths, haddock-api, haddock-library + , MonadCatchIO-transformers, mtl, network, process, text + , transformers }: mkDerivation { pname = "hdocs"; - version = "0.4.1.2"; - sha256 = "1dg4cnj3cnv2f12ibvfg451rhsgawhsj0brjmaxm73bfvbxl25vi"; + version = "0.4.2.0"; + sha256 = "1qsahvm24hxjzfd0qvyfsasdplh2hbg9fkxcdkysgqxpzq8kx4gb"; isLibrary = true; isExecutable = true; buildDepends = [ aeson aeson-pretty base bytestring containers filepath ghc - ghc-paths haddock-api MonadCatchIO-transformers mtl network process - text transformers + ghc-paths haddock-api haddock-library MonadCatchIO-transformers mtl + network process text transformers ]; testDepends = [ base containers mtl ]; + jailbreak = true; homepage = "https://github.com/mvoidex/hdocs"; description = "Haskell docs tool"; license = stdenv.lib.licenses.bsd3; @@ -59569,8 +60116,8 @@ self: { ({ mkDerivation, base, directory, doctest, filepath }: mkDerivation { pname = "heaps"; - version = "0.3.2"; - sha256 = "1xkb2lk97ymgjxk89159h226qs89z5wank4jx35awwzv4f67ay46"; + version = "0.3.2.1"; + sha256 = "1g4nf361qfjyymwpyiiq0qk5brrsr4wz1pncij69pwda919b3j6b"; buildDepends = [ base ]; testDepends = [ base directory doctest filepath ]; homepage = "http://github.com/ekmett/heaps/"; @@ -60464,12 +61011,11 @@ self: { }: mkDerivation { pname = "hexpat-lens"; - version = "0.1.2"; - sha256 = "1k4ixqwpsa4mnywd1fcfrmy2dbcpkna0hg0sxjlfp0qbhy1ik7v7"; + version = "0.1.3"; + sha256 = "0283zpzj1xsav50d4k66i90fhll89flqnb1jv0x7gxppv1460vfr"; buildDepends = [ base bytestring deepseq hexpat hexpat-tagsoup lens ]; - jailbreak = true; description = "Lenses for Hexpat"; license = stdenv.lib.licenses.mit; }) {}; @@ -60988,7 +61534,6 @@ self: { testDepends = [ base hspec HUnit QuickCheck ]; description = "Fast algorithms for single, average/UPGMA and complete linkage clustering"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hierarchical-clustering-diagrams" = callPackage @@ -61145,8 +61690,8 @@ self: { }: mkDerivation { pname = "highlighting-kate"; - version = "0.5.12"; - sha256 = "0igcph3icmskf2g861fmxwgjdgrm52r5zazviiv82wck8nvmkh0i"; + version = "0.5.14"; + sha256 = "0hpg2f660s035gj0fzy42s52adgqlgssn7pf2k0bcxml3qxf3jnr"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -61254,8 +61799,8 @@ self: { }: mkDerivation { pname = "hindent"; - version = "4.4.1"; - sha256 = "1hc71zzc8apl619449g9sp50wc6qprzd91c69rr3zf1pi77208qg"; + version = "4.4.2"; + sha256 = "14g3sqkps2bg8fc8vp5f632hj7msbl4kj0baasykxvf0iylgj7ii"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -61841,32 +62386,30 @@ self: { }: mkDerivation { pname = "hjsonpointer"; - version = "0.1.0.1"; - sha256 = "03c0hl4hzgihkqla7kqkjk5s1k68pnblqpisjrzf4bzjl8z1z6hw"; + version = "0.2.0.1"; + sha256 = "0r44fpljqwzwzj818p3xplhwkdbndwmbxf2mrgdqsjxj0dmnifhq"; buildDepends = [ aeson base text unordered-containers vector ]; testDepends = [ aeson base http-types HUnit test-framework test-framework-hunit text unordered-containers vector ]; homepage = "https://github.com/seagreen/hjsonpointer"; - description = "JSON Pointer library for Haskell"; + description = "JSON Pointer library"; license = stdenv.lib.licenses.mit; }) {}; "hjsonschema" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, file-embed - , filepath, hashable, hjsonpointer, http-conduit, http-types, HUnit + , filepath, hashable, hjsonpointer, http-client, http-types, HUnit , regexpr, scientific, test-framework, test-framework-hunit, text , unordered-containers, vector }: mkDerivation { pname = "hjsonschema"; - version = "0.5.2.1"; - sha256 = "0kff73g9gjvc035lw3420mxz9mp7pd1yl941wr3jagqnh6g1s85m"; - isLibrary = true; - isExecutable = true; + version = "0.5.3.1"; + sha256 = "1ggqxi2f10qdls67lk3204wc4naicchr20i00p17ynkzxl9ndi8b"; buildDepends = [ - aeson base bytestring file-embed hashable hjsonpointer http-conduit + aeson base bytestring file-embed hashable hjsonpointer http-client http-types regexpr scientific text unordered-containers vector ]; testDepends = [ @@ -62032,7 +62575,6 @@ self: { buildDepends = [ base Cabal Decimal hledger-lib statistics time ]; description = "computes the internal rate of return of an investment"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-lib" = callPackage @@ -62174,8 +62716,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "1.9.18"; - sha256 = "03wdfl0jmb5szcv61dd8cm0xh5z6qhpy0d5xf6wh3lybma9pjmsb"; + version = "1.9.19"; + sha256 = "07wibincqgz0sqvc00c06r5am2iyiknrrnywc8023rafajv3079p"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -62234,7 +62776,9 @@ self: { mkDerivation { pname = "hlwm"; version = "0.1.0.1"; + revision = "1"; sha256 = "1vp21440v9gq4mvnqnsw1ha72ywgc4hmp137pkpvs5p13ixyfrgi"; + editedCabalFile = "ce22b9186e03c83f13e56b33630f4af561b604c51374c23dc1ef4e24ced9a54e"; isLibrary = true; isExecutable = true; buildDepends = [ base monads-tf stm transformers unix X11 ]; @@ -62358,17 +62902,20 @@ self: { }) { inherit (pkgs) gsl;}; "hmatrix-gsl-stats" = callPackage - ({ mkDerivation, base, binary, hmatrix, storable-complex }: + ({ mkDerivation, base, binary, blas, hmatrix, lapack + , storable-complex + }: mkDerivation { pname = "hmatrix-gsl-stats"; - version = "0.2"; - sha256 = "1xwl2qgji2ib0gml9hqljzwd4wrqfjpvnzm3iq2g7kcwwfg1q0dm"; + version = "0.2.1"; + sha256 = "1sfyvp5dlxcfqwpfwzqly9h8g26lm8470xaqcw6nj15dya1zl1fj"; buildDepends = [ base binary hmatrix storable-complex ]; + extraLibraries = [ blas lapack ]; homepage = "http://code.haskell.org/hmatrix-gsl-stats"; description = "GSL Statistics interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) { inherit (pkgs) blas; lapack = null;}; "hmatrix-mmap" = callPackage ({ mkDerivation, base, hmatrix, mmap }: @@ -62563,7 +63110,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Binding to the OS level MIDI services"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmk" = callPackage @@ -62867,7 +63413,6 @@ self: { homepage = "http://github.com/tanakh/hoe"; description = "hoe: Haskell One-liner Evaluator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hofix-mtl" = callPackage @@ -63353,8 +63898,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "4.2.38"; - sha256 = "0ijd23chnkcmymn1yf4rb7jbsbdnjxjvld7wsikp85ar1l3s858a"; + version = "4.2.39"; + sha256 = "0n3sh13lhg9aip1390by0wfdfsrnqz61zgs6ji143ak7fdff1559"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -63378,8 +63923,8 @@ self: { }: mkDerivation { pname = "hoogle-index"; - version = "0.4.0"; - sha256 = "0a7zkpqcjx225c3prwca8cs8sai0yaxv56vsb0in1s9p86qw1gfv"; + version = "0.4.1"; + sha256 = "09ax7y205ds8wb99qmwszclam8p9s9swv0byf0ap2qiz948gjfbg"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -63657,7 +64202,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hosc-json"; description = "Haskell Open Sound Control JSON Serialisation"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hosc-utils" = callPackage @@ -63729,8 +64273,8 @@ self: { }: mkDerivation { pname = "hothasktags"; - version = "0.3.2"; - sha256 = "12gq3ni7w75wcvahx3yzpmgw8zl7bamswipfzr9a97j5hmi2h766"; + version = "0.3.3"; + sha256 = "1nyr77lm813v521fhhsd3zf7hlpad70g1aj729plrwaxj8c0cizl"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -63761,10 +64305,8 @@ self: { }: mkDerivation { pname = "hourglass"; - version = "0.2.8"; - revision = "1"; - sha256 = "1n5kffmf9qnr2zy6igck7rlrw0gx5lqc92n1lajpa8vq96qzx7lj"; - editedCabalFile = "df23ba9b63af9fd6ed50bdbde1c2a2b43dc702e68a85722a49cd1ff1b21894b5"; + version = "0.2.9"; + sha256 = "1xha17nwzxdjizbcp63d2142c6q051y77facs7xribgcl5iz2m4v"; buildDepends = [ base deepseq ]; testDepends = [ base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time @@ -64066,7 +64608,6 @@ self: { homepage = "https://github.com/agocorona/hplayground"; description = "monadic, reactive Formlets running in the Web browser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hplaylist" = callPackage @@ -64276,17 +64817,18 @@ self: { }) {}; "hquantlib" = callPackage - ({ mkDerivation, base, containers, hmatrix, hmatrix-special, HUnit - , mersenne-random, parallel, QuickCheck, statistics, test-framework - , test-framework-hunit, test-framework-quickcheck2, time, vector + ({ mkDerivation, base, containers, hmatrix, hmatrix-gsl + , hmatrix-special, HUnit, mersenne-random, parallel, QuickCheck + , statistics, test-framework, test-framework-hunit + , test-framework-quickcheck2, time, vector, vector-algorithms }: mkDerivation { pname = "hquantlib"; - version = "0.0.2.4"; - sha256 = "1jj4m74d07hkz8mbj732sqhwsprp0hn6rz75a01amf8h91c7aws5"; + version = "0.0.2.5"; + sha256 = "1n84j2bha8cgv38rl8jxsjiybwws2sc60x8pjmnkn83jpscgcqv0"; buildDepends = [ - base containers hmatrix hmatrix-special mersenne-random parallel - statistics time vector + base containers hmatrix hmatrix-gsl hmatrix-special mersenne-random + parallel statistics time vector vector-algorithms ]; testDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -64351,14 +64893,14 @@ self: { }: mkDerivation { pname = "hruby"; - version = "0.2.8"; - sha256 = "1gwz8fncwrga8qpin2799pfr5x34k01fvav8g3d9n6ibn24ah7f0"; + version = "0.3.1"; + sha256 = "1w13j70r6b66nyjj2fsa1z1m5p8v0zil6jf31x0h0f222x4fvmih"; buildDepends = [ aeson attoparsec base bytestring scientific stm text unordered-containers vector ]; testDepends = [ aeson attoparsec base QuickCheck text vector ]; - description = "Embed Ruby in your Haskell program"; + description = "Embed a Ruby intepreter in your Haskell program !"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -64571,6 +65113,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hs-inspector" = callPackage + ({ mkDerivation, base, haskell-src, hspec }: + mkDerivation { + pname = "hs-inspector"; + version = "0.3.0.0"; + sha256 = "0nr7g8z70cgxfzqqs331aj1f11va0hjd0am83hm8iwmyrqv9rbk1"; + buildDepends = [ base haskell-src ]; + testDepends = [ base haskell-src hspec ]; + description = "Haskell source code analyzer"; + license = stdenv.lib.licenses.mit; + }) {}; + "hs-java" = callPackage ({ mkDerivation, array, base, binary, binary-state, bytestring , containers, control-monad-exception, data-binary-ieee754 @@ -64588,7 +65142,6 @@ self: { ]; description = "Java .class files assembler/disassembler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-json-rpc" = callPackage @@ -64650,7 +65203,6 @@ self: { ]; extraLibraries = [ mesos protobuf ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) mesos; inherit (pkgs) protobuf;}; "hs-nombre-generator" = callPackage @@ -65055,7 +65607,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3"; description = "Haskell SuperCollider"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-auditor" = callPackage @@ -65069,7 +65620,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-auditor"; description = "Haskell SuperCollider Auditor"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-cairo" = callPackage @@ -65114,7 +65664,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-db"; description = "Haskell SuperCollider Unit Generator Database"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-dot" = callPackage @@ -65127,7 +65676,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-dot"; description = "haskell supercollider graph drawing"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-forth" = callPackage @@ -65253,7 +65801,6 @@ self: { homepage = "https://github.com/kaoskorobase/hsc3-process"; description = "Create and control scsynth processes"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-rec" = callPackage @@ -65325,7 +65872,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-sf"; description = "Haskell SuperCollider SoundFile"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-sf-hsndfile" = callPackage @@ -65342,7 +65888,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-sf-hsndfile"; description = "Haskell SuperCollider SoundFile"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-unsafe" = callPackage @@ -65376,7 +65921,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-utils"; description = "Haskell SuperCollider Utilities"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hscamwire" = callPackage @@ -65560,7 +66104,6 @@ self: { homepage = "http://rd.slavepianos.org/?t=hsdif"; description = "Haskell SDIF"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsdip" = callPackage @@ -65827,23 +66370,24 @@ self: { }) {}; "hsignal" = callPackage - ({ mkDerivation, array, base, binary, bytestring, hmatrix - , hmatrix-gsl, hmatrix-gsl-stats, hstatistics, mtl + ({ mkDerivation, array, base, binary, blas, bytestring, hmatrix + , hmatrix-gsl, hmatrix-gsl-stats, hstatistics, lapack, mtl , storable-complex }: mkDerivation { pname = "hsignal"; - version = "0.2.6.1"; - sha256 = "013sswmhvww16kbfmm9mmb1iabzmd41jfq06ppl5fjs5amqlinsk"; + version = "0.2.7"; + sha256 = "1a75n22rk5lpzf1fnwdpw61azibavy9x45wz1cp0l1c49477fxs0"; buildDepends = [ array base binary bytestring hmatrix hmatrix-gsl hmatrix-gsl-stats hstatistics mtl storable-complex ]; + extraLibraries = [ blas lapack ]; homepage = "http://code.haskell.org/hsignal"; description = "Signal processing and EEG data analysis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) { inherit (pkgs) blas; lapack = null;}; "hsilop" = callPackage ({ mkDerivation, base, haskeline }: @@ -65866,8 +66410,8 @@ self: { }: mkDerivation { pname = "hsimport"; - version = "0.6.4"; - sha256 = "07v7sm98a0vzfk1xx8mf6l2ybf3rwx4ml2wxp1rlw5w1aapffsfw"; + version = "0.6.5"; + sha256 = "10h19rdzqskjvaax30znqpvx765x0lj58wp1zgf8dv6mgvaz77zy"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -66521,8 +67065,8 @@ self: { }: mkDerivation { pname = "hspec-meta"; - version = "2.0.0"; - sha256 = "0x1k2d4nycglzn9l4i32xrampr9fgzjpp4j1jyy7pj89cfl8jc8f"; + version = "2.1.5"; + sha256 = "02v4a5hcp4bbvnjb18vpw6fwz4qxjll8k8ama0hf6y8jppp72hid"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -66557,8 +67101,8 @@ self: { ({ mkDerivation, hspec, test-shouldbe }: mkDerivation { pname = "hspec-shouldbe"; - version = "0.0.0"; - sha256 = "09fp3cl7mshn1812f1v7mvbcmgibbwy6ai7g1f0ndy5ipbam0yi5"; + version = "0.0.1"; + sha256 = "0b4y84vqyx22kihr0sbbxzr6sdz99hi2rhyl09r8ddzkzqadfii3"; buildDepends = [ hspec test-shouldbe ]; description = "Convenience wrapper and utilities for hspec"; license = stdenv.lib.licenses.mit; @@ -66861,6 +67405,7 @@ self: { testDepends = [ base containers directory QuickCheck tagged text ]; buildTools = [ c2hs ]; pkgconfigDepends = [ qt5 ]; + jailbreak = true; homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "Haskell binding for Qt Quick"; license = stdenv.lib.licenses.bsd3; @@ -66882,7 +67427,6 @@ self: { homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "HsQML-based implementation of Nine Men's Morris"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsqml-demo-notes" = callPackage @@ -66897,7 +67441,6 @@ self: { homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "Sticky notes example program implemented in HsQML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsqml-demo-samples" = callPackage @@ -67234,7 +67777,6 @@ self: { homepage = "http://www.happstack.com/"; description = "hsp+jmacro support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsx-xhtml" = callPackage @@ -67267,7 +67809,6 @@ self: { homepage = "https://github.com/seereason/hsx2hs"; description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsyscall" = callPackage @@ -67660,8 +68201,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.4.9"; - sha256 = "1dr8xd1y615hrc9557804zc9k1zi39rfb0hrmpr8ay28f71mb4an"; + version = "0.4.10"; + sha256 = "1llvhchjv86zfhyrf8zc4lnq3z3ryl9cg5lwy4fphnf537zg2c2c"; buildDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive clock containers cookie data-default-class deepseq @@ -67778,8 +68319,8 @@ self: { }: mkDerivation { pname = "http-client-streams"; - version = "0.3.0.0"; - sha256 = "0rzvswz68w581dqdbwjy2ywadfbjx95306rgaphac617zzgp5xpd"; + version = "0.3.1.0"; + sha256 = "1q9w0l89a599l4955kb3156ysmlg7il9pz0x7kfl3bxly4gadf8z"; buildDepends = [ base bytestring HsOpenSSL http-client http-client-openssl io-streams mtl transformers @@ -67889,8 +68430,8 @@ self: { }: mkDerivation { pname = "http-conduit-downloader"; - version = "1.0.24"; - sha256 = "1b8lg2vlh0idz2m979mxh0197wkksxwm7a0hzf2d5yjj88zzjdrr"; + version = "1.0.25"; + sha256 = "0g393cmkbpb40in03zlyahxxwiy5i7zj7wg5zb92a0hkmjkgbrka"; buildDepends = [ base bytestring conduit connection data-default HsOpenSSL http-client http-conduit http-types lifted-base mtl network @@ -67998,8 +68539,8 @@ self: { }: mkDerivation { pname = "http-media"; - version = "0.6.0"; - sha256 = "05vjlfa4z5g84y2vq9c4dhasjl8w55n0si0iy3fkl980jkx59771"; + version = "0.6.1"; + sha256 = "0x2smkccs64ll31adwj4n7kr1qalihyj28py2k5qwl2ynyygxbxq"; buildDepends = [ base bytestring case-insensitive containers ]; testDepends = [ base bytestring Cabal cabal-test-quickcheck case-insensitive @@ -68138,8 +68679,8 @@ self: { }: mkDerivation { pname = "http-streams"; - version = "0.7.2.5"; - sha256 = "0dabn3d9al9lvfqk7fg3nbddbygygq4am3j7wibp48zhy3vg8m0y"; + version = "0.7.2.6"; + sha256 = "1n44cscyrwrp71j96kjbwhak8c7hy4pjgp4b4p6ygm1hiy2xx1b7"; buildDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring case-insensitive directory HsOpenSSL http-common io-streams mtl @@ -68219,8 +68760,8 @@ self: { }: mkDerivation { pname = "http2"; - version = "0.9.0"; - sha256 = "117s8kjbqhd034f483j2x3m2kkjl895b1bc1lxj35b6ar326fp2b"; + version = "0.9.1"; + sha256 = "1aqc8rhnh1l3f3fq6n9vjgamxjxjip52f9j01caaccrylahy57mm"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -69162,7 +69703,9 @@ self: { mkDerivation { pname = "hybrid-vectors"; version = "0.1.2.1"; + revision = "1"; sha256 = "0xh6yvv7jyahzrqihc13g1nlv81v0mzxvaxib5fcyr1njwbcwv59"; + editedCabalFile = "9adcfe7dc98b64c7a1506a58c7a771bbc244874790b68f8bc7e1c859207632d7"; buildDepends = [ base deepseq primitive vector ]; homepage = "http://github.com/ekmett/hybrid-vectors"; description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors"; @@ -69220,10 +69763,11 @@ self: { }: mkDerivation { pname = "hydrogen"; - version = "0.2.0.0"; - sha256 = "03psq7m52bg3ks53ny7ra1g0hkwg62140q1fy0236b64jbk15yq1"; + version = "0.3.0.0"; + sha256 = "0aq4svvwcys06mv172zz4yp624f6mnjg94lycj4r66xhm8m3fv4i"; buildDepends = [ base bytestring containers mtl pretty text ]; testDepends = [ base Cabal containers mtl QuickCheck ]; + jailbreak = true; homepage = "https://www.github.com/ktvoelker/hydrogen"; description = "An alternate Prelude"; license = stdenv.lib.licenses.gpl3; @@ -69530,8 +70074,8 @@ self: { }: mkDerivation { pname = "hyphenation"; - version = "0.4.2.1"; - sha256 = "069mbxdjlj36lyxr8bqkh1d05bhly64wk5lk71mz73lzcyaivcxi"; + version = "0.5"; + sha256 = "10xw74d1q2kz8mv8gspa9amgax5a864iz9jxihyjcs9x1pgh762a"; buildDepends = [ base containers unordered-containers ]; testDepends = [ base containers directory doctest filepath unordered-containers @@ -69692,6 +70236,73 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ide-backend" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring + , bytestring-trie, Cabal-ide-backend, containers, crypto-api + , data-accessor, data-accessor-mtl, deepseq, directory + , executable-path, filemanip, filepath, fingertree, ghc-prim, HUnit + , ide-backend-common, mtl, pretty-show, process, pureMD5, random + , regex-compat, stm, tagged, tasty, template-haskell, temporary + , test-framework, test-framework-hunit, text, time, transformers + , unix, unordered-containers, utf8-string + }: + mkDerivation { + pname = "ide-backend"; + version = "0.9.0.6"; + sha256 = "0dskhqcxhl7vq4mgbbb4bcfn78xlrf8gii4jlrx5i4psi583jqzq"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson async attoparsec base binary bytestring bytestring-trie + Cabal-ide-backend containers crypto-api data-accessor + data-accessor-mtl directory executable-path filemanip filepath + fingertree ghc-prim ide-backend-common mtl pretty-show process + pureMD5 random tagged template-haskell temporary text time + transformers unix unordered-containers utf8-string + ]; + testDepends = [ + aeson async base binary bytestring Cabal-ide-backend containers + deepseq directory executable-path filemanip filepath HUnit + ide-backend-common process random regex-compat stm tagged tasty + template-haskell temporary test-framework test-framework-hunit text + unix utf8-string + ]; + description = "An IDE backend library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ide-backend-common" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring + , bytestring-trie, containers, crypto-api, data-accessor, directory + , filepath, fingertree, mtl, pretty-show, pureMD5, tagged + , template-haskell, temporary, text, transformers, unix + }: + mkDerivation { + pname = "ide-backend-common"; + version = "0.9.1"; + sha256 = "1gix76gbc9ccx1hkddymk8hfx418kf1i7caajyzmdp6k8snvkc12"; + buildDepends = [ + aeson async attoparsec base binary bytestring bytestring-trie + containers crypto-api data-accessor directory filepath fingertree + mtl pretty-show pureMD5 tagged template-haskell temporary text + transformers unix + ]; + description = "Shared library used be ide-backend and ide-backend-server"; + license = stdenv.lib.licenses.mit; + }) {}; + + "ide-backend-rts" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ide-backend-rts"; + version = "0.1.3.1"; + sha256 = "1zj1glpyhmgpkxy4n96aqqf3s1gl2irl8ksnx4i9y4nwvs06qzj0"; + buildDepends = [ base ]; + description = "RTS for the IDE backend"; + license = stdenv.lib.licenses.mit; + }) {}; + "ideas" = callPackage ({ mkDerivation, array, base, cgi, containers, directory, filepath , parsec, QuickCheck, random, time, uniplate, wl-pprint @@ -70038,6 +70649,7 @@ self: { system-filepath tar text transformers unix unordered-containers utf8-string uuid vector ]; + jailbreak = true; homepage = "http://gibiansky.github.io/IHaskell/"; description = "A Haskell backend kernel for the IPython project"; license = stdenv.lib.licenses.mit; @@ -70211,7 +70823,6 @@ self: { base base64-bytestring blaze-html bytestring directory filepath ihaskell ihaskell-blaze Rlang-QQ split stm template-haskell xformat ]; - jailbreak = true; description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -70334,16 +70945,16 @@ self: { }) {}; "imagesize-conduit" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec - , resourcet + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , exceptions, hspec, resourcet }: mkDerivation { pname = "imagesize-conduit"; - version = "1.0.0.4"; - revision = "1"; - sha256 = "0hhmjbdqdljfy3khzpg2xq6kgxa9x89jvpci7lf413pc1lpg4cw7"; - editedCabalFile = "9a9a6ea6572ae1cdf6f1df1bbd35c96ae2aac9f61f7eabbcc1a60ed792d14a3d"; - buildDepends = [ base bytestring conduit conduit-extra ]; + version = "1.1"; + sha256 = "06dc0453l7n3g05pg118y4smlzkl6p56zazpi4dr41dkg12pii9i"; + buildDepends = [ + base bytestring conduit conduit-extra exceptions + ]; testDepends = [ base bytestring conduit conduit-extra hspec resourcet ]; @@ -70573,12 +71184,12 @@ self: { }) {}; "include-file" = callPackage - ({ mkDerivation, base, bytestring, random, template-haskell }: + ({ mkDerivation, base, bytestring, template-haskell }: mkDerivation { pname = "include-file"; - version = "0.1.0.1"; - sha256 = "18rzxhblr77vzhkjyyi85fkbrpy897jm04l97zf39v0bf3v5wskh"; - buildDepends = [ base bytestring random template-haskell ]; + version = "0.1.0.2"; + sha256 = "0yrqvdp37wjw9j7vknzyiw4954yskxh75z8r3sic6qdmz17zv8ba"; + buildDepends = [ base bytestring template-haskell ]; testDepends = [ base bytestring ]; description = "Inclusion of files in executables at compile-time"; license = stdenv.lib.licenses.bsd3; @@ -70656,8 +71267,8 @@ self: { }: mkDerivation { pname = "indentation"; - version = "0.2.1"; - sha256 = "0p6ng30nnkgnfg06bfi0j822wfj1hh04imilmpr1k2n3pjqlqmv0"; + version = "0.2.1.1"; + sha256 = "1wb5kv0wx25hhg08afsqpzkkc8c981pbhp8wrzdclb4105y4l4vj"; buildDepends = [ base mtl parsec parsers trifecta ]; testDepends = [ base parsec tasty tasty-hunit trifecta ]; homepage = "https://bitbucket.org/mdmkolbe/indentation"; @@ -71071,13 +71682,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "integer-gmp_0_5_1_0" = callPackage + "integer-gmp_1_0_0_0" = callPackage ({ mkDerivation, ghc-prim }: mkDerivation { pname = "integer-gmp"; - version = "0.5.1.0"; - sha256 = "04nklslbl336vd73lqfw7mvmlkd2wa19qwq3j14admzk3k5a0j3j"; + version = "1.0.0.0"; + revision = "1"; + sha256 = "0sh01sbib7z0bx934a7gq6583hdz8yncaxpfi9k8y4v18gm8j55f"; + editedCabalFile = "5d63fab9a7c94b4e713d151bdc0c361228efbac2b7583dfa8e6c5370ecae5663"; buildDepends = [ ghc-prim ]; + jailbreak = true; description = "Integer library based on GMP"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -71586,8 +72200,8 @@ self: { ({ mkDerivation, base, cmdargs, IPv6Addr, text }: mkDerivation { pname = "ip6addr"; - version = "0.5.0.0"; - sha256 = "1yn68f7d41818mc8m4zpfy66xz8imgfw1mw0wgfwgiapmr0liwvw"; + version = "0.5.0.1"; + sha256 = "08nwzas5r3b47chldc3dmwmwxam5dlmsyqqqmql7rjm87h645di4"; isLibrary = false; isExecutable = true; buildDepends = [ base cmdargs IPv6Addr text ]; @@ -71687,8 +72301,8 @@ self: { }: mkDerivation { pname = "iproute"; - version = "1.3.2"; - sha256 = "0zdcpmxyn1acxbdgh0k201ha70yzms1w27s7n6awp67hz7v0n95m"; + version = "1.4.0"; + sha256 = "00f4xddz9js73bsy15zsznmnad2psq7wg1ha7pmhdmdw5zlmqvad"; buildDepends = [ appar base byteorder containers network ]; testDepends = [ appar base byteorder containers doctest hspec network QuickCheck @@ -71830,6 +72444,33 @@ self: { license = "unknown"; }) {}; + "irc-core" = callPackage + ({ mkDerivation, array, attoparsec, base, base64-bytestring + , bytestring, config-value, connection, containers + , data-default-class, deepseq, directory, filepath, free + , haskell-lexer, lens, network, old-locale, split, stm, text, time + , tls, transformers, vty, x509, x509-store, x509-system + , x509-validation + }: + mkDerivation { + pname = "irc-core"; + version = "1.0"; + revision = "1"; + sha256 = "02ymy4zar7jl14pkhl6f4l42yzb1jv8apdsf86sv39sw9yygs305"; + editedCabalFile = "1fbb89234408096eb458a63862ebd84dcb5b103b93d587548490e9a5dc2d6b31"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + array attoparsec base base64-bytestring bytestring config-value + connection containers data-default-class deepseq directory filepath + free haskell-lexer lens network old-locale split stm text time tls + transformers vty x509 x509-store x509-system x509-validation + ]; + homepage = "https://github.com/glguy/irc-core"; + description = "An IRC client library and text client"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "irc-ctcp" = callPackage ({ mkDerivation, base, bytestring, text }: mkDerivation { @@ -72919,8 +73560,8 @@ self: { }: mkDerivation { pname = "jmacro-rpc-happstack"; - version = "0.3"; - sha256 = "0z24iqq0nmvm4x4fz4vl1rsccqnaynhmza502im967y7lials9wa"; + version = "0.3.1"; + sha256 = "0b77nrvrh1wzsp6djji0hkgl6flyl664l7kzbf5kpi30mqh45a6a"; buildDepends = [ aeson base blaze-html bytestring containers happstack-server jmacro jmacro-rpc mtl @@ -72928,7 +73569,6 @@ self: { homepage = "http://hub.darcs.net/gershomb/jmacro-rpc"; description = "Happstack backend for jmacro-rpc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jmacro-rpc-snap" = callPackage @@ -73063,7 +73703,6 @@ self: { homepage = "https://github.com/frasertweedale/hs-jose"; description = "Javascript Object Signing and Encryption and JSON Web Token library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jose-jwt" = callPackage @@ -73076,8 +73715,8 @@ self: { }: mkDerivation { pname = "jose-jwt"; - version = "0.4.1.1"; - sha256 = "0myldbliixd45h1fklzjn7r4gdw5nsl1swp3h14wdl1lck4zd7fq"; + version = "0.4.2"; + sha256 = "1vz32w4yd5yfk3wcsdicfy3qczwcf9hldx19jwf4ihsfyk4hdpzr"; buildDepends = [ aeson base base64-bytestring byteable bytestring cereal cipher-aes containers crypto-cipher-types crypto-numbers crypto-pubkey @@ -73247,14 +73886,15 @@ self: { }) {}; "json-autotype" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, filepath - , GenericPretty, hashable, hflags, hint, lens, mtl, pretty, process - , scientific, text, uniplate, unordered-containers, vector + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, GenericPretty, hashable, hflags, hint, lens, mtl + , pretty, process, QuickCheck, scientific, smallcheck, text + , uniplate, unordered-containers, vector }: mkDerivation { pname = "json-autotype"; - version = "0.2.5.9"; - sha256 = "0ajsxg515484bqmg94l9gmg4jpfvv6ykcbnyglkh1j86phggxrf2"; + version = "0.5"; + sha256 = "05r61sgp5asyah71zxhy3gw7f97bqsqxgqinfvj6fiwq7gir58wr"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -73262,7 +73902,11 @@ self: { hflags hint lens mtl pretty process scientific text uniplate unordered-containers vector ]; - jailbreak = true; + testDepends = [ + aeson base bytestring containers directory filepath GenericPretty + hashable hflags lens mtl pretty process QuickCheck scientific + smallcheck text uniplate unordered-containers vector + ]; homepage = "https://github.com/mgajda/json-autotype"; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; @@ -73443,18 +74087,18 @@ self: { }) {}; "json-rpc-server" = callPackage - ({ mkDerivation, aeson, base, bytestring, HUnit, mtl + ({ mkDerivation, aeson, base, bytestring, deepseq, HUnit, mtl , test-framework, test-framework-hunit, text, unordered-containers , vector }: mkDerivation { pname = "json-rpc-server"; - version = "0.1.4.0"; - sha256 = "1k909cxp63qvbbl916m6bk7i26np4aba2v87imfik134ii4h9pry"; + version = "0.1.5.0"; + sha256 = "1328366gdcsgfwqjzqgz07nnxn2j8gpbrcr6888wq1br0bxyczj5"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base bytestring mtl text unordered-containers vector + aeson base bytestring deepseq mtl text unordered-containers vector ]; testDepends = [ aeson base bytestring HUnit mtl test-framework test-framework-hunit @@ -73472,8 +74116,8 @@ self: { }: mkDerivation { pname = "json-schema"; - version = "0.7.3.1"; - sha256 = "07jvr0n6vakyvsqxl783fyqsgw83fvk5vk9p93v3hnpxlz0vrfnp"; + version = "0.7.3.3"; + sha256 = "0645ji3dl0xilpkgpblz3kkp1yvzxxcm9qm205wk2xsn00mp864c"; buildDepends = [ aeson base containers generic-aeson generic-deriving mtl scientific tagged text time unordered-containers vector @@ -73498,6 +74142,7 @@ self: { aeson base generics-sop lens-sop tagged text time transformers unordered-containers vector ]; + jailbreak = true; description = "Generics JSON (de)serialization using generics-sop"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -73769,14 +74414,16 @@ self: { mkDerivation { pname = "kafka-client"; version = "0.7.0.0"; + revision = "1"; sha256 = "1qaz47qqrbg1k4jjvq30qy3j57vsa0pqz91dcgx67pvqqw13n7r2"; + editedCabalFile = "2a9089e946bf6bbb67d9e464a672da4b958775a2572faf78554f1d2875eb7357"; buildDepends = [ base bytestring cereal digest dlist network snappy time zlib ]; testDepends = [ base bytestring cereal hspec hspec-discover QuickCheck time ]; - homepage = "https://github.com/abhinav/haskell-kafka-client"; + homepage = "https://github.com/abhinav/kafka-client"; description = "Low-level Haskell client library for Apache Kafka 0.7."; license = stdenv.lib.licenses.mit; }) {}; @@ -74106,6 +74753,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "keycode" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "keycode"; + version = "0.1"; + sha256 = "1cwj96mzxqagim3bcshzsrm2mxgmm8rrawy6hkvki9l55cggwbpv"; + buildDepends = [ base containers ]; + homepage = "https://github.com/RyanGlScott/keycode"; + description = "Maps web browser keycodes to their corresponding keyboard keys"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "keyring" = callPackage ({ mkDerivation, base, udbus }: mkDerivation { @@ -74437,8 +75096,8 @@ self: { }: mkDerivation { pname = "koofr-client"; - version = "1.0.0.2"; - sha256 = "094rhsf910ifzazy3j937hgdkibvwjc5x69yxvglmizc3xl6qqfv"; + version = "1.0.0.3"; + sha256 = "1bz7akd7sssn1gzqfvr0y343771zk7dn1n3as0m93wg4ifpz1dia"; buildDepends = [ aeson base bytestring filepath http-client http-client-tls http-types mtl @@ -74516,8 +75175,8 @@ self: { ({ mkDerivation, base, dlist, transformers }: mkDerivation { pname = "kure"; - version = "2.16.8"; - sha256 = "01168afr5azb74sh6r6blm3fmkcjp8248rkjapk7ya6cqixagmsy"; + version = "2.16.10"; + sha256 = "0xfnrp39w2ip9744898mfd63sbya8an72fx3nwj1s3vzdb1h3lhm"; buildDepends = [ base dlist transformers ]; homepage = "http://www.ittc.ku.edu/csdl/fpg/software/kure.html"; description = "Combinators for Strategic Programming"; @@ -74606,7 +75265,6 @@ self: { homepage = "https://github.com/lucasdicioccio/laborantin-hs"; description = "an experiment management framework"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "labyrinth" = callPackage @@ -74874,7 +75532,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot is a development tool and advanced IRC bot"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-core" = callPackage @@ -75403,13 +76060,14 @@ self: { }: mkDerivation { pname = "language-c-inline"; - version = "0.7.8.0"; - sha256 = "0kzhprxw2lhk5s66nh7q2rfndjlch1ii7m3bn116dym4dc16b0cm"; + version = "0.7.9.1"; + sha256 = "0apxv1mcmglb3m06dchs25sc7bhgz6v4gv098yfb79qmjmsxpc33"; buildDepends = [ array base containers filepath language-c-quote mainland-pretty template-haskell ]; testDepends = [ base language-c-quote ]; + jailbreak = true; homepage = "https://github.com/mchakravarty/language-c-inline/"; description = "Inline C & Objective-C code in Haskell for language interoperability"; license = stdenv.lib.licenses.bsd3; @@ -75434,6 +76092,7 @@ self: { base HUnit srcloc symbol test-framework test-framework-hunit ]; buildTools = [ alex happy ]; + jailbreak = true; homepage = "http://www.cs.drexel.edu/~mainland/"; description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; license = stdenv.lib.licenses.bsd3; @@ -75684,8 +76343,8 @@ self: { }: mkDerivation { pname = "language-lua"; - version = "0.6.3.1"; - sha256 = "11q59pbl7bjx4x8xn07lq09a235l1sgw510s9lb89q35mm0mravi"; + version = "0.6.3.2"; + sha256 = "0wnmybaqiwwxg8xcs7g1ffsmv8kmld7m6s0a8wp0lvhdil7d9xq6"; buildDepends = [ array base deepseq mtl parsec safe ]; testDepends = [ base deepseq directory filepath parsec QuickCheck tasty tasty-hunit @@ -75695,7 +76354,6 @@ self: { homepage = "http://github.com/osa1/language-lua"; description = "Lua parser and pretty-printer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-mixal" = callPackage @@ -75793,6 +76451,7 @@ self: { ansi-wl-pprint base Glob hspec HUnit lens parsec parsers strict-base-types temporary text unix unordered-containers vector ]; + jailbreak = true; homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; @@ -75917,6 +76576,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "language-thrift" = callPackage + ({ mkDerivation, base, mtl, parsers, text, trifecta }: + mkDerivation { + pname = "language-thrift"; + version = "0.1.0.0"; + sha256 = "17x6311mrijm1in78nbcgfq4gmhahqcrhf5yynq3g6b1hylgswsv"; + buildDepends = [ base mtl parsers text trifecta ]; + homepage = "https://github.com/abhinav/language-thrift"; + description = "Parser for the Thrift IDL format"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "language-typescript" = callPackage ({ mkDerivation, base, containers, parsec, pretty }: mkDerivation { @@ -76032,7 +76703,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "High and low-level interface to the Novation Launchpad midi controller"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lax" = callPackage @@ -76066,8 +76736,8 @@ self: { }: mkDerivation { pname = "layers-game"; - version = "0.4.3"; - sha256 = "1diisylvg78md3bcfx2jwh2w3sbp3ka76v93i5cjf54dv3fh97ax"; + version = "0.5"; + sha256 = "01j1gq3jd8mm519p3drxfpd32mm1qmik39vijncrx64p7wii73k8"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -76337,7 +77007,6 @@ self: { jailbreak = true; description = "Haskell code for learning physics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "learn-physics-examples" = callPackage @@ -76365,12 +77034,11 @@ self: { }: mkDerivation { pname = "learning-hmm"; - version = "0.3.2.1"; - sha256 = "1nk5dcz6h27d6y5lq4sgl9vn6dl9cmwrkfghxx33nbfq5p77vkyb"; + version = "0.3.2.2"; + sha256 = "1a2a97cflnlalcqr54ssbmy047i6y1xgswssy64hsr36g2lhywrs"; buildDepends = [ base containers deepseq hmatrix random-fu random-source vector ]; - jailbreak = true; homepage = "https://github.com/mnacamura/learning-hmm"; description = "Yet another library for hidden Markov models"; license = stdenv.lib.licenses.mit; @@ -76433,8 +77101,8 @@ self: { , binary-shared, bytestring, Cabal, conduit, conduit-extra , containers, deepseq, directory, executable-path, filepath, ghc , haddock-api, hslogger, HTTP, HUnit, ltk, network, network-uri - , parsec, pretty, process, process-leksah, resourcet, strict, text - , time, transformers, unix + , parsec, pretty, process, resourcet, strict, text, time + , transformers, unix }: mkDerivation { pname = "leksah-server"; @@ -76446,17 +77114,53 @@ self: { attoparsec attoparsec-conduit base binary binary-shared bytestring Cabal conduit conduit-extra containers deepseq directory executable-path filepath ghc haddock-api hslogger HTTP ltk network - network-uri parsec pretty process process-leksah resourcet strict - text time transformers unix + network-uri parsec pretty process resourcet strict text time + transformers unix ]; testDepends = [ base conduit conduit-extra hslogger HUnit process resourcet transformers ]; + jailbreak = true; homepage = "http://leksah.org"; description = "Metadata collection for leksah"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "lens_4_7_0_1" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, comonad + , containers, contravariant, deepseq, directory, distributive + , doctest, exceptions, filepath, free, generic-deriving, ghc-prim + , hashable, hlint, HUnit, mtl, nats, parallel, primitive + , profunctors, QuickCheck, reflection, semigroupoids, semigroups + , simple-reflect, split, tagged, template-haskell, test-framework + , test-framework-hunit, test-framework-quickcheck2 + , test-framework-th, text, transformers, transformers-compat + , unordered-containers, vector, void + }: + mkDerivation { + pname = "lens"; + version = "4.7.0.1"; + revision = "2"; + sha256 = "1j9d7g4sj38zq2r8vhy05b2kbxx1sg2k0b3yx05lbxlb79wcm1j1"; + editedCabalFile = "fd79ae606fe461d82d0eca185ade4ba04200b4afbf65348a59ffc600a5b7dc03"; + buildDepends = [ + array base bifunctors bytestring comonad containers contravariant + distributive exceptions filepath free ghc-prim hashable mtl + parallel primitive profunctors reflection semigroupoids semigroups + split tagged template-haskell text transformers transformers-compat + unordered-containers vector void + ]; + testDepends = [ + base bytestring containers deepseq directory doctest filepath + generic-deriving hlint HUnit mtl nats parallel QuickCheck + semigroups simple-reflect split test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th text transformers + unordered-containers vector + ]; + homepage = "http://github.com/ekmett/lens/"; + description = "Lenses, Folds and Traversals"; + license = stdenv.lib.licenses.bsd3; }) {}; "lens" = callPackage @@ -76464,23 +77168,21 @@ self: { , containers, contravariant, deepseq, directory, distributive , doctest, exceptions, filepath, free, generic-deriving, ghc-prim , hashable, hlint, HUnit, kan-extensions, mtl, nats, parallel - , primitive, profunctors, QuickCheck, reflection, semigroupoids - , semigroups, simple-reflect, tagged, template-haskell - , test-framework, test-framework-hunit, test-framework-quickcheck2 + , profunctors, QuickCheck, reflection, semigroupoids, semigroups + , simple-reflect, tagged, template-haskell, test-framework + , test-framework-hunit, test-framework-quickcheck2 , test-framework-th, text, transformers, transformers-compat , unordered-containers, vector, void }: mkDerivation { pname = "lens"; - version = "4.8"; - revision = "1"; - sha256 = "1h39cbw25aynz7kzx55i3rcz4p2mi0907ri6g78xbk2r3wf0qbnr"; - editedCabalFile = "50c7ea763fd0273f84d02acdf9cdc2b497deb83d595a231ce3c663f877bd8d33"; + version = "4.9"; + sha256 = "1ssnjdcd50khm18pb4ramvadqqnqn119z90i7991jja3na2mwsqr"; buildDepends = [ array base bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim hashable - kan-extensions mtl parallel primitive profunctors reflection - semigroupoids semigroups tagged template-haskell text transformers + kan-extensions mtl parallel profunctors reflection semigroupoids + semigroups tagged template-haskell text transformers transformers-compat unordered-containers vector void ]; testDepends = [ @@ -76593,10 +77295,10 @@ self: { version = "4.7"; sha256 = "07acd6a9qp0z06nxb33ml8fa470i04v8bxyrhf7i30lvyy40gfik"; buildDepends = [ base lens QuickCheck transformers ]; + jailbreak = true; homepage = "http://github.com/ekmett/lens/"; description = "QuickCheck properties for lens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-sop" = callPackage @@ -76674,13 +77376,13 @@ self: { "leveldb-haskell" = callPackage ({ mkDerivation, async, base, bytestring, data-default, directory - , exceptions, filepath, leveldb, mtl, QuickCheck, resourcet, snappy - , tasty, tasty-quickcheck, temporary, transformers + , exceptions, filepath, leveldb, mtl, QuickCheck, resourcet, tasty + , tasty-quickcheck, temporary, transformers }: mkDerivation { pname = "leveldb-haskell"; - version = "0.6.1"; - sha256 = "1pc6fzjac4dxk0rspvb4ifiinx4da1ms37mwm6vc05140r0hqvbw"; + version = "0.6.2"; + sha256 = "0gx9rn5vbmy5nq1n2ga1v5v7b7p11d0rxhdh75pz4dqgazxyjlax"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -76691,12 +77393,11 @@ self: { base bytestring data-default directory exceptions mtl QuickCheck tasty tasty-quickcheck temporary transformers ]; - extraLibraries = [ leveldb snappy ]; - jailbreak = true; + extraLibraries = [ leveldb ]; homepage = "http://github.com/kim/leveldb-haskell"; description = "Haskell bindings to LevelDB"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) leveldb; inherit (pkgs) snappy;}; + }) { inherit (pkgs) leveldb;}; "leveldb-haskell-fork" = callPackage ({ mkDerivation, async, base, bytestring, data-default, filepath @@ -76903,8 +77604,8 @@ self: { }: mkDerivation { pname = "lhs2tex"; - version = "1.18.1"; - sha256 = "0j4n7vkabsggn94gbwixy1vmckdck2nggdiqvk6n9nx164if5jnw"; + version = "1.19"; + sha256 = "03mhhkrqjjqmmh18im8di1cl6wqv30lsib5hv73f0wsnv5bhbbi4"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -77072,8 +77773,8 @@ self: { }: mkDerivation { pname = "libjenkins"; - version = "0.8.0"; - sha256 = "0dndz0ja6h50ix5r93ln2s5n7ymjariflxi0g7pfy850gyyimv27"; + version = "0.8.1"; + sha256 = "00h4wzzs6b3s9cv4bw2slj3c0ckb6p8gph7wzx8cgrxjyjqqx85z"; buildDepends = [ async attoparsec base bytestring conduit containers free http-client http-conduit http-types monad-control mtl network @@ -77196,7 +77897,6 @@ self: { homepage = "https://github.com/nvidia-compiler-sdk/hsnvvm"; description = "FFI binding to libNVVM, a compiler SDK component from NVIDIA"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) { nvvm = null;}; "liboleg" = callPackage @@ -77367,7 +78067,6 @@ self: { homepage = "https://patch-tag.com/r/AndyStewart/libtagc/home"; description = "Binding to TagLib C library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) taglib;}; "libvirt-hs" = callPackage @@ -77476,8 +78175,8 @@ self: { }: mkDerivation { pname = "lifted-async"; - version = "0.6.0.1"; - sha256 = "12qbibsl26njx6m1dq12gqfb15rkyag23c1vkcinlk301a0cvsmf"; + version = "0.7.0"; + sha256 = "1i9wm7pz8mh0gjyp7jhf3as82yi1axskv1mp5596gq7pszgglyd6"; buildDepends = [ async base constraints lifted-base monad-control transformers-base ]; @@ -77509,6 +78208,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lifted-threads" = callPackage + ({ mkDerivation, base, monad-control, threads, transformers-base }: + mkDerivation { + pname = "lifted-threads"; + version = "1.0"; + sha256 = "1sq071bn5z8ks2qj52bfx6n8bdx2chijh62ai3rz6lmjai6dazbz"; + buildDepends = [ base monad-control threads transformers-base ]; + homepage = "https://github.com/scrive/lifted-threads"; + description = "lifted IO operations from the threads library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lifter" = callPackage ({ mkDerivation, array, base, bitmap, bytestring, directory , filepath, gloss, mtl, stb-image @@ -77752,8 +78463,8 @@ self: { }: mkDerivation { pname = "linear-opengl"; - version = "0.2.0.6"; - sha256 = "1yb6c0r10d44pyahhzgyajphgyhmr9hs402633k6ynm3f1jdwyyg"; + version = "0.2.0.7"; + sha256 = "0yj98757d6z1bh3mqajn58ax2iaxnf2nl68wvbjv2pncwfn679m6"; buildDepends = [ base distributive lens linear OpenGL OpenGLRaw tagged ]; @@ -77895,15 +78606,15 @@ self: { }) {}; "linklater" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hscolour - , http-types, lens, text, wai, wreq + ({ mkDerivation, aeson, base, base-prelude, bytestring, containers + , http-types, text, wai, wreq }: mkDerivation { pname = "linklater"; - version = "2.0.0.3"; - sha256 = "0rqlzji8wfc0dxixh2h2k1fa9m18swla2679d5gdq7fzq5344ccd"; + version = "3.1.0.0"; + sha256 = "0mvmlq1nl428syc013hif07rssvya7wxkr44rs58rjn2zsxhhlqq"; buildDepends = [ - aeson base bytestring containers hscolour http-types lens text wai + aeson base base-prelude bytestring containers http-types text wai wreq ]; jailbreak = true; @@ -78172,8 +78883,8 @@ self: { }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.2.3.1"; - sha256 = "0gjndhrd0cjwmvl2ligklvmqr64p50m42rvxb79i13jk2jb16pg5"; + version = "0.2.3.2"; + sha256 = "0gm2cy4a1l6kh65cwj3ssv9r9ry4nk2sjr3cqhkp5i7mhmpc6q58"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -78248,11 +78959,10 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "list-fusion-probe"; - version = "0.1.0.2"; - sha256 = "0rvj4qnbqs7m8zrrqwak508z26fa6ssirly1jzwh9sy5ksiyd6df"; + version = "0.1.0.3"; + sha256 = "1djmh6bwnmp64vwq5f5j4f54ygrjkl56gp0la06yxknyvyn9k8jp"; buildDepends = [ base ]; testDepends = [ base tasty tasty-hunit ]; - jailbreak = true; description = "testing list fusion for success"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -78329,10 +79039,8 @@ self: { ({ mkDerivation, base, binary, containers, dlist }: mkDerivation { pname = "list-tries"; - version = "0.5.2"; - revision = "1"; - sha256 = "0lfl35i1k3nnv8q6bhwq4sr197fylin2hmxa4b96kfcc22xfzwy6"; - editedCabalFile = "50826a589644da396825e57f778b8e5596df986e1cf8ca97d946d29243b0556e"; + version = "0.6.1"; + sha256 = "06li8zwhy3i3shgqrq4505af1b1dz9xpzx2lpx2has4p79bgd1mq"; isLibrary = true; isExecutable = true; buildDepends = [ base binary containers dlist ]; @@ -78394,7 +79102,6 @@ self: { base blaze-html blaze-markup cheapskate directory filepath highlighting-kate parsec text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/cdosborn/lit"; description = "A simple tool for literate programming"; license = "GPL"; @@ -78501,7 +79208,6 @@ self: { homepage = "https://github.com/bos/llvm"; description = "Bindings to the LLVM compiler toolkit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "llvm-analysis" = callPackage @@ -78543,7 +79249,6 @@ self: { homepage = "https://github.com/bos/llvm"; description = "FFI bindings to the LLVM compiler toolkit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (self.llvmPackages) llvm;}; "llvm-base-types" = callPackage @@ -78575,7 +79280,6 @@ self: { homepage = "https://github.com/bos/llvm"; description = "Utilities for bindings to the LLVM compiler toolkit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "llvm-data-interop" = callPackage @@ -78616,9 +79320,23 @@ self: { homepage = "http://code.haskell.org/~thielema/llvm-extra/"; description = "Utility functions for the llvm interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "llvm-ffi" = callPackage + ({ mkDerivation, base, llvm }: + mkDerivation { + pname = "llvm-ffi"; + version = "3.0.0"; + sha256 = "07hb4n7wk0gmprjps045cvhcyvmis0jp5f11jbk55y4mgn4jy0cv"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base ]; + pkgconfigDepends = [ llvm ]; + homepage = "http://haskell.org/haskellwiki/LLVM"; + description = "FFI bindings to the LLVM compiler toolkit"; + license = stdenv.lib.licenses.bsd3; + }) { inherit (self.llvmPackages) llvm;}; + "llvm-general" = callPackage ({ mkDerivation, array, base, bytestring, containers, HUnit , llvm-config, llvm-general-pure, mtl, parsec, QuickCheck, setenv @@ -78628,8 +79346,8 @@ self: { }: mkDerivation { pname = "llvm-general"; - version = "3.4.5.0"; - sha256 = "19rvpy7hfgkfjkijnasajrvzbw75ij7sfwg9z4w080x6w39rgppr"; + version = "3.4.5.1"; + sha256 = "13fnr4dpflbfywmdq1r7fxv16lcywwv4a300j8z59xclcskvpajr"; buildDepends = [ array base bytestring containers llvm-general-pure mtl parsec setenv template-haskell transformers transformers-compat @@ -78654,8 +79372,8 @@ self: { }: mkDerivation { pname = "llvm-general-pure"; - version = "3.4.5.0"; - sha256 = "0gb06b8bb5d7fmkjpbi3smjssjxk5xgmf3lv5axhm0rbndi6y9vc"; + version = "3.4.5.1"; + sha256 = "0j08pff3lrzbxpfz73ywxh27ps79c875qvp49swjm14zc6kbsyvy"; buildDepends = [ base containers mtl parsec setenv template-haskell transformers transformers-compat @@ -78779,7 +79497,6 @@ self: { jailbreak = true; description = "Bindings to the LLVM compiler toolkit using type families"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "llvm-tools" = callPackage @@ -78887,7 +79604,6 @@ self: { ]; description = "Human exchangable identifiers and locators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "loch" = callPackage @@ -79022,8 +79738,8 @@ self: { ({ mkDerivation, array, base }: mkDerivation { pname = "logfloat"; - version = "0.13.2"; - sha256 = "13kr1gwsrwyvnb5klcvl3h506y0l3sibks6cpszwjnz296i5kpf9"; + version = "0.13.3"; + sha256 = "0m1d0g14p6yb4g4irhisfchx3241b2vlm4g527rhwpr8lxd3fqzp"; buildDepends = [ array base ]; homepage = "http://code.haskell.org/~wren/"; description = "Log-domain floating point numbers"; @@ -79894,19 +80610,19 @@ self: { }) { inherit (pkgs) lzma;}; "maam" = callPackage - ({ mkDerivation, base, Cabal, containers, directory + ({ mkDerivation, base, Cabal, containers, directory, ghc , template-haskell, text }: mkDerivation { pname = "maam"; - version = "0.1.0.0"; - sha256 = "016r6ifvn07089fxkki3374cxinj6z6axpg16660qx9i552lrg4r"; + version = "0.2.0.1"; + sha256 = "1r6vp774gjb52bd1lmjx6xzh0pw82b060pl7bh8n0z58i67bvm9q"; isLibrary = true; isExecutable = true; buildDepends = [ - base Cabal containers directory template-haskell text + base Cabal containers directory ghc template-haskell text ]; - description = "A monadic framework for abstract interpretation"; + description = "An application of the Galois Transformers framework to two example semantics"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -80222,10 +80938,10 @@ self: { ({ mkDerivation, base, containers, srcloc, text }: mkDerivation { pname = "mainland-pretty"; - version = "0.2.7.1"; - sha256 = "1ac7rig4hc7i3qv7j45442j0d7zhvlwg41a14wykr3fsi8vb1n5m"; + version = "0.2.7.2"; + sha256 = "0spn95apa05bx2akcl13kmg0vlyyakca3jx1960ja4z9dm9lwadd"; buildDepends = [ base containers srcloc text ]; - homepage = "http://www.eecs.harvard.edu/~mainland/"; + homepage = "http://www.cs.drexel.edu/~mainland/"; description = "Pretty printing designed for printing source code"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -80367,7 +81083,6 @@ self: { ]; description = "Virtual package to install all Manatee packages"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "manatee-anything" = callPackage @@ -80545,7 +81260,6 @@ self: { jailbreak = true; description = "IRC client extension for Manatee"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "manatee-mplayer" = callPackage @@ -81270,8 +81984,8 @@ self: { }: mkDerivation { pname = "matrix"; - version = "0.3.4.2"; - sha256 = "0i45k524z4hf43dab9dgis3ggcswjm0chlxqfc2rqh581gx85sgm"; + version = "0.3.4.3"; + sha256 = "1nshgxiza384xh7h22qgbwa75bylc1l3gh6dsm51axapr1ldi8gg"; buildDepends = [ base deepseq loop primitive vector ]; testDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "A native implementation of matrix operations"; @@ -81758,8 +82472,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "memoize"; - version = "0.6"; - sha256 = "15ya80la5azkpdnlnd7n6x1z9z2nixg0rakp1bj4xsk1ad1hn6x7"; + version = "0.7"; + sha256 = "1sqi9n9r2q3sh00isgj3rmayrlm970a2g9x389rlfb0kczixdnq4"; buildDepends = [ base template-haskell ]; description = "A memoization library"; license = stdenv.lib.licenses.bsd3; @@ -81840,6 +82554,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "messente" = callPackage + ({ mkDerivation, base, bytestring, HTTP, http-conduit, network }: + mkDerivation { + pname = "messente"; + version = "0.1.0.1"; + sha256 = "1yv2dspkn34yf61z8c09aijngjr96w30s2sjmhyv9c2c48ys6jc5"; + buildDepends = [ base bytestring HTTP http-conduit network ]; + homepage = "http://github.com/kaiko/messente-haskell"; + description = "Messente SMS Gateway"; + license = stdenv.lib.licenses.mit; + }) {}; + "meta-misc" = callPackage ({ mkDerivation, base, loch-th, template-haskell }: mkDerivation { @@ -82173,8 +82899,8 @@ self: { }: mkDerivation { pname = "mighttpd2"; - version = "3.2.4"; - sha256 = "0s150iwzvx1y1yfli9187lr23l3q0bxah48n27v2k0vvl0jsr69v"; + version = "3.2.7"; + sha256 = "1l1d7hbx0ffxgfjvm8v4ay2pmw50yifw9g31mqa88pfwnjb4v5sp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -82272,8 +82998,8 @@ self: { }: mkDerivation { pname = "mime-mail"; - version = "0.4.8.1"; - sha256 = "01das7dv5xrvbbmhz2jkd8s3nbp93vz89dnliz3q04aqc5wvdbh5"; + version = "0.4.8.2"; + sha256 = "19f2q4x8b19sc7y1yyxvl3fsyggjs07yhf1zjw42a875lp4mnvia"; buildDepends = [ base base64-bytestring blaze-builder bytestring filepath process random text @@ -82416,13 +83142,13 @@ self: { }: mkDerivation { pname = "minimorph"; - version = "0.1.5.0"; - sha256 = "00dnvv0pap2xr74xwzldz89783iw320z7p1rdw0lwjjpbqa3v00g"; + version = "0.1.6.0"; + sha256 = "17ds0bjpyz7ngsq7nnlqix6yjfr6clr7xkwgpg4fysii7qvymbkz"; buildDepends = [ base text ]; testDepends = [ base HUnit test-framework test-framework-hunit text ]; - homepage = "http://darcsden.com/kowey/minimorph"; + homepage = "https://github.com/Mikolaj/minimorph"; description = "English spelling functions with an emphasis on simplicity"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -83032,6 +83758,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "monad-classes" = callPackage + ({ mkDerivation, base, conduit, data-lens-light, ghc-prim, mmorph + , monad-control, peano, reflection, tasty, tasty-hunit + , transformers, transformers-base, transformers-compat + }: + mkDerivation { + pname = "monad-classes"; + version = "0.3.1.1"; + sha256 = "1n0ry7lq0vh9siaqxfdfavg67a99zmws5nvr1hjq8k212v36v40c"; + buildDepends = [ + base ghc-prim mmorph monad-control peano reflection transformers + transformers-base transformers-compat + ]; + testDepends = [ + base conduit data-lens-light ghc-prim mmorph tasty tasty-hunit + transformers + ]; + homepage = "https://github.com/strake/monad-classes.hs"; + description = "more flexible mtl"; + license = stdenv.lib.licenses.mit; + }) {}; + "monad-codec" = callPackage ({ mkDerivation, base, binary, containers, data-lens, mtl }: mkDerivation { @@ -83200,21 +83948,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger-json" = callPackage + ({ mkDerivation, aeson, base, monad-logger, template-haskell, text + }: + mkDerivation { + pname = "monad-logger-json"; + version = "0.1.0.0"; + sha256 = "1ap98487lwgvgrrxkjskga86ckbv6rhn2n6pzp403343xx51r1qh"; + buildDepends = [ aeson base monad-logger template-haskell text ]; + homepage = "http://github.com/fpco/monad-logger-json"; + description = "JSON-friendly Logging APIs"; + license = stdenv.lib.licenses.mit; + }) {}; + "monad-logger-syslog" = callPackage ({ mkDerivation, base, bytestring, fast-logger, hsyslog - , monad-logger, shelly, text, transformers + , monad-logger, text, transformers }: mkDerivation { pname = "monad-logger-syslog"; - version = "0.1.0.0"; - sha256 = "0q0m611nr20nxm4wj9ywgq3qakl3qvd820vld4nqxdp1lqsilcwz"; + version = "0.1.1.1"; + sha256 = "0hdm495knrdrl76xlsdp0sk6n0v6qnl9b6r6x9ac6s1p7j1w66vf"; buildDepends = [ base bytestring fast-logger hsyslog monad-logger text transformers ]; - testDepends = [ base monad-logger shelly ]; - jailbreak = true; - homepage = "https://github.com/docmunch/monad-logger-rsyslog"; - description = "rsyslog output for monad-logger"; + homepage = "https://github.com/fpco/monad-logger-syslog"; + description = "syslog output for monad-logger"; license = stdenv.lib.licenses.mit; }) {}; @@ -83306,6 +84065,7 @@ self: { jailbreak = true; description = "Open recursion for when you need it"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-ox" = callPackage @@ -83380,8 +84140,8 @@ self: { }: mkDerivation { pname = "monad-parallel-progressbar"; - version = "0.1.0.0"; - sha256 = "0h714gijrmg5z1cjn86j0q58igcrqwbad5yazhhmnb2xzvz1r2p5"; + version = "0.1.0.1"; + sha256 = "1pqi2alyvsflwy5ygp4cl5g90jg50ix61plqxvsldpdkzncmmk84"; buildDepends = [ base monad-parallel monadIO terminal-progress-bar ]; @@ -83467,6 +84227,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-skeleton" = callPackage + ({ mkDerivation, base, containers, ghc-prim }: + mkDerivation { + pname = "monad-skeleton"; + version = "0"; + sha256 = "0niv5pd3n87d1yqn13sam2qsha0dnnkclvn7wxha5zk66km56zyq"; + buildDepends = [ base containers ghc-prim ]; + homepage = "https://github.com/fumieval/monad-skeleton"; + description = "An undead monad"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "monad-st" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -83589,6 +84361,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-unlift" = callPackage + ({ mkDerivation, base, constraints, exceptions, monad-control, mtl + , mutable-containers, stm, transformers, transformers-base + }: + mkDerivation { + pname = "monad-unlift"; + version = "0.1.0.0"; + sha256 = "188xs20whrq9kqqc2rwlxframxsw19qc9fv0cdz1c7dk6h1s8anz"; + buildDepends = [ + base constraints exceptions monad-control mtl mutable-containers + stm transformers transformers-base + ]; + homepage = "https://github.com/fpco/monad-unlift"; + description = "Typeclasses for representing monad transformer unlifting"; + license = stdenv.lib.licenses.mit; + }) {}; + "monad-wrap" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -83854,18 +84643,20 @@ self: { "mongoDB" = callPackage ({ mkDerivation, array, base, binary, bson, bytestring, containers - , cryptohash, hashtables, lifted-base, monad-control, mtl, network - , parsec, random, random-shuffle, text, transformers-base + , cryptohash, hashtables, hspec, lifted-base, monad-control, mtl + , network, old-locale, parsec, random, random-shuffle, text, time + , transformers-base }: mkDerivation { pname = "mongoDB"; - version = "2.0.3"; - sha256 = "1blqd30mw9fl861f07zn7az4psl9byjjbd986884p6rx07m28abk"; + version = "2.0.4"; + sha256 = "1gcv2vzmg6vllvpl8pzfkwmf4rqwldz4p0l4gl78hixbbilx0pgy"; buildDepends = [ array base binary bson bytestring containers cryptohash hashtables lifted-base monad-control mtl network parsec random random-shuffle text transformers-base ]; + testDepends = [ base hspec mtl old-locale time ]; homepage = "https://github.com/mongodb-haskell/mongodb"; description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; license = "unknown"; @@ -84044,12 +84835,11 @@ self: { }: mkDerivation { pname = "monoidal-containers"; - version = "0.1.2.0"; - sha256 = "0d94hpgkrh61cax0f4p71irgvq3psn53qiy7x9bwql8qwsdni1qg"; + version = "0.1.2.1"; + sha256 = "1n76vjh785yzirfkh63nlrpi9y1bb9z1r3v514150wfxjn3n723j"; 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; @@ -84231,8 +85021,8 @@ self: { }: mkDerivation { pname = "morte"; - version = "1.1.1"; - sha256 = "0daq0894kmd938k7qdbi7f1axih5gx5yrimx5pssfvhvw78bdqp4"; + version = "1.1.2"; + sha256 = "1rz15nmzagwngjd15kd25vnrpz3br23kmjzf558qp61bxlhflybc"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -84419,23 +85209,21 @@ self: { }) {}; "msgpack" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , containers, deepseq, ghc-prim, hashable, mtl, QuickCheck - , template-haskell, test-framework, test-framework-quickcheck2 - , text, unordered-containers, vector + ({ mkDerivation, base, binary, blaze-builder, bytestring + , containers, data-binary-ieee754, deepseq, hashable, mtl + , QuickCheck, tasty, tasty-quickcheck, text, unordered-containers + , vector }: mkDerivation { pname = "msgpack"; - version = "0.7.2.5"; - sha256 = "1iwibyv5aqp5h98x4s5pp3hj218l2k3vff87p727mh74f5j6l3s8"; + version = "1.0.0"; + sha256 = "0kk6nqn290sh0l0hhglccs0cqgk0fb3xdjzqz19yw9wb8aw01xh8"; buildDepends = [ - attoparsec base blaze-builder bytestring containers deepseq - ghc-prim hashable mtl template-haskell text unordered-containers - vector + base binary blaze-builder bytestring containers data-binary-ieee754 + deepseq hashable mtl text unordered-containers vector ]; testDepends = [ - base bytestring QuickCheck test-framework - test-framework-quickcheck2 + base bytestring QuickCheck tasty tasty-quickcheck ]; jailbreak = true; homepage = "http://msgpack.org/"; @@ -84443,6 +85231,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "msgpack-aeson" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, msgpack + , scientific, tasty, tasty-hunit, text, unordered-containers + , vector + }: + mkDerivation { + pname = "msgpack-aeson"; + version = "0.1.0.0"; + sha256 = "1ygnki55cj6951y75snc4gnv4vsjp9pgwqg3jp7cy9bcss3msq3j"; + buildDepends = [ + aeson base bytestring deepseq msgpack scientific text + unordered-containers vector + ]; + testDepends = [ aeson base msgpack tasty tasty-hunit ]; + homepage = "http://msgpack.org/"; + description = "Aeson adapter for MessagePack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "msgpack-idl" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, cmdargs , containers, directory, filepath, hspec, msgpack, peggy @@ -84467,19 +85274,19 @@ self: { }) {}; "msgpack-rpc" = callPackage - ({ mkDerivation, async, attoparsec-conduit, base, bytestring - , conduit, hspec, monad-control, msgpack, mtl, network - , network-conduit, random, text + ({ mkDerivation, async, base, binary, binary-conduit, bytestring + , conduit, conduit-extra, exceptions, monad-control, msgpack, mtl + , network, random, tasty, tasty-hunit, text }: mkDerivation { pname = "msgpack-rpc"; - version = "0.9.0"; - sha256 = "0gljj04f7zfaj7y3rknygyz0k5c0vx4zhphcp934q36xa943jmwr"; + version = "1.0.0"; + sha256 = "00m5hpj5cd521j3jzsaw49asbpxvka0x1zi2qs26si82wxgnpjkn"; buildDepends = [ - attoparsec-conduit base bytestring conduit monad-control msgpack - mtl network network-conduit random text + base binary binary-conduit bytestring conduit conduit-extra + exceptions monad-control msgpack mtl network random text ]; - testDepends = [ async base hspec mtl network ]; + testDepends = [ async base mtl network tasty tasty-hunit ]; jailbreak = true; homepage = "http://msgpack.org/"; description = "A MessagePack-RPC Implementation"; @@ -84757,8 +85564,8 @@ self: { }: mkDerivation { pname = "multiarg"; - version = "0.30.0.6"; - sha256 = "0zikmmspyk9klw44zf39qfg8c72cq9aipsdcxaldim2wzajfxrlx"; + version = "0.30.0.8"; + sha256 = "18lq0q76a4vx5r28wrxwa3cb2gdx6hv8vylkky07dqccqgxdg5ss"; isLibrary = true; isExecutable = true; buildDepends = [ base utf8-string ]; @@ -84789,6 +85596,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "multihash" = callPackage + ({ mkDerivation, attoparsec, base, base58-bytestring + , base64-bytestring, byteable, bytestring, cryptohash, hex + , io-streams, optparse-applicative + }: + mkDerivation { + pname = "multihash"; + version = "0.1.1"; + sha256 = "09yjr7whddn60kyn25hzjjls1m5xi87nqzbkrb6vp4hlvmzm0b1g"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + attoparsec base base58-bytestring base64-bytestring byteable + bytestring cryptohash hex io-streams optparse-applicative + ]; + homepage = "https://github.com/LukeHoersten/multihash"; + description = "Multihash library and CLI executable"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "multimap" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -84813,6 +85640,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "multipart-names" = callPackage + ({ mkDerivation, base, case-insensitive, HUnit, lens, parsec + , test-framework, test-framework-hunit + }: + mkDerivation { + pname = "multipart-names"; + version = "0.0.1"; + sha256 = "17cw9lg1qi3rm38yh13n6gkb0grld4gc003hz49vdz8bx4gzfqxc"; + buildDepends = [ base case-insensitive lens parsec ]; + testDepends = [ + base HUnit lens test-framework test-framework-hunit + ]; + homepage = "http://github.com/nedervold/multipart-names"; + description = "Handling of multipart names in various casing styles"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "multipass" = callPackage ({ mkDerivation, base, binary, containers, ghc-prim, hashable, keys , math-functions, newtype, unordered-containers @@ -85355,8 +86199,8 @@ self: { }: mkDerivation { pname = "mutable-containers"; - version = "0.2.1.2"; - sha256 = "1j1dzx8iniq3arpjrndkpvkjad175hl4ijjryaf3s59pzpbz17y8"; + version = "0.3.0"; + sha256 = "1xsz214z5z1qrl5xy5gyq97bsh8b1li3kaz7cp6zm955bz43rv6c"; buildDepends = [ base containers ghc-prim mono-traversable primitive vector ]; @@ -85461,8 +86305,8 @@ self: { }: mkDerivation { pname = "mwc-random"; - version = "0.13.3.0"; - sha256 = "0navzgw1y1zm3n4zs7x0lk2nmnjysk5cpw0clpl0w7iwb75yrnjd"; + version = "0.13.3.2"; + sha256 = "01jqmq52knlwskgyx7940c81dmgdivrj0sbi2h6l0ccbxiaf7c9c"; buildDepends = [ base primitive time vector ]; testDepends = [ base HUnit QuickCheck statistics test-framework @@ -85603,8 +86447,8 @@ self: { }: mkDerivation { pname = "mysql-simple"; - version = "0.2.2.4"; - sha256 = "044grjly1gyrgba2bfrii2pa14ff7v14ncyk3kj01g1zdxnwqjh6"; + version = "0.2.2.5"; + sha256 = "132igmgrgkpc0g9063d593ha3iv40k5dd017nlb07sz0qs9hi8w6"; buildDepends = [ attoparsec base base16-bytestring blaze-builder blaze-textual bytestring mysql old-locale pcre-light text time @@ -86248,6 +87092,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nero" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, containers, doctest + , Glob, lens, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "nero"; + version = "0.2"; + sha256 = "1jw8sji0ci4za62zgjdlxsh9rknaj3pdm7p32rxdd33i6ir6pmh0"; + buildDepends = [ base bifunctors bytestring containers lens text ]; + testDepends = [ + base bytestring doctest Glob lens tasty tasty-hunit text + ]; + homepage = "https://github.com/jdnavarro/nero"; + description = "Lens-based HTTP toolkit"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "nested-routes" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring, containers + , hspec, http-types, lucid, mtl, pseudo-trie, QuickCheck + , quickcheck-instances, semigroups, text, transformers, wai + , wai-extra + }: + mkDerivation { + pname = "nested-routes"; + version = "0.0.2"; + sha256 = "0gajlb66cqnsi8svs98cil7clhlwdwh5fhdx19vy8mlvl99d9ri8"; + buildDepends = [ + aeson base blaze-html bytestring containers http-types lucid mtl + pseudo-trie semigroups text transformers wai wai-extra + ]; + testDepends = [ base hspec QuickCheck quickcheck-instances ]; + description = "Like scotty, but nested"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nested-sets" = callPackage ({ mkDerivation, base, containers, hspec }: mkDerivation { @@ -86288,7 +87169,6 @@ self: { homepage = "http://netclock.slab.org/"; description = "Netclock protocol"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netcore" = callPackage @@ -86397,6 +87277,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "netrc" = callPackage + ({ mkDerivation, base, bytestring, deepseq, parsec, tasty + , tasty-golden, tasty-quickcheck + }: + mkDerivation { + pname = "netrc"; + version = "0.2.0.0"; + sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls"; + buildDepends = [ base bytestring deepseq parsec ]; + testDepends = [ + base bytestring tasty tasty-golden tasty-quickcheck + ]; + homepage = "https://github.com/hvr/netrc"; + description = "Parser for .netrc files"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "netspec" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, mtl, network , template-haskell, text, transformers @@ -86607,6 +87504,7 @@ self: { homepage = "http://github.com/solatis/haskell-network-anonymous-i2p"; description = "Haskell API for I2P anonymous networking"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-api-support" = callPackage @@ -86656,8 +87554,8 @@ self: { }: mkDerivation { pname = "network-bitcoin"; - version = "1.7.1"; - sha256 = "0w801fmwfn1q5n65yd2c5n7c6901gxvx640r6mrjxgcj402bwjxk"; + version = "1.8.0"; + sha256 = "00gffxnsij6m7mr539983ry8n6n8zm6hk6fwlh6fxsj5kv34nprj"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -86685,6 +87583,7 @@ self: { testDepends = [ base cabal-test-bin hspec hspec-server process ]; description = "Linux NetworkNameSpace Builder"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-bytestring" = callPackage @@ -87493,6 +88392,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "nicovideo-translator" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, dns, http-client, http-types, iso639, lens + , lens-aeson, random, setlocale, text, wai, warp, wreq, xml-conduit + }: + mkDerivation { + pname = "nicovideo-translator"; + version = "0.1.0.0"; + sha256 = "01qbmkr9h78iwyrgdijqyf06xl8wk2z9nn4v8dc5pb1gknlbp8wh"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base bytestring case-insensitive containers dns http-client + http-types iso639 lens lens-aeson random setlocale text wai warp + wreq xml-conduit + ]; + jailbreak = true; + homepage = "https://github.com/dahlia/nicovideo-translator"; + description = "Nico Nico Douga (ニコニコ動画) Comment Translator"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "nikepub" = callPackage ({ mkDerivation, base, containers, filepath, GoogleChart, haskell98 , haxr, hs-twitter, HStringTemplate, HTTP, hxt, json, network @@ -87685,8 +88606,8 @@ self: { ({ mkDerivation, base, containers, QuickCheck, utility-ht }: mkDerivation { pname = "non-empty"; - version = "0.2"; - sha256 = "1wapx5q8spvlq8g7nagj2lwhrqzg90dw4n0qvd1ap47n0rh3iymm"; + version = "0.2.1"; + sha256 = "1p0jp44xlc77da5g5fq78vvgfv8r9z4m0axm36qbliv609rnp5g3"; buildDepends = [ base containers QuickCheck utility-ht ]; homepage = "http://code.haskell.org/~thielema/non-empty/"; description = "List-like structures with static restrictions on the number of elements"; @@ -87738,8 +88659,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "nonfree"; - version = "0.1.0.0"; - sha256 = "1cwxnkral8d33xgpjlqrv0d5q5c046siw9z56bhp53qpk40ihn81"; + version = "0.1.0.1"; + sha256 = "05jf3i9m58lwixd3mnj9ikgkrg1gdcxz7d8m5k5k5j3fdbbgbmqi"; buildDepends = [ base ]; description = "Free structures sans laws"; license = stdenv.lib.licenses.mit; @@ -88130,15 +89051,14 @@ self: { }: mkDerivation { pname = "numeric-prelude"; - version = "0.4.1"; - sha256 = "1y1dg4bk811xmz3p23g8kjl6vxns3gs8qj671971c06nccfl1h5r"; + version = "0.4.2"; + sha256 = "1i6qavz3av3dbf70li7yqsh184bl618l1sm9s9ia15srrkzsj9sk"; isLibrary = true; isExecutable = true; buildDepends = [ array base containers deepseq non-negative parsec QuickCheck random storable-record utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Numeric_Prelude"; description = "An experimental alternative hierarchy of numeric type classes"; license = stdenv.lib.licenses.bsd3; @@ -88165,7 +89085,9 @@ self: { mkDerivation { pname = "numeric-quest"; version = "0.2.0.1"; + revision = "1"; sha256 = "110v2frn085pggjzl3l8wqgr4vcdd5h29x2wak2a59x16ngjg7ga"; + editedCabalFile = "aae9d00f380bf447af5575311f566cd6960aafb7eec8c30abbab09a2fcff092e"; buildDepends = [ array base ]; homepage = "http://www.haskell.org/haskellwiki/Numeric_Quest"; description = "Math and quantum mechanics"; @@ -88572,7 +89494,6 @@ self: { jailbreak = true; description = "An OpenLayers JavaScript Wrapper and Webframework with snaplet-fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "omaketex" = callPackage @@ -89019,7 +89940,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/SuperCollider"; description = "Haskell OpenSoundControl utilities"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "openssh-github-keys" = callPackage @@ -89214,7 +90134,6 @@ self: { homepage = "https://github.com/tsuraan/optimal-blocks"; description = "Optimal Block boundary determination for rsync-like behaviours"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optimization" = callPackage @@ -89531,17 +90450,15 @@ self: { }: mkDerivation { pname = "origami"; - version = "0.0.2"; - sha256 = "1fmr12y5dma4w8psxpnx8rk0yixm46gc8mjbdi5l8qxrkxlmnr2s"; + version = "0.0.4"; + sha256 = "0q0dsyhpp63kkpjqvjksy1xnwp1f9yilgxrxgwcqrzdjzmgg4rzw"; buildDepends = [ base bifunctors containers lens mtl pretty template-haskell ]; testDepends = [ base HUnit test-framework test-framework-hunit ]; - jailbreak = true; homepage = "http://github.com/nedervold/origami"; description = "An un-SYB framework for transforming heterogenous data through folds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "os-release" = callPackage @@ -89649,6 +90566,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "overture" = callPackage + ({ mkDerivation, base, doctest }: + mkDerivation { + pname = "overture"; + version = "0.0.5"; + sha256 = "0mv9iakq1yjawf7f0zckmxbzlcv2rlqngsllfsrcydi6lxazznzw"; + buildDepends = [ base ]; + testDepends = [ base doctest ]; + description = "An alternative to some of the Prelude"; + license = stdenv.lib.licenses.mit; + }) {}; + "pack" = callPackage ({ mkDerivation, array, base, bytestring, lens, transformers , vector @@ -89776,7 +90705,9 @@ self: { mkDerivation { pname = "packunused"; version = "0.1.1.4"; + revision = "1"; sha256 = "1ahb8wq7yxnfzwcvppk8cyhj9r51fz9ci1pwy0h4ql7iyc3z0vy8"; + editedCabalFile = "5ddb122ff2a1ac4e79226f31b4d8f7dab67bb5501d0e715d84dbfe36c845b772"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -89858,7 +90789,6 @@ self: { homepage = "http://github.com/brendanhay/pagerduty"; description = "Client library for PagerDuty Integration and REST APIs"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "palette" = callPackage @@ -89937,7 +90867,9 @@ self: { mkDerivation { pname = "pandoc"; version = "1.13.2"; + revision = "2"; sha256 = "12kd71g70d1wzz19p5yq7f00hw8d4ra8ghn83g7yzsal8igl8p76"; + editedCabalFile = "1b9479a2579d76c43089283b6fb7a060e16050fd62fe0da896a722db815671d6"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -89993,10 +90925,9 @@ self: { ({ mkDerivation, base, containers, lens, pandoc-types }: mkDerivation { pname = "pandoc-lens"; - version = "0.3.1"; - sha256 = "1h943cyj6ph5w32rmkzlvszjbb7s65is1h9ifws4m7nj9mbn13lf"; + version = "0.3.2"; + sha256 = "1n0h3cf2yb5rmlfd0bbxlj3r8bm4h8yffd76fqsbw3s5jm0df4wb"; buildDepends = [ base containers lens pandoc-types ]; - jailbreak = true; homepage = "http://github.com/bgamari/pandoc-lens"; description = "Lenses for Pandoc documents"; license = stdenv.lib.licenses.bsd3; @@ -90038,8 +90969,8 @@ self: { }: mkDerivation { pname = "pango"; - version = "0.13.0.5"; - sha256 = "031yrfz6i4sc8jp2r1ar3mhz4cg8ih3kics2g7qvrxi1s3ai3d3x"; + version = "0.13.1.0"; + sha256 = "0s69ga5gn9grdqcfxkbnvk0f3malql3fnhzh9cwvpfzqk3hxn4hn"; buildDepends = [ array base cairo containers directory glib mtl pretty process text ]; @@ -90780,7 +91711,6 @@ self: { homepage = "http://code.haskell.org/~thielema/patch-image/"; description = "Compose a big image from overlapping parts"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "path-pieces" = callPackage @@ -90895,8 +91825,8 @@ self: { }: mkDerivation { pname = "paypal-adaptive-hoops"; - version = "0.10.0.0"; - sha256 = "11v9s1hm1iyc03d20nzpp2djvxpikrqg915bjvgfcmw9zlfsh5qn"; + version = "0.10.0.1"; + sha256 = "0h4dq8p91jbzgr19jwmvmvk9agi3id226qdm46lxpnz3w6hrh5p6"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -91039,12 +91969,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pcf" = callPackage + ({ mkDerivation, base, bound, c-dsl, containers, monad-gen, mtl + , prelude-extras, transformers, void + }: + mkDerivation { + pname = "pcf"; + version = "0.1.0.1"; + sha256 = "1dmp9afylsf4n7gxa23wn25w8h89lqyhjlxa5g7gshrbwxkx7c55"; + buildDepends = [ + base bound c-dsl containers monad-gen mtl prelude-extras + transformers void + ]; + description = "A one file compiler for PCF"; + license = stdenv.lib.licenses.mit; + }) {}; + "pcg-random" = callPackage ({ mkDerivation, base, doctest, primitive, random, time }: mkDerivation { pname = "pcg-random"; - version = "0.1.1.0"; - sha256 = "0jflsspld5gfgcg2q9zmxqfyqdcdbld5d7vqfkr3ckgnwxx0kx61"; + version = "0.1.2.0"; + sha256 = "1h2ry2p1nnvh3prrl6xz18p3npccrb0p9qzq41lcn10sizfsgpzx"; buildDepends = [ base primitive random time ]; testDepends = [ base doctest ]; homepage = "http://github.com/cchalmers/pcg-random"; @@ -91112,8 +92058,8 @@ self: { }: mkDerivation { pname = "pcre-utils"; - version = "0.1.4"; - sha256 = "1kvasljlrfmlskqzzglm6swkfmfrqycv0j0hswck0lcfzd8nxkna"; + version = "0.1.5"; + sha256 = "0b6n3sls6r65kn7i9z607ck99sxw2xxh7frljc09cx73iy71ml69"; buildDepends = [ array attoparsec base bytestring mtl regex-pcre-builtin vector ]; @@ -91194,7 +92140,6 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "Simple pdf viewer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf2line" = callPackage @@ -91275,6 +92220,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "peano" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "peano"; + version = "0.1.0.1"; + sha256 = "0yzcxrl41dacvx2wkyxjj7hgvz56l4qb59r4h9rmaqd7jcwx5z9i"; + buildDepends = [ base ]; + description = "Peano numbers"; + license = "unknown"; + }) {}; + "peano-inf" = callPackage ({ mkDerivation, base, containers, lazysmallcheck }: mkDerivation { @@ -91781,8 +92737,8 @@ self: { }: mkDerivation { pname = "persistent-redis"; - version = "0.3.1"; - sha256 = "1djwaahabjpj01hvg9hp6ldqxjn45hp1dl84bbgvini1f6ihh2bq"; + version = "0.3.2"; + sha256 = "0p5wjf4f201mpdwry188v1h9wf3fh1pvfsm663x4ipy3b1yc8b1k"; buildDepends = [ aeson attoparsec base binary bytestring hedis monad-control mtl path-pieces persistent scientific text time transformers @@ -91818,8 +92774,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.1.3"; - sha256 = "1vyfhiwahyfgv6xwbfyn42f19dijbmjshlyy6a5rf0bfllc2k7gf"; + version = "2.1.4"; + sha256 = "0284w3kvphlwp31d0mlkklimyrcjmwz4mp57q85sh27j7032sfkw"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -91902,7 +92858,6 @@ self: { ]; description = "Backend for persistent library using Zookeeper"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persona" = callPackage @@ -91920,7 +92875,6 @@ self: { homepage = "https://github.com/frasertweedale/hs-persona"; description = "Persona (BrowserID) library"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persona-idp" = callPackage @@ -92307,8 +93261,8 @@ self: { }: mkDerivation { pname = "picoparsec"; - version = "0.1.2"; - sha256 = "1h6d04h72h4cckxh6b16336v47mn7f3ybslzzimg8nmi2yldn0b9"; + version = "0.1.2.1"; + sha256 = "1nlklprhnr0cgmzfp9vnyv9knn3qz5dlhpxr036fygaad67950ci"; buildDepends = [ array base bytestring containers deepseq monoid-subclasses scientific text @@ -92366,18 +93320,18 @@ self: { "pinboard" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, either - , HsOpenSSL, http-streams, http-types, io-streams, mtl, network - , old-locale, random, text, time, transformers - , unordered-containers + , haskell-src-exts, HsOpenSSL, http-streams, http-types, io-streams + , mtl, network, old-locale, random, text, time, transformers + , unordered-containers, vector }: mkDerivation { pname = "pinboard"; - version = "0.4"; - sha256 = "0vn5fy15yshr9ypz8qagnqsgkkn33qv19ayqp4fy5x5bv68y7a0b"; + version = "0.6.4"; + sha256 = "1v870whyk96imsx0ld6a3yc2am6ywjwmixh0g7b916xf8vdh727w"; buildDepends = [ - aeson base bytestring containers either HsOpenSSL http-streams - http-types io-streams mtl network old-locale random text time - transformers unordered-containers + aeson base bytestring containers either haskell-src-exts HsOpenSSL + http-streams http-types io-streams mtl network old-locale random + text time transformers unordered-containers vector ]; homepage = "https://github.com/jonschoning/pinboard"; description = "Access to the Pinboard API"; @@ -92390,8 +93344,8 @@ self: { }: mkDerivation { pname = "pipes"; - version = "4.1.4"; - sha256 = "0bv7i18lf15mvfscnif4hkwgm4anw8b7bbqhzdw4wbjqcvrrsppb"; + version = "4.1.5"; + sha256 = "1c19am4dr6na9xpx4h7yngvbml0ghc1dbym8988hjhw84gq4lhfx"; buildDepends = [ base mmorph mtl transformers ]; testDepends = [ base mtl QuickCheck test-framework test-framework-quickcheck2 @@ -92511,17 +93465,17 @@ self: { }) {}; "pipes-cliff" = callPackage - ({ mkDerivation, async, base, bytestring, pipes, pipes-concurrency - , pipes-safe, process + ({ mkDerivation, async, base, bytestring, pipes, pipes-safe + , process, stm }: mkDerivation { pname = "pipes-cliff"; - version = "0.6.0.0"; - sha256 = "1rlv19imipfjws9zhn0vf3vnnrfmx4laq5npz02fg41sk2gpincq"; + version = "0.10.0.0"; + sha256 = "1xzjw7bd96q7fg7q43rvcxv29p6ziknp6z08qzrnx5i4w9gjnk8s"; isLibrary = true; isExecutable = true; buildDepends = [ - async base bytestring pipes pipes-concurrency pipes-safe process + async base bytestring pipes pipes-safe process stm ]; homepage = "http://www.github.com/massysett/pipes-cliff"; description = "Streaming to and from subprocesses using Pipes"; @@ -92867,11 +93821,12 @@ self: { }: mkDerivation { pname = "pipes-vector"; - version = "0.5.3"; - sha256 = "1ny8dd4sd55df412v9dy5z0vf3nbi4h46pjazyiaj056p2w723aa"; + version = "0.6"; + sha256 = "0a3q8cj05b6a6iy2gi8mp2qc6xvmwmiqvcd5i3v0kzvi3rv8fh86"; buildDepends = [ base monad-primitive pipes primitive transformers vector ]; + jailbreak = true; description = "Various proxies for streaming data into vectors"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -94124,20 +95079,20 @@ self: { }) {}; "postgresql-binary" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, bytestring, HTF - , loch-th, placeholders, postgresql-libpq, QuickCheck - , quickcheck-instances, scientific, text, time, transformers, uuid + ({ mkDerivation, attoparsec, base-prelude, bytestring, HTF, loch-th + , placeholders, postgresql-libpq, QuickCheck, quickcheck-instances + , scientific, text, time, transformers, uuid }: mkDerivation { pname = "postgresql-binary"; - version = "0.5.1"; - sha256 = "09y7llixrzqyl64zv2a40i6jsvq2c03szw8y7y8pz81awd6pid4q"; + version = "0.5.2"; + sha256 = "1fwh3r0f63wcwnw544jdirzsd0brslkqahn8d2iwr2jvpm5f0pqh"; buildDepends = [ - attoparsec base base-prelude bytestring loch-th placeholders - scientific text time transformers uuid + attoparsec base-prelude bytestring loch-th placeholders scientific + text time transformers uuid ]; testDepends = [ - base base-prelude bytestring HTF postgresql-libpq QuickCheck + base-prelude bytestring HTF postgresql-libpq QuickCheck quickcheck-instances scientific text time uuid ]; homepage = "https://github.com/nikita-volkov/postgresql-binary"; @@ -94570,8 +95525,8 @@ self: { }: mkDerivation { pname = "prednote"; - version = "0.32.0.4"; - sha256 = "1w7p8f8xqwkqbhf9a59g2y31rkd84290hsprxvhrn6qka6bfxfcf"; + version = "0.32.0.6"; + sha256 = "0ammlm2dfhjmgy2ackrk4gvwgxz8sph8d2n4pwk2vl17hy024dbj"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -94977,6 +95932,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "primitive_0_6" = callPackage + ({ mkDerivation, base, ghc-prim, transformers }: + mkDerivation { + pname = "primitive"; + version = "0.6"; + sha256 = "08lpsvrgdvqh8xw7f1wzkvwdnkizblbym8y2xpknk0y62f9g799l"; + buildDepends = [ base ghc-prim transformers ]; + testDepends = [ base ghc-prim ]; + homepage = "https://github.com/haskell/primitive"; + description = "Primitive memory-related operations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "primula-board" = callPackage ({ mkDerivation, base, ConfigFile, containers, directory, happstack , happstack-helpers, happstack-server, happstack-state, hsp @@ -95291,8 +96259,8 @@ self: { }: mkDerivation { pname = "process-streaming"; - version = "0.7.0.1"; - sha256 = "1dnarvm26xwrys8wjh43757r59pby41w5cizqwyg1zcr2qk7awd8"; + version = "0.7.1.0"; + sha256 = "07f3qykiqf3a2al2dj72fm2mlpl263vgvb4n3m9a32lf7mw6243d"; buildDepends = [ base bifunctors bytestring conceit containers contravariant foldl free pipes pipes-bytestring pipes-concurrency pipes-parse @@ -95325,7 +96293,6 @@ self: { multiset QuickCheck quickcheck-instances template-haskell text transformers ]; - jailbreak = true; description = "Web graphic applications with processing.js."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -95458,8 +96425,8 @@ self: { }: mkDerivation { pname = "profiteur"; - version = "0.1.2.2"; - sha256 = "11h4hgwwh8vq96vkca2w1rc5l0aikfhp6550x5ax04k4p3l9lzhy"; + version = "0.2.0.0"; + sha256 = "0pgjd7a8xflnk0v2r2smc5qb7j8zsr5qrlxkdk36547plfjfvnv4"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -95491,7 +96458,9 @@ self: { mkDerivation { pname = "profunctors"; version = "4.4.1"; + revision = "1"; sha256 = "1x5q4bc18cyxajv39xxbxzgpq75xzrhx450n8rc3p8gir92hx645"; + editedCabalFile = "72f05aa59d302bcd53277bdff17e920bc0128e5787b2f8edf584c517cd084db7"; buildDepends = [ base comonad distributive semigroupoids tagged transformers ]; @@ -95943,6 +96912,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pseudo-trie" = callPackage + ({ mkDerivation, base, data-default, hspec, QuickCheck + , quickcheck-instances, semigroups + }: + mkDerivation { + pname = "pseudo-trie"; + version = "0.0.4"; + sha256 = "0v1j9ml746h3lpj5cvcwcwjan7vwqaadvblxnb0gl9in4k2kk0yz"; + buildDepends = [ base QuickCheck quickcheck-instances semigroups ]; + testDepends = [ + base data-default hspec QuickCheck quickcheck-instances semigroups + ]; + description = "A tagged rose-tree with short circuited unique leaves"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pseudomacros" = callPackage ({ mkDerivation, base, old-locale, template-haskell, time }: mkDerivation { @@ -96786,6 +97771,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quantfin" = callPackage + ({ mkDerivation, base, containers, mersenne-random-pure64, mtl + , random-fu, rvar, transformers, vector + }: + mkDerivation { + pname = "quantfin"; + version = "0.1.0.1"; + sha256 = "1rx8jrdhlqnbj28d2yi7vb3x1z7g5qrvzrhfx44zdiqlgw215f05"; + buildDepends = [ + base containers mersenne-random-pure64 mtl random-fu rvar + transformers vector + ]; + homepage = "https://github.com/boundedvariation/quantfin"; + description = "Quant finance library in pure Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "quantities" = callPackage ({ mkDerivation, base, containers, doctest, Glob, hlint, hspec, mtl , parsec, process, regex-compat @@ -96836,6 +97838,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "quenya-verb" = callPackage + ({ mkDerivation, aeson, base, bytestring, cmdargs, cond, containers + , directory, iproute, MissingH, network, safe, scotty, text + , transformers, wai, wai-extra, wai-middleware-static, warp + }: + mkDerivation { + pname = "quenya-verb"; + version = "0.0.1"; + sha256 = "0zw15qym8r00m7kir9h9cys1rmszdqihfcvy6dw52f1pb6cp5vsx"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base bytestring cmdargs cond containers directory iproute + MissingH network safe scotty text transformers wai wai-extra + wai-middleware-static warp + ]; + description = "Quenya verb conjugator"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "querystring-pickle" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, test-framework , test-framework-quickcheck2, text @@ -97330,8 +98352,8 @@ self: { ({ mkDerivation, base, bytestring, process, QuickCheck, text }: mkDerivation { pname = "rainbow"; - version = "0.22.0.0"; - sha256 = "0357yn0dqhmcpy6k661xwlyj7a3nfmj3qci55dkc126mdl66ibf1"; + version = "0.22.0.2"; + sha256 = "0bzjh7j0ckdzvmfb29pi1l7h28hg77rykwj4bndzi55mbqkabrs9"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring process text ]; @@ -97527,6 +98549,25 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "random-hypergeometric" = callPackage + ({ mkDerivation, base, Cabal, cabal-test-quickcheck, math-functions + , mwc-random, QuickCheck, random-fu, vector + }: + mkDerivation { + pname = "random-hypergeometric"; + version = "0.1.0.0"; + sha256 = "0jg4j2nwijb5ic9zl5y9miqhn881dmf0s49gj8f818as3mhvqlgh"; + buildDepends = [ base math-functions random-fu ]; + testDepends = [ + base Cabal cabal-test-quickcheck math-functions mwc-random + QuickCheck random-fu vector + ]; + homepage = "https://github.com/srijs/random-hypergeometric"; + description = "Random variate generation from hypergeometric distributions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "random-shuffle" = callPackage ({ mkDerivation, base, MonadRandom, random }: mkDerivation { @@ -97749,6 +98790,7 @@ self: { JuicyPixels lens linear mtl optparse-applicative Rasterific scientific svg-tree text transformers vector ]; + jailbreak = true; description = "SVG renderer based on Rasterific"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -98771,7 +99813,6 @@ self: { version = "0.2.3"; sha256 = "1bbmmvrprbig4ic1vq8jjhb4nxxkn0a4dxxaa62i02ms3wb1vsf5"; buildDepends = [ base blaze-html blaze-markup reform text ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Add support for using blaze-html with Reform"; license = stdenv.lib.licenses.bsd3; @@ -98784,7 +99825,6 @@ self: { version = "0.0.4"; sha256 = "1f8rh9wiax6g7kh1j0j2zmqr7n1ll9ijn2xqp1shhsq8vp30f8fg"; buildDepends = [ base blaze-markup reform shakespeare text ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Add support for using Hamlet with Reform"; license = stdenv.lib.licenses.bsd3; @@ -99718,11 +100758,12 @@ self: { }: mkDerivation { pname = "repa"; - version = "3.3.1.2"; - sha256 = "0rsahd6c1mxd8hq9zfx4jqgmcfs4di4askky87y71xy5v4k1x4ai"; + version = "3.4.0.1"; + sha256 = "197ab7z0fi50n3i8lkcxqazgnv39dv8dhndzihppsmfkil5y58l4"; buildDepends = [ base bytestring ghc-prim QuickCheck template-haskell vector ]; + jailbreak = true; homepage = "http://repa.ouroborus.net"; description = "High performance, regular, shape polymorphic parallel arrays"; license = stdenv.lib.licenses.bsd3; @@ -99732,10 +100773,11 @@ self: { ({ mkDerivation, base, llvm, repa, vector }: mkDerivation { pname = "repa-algorithms"; - version = "3.3.1.2"; - sha256 = "12fizvma877ws3xiz3k34jg5xh5yhnl0n5aq2za005l9i5angkk9"; + version = "3.4.0.1"; + sha256 = "0q8jwp1msg5icvcqxszh5c1190llwz17gxc7nmd1bkyca59j8w0l"; buildDepends = [ base repa vector ]; extraLibraries = [ llvm ]; + jailbreak = true; homepage = "http://repa.ouroborus.net"; description = "Algorithms using the Repa array library"; license = stdenv.lib.licenses.bsd3; @@ -99743,15 +100785,15 @@ self: { "repa-array" = callPackage ({ mkDerivation, base, bytestring, double-conversion, mtl - , primitive, repa-eval, repa-stream, text, vector + , primitive, repa-convert, repa-eval, repa-stream, text, vector }: mkDerivation { pname = "repa-array"; - version = "4.0.0.2"; - sha256 = "0169fqf07yqpx93n8qlq3yfnqv9rhc19r1a6rcvbrva7h8kh04nb"; + version = "4.1.0.1"; + sha256 = "04bi2j2y5rrpkfzys6ma0d5fhsrapip0xb43gqsgcqz3rk89lank"; buildDepends = [ - base bytestring double-conversion mtl primitive repa-eval - repa-stream text vector + base bytestring double-conversion mtl primitive repa-convert + repa-eval repa-stream text vector ]; jailbreak = true; homepage = "http://repa.ouroborus.net"; @@ -99773,6 +100815,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "repa-convert" = callPackage + ({ mkDerivation, base, primitive, vector }: + mkDerivation { + pname = "repa-convert"; + version = "4.1.0.1"; + sha256 = "197lqlyvljbngnckw742kij7frsx1rwakfa13xwaij6gxmyz9zx6"; + buildDepends = [ base primitive vector ]; + homepage = "http://repa.ouroborus.net"; + description = "Packing and unpacking binary data"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "repa-devil" = callPackage ({ mkDerivation, base, libdevil, repa, transformers }: mkDerivation { @@ -99804,8 +100858,8 @@ self: { }: mkDerivation { pname = "repa-examples"; - version = "3.3.1.1"; - sha256 = "0gdkwmdnmvq82zglryxx2ic1nm4g2r4a0bwndiwbj670w03p712p"; + version = "3.4.0.1"; + sha256 = "00v1z4kscvmnd4k7lsswzaxafkk7mbsy4ghdd503wpvr4fvslgaz"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -99840,8 +100894,8 @@ self: { }: mkDerivation { pname = "repa-flow"; - version = "4.0.0.2"; - sha256 = "1kznd1dl4rxwbc0k9asrwqm4pygq97x95g3zmy9v6lhbm6p1kpsd"; + version = "4.1.0.1"; + sha256 = "0d3j4wc3f0rbxmmj2hq9m8m9hjnad6siard279xs7sd4qzwkcpg7"; buildDepends = [ base bytestring containers directory filepath primitive repa-array repa-eval repa-stream text vector @@ -99857,9 +100911,10 @@ self: { }: mkDerivation { pname = "repa-io"; - version = "3.3.1.2"; - sha256 = "1i58ysk44y7s6z1jmns2fi83flqma4k5nsjh1pblqb2rgl7x0z5p"; + version = "3.4.0.1"; + sha256 = "06ks4gxsajnalxh9mpnl4pckxnyfc59823war3m74anb0pqcrbbl"; buildDepends = [ base binary bmp bytestring old-time repa vector ]; + jailbreak = true; homepage = "http://repa.ouroborus.net"; description = "Read and write Repa arrays in various formats"; license = stdenv.lib.licenses.bsd3; @@ -99918,8 +100973,8 @@ self: { ({ mkDerivation, base, mtl, primitive, vector }: mkDerivation { pname = "repa-stream"; - version = "4.0.0.1"; - sha256 = "0vvkgazq30skj9yr763vc5vs3zacjssvyqci721n99j7h8my7r9x"; + version = "4.1.0.1"; + sha256 = "17n48ixypx5a3anj212h4vxa6sqwk5yssjqyprb8lb3mnqfdlxmm"; buildDepends = [ base mtl primitive vector ]; jailbreak = true; homepage = "http://repa.ouroborus.net"; @@ -100145,8 +101200,8 @@ self: { }: mkDerivation { pname = "reserve"; - version = "0.1.0"; - sha256 = "09b570l6hyn0wfd4nb9xpqrpdb97gbaxnbjlz25y6s0pfg5s1yzp"; + version = "0.1.1"; + sha256 = "152pngw3xrlyrq905a231hi9hg3pf5ddpcihwic496rng5hd5hj2"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -100199,6 +101254,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "resource-embed" = callPackage + ({ mkDerivation, base, bytestring, directory }: + mkDerivation { + pname = "resource-embed"; + version = "0.1.0.0"; + sha256 = "1i33z3rr72s5z2k6j5c10vjy7nslgfn3xqgwf8w05n9m2pwhn2fv"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base bytestring directory ]; + homepage = "https://bitbucket.org/tdammers/resource-embed"; + description = "Embed data files via C and FFI"; + license = stdenv.lib.licenses.mit; + }) {}; + "resource-pool" = callPackage ({ mkDerivation, base, hashable, monad-control, stm, time , transformers, transformers-base, vector @@ -100301,20 +101370,19 @@ self: { "rest-client" = callPackage ({ mkDerivation, aeson-utils, base, bytestring, case-insensitive , data-default, exceptions, http-conduit, http-types, hxt - , hxt-pickle-utils, monad-control, mtl, primitive, resourcet - , rest-types, tostring, transformers, transformers-base - , transformers-compat, uri-encode, utf8-string + , hxt-pickle-utils, monad-control, mtl, resourcet, rest-types + , tostring, transformers, transformers-base, transformers-compat + , uri-encode, utf8-string }: mkDerivation { pname = "rest-client"; - version = "0.5.0.0"; - sha256 = "0clhqp78i6823sxfj5xahajg450s15qqf7l2kc9dpfirz49xxpva"; + version = "0.5.0.2"; + sha256 = "1sykmz3mms714sypkpbjhk6dapb0saqsvwjjxnr3cklxdhxhyvz6"; buildDepends = [ aeson-utils base bytestring case-insensitive data-default exceptions http-conduit http-types hxt hxt-pickle-utils - monad-control mtl primitive resourcet rest-types tostring - transformers transformers-base transformers-compat uri-encode - utf8-string + monad-control mtl resourcet rest-types tostring transformers + transformers-base transformers-compat uri-encode utf8-string ]; description = "Utility library for use in generated API client libraries"; license = stdenv.lib.licenses.bsd3; @@ -100356,8 +101424,8 @@ self: { }: mkDerivation { pname = "rest-example"; - version = "0.2.0.0"; - sha256 = "1442hi8av2vlbzr1ffjfn32plxs0i60bb0g0fnjrprjmcii7dzd5"; + version = "0.2.0.1"; + sha256 = "0pc8q6ky8flh0rz4s3fl7fyharg1p026v689s8h709mcf5q6kvkf"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -100381,8 +101449,8 @@ self: { }: mkDerivation { pname = "rest-gen"; - version = "0.17.0.1"; - sha256 = "1rx5a57r66gbzd78i7klb1hzzjxdahv1833xv2jm28k0yn09kwgz"; + version = "0.17.0.3"; + sha256 = "0hydifrpyzgd2kyrxxwzh7z5iiz0x3584nlgx8gzikyqab8gbk04"; buildDepends = [ aeson base blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt json-schema @@ -100434,8 +101502,8 @@ self: { }: mkDerivation { pname = "rest-stringmap"; - version = "0.2.0.3"; - sha256 = "1xy3nnq5ryk78kbcidxk8gqwmnrlvzs1gzpbfm28xyv9awgahk6m"; + version = "0.2.0.4"; + sha256 = "0r9wmy5myysnw83000qlw547ny9lpshm09fi8hmfr14kd3mr9fb1"; buildDepends = [ aeson base containers hashable hxt json-schema tagged text tostring unordered-containers @@ -100573,22 +101641,22 @@ self: { "rethinkdb-client-driver" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, hashable, hspec - , hspec-smallcheck, mtl, network, scientific, smallcheck - , template-haskell, text, time, unordered-containers, vector + , hspec-smallcheck, mtl, network, old-locale, scientific + , smallcheck, template-haskell, text, time, unordered-containers + , vector }: mkDerivation { pname = "rethinkdb-client-driver"; - version = "0.0.15"; - sha256 = "0xdd9m2m61pfsn33048hz2cbjyf6rg5qkqwpib50bxdlj07s4w19"; + version = "0.0.16"; + sha256 = "1x4kw64mjp4900qnmvakrd7vfqg14h35k0jzai5qh6y88rr3qaf1"; buildDepends = [ - aeson base binary bytestring hashable mtl network scientific - template-haskell text time unordered-containers vector + aeson base binary bytestring hashable mtl network old-locale + scientific template-haskell text time unordered-containers vector ]; testDepends = [ base hspec hspec-smallcheck smallcheck text time unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/wereHamster/rethinkdb-client-driver"; description = "Client driver for RethinkDB"; license = stdenv.lib.licenses.mit; @@ -100890,6 +101958,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ring-buffer" = callPackage + ({ mkDerivation, base, mtl, primitive, vector }: + mkDerivation { + pname = "ring-buffer"; + version = "0.1.1"; + sha256 = "03v2xxj1gd35738qrhxcl0d3bx6pps4l1singb0yg1smrx5nkpp7"; + buildDepends = [ base mtl primitive vector ]; + jailbreak = true; + homepage = "http://github.com/bgamari/ring-buffer"; + description = "A concurrent, mutable ring-buffer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "riot" = callPackage ({ mkDerivation, base, containers, directory, haskell98, mtl , ncurses, old-locale, packedstring, process, unix @@ -101040,7 +102121,6 @@ self: { homepage = "https://github.com/lfairy/robot"; description = "Simulate keyboard and mouse events"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "robots-txt" = callPackage @@ -101049,8 +102129,8 @@ self: { }: mkDerivation { pname = "robots-txt"; - version = "0.4.1.1"; - sha256 = "16r6j96iay1r6435ym34dp9iggwlfigmzmqq5k5f5ss5bljfc72f"; + version = "0.4.1.2"; + sha256 = "0lqws8c8qjw7gakyp5ridp1khjhvv0na44rakbh6nhycykvnnfkv"; buildDepends = [ attoparsec base bytestring old-locale time ]; testDepends = [ attoparsec base bytestring directory heredoc hspec QuickCheck @@ -101162,8 +102242,8 @@ self: { }: mkDerivation { pname = "rollbar"; - version = "0.3"; - sha256 = "0x7g5h0daxdgjzm95mqp7vpgjc2zs312qrmyqczsws7mlpmcy41k"; + version = "0.3.1"; + sha256 = "0hv9i38c0c1bv36xy4inq6dghn79bmjw1x0xgi5mlwf5lzzp2fv1"; buildDepends = [ aeson base basic-prelude http-conduit monad-control network text vector @@ -101278,6 +102358,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rose-trees" = callPackage + ({ mkDerivation, base, containers, data-default, hspec, pseudo-trie + , QuickCheck, quickcheck-instances, semigroups, transformers + }: + mkDerivation { + pname = "rose-trees"; + version = "0.0.1.1"; + sha256 = "0ii9jxyd7q0x30zyp1gal29msd81n5vj613mkxxavjlz9ar9gvgx"; + buildDepends = [ + base containers data-default pseudo-trie semigroups transformers + ]; + testDepends = [ base hspec QuickCheck quickcheck-instances ]; + description = "A collection of rose tree structures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rosezipper" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -101937,7 +103033,6 @@ self: { buildDepends = [ base control-monad-exception safe-failure ]; description = "control-monad-exception Instances for safe-failure"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-freeze" = callPackage @@ -102402,6 +103497,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sandman" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, filepath + , optparse-applicative, process, text, unix-compat + }: + mkDerivation { + pname = "sandman"; + version = "0.1.0.0"; + sha256 = "02lgpcr70icq9cgxzpd79d60pbk2fsg6n7pn8zmvjks7dv86bdvn"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base Cabal containers directory filepath optparse-applicative + process text unix-compat + ]; + homepage = "https://github.com/abhinav/sandman"; + description = "Manages Cabal sandboxes to avoid rebuilding packages"; + license = stdenv.lib.licenses.mit; + }) {}; + "sarasvati" = callPackage ({ mkDerivation, base, deepseq, portaudio }: mkDerivation { @@ -102593,7 +103707,6 @@ self: { homepage = "http://rd.slavepianos.org/t/sc3-rdu"; description = "Haskell bindings to sc3-rdu (sc3 rd ugens)"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scalable-server" = callPackage @@ -102630,19 +103743,22 @@ self: { }) {}; "scalpel" = callPackage - ({ mkDerivation, base, bytestring, download-curl, HUnit, regex-base - , regex-tdfa, tagsoup, text + ({ mkDerivation, base, bytestring, curl, download-curl, HUnit + , regex-base, regex-tdfa, tagsoup, text }: mkDerivation { pname = "scalpel"; - version = "0.1.1"; - sha256 = "0ypr6i4in1vvxjxi03r29q7mvig390bnpn2bcmjm9q1w51ypjdnr"; + version = "0.1.2"; + revision = "1"; + sha256 = "1h0fj56a3mppcc2pfjs7philm2jy1yb3vvzbvswsans5x4xvh8dv"; + editedCabalFile = "5062d07770eb7d265cd5c76dc7e3c90c36a2a4f6a7bc3e688d139cd8114a8f5c"; buildDepends = [ - base bytestring download-curl regex-base regex-tdfa tagsoup text + base bytestring curl download-curl regex-base regex-tdfa tagsoup + text ]; testDepends = [ - base bytestring download-curl HUnit regex-base regex-tdfa tagsoup - text + base bytestring curl download-curl HUnit regex-base regex-tdfa + tagsoup text ]; homepage = "https://github.com/fimad/scalpel"; description = "A high level web scraping library for Haskell"; @@ -102710,8 +103826,8 @@ self: { }: mkDerivation { pname = "scc"; - version = "0.8.2.1"; - sha256 = "177a4p72kaj92nn07b65pnxq3y310x2sg1lx3vb9p4hg4s8biafx"; + version = "0.8.2.2"; + sha256 = "0rsx9h0y5g2sgwg47lzdzpmx5nfnpb033fyzz5xkxnc5k4bllad5"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -103383,7 +104499,6 @@ self: { jailbreak = true; description = "Automatic generation of Isabelle/HOL correctness proofs for security protocols"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sde-solver" = callPackage @@ -103571,6 +104686,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "second-transfer" = callPackage + ({ mkDerivation, base, base16-bytestring, binary, bytestring + , conduit, containers, hashable, hashtables, hslogger, http2, lens + , network, network-uri, openssl, text, transformers + }: + mkDerivation { + pname = "second-transfer"; + version = "0.1.0.0"; + sha256 = "0y6wjni3sj0mkjwc6mbx9majc91aw51vwyqki603dggjfbp78b0x"; + buildDepends = [ + base base16-bytestring binary bytestring conduit containers + hashable hashtables hslogger http2 lens network network-uri text + transformers + ]; + testDepends = [ base conduit ]; + extraLibraries = [ openssl ]; + jailbreak = true; + homepage = "www.zunzun.se"; + description = "Second Transfer HTTP/2 web server"; + license = stdenv.lib.licenses.bsd3; + }) { inherit (pkgs) openssl;}; + "secret-santa" = callPackage ({ mkDerivation, base, containers, diagrams-cairo, diagrams-lib , haskell-qrencode, random @@ -103914,8 +105051,8 @@ self: { }: mkDerivation { pname = "semver"; - version = "0.3.3"; - sha256 = "1gc4g4qva3w4vrxh1pca49rm0s245zq81bg1qxyfbbp29f7zp5ay"; + version = "0.3.3.1"; + sha256 = "1cf8dcxq4s479f826drncqc4hd07hv330zsipkrn0vc30sbkdlrn"; buildDepends = [ attoparsec base deepseq text ]; testDepends = [ base tasty tasty-hunit text ]; homepage = "https://github.com/brendanhay/semver"; @@ -104045,8 +105182,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "seqid"; - version = "0.3.1"; - sha256 = "1iaj9hifmmscjwi55996cx5dlm44k3gf0dlvdrnr92pf10qzdw86"; + version = "0.3.2"; + sha256 = "03xyvjflas8sfnsxzpcnm0k3kf8x72y9hwfayxn8zn3gjmwl3b3y"; buildDepends = [ base transformers ]; jailbreak = true; description = "Sequence ID production and consumption"; @@ -104069,8 +105206,8 @@ self: { ({ mkDerivation, base, io-streams, seqid }: mkDerivation { pname = "seqid-streams"; - version = "0.3.1"; - sha256 = "1pka0dl7csmpjd2xa4xdq643gpnpavgr202vmp92gv67a7jpp30d"; + version = "0.3.2"; + sha256 = "0v2d5125zyldr7f50zdhvgm1wcp7zbrnas9i2chqsq3s17qkrkm5"; buildDepends = [ base io-streams seqid ]; description = "Sequence ID IO-Streams"; license = stdenv.lib.licenses.bsd3; @@ -104935,10 +106072,9 @@ self: { ({ mkDerivation, base, bytestring, css-text, hjsmin, shake, text }: mkDerivation { pname = "shake-minify"; - version = "0.1.2"; - sha256 = "1xsh6bjrr0l4vqn8iqlkv8s0y5qwaqqz3yjlxk0y3fsi1qz28yxs"; + version = "0.1.3"; + sha256 = "1634dm4rzpp5bkxczj5bbnzcn1mcaxkqbvg08x9gib1nyi2m6zzb"; buildDepends = [ base bytestring css-text hjsmin shake text ]; - jailbreak = true; homepage = "https://github.com/LukeHoersten/shake-minify"; description = "Shake Minify Rules"; license = stdenv.lib.licenses.bsd3; @@ -104948,12 +106084,11 @@ self: { ({ mkDerivation, base, bytestring, bzlib, shake, tar }: mkDerivation { pname = "shake-pack"; - version = "0.1.0"; - sha256 = "158xjn4lzcj8gk4b9z4rhql7mqdp7v5x8rpc0sb3mlws2drr8yh0"; + version = "0.1.2"; + sha256 = "0iy2n7cg7fm0by479s1hm5w2jzzfdavjlyq6nf2sh6qlkc6w2ga1"; buildDepends = [ base bytestring bzlib shake tar ]; - jailbreak = true; homepage = "https://github.com/LukeHoersten/shake-pack"; - description = "Shake File Pack Actions"; + description = "Shake File Pack Rule"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -105043,7 +106178,6 @@ self: { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Stick your haskell variables into javascript/coffeescript at compile time. (deprecated)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shakespeare-text" = callPackage @@ -105256,18 +106390,19 @@ self: { "shelltestrunner" = callPackage ({ mkDerivation, base, cmdargs, Diff, directory, filemanip - , filepath, HUnit, parsec, process, regex-tdfa, test-framework - , test-framework-hunit, utf8-string + , filepath, HUnit, parsec, pretty-show, process, regex-tdfa, safe + , test-framework, test-framework-hunit, utf8-string }: mkDerivation { pname = "shelltestrunner"; - version = "1.3.4"; - sha256 = "1gfx2l99v95i6amrlcs1qbk9p37qyz21px3a224h5hrr9svhrsqy"; + version = "1.3.5"; + sha256 = "0ad8sc4md8mp0l0s40yx7qbgaabqzd4nz8lx15ajcdbwr2ffnra2"; isLibrary = false; isExecutable = true; buildDepends = [ - base cmdargs Diff directory filemanip filepath HUnit parsec process - regex-tdfa test-framework test-framework-hunit utf8-string + base cmdargs Diff directory filemanip filepath HUnit parsec + pretty-show process regex-tdfa safe test-framework + test-framework-hunit utf8-string ]; homepage = "http://joyful.com/shelltestrunner"; description = "A tool for testing command-line programs"; @@ -105554,9 +106689,11 @@ self: { exception-transformers language-c-quote mainland-pretty mtl operational ]; + jailbreak = true; homepage = "https://github.com/markus-git/signals"; description = "Stream Processing for Embedded Domain Specific Languages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "signed-multiset" = callPackage @@ -105851,18 +106988,18 @@ self: { "simple-log" = callPackage ({ mkDerivation, base, containers, deepseq, directory, filepath - , MonadCatchIO-transformers, mtl, old-locale, SafeSemaphore, text - , time, transformers + , MonadCatchIO-transformers, mtl, SafeSemaphore, text, time + , transformers }: mkDerivation { pname = "simple-log"; - version = "0.3.1"; - sha256 = "1xddgjcl4ny2z0cc75psnl73ddql9myxwq4h7l8aib5hpbcw1gld"; + version = "0.3.2"; + sha256 = "1nlnxjv2p6fkk069480czn0wg1m2jcw1g2sb38cb524kv0qn1kr0"; buildDepends = [ base containers deepseq directory filepath - MonadCatchIO-transformers mtl old-locale SafeSemaphore text time - transformers + MonadCatchIO-transformers mtl SafeSemaphore text time transformers ]; + jailbreak = true; homepage = "http://github.com/mvoidex/simple-log"; description = "Simple log for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -106057,8 +107194,8 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "simple-smt"; - version = "0.5.4"; - sha256 = "153f0h0432rh3ff5cvsjcnwaq6ydiprs16ximp1rcamwzm0nl8hp"; + version = "0.6.0"; + sha256 = "15dnd6vjf8zl0bi5r4pczxdns8614rvdq1f44sgrmy8crc4x9d0c"; buildDepends = [ base process ]; description = "A simple way to interact with an SMT solver process"; license = stdenv.lib.licenses.bsd3; @@ -106474,7 +107611,9 @@ self: { mkDerivation { pname = "skein"; version = "1.0.9.2"; + revision = "1"; sha256 = "1j8bhqm25r9vd4qb4v12g32r0dv6xyhk48cq287wfbzjraayi1gw"; + editedCabalFile = "824638ce2aaf27614e10fe56fe886e486969fb9483e722a025b38fff3fb099ab"; buildDepends = [ base bytestring cereal crypto-api tagged ]; testDepends = [ base bytestring cereal crypto-api filepath hspec tagged @@ -106562,17 +107701,17 @@ self: { "slack-api" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, errors , HsOpenSSL, io-streams, lens, lens-aeson, monad-loops, mtl - , network, network-uri, openssl-streams, text, time, transformers - , websockets, wreq + , network, network-uri, openssl-streams, text, time + , time-locale-compat, transformers, websockets, wreq }: mkDerivation { pname = "slack-api"; - version = "0.3"; - sha256 = "13qpvsm7k5b1lfl02dxpcffrj3ilyfcxz4yiy187xbk5hrgn2c39"; + version = "0.4"; + sha256 = "1xwpcvk906v2w995gsk8g41ml46w1r8h1gybsspkx6s6z6whhik5"; buildDepends = [ aeson base bytestring containers errors HsOpenSSL io-streams lens lens-aeson monad-loops mtl network network-uri openssl-streams text - time transformers websockets wreq + time time-locale-compat transformers websockets wreq ]; testDepends = [ base ]; description = "Bindings to the Slack RTM API"; @@ -106825,8 +107964,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "smartconstructor"; - version = "0.1.0.0"; - sha256 = "1iq9803ijx9497lc49mmvq8anm8r6ww0gysc693gq0ixf8ga2f8y"; + version = "0.2.0.0"; + sha256 = "1082siphwd4xx9akqip78kzpqi19i3l53h0s2vghhdm5lwplcvlv"; buildDepends = [ base template-haskell ]; homepage = "http://github.com/frerich/smartconstructor"; description = "A package exposing a helper function for generating smart constructors"; @@ -107009,8 +108148,8 @@ self: { }: mkDerivation { pname = "snap"; - version = "0.14.0.1"; - sha256 = "1mmc6ymd0bic7rw9vsrn1jwwjhlc5jqwh8z7zik5wsk75rvddgph"; + version = "0.14.0.2"; + sha256 = "1yv1snkibsqd7cdxyqi7c8gvnv1hzzhw5jlk19kps526n5xvay7r"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -107079,7 +108218,6 @@ self: { version = "0.2.1.2"; sha256 = "136i5q9ipfqrh7fw8rgn1ws6zkjdrfwfq9wpccrm8dg3l61380wh"; buildDepends = [ base blaze-html snap-core ]; - jailbreak = true; homepage = "http://github.com/jaspervdj/snap-blaze"; description = "blaze-html integration for Snap"; license = stdenv.lib.licenses.bsd3; @@ -107119,8 +108257,8 @@ self: { }: mkDerivation { pname = "snap-core"; - version = "0.9.6.4"; - sha256 = "0azg5xyiclcir8mlf0aar05jijb0dycp3srzignd192x789y9lvi"; + version = "0.9.7.0"; + sha256 = "0ambk7q35v76ww62m4y6j45ga63c141zi3wxkgazybbazk5i36nw"; buildDepends = [ attoparsec attoparsec-enumerator base blaze-builder blaze-builder-enumerator bytestring bytestring-mmap @@ -107140,8 +108278,8 @@ self: { }: mkDerivation { pname = "snap-cors"; - version = "1.2.6"; - sha256 = "1ihqqpzymgc25shz4dvjfh8lzjczqdqg6ril39d5p7rkn4a8y2d8"; + version = "1.2.7"; + sha256 = "0yvy27fvcryc17k24y0z84zvi5b65x1zn36gz0277b3fp2dqfskc"; buildDepends = [ attoparsec base bytestring case-insensitive hashable network network-uri snap text transformers unordered-containers @@ -107275,10 +108413,8 @@ self: { }: mkDerivation { pname = "snap-server"; - version = "0.9.4.6"; - revision = "1"; - sha256 = "01qfqc63qwq604s5vy0sln7l9zhqndyqbb1y1xf397rrn97xhrpp"; - editedCabalFile = "32c4388b62e047caebb4a51bd79cb592032a0cb4f2aa56c7eb8bff15e85588bf"; + version = "0.9.5.0"; + sha256 = "1rsn3zxrl8cngpl47hd4js18gw90dwn0zhwv2z6hxi7ygwnx8q0i"; buildDepends = [ attoparsec attoparsec-enumerator base blaze-builder blaze-builder-enumerator bytestring case-insensitive containers @@ -107353,15 +108489,12 @@ self: { }) {}; "snaplet-acid-state" = callPackage - ({ mkDerivation, acid-state, base, snap, text }: + ({ mkDerivation, acid-state, base, mtl, snap, text, transformers }: mkDerivation { pname = "snaplet-acid-state"; - version = "0.2.6.1"; - revision = "1"; - sha256 = "0wlawnsxisslqzspa29swsdmncgx04z3rd1bhwx73mx5pksykw60"; - editedCabalFile = "812a72ecdd562ff80cdb396a26235d963bbec7ca97e4afa728d5ca65716ef0a7"; - buildDepends = [ acid-state base snap text ]; - jailbreak = true; + version = "0.2.6.2"; + sha256 = "0p4cfc5llz2z0jfmkj225nxi8abdncjl53g1rjwc86yfgld0wwm9"; + buildDepends = [ acid-state base mtl snap text transformers ]; homepage = "https://github.com/mightybyte/snaplet-acid-state"; description = "acid-state snaplet for Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -107500,7 +108633,18 @@ self: { homepage = "https://github.com/faylang/snaplet-fay"; description = "Fay integration for Snap with request- and pre-compilation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "snaplet-hasql" = callPackage + ({ mkDerivation, base, hasql, hasql-backend, lens, mtl, snap }: + mkDerivation { + pname = "snaplet-hasql"; + version = "0.0.2"; + sha256 = "1argaxdmr1znjgvhyj8cnbnygj98nan66la9n4knmbizaqy0yw3m"; + buildDepends = [ base hasql hasql-backend lens mtl snap ]; + jailbreak = true; + description = "A Hasql snaplet"; + license = stdenv.lib.licenses.mit; }) {}; "snaplet-haxl" = callPackage @@ -107757,6 +108901,7 @@ self: { MonadCatchIO-transformers mtl postgresql-simple resource-pool-catchio snap text transformers unordered-containers ]; + jailbreak = true; homepage = "https://github.com/mightybyte/snaplet-postgresql-simple"; description = "postgresql-simple snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -107798,17 +108943,16 @@ self: { "snaplet-recaptcha" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , configurator, heist, http-conduit, lens - , MonadCatchIO-transformers, mtl, snap, text + , MonadCatchIO-transformers, mtl, snap, text, transformers }: mkDerivation { pname = "snaplet-recaptcha"; - version = "1.0.1"; - sha256 = "05d5070z9ljxfp353q7q5nl46c7wx4bnsjm3hiw2258bnz2ih185"; + version = "1.0.3"; + sha256 = "02f5fv70r7zjzycrrqsd1jwgpa7sq1m6rci74dlcbnms7z9cpv26"; buildDepends = [ aeson base blaze-builder bytestring configurator heist http-conduit - lens MonadCatchIO-transformers mtl snap text + lens MonadCatchIO-transformers mtl snap text transformers ]; - jailbreak = true; homepage = "http://github.com/mikeplus64/snaplet-recaptcha"; description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing"; license = stdenv.lib.licenses.bsd3; @@ -108241,7 +109385,6 @@ self: { homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "SOAP client tools"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "soap-openssl" = callPackage @@ -108259,7 +109402,6 @@ self: { homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "TLS-enabled SOAP transport (using openssl bindings)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "soap-tls" = callPackage @@ -108278,7 +109420,6 @@ self: { homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "TLS-enabled SOAP transport (using tls package)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sock2stream" = callPackage @@ -109549,8 +110690,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "srcloc"; - version = "0.4.1"; - sha256 = "0cd15d9dval7zi4li48yd6a3jk62861d4qxwvhxz4a98m63519cz"; + version = "0.5.0.1"; + sha256 = "0v13s813s3a4xgadpcjwf36kw8qf6chpghrnx7r6nqii92nvry8q"; buildDepends = [ base ]; homepage = "http://www.cs.drexel.edu/~mainland/"; description = "Data types for managing source code locations"; @@ -109725,6 +110866,7 @@ self: { version = "0.3.0"; sha256 = "0a218ilzx1bgwirfp6v6bzgwwkx8l60q1xnxq347xas750wjn8a8"; buildDepends = [ base ghc-prim hashtables tagged ]; + jailbreak = true; description = "Memoization based on argument identity"; license = stdenv.lib.licenses.mit; }) {}; @@ -109752,7 +110894,6 @@ self: { homepage = "https://github.com/tsuraan/stable-tree"; description = "Trees whose branches are resistant to change"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack-prism" = callPackage @@ -109761,8 +110902,8 @@ self: { }: mkDerivation { pname = "stack-prism"; - version = "0.1"; - sha256 = "1pl5bb1qyd59pgcbbr27vk8mzfdsv3wbyk9z40cm54v8513rq307"; + version = "0.1.2"; + sha256 = "01iz7x2f3pyagk42baryj9qgklcif8ias05cipyn349x3wgaqzz6"; buildDepends = [ base profunctors tagged template-haskell transformers ]; @@ -109816,8 +110957,8 @@ self: { }: mkDerivation { pname = "stackage-curator"; - version = "0.7.0.1"; - sha256 = "0w1z3h10vwinvjqkgbiq12fslqxd3ix3br004jz54vscs5i81dch"; + version = "0.7.2.1"; + sha256 = "0ynx9xmhnb5vjzpz41b7n2wzfpindn8zs2lf9rf2yajvd1rnq3hr"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -109836,6 +110977,7 @@ self: { homepage = "https://github.com/fpco/stackage"; description = "Tools for curating Stackage bundles"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage-types" = callPackage @@ -110166,6 +111308,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "statistics-hypergeometric-genvar" = callPackage + ({ mkDerivation, base, math-functions, mwc-random, primitive + , statistics + }: + mkDerivation { + pname = "statistics-hypergeometric-genvar"; + version = "0.1.0.0"; + sha256 = "05j83vaklwi73yr4q4yq5f36wzmbas73lxkj0dkg0w1ss97syv7m"; + buildDepends = [ + base math-functions mwc-random primitive statistics + ]; + homepage = "https://github.com/srijs/statistics-hypergeometric-genvar"; + description = "Random variate generation from hypergeometric distributions"; + license = stdenv.lib.licenses.mit; + }) {}; + "statistics-linreg" = callPackage ({ mkDerivation, base, MonadRandom, random, random-shuffle, safe , statistics, vector @@ -110392,8 +111550,8 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "stm-chans"; - version = "3.0.0.2"; - sha256 = "1zsa092yjxsdq8nm2yqagdfpip3i3ff3xdwvys99ns7ridxbyynh"; + version = "3.0.0.3"; + sha256 = "058miz12xm21lghc4bi06grsddd8hf2x9x5qdh0dva6lk0h9y7mk"; buildDepends = [ base stm ]; homepage = "http://code.haskell.org/~wren/"; description = "Additional types of channels for STM"; @@ -110441,24 +111599,22 @@ self: { }) {}; "stm-containers" = callPackage - ({ mkDerivation, base, base-prelude, focus, free, hashable, HTF - , list-t, loch-th, mtl, mtl-prelude, placeholders, primitive - , QuickCheck, transformers, unordered-containers + ({ mkDerivation, base-prelude, focus, free, hashable, HTF, list-t + , loch-th, mtl, mtl-prelude, placeholders, primitive, QuickCheck + , transformers, unordered-containers }: mkDerivation { pname = "stm-containers"; - version = "0.2.8"; - sha256 = "0dqnhi99bq093zb815q8l0yhkvm0r27h230hcjmvcp01934xga0x"; + version = "0.2.9"; + sha256 = "0p2lyz1s98cxdcqfamqyx7dxxa4fzxr0a93cbm7lnmzfjvk48p52"; buildDepends = [ base-prelude focus hashable list-t loch-th placeholders primitive transformers ]; testDepends = [ - base base-prelude focus free hashable HTF list-t loch-th mtl - mtl-prelude placeholders primitive QuickCheck transformers - unordered-containers + base-prelude focus free hashable HTF list-t loch-th mtl mtl-prelude + placeholders primitive QuickCheck transformers unordered-containers ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/stm-containers"; description = "Containers for STM"; license = stdenv.lib.licenses.mit; @@ -111096,6 +112252,7 @@ self: { version = "0.1.6.4"; sha256 = "0hh2xcbf7sjsv15jgldpy5njjvkkkxwlg2g9961z9fn94zyi7854"; buildDepends = [ base bytestring tagged text ]; + jailbreak = true; homepage = "https://github.com/bairyn/string-class"; description = "String class library"; license = stdenv.lib.licenses.bsd3; @@ -111259,8 +112416,8 @@ self: { ({ mkDerivation, array, base, bytestring, containers }: mkDerivation { pname = "stringsearch"; - version = "0.3.6.5"; - sha256 = "1mjvb1qr4fkxv5qvq4jfswa3dcj3dwzvwx7dbp2wqw8zand41lsq"; + version = "0.3.6.6"; + sha256 = "0jpy9xjcjdbpi3wk6mg7xwd7wfi2mma70p97v1ij5i8bj9qijpr9"; buildDepends = [ array base bytestring containers ]; homepage = "https://bitbucket.org/dafis/stringsearch"; description = "Fast searching, splitting and replacing of ByteStrings"; @@ -111303,8 +112460,8 @@ self: { }: mkDerivation { pname = "stripe-haskell"; - version = "0.1.3.0"; - sha256 = "0crh5kmb3bql0ba8srs58hn68q6cl9iaxy2p4phmwzw4xzganawq"; + version = "0.1.3.1"; + sha256 = "0c0g1ixjja49ifdch06flsb1k233sazy7yybqskacv7xmb1bpixy"; buildDepends = [ aeson base bytestring either HsOpenSSL http-streams io-streams mtl random text time transformers unordered-containers @@ -111326,8 +112483,8 @@ self: { }: mkDerivation { pname = "strive"; - version = "0.8.0"; - sha256 = "0n9j3mpknmqm2y4psbg2yjrs6ddgw5j3ha26aq2mxqb9cz1kb29z"; + version = "1.0.0"; + sha256 = "02nfwi2h40cq393p1f43rrlx635v8fmgs4ww8jx7bl36nsrcjvwg"; buildDepends = [ aeson base bytestring data-default gpolyline http-conduit http-types template-haskell text time transformers @@ -111724,7 +112881,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/SuperCollider"; description = "Haskell SuperCollider utilities"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "supercollider-midi" = callPackage @@ -111818,8 +112974,8 @@ self: { }: mkDerivation { pname = "svg-tree"; - version = "0.1.0.2"; - sha256 = "1fyq0pnh6i49wdx29dg4r9i7nb4dqs36y651cmp6bxkszzqrqka5"; + version = "0.1.1"; + sha256 = "19bh640jzpw03k5vc9471qh2cf4nr3nz8s5axk0bxpss1dpz26fs"; buildDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml @@ -111854,8 +113010,8 @@ self: { }: mkDerivation { pname = "svgcairo"; - version = "0.13.0.2"; - sha256 = "1d1aicj2krij6n0dxv1da501jk5am8rl463ghppgp2amkdxdmk2d"; + version = "0.13.0.3"; + sha256 = "0jbcz46n5324vf9i05y8zdjp4ayid2frggsadm5nr8h9mnd4vncz"; buildDepends = [ base cairo glib mtl text ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ librsvg ]; @@ -111975,6 +113131,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) tokyocabinet;}; + "swearjure" = callPackage + ({ mkDerivation, attoparsec, base, containers, fixplate, mtl + , pretty, random, random-shuffle, readline, system-fileio + , system-filepath, text + }: + mkDerivation { + pname = "swearjure"; + version = "1.0.0"; + sha256 = "0g3xq3abwkv6rs7kvv6niwdhx50c90ys1zrrzspx2g47c9fbs2iq"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + attoparsec base containers fixplate mtl pretty random + random-shuffle readline system-fileio system-filepath text + ]; + jailbreak = true; + homepage = "http://www.swearjure.com"; + description = "Clojure without alphanumerics"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "swf" = callPackage ({ mkDerivation, base, mtl, pretty }: mkDerivation { @@ -112461,8 +113638,8 @@ self: { }: mkDerivation { pname = "synthesizer-core"; - version = "0.7.0.2"; - sha256 = "0r2www48svwvca6c0v1pgybhd0dmv2ajmc44iaz47wn5ia1vwcfn"; + version = "0.7.1"; + sha256 = "0h3dj4j9ha1db2lw3vd7zai05ivm9lfydaynq2bxqhz77s07skzf"; buildDepends = [ array base binary bytestring containers deepseq event-list explicit-exception filepath non-empty non-negative numeric-prelude @@ -112546,7 +113723,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Efficient signal processing using runtime compilation"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "synthesizer-midi" = callPackage @@ -112984,20 +114160,22 @@ self: { ({ mkDerivation, base, cairo, containers, dbus, dyre , enclosed-exceptions, filepath, gtk, gtk-traymanager , HStringTemplate, HTTP, mtl, network, network-uri, old-locale - , parsec, process, safe, split, stm, text, time, transformers - , utf8-string, X11, xdg-basedir, xmonad, xmonad-contrib + , parsec, process, safe, split, stm, text, time, time-locale-compat + , transformers, utf8-string, X11, xdg-basedir, xmonad + , xmonad-contrib }: mkDerivation { pname = "taffybar"; - version = "0.4.4"; - sha256 = "046nfp878mqj9acsid94mqp8q1yqnm1hsdkv88m5qpmn182xljwh"; + version = "0.4.5"; + sha256 = "0igwq5gmfki61igrs6v51pm8r3wz8pzv6iz8dw30nmqgr3ypddlw"; isLibrary = true; isExecutable = true; buildDepends = [ base cairo containers dbus dyre enclosed-exceptions filepath gtk gtk-traymanager HStringTemplate HTTP mtl network network-uri - old-locale parsec process safe split stm text time transformers - utf8-string X11 xdg-basedir xmonad xmonad-contrib + old-locale parsec process safe split stm text time + time-locale-compat transformers utf8-string X11 xdg-basedir xmonad + xmonad-contrib ]; homepage = "http://github.com/travitch/taffybar"; description = "A desktop bar similar to xmobar, but with more GUI"; @@ -113052,12 +114230,12 @@ self: { }) {}; "tagged" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "tagged"; - version = "0.7.3"; - sha256 = "016bzws7w09xhyyqiz56ahlf7zhagihn370ga0083fgv172lym7b"; - buildDepends = [ base ]; + version = "0.8.0.1"; + sha256 = "1w1xi107lmp8pfhf9d6hmaji2lp7himx0hqc8gh81w2rpr8g3bjh"; + buildDepends = [ base template-haskell ]; homepage = "http://github.com/ekmett/tagged"; description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; license = stdenv.lib.licenses.bsd3; @@ -113591,8 +114769,8 @@ self: { }: mkDerivation { pname = "tasty-golden"; - version = "2.3"; - sha256 = "0irqf7sx0s937ahjgjxdmxj4afxd4qvnflry538zazikgb9s51pz"; + version = "2.3.0.1"; + sha256 = "19jlfxhgrphsv7nfwsfil5ci2snlm9qsqwswnzn68pa3440zqiji"; buildDepends = [ async base bytestring containers deepseq directory filepath mtl optparse-applicative process tagged tasty temporary-rc @@ -113752,6 +114930,7 @@ self: { base containers mtl optparse-applicative reducers split stm tagged tasty transformers ]; + jailbreak = true; homepage = "http://github.com/ocharles/tasty-rerun"; description = "Run tests by filtering the test tree depending on the result of previous test runs"; license = stdenv.lib.licenses.bsd3; @@ -113761,12 +114940,12 @@ self: { ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process , process-extras, stm, tagged, tasty, tasty-hunit, temporary-rc - , text + , text, transformers }: mkDerivation { pname = "tasty-silver"; - version = "3.0.2.2"; - sha256 = "0pla52i547mjr06nm2d5y3bf4gnw89mgw3d2gic90v6c3daynk97"; + version = "3.1.2"; + sha256 = "0yghvl3ld09fzkyn4w6y8bb7715gqsrmk92lb2n5w9z9bc1azxvg"; buildDepends = [ ansi-terminal async base bytestring containers deepseq directory filepath mtl optparse-applicative process process-extras stm tagged @@ -113774,6 +114953,7 @@ self: { ]; testDepends = [ base directory filepath process tasty tasty-hunit temporary-rc + transformers ]; homepage = "https://github.com/phile314/tasty-silver"; description = "Golden tests support for tasty. Fork of tasty-golden."; @@ -113873,6 +115053,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tce-conf" = callPackage + ({ mkDerivation, base, containers, HUnit }: + mkDerivation { + pname = "tce-conf"; + version = "1.1"; + sha256 = "1c3wr9rab7835dfg9qmxhprb2r21iyig1wkvwl49h7brhmhxzpnh"; + buildDepends = [ base containers ]; + testDepends = [ base containers HUnit ]; + homepage = "http://hub.darcs.net/dino/tce-conf"; + description = "Very simple config file reading"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tconfig" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -114008,13 +115201,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "template-haskell_2_9_0_0" = callPackage - ({ mkDerivation, base, containers, pretty }: + "template-haskell_2_10_0_0" = callPackage + ({ mkDerivation, base, pretty }: mkDerivation { pname = "template-haskell"; - version = "2.9.0.0"; - sha256 = "0mqphyd77jw87n648zpizh2cggm0958y47jjl84r55s1ndhm7j54"; - buildDepends = [ base containers pretty ]; + version = "2.10.0.0"; + sha256 = "1y0dikbpy98n9g1rwb6swng86cch815x5ipj8kfjgpjgs0c3i2im"; + buildDepends = [ base pretty ]; + jailbreak = true; description = "Support library for Template Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -114670,12 +115864,11 @@ self: { ({ mkDerivation, base, hspec, hspec-discover, HUnit, silently }: mkDerivation { pname = "test-shouldbe"; - version = "0.2.1"; - sha256 = "0m8kb8ydj3s3agh45mzmn8icbik68fvh0fp2idkd1hs7km1qzaga"; + version = "0.2.1.1"; + sha256 = "0wagfhljym2mnwpxld8dcf4qcdbp3d9liyf9mcigd4kiy5sdhfx4"; buildDepends = [ base HUnit ]; testDepends = [ base hspec hspec-discover silently ]; jailbreak = true; - homepage = "https://github.com/sol/test-shouldbe#readme"; description = "Catchy combinators for HUnit"; license = stdenv.lib.licenses.mit; }) {}; @@ -115026,14 +116219,13 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit, text, text-format }: mkDerivation { pname = "text-manipulate"; - version = "0.1.3"; - sha256 = "0f8xfgsvj50x1br9r4szc94y9hycwgdnjmpwn2h4840kdcpds780"; + version = "0.1.3.1"; + sha256 = "0k7mh9p6c8yif8sbfgqclk9v9jzymhlpv66bypn0z1y3p4ywfgjc"; buildDepends = [ base text text-format ]; testDepends = [ base tasty tasty-hunit text ]; homepage = "https://github.com/brendanhay/text-manipulate"; description = "Case conversion, word boundary manipulation, and textual subjugation"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-normal" = callPackage @@ -115100,21 +116292,21 @@ self: { "text-show" = callPackage ({ mkDerivation, array, base, bytestring, ghc-prim, nats - , QuickCheck, quickcheck-instances, semigroups, silently, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, text - , transformers, transformers-compat, void + , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, transformers + , transformers-compat, void }: mkDerivation { pname = "text-show"; - version = "0.7"; - sha256 = "088fbm7zg0gvw4w232qfmlv1nbc0wxxrjni7wf39y4dinhd9wkwl"; + version = "0.7.0.1"; + sha256 = "1qmvnni69dkxdjay387qxnvy1j4cffnw5igdgqbaqvrm0cgkkg4a"; buildDepends = [ array base bytestring ghc-prim nats semigroups template-haskell text transformers void ]; testDepends = [ array base bytestring ghc-prim nats QuickCheck quickcheck-instances - silently tasty tasty-hunit tasty-quickcheck text transformers + tasty tasty-hunit tasty-quickcheck text transformers transformers-compat void ]; homepage = "https://github.com/RyanGlScott/text-show"; @@ -115132,8 +116324,8 @@ self: { }: mkDerivation { pname = "text-show-instances"; - version = "0.3"; - sha256 = "13vz9s2q8qahm1d957wzi8yz3dh7wqpgxqsg3b8qaaym59h2brak"; + version = "0.3.0.1"; + sha256 = "1a6ybgx5jivacy7b0bja5f7an1xq9mjmr2x348knaf84v2wqws9p"; buildDepends = [ base binary bytestring containers directory haskeline hoopl hpc old-locale old-time pretty random semigroups tagged @@ -115366,8 +116558,8 @@ self: { }: mkDerivation { pname = "th-desugar"; - version = "1.5.2"; - sha256 = "0kd5yn98nhji9yshnai4ffw7p8a1mn3xslbw57lvgmyln96sw096"; + version = "1.5.3"; + sha256 = "1bnbx5fpdnw24q3cjq1riccing8wadhl2xa588kf1qdf1nd9g7i0"; buildDepends = [ base containers mtl syb template-haskell th-lift th-orphans ]; @@ -115436,7 +116628,6 @@ self: { homepage = "https://github.com/nikita-volkov/th-instance-reification"; description = "Fixed versions of instances reification functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-instances" = callPackage @@ -115574,22 +116765,26 @@ self: { }) {}; "themoviedb" = callPackage - ({ mkDerivation, aeson, base, bytestring, HTTP, HUnit, network - , old-locale, text, time, unix + ({ mkDerivation, aeson, base, binary, bytestring, either + , http-client, http-client-tls, http-types, mtl, network + , network-uri, old-locale, tasty, tasty-hunit, text, text-binary + , time, transformers, unix }: mkDerivation { pname = "themoviedb"; - version = "0.1.0.1"; - sha256 = "1n0n57ah9nw9sb7gwyhvmqs7iiwaxrcpvjhgxqmiskhlwmjkpq85"; + version = "1.0.0.0"; + sha256 = "1gwvhbxmhzc5sbcfvyln84x7j8jpglknxx15q82dyr8bhccs4x0w"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base bytestring HTTP network old-locale text time unix + aeson base binary bytestring either http-client http-client-tls + http-types mtl network network-uri old-locale text text-binary time + transformers unix ]; testDepends = [ - aeson base bytestring HTTP HUnit network old-locale text time unix + aeson base bytestring network old-locale tasty tasty-hunit text + time transformers unix ]; - jailbreak = true; homepage = "http://github.com/pjones/themoviedb"; description = "Haskell API bindings for http://themoviedb.org"; license = stdenv.lib.licenses.mit; @@ -116346,7 +117541,6 @@ self: { homepage = "https://bitbucket.org/jfmueller/time-patterns"; description = "Patterns for recurring events"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-recurrence" = callPackage @@ -117131,16 +118325,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "total-maps" = callPackage + ({ mkDerivation, adjunctions, base, base-compat, bytes, containers + , distributive, keys, linear, reflection, semigroups, vector + }: + mkDerivation { + pname = "total-maps"; + version = "1.0.0.2"; + sha256 = "0i5xr0xnqazjk5j9lzhdcxlaarij1jwbfih4plfa3kpqygz5s6ps"; + buildDepends = [ + adjunctions base base-compat bytes containers distributive keys + linear reflection semigroups vector + ]; + description = "Dense and sparse total maps"; + license = stdenv.lib.licenses.mit; + }) {}; + "touched" = callPackage ({ mkDerivation, base, cmdargs, directory, process, time }: mkDerivation { pname = "touched"; - version = "0.1.0.3"; - sha256 = "050z99flcklpwl1lccdi3lsq6v0zxzj21r73743ijvxchh7y488h"; + version = "0.2.0.1"; + sha256 = "0lik2glqynjwcd64bdla2jsfy4yqqk4aap5f0c9zkqv9g916bxgi"; isLibrary = true; isExecutable = true; buildDepends = [ base cmdargs directory process time ]; - jailbreak = true; description = "Library (and cli) to execute a procedure on file change"; license = stdenv.lib.licenses.mit; }) {}; @@ -117201,19 +118410,17 @@ self: { }) {}; "trace" = callPackage - ({ mkDerivation, base, containers, either, kan-extensions + ({ mkDerivation, base, containers, deepseq, either, kan-extensions , monad-control, mtl, profunctors, transformers, transformers-base , transformers-compat }: mkDerivation { pname = "trace"; - version = "0.1.0.4"; - revision = "1"; - sha256 = "1x3920fvv2vjhbzss87lqi6d9d04lcc7nxifq3yjzhzg45rzy2cn"; - editedCabalFile = "c7889409f09df52fe6f14db2dc020899bf2810550aaa250d9c64e1318d00dbef"; + version = "0.1.0.5"; + sha256 = "19l06mxw5n9r6mnygvgvrsrdkwyf2zxfjb0ky23v2bgrs5wjx4vc"; buildDepends = [ - base containers either kan-extensions monad-control mtl profunctors - transformers transformers-base transformers-compat + base containers deepseq either kan-extensions monad-control mtl + profunctors transformers transformers-base transformers-compat ]; description = "A monad transformer for tracing provenience of errors"; license = stdenv.lib.licenses.mit; @@ -117657,7 +118864,9 @@ self: { mkDerivation { pname = "trifecta"; version = "1.5.1.3"; + revision = "1"; sha256 = "1yd55bfhdn8ckkf2c5084fsnfwhib229xw9bn2a4lwpkzbbpflxw"; + editedCabalFile = "4aef1e889929b131bcfbc3b111cc865b1c31f86be983aee768adbfeadee03f2a"; buildDepends = [ ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html blaze-markup bytestring charset comonad containers deepseq @@ -117667,7 +118876,6 @@ self: { testDepends = [ base directory doctest filepath parsers QuickCheck ]; - jailbreak = true; homepage = "http://github.com/ekmett/trifecta/"; description = "A modern parser combinator library with convenient diagnostics"; license = stdenv.lib.licenses.bsd3; @@ -117836,6 +119044,19 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "ttrie" = callPackage + ({ mkDerivation, atomic-primops, base, hashable, primitive, stm }: + mkDerivation { + pname = "ttrie"; + version = "0.1.0.0"; + sha256 = "1lyz2hyi52fc0w1pix15g5h88y9x66wfw65k8bm4zc79irfv969h"; + buildDepends = [ atomic-primops base hashable primitive stm ]; + jailbreak = true; + homepage = "http://github.com/mcschroeder/ttrie"; + description = "Contention-free STM hash map"; + license = stdenv.lib.licenses.mit; + }) {}; + "tttool" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , directory, filepath, ghc-prim, hashable, JuicyPixels, mtl @@ -118017,8 +119238,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.0.2"; - sha256 = "1qff8qd46583d8pyh9ac11r91cnzgncpjlnpdw5kg81xxldjv1n8"; + version = "1.1.0"; + sha256 = "0qpw366hyvprgcmxr83in2ay07f7br7bff2zqw9pnm7lkmkxrlkw"; buildDepends = [ async base clock directory foldl managed process system-fileio system-filepath temporary text time transformers unix @@ -118201,6 +119422,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "twilio" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, errors, exceptions, free, http-client + , http-client-tls, http-types, mtl, network-uri, old-locale, text + , time, transformers, unordered-containers + }: + mkDerivation { + pname = "twilio"; + version = "0.1.1.0"; + sha256 = "0pzdmsr8ncbpqs42g0n1rbjprg70yfqrxlp8fn719s7gg37qaz78"; + buildDepends = [ + aeson base bifunctors bytestring containers errors exceptions free + http-client http-client-tls http-types mtl network-uri old-locale + text time transformers unordered-containers + ]; + testDepends = [ + aeson base bytestring Cabal http-client http-client-tls text + transformers + ]; + jailbreak = true; + homepage = "https://github.com/markandrus/twilio-haskell"; + description = "Twilio REST API library for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "twill" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, bytestring, cryptohash, data-default, datetime @@ -119102,8 +120348,8 @@ self: { }: mkDerivation { pname = "tz"; - version = "0.0.0.9"; - sha256 = "0ak54chjaw1vnwb7jd8fki2qvpdry5ycwh5ap9wjv61zbdscw74k"; + version = "0.0.0.10"; + sha256 = "15j0ai0i4savvvhd8b7f9mrm1kwdmvjrphyjclmlj1k65c6ap5qm"; buildDepends = [ base binary bytestring containers deepseq template-haskell time tzdata vector @@ -119301,20 +120547,18 @@ self: { "uhc-light" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, fgl, filepath, hashable, mtl, network, old-locale - , primitive, process, syb, uhc-util, uulib, vector + , primitive, process, syb, transformers, uhc-util, uulib, vector }: mkDerivation { pname = "uhc-light"; - version = "1.1.8.7"; - revision = "1"; - sha256 = "05ki2zmravvnikn9d5ldiaxafyqnf2ghh7w2jpq1gzpx2mwslrrp"; - editedCabalFile = "d2ebe192f81a8eec4d1c0bc1b5a52a78c00d1839754ec75a88c16bc63c722f2d"; + version = "1.1.8.10"; + sha256 = "12rrcvmqpani5pp9qpf4yqsgvbzx4xwj87nfw0kl4mrhl4gd8c8d"; isLibrary = true; isExecutable = true; buildDepends = [ array base binary bytestring containers directory fgl filepath - hashable mtl network old-locale primitive process syb uhc-util - uulib vector + hashable mtl network old-locale primitive process syb transformers + uhc-util uulib vector ]; homepage = "https://github.com/UU-ComputerScience/uhc"; description = "Part of UHC packaged as cabal/hackage installable library"; @@ -119323,18 +120567,18 @@ self: { "uhc-util" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , directory, fgl, hashable, ListLike, mtl, process, syb, time - , time-compat, uulib + , directory, fclabels, fgl, hashable, ListLike, mtl, process, syb + , time, time-compat, uulib }: mkDerivation { pname = "uhc-util"; - version = "0.1.5.0"; - sha256 = "1im2hn285lmi2gvlhyi78hhhq0mb72hv74jn2cwrzqb03lav8q52"; + version = "0.1.5.3"; + sha256 = "0hy950rl4d7ml0aqs0bkyjz3xc8b6p3m2ik6dqkagxxjl3cksjz3"; buildDepends = [ - array base binary bytestring containers directory fgl hashable - ListLike mtl process syb time time-compat uulib + array base binary bytestring containers directory fclabels fgl + hashable ListLike mtl process syb time time-compat uulib ]; - homepage = "https://github.com/UU-ComputerScience/uhc-utils"; + homepage = "https://github.com/UU-ComputerScience/uhc-util"; description = "UHC utilities"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -119440,10 +120684,9 @@ self: { ({ mkDerivation, base, io-streams, unagi-chan }: mkDerivation { pname = "unagi-streams"; - version = "0.1.1.0"; - sha256 = "1mns1qmxv1xmrrsbhr1ywami37gk416rwxi5p3ry6j88cbf4i4zg"; + version = "0.1.2"; + sha256 = "0fhs55bap2dkp9lismq4df4sy8878f52xawr4an4cl0v1yj12cq0"; buildDepends = [ base io-streams unagi-chan ]; - jailbreak = true; description = "Unagi Chan IO-Streams"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -119787,8 +121030,8 @@ self: { ({ mkDerivation, base, containers, logict, mtl }: mkDerivation { pname = "unification-fd"; - version = "0.9.0"; - sha256 = "0fdnpcpcpjlxlwxpqlawwbgqhs1p9lrksy5ln5isyvr06hwqh7ki"; + version = "0.10.0"; + sha256 = "1jin4w4csy6vhjrqk4lwn6aa6ic3xqnk86fsasznp2x9jv3rzw2b"; buildDepends = [ base containers logict mtl ]; homepage = "http://code.haskell.org/~wren/"; description = "Simple generic unification algorithms"; @@ -120233,7 +121476,6 @@ self: { buildDepends = [ array base mtl unix ]; description = "Unlambda interpreter"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unlit" = callPackage @@ -120549,6 +121791,7 @@ self: { homepage = "https://travis-ci.org/Soostone/uri-bytestring"; description = "Haskell URI parsing as ByteStrings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uri-conduit" = callPackage @@ -121189,8 +122432,8 @@ self: { ({ mkDerivation, base, diagrams-lib, SVGFonts }: mkDerivation { pname = "uuagc-diagrams"; - version = "0.1.0.0"; - sha256 = "1ai61r0sdi900anwl767v3j1zykgh80m3xqzr05hp6k16d0j38ms"; + version = "0.1.1.0"; + sha256 = "16sf4kbjgxsi3amdpr3nqg15f2gmjvf3w2wh6pn72zhjqsbnfnmz"; buildDepends = [ base diagrams-lib SVGFonts ]; description = "Utility for drawing attribute grammar pictures with the diagrams package"; license = stdenv.lib.licenses.bsd3; @@ -121212,21 +122455,20 @@ self: { "uuid" = callPackage ({ mkDerivation, base, binary, bytestring, cryptohash, HUnit - , network-info, QuickCheck, random, test-framework - , test-framework-hunit, test-framework-quickcheck2, time - , uuid-types + , network-info, QuickCheck, random, tasty, tasty-hunit + , tasty-quickcheck, time, uuid-types }: mkDerivation { pname = "uuid"; - version = "1.3.9"; - sha256 = "1ngajcmg0sxj67qq9h4lfcvgazx1bbzq3y8zhqb6vb3vw6vwmcny"; + version = "1.3.10"; + sha256 = "0csq2y8rzdy8cnag4piqvxa742jasxqcq07qgrp4kmdkbnbqvyvy"; buildDepends = [ base binary bytestring cryptohash network-info random time uuid-types ]; testDepends = [ - base bytestring HUnit QuickCheck random test-framework - test-framework-hunit test-framework-quickcheck2 + base bytestring HUnit QuickCheck random tasty tasty-hunit + tasty-quickcheck ]; homepage = "https://github.com/aslatter/uuid"; description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; @@ -121269,17 +122511,15 @@ self: { "uuid-types" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, hashable, HUnit - , QuickCheck, random, test-framework, test-framework-hunit - , test-framework-quickcheck2 + , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "uuid-types"; - version = "1.0.0"; - sha256 = "09djqdbfd7a5fqarw38r4rrm9bq51f5a664g8hvk9190bwlsyvlq"; + version = "1.0.1"; + sha256 = "1brws1nq3pmd3sq786kig2raaxdcx2s8anwsn9f1jj92i5r7y7jb"; buildDepends = [ base binary bytestring deepseq hashable random ]; testDepends = [ - base bytestring HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 + base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/aslatter/uuid"; description = "Type definitions for Universally Unique Identifiers"; @@ -121290,10 +122530,10 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "uulib"; - version = "0.9.16"; - sha256 = "06d9i712flxj62j7rdxvy9b0ximhdfvdakwpmr886l6fi3xpajl3"; + version = "0.9.19"; + sha256 = "1q7mnin2prjnxgjln60s97163191dl1kfaqjq01qxfax845c0qbn"; buildDepends = [ base ghc-prim ]; - homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; + homepage = "https://github.com/UU-ComputerScience/uulib"; description = "Haskell Utrecht Tools Library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -121870,8 +123110,8 @@ self: { }: mkDerivation { pname = "vector"; - version = "0.10.12.2"; - sha256 = "01hc71k1z9m0g0dv4zsvq5d2dvbgyc5p01hryw5c53792yi2fm25"; + version = "0.10.12.3"; + sha256 = "16p8i0gvc9d4n9mxlhlnvrl2s0gmgd7kcsk5czdzz2cd4gh5qxhg"; buildDepends = [ base deepseq ghc-prim primitive ]; testDepends = [ base QuickCheck random template-haskell test-framework @@ -121888,8 +123128,8 @@ self: { }: mkDerivation { pname = "vector-algorithms"; - version = "0.6.0.3"; - sha256 = "1kz4b41y7swad6mbx0g3adc8lqma8pl3rnzah71cfdvb87gssbn4"; + version = "0.6.0.4"; + sha256 = "09f0kds50xa0r2l837gqarzazvlhx2afvvykkqiwjqma9caj52av"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring mtl mwc-random primitive vector ]; @@ -121927,12 +123167,11 @@ self: { ({ mkDerivation, base, deepseq, vector }: mkDerivation { pname = "vector-buffer"; - version = "0.4"; - sha256 = "00dr9fm91q091jv19b0fpzjq297fhh7b5xmpyypm26pkzzb7vqz7"; + version = "0.4.1"; + sha256 = "16zxc2d25qd15nankhc974ax7q3y72mg5a77v5jsfrw291brnnlv"; buildDepends = [ base deepseq vector ]; description = "A buffer compatible with Data.Vector.*"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-bytestring" = callPackage @@ -122107,8 +123346,8 @@ self: { ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { pname = "vector-space"; - version = "0.10"; - sha256 = "06nrjis2ba61vpbng1yfxbj6s207x94aia7g4njgjwbb8clm66aw"; + version = "0.10.2"; + sha256 = "0n78g23jw6pcilkssnkqvnq1z8ram1al6cbas24ziacdwjbw6zah"; buildDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = stdenv.lib.licenses.bsd3; @@ -122148,10 +123387,9 @@ self: { ({ mkDerivation, base, vector-space }: mkDerivation { pname = "vector-space-points"; - version = "0.2.1"; - sha256 = "061gpayzqz0shn2s6fx4ss0dfgxcq717dycmkxjhrx3hy0dczv34"; + version = "0.2.1.1"; + sha256 = "0d5k7wmwhm9y2jif4fy71bnp8nwbfnkh033nzhiw36wfl35aaznp"; buildDepends = [ base vector-space ]; - jailbreak = true; description = "A type for points, as distinct from vectors"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -122207,17 +123445,15 @@ self: { }) {}; "verilog" = callPackage - ({ mkDerivation, alex, array, base, happy, monadLib }: + ({ mkDerivation, alex, array, base, happy }: mkDerivation { pname = "verilog"; - version = "0.0.10"; - sha256 = "1kyhxxa1d1pqipq714nh60qh90pwb2b3a5wiy1h6yms77c2p4wq4"; - isLibrary = true; - isExecutable = true; - buildDepends = [ array base monadLib ]; + version = "0.0.11"; + sha256 = "0lhl6zcf8f8ndyqx7ksj1qy4a5wnhvphsawb944d5rynrnj8fd46"; + buildDepends = [ array base ]; buildTools = [ alex happy ]; homepage = "http://github.com/tomahawkins/verilog"; - description = "Verilog parser and DSL"; + description = "Verilog preprocessor, parser, and AST"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -122517,15 +123753,14 @@ self: { }: mkDerivation { pname = "vivid"; - version = "0.1.0.1"; + version = "0.1.0.3"; revision = "1"; - sha256 = "15l36rfazqaz1ng1nf5bs6yai4qlcia5lalqwsj0bh526xjd1y82"; - editedCabalFile = "85cc767be7d6265ce51587d0e2eda19066f2e7ae580eced0378684db8c0b4426"; + sha256 = "034kjk2lxfbb4hd8z1axccz9alfkm76mpgw39nisvxngjs6si158"; + editedCabalFile = "de2442ab5d53f8044c99cd0489281bf902ef6615028be780e0df937ae60266da"; buildDepends = [ base binary bytestring containers deepseq hashable mtl network split stm ]; - jailbreak = true; description = "Sound synthesis with SuperCollider"; license = "GPL"; }) {}; @@ -122616,8 +123851,8 @@ self: { ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, pango, vte }: mkDerivation { pname = "vte"; - version = "0.13.0.1"; - sha256 = "1wn9cr6sjc0cjswgdpkg3zcyymgkd4kjzby83dv0mp15jbq09hxb"; + version = "0.13.0.2"; + sha256 = "1w3y88rqkxx3pmcx73kmihivk2k4ywm7jnb9lvmvkgj4bqggis3h"; buildDepends = [ base glib gtk pango ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ vte ]; @@ -122630,8 +123865,8 @@ self: { ({ mkDerivation, base, glib, gtk2hs-buildtools, gtk3, pango, vte }: mkDerivation { pname = "vtegtk3"; - version = "0.13.0.1"; - sha256 = "035vc1vrp4w9a2hrq4jhqjqwmwc734ilndqp5jbm7icdpdwbhd0y"; + version = "0.13.0.2"; + sha256 = "0dkmp6s58nmc4qvhmxpn91b1zxf0ard33dkbh4426086k1zkcfzg"; buildDepends = [ base glib gtk3 pango ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ vte ]; @@ -122666,6 +123901,7 @@ self: { string-qq terminfo test-framework test-framework-hunit test-framework-smallcheck text unix utf8-string vector ]; + jailbreak = true; homepage = "https://github.com/coreyoconnor/vty"; description = "A simple terminal UI library"; license = stdenv.lib.licenses.bsd3; @@ -122771,8 +124007,8 @@ self: { }: mkDerivation { pname = "wai-app-file-cgi"; - version = "3.0.4"; - sha256 = "1f6dqlcxzw9m3flv9f14l0qgwhz2ywvn4i1hycywsvbdsj5ja4vh"; + version = "3.0.7"; + sha256 = "0ggxsnqk0wc47l98sykhyq7qwfys58y4048v1pqdd35w4p92qhbr"; buildDepends = [ array attoparsec attoparsec-conduit base blaze-builder blaze-html bytestring case-insensitive conduit conduit-extra containers @@ -122801,8 +124037,8 @@ self: { }: mkDerivation { pname = "wai-app-static"; - version = "3.0.0.6"; - sha256 = "0ilwlawffvib1p98q5jcc5m2i93n7iwmszwlbkb3ihlh1wz5q2b8"; + version = "3.0.1"; + sha256 = "0c2zhkm9c9ixaj210npi5vlm4rnyj56nxakjz63kahna121qjqak"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -122900,7 +124136,7 @@ self: { "wai-extra" = callPackage ({ mkDerivation, ansi-terminal, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, containers + , blaze-builder, bytestring, case-insensitive, containers, cookie , data-default-class, deepseq, directory, fast-logger, hspec , http-types, HUnit, lifted-base, network, old-locale, resourcet , streaming-commons, stringsearch, text, time, transformers, unix @@ -122908,18 +124144,18 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.5"; - sha256 = "1z4ifsldm1j6kf7jnbq8j4pk39f5d51yrygaxfs1m3mnnvr8xl52"; + version = "3.0.6.1"; + sha256 = "15wxr9y1f87q3wh5zkrv7d7w2mb9s4jd6l6cxwj9cgk0yw2nbi5f"; buildDepends = [ ansi-terminal base base64-bytestring blaze-builder bytestring - case-insensitive containers data-default-class deepseq directory - fast-logger http-types lifted-base network old-locale resourcet - streaming-commons stringsearch text time transformers unix - unix-compat void wai wai-logger word8 + case-insensitive containers cookie data-default-class deepseq + directory fast-logger http-types lifted-base network old-locale + resourcet streaming-commons stringsearch text time transformers + unix unix-compat void wai wai-logger word8 ]; testDepends = [ - base bytestring fast-logger hspec http-types HUnit resourcet text - transformers wai zlib + base blaze-builder bytestring cookie fast-logger hspec http-types + HUnit resourcet text time transformers wai zlib ]; homepage = "http://github.com/yesodweb/wai"; description = "Provides some basic WAI handlers and middleware"; @@ -123096,6 +124332,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wai-lens" = callPackage + ({ mkDerivation, base, bytestring, http-types, lens, network, text + , vault, wai + }: + mkDerivation { + pname = "wai-lens"; + version = "0.1"; + sha256 = "05vd7pjw6jgbb11yln4h2lbyr5pr471040p51pj7iy2m65s42v4x"; + buildDepends = [ + base bytestring http-types lens network text vault wai + ]; + homepage = "https://github.com/webcrank/wai-lens"; + description = "Lenses for WAI"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-lite" = callPackage ({ mkDerivation, base, bytestring, conduit, http-types, text , transformers, wai, wai-extra @@ -123120,8 +124372,8 @@ self: { }: mkDerivation { pname = "wai-logger"; - version = "2.2.3"; - sha256 = "0ljpzq3yfiz3xfglvj69jdk46lmgsg6nqncv9mhij4ih6qq0cx0w"; + version = "2.2.4"; + sha256 = "0l7jd3fczn1hp5d7bbhkk0qflw320sr2yw9gb10jvsv42rs1kdbv"; buildDepends = [ auto-update base blaze-builder byteorder bytestring case-insensitive easy-file fast-logger http-types network unix @@ -123208,6 +124460,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wai-middleware-consul" = callPackage + ({ mkDerivation, async, base, base-prelude, bytestring, conduit + , conduit-extra, consul-haskell, enclosed-exceptions, http-client + , http-types, monad-control, monad-logger, network, process + , resourcet, text, transformers, void, wai, wai-app-static + , wai-conduit, wai-extra, warp + }: + mkDerivation { + pname = "wai-middleware-consul"; + version = "0.1.0.2"; + sha256 = "0qq7kilp9a4qjja337saqccn250s6mnf3n80sgyg935hy1dmm7fq"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + async base base-prelude bytestring conduit conduit-extra + consul-haskell enclosed-exceptions http-client http-types + monad-control monad-logger network process resourcet text + transformers void wai wai-app-static wai-conduit wai-extra warp + ]; + homepage = "https://github.com/fpco/wai-middleware-consul"; + description = "Wai Middleware for Consul"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-middleware-etag" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash , filepath, http-date, http-types, unix-compat @@ -123703,8 +124980,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.0.10"; - sha256 = "07xzc8m662zp14pqfmygjzpkafdklf776xc5ihsnqaxym7wpajds"; + version = "3.0.11"; + sha256 = "05sm9l8fjf18vl3b7qk3lpz2fd4knld0a90fh8smfxdvxap3fqv3"; buildDepends = [ array auto-update base blaze-builder bytestring case-insensitive ghc-prim hashable http-date http-types iproute network @@ -124197,8 +125474,8 @@ self: { }: mkDerivation { pname = "web-routing"; - version = "0.6.1"; - sha256 = "0lz81mdc0a2i1jpra1c7v1pva9nff2b35cm5snllnpkb7r898vgr"; + version = "0.6.2"; + sha256 = "1x7imgnpq3998fk4pi2z5ba0r9xc7blf61rn1i51yqqd24la887f"; buildDepends = [ base bytestring primitive text types-compat unordered-containers ]; @@ -124208,6 +125485,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "webcrank" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, bytestring + , case-insensitive, either, exceptions, http-date, http-media + , http-types, lens, mtl, network-uri, QuickCheck, semigroups, tasty + , tasty-hunit, tasty-quickcheck, text, transformers + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "webcrank"; + version = "0.1"; + revision = "1"; + sha256 = "00jnarj4s9jsb7g03jazabpvnnscz7385yslyvvj9z2qryxwv9xk"; + editedCabalFile = "f4521a187e8f4fca8752ab6e53c38df6cafbdc2002397c521928ad69765c1864"; + buildDepends = [ + attoparsec base blaze-builder bytestring case-insensitive either + exceptions http-date http-media http-types lens mtl network-uri + semigroups text transformers unordered-containers utf8-string + ]; + testDepends = [ + attoparsec base bytestring case-insensitive either exceptions + http-date http-media http-types lens mtl QuickCheck tasty + tasty-hunit tasty-quickcheck unordered-containers + ]; + jailbreak = true; + homepage = "https://github.com/webcrank/webcrank.hs"; + description = "Webmachine inspired toolkit for building http applications and services"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "webcrank-dispatch" = callPackage ({ mkDerivation, base, bytestring, mtl, path-pieces, reroute, text , unordered-containers @@ -124224,6 +125531,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "webcrank-wai" = callPackage + ({ mkDerivation, base, bytestring, exceptions, lens, mtl + , unix-compat, unordered-containers, wai, wai-lens, webcrank + , webcrank-dispatch + }: + mkDerivation { + pname = "webcrank-wai"; + version = "0.1"; + sha256 = "16w5hw517mmh46jxv7ks9lrpzaahkyal6a26f99118kzh6w0447b"; + buildDepends = [ + base bytestring exceptions lens mtl unix-compat + unordered-containers wai wai-lens webcrank webcrank-dispatch + ]; + homepage = "https://github.com/webcrank/webcrank-wai"; + description = "Build a WAI Application from Webcrank Resources"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "webdriver" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, cond, data-default, directory, directory-tree @@ -124347,8 +125672,8 @@ self: { }: mkDerivation { pname = "webkit"; - version = "0.13.1.1"; - sha256 = "0652as9wq0ajaqmcx14y2svishccgrywyagrbzga7m06r3h94dz5"; + version = "0.13.1.2"; + sha256 = "090gp3700dafb30jdf1bw1vcn7rj7cs4h0glbi5rqp2ssg5f78kc"; buildDepends = [ base bytestring cairo glib gtk mtl pango text ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ webkit ]; @@ -124362,8 +125687,8 @@ self: { ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, webkit }: mkDerivation { pname = "webkit-javascriptcore"; - version = "0.13.0.3"; - sha256 = "13zhqpiw5b6gz033cpgmza048hpg8c1x1il0rw1xkr3wxija76lq"; + version = "0.13.0.4"; + sha256 = "1gj40kdll7pd84graxcrc327za6kgp453zh48srmzvrk9yvnj67x"; buildDepends = [ base glib gtk webkit ]; buildTools = [ gtk2hs-buildtools ]; description = "JavaScriptCore FFI from webkitgtk"; @@ -124377,15 +125702,14 @@ self: { }: mkDerivation { pname = "webkitgtk3"; - version = "0.13.1.1"; - sha256 = "0lm52xsgf3sayj5d32fyf9fy89zinn7c4z6rq4qw2bsnsdw8hcyb"; + version = "0.13.1.2"; + sha256 = "11b9n7q5xljjfnpfbh91kzs568y7nqdys5rm518cr4an20mbi47l"; buildDepends = [ base bytestring cairo glib gtk3 mtl pango text ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ webkit ]; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) webkit;}; "webkitgtk3-javascriptcore" = callPackage @@ -124394,14 +125718,13 @@ self: { }: mkDerivation { pname = "webkitgtk3-javascriptcore"; - version = "0.13.0.3"; - sha256 = "0w71phbs11iim2gb89bxix0grx9k7fbvabzjjsw7l24wwgfn8ad6"; + version = "0.13.0.4"; + sha256 = "0lq6n1bhvg9rf48scc5ss299dil205y23r9qzl1ls4g4msv6k25c"; buildDepends = [ base glib gtk3 webkitgtk3 ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ webkit ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) webkit;}; "webpage" = callPackage @@ -124448,6 +125771,7 @@ self: { homepage = "https://github.com/jrb/websnap"; description = "Transforms URLs to PNGs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "websockets" = callPackage @@ -124799,8 +126123,8 @@ self: { }: mkDerivation { pname = "wiring"; - version = "0.2.0.1"; - sha256 = "1334hhsdhf2m91hwp0vmj9kfc02b77vlaq6amyqk57yh8sl7gz60"; + version = "0.2.1"; + sha256 = "1vbvv6wkizmh6wrzfk968vdsmp9iwrkpl3dgw6465s8z90ncclj5"; buildDepends = [ base mtl template-haskell transformers ]; testDepends = [ base hspec mtl QuickCheck template-haskell transformers @@ -124858,8 +126182,8 @@ self: { }: mkDerivation { pname = "wizards"; - version = "1.0.1"; - sha256 = "08dn24injfzvhs34yw39y336pyi6p98bdrafx3lhd6lcbp531sca"; + version = "1.0.2"; + sha256 = "02yk9d01d39c3hpvlh2c6v35fzyf3nm92f6vff0qns30dmr2r8ab"; buildDepends = [ base containers control-monad-free haskeline mtl transformers ]; @@ -124885,7 +126209,9 @@ self: { mkDerivation { pname = "wl-pprint"; version = "1.1"; + revision = "1"; sha256 = "16kp3fkh0x9kgzk6fdqrm8m0v7b5cgbv0m3x63ybbp5vxbhand06"; + editedCabalFile = "faf1b4364a3b77cf970f7d966be6dea925f6029625e12db730435230527c6aed"; buildDepends = [ base ]; description = "The Wadler/Leijen Pretty Printer"; license = stdenv.lib.licenses.bsd3; @@ -124948,8 +126274,8 @@ self: { ({ mkDerivation, base, text }: mkDerivation { pname = "wl-pprint-text"; - version = "1.1.0.3"; - sha256 = "1ghrkqdfsdkn71mpipbxiaar2gd8mdyd3dxbsz68awwnlpapy4f3"; + version = "1.1.0.4"; + sha256 = "1xgizzimfw17mpmw2afvmnvyag976j8ggn7k5r564rkw9f0m6bgz"; buildDepends = [ base text ]; description = "A Wadler/Leijen Pretty Printer for Text values"; license = stdenv.lib.licenses.bsd3; @@ -125777,8 +127103,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.2.1"; - sha256 = "1630c38glbfljw18822xmznwfa48sng1wvjzy5gjyjk9165skzig"; + version = "0.2.2"; + sha256 = "1h8rnpgzicn46i4narvmjgh4r46q90ch5wgwmxknksnqi55c7gs4"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -125924,7 +127250,6 @@ self: { homepage = "https://github.com/aslatter/xhb"; description = "X Haskell Bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xhb-atom-cache" = callPackage @@ -126040,6 +127365,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "xinput-conduit" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , transformers + }: + mkDerivation { + pname = "xinput-conduit"; + version = "0.0.0"; + sha256 = "05pcaakqc6krv13480dp7ygr8s2k5wdwr6kixmc9fcp6baa1zkn4"; + buildDepends = [ + base bytestring conduit conduit-extra transformers + ]; + description = "Conduit of keys pressed by xinput"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "xkbcommon" = callPackage ({ mkDerivation, base, bytestring, cpphs, data-flags, filepath , process, storable-record, template-haskell, text, transformers @@ -126097,7 +127437,6 @@ self: { testDepends = [ base blaze-markup bytestring old-locale text time zip-archive ]; - jailbreak = true; description = "Streaming Excel file generation and parsing"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -126399,8 +127738,8 @@ self: { }: mkDerivation { pname = "xml-picklers"; - version = "0.3.5"; - sha256 = "1h0m6in8w3m8d987yzs4m8s86dsa6fb0i0l7xddk7csmhsyflk2a"; + version = "0.3.6"; + sha256 = "196iy4z58x58bjk5jy4fpmn8zhiramlyca4rd732i8j3jp6h5f6i"; buildDepends = [ base containers text xml-types ]; testDepends = [ base Cabal QuickCheck tasty tasty-hunit tasty-quickcheck text @@ -126462,21 +127801,20 @@ self: { "xml-to-json" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, curl - , directory, hashable, hxt, hxt-curl, hxt-expat, hxt-tagsoup - , process, regex-posix, tagsoup, text, unordered-containers, vector + , hashable, hxt, hxt-curl, hxt-expat, hxt-tagsoup, regex-posix + , tagsoup, text, unordered-containers, vector }: mkDerivation { pname = "xml-to-json"; - version = "1.0.1"; - sha256 = "098crnwdq96rzb0ixy1s5krbabfgc36dnxr1ygav3fpqr16ndrng"; + version = "2.0.1"; + sha256 = "0brfdlarr4yyfsfawkfjdbk4z3lvi9ihkhvqh5ws2ll0h80ja6md"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base bytestring containers curl directory hashable hxt - hxt-curl hxt-expat hxt-tagsoup process regex-posix tagsoup text - unordered-containers vector + aeson base bytestring containers curl hashable hxt hxt-curl + hxt-expat hxt-tagsoup regex-posix tagsoup text unordered-containers + vector ]; - jailbreak = true; homepage = "https://github.com/sinelaw/xml-to-json"; description = "Library and command line tool for converting XML files to json"; license = stdenv.lib.licenses.mit; @@ -126486,8 +127824,8 @@ self: { ({ mkDerivation, base, directory, process, tagsoup, text }: mkDerivation { pname = "xml-to-json-fast"; - version = "1.0.1"; - sha256 = "1gp32adky7pjspppkzz01rj3lpl2b8fvaqf7fg3j0p3cmlbhap7m"; + version = "2.0.0"; + sha256 = "0gsn8wdiwmvr7nvxbfj9vpzlxwdh8m9lprx2hxnkrnslmbhjz1fx"; isLibrary = true; isExecutable = true; buildDepends = [ base directory process tagsoup text ]; @@ -126686,10 +128024,8 @@ self: { }: mkDerivation { pname = "xmonad"; - version = "0.11"; - revision = "1"; - sha256 = "1nsv88y2b206n3s5hrsp5ginvz1bj818ns7jmikavb2g33akdgg5"; - editedCabalFile = "e9b49b3835d57df793f01d2e4f6f32ce9b2478ba6fce8503b0e4e80c57807f0b"; + version = "0.11.1"; + sha256 = "1pfjssamiwpwjp1qqkm9m9p9s35pv381m0cwg6jxg0ppglibzq1r"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -126733,8 +128069,8 @@ self: { }: mkDerivation { pname = "xmonad-contrib"; - version = "0.11.3"; - sha256 = "14h9vr33yljymswj50wbimav263y9abdcgi07mvfis0zd08rxqxa"; + version = "0.11.4"; + sha256 = "1g5cw9vvnfbiyi599fngk02zlmdhrf82x0bndhypkn6kybab6yd3"; buildDepends = [ base containers directory extensible-exceptions mtl old-locale old-time process random unix utf8-string X11 X11-xft xmonad @@ -126959,7 +128295,6 @@ self: { homepage = "http://ianwookim.org/hoodle"; description = "Xournal file parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xournal-render" = callPackage @@ -127352,16 +128687,18 @@ self: { "yaml-light-lens" = callPackage ({ mkDerivation, base, bytestring, bytestring-lexing, containers - , doctest, lens, yaml-light + , doctest, lens, transformers-compat, yaml-light }: mkDerivation { pname = "yaml-light-lens"; - version = "0.3.1.7"; - sha256 = "0r6gkvxcd598c52z1s4rzbc80xgc571jcr3p5h0bwkn93b8bj5vf"; + version = "0.3.1.9"; + sha256 = "0gxwa792g2nbgm2j6gl478qq5vgr06z6zzbbxranvh5fq7pq6al5"; buildDepends = [ - base bytestring bytestring-lexing containers lens yaml-light + base bytestring bytestring-lexing containers lens + transformers-compat yaml-light ]; testDepends = [ base doctest ]; + jailbreak = true; description = "Lens interface to yaml-light"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -127530,11 +128867,14 @@ self: { mkDerivation { pname = "yarr"; version = "1.3.3.3"; + revision = "1"; sha256 = "09nr1k0yhm1sh4g741876sf4vi0mgrh7gdq9cbw33hxn6168h547"; + editedCabalFile = "290dde1a67c1de78074c60796f5326cf01668fb109345cd100ff1ac5a5663687"; buildDepends = [ base deepseq fixed-vector ghc-prim missing-foreign primitive template-haskell ]; + jailbreak = true; description = "Yet another array library"; license = stdenv.lib.licenses.mit; }) {}; @@ -127816,8 +129156,8 @@ self: { }: mkDerivation { pname = "yesod-auth-hashdb"; - version = "1.4.1.2"; - sha256 = "1qrb160jq5nniwvbv92hbsznxiwdcjbcxb6lcqdkj1ggfbhs3zp8"; + version = "1.4.2.1"; + sha256 = "1gc8049xvzrkqb91fpdrzr54byxag6rkqvb8650q4scpr09vzdpl"; buildDepends = [ base bytestring cryptohash persistent pwstore-fast text yesod-auth yesod-core yesod-form yesod-persistent @@ -127956,32 +129296,33 @@ self: { }) {}; "yesod-bin" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder - , bytestring, Cabal, conduit, conduit-extra, containers - , data-default-class, directory, file-embed, filepath, fsnotify - , ghc, ghc-paths, http-client, http-conduit, http-reverse-proxy - , http-types, lifted-base, network, optparse-applicative, parsec - , process, project-template, resourcet, shakespeare, split - , streaming-commons, system-fileio, system-filepath, tar - , template-haskell, text, time, transformers, transformers-compat - , unix-compat, unordered-containers, wai, wai-extra, warp, yaml - , zlib + ({ mkDerivation, async, attoparsec, base, base64-bytestring + , blaze-builder, bytestring, Cabal, conduit, conduit-extra + , containers, data-default-class, directory, file-embed, filepath + , fsnotify, ghc, ghc-paths, http-client, http-conduit + , http-reverse-proxy, http-types, lifted-base, network + , optparse-applicative, parsec, process, project-template + , resourcet, shakespeare, split, streaming-commons, system-fileio + , system-filepath, tar, template-haskell, text, time, transformers + , transformers-compat, unix-compat, unordered-containers, wai + , wai-extra, warp, warp-tls, yaml, zlib }: mkDerivation { pname = "yesod-bin"; - version = "1.4.5.1"; - sha256 = "0q5n2rcwz7qc5gs4r2kfc8dc7xg0khy9khzb1zgbfxl6bv9kvnk5"; + version = "1.4.7"; + sha256 = "1xi0i9j8gmgg920wzv363yq586kxcrmbf7br5ykxj30adj5w0cvp"; isLibrary = false; isExecutable = true; buildDepends = [ - attoparsec base base64-bytestring blaze-builder bytestring Cabal - conduit conduit-extra containers data-default-class directory + async attoparsec base base64-bytestring blaze-builder bytestring + Cabal conduit conduit-extra containers data-default-class directory file-embed filepath fsnotify ghc ghc-paths http-client http-conduit http-reverse-proxy http-types lifted-base network optparse-applicative parsec process project-template resourcet shakespeare split streaming-commons system-fileio system-filepath tar template-haskell text time transformers transformers-compat - unix-compat unordered-containers wai wai-extra warp yaml zlib + unix-compat unordered-containers wai wai-extra warp warp-tls yaml + zlib ]; homepage = "http://www.yesodweb.com/"; description = "The yesod helper executable"; @@ -128044,8 +129385,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.9"; - sha256 = "10rf7xrb0zrqpiv8149z52h1jx4nr96ajs2pxdr9avazprls9jmb"; + version = "1.4.9.1"; + sha256 = "1fqla2cahqr51jgr0l8pl2wq4rai2dq6yky75qjg5a4xrxcdq6sc"; buildDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit @@ -128193,7 +129534,6 @@ self: { homepage = "https://github.com/fpco/yesod-fay"; description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-fb" = callPackage @@ -128361,7 +129701,6 @@ self: { base blaze-html blaze-markup bytestring directory pandoc persistent shakespeare texmath text xss-sanitize yesod-core yesod-form ]; - jailbreak = true; homepage = "http://github.com/pbrisbin/yesod-markdown"; description = "Tools for using markdown in a yesod application"; license = stdenv.lib.licenses.gpl2; @@ -128561,20 +129900,19 @@ self: { "yesod-purescript" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default - , formatting, fsnotify, purescript, regex-tdfa, regex-tdfa-text - , shakespeare, system-fileio, system-filepath, template-haskell - , text, time, transformers, yesod-core + , formatting, fsnotify, mtl, purescript, regex-tdfa + , regex-tdfa-text, shakespeare, system-fileio, system-filepath + , template-haskell, text, time, transformers, yesod-core }: mkDerivation { pname = "yesod-purescript"; - version = "0.0.4.7"; - sha256 = "0x2mbc4ra6cn3jz3lsb0q40bwz1j7il2nly97m52n4nr18pw4fp9"; + version = "0.0.5"; + sha256 = "0arij86cfzy5hh82gc5l4i3s3z4qa9rfrnj9nrp6q25qhvgiclmy"; buildDepends = [ aeson base bytestring containers data-default formatting fsnotify - purescript regex-tdfa regex-tdfa-text shakespeare system-fileio + mtl purescript regex-tdfa regex-tdfa-text shakespeare system-fileio system-filepath template-haskell text time transformers yesod-core ]; - jailbreak = true; homepage = "https://github.com/mpietrzak/yesod-purescript"; description = "PureScript integration for Yesod"; license = stdenv.lib.licenses.mit; @@ -128936,8 +130274,8 @@ self: { }: mkDerivation { pname = "yet-another-logger"; - version = "0.1.1"; - sha256 = "0h6cszsjffp4crkavr74lfna847pxc506nrqcw108awyjji803by"; + version = "0.1.1.1"; + sha256 = "0bwslcxb747krvpa4irnych4ddjik51542jf0bkzsyhagmakrjz8"; buildDepends = [ aeson ansi-terminal async base base-unicode-symbols bytestring case-insensitive configuration-tools deepseq either @@ -129406,7 +130744,6 @@ self: { homepage = "http://bitbucket.org/iago/z3-haskell"; description = "Bindings for the Z3 Theorem Prover"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { gomp = null; inherit (pkgs) z3;}; "zampolit" = callPackage @@ -129761,7 +131098,6 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming compression/decompression via conduits. (deprecated)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zlib-enum" = callPackage diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 323030f1eaf..8f932c87023 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -55,4 +55,7 @@ rec { appendPatch = drv: x: appendPatches drv [x]; appendPatches = drv: xs: overrideCabal drv (drv: { patches = (drv.patches or []) ++ xs; }); + doHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = true; }); + dontHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = false; }); + } diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index be3e2e22a13..30035671a32 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -1,11 +1,9 @@ -{ stdenv, ghc, llvmPackages, packages, buildEnv +{ stdenv, lib, ghc, llvmPackages, packages, buildEnv , makeWrapper , ignoreCollisions ? false, withLLVM ? false }: -with stdenv.lib; - # This wrapper works only with GHC 6.12 or later. -assert versionOlder "6.12" ghc.version; +assert lib.versionOlder "6.12" ghc.version || ghc.isGhcjs; # It's probably a good idea to include the library "ghc-paths" in the # compiler environment, because we have a specially patched version of @@ -30,19 +28,19 @@ assert versionOlder "6.12" ghc.version; let isGhcjs = ghc.isGhcjs or false; - ghc761OrLater = isGhcjs || versionOlder "7.6.1" ghc.version; + ghc761OrLater = isGhcjs || lib.versionOlder "7.6.1" ghc.version; packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf"; ghcCommand = if isGhcjs then "ghcjs" else "ghc"; libDir = "$out/lib/${ghcCommand}-${ghc.version}"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; - paths = filter (x: x ? isHaskellLibrary) (closePropagation packages); - hasLibraries = any (x: x.isHaskellLibrary) paths; + paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages); + hasLibraries = lib.any (x: x.isHaskellLibrary) paths; # CLang is needed on Darwin for -fllvm to work: # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/code-generators.html - llvm = makeSearchPath "bin" + llvm = lib.makeSearchPath "bin" ([ llvmPackages.llvm ] - ++ optional stdenv.isDarwin llvmPackages.clang); + ++ lib.optional stdenv.isDarwin llvmPackages.clang); in if paths == [] && !withLLVM then ghc else buildEnv { @@ -52,7 +50,7 @@ buildEnv { postBuild = '' . ${makeWrapper}/nix-support/setup-hook - ${optionalString isGhcjs '' + ${lib.optionalString isGhcjs '' cp -r "${ghc}/${ghc.libDir}/"* ${libDir}/ ''} @@ -71,7 +69,7 @@ buildEnv { --set "NIX_GHCPKG" "$out/bin/${ghcCommand}-pkg" \ --set "NIX_GHC_DOCDIR" "${docDir}" \ --set "NIX_GHC_LIBDIR" "${libDir}" \ - ${optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''} + ${lib.optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''} done for prg in runghc runhaskell; do @@ -89,7 +87,7 @@ buildEnv { makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}" done - ${optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"} + ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"} $out/bin/${ghcCommand}-pkg check ''; } // { diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index 667e513769b..2e17ebea5ea 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -1,15 +1,19 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl , gnused, gawk, makeWrapper , odbcSupport ? false, unixODBC ? null -, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }: +, wxSupport ? true, mesa ? null, wxGTK ? null, xlibs ? null +, javacSupport ? false, openjdk ? null +, enableHipe ? true}: assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; assert odbcSupport -> unixODBC != null; +assert javacSupport -> openjdk != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}"; + name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}" + + "${optionalString javacSupport "-javac"}"; version = "17.4"; src = fetchurl { @@ -20,7 +24,8 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper ] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ] - ++ optional odbcSupport [ unixODBC ]; + ++ optional odbcSupport [ unixODBC ] + ++ optional javacSupport [ openjdk ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; @@ -29,7 +34,7 @@ stdenv.mkDerivation rec { sed -e s@/bin/pwd@pwd@g -i otp_build ''; - configureFlags= "--with-ssl=${openssl} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"; + configureFlags= "--with-ssl=${openssl} ${optionalString enableHipe "--enable-hipe"} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"} ${optionalString javacSupport "--with-javac"}"; postInstall = let manpages = fetchurl { @@ -68,6 +73,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; # Note: Maintainer of prev. erlang version was simons. If he wants # to continue maintaining erlang I'm totally ok with that. - maintainers = [ maintainers.the-kenny ]; + maintainers = [ maintainers.the-kenny maintainers.sjmackenzie ]; }; } diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index 8600d17f366..687b7319cf4 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnu-apl-${version}"; - version = "1.4"; + version = "1.5"; src = fetchurl { url = "mirror://gnu/apl/apl-${version}.tar.gz"; - sha256 = "0fl9l4jb5wpnb54kqkphavi657z1cv15h9qj2rqy2shf33dk3nk9"; + sha256 = "0h4diq3wfbdwxp5nm0z4b0p1zq13lwip0y7v28r9v0mbbk8xsfh1"; }; buildInputs = [ liblapack readline gettext ncurses ]; @@ -16,12 +16,13 @@ stdenv.mkDerivation rec { find $out/share/doc/support-files -name 'Makefile*' -delete ''; - meta = { - description = "Free interpreter for the APL programming language."; + meta = with stdenv.lib; { + description = "Free interpreter for the APL programming language"; homepage = http://www.gnu.org/software/apl/; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ kovirobi ]; + license = licenses.gpl3Plus; + maintainers = [ maintainers.kovirobi ]; platforms = stdenv.lib.platforms.linux; + inherit version; longDescription = '' GNU APL is a free interpreter for the programming language APL, with an diff --git a/pkgs/development/interpreters/lush/default.nix b/pkgs/development/interpreters/lush/default.nix index 54a043458a3..63cf85bc506 100644 --- a/pkgs/development/interpreters/lush/default.nix +++ b/pkgs/development/interpreters/lush/default.nix @@ -7,7 +7,7 @@ let version="2.0.1"; name="${baseName}-${version}"; hash="02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k"; - url="http://softlayer-ams.dl.sourceforge.net/project/lush/lush2/lush-2.0.1.tar.gz"; + url="mirror://sourceforge/project/lush/lush2/lush-2.0.1.tar.gz"; sha256="02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k"; }; buildInputs = [ diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 49740fddb46..6796a195286 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -9,7 +9,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.4.38"; + version = "5.4.39"; name = "php-${version}"; @@ -87,13 +87,13 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; mysql = { - configureFlags = ["--with-mysql=${mysql}"]; - buildInputs = [ mysql ]; + configureFlags = ["--with-mysql=${mysql.lib}"]; + buildInputs = [ mysql.lib ]; }; mysqli = { - configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"]; - buildInputs = [ mysql]; + configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"]; + buildInputs = [ mysql.lib ]; }; mysqli_embedded = { @@ -103,8 +103,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; pdo_mysql = { - configureFlags = ["--with-pdo-mysql=${mysql}"]; - buildInputs = [ mysql ]; + configureFlags = ["--with-pdo-mysql=${mysql.lib}"]; + buildInputs = [ mysql.lib ]; }; bcmath = { @@ -258,7 +258,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) src = fetchurl { url = "http://www.php.net/distributions/php-${version}.tar.bz2"; - sha256 = "121ybn55c9f65r1mwiy4yks67bb6m5m5zwwx9y0vpjddryq7vwxb"; + sha256 = "0znpd6pgri5vah4j4wwamhqc60awila43bhh699p973hir9pdsvw"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/php/5.5.nix b/pkgs/development/interpreters/php/5.5.nix index fac04654847..87aff4ff1a2 100644 --- a/pkgs/development/interpreters/php/5.5.nix +++ b/pkgs/development/interpreters/php/5.5.nix @@ -90,13 +90,13 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; mysql = { - configureFlags = ["--with-mysql=${mysql}"]; - buildInputs = [ mysql ]; + configureFlags = ["--with-mysql=${mysql.lib}"]; + buildInputs = [ mysql.lib ]; }; mysqli = { - configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"]; - buildInputs = [ mysql]; + configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"]; + buildInputs = [ mysql.lib ]; }; mysqli_embedded = { @@ -106,8 +106,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; pdo_mysql = { - configureFlags = ["--with-pdo-mysql=${mysql}"]; - buildInputs = [ mysql ]; + configureFlags = ["--with-pdo-mysql=${mysql.lib}"]; + buildInputs = [ mysql.lib ]; }; bcmath = { diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix index 6559ecfa658..1fa98708920 100644 --- a/pkgs/development/interpreters/php/5.6.nix +++ b/pkgs/development/interpreters/php/5.6.nix @@ -90,13 +90,13 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; mysql = { - configureFlags = ["--with-mysql=${mysql}"]; - buildInputs = [ mysql ]; + configureFlags = ["--with-mysql=${mysql.lib}"]; + buildInputs = [ mysql.lib ]; }; mysqli = { - configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"]; - buildInputs = [ mysql]; + configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"]; + buildInputs = [ mysql.lib ]; }; mysqli_embedded = { @@ -106,8 +106,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; pdo_mysql = { - configureFlags = ["--with-pdo-mysql=${mysql}"]; - buildInputs = [ mysql ]; + configureFlags = ["--with-pdo-mysql=${mysql.lib}"]; + buildInputs = [ mysql.lib ]; }; bcmath = { diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index bfa47693de0..2860aceb383 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { baseName="pure"; project="pure-lang"; - version="0.63"; + version="0.64"; name="${baseName}-${version}"; extension="tar.gz"; src = fetchurl { url="https://bitbucket.org/purelang/${project}/downloads/${name}.${extension}"; - sha256="33acb2d560b21813f5e856973b493d9cfafba82bd6f539425ce07aa22f84ee29"; + sha256="01vvix302gh5vsmnjf2g0rrif3hl1yik4izsx1wrvv1a6hlm5mgg"; }; buildInputs = [ bison flex makeWrapper ]; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { linux; license = lib.licenses.gpl3Plus; }; -} \ No newline at end of file +} diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 0d7490d910c..8b24fe00463 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -1,7 +1,19 @@ -{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false -, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, libX11, self, callPackage }: +{ stdenv, fetchurl, self, callPackage +, bzip2, openssl + +, includeModules ? false + +, db, gdbm, ncurses, sqlite, readline + +, tcl ? null, tk ? null, x11 ? null, libX11 ? null, x11Support ? true +, zlib ? null, zlibSupport ? true +}: assert zlibSupport -> zlib != null; +assert x11Support -> tcl != null + && tk != null + && x11 != null + && libX11 != null; with stdenv.lib; @@ -28,7 +40,7 @@ let # if DETERMINISTIC_BUILD env var is set ./deterministic-build.patch ]; - + preConfigure = '' # Purity. for i in /usr /sw /opt /pkg; do @@ -48,7 +60,11 @@ let buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ - [ bzip2 openssl ] ++ optionals includeModules [ db openssl ncurses gdbm libX11 readline x11 tcl tk sqlite ] + [ bzip2 openssl ] + ++ optionals includeModules ( + [ db gdbm ncurses sqlite readline + ] ++ optionals x11Support [ tcl tk x11 libX11 ] + ) ++ optional zlibSupport zlib; # Build the basic Python interpreter without modules that have @@ -87,7 +103,7 @@ let ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz} paxmark E $out/bin/python${majorVersion} - + ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"} ''; @@ -192,11 +208,15 @@ let deps = [ sqlite ]; }; + } // optionalAttrs x11Support { + tkinter = buildInternalPythonModule { moduleName = "tkinter"; deps = [ tcl tk x11 libX11 ]; }; + } // { + readline = buildInternalPythonModule { moduleName = "readline"; internalName = "readline"; diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index e788e1ad13d..dc9323f40ef 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { name = "rakudo-star-${version}"; - version = "2014.04"; + version = "2015.03"; src = fetchurl { url = "http://rakudo.org/downloads/star/${name}.tar.gz"; - sha256 = "0spdrxc2kiidpgni1vl71brgs4d76h8029w5jxvah3yvjcqixz7l"; + sha256 = "1fwvmjyc1bv3kq7p25xyl4sqinp19mbrspmf0h7rvxlwnfcrr5mv"; }; buildInputs = [ icu zlib gmp readline jdk perl ]; configureScript = "perl ./Configure.pl"; configureFlags = - [ "--gen-moar" + [ "--backends=moar,jvm" + "--gen-moar" "--gen-nqp" - "--gen-parrot" ]; meta = { diff --git a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix index cf7bf881a8f..cadda288764 100644 --- a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix +++ b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix @@ -57,7 +57,7 @@ in }; mysql2 = attrs: { - buildInputs = [ mysql zlib openssl ]; + buildInputs = [ mysql.lib zlib openssl ]; }; ncursesw = attrs: { diff --git a/pkgs/development/interpreters/ruby/bundler-head.nix b/pkgs/development/interpreters/ruby/bundler-head.nix index 43a5961aa35..35b8823d22a 100644 --- a/pkgs/development/interpreters/ruby/bundler-head.nix +++ b/pkgs/development/interpreters/ruby/bundler-head.nix @@ -5,7 +5,7 @@ buildRubyGem { src = fetchgit { url = "https://github.com/bundler/bundler.git"; rev = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157"; - sha256 = "1fywz0m3bb0fmcikhqbw9iaw67k29srwi8dllq6ni1cbm1xfyj46"; + sha256 = "0q7cjmz1fsrw3yfsr3h274qjamwnw01xgaqq3h5cjbqlrni4iq7k"; leaveDotGit = true; }; dontPatchShebangs = true; diff --git a/pkgs/development/interpreters/ruby/bundler.nix b/pkgs/development/interpreters/ruby/bundler.nix index cbec8d0ad75..88e0af2a21b 100644 --- a/pkgs/development/interpreters/ruby/bundler.nix +++ b/pkgs/development/interpreters/ruby/bundler.nix @@ -1,8 +1,8 @@ { buildRubyGem, coreutils }: buildRubyGem { - name = "bundler-1.7.9"; - sha256 = "1gd201rh17xykab9pbqp0dkxfm7b9jri02llyvmrc0c5bz2vhycm"; + name = "bundler-1.9.2"; + sha256 = "0ck9bnqg7miimggj1d6qlabrsa5h9yaw241fqn15cvqh915209zk"; dontPatchShebangs = true; postInstall = '' find $out -type f -perm +0100 | while read f; do diff --git a/pkgs/development/libraries/aalib/darwin.patch b/pkgs/development/libraries/aalib/darwin.patch new file mode 100644 index 00000000000..44559d06210 --- /dev/null +++ b/pkgs/development/libraries/aalib/darwin.patch @@ -0,0 +1,106 @@ +diff --git a/src/aaedit.c b/src/aaedit.c +index 09534d2..2ea52f9 100644 +--- a/src/aaedit.c ++++ b/src/aaedit.c +@@ -1,6 +1,6 @@ + #include + #include +-#include ++#include + #include "aalib.h" + #include "aaint.h" + static void aa_editdisplay(struct aa_edit *e) + +diff --git a/src/aakbdreg.c b/src/aakbdreg.c +index def65fe..f4f8efb 100644 +--- a/src/aakbdreg.c ++++ b/src/aakbdreg.c +@@ -1,4 +1,4 @@ +-#include ++#include + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff --git a/src/aalib.c b/src/aalib.c +index 11fecc8..e3063b4 100644 +--- a/src/aalib.c ++++ b/src/aalib.c +@@ -1,6 +1,6 @@ + #include + #include +-#include ++#include + #include "aalib.h" + #include "aaint.h" + +diff --git a/src/aamoureg.c b/src/aamoureg.c +index 0380828..bb55fe3 100644 +--- a/src/aamoureg.c ++++ b/src/aamoureg.c +@@ -1,4 +1,4 @@ +-#include ++#include + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff --git a/src/aarec.c b/src/aarec.c +index 70f4ebc..ee43e8a 100644 +--- a/src/aarec.c ++++ b/src/aarec.c +@@ -1,5 +1,5 @@ + #include +-#include ++#include + #include "aalib.h" + #include "aaint.h" + aa_linkedlist *aa_kbdrecommended = NULL, *aa_mouserecommended = NULL, +diff --git a/src/aaregist.c b/src/aaregist.c +index 54abec0..765155e 100644 +--- a/src/aaregist.c ++++ b/src/aaregist.c +@@ -1,4 +1,4 @@ +-#include ++#include + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff --git a/src/aax.c b/src/aax.c +index adcbd82..36e3294 100644 +--- a/src/aax.c ++++ b/src/aax.c +@@ -1,4 +1,3 @@ +-#include + #include + #include + #include +diff --git a/src/aaxkbd.c b/src/aaxkbd.c +index 30d5903..da2248d 100644 +--- a/src/aaxkbd.c ++++ b/src/aaxkbd.c +@@ -1,4 +1,3 @@ +-#include + #include + #include + #include +diff --git a/src/aaxmouse.c b/src/aaxmouse.c +index 9935b03..7e725ad 100644 +--- a/src/aaxmouse.c ++++ b/src/aaxmouse.c +@@ -1,4 +1,3 @@ +-#include + #include + #include + #include +diff --git a/aalib.m4 b/aalib.m4 +index c40b8db..991fbda 100644 +--- a/aalib.m4 ++++ b/aalib.m4 +@@ -9,7 +9,7 @@ + dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS + dnl +-AC_DEFUN(AM_PATH_AALIB, ++AC_DEFUN([AM_PATH_AALIB], + [dnl + dnl Get the cflags and libraries from the aalib-config script + dnl diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index fa21a9570c7..d7dcbeba330 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation { configureFlags = "--without-x --with-ncurses=${ncurses}"; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + meta = { description = "ASCII art graphics library"; }; diff --git a/pkgs/development/libraries/agda/AgdaSheaves/default.nix b/pkgs/development/libraries/agda/Agda-Sheaves/default.nix similarity index 100% rename from pkgs/development/libraries/agda/AgdaSheaves/default.nix rename to pkgs/development/libraries/agda/Agda-Sheaves/default.nix diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/contextfile b/pkgs/development/libraries/agda/TotalParserCombinators/contextfile index 1c195ee97fa..46743cba3b6 100644 --- a/pkgs/development/libraries/agda/TotalParserCombinators/contextfile +++ b/pkgs/development/libraries/agda/TotalParserCombinators/contextfile @@ -1,6 +1,42 @@ Context: +[Updated the code in response to changes to Agda. +Nils Anders Danielsson **20150319181310 + Ignore-this: 52b9ff613d7f10b0c8f45591a0759d07 +] + +[Rolled back most of "Updated the code in response to changes to Agda". +Nils Anders Danielsson **20150319101420 + Ignore-this: c2ea7bdf79848235fa3ea64ebda116eb + * One of the Agda changes has been reverted. +] + +[Removed an outdated comment. +Nils Anders Danielsson **20150217162945 + Ignore-this: 3ff7732335750305fe220e65693f0cbf +] + +[Added the simplification "nonempty (return x) → fail". +Nils Anders Danielsson **20150217161718 + Ignore-this: 56ad6a68c314446d8986a8c1b49655d0 +] + +[Added Nonempty.nonempty-return. +Nils Anders Danielsson **20150217161629 + Ignore-this: 68829d3f9a248272c46848daa05ccfe3 +] + +[Updated the copyright year range. +Nils Anders Danielsson **20150212154744 + Ignore-this: 3410a12ca1f9de825b00e692b136d500 +] + +[Updated the code in response to changes to Agda. +Nils Anders Danielsson **20150212152207 + Ignore-this: 683b5eeca5fa9c8490bceaf68c23a204 +] + [Updated the copyright year range. Nils Anders Danielsson **20141128223227 Ignore-this: 31d3f5e4fdd6fbfad9758d9bfd0d3a3e diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix index 4a261e07cfd..8c299000065 100644 --- a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix +++ b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix @@ -1,13 +1,13 @@ { stdenv, agda, fetchdarcs, AgdaStdlib }: agda.mkDerivation (self: rec { - version = "2014-11-28"; + version = "2015-03-19"; name = "TotalParserCombinators-${version}"; src = fetchdarcs { url = "http://www.cse.chalmers.se/~nad/repos/parser-combinators.code/"; context = ./contextfile; - sha256 = "03fjrgj0749929h5zz6yfz5x9h7fln95c8ydrm44550350n4xjvk"; + sha256 = "0jlbz8yni6i7vb2qsd41bdkpchqirvc5pavckaf97z7p4gqi2mlj"; }; buildDepends = [ AgdaStdlib ]; diff --git a/pkgs/development/compilers/agda/stdlib.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix similarity index 56% rename from pkgs/development/compilers/agda/stdlib.nix rename to pkgs/development/libraries/agda/agda-stdlib/default.nix index 597d0228b45..8f3d298306b 100644 --- a/pkgs/development/compilers/agda/stdlib.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -1,15 +1,16 @@ -{ stdenv, agda, fetchurl, ghc, filemanip }: +{ stdenv, agda, fetchgit, ghcWithPackages }: agda.mkDerivation (self: rec { - version = "0.9"; - name = "Agda-stdlib-${version}"; + version = "2.4.2.3"; + name = "agda-stdlib-${version}"; - src = fetchurl { - url = "https://github.com/agda/agda-stdlib/archive/v${version}.tar.gz"; - sha256 = "05rpmd2xra8wygq33mahdmijcjwq132l1akqyzj66n13frw4hfwj"; + src = fetchgit { + url = "git://github.com/agda/agda-stdlib"; + rev = "451446c5d849b8c5d6d34363e3551169eb126cfb"; + sha256 = "40a55d3c22fb3462b110859f4cd63e79e086b25f23964b465768397b93c57701"; }; - buildInputs = [ filemanip ghc ]; + nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; preConfigure = '' runhaskell GenerateEverything.hs ''; diff --git a/pkgs/development/libraries/agda/pretty/contextfile b/pkgs/development/libraries/agda/pretty/contextfile index 12079515f66..2ea20153bbc 100644 --- a/pkgs/development/libraries/agda/pretty/contextfile +++ b/pkgs/development/libraries/agda/pretty/contextfile @@ -1,6 +1,32 @@ Context: +[Updated the code in response to a change to Agda. +Nils Anders Danielsson **20150319181428 + Ignore-this: f83c3dccfe25a2a5b9d0437d1dce0ec0 +] + +[Rolled back most of "Updated the code in response to changes to Agda". +Nils Anders Danielsson **20150319101413 + Ignore-this: 5a26cf9cf83d0d146cca0c15c857d20c + * One of the Agda changes has been reverted. +] + +[Updated the code in response to changes to Agda. +Nils Anders Danielsson **20150217101656 + Ignore-this: a12921aebbe0fb575ef391ba5789a391 +] + +[Modified the copyright year range. +Nils Anders Danielsson **20150213144338 + Ignore-this: 1d1b22457dd6dadcb47f5d7f3eea062 +] + +[Restored Grammar.Abstract and Grammar.Non-terminal. +Nils Anders Danielsson **20130727225031 + Ignore-this: ddccb15caa7a3c26e973997ffdb4eec1 +] + [Modified the copyright year range. Nils Anders Danielsson **20141128164015 Ignore-this: b9c6dddc965738aa2a7670c4c18da67f diff --git a/pkgs/development/libraries/agda/pretty/default.nix b/pkgs/development/libraries/agda/pretty/default.nix index cab58b36978..6aaaa44b00f 100644 --- a/pkgs/development/libraries/agda/pretty/default.nix +++ b/pkgs/development/libraries/agda/pretty/default.nix @@ -1,13 +1,13 @@ { stdenv, agda, fetchdarcs, AgdaStdlib }: agda.mkDerivation (self: rec { - version = "2014-11-28"; + version = "2015-03-19"; name = "pretty-${version}"; src = fetchdarcs { url = "http://www.cse.chalmers.se/~nad/repos/pretty/"; context = ./contextfile; - sha256 = "1y896qqlfjqvpd09cp0x9nhr60ii21f5cibl0v73xl3z2d0wn0xa"; + sha256 = "0zmwh9kln7ykpmkx1qhqz64qm2arq62b17vs5fswnxk7mqxsmrf0"; }; buildDepends = [ AgdaStdlib ]; diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix index 813dd2d8687..b996069466b 100644 --- a/pkgs/development/libraries/asio/default.nix +++ b/pkgs/development/libraries/asio/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, boost, openssl}: stdenv.mkDerivation rec { - name = "asio-1.10.4"; + name = "asio-1.10.6"; src = fetchurl { url = "mirror://sourceforge/asio/${name}.tar.bz2"; - sha256 = "0jminwr84wphwpph7j820cql7cbaqlj2zv4gfjk2imazpmlhsfri"; + sha256 = "0phr6zq8z78dwhhzs3h27q32mcv1ffg2gyq880rw3xmilx01rmz0"; }; propagatedBuildInputs = [ boost ]; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 416a33b09a2..b562a2e5d3d 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { intltool dbus_glib at_spi2_core libSM ]; meta = with stdenv.lib; { - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index c27506fe588..7128e4d3f2b 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = with stdenv; lib.optionalString isDarwin "-lintl"; meta = with stdenv.lib; { - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 473df8819c0..f5de02e22bb 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.10"; + name = "babl-0.1.12"; src = fetchurl { - url = "ftp://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4"; + url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; + sha256 = "01x4an6zixrhn0vibkxpcb7gg348gadydq8gpw82rdqp39zjp01g"; }; meta = { diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix index f586d6fd622..cc2a5ebaa31 100644 --- a/pkgs/development/libraries/botan/unstable.nix +++ b/pkgs/development/libraries/botan/unstable.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix (args // { baseVersion = "1.11"; - revision = "15"; - sha256 = "1rkv84v09llbxyvh33szi7zsjm19l02j7h60n9g7jhhc2w667jk0"; + revision = "16"; + sha256 = "0z3a7jp10w9ipmbzhc2xazd2savxmns57ca2a8d6vvjahxg4w6m3"; openssl = null; }) diff --git a/pkgs/development/libraries/ctdb/default.nix b/pkgs/development/libraries/ctdb/default.nix deleted file mode 100644 index 3176352a72e..00000000000 --- a/pkgs/development/libraries/ctdb/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "ctdb-2.5.4"; - - src = fetchurl { - url = "mirror://samba/ctdb/${name}.tar.gz"; - sha256 = "09fb29ngxnh1crsqchykg23bl6s4fifvxwq4gwg1y742mmnjp9fy"; - }; - - buildInputs = [ ]; - - meta = with stdenv.lib; { - description = "The trivial database"; - longDescription = - '' TDB is a Trivial Database. In concept, it is very much like GDBM, - and BSD's DB except that it allows multiple simultaneous writers and - uses locking internally to keep writers from trampling on each - other. TDB is also extremely small. - ''; - homepage = http://tdb.samba.org/; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ wkennington ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 8fc75721c23..ad836ac732d 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -1,6 +1,10 @@ { stdenv, fetchurl, pkgconfig, autoconf, automake, libtool , expat, systemd, glib, dbus_glib, python -, libX11, libICE, libSM, useX11 ? (stdenv.isLinux || stdenv.isDarwin) }: +, libX11 ? null, libICE ? null, libSM ? null, x11Support ? (stdenv.isLinux || stdenv.isDarwin) }: + +assert x11Support -> libX11 != null + && libICE != null + && libSM != null; let version = "1.8.16"; @@ -8,7 +12,7 @@ let inherit (stdenv) lib; - buildInputsX = lib.optionals useX11 [ libX11 libICE libSM ]; + buildInputsX = lib.optionals x11Support [ libX11 libICE libSM ]; # also other parts than "libs" need this statically linked lib makeInternalLib = "(cd dbus && make libdbus-internal.la)"; @@ -57,7 +61,7 @@ let "--sysconfdir=/etc" "--with-session-socket-dir=/tmp" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - ] ++ lib.optional (!useX11) "--without-x"; + ] ++ lib.optional (!x11Support) "--without-x"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 1a46a0e5386..9cb8f86d01d 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -64,17 +64,17 @@ , freetype ? null # Needed for drawtext filter , frei0r ? null # frei0r video filtering , fribidi ? null # Needed for drawtext filter -, game-music-emu ? null # Game Music Emulator +#, game-music-emu ? null # Game Music Emulator , gnutls ? null -, gsm ? null # GSM de/encoder +#, gsm ? null # GSM de/encoder #, ilbc ? null # iLBC de/encoder -, jack2 ? null # Jack audio (only version 2 is supported in this build) +#, jack2 ? null # Jack audio (only version 2 is supported in this build) , ladspaH ? null # LADSPA audio filtering , lame ? null # LAME MP3 encoder , libass ? null # (Advanced) SubStation Alpha subtitle rendering , libbluray ? null # BluRay reading , libbs2b ? null # bs2b DSP library -, libcaca ? null # Textual display (ASCII art) +#, libcaca ? null # Textual display (ASCII art) #, libcdio-paranoia ? null # Audio CD grabbing , libdc1394 ? null, libraw1394 ? null # IIDC-1394 grabbing (ieee 1394) , libiconv ? null @@ -100,10 +100,10 @@ , libXv ? null # Xlib support , lzma ? null # xz-utils #, nvenc ? null # NVIDIA NVENC support -, openal ? null # OpenAL 1.1 capture support +#, openal ? null # OpenAL 1.1 capture support #, opencl ? null # OpenCL code #, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder -, opencv ? null # Video filtering +#, opencv ? null # Video filtering , openglExtlib ? false, mesa ? null # OpenGL rendering #, openh264 ? null # H.264/AVC encoder , openjpeg_1 ? null # JPEG 2000 de/encoder @@ -127,9 +127,9 @@ , x11grabExtlib ? false, libXext ? null, libXfixes ? null # X11 grabbing (legacy) , x264 ? null # H.264/AVC encoder , x265 ? null # H.265/HEVC encoder -, xavs ? null # AVS encoder +#, xavs ? null # AVS encoder , xvidcore ? null # Xvid encoder, native encoder exists -, zeromq4 ? null # Message passing +#, zeromq4 ? null # Message passing , zlib ? null #, zvbi ? null # Teletext support /* @@ -156,14 +156,19 @@ * * Packages with errors: * flite ilbc schroedinger + * opencv - circular dependency issue * * Not packaged: * aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883 * libmxf libnut libquvi nvenc opencl opencore-amr openh264 oss shine twolame * utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video * + * Need fixes to support Darwin: + * frei0r, game-music-emu, gsm, jack2, libssh, libvpx(stable 1.3.0), openal, openjpeg_1, + * pulseaudio, rtmpdump, samba, vit-stab, wavpack, x265. xavs + * * Not supported: - * stagehright-h264(android only) + * stagefright-h264(android only) * * Known issues: * 0.5 - libgsm: configure fails to find library (fix: disable for 0.5) @@ -203,7 +208,12 @@ let # Flag change between versions (e.g. "--enable-armvfp" -> "--enable-vfp" changed in v1.1) chgFlg = chgVer: oldFlag: newFlag: if reqMin chgVer then newFlag else oldFlag; + # Disable dependency that needs fixes before it will work on Darwin + disDarwinFix = origArg: if stdenv.isDarwin then false else origArg; + isCygwin = stdenv.isCygwin; + isDarwin = stdenv.isDarwin; + isLinux = stdenv.isLinux; in /* @@ -239,38 +249,26 @@ assert avdeviceLibrary && reqMin "0.6" -> avformatLibrary && avutilLibrary; # configure flag since 0.6 assert avformatLibrary && reqMin "0.6" -> avcodecLibrary && avutilLibrary; # configure flag since 0.6 assert avresampleLibrary && reqMin "0.11" -> avutilLibrary; -assert postprocLibrary && reqMin "0.5" -> gplLicensing && avutilLibrary; +assert postprocLibrary && reqMin "0.5" -> avutilLibrary; assert swresampleLibrary && reqMin "0.9" -> soxr != null; assert swscaleLibrary && reqMin "0.5" -> avutilLibrary; /* * External libraries */ #assert aacplusExtlib && reqMin "0.7" -> nonfreeLicensing; -#assert cdio-paranoia != null && reqMin "0.9" -> gplLicensing; #assert decklinkExtlib && reqMin "2.2" -> blackmagic-design-desktop-video != null # && !isCygwin && multithreadBuild # POSIX threads required # && nonfreeLicensing; assert faacExtlib && reqMin "0.5" -> faac != null && nonfreeLicensing; -assert fdk-aacExtlib && reqMin "1.0" -> fdk_aac != null && gplLicensing && nonfreeLicensing; -assert frei0r != null && reqMin "0.7" -> gplLicensing; +assert fdk-aacExtlib && reqMin "1.0" -> fdk_aac != null && nonfreeLicensing; assert gnutls != null && reqMin "0.9" -> !opensslExtlib; assert libxcb-shmExtlib && reqMin "2.5" -> libxcb != null; assert libxcb-xfixesExtlib && reqMin "2.5" -> libxcb != null; assert libxcb-shapeExtlib && reqMin "2.5" -> libxcb != null; -#assert opencore-amr != null && reqMin "0.5" -> version3Licensing; assert openglExtlib && reqMin "2.2" -> mesa != null; -assert opensslExtlib && reqMin "0.9" -> gnutls == null && openssl != null && gplLicensing && nonfreeLicensing; -assert sambaExtlib && reqMin "2.3" -> samba != null && gplLicensing && version3Licensing; -#assert utvideo != null && reqMin "0.9" -> gplLicensing; -assert vid-stab != null && reqMin "2.0" -> gplLicensing; -#assert vo-aacenc != null && reqMin "0.6" -> version3Licensing; -#assert vo-amrwbenc != null && reqMin "0.7" -> version3Licensing; -assert x11grabExtlib && reqMin "0.5" -> libX11 != null && libXv != null && gplLicensing; -assert x264 != null && reqMin "0.5" -> gplLicensing; -assert x265 != null && reqMin "2.2" -> gplLicensing; -assert xavs != null && reqMin "0.7" -> gplLicensing; -assert xvidcore != null && reqMin "0.5" -> gplLicensing; -#assert zvbi != null && reqMin "2.1" -> gplLicensing; +assert opensslExtlib && reqMin "0.9" -> gnutls == null && openssl != null && nonfreeLicensing; +assert sambaExtlib && reqMin "2.3" -> samba != null && !isDarwin; +assert x11grabExtlib && reqMin "0.5" -> libX11 != null && libXv != null; with stdenv.lib; stdenv.mkDerivation rec { @@ -295,9 +293,10 @@ stdenv.mkDerivation rec { /* * Build flags */ - # One some ARM platforms --enable-thumb + # On some ARM platforms --enable-thumb "--enable-shared --disable-static" (mkFlag true "0.6" "pic") + (if (stdenv.cc.cc.isClang or false) then "--cc=clang" else null) (mkFlag smallBuild "0.5" "small") (mkFlag runtime-cpudetectBuild "0.5" "runtime-cpudetect") (mkFlag grayBuild "0.5" "gray") @@ -334,7 +333,7 @@ stdenv.mkDerivation rec { (mkFlag avformatLibrary "0.6" "avformat") (mkFlag avresampleLibrary "1.0" "avresample") (mkFlag avutilLibrary "1.1" "avutil") - (mkFlag postprocLibrary "0.5" "postproc") + (mkFlag (postprocLibrary && gplLicensing) "0.5" "postproc") (mkFlag swresampleLibrary "0.9" "swresample") (mkFlag swscaleLibrary "0.5" "swscale") /* @@ -359,18 +358,18 @@ stdenv.mkDerivation rec { #(mkFlag decklinkExtlib "2.2" "decklink") (mkFlag faacExtlib "0.5" "libfaac") (depFlag faad2Extlib "0.5" "0.6" "libfaad") - (mkFlag fdk-aacExtlib "1.0" "libfdk-aac") + (mkFlag (fdk-aacExtlib && gplLicensing) "1.0" "libfdk-aac") #(mkFlag (flite != null) "1.0" "libflite") (if reqMin "1.0" then # Force disable until a solution is found "--disable-libflite" else null) (mkFlag (fontconfig != null) "1.0" "fontconfig") (mkFlag (freetype != null) "0.7" "libfreetype") - (mkFlag (frei0r != null) "0.7" "frei0r") + (mkFlag (disDarwinFix (frei0r != null && gplLicensing)) "0.7" "frei0r") (mkFlag (fribidi != null) "2.3" "libfribidi") - (mkFlag (game-music-emu != null) "2.2" "libgme") + #(mkFlag (disDarwinFix (game-music-emu != null)) "2.2" "libgme") (mkFlag (gnutls != null) "0.9" "gnutls") - (verFix (mkFlag (gsm != null) "0.5" "libgsm") "0.5" "--disable-libgsm") + #(verFix (mkFlag (disDarwinFix (gsm != null)) "0.5" "libgsm") "0.5" "--disable-libgsm") #(mkFlag (ilbc != null) "1.0" "libilbc") (mkFlag (ladspaH !=null) "2.1" "ladspa") (mkFlag (lame != null) "0.5" "libmp3lame") @@ -378,21 +377,21 @@ stdenv.mkDerivation rec { #(mkFlag (libavc1394 != null) null null) (mkFlag (libbluray != null) "1.0" "libbluray") (mkFlag (libbs2b != null) "2.3" "libbs2b") - (mkFlag (libcaca != null) "1.0" "libcaca") - #(mkFlag (cdio-paranoia != null) "0.9" "libcdio") - (mkFlag (libdc1394 != null && libraw1394 != null) "0.5" "libdc1394") + #(mkFlag (libcaca != null) "1.0" "libcaca") + #(mkFlag (cdio-paranoia != null && gplLicensing) "0.9" "libcdio") + (mkFlag (if !isLinux then false else libdc1394 != null && libraw1394 != null && isLinux) "0.5" "libdc1394") (mkFlag (libiconv != null) "1.2" "iconv") - #(mkFlag (libiec61883 != null && libavc1394 != null && libraw1394 != null) "1.0" "libiec61883") + #(mkFlag (if !isLinux then false else libiec61883 != null && libavc1394 != null && libraw1394 != null) "1.0" "libiec61883") #(mkFlag (libmfx != null) "2.6" "libmfx") - (mkFlag (libmodplug != null) "0.9" "libmodplug") + (mkFlag (disDarwinFix (libmodplug != null)) "0.9" "libmodplug") #(mkFlag (libnut != null) "0.5" "libnut") (mkFlag (libopus != null) "1.0" "libopus") - (mkFlag (libssh != null) "2.1" "libssh") + (mkFlag (disDarwinFix (libssh != null)) "2.1" "libssh") (mkFlag (libtheora != null) "0.5" "libtheora") - (mkFlag (libva != null) "0.6" "vaapi") + (mkFlag (if isDarwin then false else libva != null) "0.6" "vaapi") (mkFlag (libvdpau != null) "0.5" "vdpau") (mkFlag (libvorbis != null) "0.5" "libvorbis") - (mkFlag (libvpx != null) "0.6" "libvpx") + (mkFlag (disDarwinFix (libvpx != null)) "0.6" "libvpx") (mkFlag (libwebp != null) "2.2" "libwebp") (mkFlag (libX11 != null && libXv != null) "2.3" "xlib") (mkFlag (libxcb != null) "2.5" "libxcb") @@ -401,39 +400,38 @@ stdenv.mkDerivation rec { (mkFlag libxcb-shapeExtlib "2.5" "libxcb-shape") (mkFlag (lzma != null) "2.4" "lzma") #(mkFlag nvenc "2.6" "nvenc") - (mkFlag (openal != null) "0.9" "openal") + #(mkFlag (disDarwinFix (openal != null)) "0.9" "openal") #(mkFlag opencl "2.2" "opencl") - #(mkFlag (opencore-amr != null) "0.5" "libopencore-amrnb") - #(mkFlag (opencore-amr != null) "0.5" "libopencore-amrwb") - (mkFlag (opencv != null) "1.1" "libopencv") # Actual min. version 0.7 + #(mkFlag (opencore-amr != null && version3Licensing) "0.5" "libopencore-amrnb") + #(mkFlag (opencv != null) "1.1" "libopencv") # Actual min. version 0.7 (mkFlag openglExtlib "2.2" "opengl") #(mkFlag (openh264 != null) "2.6" "openh264") - (mkFlag (openjpeg_1 != null) "0.5" "libopenjpeg") - (mkFlag opensslExtlib "0.9" "openssl") - (mkFlag (pulseaudio != null) "0.9" "libpulse") + (mkFlag (disDarwinFix (openjpeg_1 != null)) "0.5" "libopenjpeg") + (mkFlag (opensslExtlib && gplLicensing) "0.9" "openssl") + (mkFlag (disDarwinFix (pulseaudio != null)) "0.9" "libpulse") #(mkFlag quvi "2.0" "libquvi") - (mkFlag (rtmpdump != null) "0.6" "librtmp") + (mkFlag (disDarwinFix (rtmpdump != null)) "0.6" "librtmp") #(mkFlag (schroedinger != null) "0.5" "libschroedinger") #(mkFlag (shine != null) "2.0" "libshine") - (mkFlag sambaExtlib "2.3" "libsmbclient") + (mkFlag (disDarwinFix (sambaExtlib && gplLicensing && version3Licensing)) "2.3" "libsmbclient") (mkFlag (SDL != null) "2.5" "sdl") # Only configurable since 2.5, auto detected before then (mkFlag (soxr != null) "1.2" "libsoxr") (mkFlag (speex != null) "0.5" "libspeex") #(mkFlag (twolame != null) "1.0" "libtwolame") - #(mkFlag (utvideo != null) "0.9" "libutvideo") - (mkFlag (v4l_utils != null) "0.9" "libv4l2") - (mkFlag (vid-stab != null) "2.2" "libvidstab") # Actual min. version 2.0 - #(mkFlag (vo-aacenc != null) "0.6" "libvo-aacenc") - #(mkFlag (vo-amrwbenc) "0.7" "libvo-amrwbenc") - (mkFlag (wavpack != null) "2.0" "libwavpack") - (mkFlag (x11grabExtlib) "0.5" "x11grab") - (mkFlag (x264 != null) "0.5" "libx264") - (mkFlag (x265 != null) "2.2" "libx265") - (mkFlag (xavs != null) "0.7" "libxavs") - (mkFlag (xvidcore != null) "0.5" "libxvid") - (mkFlag (zeromq4 != null) "2.0" "libzmq") + #(mkFlag (utvideo != null && gplLicensing) "0.9" "libutvideo") + #(mkFlag (if !isLinux then false else v4l_utils != null && isLinux) "0.9" "libv4l2") + (mkFlag (disDarwinFix (vid-stab != null && gplLicensing)) "2.2" "libvidstab") # Actual min. version 2.0 + #(mkFlag (vo-aacenc != null && version3Licensing) "0.6" "libvo-aacenc") + #(mkFlag (vo-amrwbenc != null && version3Licensing) "0.7" "libvo-amrwbenc") + (mkFlag (disDarwinFix (wavpack != null)) "2.0" "libwavpack") + (mkFlag (x11grabExtlib && gplLicensing) "0.5" "x11grab") + (mkFlag (x264 != null && gplLicensing) "0.5" "libx264") + (mkFlag (disDarwinFix (x265 != null && gplLicensing)) "2.2" "libx265") + #(mkFlag (disDarwinFix (xavs != null && gplLicensing)) "0.7" "libxavs") + (mkFlag (xvidcore != null && gplLicensing) "0.5" "libxvid") + #(mkFlag (zeromq4 != null) "2.0" "libzmq") (mkFlag (zlib != null) "0.5" "zlib") - #(mkFlag (zvbi != null) "2.1" "libzvbi") + #(mkFlag (zvbi != null && gplLicensing) "2.1" "libzvbi") /* * Developer flags */ @@ -449,14 +447,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; buildInputs = [ - alsaLib bzip2 celt faad2 fdk_aac fontconfig freetype frei0r fribidi - game-music-emu gnutls gsm jack2 ladspaH lame libass libbluray libbs2b - libcaca libdc1394 libmodplug libogg libopus libraw1394 libssh libtheora - libva libvdpau libvpx libvorbis libwebp libX11 libxcb libXext libXfixes - libXv lzma mesa openal opencv openjpeg_1 openssl pulseaudio rtmpdump - samba SDL soxr speex v4l_utils vid-stab wavpack x264 x265 xavs xvidcore - zeromq4 zlib - ] ++ optional faacExtlib faac; + bzip2 celt fontconfig freetype fribidi gnutls ladspaH lame libass libbluray + libbs2b /* libcaca */ libdc1394 libogg libopus libtheora libvdpau libvorbis + libwebp libX11 libxcb libXext libXfixes libXv lzma SDL soxr speex x264 + xvidcore /* zeromq4 */ zlib + ] ++ optional (disDarwinFix sambaExtlib) samba + ++ optional openglExtlib mesa + ++ optionals x11grabExtlib [ libXext libXfixes ] + ++ optionals nonfreeLicensing [ faac faad2 fdk_aac openssl ] + ++ optionals (!isDarwin) [ + frei0r /* game-music-emu gsm jack2 */ libmodplug libssh libvpx /* openal */ + openjpeg_1 pulseaudio rtmpdump vid-stab wavpack x265 /* xavs */ + ] ++ optional (!isDarwin && !isCygwin) libva + ++ optionals isLinux [ alsaLib libraw1394 /* v4l_utils */ ]; # Build qt-faststart executable buildPhase = optional (qt-faststartProgram && (reqMin "0.9")) ''make tools/qt-faststart''; diff --git a/pkgs/development/libraries/garmintools/default.nix b/pkgs/development/libraries/garmintools/default.nix new file mode 100644 index 00000000000..1f68131efd5 --- /dev/null +++ b/pkgs/development/libraries/garmintools/default.nix @@ -0,0 +1,14 @@ +{ stdenv, fetchurl, libusb }: +stdenv.mkDerivation { + name = "garmintools-0.10"; + src = fetchurl { + url = https://garmintools.googlecode.com/files/garmintools-0.10.tar.gz; + sha256 = "1vjc8h0z4kx2h52yc3chxn3wh1krn234fg12sggbia9zjrzhpmgz"; + }; + buildInputs = [ libusb ]; + meta = { + homepage = https://code.google.com/p/garmintools; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.ocharles ]; + }; +} diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 579d22ad754..237b5537ba4 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib -, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl }: +, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl +, libpng }: composableDerivation.composableDerivation {} (fixed: rec { version = "1.11.2"; @@ -10,7 +11,7 @@ composableDerivation.composableDerivation {} (fixed: rec { sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845"; }; - buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy proj openssl ]; + buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ]; # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults. # Unset CC and CXX as they confuse libtool. @@ -19,10 +20,11 @@ composableDerivation.composableDerivation {} (fixed: rec { configureFlags = [ "--with-jpeg=${libjpeg}" "--with-libtiff=${libtiff}" # optional (without largetiff support) + "--with-libpng=${libpng}" # optional "--with-libz=${zlib}" # optional "--with-pg=${postgresql}/bin/pg_config" - "--with-mysql=${mysql}/bin/mysql_config" + "--with-mysql=${mysql.lib}/bin/mysql_config" "--with-geotiff=${libgeotiff}" "--with-python" # optional "--with-static-proj4=${proj}" # optional diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 27e2cad062b..da6a3ad1dff 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -2,15 +2,15 @@ , jasper, libintlOrEmpty, gobjectIntrospection }: let - ver_maj = "2.30"; - ver_min = "8"; + ver_maj = "2.31"; + ver_min = "3"; in stdenv.mkDerivation rec { name = "gdk-pixbuf-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz"; - sha256 = "1gpqpskp4zzf7h35bp247jcvnk6rxc52r69pb11v8g8i2q386ls8"; + sha256 = "ddd861747bb7c580acce7cfa3ce38c3f52a9516e66a6477988fd100c8fb9eabc"; }; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index a589d625273..38432f68273 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { # needs fonts otherwise don't know how to pass them configureFlags = "--disable-docs"; + NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix index 5818726e345..59f97e46bef 100644 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ b/pkgs/development/libraries/gnome-sharp/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { patches = [ ./Makefile.in.patch ]; + dontStrip = true; + meta = with stdenv.lib; { homepage = http://www.mono-project.com/docs/gui/gtksharp/; description = "A .NET language binding for assorted GNOME libraries"; diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix index e9254a445de..e46b1dfd8e6 100644 --- a/pkgs/development/libraries/gnutls/3.2.nix +++ b/pkgs/development/libraries/gnutls/3.2.nix @@ -1,70 +1,10 @@ -{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip -, guileBindings, guile, perl, gmp }: +{ callPackage, fetchurl, ... } @ args: -assert guileBindings -> guile != null; - -stdenv.mkDerivation rec { - name = "gnutls-3.2.20"; +callPackage ./generic.nix (args // rec { + version = "3.2.21"; src = fetchurl { - url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.lz"; - sha256 = "0mjwzj486g0aj5i3zr70mixmbd4ldrj1ckrwmcr90si6bqa0sc6q"; + url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-${version}.tar.lz"; + sha256 = "1xydzlwmf0frxvr26yw0ily5vwkdvf90m53fix61bi5gx4xd2m7m"; }; - - patches = - # FreeBSD doesn't have , and Gnulib's `alloca' module isn't used. - stdenv.lib.optional stdenv.isFreeBSD ./guile-gnulib-includes.patch - ; - - # Note: GMP is a dependency of Nettle, whose public headers include - # GMP headers, hence the hack. - configurePhase = '' - ./configure --prefix="$out" \ - --disable-dependency-tracking --enable-fast-install \ - --without-p11-kit \ - --with-lzo --with-libtasn1-prefix="${libtasn1}" \ - --with-libnettle-prefix="${nettle}" \ - CPPFLAGS="-I${gmp}/include" \ - ${stdenv.lib.optionalString guileBindings - "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""} - ''; - - # Build of the Guile bindings is not parallel-safe. See - # - # for the actual fix. - enableParallelBuilding = !guileBindings; - - buildInputs = [ zlib lzo lzip ] - ++ stdenv.lib.optional guileBindings guile; - - nativeBuildInputs = [ perl pkgconfig ]; - - propagatedBuildInputs = [ nettle libtasn1 ]; - - # XXX: Gnulib's `test-select' fails on FreeBSD: - # http://hydra.nixos.org/build/2962084/nixlog/1/raw . - doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); - - meta = { - description = "The GNU Transport Layer Security Library"; - - longDescription = '' - GnuTLS is a project that aims to develop a library which - provides a secure layer, over a reliable transport - layer. Currently the GnuTLS library implements the proposed - standards by the IETF's TLS working group. - - Quoting from the TLS protocol specification: - - "The TLS protocol provides communications privacy over the - Internet. The protocol allows client/server applications to - communicate in a way that is designed to prevent eavesdropping, - tampering, or message forgery." - ''; - - homepage = http://www.gnu.org/software/gnutls/; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; - }; -} +}) diff --git a/pkgs/development/libraries/gnutls/3.3.nix b/pkgs/development/libraries/gnutls/3.3.nix new file mode 100644 index 00000000000..fbf51f34ff8 --- /dev/null +++ b/pkgs/development/libraries/gnutls/3.3.nix @@ -0,0 +1,10 @@ +{ callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "3.3.14"; + + src = fetchurl { + url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.lz"; + sha256 = "1117j71ng66syddw10yazrniqkd326hcigx2hfcw4s86rk0kqanv"; + }; +}) diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix new file mode 100644 index 00000000000..9c1c2e1b7d8 --- /dev/null +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -0,0 +1,71 @@ +{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip +, guileBindings, guile, perl, gmp + +# Version dependent args +, version, src +, ...}: + +assert guileBindings -> guile != null; + +stdenv.mkDerivation rec { + name = "gnutls-${version}"; + + inherit src; + + patches = + # FreeBSD doesn't have , and Gnulib's `alloca' module isn't used. + stdenv.lib.optional stdenv.isFreeBSD ./guile-gnulib-includes.patch + ; + + # Note: GMP is a dependency of Nettle, whose public headers include + # GMP headers, hence the hack. + configurePhase = '' + ./configure --prefix="$out" \ + --disable-dependency-tracking --enable-fast-install \ + --without-p11-kit \ + --with-lzo --with-libtasn1-prefix="${libtasn1}" \ + --with-libnettle-prefix="${nettle}" \ + CPPFLAGS="-I${gmp}/include" \ + ${stdenv.lib.optionalString guileBindings + "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""} + ''; + + # Build of the Guile bindings is not parallel-safe. See + # + # for the actual fix. + enableParallelBuilding = !guileBindings; + + buildInputs = [ zlib lzo lzip ] + ++ stdenv.lib.optional guileBindings guile; + + nativeBuildInputs = [ perl pkgconfig ]; + + propagatedBuildInputs = [ nettle libtasn1 ]; + + # XXX: Gnulib's `test-select' fails on FreeBSD: + # http://hydra.nixos.org/build/2962084/nixlog/1/raw . + doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); + + meta = with stdenv.lib; { + description = "The GNU Transport Layer Security Library"; + + longDescription = '' + GnuTLS is a project that aims to develop a library which + provides a secure layer, over a reliable transport + layer. Currently the GnuTLS library implements the proposed standards by + the IETF's TLS working group. + + Quoting from the TLS protocol specification: + + "The TLS protocol provides communications privacy over the + Internet. The protocol allows client/server applications to + communicate in a way that is designed to prevent eavesdropping, + tampering, or message forgery." + ''; + + homepage = http://www.gnu.org/software/gnutls/; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ eelco wkennington ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index fa350110476..35b40a507a8 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -21,12 +21,14 @@ stdenv.mkDerivation rec { sha256 = "1l45nd7ln2pnrf99vdki3l7an5wrzkbak11hnnj1w6r3fkm4xmv1"; }; + NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; buildInputs = [ libxkbcommon ]; propagatedBuildInputs = with xlibs; with stdenv.lib; - [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ] - ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor wayland ] + [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ] + ++ optionals stdenv.isLinux [ wayland ] ++ optional stdenv.isDarwin x11 ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 727e4b2185c..d0782d94e5e 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurlGnome, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm }: +{ stdenv, fetchurl, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm }: stdenv.mkDerivation rec { - name = src.pkgname; + name = "gtkmm-${minVer}.4"; + minVer = "2.24"; - src = fetchurlGnome { - project = "gtkmm"; - major = "2"; minor = "24"; patchlevel = "4"; extension = "xz"; + src = fetchurl { + url = "mirror://gnome/sources/gtkmm/${minVer}/${name}.tar.xz"; sha256 = "1vpmjqv0aqb1ds0xi6nigxnhlr0c74090xzi15b92amlzkrjyfj4"; }; diff --git a/pkgs/development/libraries/haskell/poppler/default.nix b/pkgs/development/libraries/haskell/poppler/default.nix index 28e7e515c2b..0eb3c13f9bd 100644 --- a/pkgs/development/libraries/haskell/poppler/default.nix +++ b/pkgs/development/libraries/haskell/poppler/default.nix @@ -12,6 +12,10 @@ cabal.mkDerivation (self: { buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc ]; pkgconfigDepends = [ cairo gdk_pixbuf glib gtk pango popplerGlib ]; + patchPhase = '' + sed -i -e 's,glib/poppler.h,poppler.h,' poppler.cabal + sed -i -e 's,glib/poppler.h,poppler.h,' Graphics/UI/Gtk/Poppler/Structs.hsc + ''; meta = { homepage = "http://www.haskell.org/gtk2hs/"; description = "Binding to the Poppler"; diff --git a/pkgs/development/libraries/ilmbase/bootstrap.patch b/pkgs/development/libraries/ilmbase/bootstrap.patch new file mode 100644 index 00000000000..db6af6daebd --- /dev/null +++ b/pkgs/development/libraries/ilmbase/bootstrap.patch @@ -0,0 +1,15 @@ +diff -ur openexr-v2.2.0-src-orig/IlmBase/bootstrap openexr-v2.2.0-src/IlmBase/bootstrap +--- IlmBase/bootstrap 2015-03-31 01:02:41.000000000 -0400 ++++ IlmBase/bootstrap 2015-03-31 01:03:35.000000000 -0400 +@@ -47,11 +47,6 @@ + fi + } + +-# Check if /usr/local/share/aclocal exists +-if [ -d /usr/local/share/aclocal ]; then +- ACLOCAL_INCLUDE="$ACLOCAL_INCLUDE -I /usr/local/share/aclocal" +-fi +- + run_cmd aclocal -I m4 $ACLOCAL_INCLUDE + run_cmd $LIBTOOLIZE --automake --copy + run_cmd automake --add-missing --copy diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 7f8147261ce..816a9c023e1 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, openexr, automake, autoconf, libtool }: +{ stdenv, openexr, automake, autoconf, libtool, which }: stdenv.mkDerivation { name = "ilmbase-${openexr.source.version}"; @@ -13,7 +13,9 @@ stdenv.mkDerivation { ./bootstrap ''; - buildInputs = [ automake autoconf libtool ]; + buildInputs = [ automake autoconf libtool which ]; + + patches = [ ./bootstrap.patch ]; meta = with stdenv.lib; { homepage = http://www.openexr.com/; diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index ac67c17218f..a682b3a6b82 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0v31l3k0fzy7isdsx2sh0baaixzlml1m7vgz6cd0015d9f5n99vl"; }; - patchPhase = '' + patches = [ ./irrlicht-1.8.1-mesa-10.x.patch ]; + + postPatch = '' sed -i /stdcall-alias/d source/Irrlicht/Makefile ''; diff --git a/pkgs/development/libraries/irrlicht/irrlicht-1.8.1-mesa-10.x.patch b/pkgs/development/libraries/irrlicht/irrlicht-1.8.1-mesa-10.x.patch new file mode 100644 index 00000000000..e90ff36443a --- /dev/null +++ b/pkgs/development/libraries/irrlicht/irrlicht-1.8.1-mesa-10.x.patch @@ -0,0 +1,40 @@ +From 244d00280c1b082ca164f92337773e9e4e1a3898 Mon Sep 17 00:00:00 2001 +From: hiker +Date: Wed, 26 Feb 2014 11:13:03 +1100 +Subject: [PATCH] Applied patch from jpirie for fixing mesa 10 compilation + problems. + +--- irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h ++++ irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h +@@ -21,6 +21,7 @@ + #endif + #include + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) ++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); + #include "glext.h" + #endif + #include "wglext.h" +@@ -35,6 +36,7 @@ + #endif + #include + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) ++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); + #include "glext.h" + #endif + #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_) +@@ -48,6 +50,7 @@ + #define NO_SDL_GLEXT + #include + #include ++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); + #include "glext.h" + #else + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) +@@ -60,6 +63,7 @@ + #include + #include + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) ++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); + #include "glext.h" + #undef GLX_ARB_get_proc_address // avoid problems with local glxext.h + #include "glxext.h" diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 795062f12d5..d942dd7b692 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -6,11 +6,21 @@ , libsoup }: -let metadata = if stdenv.system == "i686-linux" - then { arch = "x86"; sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; } - else if stdenv.system == "x86_64-linux" - then { arch = "x86_64"; sha256 = "0hq48zfqx2p0fqr0rlabnz2pdj0874k19918a4dbj0fhzkhrh959"; } - else { }; +let + platformMap = { + "x86_64-linux" = + { platform = "gtk-linux-x86_64"; + sha256 = "0hq48zfqx2p0fqr0rlabnz2pdj0874k19918a4dbj0fhzkhrh959"; }; + "i686-linux" = + { platform = "gtk-linux-x86"; + sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; }; + "x86_64-darwin" = + { platform = "cocoa-macosx-x86_64"; + sha256 = "1565gg63ssrl04fh355vf9mnmq8qwwki3zpc3ybm7bylgkfwc9h4"; }; + }; + + metadata = assert platformMap ? ${stdenv.system}; platformMap.${stdenv.system}; + in stdenv.mkDerivation rec { version = "3.7.2"; fullVersion = "${version}-201202080800"; @@ -22,7 +32,7 @@ in stdenv.mkDerivation rec { # releases of SWT. So we just grab a binary release and extract # "src.zip" from that. src = fetchurl { - url = "http://archive.eclipse.org/eclipse/downloads/drops/R-${fullVersion}/${name}-gtk-linux-${metadata.arch}.zip"; + url = "http://archive.eclipse.org/eclipse/downloads/drops/R-${fullVersion}/${name}-${metadata.platform}.zip"; sha256 = metadata.sha256; }; diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index af2611a0bae..2e0c75c1452 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -10,6 +10,9 @@ stdenv.mkDerivation rec { postPatch = '' sed -i 's/^\(CFLAGS.*\)$/\1 -fPIC/' Makefile + '' + stdenv.lib.optionalString (stdenv.cc.cc.isClang or false) '' + substituteInPlace Makefile libjbig/Makefile pbmtools/Makefile \ + --replace "CC = gcc" "CC = clang" ''; installPhase = '' diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index a50163c601d..e49063a9de9 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,18 +1,15 @@ -{ stdenv, fetchurlGnome, glib, pkgconfig, gobjectIntrospection, dbus }: +{ stdenv, fetchurl, glib, pkgconfig, gobjectIntrospection, dbus }: stdenv.mkDerivation rec { - name = src.pkgname; + name = "json-glib-${minVer}.2"; + minVer = "1.0"; - src = fetchurlGnome { - project = "json-glib"; - major = "1"; - minor = "0"; - patchlevel = "2"; - extension = "xz"; + src = fetchurl { + url = "mirror://gnome/sources/json-glib/${minVer}/${name}.tar.xz"; sha256 = "887bd192da8f5edc53b490ec51bf3ffebd958a671f5963e4f3af32c22e35660a"; }; - configureflags= "--with-introspection" ; + configureflags= "--with-introspection"; propagatedBuildInputs = [ glib gobjectIntrospection ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 74d26d2fa03..1f396fff1cf 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (rec { description = "MIT Kerberos 5"; homepage = webpage; license = "MPL"; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; }; diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 542aa3cb340..8836b0bffa2 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3"; }; - buildInputs = [ libdbi mysql sqlite postgresql ]; + buildInputs = [ libdbi sqlite postgresql ] + ++ optional (mysql != null) mysql.lib; postPatch = '' sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure; @@ -26,8 +27,8 @@ stdenv.mkDerivation rec { "--with-dbi-libdir=${libdbi}/lib" ] ++ optionals (mysql != null) [ "--with-mysql" - "--with-mysql-incdir=${mysql}/include/mysql" - "--with-mysql-libdir=${mysql}/lib/mysql" + "--with-mysql-incdir=${mysql.lib}/include/mysql" + "--with-mysql-libdir=${mysql.lib}/lib/mysql" ] ++ optionals (postgresql != null) [ "--with-pgsql" "--with-pgsql_incdir=${postgresql}/include" diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index 11ec1c0ecf3..2540d22b8d4 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { sha256 = "0pbvxbp30zqjpc0q71qbl15cb47py74c4d6a8qv1mqa6j81pb233"; }; + # Darwin gets misdetected as Windows without this + NIX_CFLAGS_COMPILE = if stdenv.isDarwin then "-D__unix" else null; + + # This dead code causes a duplicate symbol error in Clang so just remove it + postPatch = if (stdenv.cc.cc.isClang or false) then '' + substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" "" + '' else null; + meta = with stdenv.lib; { homepage = http://www.imagemagick.org; description = "A library for manipulating FlashPIX images"; diff --git a/pkgs/development/libraries/libibverbs/default.nix b/pkgs/development/libraries/libibverbs/default.nix index cef34fe6db8..38f94e7992d 100644 --- a/pkgs/development/libraries/libibverbs/default.nix +++ b/pkgs/development/libraries/libibverbs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.openfabrics.org/; license = licenses.bsd2; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index 883ad072c7b..7739c3627ec 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -8,7 +8,11 @@ stdenv.mkDerivation rec { sha256 = "bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690"; }; - patches = [ ./001-mips_removal_h_constraint.patch ./pkgconfig.patch ]; + patches = [ ./001-mips_removal_h_constraint.patch ./pkgconfig.patch ] + # optimize.diff is taken from https://projects.archlinux.org/svntogit/packages.git/tree/trunk/optimize.diff?h=packages/libmad + # It is included here in order to fix a build failure in Clang + # But it may be useful to fix other, currently unknown problems as well + ++ stdenv.lib.optional (stdenv.cc.cc.isClang or false) [ ./optimize.diff ]; nativeBuildInputs = [ autoconf ]; @@ -22,6 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://sourceforge.net/projects/mad/; description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2"; + license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libmad/optimize.diff b/pkgs/development/libraries/libmad/optimize.diff new file mode 100644 index 00000000000..1418dc92707 --- /dev/null +++ b/pkgs/development/libraries/libmad/optimize.diff @@ -0,0 +1,77 @@ +Index: libmad-0.15.1b/configure.ac +=================================================================== +--- libmad-0.15.1b.orig/configure.ac 2008-03-07 20:31:23.000000000 +0000 ++++ libmad-0.15.1b/configure.ac 2008-03-07 20:34:26.000000000 +0000 +@@ -124,71 +124,7 @@ + + if test "$GCC" = yes + then +- if test -z "$arch" +- then +- case "$host" in +- i386-*) ;; +- i?86-*) arch="-march=i486" ;; +- arm*-empeg-*) arch="-march=armv4 -mtune=strongarm1100" ;; +- armv4*-*) arch="-march=armv4 -mtune=strongarm" ;; +- powerpc-*) ;; +- mips*-agenda-*) arch="-mcpu=vr4100" ;; +- mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;; +- esac +- fi +- +- case "$optimize" in +- -O|"-O "*) +- optimize="-O" +- optimize="$optimize -fforce-mem" +- optimize="$optimize -fforce-addr" +- : #x optimize="$optimize -finline-functions" +- : #- optimize="$optimize -fstrength-reduce" +- optimize="$optimize -fthread-jumps" +- optimize="$optimize -fcse-follow-jumps" +- optimize="$optimize -fcse-skip-blocks" +- : #x optimize="$optimize -frerun-cse-after-loop" +- : #x optimize="$optimize -frerun-loop-opt" +- : #x optimize="$optimize -fgcse" +- optimize="$optimize -fexpensive-optimizations" +- optimize="$optimize -fregmove" +- : #* optimize="$optimize -fdelayed-branch" +- : #x optimize="$optimize -fschedule-insns" +- optimize="$optimize -fschedule-insns2" +- : #? optimize="$optimize -ffunction-sections" +- : #? optimize="$optimize -fcaller-saves" +- : #> optimize="$optimize -funroll-loops" +- : #> optimize="$optimize -funroll-all-loops" +- : #x optimize="$optimize -fmove-all-movables" +- : #x optimize="$optimize -freduce-all-givs" +- : #? optimize="$optimize -fstrict-aliasing" +- : #* optimize="$optimize -fstructure-noalias" +- +- case "$host" in +- arm*-*) +- optimize="$optimize -fstrength-reduce" +- ;; +- mips*-*) +- optimize="$optimize -fstrength-reduce" +- optimize="$optimize -finline-functions" +- ;; +- i?86-*) +- optimize="$optimize -fstrength-reduce" +- ;; +- powerpc-apple-*) +- # this triggers an internal compiler error with gcc2 +- : #optimize="$optimize -fstrength-reduce" +- +- # this is really only beneficial with gcc3 +- : #optimize="$optimize -finline-functions" +- ;; +- *) +- # this sometimes provokes bugs in gcc 2.95.2 +- : #optimize="$optimize -fstrength-reduce" +- ;; +- esac +- ;; +- esac ++ optimize="-O2" + fi + + case "$host" in diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index a8b2c04ddf5..100f91d966f 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "Shared library for mediainfo"; homepage = http://mediaarea.net/; license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.devhell ]; }; } diff --git a/pkgs/development/libraries/libmsgpack/default.nix b/pkgs/development/libraries/libmsgpack/default.nix index 3e43842495a..5b2c7902c3c 100644 --- a/pkgs/development/libraries/libmsgpack/default.nix +++ b/pkgs/development/libraries/libmsgpack/default.nix @@ -1,12 +1,12 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "msgpack"; repo = "msgpack-c"; rev = "cpp-${version}"; - sha256 = "0qyjz2rm0gxbv81dlh28ynss66dsyhlqzs09rblbjsdf1vh6yzcq"; + sha256 = "1hnpnin6gjiilbzfd75871kamfn9grrf53qpbs061sflvz56fddq"; }; }) diff --git a/pkgs/development/libraries/librdmacm/default.nix b/pkgs/development/libraries/librdmacm/default.nix index 0f5500478b4..843ff62530b 100644 --- a/pkgs/development/libraries/librdmacm/default.nix +++ b/pkgs/development/libraries/librdmacm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.openfabrics.org/; - platforms = platforms.unix; + platforms = platforms.linux; license = licenses.bsd2; maintainers = with maintainers; [ wkennington ]; }; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 4a8e68da0b8..56e7084292c 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { - version = "0.4.11"; + version = "0.4.12"; name = "libre-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; - sha256 = "10jqra8b1nzy1q440ax72fxymxasgjyvpy0x4k67l77wy4p1jr42"; + sha256 = "1wjdcf5wr50d86rysj5haz53v7d58j7sszpc6k5b4mn1x6604i0d"; }; buildInputs = [zlib openssl]; makeFlags = [ diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 626b5220ebf..fe05275871f 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { homepage = http://www.librelp.com/; description = "a reliable logging library"; license = licenses.gpl2; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index aa138613ec4..ef4638eea27 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.1.5"; + version = "2.1.6"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "1fy3x5idx5mnncbzhsw1ahwnh7ram4d05ksz0ipf5x6p7y8pj8x8"; + sha256 = "1a2k6sby6a1d0hf4hns6d13cvyck2i0figbkf1q0301vggcnv0jg"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 3ed89ec8a8a..9589298ecd5 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf -, bzip2, libcroco +, bzip2, libcroco, libintlOrEmpty , gtk3 ? null , gobjectIntrospection ? null, enableIntrospection ? false }: @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { sha256 = "0fplymmqqr28y24vcnb01szn62pfbqhk8p1ngns54x9m6mflr5hk"; }; - buildInputs = [ libxml2 libgsf bzip2 libcroco pango ] + NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + + buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ] ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ]; propagatedBuildInputs = [ glib gdk_pixbuf cairo gtk3 ]; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 6e8f3548e87..b08c169993e 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xz}: +{ stdenv, fetchurl, xz }: stdenv.mkDerivation rec { name = "libunwind-1.1"; @@ -22,8 +22,10 @@ stdenv.mkDerivation rec { touch "$out/lib/libunwind-generic.so" ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.nongnu.org/libunwind; description = "A portable and efficient API to determine the call-chain of a program"; + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index f2a903a21da..c900cfbc684 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, libjpeg, libpng12, libX11, zlib }: +{ stdenv, fetchurl, autoreconfHook, libjpeg, libpng12, libX11, zlib }: let version = "3.5.0.31"; in stdenv.mkDerivation { @@ -17,11 +17,10 @@ stdenv.mkDerivation { maintainers = with maintainers; [ nckx ]; }; - buildInputs = [ autoconf libjpeg libpng12 libX11 zlib ]; + buildInputs = [ autoreconfHook libjpeg libpng12 libX11 zlib ]; - preConfigure = '' + preAutoreconf = '' cd nxcomp/ - autoconf ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 434b76a09ea..153096ee45c 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (rec { name = "libxml2-${version}"; src = fetchurl { - url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz"; + url = "http://xmlsoft.org/sources/${name}.tar.gz"; sha256 = "1g6mf03xcabmk5ing1lwqmasr803616gb2xhn7pll10x2l5w6y2i"; }; diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index c5b91f3c491..fda24776480 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libxslt-1.1.28"; src = fetchurl { - url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz"; + url = "http://xmlsoft.org/sources/${name}.tar.gz"; sha256 = "13029baw9kkyjgr7q3jccw2mz38amq7mmpr5p3bh775qawd1bisz"; }; diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix index 5a2723487a4..2fdeee7b5dc 100644 --- a/pkgs/development/libraries/libzen/default.nix +++ b/pkgs/development/libraries/libzen/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { description = "Shared library for libmediainfo and mediainfo"; homepage = http://mediaarea.net/; license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.devhell ]; }; } diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index be50a58c54a..4af9278c7b1 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -2,12 +2,21 @@ stdenv.mkDerivation rec { name = "libzip-0.11.2"; - + src = fetchurl { url = "http://www.nih.at/libzip/${name}.tar.gz"; sha256 = "1mcqrz37vjrfr4gnss37z1m7xih9x9miq3mms78zf7wn7as1znw3"; }; - + + # fix CVE-2015-2331 taken from Debian patch: + # https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=12;filename=libzip-0.11.2-1.2-nmu.diff;att=1;bug=780756 + postPatch = '' + substituteInPlace lib/zip_dirent.c --replace \ + 'else if ((cd->entry=(struct zip_entry *)' \ + 'else if (nentry > ((size_t)-1)/sizeof(*(cd->entry)) || (cd->entry=(struct zip_entry *)' + cat lib/zip_dirent.c + ''; + propagatedBuildInputs = [ zlib ]; # At least mysqlWorkbench cannot find zipconf.h; I think also openoffice diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 8bf41584bdf..bc8f91dcb93 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "0.11.2"; + version = "0.12.0"; name = "mdds-${version}"; src = fetchurl { url = "http://kohei.us/files/mdds/src/mdds_${version}.tar.bz2"; - sha256 = "1ax50ahgl549gw76p8kbd5cb0kkihrn59638mppq4raxng40s2nd"; + sha256 = "10ar7r0gkdl2r7916jlkl5c38cynrh7x9s90a5i8d242r8ixw8ia"; }; postInstall = '' diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix index 51a66b4b92c..0e1327e9e76 100644 --- a/pkgs/development/libraries/mtdev/default.nix +++ b/pkgs/development/libraries/mtdev/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { See the kernel documentation for further details. ''; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/nettle/27.nix b/pkgs/development/libraries/nettle/27.nix new file mode 100644 index 00000000000..fc85f5eb9de --- /dev/null +++ b/pkgs/development/libraries/nettle/27.nix @@ -0,0 +1,10 @@ +{ callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "2.7.1"; + + src = fetchurl { + url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; + sha256 = "0h2vap31yvi1a438d36lg1r1nllfx3y19r4rfxv7slrm6kafnwdw"; + }; +}) diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 8f731233aa9..a6aae14e5c3 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,67 +1,10 @@ -{ fetchurl, stdenv, gmp, gnum4 }: +{ callPackage, fetchurl, ... } @ args: -stdenv.mkDerivation (rec { - name = "nettle-2.7.1"; +callPackage ./generic.nix (args // rec { + version = "3.0"; src = fetchurl { - url = "mirror://gnu/nettle/${name}.tar.gz"; - sha256 = "0h2vap31yvi1a438d36lg1r1nllfx3y19r4rfxv7slrm6kafnwdw"; + url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; + sha256 = "04yrpjz33vrj6j0zxc153b00f93i8hs41syr1ryp7sr64fyw0lcn"; }; - - buildInputs = [ gnum4 ]; - propagatedBuildInputs = [ gmp ]; - - doCheck = (stdenv.system != "i686-cygwin" && !stdenv.isDarwin); - - enableParallelBuilding = true; - - # It doesn't build otherwise - dontDisableStatic = true; - - patches = stdenv.lib.optional (stdenv.system == "i686-cygwin") - ./cygwin.patch; - - meta = { - description = "Cryptographic library"; - - longDescription = '' - Nettle is a cryptographic library that is designed to fit - easily in more or less any context: In crypto toolkits for - object-oriented languages (C++, Python, Pike, ...), in - applications like LSH or GNUPG, or even in kernel space. In - most contexts, you need more than the basic cryptographic - algorithms, you also need some way to keep track of available - algorithms, their properties and variants. You often have - some algorithm selection process, often dictated by a protocol - you want to implement. - - And as the requirements of applications differ in subtle and - not so subtle ways, an API that fits one application well can - be a pain to use in a different context. And that is why - there are so many different cryptographic libraries around. - - Nettle tries to avoid this problem by doing one thing, the - low-level crypto stuff, and providing a simple but general - interface to it. In particular, Nettle doesn't do algorithm - selection. It doesn't do memory allocation. It doesn't do any - I/O. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - - homepage = http://www.lysator.liu.se/~nisse/nettle/; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; - }; -} - -// - -stdenv.lib.optionalAttrs stdenv.isSunOS { - # Make sure the right is found, and not the incompatible - # /usr/include/mp.h from OpenSolaris. See - # - # for details. - configureFlags = [ "--with-include-path=${gmp}/include" ]; }) diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix new file mode 100644 index 00000000000..76629c80b96 --- /dev/null +++ b/pkgs/development/libraries/nettle/generic.nix @@ -0,0 +1,68 @@ +{ stdenv, gmp, gnum4 + +# Version specific args +, version, src +, ...}: + +stdenv.mkDerivation (rec { + name = "nettle-${version}"; + + inherit src; + + buildInputs = [ gnum4 ]; + propagatedBuildInputs = [ gmp ]; + + doCheck = (stdenv.system != "i686-cygwin" && !stdenv.isDarwin); + + enableParallelBuilding = true; + + # It doesn't build otherwise + dontDisableStatic = true; + + patches = stdenv.lib.optional (stdenv.system == "i686-cygwin") + ./cygwin.patch; + + meta = { + description = "Cryptographic library"; + + longDescription = '' + Nettle is a cryptographic library that is designed to fit + easily in more or less any context: In crypto toolkits for + object-oriented languages (C++, Python, Pike, ...), in + applications like LSH or GNUPG, or even in kernel space. In + most contexts, you need more than the basic cryptographic + algorithms, you also need some way to keep track of available + algorithms, their properties and variants. You often have + some algorithm selection process, often dictated by a protocol + you want to implement. + + And as the requirements of applications differ in subtle and + not so subtle ways, an API that fits one application well can + be a pain to use in a different context. And that is why + there are so many different cryptographic libraries around. + + Nettle tries to avoid this problem by doing one thing, the + low-level crypto stuff, and providing a simple but general + interface to it. In particular, Nettle doesn't do algorithm + selection. It doesn't do memory allocation. It doesn't do any + I/O. + ''; + + license = stdenv.lib.licenses.gpl2Plus; + + homepage = http://www.lysator.liu.se/~nisse/nettle/; + + maintainers = [ ]; + platforms = stdenv.lib.platforms.all; + }; +} + +// + +stdenv.lib.optionalAttrs stdenv.isSunOS { + # Make sure the right is found, and not the incompatible + # /usr/include/mp.h from OpenSolaris. See + # + # for details. + configureFlags = [ "--with-include-path=${gmp}/include" ]; +}) diff --git a/pkgs/development/libraries/ntdb/default.nix b/pkgs/development/libraries/ntdb/default.nix index 0d553f68885..80e683a32ae 100644 --- a/pkgs/development/libraries/ntdb/default.nix +++ b/pkgs/development/libraries/ntdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pkgconfig, readline, libxslt +{ stdenv, fetchurl, python, pkgconfig, readline, gettext, libxslt , docbook_xsl, docbook_xml_dtd_42 }: @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { }; buildInputs = [ - python pkgconfig readline libxslt docbook_xsl docbook_xml_dtd_42 + python pkgconfig readline gettext libxslt docbook_xsl docbook_xml_dtd_42 ]; preConfigure = '' - sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf + patchShebangs buildtools/bin/waf ''; configureFlags = [ diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index a89965d0467..03e7718a3ae 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -1,17 +1,18 @@ -{stdenv, fetchurl, readline, mysql, postgresql, sqlite}: +{ stdenv, fetchurl, readline, mysql, postgresql, sqlite }: stdenv.mkDerivation rec { - name = "opendbx-1.4.4"; + name = "opendbx-1.4.6"; + src = fetchurl { url = "http://linuxnetworks.de/opendbx/download/${name}.tar.gz"; - sha256 = "1pc70l54kkdakdw8njr2pnbcghq7fn2bnk97wzhac2adwdkjp7vs"; + sha256 = "0z29h6zx5f3gghkh1a0060w6wr572ci1rl2a3480znf728wa0ii2"; }; preConfigure = '' - export CPPFLAGS="-I${mysql}/include/mysql" - export LDFLAGS="-L${mysql}/lib/mysql" + export CPPFLAGS="-I${mysql.lib}/include/mysql" + export LDFLAGS="-L${mysql.lib}/lib/mysql" configureFlagsArray=(--with-backends="mysql pgsql sqlite3") ''; - buildInputs = [readline mysql postgresql sqlite]; + buildInputs = [ readline mysql.lib postgresql sqlite ]; } diff --git a/pkgs/development/libraries/openexr/bootstrap.patch b/pkgs/development/libraries/openexr/bootstrap.patch new file mode 100644 index 00000000000..af6669c16a4 --- /dev/null +++ b/pkgs/development/libraries/openexr/bootstrap.patch @@ -0,0 +1,15 @@ +diff -ur openexr-v2.2.0-src-orig/OpenEXR/bootstrap openexr-v2.2.0-src/OpenEXR/bootstrap +--- OpenEXR/bootstrap 2015-03-31 01:02:41.000000000 -0400 ++++ OpenEXR/bootstrap 2015-03-31 01:03:35.000000000 -0400 +@@ -47,11 +47,6 @@ + fi + } + +-# Check if /usr/local/share/aclocal exists +-if [ -d /usr/local/share/aclocal ]; then +- ACLOCAL_INCLUDE="$ACLOCAL_INCLUDE -I /usr/local/share/aclocal" +-fi +- + run_cmd aclocal -I m4 $ACLOCAL_INCLUDE + run_cmd $LIBTOOLIZE --automake --copy + run_cmd automake --add-missing --copy diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index fcb27c2c0cc..63a8c11a341 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake libtool pkgconfig ]; propagatedBuildInputs = [ ilmbase zlib ]; + + patches = [ ./bootstrap.patch ]; meta = with stdenv.lib; { homepage = http://www.openexr.com/; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 45ca9cb98e8..87187667a92 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -14,8 +14,7 @@ stdenv.mkDerivation rec { sha256 = "01rdzjh68w8l5zn0648yibyarj8p6g7yfn59nw5awaz1i8dvbnqq"; }; - buildInputs = with stdenv.lib; - optional (!stdenv.isDarwin) gobjectIntrospection # build problems of itself and flex + buildInputs = with stdenv.lib; [ gobjectIntrospection ] ++ optionals stdenv.isDarwin [ fontconfig ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 2c310603b78..c79cdfd4466 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,83 +1,50 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake, libiconv, libintlOrEmpty +{ stdenv, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg -, qt4Support ? false, qt4 ? null, qt5 +, qt4Support ? false, qt4 ? null, qt5Support ? false, qt5 ? null +, utils ? false, suffix ? "glib" }: let - version = "0.28.1"; # even major numbers are stable - sha256 = "01pxjdbhvpxf00ncf8d9wxc8gkcqcxz59lwrpa151ah988inxkrc"; + version = "0.32.0"; # even major numbers are stable + sha256 = "162vfbvbz0frvqyk00ldsbl49h4bj8i8wn0ngfl30xg1lldy6qs9"; +in +stdenv.mkDerivation rec { + name = "poppler-${suffix}-${version}"; - # This is for Okular (and similar) to support subpixel rendering. - # It's kept from upstream because of political reasons. - qtcairo_patch = fetchpatch { - url = "https://github.com/giddie/poppler-qt4-cairo-backend/compare/" - + "fa1d636...b30f96c.diff"; # update to current maint...qt4-lcd - sha256 = "0g18y247k2vcz1n56rnfpy226f22v4r9c7pk8cf2h9l12vz2qxkm"; + src = fetchurl { + url = "${meta.homepage}/poppler-${version}.tar.xz"; + inherit sha256; }; - poppler_drv = nameSuff: merge: stdenv.mkDerivation (stdenv.lib.mergeAttrsByFuncDefaultsClean [ - rec { - name = "poppler-${nameSuff}-${version}"; + patches = [ ./datadir_env.patch ]; - src = fetchurl { - url = "${meta.homepage}/poppler-${version}.tar.xz"; - inherit sha256; - }; + propagatedBuildInputs = with stdenv.lib; + [ zlib cairo freetype fontconfig libjpeg lcms curl openjpeg ] + ++ optional qt4Support qt4 + ++ optional qt5Support qt5.base; - propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms curl openjpeg ]; + nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty; - nativeBuildInputs = [ pkgconfig cmake libiconv ] ++ libintlOrEmpty; + configureFlags = + [ + "--enable-xpdf-headers" + "--enable-libcurl" + "--enable-zlib" + ] + ++ stdenv.lib.optional (!utils) "--disable-utils"; - cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; + enableParallelBuilding = true; - patches = [ ./datadir_env.patch ./poppler-glib.patch ]; + meta = { + homepage = http://poppler.freedesktop.org/; + description = "A PDF rendering library"; - # XXX: The Poppler/Qt4 test suite refers to non-existent PDF files - # such as `../../../test/unittestcases/UseNone.pdf'. - #doCheck = !qt4Support; - checkTarget = "test"; - - enableParallelBuilding = true; - - meta = { - homepage = http://poppler.freedesktop.org/; - description = "A PDF rendering library"; - - longDescription = '' - Poppler is a PDF rendering library based on the xpdf-3.0 code base. - ''; - - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; - }; - } merge ]); # poppler_drv - - /* We always use cairo in poppler, so we always depend on glib, - so we always build the glib wrapper (~350kB). - We also always build the cpp wrapper (<100kB). - ToDo: around half the size could be saved by splitting out headers and tools (1.5 + 0.5 MB). - */ - - poppler_glib = poppler_drv "glib" { }; - - poppler_qt4 = poppler_drv "qt4" { - #patches = [ qtcairo_patch ]; # text rendering artifacts in recent versions - propagatedBuildInputs = [ qt4 poppler_glib ]; - NIX_LDFLAGS = "-lpoppler"; - postConfigure = '' - mkdir -p "$out/lib/pkgconfig" - install -c -m 644 poppler-qt4.pc "$out/lib/pkgconfig" - cd qt4 + longDescription = '' + Poppler is a PDF rendering library based on the xpdf-3.0 code base. ''; - }; - poppler_qt5 = poppler_drv "qt5" { - propagatedBuildInputs = [ qt5.base poppler_glib ]; - postConfigure = '' - mkdir -p "$out/lib/pkgconfig" - install -c -m 644 poppler-qt5.pc "$out/lib/pkgconfig" - cd qt5 - ''; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; }; - -in { inherit poppler_glib poppler_qt4 poppler_qt5; } // poppler_glib +} diff --git a/pkgs/development/libraries/poppler/poppler-glib.patch b/pkgs/development/libraries/poppler/poppler-glib.patch deleted file mode 100644 index 09f5a145b84..00000000000 --- a/pkgs/development/libraries/poppler/poppler-glib.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -rupN a/poppler-glib.pc.cmake b/poppler-glib.pc.cmake ---- a/poppler-glib.pc.cmake 2013-08-17 01:20:41.000000001 +0200 -+++ b/poppler-glib.pc.cmake 2014-01-01 09:30:50.000000001 +0100 -@@ -10,4 +10,4 @@ Requires: glib-2.0 >= @GLIB_REQUIRED@ go - @PC_REQUIRES_PRIVATE@ - - Libs: -L${libdir} -lpoppler-glib --Cflags: -I${includedir}/poppler/glib -+Cflags: -I${includedir}/poppler/glib -I${includedir}/poppler -diff -rupN a/poppler-glib.pc.in b/poppler-glib.pc.in ---- a/poppler-glib.pc.in 2013-08-17 01:20:41.000000001 +0200 -+++ b/poppler-glib.pc.in 2014-01-01 09:27:17.000000001 +0100 -@@ -10,4 +10,5 @@ Requires: glib-2.0 >= @GLIB_REQUIRED@ go - @PC_REQUIRES_PRIVATE@ - - Libs: -L${libdir} -lpoppler-glib --Cflags: -I${includedir}/poppler/glib -+Cflags: -I${includedir}/poppler/glib -I${includedir}/poppler -+ diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 952bdfa29ce..7890017b55b 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -1,32 +1,18 @@ -{ stdenv, fetchurl, which, qt4 }: +{ stdenv, fetchurl, cmake, pkgconfig, qt }: stdenv.mkDerivation rec { - name = "qca-2.0.3"; - + name = "qca-2.1.0"; + src = fetchurl { - url = "http://delta.affinix.com/download/qca/2.0/${name}.tar.bz2"; - sha256 = "0pw9fkjga8vxj465wswxmssxs4wj6zpxxi6kzkf4z5chyf4hr8ld"; + url = "http://delta.affinix.com/download/qca/2.0/${name}.tar.gz"; + sha256 = "114jg97fmg1rb4llfg7x7r68lxdkjrx60qsqq76khdwc2dvcsv92"; }; - - buildInputs = [ qt4 ]; - - nativeBuildInputs = [ which ]; - preBuild = - '' - sed -i include/QtCrypto/qca_publickey.h -e '/EMSA3_Raw/a,\ - EMSA3_SHA224, ///< SHA224, with EMSA3 (ie PKCS#1 Version 1.5) encoding\ - EMSA3_SHA256, ///< SHA256, with EMSA3 (ie PKCS#1 Version 1.5) encoding\ - EMSA3_SHA384, ///< SHA384, with EMSA3 (ie PKCS#1 Version 1.5) encoding\ - EMSA3_SHA512 ///< SHA512, with EMSA3 (ie PKCS#1 Version 1.5) encoding' - ''; - - patches = [ ./gcc47.patch ]; - - configureFlags = "--no-separate-debug-info"; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ qt ]; enableParallelBuilding = true; - + meta = with stdenv.lib; { description = "Qt Cryptographic Architecture"; license = "LGPL"; diff --git a/pkgs/development/libraries/qca2/gcc47.patch b/pkgs/development/libraries/qca2/gcc47.patch deleted file mode 100644 index 08711884a57..00000000000 --- a/pkgs/development/libraries/qca2/gcc47.patch +++ /dev/null @@ -1,12 +0,0 @@ -# Thanks to http://lists.pld-linux.org/mailman/pipermail/pld-cvs-commit/Week-of-Mon-20120917/347917.html ---- qca-2.0.3/src/botantools/botan/botan/secmem.h.orig 2007-04-19 23:26:13.000000000 +0200 -+++ qca-2.0.3/src/botantools/botan/botan/secmem.h 2012-09-16 23:28:43.767480490 +0200 -@@ -214,7 +214,7 @@ - - SecureVector(u32bit n = 0) { MemoryRegion::init(true, n); } - SecureVector(const T in[], u32bit n) -- { MemoryRegion::init(true); set(in, n); } -+ { MemoryRegion::init(true); this->set(in, n); } - SecureVector(const MemoryRegion& in) - { MemoryRegion::init(true); set(in); } - SecureVector(const MemoryRegion& in1, const MemoryRegion& in2) diff --git a/pkgs/development/libraries/qca2/ossl.nix b/pkgs/development/libraries/qca2/ossl.nix deleted file mode 100644 index d2b8778aa14..00000000000 --- a/pkgs/development/libraries/qca2/ossl.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, fetchurl, fetchgit, qt4, qca2, openssl, which}: - -stdenv.mkDerivation rec { - version = "2.0.0-beta3"; - name = "qca-ossl-${version}"; - src = fetchurl { - url = "http://delta.affinix.com/download/qca/2.0/plugins/${name}.tar.bz2"; - sha256 = "0yy68racvx3clybry2i1bw5bz9yhxr40p3xqagxxb15ihvsrzq08"; - }; - # SVN version has stabilized and has a lot of fixes for fresh OpenSSL - # Take the main source from there - git_src = fetchgit { - url = git://anongit.kde.org/qca; - rev = "0a8b9db6613f2282fe492ff454412f502a6be410"; - sha256 = "1ebb97092f21b9152c6dda56cb33795bea4e83c82800848e800ddaaaf23a31e1"; - }; - buildInputs = [ qt4 qca2 openssl ]; - nativeBuildInputs = [ which ]; - dontAddPrefix = true; - configureFlags="--no-separate-debug-info --with-qca=${qca2} - --with-openssl-inc=${openssl}/include --with-openssl-lib=${openssl}/lib"; - preConfigure='' - cp ${git_src}/plugins/qca-ossl/qca-ossl.cpp . - - configureFlags="$configureFlags --plugins-path=$out/lib/qt4/plugins" - ''; - meta = with stdenv.lib; { - description = "Qt Cryptographic Architecture OpenSSL plugin"; - license = "LGPL"; - homepage = http://delta.affinix.com/qca; - maintainers = [ maintainers.urkud ]; - }; -} diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 432b4358f7a..ffad4418815 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { -I${randrproto}/include" else "-no-xrandr"} ${if xineramaSupport then "-xinerama -L${libXinerama}/lib -I${libXinerama}/include" else "-no-xinerama"} ${if cursorSupport then "-L${libXcursor}/lib -I${libXcursor}/include" else ""} - ${if mysqlSupport then "-qt-sql-mysql -L${mysql}/lib/mysql -I${mysql}/include/mysql" else ""} + ${if mysqlSupport then "-qt-sql-mysql -L${mysql.lib}/lib/mysql -I${mysql.lib}/include/mysql" else ""} ${if xftSupport then "-xft -L${libXft}/lib -I${libXft}/include -L${libXft.freetype}/lib -I${libXft.freetype}/include diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index a8d8beb4145..06ff3fe66d4 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { # The following libraries are only used in plugins buildInputs = [ cups # Qt dlopen's libcups instead of linking to it - mysql postgresql sqlite libjpeg libmng libtiff icu ] + mysql.lib postgresql sqlite libjpeg libmng libtiff icu ] ++ optionals gtkStyle [ gtk gdk_pixbuf ]; nativeBuildInputs = [ perl pkgconfig which ]; diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix index 98fd20c44c0..d7ae685af6d 100644 --- a/pkgs/development/libraries/qt-5/5.3/default.nix +++ b/pkgs/development/libraries/qt-5/5.3/default.nix @@ -153,7 +153,7 @@ stdenv.mkDerivation rec { # doesn't remain a runtime-dep if not used ++ optionals mesaSupported [ mesa mesa_glu ] ++ optional (cups != null) cups - ++ optional (mysql != null) mysql + ++ optional (mysql != null) mysql.lib ++ optional (postgresql != null) postgresql; buildInputs = [ gdb bison flex gperf ruby ]; diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix index 45de927bc8d..bc342f605bc 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix @@ -148,7 +148,7 @@ stdenv.mkDerivation { # doesn't remain a runtime-dep if not used ++ optionals mesaSupported [ mesa mesa_glu ] ++ optional (cups != null) cups - ++ optional (mysql != null) mysql + ++ optional (mysql != null) mysql.lib ++ optional (postgresql != null) postgresql; buildInputs = [ gdb bison flex gperf ruby ]; diff --git a/pkgs/development/libraries/sfsexp/default.nix b/pkgs/development/libraries/sfsexp/default.nix new file mode 100644 index 00000000000..57124f575a1 --- /dev/null +++ b/pkgs/development/libraries/sfsexp/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "sfsexp-${version}"; + version = "1.3"; + + src = fetchurl { + url = "mirror://sourceforge/sexpr/sexpr-${version}.tar.gz"; + sha256 = "18gdwxjja0ip378hlzs8sp7q2g6hrmy7x10yf2wnxfmmylbpqn8k"; + }; + + meta = with stdenv.lib; { + description = "Small, fast s-expression library"; + homepage = "http://sexpr.sourceforge.net/"; + maintainers = with maintainers; [ jb55 ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index 67c1c74e6cf..fa1d4f4f984 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -2,7 +2,7 @@ let - version = "2.2.0.0"; + version = "2.3.2.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/skalibs"; rev = "refs/tags/v${version}"; - sha256 = "1ww45ygrws7h3p3p7y3blc5kzvvy5fmzb158ngfbdamf0pgc5vkn"; + sha256 = "1l7f2zmas0w28j19g46bvm13j3cx7jimxifivd04zz5r7g79ik5a"; }; dontDisableStatic = true; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 9aad51f9fad..d9f52d8d87c 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace" ]; + postInstall = '' + ar qf $out/lib/libtalloc.a bin/default/talloc_5.o + ''; + meta = with stdenv.lib; { description = "Hierarchical pool based memory allocator with destructors"; homepage = http://tdb.samba.org/; diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 8c9b6f0e1b3..55438e2c201 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { homepage = "http://sourceforge.net/projects/libtirpc/"; description = "The transport-independent Sun RPC implementation (TI-RPC)"; license = licenses.bsd3; + platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; longDescription = '' Currently, NFS commands use the SunRPC routines provided by the diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 03769815a3e..74a14231801 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -64,8 +64,8 @@ args : with args; md5 = "a484f590464fb823a8f821b2f1fd7fef"; }; configureFlags = "--disable-gui" - + " --with-mysql-path=${mysql} --with-unixODBC=${unixODBC}"; - buildInputs = [libtool zlib]; + + " --with-mysql-path=${mysql.lib} --with-unixODBC=${unixODBC}"; + buildInputs = [ libtool zlib ]; inherit mysql unixODBC; }; ini = diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 064ea840e26..e423344fb16 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -193,7 +193,7 @@ let lispPackages = rec { version = "git-20141112"; description = "Common Lisp SQL Interface library"; deps = [uffi]; - buildInputs = [pkgs.mysql pkgs.zlib]; + buildInputs = [pkgs.mysql.lib pkgs.zlib]; # Source type: git src = pkgs.fetchgit { url = ''http://git.b9.com/clsql.git''; @@ -202,8 +202,8 @@ let lispPackages = rec { }; overrides = x:{ preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql}/include/mysql" - export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql}/lib/mysql" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.lib}/include/mysql" + export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.lib}/lib/mysql" ''; }; }; diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix index 8c3c4275837..2fbbabfd36b 100644 --- a/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { createFindlibDestdir = true; + preInstall = "make doc"; + meta = { homepage = https://forge.ocamlcore.org/projects/ocaml-fileutils/; platforms = ocaml.meta.platforms; diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index 0ae60ab07e4..4ffef60c4bf 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation { "--libdir=$out/lib/ocaml/${ocaml_version}/site-lib/mysql" ]; - buildInputs = [ocaml findlib mysql]; + buildInputs = [ocaml findlib mysql.lib ]; createFindlibDestdir = true; - propagatedbuildInputs = [mysql]; + propagatedbuildInputs = [ mysql.lib ]; preConfigure = '' - export LDFLAGS="-L${mysql}/lib/mysql" + export LDFLAGS="-L${mysql.lib}/lib/mysql" ''; buildPhase = '' diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix index 92b70a8cd1b..ba0ce29bdf9 100644 --- a/pkgs/development/ocaml-modules/ounit/default.nix +++ b/pkgs/development/ocaml-modules/ounit/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = http://www.xs4all.nl/~mmzeeman/ocaml/; + homepage = http://ounit.forge.ocamlcore.org/; description = "Unit test framework for OCaml"; license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; diff --git a/pkgs/development/ocaml-modules/stringext/default.nix b/pkgs/development/ocaml-modules/stringext/default.nix index dde2b0ebe45..dae947035d2 100644 --- a/pkgs/development/ocaml-modules/stringext/default.nix +++ b/pkgs/development/ocaml-modules/stringext/default.nix @@ -1,14 +1,13 @@ -{ stdenv, fetchgit, ocaml, findlib }: +{ stdenv, fetchzip, ocaml, findlib }: -let version = "1.2.0"; in +let version = "1.3.0"; in stdenv.mkDerivation { name = "ocaml-stringext-${version}"; - src = fetchgit { - url = https://github.com/rgrinberg/stringext.git; - rev = "refs/tags/v${version}"; - sha256 = "04ixh33225n2fyc0i35pk7h9shxfdg9grhvkxy086zppki3a3vc6"; + src = fetchzip { + url = "https://github.com/rgrinberg/stringext/archive/v${version}.tar.gz"; + sha256 = "0sd1chyxclmip0nxqhasp1ri91bwxr8nszkkr5kpja45f6bav6k9"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix index a7464893cbb..273cc0e44f2 100644 --- a/pkgs/development/perl-modules/DBD-mysql/default.nix +++ b/pkgs/development/perl-modules/DBD-mysql/default.nix @@ -1,15 +1,17 @@ -{fetchurl, buildPerlPackage, DBI, mysql}: +{ fetchurl, buildPerlPackage, DBI, mysql }: -buildPerlPackage { - name = "DBD-mysql-4.023"; +buildPerlPackage rec { + name = "DBD-mysql-4.031"; src = fetchurl { - url = mirror://cpan/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.023.tar.gz; - sha256 = "0j4i0i6apjwx5klk3wigh6yysssn7bs6p8c5sh31m6qxsbgyk9xa"; + url = "mirror://cpan/authors/id/C/CA/CAPTTOFU/${name}.tar.gz"; + sha256 = "1lngnkfi71gcpfk93xhil2x9i3w3rqjpxlvn5n92jd5ikwry8bmf"; }; - buildInputs = [mysql] ; - propagatedBuildInputs = [DBI]; + buildInputs = [ mysql.lib ] ; + propagatedBuildInputs = [ DBI ]; + + doCheck = false; # makeMakerFlags = "MYSQL_HOME=${mysql}"; } diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index e647dfc809f..aa5deb6d6db 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { homepage = http://graph-tool.skewed.de/; license = licenses.gpl3; platforms = platforms.all; + maintainer = [ stdenv.lib.maintainers.joelmo ]; }; src = fetchurl { diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 818cdcb3376..c3572bfd0a0 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -278,7 +278,7 @@ let rmatio = [ pkgs.zlib ]; Rmpfr = [ pkgs.gmp pkgs.mpfr ]; Rmpi = [ pkgs.openmpi ]; - RMySQL = [ pkgs.zlib pkgs.mysql ]; + RMySQL = [ pkgs.zlib pkgs.mysql.lib ]; RNetCDF = [ pkgs.netcdf pkgs.udunits ]; RODBCext = [ pkgs.libiodbc ]; RODBC = [ pkgs.libiodbc ]; @@ -1011,7 +1011,7 @@ let RMySQL = old.RMySQL.overrideDerivation (attrs: { patches = [ ./patches/RMySQL.patch ]; - MYSQL_DIR="${pkgs.mysql}"; + MYSQL_DIR="${pkgs.mysql.lib}"; }); devEMF = old.devEMF.overrideDerivation (attrs: { diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index a4004f7cb8a..770162c237e 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -12,16 +12,22 @@ stdenv.mkDerivation { sha256 = "1b0f4wm1qmgcswmixv9mwbp86hbdqxk754hml8cjv5vajvqwdpzv"; }; - sourceRoot = "astyle/build/gcc"; + sourceRoot = if (stdenv.cc.cc.isClang or false) + then "astyle/build/clang" + else "astyle/build/gcc"; + + # -s option is obsolete on Darwin and breaks build + postPatch = if stdenv.isDarwin then '' + substituteInPlace Makefile --replace "LDFLAGSr = -s" "LDFLAGSr =" + '' else null; installFlags = "INSTALL=install prefix=$$out"; meta = { homepage = "http://astyle.sourceforge.net/"; description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java"; - license = "LGPL"; - - platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix index ffa56aaa9a0..a6ea7ed766e 100644 --- a/pkgs/development/tools/misc/cl-launch/default.nix +++ b/pkgs/development/tools/misc/cl-launch/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="cl-launch"; - version="4.1.1"; + version="4.1.2"; name="${baseName}-${version}"; - hash="1nimbv1ms7fcikx8y6dxrzdm63psf4882z5kjr6qdyarqz6gaq20"; - url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.1.tar.gz"; - sha256="1nimbv1ms7fcikx8y6dxrzdm63psf4882z5kjr6qdyarqz6gaq20"; + hash="13fgcvg71s1yp3r7jf1cs3kkpfw0pwykgmj7zryh24mw2269rx90"; + url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.2.tar.gz"; + sha256="13fgcvg71s1yp3r7jf1cs3kkpfw0pwykgmj7zryh24mw2269rx90"; }; buildInputs = [ ]; diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index e6169c48a44..01d75a5bb01 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, stdenv, libtool, ncurses }: +{ fetchurl, stdenv, libtool, ncurses, ctags, sqlite +, pythonPackages, makeWrapper }: stdenv.mkDerivation rec { name = "global-6.3.4"; @@ -8,19 +9,27 @@ stdenv.mkDerivation rec { sha256 = "0hcplcayyjf42d8ygzla6142b5dq4ybq4wg3n3cgx3b5yfhvic85"; }; - buildInputs = [ libtool ncurses ]; + buildInputs = [ libtool ncurses makeWrapper ]; + propagatedBuildInputs = [ pythonPackages.pygments ]; configurePhase = '' ./configure --prefix="$out" --disable-static '' + ''--with-posix-sort=$(type -p sort) '' + ''--with-ltdl-include=${libtool}/include --with-ltdl-lib=${libtool}/lib '' - + ''--with-ncurses=${ncurses}''; + + ''--with-ncurses=${ncurses} '' + + ''--with-sqlite3=${sqlite} '' + + ''--with-exuberant-ctags=${ctags}/bin/ctags''; doCheck = true; postInstall = '' mkdir -p "$out/share/emacs/site-lisp" cp -v *.el "$out/share/emacs/site-lisp" + + wrapProgram $out/bin/gtags \ + --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})" + wrapProgram $out/bin/global \ + --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index a434e54bba9..c1ab6ebe074 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurlGnome, pkgconfig, glib, bison, flex }: +{ stdenv, fetchurl, pkgconfig, glib, bison, flex }: stdenv.mkDerivation rec { - name = src.pkgname; + name = "gob2-${minVer}.18"; + minVer = "2.0"; - src = fetchurlGnome { - project = "gob2"; - major = "2"; minor = "0"; patchlevel = "18"; extension = "gz"; + src = fetchurl { + url = "mirror://gnome/sources/gob2/${minVer}/${name}.tar.gz"; sha256 = "1r242s3rsxyqiw2ic2gdpvvrx903jgjd1aa4mkl26in5k9zk76fa"; }; diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index c9bb661935a..40b7ea3b578 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="intltool"; - version="0.50.2"; - name="intltool-0.50.2"; - hash="01j4yd7i84n9nk4ccs6yifg84pp68nr9by57jdbhj7dpdxf5rwk7"; - url="https://launchpad.net/intltool/trunk/0.50.2/+download/intltool-0.50.2.tar.gz"; - sha256="01j4yd7i84n9nk4ccs6yifg84pp68nr9by57jdbhj7dpdxf5rwk7"; + version="0.51.0"; + name="${baseName}-${version}"; + hash="1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7"; + url="https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz"; + sha256="1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7"; }; propagatedBuildInputs = [perl perlXMLParser]; buildInputs = []; diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 1b4cab361ce..e4c2b474d46 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -2,11 +2,14 @@ stdenv.mkDerivation rec { name = "sysbench-0.4.12"; - buildInputs = [ autoreconfHook mysql libxslt zlib ]; + + buildInputs = [ autoreconfHook mysql.lib libxslt zlib ]; + src = fetchurl { url = mirror://sourceforge/sysbench/sysbench-0.4.12.tar.gz; sha256 = "17pa4cw7wxvlb4mba943lfs3b3jdi64mlnaf4n8jq09y35j79yl3"; }; + preAutoreconf = '' touch NEWS AUTHORS ''; diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 27e59af34fc..f4add9a4b9e 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"; homepage = http://uncrustify.sourceforge.net/; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index 9f02b10c898..ce9941b2362 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "re2c-${version}"; - version = "0.14.1"; + version = "0.14.2"; src = fetchurl { url = "mirror://sourceforge/re2c/re2c/${version}/${name}.tar.gz"; - sha256 = "0xfskwzr6n94sa22m24x7z051qfbb9d6k4dipcv95s8j8zq74dcv"; + sha256 = "0c0w5w1dp9v9d0a6smjbnk6zvfs77fx1xd7damap3x3sjxiyn0m7"; }; meta = { diff --git a/pkgs/development/tools/sloc/default.nix b/pkgs/development/tools/sloc/default.nix deleted file mode 100644 index 6cc7ed8c299..00000000000 --- a/pkgs/development/tools/sloc/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ pkgs }: - -let - nodePackages = import { - inherit pkgs; - inherit (pkgs) stdenv nodejs fetchurl fetchgit; - neededNatives = [ pkgs.python ] ++ pkgs.lib.optional pkgs.stdenv.isLinux pkgs.utillinux; - self = nodePackages; - generated = ./package.nix; - }; - -in rec { - - build = nodePackages.buildNodePackage { - name = "sloc-0.1.6"; - src = [ - (pkgs.fetchgit { - url = "https://github.com/flosse/sloc.git"; - sha256 = "0064va0cd4604vqp8y8ggm33klp2xgqmgrwk9ilp7230x27wykyf"; - rev = "refs/tags/v0.1.6"; - }) - ]; - buildInputs = [ nodePackages.coffee-script ]; - postInstall = '' - coffee -o $out/lib/node_modules/sloc/lib/ -c $src/src/ - ''; - deps = [ nodePackages.commander nodePackages.async nodePackages.cli-table nodePackages.readdirp ]; - passthru.names = [ "sloc" ]; - }; -} diff --git a/pkgs/development/tools/sloc/package.nix b/pkgs/development/tools/sloc/package.nix deleted file mode 100644 index 36a4fee1358..00000000000 --- a/pkgs/development/tools/sloc/package.nix +++ /dev/null @@ -1,614 +0,0 @@ -{ self, fetchurl, fetchgit ? null, lib }: - -{ - by-spec."assertion-error"."1.0.0" = - self.by-version."assertion-error"."1.0.0"; - by-version."assertion-error"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-assertion-error-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz"; - name = "assertion-error-1.0.0.tgz"; - sha1 = "c7f85438fdd466bc7ca16ab90c81513797a5d23b"; - }) - ]; - buildInputs = - (self.nativeDeps."assertion-error" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "assertion-error" ]; - }; - by-spec."async"."~0.9.0" = - self.by-version."async"."0.9.0"; - by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage { - name = "node-async-0.9.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz"; - name = "async-0.9.0.tgz"; - sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7"; - }) - ]; - buildInputs = - (self.nativeDeps."async" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; - }; - "async" = self.by-version."async"."0.9.0"; - by-spec."chai"."~1.9.1" = - self.by-version."chai"."1.9.1"; - by-version."chai"."1.9.1" = lib.makeOverridable self.buildNodePackage { - name = "node-chai-1.9.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/chai/-/chai-1.9.1.tgz"; - name = "chai-1.9.1.tgz"; - sha1 = "3711bb6706e1568f34c0b36098bf8f19455c81ae"; - }) - ]; - buildInputs = - (self.nativeDeps."chai" or []); - deps = [ - self.by-version."assertion-error"."1.0.0" - self.by-version."deep-eql"."0.1.3" - ]; - peerDependencies = [ - ]; - passthru.names = [ "chai" ]; - }; - "chai" = self.by-version."chai"."1.9.1"; - by-spec."cli-table"."^0.3.0" = - self.by-version."cli-table"."0.3.0"; - by-version."cli-table"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-cli-table-0.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cli-table/-/cli-table-0.3.0.tgz"; - name = "cli-table-0.3.0.tgz"; - sha1 = "44a43c2641667701e084202bff7aa934128aa13e"; - }) - ]; - buildInputs = - (self.nativeDeps."cli-table" or []); - deps = [ - self.by-version."colors"."0.6.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "cli-table" ]; - }; - "cli-table" = self.by-version."cli-table"."0.3.0"; - by-spec."coffee-script"."~1.8.0" = - self.by-version."coffee-script"."1.8.0"; - by-version."coffee-script"."1.8.0" = lib.makeOverridable self.buildNodePackage { - name = "coffee-script-1.8.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz"; - name = "coffee-script-1.8.0.tgz"; - sha1 = "9c9f1d2b4a52a000ded15b659791703648263c1d"; - }) - ]; - buildInputs = - (self.nativeDeps."coffee-script" or []); - deps = [ - self.by-version."mkdirp"."0.3.5" - ]; - peerDependencies = [ - ]; - passthru.names = [ "coffee-script" ]; - }; - "coffee-script" = self.by-version."coffee-script"."1.8.0"; - by-spec."colors"."0.6.2" = - self.by-version."colors"."0.6.2"; - by-version."colors"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "node-colors-0.6.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; - name = "colors-0.6.2.tgz"; - sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; - }) - ]; - buildInputs = - (self.nativeDeps."colors" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "colors" ]; - }; - by-spec."commander"."0.6.1" = - self.by-version."commander"."0.6.1"; - by-version."commander"."0.6.1" = lib.makeOverridable self.buildNodePackage { - name = "node-commander-0.6.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; - name = "commander-0.6.1.tgz"; - sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; - }) - ]; - buildInputs = - (self.nativeDeps."commander" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "commander" ]; - }; - by-spec."commander"."2.0.0" = - self.by-version."commander"."2.0.0"; - by-version."commander"."2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-commander-2.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz"; - name = "commander-2.0.0.tgz"; - sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928"; - }) - ]; - buildInputs = - (self.nativeDeps."commander" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "commander" ]; - }; - by-spec."commander"."~2.3.0" = - self.by-version."commander"."2.3.0"; - by-version."commander"."2.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-commander-2.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz"; - name = "commander-2.3.0.tgz"; - sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873"; - }) - ]; - buildInputs = - (self.nativeDeps."commander" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "commander" ]; - }; - "commander" = self.by-version."commander"."2.3.0"; - by-spec."core-util-is"."~1.0.0" = - self.by-version."core-util-is"."1.0.1"; - by-version."core-util-is"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-core-util-is-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"; - name = "core-util-is-1.0.1.tgz"; - sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538"; - }) - ]; - buildInputs = - (self.nativeDeps."core-util-is" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "core-util-is" ]; - }; - by-spec."debug"."*" = - self.by-version."debug"."2.0.0"; - by-version."debug"."2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-debug-2.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz"; - name = "debug-2.0.0.tgz"; - sha1 = "89bd9df6732b51256bc6705342bba02ed12131ef"; - }) - ]; - buildInputs = - (self.nativeDeps."debug" or []); - deps = [ - self.by-version."ms"."0.6.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "debug" ]; - }; - by-spec."deep-eql"."0.1.3" = - self.by-version."deep-eql"."0.1.3"; - by-version."deep-eql"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-deep-eql-0.1.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz"; - name = "deep-eql-0.1.3.tgz"; - sha1 = "ef558acab8de25206cd713906d74e56930eb69f2"; - }) - ]; - buildInputs = - (self.nativeDeps."deep-eql" or []); - deps = [ - self.by-version."type-detect"."0.1.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "deep-eql" ]; - }; - by-spec."diff"."1.0.7" = - self.by-version."diff"."1.0.7"; - by-version."diff"."1.0.7" = lib.makeOverridable self.buildNodePackage { - name = "node-diff-1.0.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/diff/-/diff-1.0.7.tgz"; - name = "diff-1.0.7.tgz"; - sha1 = "24bbb001c4a7d5522169e7cabdb2c2814ed91cf4"; - }) - ]; - buildInputs = - (self.nativeDeps."diff" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "diff" ]; - }; - by-spec."glob"."3.2.3" = - self.by-version."glob"."3.2.3"; - by-version."glob"."3.2.3" = lib.makeOverridable self.buildNodePackage { - name = "node-glob-3.2.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz"; - name = "glob-3.2.3.tgz"; - sha1 = "e313eeb249c7affaa5c475286b0e115b59839467"; - }) - ]; - buildInputs = - (self.nativeDeps."glob" or []); - deps = [ - self.by-version."minimatch"."0.2.14" - self.by-version."graceful-fs"."2.0.3" - self.by-version."inherits"."2.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "glob" ]; - }; - by-spec."graceful-fs"."~2.0.0" = - self.by-version."graceful-fs"."2.0.3"; - by-version."graceful-fs"."2.0.3" = lib.makeOverridable self.buildNodePackage { - name = "node-graceful-fs-2.0.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"; - name = "graceful-fs-2.0.3.tgz"; - sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"; - }) - ]; - buildInputs = - (self.nativeDeps."graceful-fs" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "graceful-fs" ]; - }; - by-spec."growl"."1.8.x" = - self.by-version."growl"."1.8.1"; - by-version."growl"."1.8.1" = lib.makeOverridable self.buildNodePackage { - name = "node-growl-1.8.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/growl/-/growl-1.8.1.tgz"; - name = "growl-1.8.1.tgz"; - sha1 = "4b2dec8d907e93db336624dcec0183502f8c9428"; - }) - ]; - buildInputs = - (self.nativeDeps."growl" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "growl" ]; - }; - by-spec."inherits"."2" = - self.by-version."inherits"."2.0.1"; - by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-inherits-2.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - name = "inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; - }) - ]; - buildInputs = - (self.nativeDeps."inherits" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "inherits" ]; - }; - by-spec."inherits"."~2.0.1" = - self.by-version."inherits"."2.0.1"; - by-spec."isarray"."0.0.1" = - self.by-version."isarray"."0.0.1"; - by-version."isarray"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-isarray-0.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - name = "isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }) - ]; - buildInputs = - (self.nativeDeps."isarray" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "isarray" ]; - }; - by-spec."jade"."0.26.3" = - self.by-version."jade"."0.26.3"; - by-version."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage { - name = "jade-0.26.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/jade/-/jade-0.26.3.tgz"; - name = "jade-0.26.3.tgz"; - sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c"; - }) - ]; - buildInputs = - (self.nativeDeps."jade" or []); - deps = [ - self.by-version."commander"."0.6.1" - self.by-version."mkdirp"."0.3.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "jade" ]; - }; - by-spec."lru-cache"."2" = - self.by-version."lru-cache"."2.5.0"; - by-version."lru-cache"."2.5.0" = lib.makeOverridable self.buildNodePackage { - name = "node-lru-cache-2.5.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"; - name = "lru-cache-2.5.0.tgz"; - sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb"; - }) - ]; - buildInputs = - (self.nativeDeps."lru-cache" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "lru-cache" ]; - }; - by-spec."minimatch"."~0.2.11" = - self.by-version."minimatch"."0.2.14"; - by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage { - name = "node-minimatch-0.2.14"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; - name = "minimatch-0.2.14.tgz"; - sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; - }) - ]; - buildInputs = - (self.nativeDeps."minimatch" or []); - deps = [ - self.by-version."lru-cache"."2.5.0" - self.by-version."sigmund"."1.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimatch" ]; - }; - by-spec."minimatch"."~0.2.12" = - self.by-version."minimatch"."0.2.14"; - by-spec."mkdirp"."0.3.0" = - self.by-version."mkdirp"."0.3.0"; - by-version."mkdirp"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-mkdirp-0.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; - name = "mkdirp-0.3.0.tgz"; - sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; - }) - ]; - buildInputs = - (self.nativeDeps."mkdirp" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mkdirp" ]; - }; - by-spec."mkdirp"."0.3.5" = - self.by-version."mkdirp"."0.3.5"; - by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "node-mkdirp-0.3.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - name = "mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }) - ]; - buildInputs = - (self.nativeDeps."mkdirp" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mkdirp" ]; - }; - by-spec."mkdirp"."~0.3.5" = - self.by-version."mkdirp"."0.3.5"; - by-spec."mocha"."~1.21.4" = - self.by-version."mocha"."1.21.4"; - by-version."mocha"."1.21.4" = lib.makeOverridable self.buildNodePackage { - name = "mocha-1.21.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mocha/-/mocha-1.21.4.tgz"; - name = "mocha-1.21.4.tgz"; - sha1 = "e77d69c3773ba3e2b4fe6b628c28b5dd43880adc"; - }) - ]; - buildInputs = - (self.nativeDeps."mocha" or []); - deps = [ - self.by-version."commander"."2.0.0" - self.by-version."growl"."1.8.1" - self.by-version."jade"."0.26.3" - self.by-version."diff"."1.0.7" - self.by-version."debug"."2.0.0" - self.by-version."mkdirp"."0.3.5" - self.by-version."glob"."3.2.3" - ]; - peerDependencies = [ - ]; - passthru.names = [ "mocha" ]; - }; - "mocha" = self.by-version."mocha"."1.21.4"; - by-spec."ms"."0.6.2" = - self.by-version."ms"."0.6.2"; - by-version."ms"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "node-ms-0.6.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; - name = "ms-0.6.2.tgz"; - sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; - }) - ]; - buildInputs = - (self.nativeDeps."ms" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "ms" ]; - }; - by-spec."readable-stream"."~1.0.26-2" = - self.by-version."readable-stream"."1.0.31"; - by-version."readable-stream"."1.0.31" = lib.makeOverridable self.buildNodePackage { - name = "node-readable-stream-1.0.31"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz"; - name = "readable-stream-1.0.31.tgz"; - sha1 = "8f2502e0bc9e3b0da1b94520aabb4e2603ecafae"; - }) - ]; - buildInputs = - (self.nativeDeps."readable-stream" or []); - deps = [ - self.by-version."core-util-is"."1.0.1" - self.by-version."isarray"."0.0.1" - self.by-version."string_decoder"."0.10.31" - self.by-version."inherits"."2.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "readable-stream" ]; - }; - by-spec."readdirp"."^1.1.0" = - self.by-version."readdirp"."1.1.0"; - by-version."readdirp"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-readdirp-1.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/readdirp/-/readdirp-1.1.0.tgz"; - name = "readdirp-1.1.0.tgz"; - sha1 = "6506f9d5d8bb2edc19c855a60bb92feca5fae39c"; - }) - ]; - buildInputs = - (self.nativeDeps."readdirp" or []); - deps = [ - self.by-version."graceful-fs"."2.0.3" - self.by-version."minimatch"."0.2.14" - self.by-version."readable-stream"."1.0.31" - ]; - peerDependencies = [ - ]; - passthru.names = [ "readdirp" ]; - }; - "readdirp" = self.by-version."readdirp"."1.1.0"; - by-spec."sigmund"."~1.0.0" = - self.by-version."sigmund"."1.0.0"; - by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-sigmund-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"; - name = "sigmund-1.0.0.tgz"; - sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296"; - }) - ]; - buildInputs = - (self.nativeDeps."sigmund" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "sigmund" ]; - }; - by-spec."string_decoder"."~0.10.x" = - self.by-version."string_decoder"."0.10.31"; - by-version."string_decoder"."0.10.31" = lib.makeOverridable self.buildNodePackage { - name = "node-string_decoder-0.10.31"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - name = "string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }) - ]; - buildInputs = - (self.nativeDeps."string_decoder" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "string_decoder" ]; - }; - by-spec."type-detect"."0.1.1" = - self.by-version."type-detect"."0.1.1"; - by-version."type-detect"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-type-detect-0.1.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz"; - name = "type-detect-0.1.1.tgz"; - sha1 = "0ba5ec2a885640e470ea4e8505971900dac58822"; - }) - ]; - buildInputs = - (self.nativeDeps."type-detect" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "type-detect" ]; - }; -} diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 7b153eab869..e99df5e6c74 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses -, dejavu_fonts, libpng, SDL, SDL_image, mesa, freetype +, dejavu_fonts, libpng, SDL2, SDL2_image, mesa, freetype , tileMode ? true }: @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { # Still unstable with luajit buildInputs = [ lua5_1 zlib sqlite ncurses ] ++ stdenv.lib.optionals tileMode - [ libpng SDL SDL_image freetype mesa ]; + [ libpng SDL2 SDL2_image freetype mesa ]; preBuild = '' cd crawl-ref/source echo "${version}" > util/release_ver # Related to issue #1963 sed -i 's/-fuse-ld=gold//g' Makefile - for i in util/*.pl; do + for i in util/*; do patchShebangs $i done patchShebangs util/gen-mi-enum diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index f19596789ce..6c53bc3fdb3 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -7,10 +7,12 @@ let src = fetchgit { url = "https://github.com/celeron55/minetest.git"; rev = "ab06fca4bed26f3dc97d5e5cff437d075d7acff8"; + sha256 = "033gajwxgs8dqxb8684waaav28s0qd6cd4rlzfldwgdbkwam9cb1"; }; data = fetchgit { url = "https://github.com/celeron55/minetest_game.git"; rev = "3928eccf74af0288d12ffb14f8222fae479bc06b"; + sha256 = "1gw2267bnqwfpnm7iq014y1vkb1v3nhpg1dmg9vgm9z5yja2blif"; }; }; in stdenv.mkDerivation { diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index 0b344873734..0d55f1cd13e 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { sourceRoot=`pwd`/src ''; - buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql + buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql.lib makeWrapper ]; - NIX_LDFLAGS="-L${mysql}/lib/mysql"; + NIX_LDFLAGS="-L${mysql.lib}/lib/mysql"; installPhase = '' mkdir -p $out/bin $out/share/zod diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index 1a249cc6a2c..fc297ca9553 100644 --- a/pkgs/misc/apulse/default.nix +++ b/pkgs/misc/apulse/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "apulse-${version}"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "i-rinat"; repo = "apulse"; rev = "v${version}"; - sha256 = "115z5a0n8lkcqfgz0cgvjw3p7d0nvzfxzd9g0h137ziflyx3ysh1"; + sha256 = "0b384dr415flxk3n4abfwfljlh7vvr1g9gad15zc5fgbyxsinv12"; }; buildInputs = diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index d2170cfc332..e62cfcff832 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,11 +1,8 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl -, dbus, acl, gmp -, libusb ? null, gnutls ? null, avahi ? null, libpaper ? null -}: +, dbus, libusb, acl, gmp }: -let version = "2.0.2"; in +let version = "1.7.5"; in -with stdenv.lib; stdenv.mkDerivation { name = "cups-${version}"; @@ -13,27 +10,15 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2"; - sha256 = "12xild9nrhqnrzx8zqh78v3chm4mpp5gf5iamr0h9zb6dgvj11w5"; + sha256 = "00mx4rpiqw9cwx46bd3hd5lcgmcxy63zfnmkr02smanv8xl4rjqq"; }; - buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ] + buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ] ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ; propagatedBuildInputs = [ openssl gmp ]; - configureFlags = [ - "--localstatedir=/var" - "--sysconfdir=/etc" - "--with-systemd=\${out}/lib/systemd/system" - "--enable-raw-printing" - "--enable-threads" - ] ++ optionals stdenv.isLinux [ - "--enable-dbus" - "--enable-pam" - ] ++ optional (libusb != null) "--enable-libusb" - ++ optional (gnutls != null) "--enable-ssl" - ++ optional (avahi != null) "--enable-avahi" - ++ optional (libpaper != null) "--enable-libpaper"; + configureFlags = "--localstatedir=/var --sysconfdir=/etc --enable-dbus"; # --with-dbusdir installFlags = [ # Don't try to write in /var at build time. diff --git a/pkgs/misc/cups/drivers/samsung/builder.sh b/pkgs/misc/cups/drivers/samsung/builder.sh index db54d8a6c93..f750df6e506 100644 --- a/pkgs/misc/cups/drivers/samsung/builder.sh +++ b/pkgs/misc/cups/drivers/samsung/builder.sh @@ -1,15 +1,14 @@ source $stdenv/setup arch=$(uname -m) -# replace i[3456]86 with i386 -echo arch | egrep -q '^i[3456]86$' && arch=i386 -arch=i386 +echo "$arch" | egrep -q '^i[3456]86$' && arch=i386 +echo "Installing for $arch" + unpackPhase patchPhase set -v -echo $arch cd cdroot/Linux mkdir -p $out/opt cp -r $arch/at_root/* $out @@ -18,8 +17,8 @@ cp -r $arch/at_opt/* $out/opt cp -r noarch/at_opt/* $out/opt cd $out -#test -d usr/lib64 && ln -s usr/lib64 lib || -ln -s usr/lib lib +test -d usr/lib64 && ln -s usr/lib64 lib || + ln -s usr/lib lib mkdir -p share/cups cd share/cups ln -s ../../opt/share/* . @@ -27,8 +26,9 @@ ln -s ppd model cd $out/lib/cups/filter for i in $(ls); do - echo patching $i... - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i || echo "(couldn't set interpreter)" + echo "Patching $i..." + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i || + echo "Couldn't set interpreter!" patchelf --set-rpath $cups/lib:$gcc/lib:$glibc/lib $i # This might not be necessary. done diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix index 3d111ec5942..b78104a7ddc 100644 --- a/pkgs/misc/cups/drivers/samsung/default.nix +++ b/pkgs/misc/cups/drivers/samsung/default.nix @@ -13,12 +13,15 @@ {stdenv, fetchurl, cups, gcc, ghostscript, glibc, patchelf}: -stdenv.mkDerivation rec { - name = "samsung-UnifiedLinuxDriver-0.92"; +# Do not bump lightly! Visit +# to see what will break when upgrading. Consider a new versioned attribute. +let version = "4.00.39"; in +stdenv.mkDerivation { + name = "samsung-UnifiedLinuxDriver-${version}"; src = fetchurl { - url = "http://downloadcenter.samsung.com/content/DR/200911/20091103171827750/UnifiedLinuxDriver_0.92.tar.gz"; - sha256 = "0p2am0p8xvm339mad07c4j77gz31m63z76sy6d9hgwmxy2prbqfq"; + url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz"; + sha256 = "144b4xggbzjfq7ga5nza7nra2cf6qn63z5ls7ba1jybkx1vm369k"; }; buildInputs = [ cups gcc ghostscript glibc patchelf ]; @@ -28,9 +31,10 @@ stdenv.mkDerivation rec { builder = ./builder.sh; meta = with stdenv.lib; { - description = "Samsung's Linux drivers; includes binaries without source code"; - homepage = "http://www.samsung.com/"; + description = "Samsung's Linux printing drivers; includes binaries without source code"; + homepage = http://www.samsung.com/; license = licenses.unfree; platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 524662a0ee6..269f0df1090 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cups, poppler, fontconfig +{ stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig , libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash }: stdenv.mkDerivation rec { @@ -10,8 +10,22 @@ stdenv.mkDerivation rec { sha256 = "1bq48nnrarlbf6qc93bz1n5wlh6j420gppbck3r45sinwhz5wa7m"; }; + patches = [ + (substituteAll { + src = ./longer-shell-path.patch; + bash = "${bash}/bin/bash"; + }) + + # Fix build with poppler-0.31.0 + (fetchurl { + url = "https://bugs.linuxfoundation.org/attachment.cgi?id=476"; + name = "cups-filters-poppler-0.31.0.patch"; + sha256 = "016pzksz4nl1sv3p5ahlnbmb7c899yrvlzq8jxic0gvdrzwd5bl4"; + }) + ]; + buildInputs = [ - pkgconfig cups poppler fontconfig libjpeg libpng perl + pkgconfig cups poppler poppler_utils fontconfig libjpeg libpng perl ijs qpdf dbus ]; @@ -34,13 +48,6 @@ stdenv.mkDerivation rec { substituteInPlace filter/gstoraster.c --replace execve execvpe ''; - patches = [ - (substituteAll { - src = ./longer-shell-path.patch; - bash = "${bash}/bin/bash"; - }) - ]; - postInstall = '' for i in $out/lib/cups/filter/{pstopdf,texttops,imagetops}; do diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 1bc9f86766f..640d8f4fe6c 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -4,11 +4,11 @@ , pulseaudio ? null }: stdenv.mkDerivation rec { - name = "dolphin-emu-20150302"; + name = "dolphin-emu-20150403"; src = fetchgit { url = git://github.com/dolphin-emu/dolphin.git; - rev = "cd8c37bc0792a492b59976eba10a3e54e0ea2842"; - sha256 = "06cb89c97w86ffn2nls0jb69macd5lqz930fjyjjahk9njx164fv"; + rev = "38236fb8e8370f9f1ca1482ffa94b08c4595f2aa"; + sha256 = "14v86c042jz5adqk6ngqbzl5xna7m69i39y7q23s7h6ra75461yf"; fetchSubmodules = false; }; diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index b3c793f00e1..3eb60b81b81 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -11,6 +11,7 @@ assert guiToolkit == "gtk" || guiToolkit == "qt4"; assert (guiToolkit == "gtk" -> gtk != null) || (guiToolkit == "qt4" -> qt4 != null); +with stdenv.lib; stdenv.mkDerivation rec { name = "higan-${version}"; @@ -18,12 +19,12 @@ stdenv.mkDerivation rec { sourceName = "higan_v${version}-source"; src = fetchurl { - urls = [ "http://byuu.org/files/${sourceName}.tar.xz" "http://byuu.net/files/${sourceName}.tar.xz" ]; + urls = [ "http://files.byuu.org/download/${sourceName}.tar.xz" ]; sha256 = "06qm271pzf3qf2labfw2lx6k0xcd89jndmn0jzmnc40cspwrs52y"; curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick... }; - buildInputs = with stdenv.lib; + buildInputs = [ pkgconfig libX11 libXv udev mesa SDL libao openal pulseaudio ] ++ optionals (guiToolkit == "gtk") [ gtk ] ++ optionals (guiToolkit == "qt4") [ qt4 ]; @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/higan-init.sh ''; - meta = with stdenv.lib; { + meta = { description = "An open-source, cycle-accurate Nintendo multi-system emulator"; longDescription = '' Higan (formerly bsnes) is a Nintendo multi-system emulator. diff --git a/pkgs/misc/emulators/retroarch/xbmc-advanced-launchers.nix b/pkgs/misc/emulators/retroarch/xbmc-advanced-launchers.nix deleted file mode 100644 index 3ff15aa1258..00000000000 --- a/pkgs/misc/emulators/retroarch/xbmc-advanced-launchers.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, pkgs, cores }: - -assert cores != []; - -with pkgs.lib; - -let - - script = exec: '' - #!${stdenv.shell} - nohup sh -c "sleep 1 && pkill -SIGSTOP xbmc" & - nohup sh -c "${exec} '$@' -f;pkill -SIGCONT xbmc" - ''; - scriptSh = exec: pkgs.writeScript ("xbmc-"+exec.name) (script exec.path); - execs = map (core: rec { name = core.core; path = core+"/bin/retroarch-"+name;}) cores; - -in - -stdenv.mkDerivation rec { - name = "xbmc-retroarch-advanced-launchers-${version}"; - version = "0.2"; - - dontBuild = true; - - buildCommand = '' - mkdir -p $out/bin - ${stdenv.lib.concatMapStrings (exec: "ln -s ${scriptSh exec} $out/bin/xbmc-${exec.name};") execs} - ''; - - meta = { - description = "XBMC retroarch advanced launchers"; - longDescription = '' - These retroarch launchers are intended to be used with - anglescry advanced launcher for XBMC since device input is - caught by both XBMC and the retroarch process. - ''; - license = stdenv.lib.licenses.gpl3; - }; -} diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index 198226c759a..a2338f376a7 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -1,19 +1,20 @@ { stdenv, fetchurl, pkgconfig, SDL2 }: +with stdenv.lib; stdenv.mkDerivation rec { name = "stella-${version}"; - version = "4.2"; + version = "4.6"; src = fetchurl { url = "http://downloads.sourceforge.net/project/stella/stella/${version}/${name}-src.tar.gz"; - sha256 = "0aikd7l5ill0vl5q06dg1wly8v9vav7wd78yjm6rmikd0cd2irzh"; + sha256 = "03vg8cxr0hn99vrr2dcwhv610xi9vhlw08ypazpm0nny522a9j4d"; }; buildInputs = with stdenv.lib; [ pkgconfig SDL2 ]; - meta = with stdenv.lib; { + meta = { description = "An open-source Atari 2600 VCS emulator"; longDescription = '' Stella is a multi-platform Atari 2600 VCS emulator released under diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index f8a32cb8ff4..a7a1e02da3b 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.cc.cc.isGNU or false; let - version = "1.7.39"; + version = "1.7.40"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "0p1kj61hkfyhbxdfgj3z3hlxi5nvcbdknkjqiicbabkpzq3v1zva"; + sha256 = "1dnasmw1rnlz7wk1bn0x1zmy3r78hgrn9y53z4vm8xjkllwyd0hd"; }; gecko = fetchurl { diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index d6c09e1b297..6a8a019f946 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -483,11 +483,11 @@ rec { }; wakatime = buildVimPlugin { - name = "wakatime-3.0.8"; + name = "wakatime-3.0.9"; src = fetchFromGitHub { - sha256 = "0sb3vgwnn8x1g50qlcimhw0rnkiw26rmk1d3j2a5bipx69xcl9pb"; - rev = "d6816d3766b31dd247a68023b04913b4a15fe565"; + sha256 = "0qq2h5ysbixypz1ga5j3yrh8sd5h1npqkd59dpl5c1mvjlc30fpk"; + rev = "f5848439ffdf63db3859f692df1d8fa64b1b3edf"; repo = "vim-wakatime"; owner = "wakatime"; }; diff --git a/pkgs/os-specific/linux/autofs/autofs-v5.nix b/pkgs/os-specific/linux/autofs/autofs-v5.nix index 5c5c2f026af..787cd34180e 100644 --- a/pkgs/os-specific/linux/autofs/autofs-v5.nix +++ b/pkgs/os-specific/linux/autofs/autofs-v5.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { configureFlags="--disable-move-mount --with-path=$PATH" export MOUNT=/var/run/current-system/sw/bin/mount export UMOUNT=/var/run/current-system/sw/bin/umount - export MODPROBE=/var/run/current-system/sw/sbin/modprobe + export MODPROBE=/var/run/current-system/sw/bin/modprobe # Grrr, rpcgen can't find cpp. (NIXPKGS-48) mkdir rpcgen echo "#! $shell" > rpcgen/rpcgen diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index 6c7d6d5330e..ec1e5f2e20b 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel }: +{ stdenv, fetchurl, fetchpatch, kernel }: let baseName = "bbswitch"; @@ -15,6 +15,11 @@ stdenv.mkDerivation { sha256 = "0xql1nv8dafnrcg54f3jsi3ny3cd2ca9iv73pxpgxd2gfczvvjkn"; }; + patches = [ (fetchpatch { + url = "https://github.com/Bumblebee-Project/bbswitch/pull/102.patch"; + sha256 = "1lbr6pyyby4k9rn2ry5qc38kc738d0442jhhq57vmdjb6hxjya7m"; + }) ]; + preBuild = '' substituteInPlace Makefile \ --replace "\$(shell uname -r)" "${kernel.modDirVersion}" \ @@ -39,8 +44,10 @@ stdenv.mkDerivation { chmod +x $out/bin/discrete_vga_poweroff $out/bin/discrete_vga_poweron ''; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { description = "A module for powering off hybrid GPUs"; + platforms = platforms.linux; + homepage = https://github.com/Bumblebee-Project/bbswitch; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 52e5d95346e..c54d4aa6319 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,31 +1,59 @@ { stdenv, fetchurl, pkgconfig # dependencies -, glib, ncurses +, glib # optional features without extra dependencies -, mpdSupport ? true +, mpdSupport ? true +, ibmSupport ? true # IBM/Lenovo notebooks + +# This should be optional, but it is not due to a bug in conky +# Please, try to make it optional again on update +, ncurses +#, ncursesSupport ? true , ncurses ? null # optional features with extra dependencies -, x11Support ? false, x11 ? null -, xdamage ? false, libXdamage ? null -, wireless ? false, wirelesstools ? null -, luaSupport ? false, lua5 ? null +, x11Support ? true , x11 ? null +, xdamageSupport ? x11Support, libXdamage ? null +, imlib2Support ? x11Support, imlib2 ? null +, luaSupport ? true , lua ? null -, rss ? false -, weatherMetar ? false -, weatherXoap ? false -, curl ? null, libxml2 ? null +, luaImlib2Support ? luaSupport && imlib2Support +, luaCairoSupport ? luaSupport && x11Support, cairo ? null +, toluapp ? null + +, alsaSupport ? true , alsaLib ? null + +, wirelessSupport ? true , wirelesstools ? null + +, curlSupport ? true , curl ? null +, rssSupport ? curlSupport +, weatherMetarSupport ? curlSupport +, weatherXoapSupport ? curlSupport +, libxml2 ? null }: -assert luaSupport -> lua5 != null; -assert wireless -> wirelesstools != null; -assert x11Support -> x11 != null; -assert xdamage -> x11Support && libXdamage != null; +#assert ncursesSupport -> ncurses != null; -assert rss -> curl != null && libxml2 != null; -assert weatherMetar -> curl != null; -assert weatherXoap -> curl != null && libxml2 != null; +assert x11Support -> x11 != null; +assert xdamageSupport -> x11Support && libXdamage != null; +assert imlib2Support -> x11Support && imlib2 != null; +assert luaSupport -> lua != null; +assert luaImlib2Support -> luaSupport && imlib2Support + && toluapp != null; +assert luaCairoSupport -> luaSupport && toluapp != null + && cairo != null; +assert luaCairoSupport || luaImlib2Support + -> lua.luaversion == "5.1"; + +assert alsaSupport -> alsaLib != null; + +assert wirelessSupport -> wirelesstools != null; + +assert curlSupport -> curl != null; +assert rssSupport -> curlSupport && libxml2 != null; +assert weatherMetarSupport -> curlSupport; +assert weatherXoapSupport -> curlSupport && libxml2 != null; with stdenv.lib; @@ -39,30 +67,47 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lgcc_s"; - buildInputs = [ pkgconfig glib ncurses ] - ++ optional luaSupport lua5 - ++ optional wireless wirelesstools - ++ optional x11Support x11 - ++ optional xdamage libXdamage + buildInputs = [ pkgconfig glib ] + ++ [ ncurses ] + #++ optional ncursesSupport ncurses + ++ optional x11Support x11 + ++ optional xdamageSupport libXdamage + ++ optional imlib2Support imlib2 + ++ optional luaSupport lua + ++ optionals luaImlib2Support [ toluapp imlib2 ] + ++ optionals luaCairoSupport [ toluapp cairo ] - ++ optionals rss [ curl libxml2 ] - ++ optional weatherMetar curl - ++ optionals weatherXoap [ curl libxml2 ] + ++ optional alsaSupport alsaLib + + ++ optional wirelessSupport wirelesstools + + ++ optional curlSupport curl + ++ optional rssSupport libxml2 + ++ optional weatherXoapSupport libxml2 ; configureFlags = let flag = state: flags: if state then map (x: "--enable-${x}") flags else map (x: "--disable-${x}") flags; - in flag mpdSupport [ "mpd" ] + in flag mpdSupport [ "mpd" ] + ++ flag ibmSupport [ "ibm" ] - ++ flag luaSupport [ "lua" ] - ++ flag wireless [ "wlan" ] - ++ flag x11Support [ "x11" "xft" "argb" "double-buffer" "own-window" ] # conky won't compile without --enable-own-window - ++ flag xdamage [ "xdamage" ] + #++ flag ncursesSupport [ "ncurses" ] + ++ flag x11Support [ "x11" "xft" "argb" "double-buffer" "own-window" ] # conky won't compile without --enable-own-window + ++ flag xdamageSupport [ "xdamage" ] + ++ flag imlib2Support [ "imlib2" ] + ++ flag luaSupport [ "lua" ] + ++ flag luaImlib2Support [ "lua-imlib2" ] + ++ flag luaCairoSupport [ "lua-cairo" ] - ++ flag rss [ "rss" ] - ++ flag weatherMetar [ "weather-metar" ] - ++ flag weatherXoap [ "weather-xoap" ] + ++ flag alsaSupport [ "alsa" ] + + ++ flag wirelessSupport [ "wlan" ] + + ++ flag curlSupport [ "curl" ] + ++ flag rssSupport [ "rss" ] + ++ flag weatherMetarSupport [ "weather-metar" ] + ++ flag weatherXoapSupport [ "weather-xoap" ] ; meta = { diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 6e1a4ac025c..91c039c875b 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.22"; + version="0.9.24"; name="${baseName}-${version}"; - hash="1yyh1vjhpdl307bj1ri7jskq4hpq1ifcqfz55i02w9faiz9kkmc5"; - url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.22-rc1.tar.bz2"; - sha256="1yyh1vjhpdl307bj1ri7jskq4hpq1ifcqfz55i02w9faiz9kkmc5"; + hash="15fz6hjxakjnsn505w3wlc6bqvf5pjwn8zfhp5aw9zq6vxr7f317"; + url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.24-rc1.tar.bz2"; + sha256="15fz6hjxakjnsn505w3wlc6bqvf5pjwn8zfhp5aw9zq6vxr7f317"; }; buildInputs = [ ]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index a2af42761b9..5fdfdb3b6a1 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -310,6 +310,9 @@ with stdenv.lib; SLIP_COMPRESSED y # CSLIP compressed headers SLIP_SMART y THERMAL_HWMON y # Hardware monitoring support + ${optionalString (versionAtLeast version "3.15") '' + UEVENT_HELPER n + ''} ${optionalString (versionOlder version "3.15") '' USB_DEBUG? n ''} diff --git a/pkgs/os-specific/linux/kernel/grsec-path.patch b/pkgs/os-specific/linux/kernel/grsec-path.patch index 6f59cf8d80b..aaf7d80dc91 100644 --- a/pkgs/os-specific/linux/kernel/grsec-path.patch +++ b/pkgs/os-specific/linux/kernel/grsec-path.patch @@ -1,17 +1,18 @@ diff --git a/kernel/kmod.c b/kernel/kmod.c -index 67f7981..03f127d 100644 +index a26e825..29baec1 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c -@@ -246,9 +246,9 @@ static int ____call_usermodehelper(void *data) +@@ -294,10 +294,9 @@ static int ____call_usermodehelper(void *data) out the path to be used prior to this point and are now operating on that copy */ - if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) && - strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) && +- strncmp(sub_info->path, "/usr/libexec/", 13) && - strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) { -+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/nix/store/", 11) && -+ strncmp(sub_info->path, "/run/current-system/systemd/lib/", 32)) || -+ strstr(sub_info->path, "..")) { ++ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/nix/store/", 11) && ++ strncmp(sub_info->path, "/run/current-system/systemd/lib/", 32)) || ++ strstr(sub_info->path, "..")) { printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path); retval = -EPERM; - goto fail; + goto out; diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index 06145488d50..9e85c5397c6 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.18.10"; + version = "3.18.11"; extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0kmh0ybjh1l35pm421v2q3z9fyhss85agh1rkmnh9bim2bq1ac6h"; + sha256 = "19di7k38adnwimxddd1v6flgdsvxhgf8iswjwfyqi2p2bdcb0p5d"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 1c2a3edf298..de13f8394d8 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.0-rc4"; - modDirVersion = "4.0.0-rc4"; + version = "4.0-rc6"; + modDirVersion = "4.0.0-rc6"; extraMeta.branch = "4.0"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "01jn3mpxd1gly79psgh27l9ad24i07z9an0mw93pbs16nnncv0dn"; + sha256 = "1f6xqrc9lqssr2gyzd6d82dk2niikbr1swg68vfc250am0l55vw8"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 6a4b707e777..57992428cda 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -66,16 +66,16 @@ rec { grsecurity_stable = grsecPatch { kversion = "3.14.37"; - revision = "201503270048"; + revision = "201504051405"; branch = "stable"; - sha256 = "1ryxh89m392mwqlwqiy3jszyhq9cxmvkv320di7hi50aqx8k2lqf"; + sha256 = "0w1rz5g4wwd22ivii7m7qjgakdynzjwpqxiydx51kiw5j0avkzs3"; }; grsecurity_unstable = grsecPatch { kversion = "3.19.3"; - revision = "201503270049"; + revision = "201504021826"; branch = "test"; - sha256 = "0m76p947gr0bqk6xxb237bpf4ikxjzycjzq4i2szm4n86k9sfac0"; + sha256 = "0r3gsha4x9bkzg9n4rcwzi9f3hkbqrf8yga1dd83kyd10fns4lzm"; }; grsec_fix_path = diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index 682c36401de..686f63720fc 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation { substituteInPlace "$out"/modprobe.conf \ --replace /sbin/lsmod /run/booted-system/sw/bin/lsmod \ - --replace /sbin/rmmod /run/booted-system/sw/sbin/rmmod \ - --replace /sbin/modprobe /run/booted-system/sw/sbin/modprobe \ + --replace /sbin/rmmod /run/booted-system/sw/bin/rmmod \ + --replace /sbin/modprobe /run/booted-system/sw/bin/modprobe \ --replace " grep " " ${gnugrep}/bin/grep " \ --replace " xargs " " ${findutils}/bin/xargs " ''; diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 767f1e9ecae..a7965a70b1c 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -1,11 +1,20 @@ { stdenv, fetchurl, groff }: stdenv.mkDerivation rec { - name = "mdadm-3.3.2"; + name = "mdadm-3.3"; + # WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING + # Do NOT update this if you're not ABSOLUTELY certain that it will work. + # Please check the update using the NixOS VM test, BEFORE pushing: + # nix-build nixos/release.nix -A tests.installer.swraid.x86_64-linux + # Discussion: + # https://github.com/NixOS/nixpkgs/commit/7719f7f + # https://github.com/NixOS/nixpkgs/commit/666cf99 + # https://github.com/NixOS/nixpkgs/pull/6006 + # WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING src = fetchurl { - url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz"; - sha256 = "132vdvh3myjgcjn6i9w90ck16ddjxjcszklzkyvr4f5ifqd7wfhg"; + url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.bz2"; + sha256 = "0igdqflihiq1dp5qlypzw0xfl44f4n3bckl7r2x2wfgkplcfa1ww"; }; nativeBuildInputs = [ groff ]; diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index c10cfb38cbd..1dae1d215ec 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { url = "http://www.musl-libc.org/releases/${name}.tar.gz"; - sha256 = "168mz5mwmzr5j6l4jxnwaxw6l89xycql3vfk01jsmy7chziamq6q"; + sha256 = "04vq4a1hm81kbxfcqa30s6xpzbqf3568gbysfxcmb72v8438b4ps"; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/nvidia-x11/beta.nix b/pkgs/os-specific/linux/nvidia-x11/beta.nix new file mode 100644 index 00000000000..fb57e194c80 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/beta.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl +, gtk, atk, pango, glib, gdk_pixbuf, cairo +, # Whether to build the libraries only (i.e. not the kernel module or + # nvidia-settings). Used to support 32-bit binaries on 64-bit + # Linux. + libsOnly ? false +}: + +with stdenv.lib; + +assert (!libsOnly) -> kernel != null; + +let + + versionNumber = "349.12"; + + # Policy: use the highest stable version as the default (on our master). + inherit (stdenv.lib) makeLibraryPath; + +in + +stdenv.mkDerivation { + name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; + + builder = ./builder.sh; + + src = + if stdenv.system == "i686-linux" then + fetchurl { + url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; + sha256 = "0x9zfw66nxv98zpkdkymlyqzspksk850bhfmza7g7pba4yba085h"; + } + else if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; + sha256 = "19mfkigzffxsik3h4bsjsl481q410h804fz3rdc7chs86q4bg9h3"; + } + else throw "nvidia-x11 does not support platform ${stdenv.system}"; + + inherit versionNumber libsOnly; + + kernel = if libsOnly then null else kernel.dev; + + dontStrip = true; + + glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; + cudaPath = makeLibraryPath [zlib stdenv.cc.cc]; + openclPath = makeLibraryPath [zlib]; + allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.cc]; + + gtkPath = optionalString (!libsOnly) (makeLibraryPath + [ gtk atk pango glib gdk_pixbuf cairo ] ); + programPath = makeLibraryPath [ xlibs.libXv ]; + + buildInputs = [ perl ]; + + meta = with stdenv.lib.meta; { + homepage = http://www.nvidia.com/object/unix.html; + description = "X.org driver and kernel module for NVIDIA graphics cards"; + license = licenses.unfreeRedistributable; + platforms = platforms.linux; + maintainers = [ maintainers.vcunat ]; + }; +} diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 02731d7f775..f34e593b961 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -12,6 +12,9 @@ assert (!libsOnly) -> kernel != null; let + # TODO: Remove the use of the beta driver for kernel 4.0 in + # nixos/modules/hardware/video/nvidia.nix when this driver supports + # kernel 4.0 versionNumber = "346.47"; # Policy: use the highest stable version as the default (on our master). diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 80e87d8aacc..266fee9e493 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pax-utils-${version}"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz"; - sha256 = "15708pm5l1bgxg1bgic82hqvmn3gcq83mi1l8akhz9qlykh5sfdq"; + sha256 = "0w2nddgany3s0znyj6zizlvn8y5vba9x49jm5nliv13p3x7ajdc5"; }; makeFlags = [ diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index 42a4357c74c..9bccedb0120 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.0.0"; + version = "2.0.2.0"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz"; - sha256 = "0lfgfwnk81vjlkvmr1gzknz9swgcrp5s7x19dfkw6shvi95fyirh"; + sha256 = "0y6dq4wb5v1c6ps6a7jyq08r2pjksrvz6n3dnfa9c91gzm4m1dxb"; }; dontDisableStatic = true; diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix index be09b424a6b..e60af32ea91 100644 --- a/pkgs/os-specific/linux/spl/git.nix +++ b/pkgs/os-specific/linux/spl/git.nix @@ -1,12 +1,12 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-03-25"; + version = "2015-04-03"; src = fetchgit { url = git://github.com/zfsonlinux/spl.git; - rev = "a4f54cf036d9a966ff87abe9a0063f2b457c2389"; - sha256 = "0n10icwmnx3y6201fncswhd1mfvs6xyk8praj27z0wnzxs1i4k96"; + rev = "ae26dd003911277e0c7134b3e4e3a41c300a2fd5"; + sha256 = "0wq1raz68b9msbn00q1zg89rm5l7l2018k7m31s4b4gj17w38h5b"; }; patches = [ ./const.patch ./install_prefix-git.patch ]; diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch index 182927486c5..c1c768dbacb 100644 --- a/pkgs/os-specific/linux/systemd/fixes.patch +++ b/pkgs/os-specific/linux/systemd/fixes.patch @@ -229,7 +229,7 @@ index 70a5918..1926e52 100644 - cmdline[i++] = "/sbin/fsck"; - cmdline[i++] = arg_repair; -+ cmdline[i++] = "/run/current-system/sw/sbin/fsck"; ++ cmdline[i++] = "/run/current-system/sw/bin/fsck"; cmdline[i++] = "-T"; /* diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index 780eeb68d1d..b3df300e519 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { substituteInPlace src/main.c --replace \ "/sbin:/bin:/usr/sbin:/usr/bin" \ - "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin" + "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/bin" ''; buildInputs = diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 7888fc51be0..2dc99504c58 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { '' substituteInPlace src/main.c --replace \ "@path@" \ - "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin" + "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/bin" ''; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 21eaea06788..cf2783b9bbe 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { --enable-mesg --enable-ddate --disable-use-tty-group - --enable-fs-paths-default=/var/setuid-wrappers:/var/run/current-system/sw/sbin:/sbin + --enable-fs-paths-default=/var/setuid-wrappers:/var/run/current-system/sw/bin:/sbin ${if ncurses == null then "--without-ncurses" else ""} ''; diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 0455c2b8626..1a27ae8f571 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -1,26 +1,57 @@ -{stdenv, fetchurl, which, libjpeg -, withQt4 ? false, qt4 ? null}: +{ stdenv, fetchurl, pkgconfig +, libjpeg +, alsaLib ? null +, libX11 ? null +, qt4 ? null # The default is set to qt4 in all-packages.nix +, qt5 ? null +}: -assert withQt4 -> qt4 != null; +# See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT) + +assert qt4 != null -> qt5 == null; +assert qt5 != null -> qt4 == null; + +let + inherit (stdenv.lib) optional; +in stdenv.mkDerivation rec { - name = "v4l-utils-1.0.0"; + name = "v4l-utils-1.6.2"; src = fetchurl { url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; - sha256 = "0c2z500ijxr1ldzb4snasfpwi2icp04f8pk7akiqjkp0k4h8iqqx"; + sha256 = "0zdyjrja2mkqlijpdb4gz1vw0g7pslswmgqqsgri3yq408gypmnk"; }; - buildInputs = [ which ]; - propagatedBuildInputs = [ libjpeg ] ++ stdenv.lib.optional withQt4 qt4; + configureFlags = [ + "--enable-libv4l" + ] ++ (if (alsaLib != null && libX11 != null && (qt4 != null || qt5 != null)) then [ + "--with-udevdir=\${out}/lib/udev" + "--enable-v4l-utils" + "--enable-qv4l2" + ] else [ + "--without-libudev" + "--without-udevdir" + "--disable-v4l-utils" + "--disable-qv4l2" + ]); - preConfigure = ''configureFlags="--with-udevdir=$out/lib/udev"''; + postInstall = '' + # Create symlink for V4l1 compatibility + ln -s $out/include/libv4l1-videodev.h $out/include/videodev.h + ''; - meta = { + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ alsaLib libX11 qt4 qt5 ]; + + propagatedBuildInputs = [ libjpeg ]; + + meta = with stdenv.lib; { + description = "V4L utils and libv4l, provide common image formats regardless of the v4l device"; homepage = http://linuxtv.org/projects.php; - description = "V4L utils and libv4l, that provides common image formats regardless of the v4l device"; - license = stdenv.lib.licenses.free; # The libs are of LGPLv2.1+, some other pieces are GPL. - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ codyopel viric ]; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index fb7b7f76ee4..a8313867339 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -1,12 +1,12 @@ { callPackage, stdenv, fetchgit, spl_git, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-03-25"; + version = "2015-04-03"; src = fetchgit { url = git://github.com/zfsonlinux/zfs.git; - rev = "7d90f569b3f05def7cbd0a52ce8ac3040364d702"; - sha256 = "09qcfd3h6zjwvgr1prs41qi8wlzvdv8x4sfrcf95bjj6h25v7n51"; + rev = "40d06e3c78c23b199dfd9284809e710fab549391"; + sha256 = "1yxpx7lylbbr6jlm8g2x6xsmh6wmzb8prfg7shks7sib750a4slx"; }; patches = [ diff --git a/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch b/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch index 49ad88fc3a4..82b5999cf9e 100644 --- a/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch +++ b/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch @@ -16,7 +16,7 @@ diff -crN '--exclude=.git' zfs-0.60-rc11/cmd/mount_zfs/Makefile.am zfs/cmd/mount # Ignore the prefix for the mount helper. It must be installed in /sbin/ # because this path is hardcoded in the mount(8) for security reasons. + # -+ # ... except on nixos, where it really is /var/run/current-system/sw/sbin, ++ # ... except on nixos, where it really is /var/run/current-system/sw/bin, + # which is where this will end up if we put it in ${out}/sbin. # sbin_PROGRAMS = mount.zfs diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 25f3fbb5a64..a1a1a2ea1f2 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0xx1q9ximsyyipl0xbj8r7ajsz4xrxik8xmhcb1z9nv0aza1rff2"; }; - buildInputs = [ python munge perl pam openssl mysql ]; + buildInputs = [ python munge perl pam openssl mysql.lib ]; configureFlags = '' --with-munge=${munge} diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index f4ceca5f386..5e8f2fd0caa 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { homepage = http://corosync.org/; description = "A Group Communication System with features for implementing high availability within applications"; license = licenses.bsd3; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/servers/games/ghost-one/default.nix b/pkgs/servers/games/ghost-one/default.nix index f90b5e40997..3c1430157d0 100644 --- a/pkgs/servers/games/ghost-one/default.nix +++ b/pkgs/servers/games/ghost-one/default.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1sm2ca3lcdr4vjg7v94d8zhqz8cdp44rg8yinzzwkgsr0hj74fv2"; }; - buildInputs = [ unzip gmp zlib bzip2 boost mysql ]; + buildInputs = [ unzip gmp zlib bzip2 boost mysql.lib ]; patchPhase = '' - substituteInPlace ghost/Makefile --replace "/usr/local/lib/mysql" "${mysql}/lib/mysql" + substituteInPlace ghost/Makefile --replace "/usr/local/lib/mysql" "${mysql.lib}/lib/mysql" ''; buildPhase = '' @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = [ maintainers.phreedom ]; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index 6572e63a14f..011b0b8ff49 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, flex, bison, ncurses }: +{ stdenv, fetchurl, automake, autoconf, libtool, flex, bison, ncurses, texinfo }: stdenv.mkDerivation rec { - name = "gpm-1.20.6"; + name = "gpm-1.20.7"; src = fetchurl { url = "http://www.nico.schottelius.org/software/gpm/archives/${name}.tar.bz2"; - sha256 = "1990i19ddzn8gg5xwm53yn7d0mya885f48sd2hyvr7dvzyaw7ch8"; + sha256 = "13d426a8h403ckpc8zyf7s2p5rql0lqbg2bv0454x0pvgbfbf4gh"; }; - nativeBuildInputs = [ flex bison ]; - buildInputs = [ ncurses ]; + buildInputs = [ automake autoconf libtool flex bison ncurses texinfo ]; - preConfigure = - '' - sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in - ''; + preConfigure = '' + ./autogen.sh + sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in + ''; + + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; # Its configure script does not allow --disable-static # Disabling this, we make cross-builds easier, because having diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index f564cb0d483..056f9202df4 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ] ++ stdenv.lib.optional enableMagnet lua5_1 - ++ stdenv.lib.optional enableMysql mysql; + ++ stdenv.lib.optional enableMysql mysql.lib; configureFlags = [ "--with-openssl" ] ++ stdenv.lib.optional enableMagnet "--with-lua" diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index ee5b4a1cd5d..b47b67792b8 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -10,10 +10,10 @@ with stdenv.lib; let - version = "1.7.10"; + version = "1.7.11"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "0q24rwwlw3xas0ar4jygyb6czwjzsjz11sax199z7fnfd2sc2wyz"; + sha256 = "15cnlrhiqklqfzwfspkp0i6g04zdhc092dh593yqnqqf450dgnfs"; }; rtmp-ext = fetchFromGitHub { diff --git a/pkgs/servers/mail/postfix/2.11.nix b/pkgs/servers/mail/postfix/2.11.nix index 5cb22ff936e..817f559cbd5 100644 --- a/pkgs/servers/mail/postfix/2.11.nix +++ b/pkgs/servers/mail/postfix/2.11.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "postfix-${version}"; - version = "2.11.3"; + version = "2.11.4"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "1hq213s36wp94q72ciix5pi2rcd4901mjg7nx6m1n9jndrp19r84"; + sha256 = "07h3rdfgs449hb49rxcx4iapib0l0zchnhscgn4h00wcnlflq5gl"; }; patches = [ ./postfix-2.11.0.patch ]; @@ -33,8 +33,9 @@ stdenv.mkDerivation rec { export sendmail_path=$out/bin/sendmail make makefiles \ - CCARGS='-DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${cyrus_sasl}/include/sasl' \ - AUXLIBS='-ldb -lnsl -lresolv -lsasl2 -lcrypto -lssl' + CCARGS='-DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${cyrus_sasl}/include/sasl \ + -fPIE -fstack-protector-all --param ssp-buffer-size=4 -O2 -D_FORTIFY_SOURCE=2' \ + AUXLIBS='-ldb -lnsl -lresolv -lsasl2 -lcrypto -lssl -pie -Wl,-z,relro,-z,now' ''; installTargets = [ "non-interactive-package" ]; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 0bfc31580e1..7bd2d620910 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i -e s,/usr/bin,/var/run/current-system/sw/bin, \ - -e s,/usr/sbin,/var/run/current-system/sw/sbin, \ + -e s,/usr/sbin,/var/run/current-system/sw/bin, \ -e s,:/sbin,, src/util/sys_defs.h ''; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { export sample_directory=$out/share/postfix/doc/samples export readme_directory=$out/share/postfix/doc - make makefiles CCARGS='-DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${cyrus_sasl}/include/sasl' AUXLIBS='-lssl -lcrypto -lsasl2 -ldb -lnsl' + make makefiles CCARGS='-DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${cyrus_sasl}/include/sasl -fPIE -fstack-protector-all --param ssp-buffer-size=4 -O2 -D_FORTIFY_SOURCE=2' AUXLIBS='-lssl -lcrypto -lsasl2 -ldb -lnsl -pie -Wl,-z,relro,-z,now' ''; installPhase = '' diff --git a/pkgs/servers/monitoring/sensu/Gemfile b/pkgs/servers/monitoring/sensu/Gemfile new file mode 100644 index 00000000000..ebee9f25721 --- /dev/null +++ b/pkgs/servers/monitoring/sensu/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'sensu' diff --git a/pkgs/servers/monitoring/sensu/Gemfile.lock b/pkgs/servers/monitoring/sensu/Gemfile.lock new file mode 100644 index 00000000000..9f58be03b62 --- /dev/null +++ b/pkgs/servers/monitoring/sensu/Gemfile.lock @@ -0,0 +1,75 @@ +GEM + remote: https://rubygems.org/ + specs: + amq-protocol (1.9.2) + amqp (1.5.0) + amq-protocol (>= 1.9.2) + eventmachine + async_sinatra (1.0.0) + rack (>= 1.4.1) + sinatra (>= 1.3.2) + childprocess (0.5.3) + ffi (~> 1.0, >= 1.0.11) + daemons (1.2.2) + em-redis-unified (0.6.0) + eventmachine (>= 0.12.10) + em-worker (0.0.2) + eventmachine + eventmachine (1.0.3) + ffi (1.9.8) + multi_json (1.11.0) + rack (1.6.0) + rack-protection (1.5.3) + rack + sensu (0.17.1) + async_sinatra (= 1.0.0) + em-redis-unified (= 0.6.0) + eventmachine (= 1.0.3) + multi_json (= 1.11.0) + sensu-em (= 2.4.1) + sensu-extension (= 1.1.2) + sensu-extensions (= 1.2.0) + sensu-logger (= 1.0.0) + sensu-settings (= 1.3.0) + sensu-spawn (= 1.1.0) + sensu-transport (= 2.4.0) + sinatra (= 1.3.5) + thin (= 1.5.0) + uuidtools (= 2.1.4) + sensu-em (2.4.1) + sensu-extension (1.1.2) + sensu-em + sensu-extensions (1.2.0) + multi_json + sensu-em + sensu-extension + sensu-logger + sensu-settings + sensu-logger (1.0.0) + multi_json + sensu-em + sensu-settings (1.3.0) + multi_json + sensu-spawn (1.1.0) + childprocess (= 0.5.3) + em-worker (= 0.0.2) + sensu-em + sensu-transport (2.4.0) + amqp (= 1.5.0) + sensu-em + sinatra (1.3.5) + rack (~> 1.4) + rack-protection (~> 1.3) + tilt (~> 1.3, >= 1.3.3) + thin (1.5.0) + daemons (>= 1.0.9) + eventmachine (>= 0.12.6) + rack (>= 1.0.0) + tilt (1.4.1) + uuidtools (2.1.4) + +PLATFORMS + ruby + +DEPENDENCIES + sensu diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix new file mode 100644 index 00000000000..2785898bed5 --- /dev/null +++ b/pkgs/servers/monitoring/sensu/default.nix @@ -0,0 +1,19 @@ + { lib, bundlerEnv, ruby }: + + bundlerEnv { + name = "sensu-0.17.1"; + + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = with lib; { + description = "A monitoring framework that aims to be simple, malleable, +and scalable."; + homepage = http://sensuapp.org/; + license = with licenses; mit; + maintainers = with maintainers; [ theuni ]; + platforms = platforms.unix; + }; + } diff --git a/pkgs/servers/monitoring/sensu/gemset.nix b/pkgs/servers/monitoring/sensu/gemset.nix new file mode 100644 index 00000000000..116bce9c4b5 --- /dev/null +++ b/pkgs/servers/monitoring/sensu/gemset.nix @@ -0,0 +1,242 @@ +{ + "amq-protocol" = { + version = "1.9.2"; + source = { + type = "gem"; + sha256 = "1gl479j003vixfph5jmdskl20il8816y0flp4msrc8im3b5iiq3r"; + }; + }; + "amqp" = { + version = "1.5.0"; + source = { + type = "gem"; + sha256 = "0jlcwyvjz0b28wxdabkyhdqyqp5ji56ckfywsy9mgp0m4wfbrh8c"; + }; + dependencies = [ + "amq-protocol" + "eventmachine" + ]; + }; + "async_sinatra" = { + version = "1.0.0"; + source = { + type = "gem"; + sha256 = "02yi9qfsi8kk4a4p1c4sx4pgism05m18kwlc9dd23zzdy9jdgq1a"; + }; + dependencies = [ + "rack" + "sinatra" + ]; + }; + "childprocess" = { + version = "0.5.3"; + source = { + type = "gem"; + sha256 = "12djpdr487fddq55sav8gw1pjglcbb0ab0s6npga0ywgsqdyvsww"; + }; + dependencies = [ + "ffi" + ]; + }; + "daemons" = { + version = "1.2.2"; + source = { + type = "gem"; + sha256 = "121c7vkimg3baxga69xvdkwxiq8wkmxqvdbyqi5i82vhih5d3cn3"; + }; + }; + "em-redis-unified" = { + version = "0.6.0"; + source = { + type = "gem"; + sha256 = "1hf7dv6qmxfilpd7crcqlyqk6jp5z8md76bpg3n0163ps4ra73p0"; + }; + dependencies = [ + "eventmachine" + ]; + }; + "em-worker" = { + version = "0.0.2"; + source = { + type = "gem"; + sha256 = "0z4jx9z2q5hxvdvik4yp0ahwfk69qsmdnyp72ln22p3qlkq2z5wk"; + }; + dependencies = [ + "eventmachine" + ]; + }; + "eventmachine" = { + version = "1.0.3"; + source = { + type = "gem"; + sha256 = "09sqlsb6x9ddlgfw5gsw7z0yjg5m2qfjiqkz2fx70zsizj3lqhil"; + }; + }; + "ffi" = { + version = "1.9.8"; + source = { + type = "gem"; + sha256 = "0ph098bv92rn5wl6rn2hwb4ng24v4187sz8pa0bpi9jfh50im879"; + }; + }; + "multi_json" = { + version = "1.11.0"; + source = { + type = "gem"; + sha256 = "1mg3hp17ch8bkf3ndj40s50yjs0vrqbfh3aq5r02jkpjkh23wgxl"; + }; + }; + "rack" = { + version = "1.6.0"; + source = { + type = "gem"; + sha256 = "1f57f8xmrgfgd76s6mq7vx6i266zm4330igw71an1g0kh3a42sbb"; + }; + }; + "rack-protection" = { + version = "1.5.3"; + source = { + type = "gem"; + sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; + }; + dependencies = [ + "rack" + ]; + }; + "sensu" = { + version = "0.17.1"; + source = { + type = "gem"; + sha256 = "1fqpypins1zhind0in0ax0y97a6pf3z85gwjz4bjm6cjrkarb5zj"; + }; + dependencies = [ + "async_sinatra" + "em-redis-unified" + "eventmachine" + "multi_json" + "sensu-em" + "sensu-extension" + "sensu-extensions" + "sensu-logger" + "sensu-settings" + "sensu-spawn" + "sensu-transport" + "sinatra" + "thin" + "uuidtools" + ]; + }; + "sensu-em" = { + version = "2.4.1"; + source = { + type = "gem"; + sha256 = "08jz47lfnv55c9yl2dhyv1si6zl8h4xj8y1sjy2h2fqy48prfgmy"; + }; + }; + "sensu-extension" = { + version = "1.1.2"; + source = { + type = "gem"; + sha256 = "19qz22fcb3xjz9p5npghlcvxkf8h1rsfws3j988ybnimmmmiqm24"; + }; + dependencies = [ + "sensu-em" + ]; + }; + "sensu-extensions" = { + version = "1.2.0"; + source = { + type = "gem"; + sha256 = "1b8978g1ww7vdrsw7zvba6qvc56s4vfm1hw3szw3j1gsk6j0vb81"; + }; + dependencies = [ + "multi_json" + "sensu-em" + "sensu-extension" + "sensu-logger" + "sensu-settings" + ]; + }; + "sensu-logger" = { + version = "1.0.0"; + source = { + type = "gem"; + sha256 = "0vwa2b5wa9xqzb9lmhma49171iabwbnnnyhhhaii8n6j4axvar93"; + }; + dependencies = [ + "multi_json" + "sensu-em" + ]; + }; + "sensu-settings" = { + version = "1.3.0"; + source = { + type = "gem"; + sha256 = "0s9fyqhq5vf9m9937n3wczlr4z62rn1ydc6m53vn4156fpim6yga"; + }; + dependencies = [ + "multi_json" + ]; + }; + "sensu-spawn" = { + version = "1.1.0"; + source = { + type = "gem"; + sha256 = "0w9z6hpr27lq02y6c2mnrdl9xpsjfg77kzsfsp2f2w4swdwmiv0v"; + }; + dependencies = [ + "childprocess" + "em-worker" + "sensu-em" + ]; + }; + "sensu-transport" = { + version = "2.4.0"; + source = { + type = "gem"; + sha256 = "0gh8rcl22daax7qng93kj2jydql1jhhskd37kj7sgz0rr8wy2x06"; + }; + dependencies = [ + "amqp" + "sensu-em" + ]; + }; + "sinatra" = { + version = "1.3.5"; + source = { + type = "gem"; + sha256 = "1mn6nzfyirfqr7prhsn4nr3k481c6nzsad2p9s1xnsbvxa1vkqwr"; + }; + dependencies = [ + "rack" + "rack-protection" + "tilt" + ]; + }; + "thin" = { + version = "1.5.0"; + source = { + type = "gem"; + sha256 = "14sd2qbbk6y108z6v723mh3f1mk8s4fwxmmn9f8dk4xkhk4rwvq1"; + }; + dependencies = [ + "daemons" + "eventmachine" + "rack" + ]; + }; + "tilt" = { + version = "1.4.1"; + source = { + type = "gem"; + sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir"; + }; + }; + "uuidtools" = { + version = "2.1.4"; + source = { + type = "gem"; + sha256 = "1w0bhnkp5515f3yx5fakfrfkawxjpb4fjm1r2c6lk691xlr696s3"; + }; + }; +} \ No newline at end of file diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix index a67afd45f39..defb4f657d6 100644 --- a/pkgs/servers/nosql/cassandra/2.0.nix +++ b/pkgs/servers/nosql/cassandra/2.0.nix @@ -10,8 +10,8 @@ let - version = "2.0.13"; - sha256 = "125yga0h055fwp5kvgv57y5yyv7x4inib4fp9xsckmc7n7kmjvxg"; + version = "2.0.14"; + sha256 = "06vsv141dk5i5z47nh1glkqpscjl5fgynbhaxb4yjab9lskwv5jk"; in diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix index 99292e2f442..d62e8aa450c 100644 --- a/pkgs/servers/nosql/cassandra/2.1.nix +++ b/pkgs/servers/nosql/cassandra/2.1.nix @@ -10,8 +10,8 @@ let - version = "2.1.3"; - sha256 = "1hzb7h73vr28v9axw85c1987l2i5g4i9ivmgq5mqlv3cv1ng0knz"; + version = "2.1.4"; + sha256 = "1wdp1hcp541bwja0h5kb0ff2yy74mlhkr93chrlz2199lynynpgv"; in diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix index 65e957852fb..705a4ba43e7 100644 --- a/pkgs/servers/restund/default.nix +++ b/pkgs/servers/restund/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, openssl, libre, librem, mysql}: +{ stdenv, fetchurl, zlib, openssl, libre, librem, mysql }: stdenv.mkDerivation rec { version = "0.4.2"; name = "restund-${version}"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = "http://www.creytiv.com/pub/restund-${version}.tar.gz"; sha256 = "db5260939d40cb2ce531075bef02b9d6431067bdd52f3168a6f25246bdf7b9f2"; }; - buildInputs = [zlib openssl libre librem mysql]; + buildInputs = [ zlib openssl libre librem mysql.lib ]; makeFlags = [ "LIBRE_MK=${libre}/share/re/re.mk" "LIBRE_INC=${libre}/include/re" @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ; - NIX_LDFLAGS='' -L${mysql}/lib/mysql ''; + NIX_LDFLAGS='' -L${mysql.lib}/lib/mysql ''; meta = { homepage = "http://www.creytiv.com/restund.html"; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/servers/s6/default.nix b/pkgs/servers/s6/default.nix index 1452f82573e..73843b8c114 100644 --- a/pkgs/servers/s6/default.nix +++ b/pkgs/servers/s6/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.1.0"; + version = "2.1.3.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6"; rev = "refs/tags/v${version}"; - sha256 = "1x7za0b1a2i6xn06grpb5j361s9bl4524bp5mz3zcdg8s9nil50d"; + sha256 = "0dnwkdxqjv5awdgwxci1spcx1s13y5s9wd8ccskwv1rymvpgn8b3"; }; dontDisableStatic = true; @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { "--with-lib=${execline}/lib" "--with-dynlib=${skalibs}/lib" "--with-dynlib=${execline}/lib" - ] ++ stdenv.lib.optional stdenv.isDarwin [ "--disable-shared" ]; + ] ++ [ (if stdenv.isDarwin then "--disable-shared" else "--enable-shared") ]; preBuild = '' substituteInPlace "src/daemontools-extras/s6-log.c" \ diff --git a/pkgs/servers/samba/4.x-fix-ctdb-deps.patch b/pkgs/servers/samba/4.x-fix-ctdb-deps.patch new file mode 100644 index 00000000000..33886348412 --- /dev/null +++ b/pkgs/servers/samba/4.x-fix-ctdb-deps.patch @@ -0,0 +1,13 @@ +diff --git a/ctdb/wscript b/ctdb/wscript +index 3e2a992..3fe15cc 100755 +--- a/ctdb/wscript ++++ b/ctdb/wscript +@@ -568,7 +568,7 @@ def build(bld): + source='ib/ibwrapper_test.c', + includes='include include/internal', + deps='''replace talloc ctdb-client ctdb-common +- ctdb-system''' + ++ ctdb-system ctdb-common-util''' + + ib_deps, + install_path='${CTDB_TEST_LIBDIR}') + diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 2cc3cc69d3f..79736e17a50 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,9 +1,11 @@ -{ stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl_ns -, docbook_xml_dtd_42, readline, talloc, ntdb, tdb, tevent, ldb, popt, iniparser -, pythonPackages, libbsd, nss_wrapper, socket_wrapper, uid_wrapper, libarchive +{ stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl +, docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc, ntdb, tdb, tevent +, ldb, popt, iniparser, pythonPackages, libbsd, nss_wrapper, socket_wrapper +, uid_wrapper, libarchive # source3/wscript optionals , kerberos ? null +, zlib ? null , openldap ? null , cups ? null , pam ? null @@ -24,11 +26,29 @@ , libgpgerror ? null # other optionals -, zlib ? null , ncurses ? null -, libcap ? null +, libunwind ? null +, dbus ? null +, libibverbs ? null +, librdmacm ? null +, systemd ? null }: +assert kerberos != null -> zlib != null; + +let + mkFlag = trueStr: falseStr: cond: name: val: + if cond == null then null else + "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}"; + mkEnable = mkFlag "enable-" "disable-"; + mkWith = mkFlag "with-" "without-"; + mkOther = mkFlag "" "" true; + + bundledLibs = if kerberos != null && kerberos.implementation == "heimdal" then "NONE" else "com_err"; + hasGnutls = gnutls != null && libgcrypt != null && libgpgerror != null; + isKrb5OrNull = if kerberos != null && kerberos.implementation == "krb5" then true else null; + hasInfinibandOrNull = if libibverbs != null && librdmacm != null then true else null; +in stdenv.mkDerivation rec { name = "samba-4.2.0"; @@ -39,83 +59,96 @@ stdenv.mkDerivation rec { patches = [ ./4.x-no-persistent-install.patch - ./4.x-heimdal-compat.patch - ]; + ./4.x-fix-ctdb-deps.patch + ] ++ stdenv.lib.optional (kerberos != null) ./4.x-heimdal-compat.patch; buildInputs = [ - python pkgconfig perl libxslt docbook_xsl_ns docbook_xml_dtd_42 - readline talloc ntdb tdb tevent ldb popt iniparser pythonPackages.subunit - libbsd nss_wrapper socket_wrapper uid_wrapper libarchive + python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 + docbook_xml_dtd_45 readline talloc ntdb tdb tevent ldb popt iniparser + pythonPackages.subunit libbsd nss_wrapper socket_wrapper uid_wrapper + libarchive - kerberos openldap cups pam avahi acl libaio fam ceph glusterfs + kerberos zlib openldap cups pam avahi acl libaio fam ceph glusterfs libiconv gettext gnutls libgcrypt libgpgerror - zlib ncurses libcap + ncurses libunwind dbus libibverbs librdmacm systemd ]; postPatch = '' # Removes absolute paths in scripts sed -i 's,/sbin/,,g' ctdb/config/functions + + # Fix the XML Catalog Paths + sed -i "s,\(XML_CATALOG_FILES=\"\),\1$XML_CATALOG_FILES ,g" buildtools/wafsamba/wafsamba.py ''; enableParallelBuilding = true; configureFlags = [ # source3/wscript options - "--with-static-modules=NONE" - "--with-shared-modules=ALL" - "--with-winbind" - ] ++ (if kerberos != null then [ "--with-ads" ] else [ "--without-ads" ]) - ++ (if openldap != null then [ "--with-ldap" ] else [ "--without-ldap" ]) - ++ (if cups != null then [ "--enable-cups" ] else [ "--disable-cups" ]) - ++ (if pam != null then [ "--with-pam" "--with-pam_smbpass" ] - else [ "--without-pam" "--without-pam_smbpass" ]) ++ [ - "--with-quotas" - "--with-sendfile-support" - "--with-utmp" - "--enable-pthreadpool" - ] ++ (if avahi != null then [ "--enable-avahi" ] else [ "--disable-avahi" ]) ++ [ - "--with-iconv" - ] ++ (if acl != null then [ "--with-acl-support" ] else [ "--without-acl-support" ]) ++ [ - "--with-dnsupdate" - "--with-syslog" - "--with-automount" - ] ++ (if libaio != null then [ "--with-aio-support" ] else [ "--without-aio-support" ]) - ++ (if fam != null then [ "--with-fam" ] else [ "--without-fam" ]) ++ [ - "--with-cluster-support" - ] ++ (if ceph != null then [ "--with-libcephfs=${ceph}" ] else [ ]) - ++ (if glusterfs != null then [ "--enable-glusterfs" ] else [ "--disable-glusterfs" ]) ++ [ + (mkWith true "static-modules" "NONE") + (mkWith true "shared-modules" "ALL") + (mkWith true "winbind" null) + (mkWith (openldap != null) "ads" null) + (mkWith (openldap != null) "ldap" null) + (mkEnable (cups != null) "cups" null) + (mkEnable (cups != null) "iprint" null) + (mkWith (pam != null) "pam" null) + (mkWith (pam != null) "pam_smbpass" null) + (mkWith true "quotas" null) + (mkWith true "sendfile-support" null) + (mkWith true "utmp" null) + (mkWith true "utmp" null) + (mkEnable true "pthreadpool" null) + (mkEnable (avahi != null) "avahi" null) + (mkWith true "iconv" null) + (mkWith (acl != null) "acl-support" null) + (mkWith true "dnsupdate" null) + (mkWith true "syslog" null) + (mkWith true "automount" null) + (mkWith (libaio != null) "aio-support" null) + (mkWith (fam != null) "fam" null) + (mkWith (libarchive != null) "libarchive" null) + (mkWith true "cluster-support" null) + (mkWith (ncurses != null) "regedit" null) + (mkWith ceph "libcephfs" ceph) + (mkEnable (glusterfs != null) "glusterfs" null) # dynconfig/wscript options - "--enable-fhs" - "--sysconfdir=/etc" - "--localstatedir=/var" + (mkEnable true "fhs" null) + (mkOther "sysconfdir" "/etc") + (mkOther "localstatedir" "/var") # buildtools/wafsamba/wscript options - "--bundled-libraries=${if kerberos != null && kerberos.implementation == "heimdal" then "NONE" else "com_err"}" - "--private-libraries=NONE" - "--builtin-libraries=replace" - ] ++ (if libiconv != null then [ "--with-libiconv=${libiconv}" ] else [ ]) - ++ (if gettext != null then [ "--with-gettext=${gettext}" ] else [ "--without-gettext" ]) ++ [ + (mkOther "bundled-libraries" bundledLibs) + (mkOther "private-libraries" "NONE") + (mkOther "builtin-libraries" "replace") + (mkWith libiconv "libiconv" libiconv) + (mkWith (gettext != null) "gettext" gettext) # source4/lib/tls/wscript options - ] ++ (if gnutls != null && libgcrypt != null && libgpgerror != null - then [ "--enable-gnutls" ] else [ "--disable-gnutls" ]) ++ [ + (mkEnable hasGnutls "gnutls" null) # wscript options - ] ++ stdenv.lib.optional (kerberos != null && kerberos.implementation == "krb5") "--with-system-mitkrb5" - ++ stdenv.lib.optional (kerberos == null) "--without-ad-dc" ++ [ + (mkWith isKrb5OrNull "system-mitkrb5" null) + (if hasGnutls then null else "--without-ad-dc") # ctdb/wscript - "--enable-infiniband" - "--enable-pmda" + (mkEnable hasInfinibandOrNull "infiniband" null) + (mkEnable null "pmda" null) ]; stripAllList = [ "bin" "sbin" ]; + postInstall = '' + # Remove unecessary components + rm -r $out/{lib,share}/ctdb-tests + rm $out/bin/ctdb_run{_cluster,}_tests + ''; + postFixup = '' export SAMBA_LIBS="$(find $out -type f -name \*.so -exec dirname {} \; | sort | uniq)" read -r -d "" SCRIPT << EOF diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 23a09f1d54e..4edf66d80d4 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -55,13 +55,48 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + outputs = [ "out" "lib" ]; + prePatch = '' substituteInPlace cmake/libutils.cmake \ --replace /usr/bin/libtool libtool + sed -i "s,SET(DEFAULT_MYSQL_HOME.*$,SET(DEFAULT_MYSQL_HOME /not/a/real/dir),g" CMakeLists.txt + sed -i "s,SET(PLUGINDIR.*$,SET(PLUGINDIR $lib/lib/mysql/plugin),g" CMakeLists.txt + + sed -i "s,SET(pkgincludedir.*$,SET(pkgincludedir $lib/include),g" scripts/CMakeLists.txt + sed -i "s,SET(pkglibdir.*$,SET(pkglibdir $lib/lib),g" scripts/CMakeLists.txt + sed -i "s,SET(pkgplugindir.*$,SET(pkgplugindir $lib/lib/mysql/plugin),g" scripts/CMakeLists.txt + + sed -i "s,set(libdir.*$,SET(libdir $lib/lib),g" storage/mroonga/vendor/groonga/CMakeLists.txt + sed -i "s,set(includedir.*$,SET(includedir $lib/include),g" storage/mroonga/vendor/groonga/CMakeLists.txt + sed -i "/\"\$[{]CMAKE_INSTALL_PREFIX}\/\$[{]GRN_RELATIVE_PLUGINS_DIR}\"/d" storage/mroonga/vendor/groonga/CMakeLists.txt + sed -i "s,set(GRN_PLUGINS_DIR.*$,SET(GRN_PLUGINS_DIR $lib/\$\{GRN_RELATIVE_PLUGINS_DIR}),g" storage/mroonga/vendor/groonga/CMakeLists.txt + sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt ''; + postInstall = '' substituteInPlace $out/bin/mysql_install_db \ --replace basedir=\"\" basedir=\"$out\" + + # Remove superfluous files + rm -r $out/mysql-test $out/sql-bench $out/data + rm $out/share/man/man1/mysql-test-run.pl.1 + rm $out/bin/rcmysql + find $out/bin -name \*test\* -exec rm {} \; + + # Separate libs and includes into their own derivation + mkdir -p $lib + mv $out/lib $lib + mv $out/include $lib + + # Add mysql_config to libs since configure scripts use it + mkdir -p $lib/bin + cp $out/bin/mysql_config $lib/bin + sed -i "/\(execdir\|bindir\)/ s,'[^\"']*',$lib/bin,g" $lib/bin/mysql_config + + # Make sure to propagate lib for compatability + mkdir -p $out/nix-support + echo "$lib" > $out/nix-support/propagated-native-build-inputs ''; passthru.mysqlVersion = "5.6"; diff --git a/pkgs/servers/sql/mysql/5.1.x.nix b/pkgs/servers/sql/mysql/5.1.x.nix index 3389f811489..caf6149e62c 100644 --- a/pkgs/servers/sql/mysql/5.1.x.nix +++ b/pkgs/servers/sql/mysql/5.1.x.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ps, ncurses, zlib, perl, openssl}: +{ stdenv, fetchurl, ps, ncurses, zlib, perl, openssl }: # Note: zlib is not required; MySQL can use an internal zlib. @@ -10,16 +10,21 @@ stdenv.mkDerivation rec { sha256 = "1dfwi4ck0vq6sdci6gz0031s7zz5lc3pddqlgm0292s00l9y5sq5"; }; - buildInputs = [ncurses zlib perl openssl] ++ stdenv.lib.optional stdenv.isLinux ps; + buildInputs = [ ncurses zlib perl openssl ] ++ stdenv.lib.optional stdenv.isLinux ps; - configureFlags = "--enable-thread-safe-client --with-ssl=${openssl} --with-embedded-server --with-plugins=max-no-ndb" + - (if stdenv.system == "x86_64-linux" then " --with-lib-ccflags=-fPIC" else ""); + configureFlags = [ + "--enable-thread-safe-client" + "--with-ssl=${openssl}" + "--with-embedded-server" + "--with-plugins=max-no-ndb" + "--with-unix-socket-path=/run/mysqld/mysqld.sock" + ] ++ stdenv.lib.optional (stdenv.system == "x86_64-linux") " --with-lib-ccflags=-fPIC"; NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; NIX_CFLAGS_CXXFLAGS = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; - patches = [./abi_check.patch]; + patches = [ ./abi_check.patch ]; postInstall = '' diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 842d38e8dc5..d25882b826e 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.5.40"; + version = "5.5.42"; src = fetchurl { - url = "http://cdn.mysql.com/archives/mysql-5.5/${name}.tar.gz"; - sha256 = "0q29nzmmxm78b89qjfzgm93r0glaam3xw3zfx1k8ihii39v22dsd"; + url = "http://mysql.mirrors.pair.com/Downloads/MySQL-5.5/${name}.tar.gz"; + sha256 = "0jn7py2wsq78rwi7vfihxs6z3h5hr338b9g46fl3z2g4ddki4yw8"; }; preConfigure = stdenv.lib.optional stdenv.isDarwin '' @@ -27,15 +27,19 @@ stdenv.mkDerivation rec { "-DWITH_EMBEDDED_SERVER=yes" "-DWITH_ZLIB=yes" "-DHAVE_IPV6=yes" - "-DINSTALL_DOCDIR=share/doc/mysql" - "-DINSTALL_DOCREADMEDIR=share/doc/mysql" - "-DINSTALL_INCLUDEDIR=include/mysql" - "-DINSTALL_INFODIR=share/doc/mysql" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DMYSQL_DATADIR=/var/lib/mysql" + "-DINSTALL_SYSCONFDIR=etc/mysql" + "-DINSTALL_INFODIR=share/mysql/docs" "-DINSTALL_MANDIR=share/man" - "-DINSTALL_MYSQLSHAREDIR=share/mysql" - "-DINSTALL_MYSQLPLUGINDIR=lib/mysql/plugin" + "-DINSTALL_PLUGINDIR=lib/mysql/plugin" "-DINSTALL_SCRIPTDIR=bin" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_DOCREADMEDIR=share/mysql" "-DINSTALL_SUPPORTFILESDIR=share/mysql" + "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_DOCDIR=share/mysql/docs" + "-DINSTALL_SHAREDIR=share/mysql" ]; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index c0b8403a9bc..e39fe85fa6a 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { homepage = http://pgpool.net/mediawiki/index.php; description = "a middleware that works between postgresql servers and postgresql clients."; license = licenses.free; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index 8c973f0e53a..2422d2bb4f7 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, libxcomp }: +{ stdenv, fetchurl, autoreconfHook, libxcomp }: let version = "3.5.0.31"; in stdenv.mkDerivation { @@ -17,11 +17,10 @@ stdenv.mkDerivation { maintainers = with maintainers; [ nckx ]; }; - buildInputs = [ autoconf libxcomp ]; + buildInputs = [ autoreconfHook libxcomp ]; - preConfigure = '' + preAutoreconf = '' cd nxproxy/ - autoconf ''; makeFlags = [ "exec_prefix=$(out)" ]; diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix index 40882f04d16..9512a917d85 100644 --- a/pkgs/tools/backup/attic/default.nix +++ b/pkgs/tools/backup/attic/default.nix @@ -5,8 +5,9 @@ python3Packages.buildPythonPackage rec { namePrefix = ""; src = fetchzip { + name = "${name}-src"; url = "https://github.com/jborg/attic/archive/0.14.tar.gz"; - sha256 = "17y7kihykaf84sy9cm00fn4wcc7rnhv2792kcwplylz7dsm7ksiw"; + sha256 = "1ij99dmd571rvk3kz97vs7wbjj2pbbd54l310lydnwywxhqs8hrv"; }; propagatedBuildInputs = with python3Packages; diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 5342b4f489d..55c84a1015f 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig nettools gettext readline openssl python - ncurses sqlite postgresql mysql zlib lzo acl glusterfs ceph libcap + ncurses sqlite postgresql mysql.lib zlib lzo acl glusterfs ceph libcap ]; postPatch = '' @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" - "--localstatedir=/var" "--exec-prefix=\${out}" "--enable-lockmgr" "--enable-dynamic-storage-backends" @@ -55,24 +54,18 @@ stdenv.mkDerivation rec { ++ optional (openssl != null) "--with-openssl=${openssl}" ++ optional (sqlite != null) "--with-sqlite3=${sqlite}" ++ optional (postgresql != null) "--with-postgresql=${postgresql}" - ++ optional (mysql != null) "--with-mysql=${mysql}" + ++ optional (mysql != null) "--with-mysql=${mysql.lib}" ++ optional (zlib != null) "--with-zlib=${zlib}" ++ optional (lzo != null) "--with-lzo=${lzo}" ++ optional (acl != null) "--enable-acl" ++ optional (glusterfs != null) "--with-glusterfs=${glusterfs}" ++ optional (ceph != null) "--with-cephfs=${ceph}"; - installFlags = [ "DESTDIR=\${out}" ]; - - postInstall = '' - mv $out/$out/* $out - DIR=$out/$out - while rmdir $DIR 2>/dev/null; do - DIR="$(dirname "$DIR")" - done - - rm -rf /tmp /var - ''; + installFlags = [ + "sysconfdir=\${out}/etc" + "working_dir=\${TMPDIR}" + "log_dir=\${TMPDIR}" + ]; meta = with stdenv.lib; { homepage = http://www.bareos.org/; diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 41e40e79954..79f394c2aac 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -2,14 +2,14 @@ , lockfile, setuptools }: let - version = "0.6.25"; + version = "0.7.02"; in stdenv.mkDerivation { name = "duplicity-${version}"; src = fetchurl { - url = "http://code.launchpad.net/duplicity/0.6-series/${version}/+download/duplicity-${version}.tar.gz"; - sha256 = "098p5j7clbaya3yq7q05n6xv7h1qs8iffxwvlisyfpqwpi5g8i5c"; + url = "http://code.launchpad.net/duplicity/0.7-series/${version}/+download/duplicity-${version}.tar.gz"; + sha256 = "0fh3xl4xc7cpi7iam34qd0ndqp1641kfw2609yp40lr78fx65530"; }; installPhase = '' diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix new file mode 100644 index 00000000000..d7773b0ba0c --- /dev/null +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify +, libcanberra_gtk3, intltool, gnome3, makeWrapper, dvdauthor, cdrdao +, dvdplusrwtools, cdrtools, libdvdcss }: + +let + major = "3.12"; + minor = "0"; + GST_PLUGIN_PATH = stdenv.lib.makeSearchPath "lib/gstreamer-1.0" [ + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-libav ]; + +in stdenv.mkDerivation rec { + version = "${major}.${minor}"; + name = "brasero-${version}"; + + src = fetchurl { + url = "http://download.gnome.org/sources/brasero/${major}/${name}.tar.xz"; + sha256 = "68fef2699b772fa262d855dac682100dbfea05563a7e4056eff8fe6447aec2fc"; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard dvdauthor + cdrdao dvdplusrwtools cdrtools ]; + + buildInputs = [ pkgconfig gtk3 itstool libxml2 libnotify libcanberra_gtk3 + intltool gnome3.gsettings_desktop_schemas makeWrapper libdvdcss + gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.dconf + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad ]; + + # brasero checks that the applications it uses aren't symlinks, but this + # will obviously not work on nix + patches = [ ./remove-symlink-check.patch ]; + + configureFlags = [ + "--with-girdir=$out/share/gir-1.0" + "--with-typelibdir=$out/lib/girepository-1.0" ]; + + preFixup = '' + for f in $out/bin/* $out/libexec/*; do + wrapProgram "$f" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --prefix GST_PLUGIN_PATH : "${GST_PLUGIN_PATH}" \ + --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \ + --prefix LD_LIBRARY_PATH : ${libdvdcss}/lib + done + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = with stdenv.lib; { + description = "A Gnome CD/DVD Burner"; + homepage = https://wiki.gnome.org/Apps/Brasero; + maintainers = [ maintainers.bdimcheff ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/cd-dvd/brasero/remove-symlink-check.patch b/pkgs/tools/cd-dvd/brasero/remove-symlink-check.patch new file mode 100644 index 00000000000..028ac12c4a0 --- /dev/null +++ b/pkgs/tools/cd-dvd/brasero/remove-symlink-check.patch @@ -0,0 +1,29 @@ +diff --git a/libbrasero-burn/burn-plugin.c b/libbrasero-burn/burn-plugin.c +index f97bc5f..88e9d35 100644 +--- a/libbrasero-burn/burn-plugin.c ++++ b/libbrasero-burn/burn-plugin.c +@@ -221,21 +221,10 @@ brasero_plugin_test_app (BraseroPlugin *plugin, + return; + } + +- /* make sure that's not a symlink pointing to something with another +- * name like wodim. +- * NOTE: we used to test the target and see if it had the same name as +- * the symlink with GIO. The problem is, when the symlink pointed to +- * another symlink, then GIO didn't follow that other symlink. And in +- * the end it didn't work. So forbid all symlink. */ +- if (g_file_test (prog_path, G_FILE_TEST_IS_SYMLINK)) { +- brasero_plugin_add_error (plugin, +- BRASERO_PLUGIN_ERROR_SYMBOLIC_LINK_APP, +- name); +- g_free (prog_path); +- return; +- } ++ /* disable symlink check on nixos */ ++ + /* Make sure it's a regular file */ +- else if (!g_file_test (prog_path, G_FILE_TEST_IS_REGULAR)) { ++ if (!g_file_test (prog_path, G_FILE_TEST_IS_REGULAR)) { + brasero_plugin_add_error (plugin, + BRASERO_PLUGIN_ERROR_MISSING_APP, + name); diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index c89909503d5..d7d9fc0c0a2 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -1,14 +1,12 @@ { stdenv, fetchurl, valgrind }: stdenv.mkDerivation rec { - # The r127 source still calls itself r126 everywhere, but I'm not going to - # patch over such silly cosmetic oversights in an official release. -- nckx - version = "127"; + version = "128"; name = "lz4-${version}"; src = fetchurl { url = "https://github.com/Cyan4973/lz4/archive/r${version}.tar.gz"; - sha256 = "0hvbbr07j4hfix4dn4xw4fsmkr5s02bj596fn0i15d1i49xby2aj"; + sha256 = "1lf7a0gqm2q7p1qs28lmajmls3pwfk2p0w3hljjlmshbkndaj26b"; }; # valgrind is required only by `make test` @@ -20,6 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; + checkFlags = "-j1"; # required since version 128 meta = with stdenv.lib; { description = "Extremely fast compression algorithm"; diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix index 894ca2ef28d..d178be0f0fa 100644 --- a/pkgs/tools/filesystems/duff/default.nix +++ b/pkgs/tools/filesystems/duff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, gettext }: +{ stdenv, fetchurl, autoreconfHook, gettext }: stdenv.mkDerivation rec { name = "duff-${version}"; @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "149dd80f9758085ed199c37aa32ad869409fa5e2c8da8a51294bd64ca886e058"; }; - buildInputs = [ autoconf automake gettext ]; + buildInputs = [ autoreconfHook gettext ]; - preConfigure = '' + preAutoreconf = '' # duff is currently badly packaged, requiring us to do extra work here that # should be done upstream. If that is ever fixed, this entire phase can be # removed along with all buildInputs. @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { ./gettextize sed 's@po/Makefile.in\( .*\)po/Makefile.in@po/Makefile.in \1@' \ -i configure.ac - autoreconf -i ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index ebec72c6d0a..bf108ad42ab 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -3,7 +3,7 @@ let sourceInfo = rec { version = "2.2.3"; url = "http://nilfs.sourceforge.net/download/nilfs-utils-${version}.tar.bz2"; - sha256 = "17s7d2rdb6fwrfvpif573c8n0i4f21m09pzqdsc0kyy1qqdgnc1v"; + sha256 = "1sv0p5d9ivik7lhrdynf6brma66llcvn11zhzasws12n4sfk6k6q"; baseName = "nilfs-utils"; name = "${baseName}-${version}"; }; diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix new file mode 100644 index 00000000000..fa034968911 --- /dev/null +++ b/pkgs/tools/filesystems/zerofree/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, e2fsprogs }: + +stdenv.mkDerivation rec { + name = "zerofree-1.0.3"; + + src = fetchurl { + url = "http://intgat.tigress.co.uk/rmy/uml/zerofree-1.0.3.tgz"; + sha256 = "3acfda860be0f0ddcb5c982ff3b4475b1ee8cc35a90ae2a910e93261dbe0ccf6"; + }; + + buildInputs = [ e2fsprogs ]; + + installPhase = '' + mkdir -p $out/bin + cp zerofree $out/bin +''; + + meta = { + homepage = http://intgat.tigress.co.uk/rmy/uml/index.html; + description = "zero free blocks from ext2, ext3 and ext4 file-systems"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.theuni ]; + }; +} diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix index 591a85c2447..826f1a56055 100644 --- a/pkgs/tools/graphics/pdf2svg/default.nix +++ b/pkgs/tools/graphics/pdf2svg/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1jy6iqwwvd7drcybmdlmnc8m970f82fd7fisa8ha5zh13p49r8n2"; }; - buildInputs = [ cairo pkgconfig poppler.poppler_glib gtk ]; + buildInputs = [ cairo pkgconfig poppler gtk ]; meta = { description = "PDF converter to SVG format"; diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 320115b4f2d..a2edb1f842e 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.1.1"; + version = "2.1.1.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/execline"; rev = "refs/tags/v${version}"; - sha256 = "06fn4fb8hp68pffgfc55l5raph3bk9v0gngbgxfyzkmwbb1gxhll"; + sha256 = "0yhxyih8p6p9135nifi655qk4gnhdarjzfp1lb4pxx9ar9ay5q7w"; }; dontDisableStatic = true; diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index e166d2e93c9..886495a27eb 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, lib , autoconf, automake, gnum4, libtool, git, perl, gnulib, uthash, pkgconfig, gettext -, python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2 +, python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango , withGTK ? false, gtk2 , withPython ? false # python-scripting was breaking inconsolata and libertine builds }: @@ -30,7 +30,9 @@ stdenv.mkDerivation { git autoconf automake gnum4 libtool perl pkgconfig gettext uthash python freetype zlib glib libungif libpng libjpeg libtiff libxml2 ] - ++ lib.optionals withGTK [ gtk2 ]; + ++ lib.optionals withGTK [ gtk2 ] + # I'm not sure why pango doesn't seem necessary on Linux + ++ lib.optionals stdenv.isDarwin [ pango ]; configureFlags = lib.optionals (!withPython) [ "--disable-python-scripting" "--disable-python-extension" ] diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index e4557e6ae0b..e5c814faa4a 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -2,11 +2,11 @@ , pkgconfig, gtkmm, libxml2 }: stdenv.mkDerivation rec { - name = "gparted-0.21.0"; + name = "gparted-0.22.0"; src = fetchurl { + sha256 = "09vg5lxvh81x54ps5ayfjd4jl84wprn42i1wifnfmj44dqd5wxda"; url = "mirror://sourceforge/gparted/${name}.tar.bz2"; - sha256 = "1ab56pplnlnqnhvvgfx1s47g9iz78sb048xlwv7v7hzzx16c73rr"; }; configureFlags = "--disable-doc"; @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { parted gtk glib intltool gettext libuuid pkgconfig gtkmm libxml2 ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = with stdenv.lib; { description = "Graphical disk partitioning tool"; longDescription = '' diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index 9e6c31c055f..452b6c981ff 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - version = "1.7"; + version = "1.9"; name = "grc-${version}"; src = fetchurl { url = "http://korpus.juls.savba.sk/~garabik/software/grc/grc_${version}.orig.tar.gz"; - sha256 = "01hpvs5915ajcswm7kg4167qsa9kbg0snxxj5k3ymkz6c567dp70"; + sha256 = "0nsgqpijhpinnzscmpnhcjahv8yivz0g65h8zsly2md23ibnwqj1"; }; installPhase = '' @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Yet another colouriser for beautifying your logfiles or output of commands"; homepage = http://korpus.juls.savba.sk/~garabik/software/grc.html; license = licenses.gpl2; - maintainers = with maintainers; [ lovek323 ]; + maintainers = with maintainers; [ lovek323 AndersonTorres ]; platforms = platforms.unix; longDescription = '' diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix new file mode 100644 index 00000000000..7ee6089c249 --- /dev/null +++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -0,0 +1,53 @@ +{ fetchurl, stdenv, xlibs, freetype, fontconfig, mesa, glibc, makeWrapper }: + +let + system = if stdenv.system == "x86_64-linux" then "linux64" else "linux32"; +in +stdenv.mkDerivation rec { + name = "ocz-ssd-guru-${version}"; + version = "1.0.1170"; + + src = fetchurl { + url = "http://ocz.com/consumer/download/ssd-guru/SSDGuru_${version}.tar.gz"; + sha256 = "0ri7qmpc1xpy12lpzl6k298c641wcibcwrzz8jn75wdg4rr176r5"; + }; + + buildInputs = [ makeWrapper ]; + + libPath = stdenv.lib.makeLibraryPath [ + xlibs.libX11 + xlibs.libxcb + freetype + fontconfig + xlibs.libXext + xlibs.libXi + xlibs.libXrender + stdenv.cc.cc + glibc + mesa + ]; + + installPhase = '' + mkdir -p $out/bin + cp ${system}/SSDGuru $out/bin/ + rm -rf linux{32,64} + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath $libPath:$out \ + $out/bin/SSDGuru + + wrapProgram $out/bin/SSDGuru --prefix LD_LIBRARY_PATH : $libPath + ''; + + dontStrip = true; + dontPatchELF = true; + + meta = { + homepage = http://ocz.com/ssd-guru; + description = "SSD Management Tool for OCZ disks"; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ jagajaga ]; + }; + +} diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index a94cdea1339..a2d8c535d06 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - name = "pv-1.5.7"; + name = "pv-1.6.0"; src = fetchurl { url = "http://www.ivarch.com/programs/sources/${name}.tar.bz2"; - sha256 = "15srxzyssr8l25bl3rws476nx3fl58bdlh55gyv8cc3hpdhm0ly8"; + sha256 = "13gg6r84pkvznpd1l11qw1jw9yna40gkgpni256khyx21m785khf"; }; meta = { diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 755cfce3d8b..9aaf928b7b0 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.0.0"; + version = "2.0.4.0"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz"; - sha256 = "1vszqaqkyhz1v69pxls3c7y1qs8wjkdylpg0yz183xlirywimwwk"; + sha256 = "0gl4v6hslqkxdfxj3qzi1xpiiw52ic8y8l9nkl2z5gp893qb6yvx"; }; dontDisableStatic = true; diff --git a/pkgs/tools/misc/sl/default.nix b/pkgs/tools/misc/sl/default.nix index aa35461a7a9..f5bc2edf3ca 100644 --- a/pkgs/tools/misc/sl/default.nix +++ b/pkgs/tools/misc/sl/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { url = https://github.com/mtoyoda/sl/blob/master/LICENSE; }; description = "Steam Locomotive runs across your terminal when you type 'sl'"; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/tools/misc/tmuxinator/Gemfile b/pkgs/tools/misc/tmuxinator/Gemfile new file mode 100644 index 00000000000..5fa4859adfc --- /dev/null +++ b/pkgs/tools/misc/tmuxinator/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem 'tmuxinator' diff --git a/pkgs/tools/misc/tmuxinator/Gemfile.lock b/pkgs/tools/misc/tmuxinator/Gemfile.lock new file mode 100644 index 00000000000..6f05b475ff2 --- /dev/null +++ b/pkgs/tools/misc/tmuxinator/Gemfile.lock @@ -0,0 +1,14 @@ +GEM + remote: https://rubygems.org/ + specs: + erubis (2.7.0) + thor (0.19.1) + tmuxinator (0.6.9) + erubis (~> 2.6) + thor (~> 0.19, >= 0.15.0) + +PLATFORMS + ruby + +DEPENDENCIES + tmuxinator diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix new file mode 100644 index 00000000000..96610c32167 --- /dev/null +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -0,0 +1,18 @@ +{ stdenv, lib, bundlerEnv, ruby }: + +bundlerEnv { + name = "tmuxinator-0.6.9"; + + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = with lib; { + description = "Manage complex tmux sessions easily"; + homepage = https://github.com/tmuxinator/tmuxinator; + license = with licenses; mit; + maintainers = with maintainers; [ auntie ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/tmuxinator/gemset.nix b/pkgs/tools/misc/tmuxinator/gemset.nix new file mode 100644 index 00000000000..1b5b1605c4c --- /dev/null +++ b/pkgs/tools/misc/tmuxinator/gemset.nix @@ -0,0 +1,27 @@ +{ + "erubis" = { + version = "2.7.0"; + source = { + type = "gem"; + sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; + }; + }; + "thor" = { + version = "0.19.1"; + source = { + type = "gem"; + sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; + }; + }; + "tmuxinator" = { + version = "0.6.9"; + source = { + type = "gem"; + sha256 = "0q0ld82dznjsan7ciblfsxz59brcc16fwmvr9n3c7vdcndj8rd27"; + }; + dependencies = [ + "erubis" + "thor" + ]; + }; +} \ No newline at end of file diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index d6d8fa084be..60d31fec8c3 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,18 +1,16 @@ { stdenv, fetchurl, makeWrapper, python, zip, pandoc, ffmpeg }: -let - version = "2015.03.24"; -in +with stdenv.lib; stdenv.mkDerivation rec { name = "youtube-dl-${version}"; + version = "2015.04.03"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "1m462hcgizdp59s9h62hjwhq4vjrgmck23x2bh5jvb9vjpcfqjxv"; + sha256 = "0ndzswv6vq5ld5p1ny23sh76cx6acf8yli9gi9r21dm94ida2885"; }; - buildInputs = [ python makeWrapper ]; - nativeBuildInputs = [ zip pandoc ]; + buildInputs = [ python makeWrapper zip pandoc ]; patchPhase = '' rm youtube-dl @@ -31,9 +29,14 @@ stdenv.mkDerivation rec { homepage = "http://rg3.github.com/youtube-dl/"; repositories.git = https://github.com/rg3/youtube-dl.git; description = "Command-line tool to download videos from YouTube.com and other sites"; - license = stdenv.lib.licenses.unlicense; - - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ bluescreen303 simons phreedom AndersonTorres fuuzetsu ]; + longDescription = '' + youtube-dl is a small, Python-based command-line program + to download videos from YouTube.com and a few more sites. + youtube-dl is released to the public domain, which means + you can modify it, redistribute it or use it however you like. + ''; + license = licenses.publicDomain; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ bluescreen303 simons phreedom AndersonTorres fuuzetsu ]; }; } diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 73359cb36a9..efd04e33d7f 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libxml2, sqlite, zlib }: +{ stdenv, fetchurl, pkgconfig, cacert, c-ares, openssl, libxml2, sqlite, zlib }: stdenv.mkDerivation rec { name = "aria2-${version}"; @@ -9,7 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1vvc3pv1100xb4293bmgqpxvy3pdvivnz415b9q78n7190kag3a5"; }; - buildInputs = [ pkgconfig openssl libxml2 sqlite zlib ]; + buildInputs = [ pkgconfig c-ares openssl libxml2 sqlite zlib ]; + + propagatedBuildInputs = [ cacert ]; + + configureFlags = [ "--with-ca-bundle=${cacert}/etc/ca-bundle.crt" ]; meta = with stdenv.lib; { homepage = http://aria2.sourceforge.net/; diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index dc29697044a..911bb7197eb 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -2,14 +2,14 @@ , makeWrapper }: stdenv.mkDerivation rec { - version = "5.1.1"; + version = "5.2.3"; name = "dd-agent-${version}"; src = fetchFromGitHub { owner = "DataDog"; repo = "dd-agent"; rev = version; - sha256 = "17gj2bsnidwwmwfc0m2ll90sh28izpxz2wkczpnvzfiq0askdxmp"; + sha256 = "05flcbzpnmhf6qskkccbfk957sl9hhydlp4p5vqhs62hkpwmqwan"; }; buildInputs = [ python unzip makeWrapper pythonPackages.psycopg2 pythonPackages.ntplib pythonPackages.simplejson pythonPackages.pyyaml pythonPackages.requests ]; diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix new file mode 100644 index 00000000000..088e8e8de7f --- /dev/null +++ b/pkgs/tools/networking/i2p/default.nix @@ -0,0 +1,41 @@ +{ stdenv, procps, coreutils, fetchurl, openjdk8, ant, gcj, gettext }: + +# TODO: support other systems, just copy appropriate lib/wrapper.. to $out +assert stdenv.system != "x86_64-linux"; + +stdenv.mkDerivation rec { + name = "i2p-0.9.18"; + src = fetchurl { + url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; + sha256 = "1hahdzvfh1zqb8qdc59xbjpqm8qq95k2xx22mpnhcdh90lb6xqnl"; + }; + buildInputs = [ openjdk8 ant gcj gettext ]; + buildPhase = '' + export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" + ant preppkg-linux-only + ''; + installPhase = '' + set -B + mkdir -p $out/{bin,share} + cp -r pkg-temp/* $out + cp installer/lib/wrapper/linux64/* $out + sed -i $out/i2prouter -i $out/runplain.sh \ + -e "s#%INSTALL_PATH#$out#" \ + -e "s#/usr/ucb/ps#${procps}/bin/ps#" \ + -e "s#/usr/bin/tr#${coreutils}/bin/tr#" \ + -e 's#%USER_HOME#$HOME#' \ + -e "s#%SYSTEM_java_io_tmpdir#/tmp#" + mv $out/runplain.sh $out/bin/i2prouter-plain + mv $out/man $out/share/ + chmod +x $out/bin/* $out/i2psvc + rm $out/{osid,postinstall.sh,INSTALL-headless.txt} + ''; + + meta = with stdenv.lib; { + homepage = "https://geti2p.net"; + description = "Applications and router for I2P, anonymity over the Internet"; + maintainers = [ stdenv.lib.maintainers.joelmo ]; + licenses = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index b8d2deb626b..984e91e255f 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "i2pd-${version}"; - version = "0.8.0"; + version = "0.9.0"; src = fetchurl { name = "i2pd-src-${version}.tar.gz"; url = "https://github.com/PurpleI2P/i2pd/archive/${version}.tar.gz"; - sha256 = "1vw6s480lmxwhq0rx6d2lczb6d2j9f68hmv3ri9jwgp7bicy6ziz"; + sha256 = "1rcf4wc34g2alva9jzj6bz0f88g2f5v1w4418b6lp6chvqi7fhc7"; }; buildInputs = [ boost cryptopp ]; diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index 6dcb6e7f317..9b676c6b72e 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, geoip, getopt, openssl, perl }: +{ stdenv, fetchurl, geoip, geolite-legacy, getopt, openssl, perl }: stdenv.mkDerivation rec { version = "0.98.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "02r0r4lgz10ivbmgdzivj7dvry1aad75ik9vyy6irjvngjkzg5r3"; }; - buildInputs = [ geoip getopt openssl perl ]; + buildInputs = [ geoip geolite-legacy getopt openssl perl ]; patchPhase = '' for i in {,databases/}lib/Makefile.in; do @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --disable-dynamic-load --enable-shared --enable-geoip - --with-geoip-db=${geoip}/share/GeoIP + --with-geoip-db=${geolite-legacy}/share/GeoIP ''; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index b493bd74dae..d5695709a3c 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, openssl, pkgconfig, db }: stdenv.mkDerivation rec { - name = "isync-1.1.2"; + name = "isync-1.2.0"; src = fetchurl { url = "mirror://sourceforge/isync/${name}.tar.gz"; - sha256 = "1960ah3fmp75cakd06lcx50n5q0yvfsadjh3lffhyvjvj7ava9d2"; + sha256 = "0n8fwvv88h7ps7qs122kgh1yx5308765fiwqav5h7m272vg7hf43"; }; buildInputs = [ openssl pkgconfig db ]; diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 5326c9059de..0b57a752a37 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext gdbm libtool pam readline ncurses - gnutls mysql guile texinfo gnum4 ] + gnutls mysql.lib guile texinfo gnum4 ] ++ stdenv.lib.optional doCheck dejagnu; # Tests fail since gcc 4.8 diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix index 5ea6c8f6895..86eec455564 100644 --- a/pkgs/tools/networking/ndisc6/default.nix +++ b/pkgs/tools/networking/ndisc6/default.nix @@ -1,23 +1,30 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "ndisc6-1.0.2"; + name = "ndisc6-1.0.3"; src = fetchurl { url = "http://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2"; - sha256 = "0ynacanjhlib4japqmf7n2c0bv5f2qq6rx2nhk4kmylyrfhcikka"; + sha256 = "08f8xrsck2ykszp12yxx4ssf6wnkn7l6m59456hw3vgjyp5dch8g"; }; buildInputs = [ perl ]; - configureFlags = "--localstatedir=/var"; + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; - installFlags = "localstatedir=$(TMPDIR)"; + installFlags = [ + "sysconfdir=\${out}/etc" + "localstatedir=$(TMPDIR)" + ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.remlab.net/ndisc6/; description = "A small collection of useful tools for IPv6 networking"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ eelco wkennington ]; + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index e8436c040fd..196c176018a 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchFromGitHub, bison, flex, libcli, libnet +{ stdenv, fetchFromGitHub, bison, flex, geoip, geolite-legacy, libcli, libnet , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl , pkgconfig, zlib }: stdenv.mkDerivation rec { - version = "0.5.9-rc4-49-g6f54288"; + version = "v0.5.9-rc4-53-gdd5d906"; name = "netsniff-ng-${version}"; src = fetchFromGitHub rec { # Upstream recommends and supports git repo = "netsniff-ng"; owner = repo; - rev = "6f542884d002d55d517a50dd9892068e95400b25"; - sha256 = "0j7rqigfn9zazmzi8w3hapzi8028jr3q27lwyjw7k7lpnayj5iaa"; + rev = "dd5d906c40db5264d8d33c37565b39540f0258c8"; + sha256 = "0iwnfjbxiv10zk5mfpnvs2xb88f14hv1a156kn9mhasszknp0a57"; }; - buildInputs = [ bison flex libcli libnet libnl libnetfilter_conntrack - libpcap libsodium liburcu ncurses perl pkgconfig zlib ]; + buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl + libnetfilter_conntrack libpcap libsodium liburcu ncurses perl + pkgconfig zlib ]; # ./configure is not autoGNU but some home-brewn magic configurePhase = '' @@ -25,9 +26,19 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Tries to install to /etc, but they're more like /share files anyway + # All files installed to /etc are just static data that can go in the store makeFlags = "PREFIX=$(out) ETCDIR=$(out)/etc"; + postInstall = '' + ln -sv ${geolite-legacy}/share/GeoIP/GeoIP.dat $out/etc/netsniff-ng/country4.dat + ln -sv ${geolite-legacy}/share/GeoIP/GeoIPv6.dat $out/etc/netsniff-ng/country6.dat + ln -sv ${geolite-legacy}/share/GeoIP/GeoLiteCity.dat $out/etc/netsniff-ng/city4.dat + ln -sv ${geolite-legacy}/share/GeoIP/GeoLiteCityv6.dat $out/etc/netsniff-ng/city6.dat + ln -sv ${geolite-legacy}/share/GeoIP/GeoIPASNum.dat $out/etc/netsniff-ng/asname4.dat + ln -sv ${geolite-legacy}/share/GeoIP/GeoIPASNumv6.dat $out/etc/netsniff-ng/asname6.dat + rm -v $out/etc/netsniff-ng/geoip.conf # updating databases after installation is impossible + ''; + meta = with stdenv.lib; { description = "Swiss army knife for daily Linux network plumbing"; longDescription = '' diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index d289695398c..56c0dd1363a 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -2,7 +2,8 @@ , libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas , makeWrapper, networkmanager_openvpn, networkmanager_vpnc -, networkmanager_openconnect, networkmanager_pptp, udev, hicolor_icon_theme, dconf }: +, networkmanager_openconnect, networkmanager_pptp, networkmanager_l2tp +, udev, hicolor_icon_theme, dconf }: let pn = "network-manager-applet"; @@ -37,16 +38,19 @@ stdenv.mkDerivation rec { ln -s ${networkmanager_vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name $out/etc/NetworkManager/VPN/nm-vpnc-service.name ln -s ${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name $out/etc/NetworkManager/VPN/nm-openconnect-service.name ln -s ${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name $out/etc/NetworkManager/VPN/nm-pptp-service.name + ln -s ${networkmanager_l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name $out/etc/NetworkManager/VPN/nm-l2tp-service.name mkdir -p $out/lib/NetworkManager ln -s ${networkmanager_openvpn}/lib/NetworkManager/* $out/lib/NetworkManager/ ln -s ${networkmanager_vpnc}/lib/NetworkManager/* $out/lib/NetworkManager/ ln -s ${networkmanager_openconnect}/lib/NetworkManager/* $out/lib/NetworkManager/ ln -s ${networkmanager_pptp}/lib/NetworkManager/* $out/lib/NetworkManager/ + ln -s ${networkmanager_l2tp}/lib/NetworkManager/* $out/lib/NetworkManager/ mkdir -p $out/libexec ln -s ${networkmanager_openvpn}/libexec/* $out/libexec/ ln -s ${networkmanager_vpnc}/libexec/* $out/libexec/ ln -s ${networkmanager_openconnect}/libexec/* $out/libexec/ ln -s ${networkmanager_pptp}/libexec/* $out/libexec/ + ln -s ${networkmanager_l2tp}/libexec/* $out/libexec/ ''; preFixup = '' diff --git a/pkgs/tools/networking/network-manager/l2tp-purity.patch b/pkgs/tools/networking/network-manager/l2tp-purity.patch new file mode 100644 index 00000000000..c9117c5325b --- /dev/null +++ b/pkgs/tools/networking/network-manager/l2tp-purity.patch @@ -0,0 +1,26 @@ +diff --git a/src/nm-l2tp-service.c b/src/nm-l2tp-service.c +index d2c9dc4..e61d3d2 100644 +--- a/src/nm-l2tp-service.c ++++ b/src/nm-l2tp-service.c +@@ -655,9 +655,7 @@ nm_find_ipsec (void) + { + static const char *ipsec_binary_paths[] = + { +- "/sbin/ipsec", +- "/usr/sbin/ipsec", +- "/usr/local/sbin/ipsec", ++ "@strongswan@/bin/ipsec", + NULL + }; + +@@ -677,9 +675,7 @@ nm_find_l2tpd (void) + { + static const char *l2tp_binary_paths[] = + { +- "/sbin/xl2tpd", +- "/usr/sbin/xl2tpd", +- "/usr/local/sbin/xl2tpd", ++ "@xl2tpd@/bin/xl2tpd", + NULL + }; + diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix new file mode 100644 index 00000000000..a104f321c12 --- /dev/null +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, substituteAll, automake, autoconf, libtool, intltool, pkgconfig +, networkmanager, ppp, xl2tpd, strongswan +, withGnome ? true, gnome3 }: + +stdenv.mkDerivation rec { + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-l2tp"; + version = "0.9.8.7"; + + src = fetchFromGitHub { + owner = "seriyps"; + repo = "NetworkManager-l2tp"; + rev = version; + sha256 = "07gl562p3f6l2wn64f3vvz1ygp3hsfhiwh4sn04c3fahfdys69zx"; + }; + + buildInputs = [ networkmanager ppp ] + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ]; + + nativeBuildInputs = [ automake autoconf libtool intltool pkgconfig ]; + + configureScript = "./autogen.sh"; + + configureFlags = + if withGnome then "--with-gnome" else "--without-gnome"; + + postConfigure = "sed 's/-Werror//g' -i Makefile */Makefile"; + + patches = + [ ( substituteAll { + src = ./l2tp-purity.patch; + inherit xl2tpd strongswan; + }) + ]; + + meta = with stdenv.lib; { + description = "L2TP plugin for NetworkManager"; + inherit (networkmanager.meta) platforms; + license = licenses.gpl2; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/tools/networking/network-manager/nixos-purity.patch b/pkgs/tools/networking/network-manager/nixos-purity.patch index 505dd8b2b3c..831b2010fcf 100644 --- a/pkgs/tools/networking/network-manager/nixos-purity.patch +++ b/pkgs/tools/networking/network-manager/nixos-purity.patch @@ -47,7 +47,7 @@ index 1dc94ee..e60f3c8 100644 for (iter = modules; *iter; iter++) { - char *argv[3] = { "/sbin/modprobe", *iter, NULL }; -+ char *argv[3] = { "/var/run/current-system/sw/sbin/modprobe", *iter, NULL }; ++ char *argv[3] = { "/var/run/current-system/sw/bin/modprobe", *iter, NULL }; char *envp[1] = { NULL }; GError *error = NULL; @@ -71,7 +71,7 @@ index 59698c3..7dba0f7 100644 /* Make sure /dev/ppp exists (bgo #533064) */ if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode)) - ignored = system ("/sbin/modprobe ppp_generic"); -+ ignored = system ("/var/run/current-system/sw/sbin/modprobe ppp_generic"); ++ ignored = system ("/var/run/current-system/sw/bin/modprobe ppp_generic"); connection = nm_act_request_get_connection (req); g_assert (connection); diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/tools/networking/ngrep/default.nix index 5c7840034b7..3c0b0d9278a 100644 --- a/pkgs/tools/networking/ngrep/default.nix +++ b/pkgs/tools/networking/ngrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap }: +{ stdenv, fetchurl, libpcap, gnumake3 }: stdenv.mkDerivation rec { name = "ngrep-1.45"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "19rg8339z5wscw877mz0422wbsadds3mnfsvqx3ihy58glrxv9mf"; }; - buildInputs = [ libpcap ]; + buildInputs = [ gnumake3 libpcap ]; preConfigure = '' # Fix broken test for BPF header file diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index be853dad841..1a2bac79e1f 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, libpcap, gnutls, libgcrypt, libxml2, glib, geoip, sqlite -, which, autoreconfHook, subversion, pkgconfig, groff +{ stdenv, fetchurl, libpcap, gnutls, libgcrypt, libxml2, glib +, geoip, geolite-legacy, sqlite, which, autoreconfHook, subversion +, pkgconfig, groff }: # ntopng includes LuaJIT, mongoose, rrdtool and zeromq in its third-party/ @@ -8,26 +9,6 @@ stdenv.mkDerivation rec { name = "ntopng-1.2.1"; - geoLiteCity = fetchurl { - url = "http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz"; - sha256 = "1xqjyz9xnga3dvhj0f38hf78wv781jflvqkxm6qni3sj781nfr4a"; - }; - - geoLiteCityV6 = fetchurl { - url = "http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"; - sha256 = "03s41ffc5a13qy5kgx8jqya97jkw2qlvdkak98hab7xs0i17z9pd"; - }; - - geoIPASNum = fetchurl { - url = "http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz"; - sha256 = "1h766l8dsfgzlrz0q76877xksaf5qf91nwnkqwb6zl1gkczbwy6p"; - }; - - geoIPASNumV6 = fetchurl { - url = "http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz"; - sha256 = "0dwi9b3amfpmpkknf9ipz2r8aq05gn1j2zlvanwwah3ib5cgva9d"; - }; - src = fetchurl { url = "mirror://sourceforge/project/ntop/ntopng/${name}.tgz"; sha256 = "1db83cd1v4ivl8hxzzdvvdcgk22ji7mwrfnd5nnwll6kb11i364v"; @@ -38,7 +19,8 @@ stdenv.mkDerivation rec { ./0002-Remove-requirement-to-have-writeable-callback-dir.patch ]; - buildInputs = [ libpcap gnutls libgcrypt libxml2 glib geoip sqlite which autoreconfHook subversion pkgconfig groff ]; + buildInputs = [ libpcap gnutls libgcrypt libxml2 glib geoip geolite-legacy + sqlite which autoreconfHook subversion pkgconfig groff ]; preConfigure = '' find . -name Makefile.in | xargs sed -i "s|/bin/rm|rm|" @@ -55,10 +37,8 @@ stdenv.mkDerivation rec { -e "s|\(#define CONST_DEFAULT_INSTALL_DIR\).*|\1 \"$out/share/ntopng\"|g" \ -i ntop_defines.h - gunzip -c $geoLiteCity > httpdocs/geoip/GeoLiteCity.dat - gunzip -c $geoLiteCityV6 > httpdocs/geoip/GeoLiteCityv6.dat - gunzip -c $geoIPASNum > httpdocs/geoip/GeoIPASNum.dat - gunzip -c $geoIPASNumV6 > httpdocs/geoip/GeoIPASNumv6.dat + rmdir httpdocs/geoip + ln -s ${geolite-legacy}/share/GeoIP httpdocs/geoip ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 83a8b4cafef..2287671aef2 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -1,23 +1,20 @@ { stdenv, fetchurl, pythonPackages }: -stdenv.mkDerivation rec { - name = "s3cmd-1.0.1"; +pythonPackages.buildPythonPackage rec { + name = "s3cmd-1.5.2"; src = fetchurl { url = "mirror://sourceforge/s3tools/${name}.tar.gz"; - sha256 = "1kmxhilwix5plv3qb49as6jknll3pq5abw948h28jisskkm2cs6p"; + sha256 = "0bdl2wvh4nri4n6hpaa8s9lk98xy4a1b0l9ym54fvmxxx1j6g2pz"; }; - buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; + propagatedBuildInputs = with pythonPackages; [ python_magic dateutil ]; - installPhase = - '' - python setup.py install --prefix=$out - wrapPythonPrograms - ''; - - meta = { + meta = with stdenv.lib; { homepage = http://s3tools.org/; description = "A command-line tool to manipulate Amazon S3 buckets"; + license = licenses.gpl2; + maintainers = [ maintainers.spwhitt ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/s3cmd/git.nix b/pkgs/tools/networking/s3cmd/git.nix deleted file mode 100644 index 6193137c8d4..00000000000 --- a/pkgs/tools/networking/s3cmd/git.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchgit, pythonPackages }: - -pythonPackages.buildPythonPackage rec { - name = "s3cmd-1.5-pre-81e3842f7a"; - - src = fetchgit { - url = "https://github.com/s3tools/s3cmd.git"; - rev = "81e3842f7afbc8c629f408f4d7dc22058f7bd536"; - sha256 = "13jqw19ws5my8r856j1p7xydwpyp8agnzxkjv6pa7h72wl7rz90i"; - }; - - propagatedBuildInputs = with pythonPackages; [ dateutil ]; - - meta = with stdenv.lib; { - description = "Command line tool for managing Amazon S3 and CloudFront services"; - homepage = http://s3tools.org/s3cmd; - license = licenses.gpl2; - }; -} diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index 2339ac5ff05..89c7642d0a5 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-dns"; rev = "refs/tags/v${version}"; - sha256 = "0y76gvgvg2y3hhr3pk2nkki1idjj6sxxcnvd29yd79v0419p2dl3"; + sha256 = "0rsw19r9hwxb0xj9xs1rwb7fa21wwbsnfq3p2nfg4lf6cc64b39r"; }; dontDisableStatic = true; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index e8857e35e67..d2c7ebd0345 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.1.0"; + version = "2.1.0.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-networking"; rev = "refs/tags/v${version}"; - sha256 = "1q094x8x99cy0kkq74kfw1rd9kmp6ynpz9ahx0lviz05n9paq7ya"; + sha256 = "057xwh1dpwg2dz47s0badqhi66nhxgs5ps0xwn7s6hvba0lwyy4c"; }; dontDisableStatic = true; @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { "--with-include=${s6Dns}/include" "--with-lib=${skalibs}/lib" "--with-lib=${execline}/lib" - "--with-lib=${s6}/lib" + "--with-lib=${s6}/lib/s6" "--with-lib=${s6Dns}/lib" "--with-dynlib=${skalibs}/lib" "--with-dynlib=${execline}/lib" diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index 3f7c66e0406..2fec2ac1bd5 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "spiped-${version}"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { url = "http://www.tarsnap.com/spiped/${name}.tgz"; - sha256 = "1y642mn4jz2h83vhkji0l42r2l1hbzbwwlplc3xmr66zjj54psqf"; + sha256 = "1mxcbxifr3bnj6ga8lz88y4bhff016i6kjdzwbb3gzb2zcs4pxxj"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 2dba887adb8..74788e6ff2a 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.11"; + version = "5.14"; src = fetchurl { url = "http://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "137zxnavc7880fxfbmhlgw97lk4rj8if1bb70adm0d4fwlvvra3i"; + sha256 = "0nk9cjrgpa54sphykizqx4kayrq71z1zmwdsr1lvlbmq3pyb95r1"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index c0be126bdfd..7fc993338f7 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { - name = "tinc-1.1pre-2015-02-24"; + name = "tinc-1.1pre-2015-03-14"; src = fetchgit { url = "git://tinc-vpn.org/tinc"; - rev = "4b2ddded2c8ae1a1a5930637552eeb48f30d6530"; - sha256 = "037yl4qvy053a7jsp9dhj9bak6knnqxx2wsqq282dv032584sh46"; + rev = "6568cffd52d4803effaf52a9bb9c98d69cf7922a"; + sha256 = "1nh0yjv6gf8p5in67kdq68xlai69f34ks0j610i8d8nw2mfm9x4a"; }; buildInputs = [ autoreconfHook texinfo ncurses readline zlib lzo openssl ]; diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/tools/networking/xl2tpd/default.nix new file mode 100644 index 00000000000..4b8f91461d8 --- /dev/null +++ b/pkgs/tools/networking/xl2tpd/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, libpcap, ppp }: + +let version = "1.3.6"; +in stdenv.mkDerivation { + name = "xl2tpd-${version}"; + + src = fetchFromGitHub { + owner = "xelerance"; + repo = "xl2tpd"; + rev = "v${version}"; + sha256 = "17lnsk9fsyfp2g5hha7psim6047wj9qs8x4y4w06gl6bbf36jm9z"; + }; + + buildInputs = [ libpcap ]; + + postPatch = '' + substituteInPlace l2tp.h --replace /usr/sbin/pppd ${ppp}/sbin/pppd + ''; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = http://www.xelerance.com/software/xl2tpd/; + description = "Layer 2 Tunnelling Protocol Daemon (RFC 2661)"; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix new file mode 100644 index 00000000000..78c72967880 --- /dev/null +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, openssl, lzo, zlib, gcc }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = "1.0.2"; + name = "zerotierone"; + + src = fetchurl { + url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz"; + sha256 = "002ay4f6l9h79j1708klwjvinsv6asv24a0hql85jq27587sv6mq"; + }; + + preConfigure = '' + substituteInPlace ./make-linux.mk \ + --replace 'CC=$(shell which clang gcc cc 2>/dev/null | head -n 1)' "CC=${gcc}/bin/gcc"; + substituteInPlace ./make-linux.mk \ + --replace 'CXX=$(shell which clang++ g++ c++ 2>/dev/null | head -n 1)' "CC=${gcc}/bin/g++"; + ''; + + buildInputs = [ openssl lzo zlib gcc ]; + + installPhase = '' + installBin zerotier-one + ''; + + meta = { + description = "Create flat virtual Ethernet networks of almost unlimited size"; + homepage = https://www.zerotier.com; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.sjmackenzie ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 6fa95f060d7..021225c1b4d 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { buildInputs = [ getopt ] ++ stdenv.lib.optional enableEjabberdDump ejabberd - ++ stdenv.lib.optional enableMySQLDatabase mysql + ++ stdenv.lib.optional enableMySQLDatabase mysql.lib ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql ++ stdenv.lib.optional enableSubversionRepository subversion ++ stdenv.lib.optional enableMongoDatabase mongodb; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index d39a13196a8..dd3a6ba3cf0 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.9pre4083_5114a07"; + name = "nix-1.9pre4087_afa433e"; src = fetchurl { - url = "http://hydra.nixos.org/build/20650421/download/4/${name}.tar.xz"; - sha256 = "971fdd36bcf39c7e6ce9ef12dbfe09c98d2be3275e482ca2dbacb2e668f0dff9"; + url = "http://hydra.nixos.org/build/21053128/download/4/${name}.tar.xz"; + sha256 = "05dda3644ed68364bbff87d0ec662ca18d8542f921683cb2e1f308281d6bf384"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index 239ad596bbb..590e6071b52 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchurl, pkgconfig, perl, utillinux, keyutils, nss, nspr, python, pam , intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which }: -stdenv.mkDerivation { - name = "ecryptfs-104"; +stdenv.mkDerivation rec { + name = "ecryptfs-${version}"; + version = "106"; src = fetchurl { - url = http://launchpad.net/ecryptfs/trunk/104/+download/ecryptfs-utils_104.orig.tar.gz; - sha256 = "0f3lzpjw97vcdqzzgii03j3knd6pgwn1y0lpaaf46iidaiv0282a"; + url = "http://launchpad.net/ecryptfs/trunk/${version}/+download/ecryptfs-utils_${version}.orig.tar.gz"; + sha256 = "1d5nlzcbl8ch639zi3lq6d14gkk4964j6dqhfs87i67867fhlghp"; }; #TODO: replace wrapperDir below with from config.security.wrapperDir; - preConfigure = '' + postPatch = '' FILES="$(grep -r '/bin/sh' src/utils -l; find src -name \*.c)" for file in $FILES; do substituteInPlace "$file" \ diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index cf11ecb8232..a5fdc2e2692 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -1,10 +1,16 @@ { fetchurl, stdenv, readline, zlib, libgpgerror, pth, libgcrypt, libassuan , libksba, coreutils, libiconv, pcsclite + # Each of the dependencies below are optional. # Gnupg can be built without them at the cost of reduced functionality. -, pinentry ? null, openldap ? null, bzip2 ? null, libusb ? null, curl ? null +, pinentry ? null, x11Support ? true +, openldap ? null, bzip2 ? null, libusb ? null, curl ? null }: +with stdenv.lib; + +assert x11Support -> pinentry != null; + stdenv.mkDerivation rec { name = "gnupg-2.0.27"; @@ -27,9 +33,7 @@ stdenv.mkDerivation rec { patch gl/stdint_.h < ${./clang.patch} ''; - configureFlags = - if pinentry != null then "--with-pinentry-pgm=${pinentry}/bin/pinentry" - else ""; + configureFlags = optional x11Support "--with-pinentry-pgm=${pinentry}/bin/pinentry"; checkPhase="GNUPGHOME=`pwd` ./agent/gpg-agent --daemon make check"; diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 440d2294b0d..fc5da48a1b9 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -1,10 +1,17 @@ { fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, npth -, readline ? null, libusb ? null, gnutls ? null, adns ? null, openldap ? null -, zlib ? null, bzip2 ? null, pinentry ? null, autoreconfHook, gettext, texinfo -, pcsclite +, autoreconfHook, gettext, texinfo, pcsclite + +# Each of the dependencies below are optional. +# Gnupg can be built without them at the cost of reduced functionality. +, pinentry ? null, x11Support ? true +, adns ? null, gnutls ? null, libusb ? null, openldap ? null +, readline ? null, zlib ? null, bzip2 ? null }: with stdenv.lib; + +assert x11Support -> pinentry != null; + stdenv.mkDerivation rec { name = "gnupg-2.1.2"; @@ -21,12 +28,11 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libgcrypt libassuan libksba npth - readline libusb gnutls adns openldap zlib bzip2 autoreconfHook gettext texinfo + readline libusb gnutls adns openldap zlib bzip2 ]; - configureFlags = - optional (pinentry != null) "--with-pinentry-pgm=${pinentry}/bin/pinentry"; + configureFlags = optional x11Support "--with-pinentry-pgm=${pinentry}/bin/pinentry"; meta = with stdenv.lib; { homepage = http://gnupg.org; diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 0e37443c3ed..1aa5e0b51f1 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl , coreutils, gnused, getopt, pwgen, git, tree, gnupg , makeWrapper -, withX ? true, xclip, xdotool, dmenu + +, xclip ? null, xdotool ? null, dmenu ? null +, x11Support ? true }: -assert withX -> xclip != null; -assert withX -> xdotool != null; -assert withX -> dmenu != null; +assert x11Support -> xclip != null + && xdotool != null + && dmenu != null; stdenv.mkDerivation rec { version = "1.6.5"; @@ -52,7 +54,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/emacs/site-lisp" cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/" - ${if withX then '' + ${if x11Support then '' cp "contrib/dmenu/passmenu" "$out/bin/" '' else ""} ''; @@ -64,9 +66,9 @@ stdenv.mkDerivation rec { # Ensure all dependencies are in PATH wrapProgram $out/bin/pass \ - --prefix PATH : "${coreutils}/bin:${gnused}/bin:${getopt}/bin:${gnupg}/bin:${git}/bin:${tree}/bin:${pwgen}/bin${if withX then ":${xclip}/bin" else ""}" + --prefix PATH : "${coreutils}/bin:${gnused}/bin:${getopt}/bin:${gnupg}/bin:${git}/bin:${tree}/bin:${pwgen}/bin${if x11Support then ":${xclip}/bin" else ""}" - ${if withX then '' + ${if x11Support then '' wrapProgram $out/bin/passmenu \ --prefix PATH : "$out/bin:${xdotool}/bin:${dmenu}/bin" '' else ""} diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix index fd97a6e618d..7ec4934805b 100644 --- a/pkgs/tools/security/ssdeep/default.nix +++ b/pkgs/tools/security/ssdeep/default.nix @@ -1,14 +1,21 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, patchelf }: stdenv.mkDerivation rec { name = "ssdeep-${version}"; - version = "2.11"; + version = "2.12"; src = fetchurl { url = "mirror://sourceforge/ssdeep/${name}.tar.gz"; - sha256 = "1izzkvrng4cc2p8gxp3w32k1v60l2yaq2y2hkifgq9s1yh30xk42"; + sha256 = "1pjb3qpcn6slfqjv23jf7i8zf7950b7h27b0v0dva5pxmn3rw149"; }; + # For some reason (probably a build system bug), the binary isn't + # properly linked to $out/lib to find libfuzzy.so + postFixup = '' + rp=$(patchelf --print-rpath $out/bin/ssdeep) + patchelf --set-rpath $rp:$out/lib $out/bin/ssdeep + ''; + meta = { description = "A program for calculating fuzzy hashes"; homepage = "http://www.ssdeep.sf.net"; diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 692016153a6..e0149078271 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig curl iptables libcredis libdbi libgcrypt libmemcached cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt - lm_sensors libxml2 lvm2 mysql postgresql protobufc rabbitmq-c rrdtool + lm_sensors libxml2 lvm2 mysql.lib postgresql protobufc rabbitmq-c rrdtool varnish yajl ]; diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 172da395374..be3cffb47eb 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, talloc }: +{ stdenv, fetchgit, talloc, enableStatic ? false }: stdenv.mkDerivation rec { name = "proot-${version}"; @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ talloc ]; - preBuild = '' + preBuild = stdenv.lib.optionalString enableStatic '' + export LDFLAGS="-static -L${talloc}/lib" + '' + '' substituteInPlace GNUmakefile --replace "/usr/local" "$out" ''; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 2f62ce31949..32f48eb7e14 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libestr json_c zlib pythonPackages.docutils - krb5 jemalloc mysql postgresql libdbi net_snmp libuuid curl gnutls + krb5 jemalloc postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis - ] ++ stdenv.lib.optional stdenv.isLinux systemd; + ] ++ stdenv.lib.optional stdenv.isLinux systemd ++ stdenv.lib.optional (mysql != null) mysql.lib; configureFlags = [ "--sysconfdir=/etc" @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { homepage = "http://www.rsyslog.com/"; description = "Enhanced syslog implementation"; license = licenses.gpl3; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix index da2ac49b195..c9cf05373b5 100644 --- a/pkgs/tools/system/uptimed/default.nix +++ b/pkgs/tools/system/uptimed/default.nix @@ -1,18 +1,30 @@ -{stdenv, fetchurl, automake, autoconf, libtool}: +{ stdenv, fetchFromGitHub, autoreconfHook }: +let version = "0.3.18"; in stdenv.mkDerivation { - name = "uptimed-0.3.16"; + name = "uptimed-${version}"; - src = fetchurl { - url = http://podgorny.cz/uptimed/releases/uptimed-0.3.16.tar.bz2; - sha256 = "0axi2rz4gnmzzjl7xay7y8j1mh6iqqyg0arl1jyc3fgsk1ggy27m"; + src = fetchFromGitHub { + sha256 = "108h8ck8cyzvf3xv23vzyj0j8dffdmwavj6nbn9ryqhqhqmk4fhb"; + rev = "v${version}"; + repo = "uptimed"; + owner = "rpodgorny"; + }; + + meta = with stdenv.lib; { + description = "Uptime record daemon"; + longDescription = '' + An uptime record daemon keeping track of the highest uptimes a computer + system ever had. It uses the system boot time to keep sessions apart from + each other. Uptimed comes with a console front-end to parse the records, + which can also easily be used to show your records on a web page. + ''; + homepage = https://github.com/rpodgorny/uptimed/; + license = with licenses; gpl2; + platforms = with platforms; linux; }; patches = [ ./no-var-spool-install.patch ]; - buildInputs = [automake autoconf libtool]; - - meta = { - homepage = http://podgorny.cz/uptimed/; - }; + buildInputs = [ autoreconfHook ]; } diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index 9e21bd2f8fa..83b3d49b253 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl, gettext }: -stdenv.mkDerivation { - name = "dos2unix-7.0"; +stdenv.mkDerivation rec { + name = "dos2unix-7.2.1"; src = fetchurl { - url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.0.tar.gz; - sha256 = "0az7nkgddnmimb88sj004klszbvkir02f4zlnij8drc6b80gw6jm"; + url = "http://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz"; + sha256 = "1ws5d66gjs3iqc92d0qxwivixl9092540kxqq2gr6jdzmflqm4jk"; }; configurePhase = '' diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index b64bedd720c..55240be19a4 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { makeFlags = [ ''prefix=$(out)'' ] ++ optional gnutlsSupport "CRYPTO=GNUTLS" - ++ optional opensslSupport "CRYPTO=OPENSSL"; + ++ optional opensslSupport "CRYPTO=OPENSSL" + ++ optional stdenv.isDarwin "SYS=darwin" + ++ optional (stdenv.cc.cc.isClang or false) "CC=clang"; buildInputs = [ zlib ] ++ optional gnutlsSupport gnutls @@ -32,7 +34,7 @@ stdenv.mkDerivation rec { description = "Toolkit for RTMP streams"; homepage = http://rtmpdump.mplayerhq.hu/; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ codyopel viric ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0fd8b9e02f5..4067ccdbc8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -330,7 +330,7 @@ let fetchgitrevision = import ../build-support/fetchgitrevision runCommand git; fetchgitLocal = import ../build-support/fetchgitlocal { - inherit runCommand git; + inherit runCommand git nix; }; fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or {}); @@ -360,9 +360,6 @@ let inherit curl stdenv; }; - # A wrapper around fetchurl that generates miror://gnome URLs automatically - fetchurlGnome = callPackage ../build-support/fetchurl/gnome.nix { }; - # fetchurlBoot is used for curl and its dependencies in order to # prevent a cyclic dependency (curl depends on curl.tar.bz2, # curl.tar.bz2 depends on fetchurl, fetchurl depends on curl). It @@ -687,6 +684,8 @@ let boxfs = callPackage ../tools/filesystems/boxfs { }; + brasero = callPackage ../tools/cd-dvd/brasero { }; + bro = callPackage ../applications/networking/ids/bro { }; bsod = callPackage ../misc/emulators/bsod { }; @@ -1394,6 +1393,10 @@ let gtk = gtk3; }; + garmin-plugin = callPackage ../applications/misc/garmin-plugin {}; + + garmintools = callPackage ../development/libraries/garmintools {}; + gawk = callPackage ../tools/text/gawk { }; gawkInteractive = appendToName "interactive" @@ -1435,6 +1438,8 @@ let gmvault = callPackage ../tools/networking/gmvault { }; + gnaural = callPackage ../applications/audio/gnaural { }; + gnokii = builderDefsPackage (import ../tools/misc/gnokii) { inherit intltool perl gettext libusb pkgconfig bluez readline pcsclite libical gtk glib; @@ -1653,6 +1658,8 @@ let httptunnel = callPackage ../tools/networking/httptunnel { }; + i2p = callPackage ../tools/networking/i2p {}; + i2pd = callPackage ../tools/networking/i2pd {}; iasl = callPackage ../development/compilers/iasl { }; @@ -1893,6 +1900,8 @@ let macchanger = callPackage ../os-specific/linux/macchanger { }; + mailcheck = callPackage ../applications/networking/mailreaders/mailcheck { }; + maildrop = callPackage ../tools/networking/maildrop { }; mailsend = callPackage ../tools/networking/mailsend { }; @@ -2079,6 +2088,8 @@ let networkmanager_pptp = callPackage ../tools/networking/network-manager/pptp.nix { }; + networkmanager_l2tp = callPackage ../tools/networking/network-manager/l2tp.nix { }; + networkmanager_vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { }; networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { }; @@ -2089,7 +2100,9 @@ let newsbeuter-dev = callPackage ../applications/networking/feedreaders/newsbeuter/dev.nix { }; - ngrep = callPackage ../tools/networking/ngrep { }; + ngrep = callPackage ../tools/networking/ngrep { + inherit gnumake3; + }; ngrok = callPackage ../tools/misc/ngrok { }; @@ -2479,6 +2492,8 @@ let sip = pythonPackages.sip_4_16; }; + ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { }; + qastools = callPackage ../tools/audio/qastools { qt = qt4; }; @@ -2601,8 +2616,6 @@ let s3cmd = callPackage ../tools/networking/s3cmd { }; - s3cmd_15_pre_81e3842f7a = lowPrio (callPackage ../tools/networking/s3cmd/git.nix { }); - s3sync = callPackage ../tools/networking/s3sync { ruby = ruby_1_8; }; @@ -2839,6 +2852,8 @@ let tmux = callPackage ../tools/misc/tmux { }; + tmuxinator = callPackage ../tools/misc/tmuxinator { }; + tmin = callPackage ../tools/security/tmin { }; tmsu = callPackage ../tools/filesystems/tmsu { }; @@ -2965,6 +2980,8 @@ let welkin = callPackage ../tools/graphics/welkin {}; + xl2tpd = callPackage ../tools/networking/xl2tpd { }; + testdisk = callPackage ../tools/misc/testdisk { }; html2text = callPackage ../tools/text/html2text { }; @@ -3211,6 +3228,10 @@ let zdelta = callPackage ../tools/compression/zdelta { }; + zerotierone = callPackage ../tools/networking/zerotierone { }; + + zerofree = callPackage ../tools/filesystems/zerofree { }; + zfstools = callPackage ../tools/filesystems/zfstools { }; zile = callPackage ../applications/editors/zile { }; @@ -3564,6 +3585,10 @@ let inherit fetchurl stdenv; }); + gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { + emacsSupport = config.emacsSupport or false; + }; + gccgo = gccgo48; gccgo48 = wrapCC (gcc48.cc.override { @@ -3573,6 +3598,14 @@ let langGo = true; }); + gccgo49 = wrapCC (gcc49.cc.override { + name = "gccgo49"; + langCC = true; #required for go. + langC = true; + langGo = true; + profiledCompiler = false; + }); + ghdl = wrapCC (import ../development/compilers/gcc/4.3 { inherit stdenv fetchurl gmp mpfr noSysDirs gnat; texinfo = texinfo4; @@ -4435,8 +4468,12 @@ let erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { odbcSupport = true; }; erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { }; erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { odbcSupport = true; }; + erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; }; + erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; odbcSupport = true; }; erlang = erlangR17; erlang_odbc = erlangR17_odbc; + erlang_javac = erlangR17_javac; + erlang_odbc_javac = erlangR17_odbc_javac; rebar = callPackage ../development/tools/build-managers/rebar { }; @@ -4576,7 +4613,9 @@ let polyml = callPackage ../development/compilers/polyml { }; - pure = callPackage ../development/interpreters/pure { }; + pure = callPackage ../development/interpreters/pure { + llvm = llvm_35; + }; pure-gsl = callPackage ../development/pure-modules/pure-gsl { }; python = python2; @@ -4928,7 +4967,16 @@ let ctodo = callPackage ../applications/misc/ctodo { }; - cmake = callPackage ../development/tools/build-managers/cmake { }; + cmake = callPackage ../development/tools/build-managers/cmake { + wantPS = stdenv.isDarwin; + ps = if stdenv.isDarwin then darwin.ps else null; + }; + + cmake-3_2 = callPackage ../development/tools/build-managers/cmake/3.2.nix { + jsoncpp = jsoncpp-1_6; + }; + cmake-3_0 = callPackage ../development/tools/build-managers/cmake/3.0.nix { }; + cmake264 = callPackage ../development/tools/build-managers/cmake/264.nix { }; cmakeCurses = cmake.override { useNcurses = true; }; @@ -5248,7 +5296,7 @@ let sloccount = callPackage ../development/tools/misc/sloccount { }; - sloc = callPackage ../development/tools/sloc { }; + sloc = nodePackages.sloc; smatch = callPackage ../development/tools/analysis/smatch { buildllvmsparse = false; @@ -5720,11 +5768,11 @@ let getdata = callPackage ../development/libraries/getdata { }; - gettext = gettext_0_19; + gettext = gettext_0_18; gettext_0_17 = callPackage ../development/libraries/gettext/0.17.nix { }; - gettext_0_18 = callPackage ../development/libraries/gettext/0.18.nix { }; - gettext_0_19 = callPackage ../development/libraries/gettext { }; + gettext_0_18 = callPackage ../development/libraries/gettext { }; + gettext_0_19 = callPackage ../development/libraries/gettext/0.19.nix { }; gd = callPackage ../development/libraries/gd { }; @@ -5736,7 +5784,7 @@ let giblib = callPackage ../development/libraries/giblib { }; - libgit2 = callPackage ../development/libraries/git2 {}; + libgit2 = callPackage ../development/libraries/git2 { cmake = cmake-3_2; }; glew = callPackage ../development/libraries/glew { }; @@ -5813,8 +5861,7 @@ let gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; # required by older GHC versions gmp5 = callPackage ../development/libraries/gmp/5.1.x.nix { }; - gmp6 = callPackage ../development/libraries/gmp/6.x.nix { }; - gmp = gmp6; + gmp = gmp5; gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; }); #GMP ex-satellite, so better keep it near gmp @@ -5875,13 +5922,21 @@ let gnu-efi = callPackage ../development/libraries/gnu-efi { }; - gnutls = gnutls32; + gnutls = gnutls33; gnutls32 = callPackage ../development/libraries/gnutls/3.2.nix { guileBindings = config.gnutls.guile or false; + nettle = nettle27; }; - gnutls_with_guile = lowPrio (gnutls.override { guileBindings = true; }); + gnutls33 = callPackage ../development/libraries/gnutls/3.3.nix { + guileBindings = config.gnutls.guile or false; + nettle = nettle27; + }; + + gnutls32_with_guile = lowPrio (gnutls32.override { guileBindings = true; }); + + gnutls33_with_guile = lowPrio (gnutls33.override { guileBindings = true; }); gpac = callPackage ../applications/video/gpac { }; @@ -6088,6 +6143,7 @@ let json_c = callPackage ../development/libraries/json-c { }; jsoncpp = callPackage ../development/libraries/jsoncpp { }; + jsoncpp-1_6 = callPackage ../development/libraries/jsoncpp/1.6.nix { }; libjson = callPackage ../development/libraries/libjson { }; @@ -6102,9 +6158,10 @@ let automake = automake111x; }; - kf57 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.7 { }); - kf58 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.8 { }); - kf5_latest = kf58; + kf57 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.7 { + qt5 = qt54; + }); + kf5_latest = kf57; kf5_stable = kf57; krb5 = callPackage ../development/libraries/kerberos/krb5.nix { @@ -6212,8 +6269,6 @@ let libchop = callPackage ../development/libraries/libchop { }; - libclc = callPackage ../development/libraries/libclc { }; - libcli = callPackage ../development/libraries/libcli { }; libcm = callPackage ../development/libraries/libcm { }; @@ -6246,7 +6301,9 @@ let }; libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { }; - libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt5.nix { }; + libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt5.nix { + qt5 = qt54; + }; libdc1394 = callPackage ../development/libraries/libdc1394 { }; @@ -6613,8 +6670,6 @@ let liboil = callPackage ../development/libraries/liboil { }; - libomxil-bellagio = callPackage ../development/libraries/libomxil-bellagio { }; - liboop = callPackage ../development/libraries/liboop { }; libopus = callPackage ../development/libraries/libopus { }; @@ -6773,7 +6828,10 @@ let }); libv4l = lowPrio (v4l_utils.override { - withQt4 = false; + alsaLib = null; + libX11 = null; + qt4 = null; + qt5 = null; }); libva = callPackage ../development/libraries/libva { }; @@ -6792,7 +6850,7 @@ let libviper = callPackage ../development/libraries/libviper { }; - libvpx = callPackage ../development/libraries/libvpx { }; + libvpx = if stdenv.isDarwin then libvpx-git else callPackage ../development/libraries/libvpx { }; libvpx-git = callPackage ../development/libraries/libvpx/git.nix { }; libvterm = callPackage ../development/libraries/libvterm { }; @@ -6915,8 +6973,7 @@ let # makes it slower, but during runtime we link against just mesa_drivers # through /run/opengl-driver*, which is overriden according to config.grsecurity grsecEnabled = true; - libva = libva.override { mesa = null; }; - llvmPackages = llvmPackages_36; + llvm = llvm_35; }); mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { }); mesa_drivers = mesaDarwinOr ( @@ -6972,7 +7029,7 @@ let }; mlt-qt5 = callPackage ../development/libraries/mlt { - qt = qt53; + qt = qt5; }; movit = callPackage ../development/libraries/movit { }; @@ -7030,6 +7087,7 @@ let inherit ncurses flex bison; }; + nettle27 = callPackage ../development/libraries/nettle/27.nix { }; nettle = callPackage ../development/libraries/nettle { }; newt = callPackage ../development/libraries/newt { }; @@ -7152,12 +7210,21 @@ let pdf2xml = callPackage ../development/libraries/pdf2xml {} ; phonon = callPackage ../development/libraries/phonon/qt4 {}; + phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt4 {}; + phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt4 {}; - phonon_qt5 = callPackage ../development/libraries/phonon/qt5 { }; - phonon_qt5_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { }; - phonon_qt5_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { }; + phonon_qt5 = callPackage ../development/libraries/phonon/qt5 { + qt5 = qt54; + }; + + phonon_qt5_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { + qt5 = qt54; + }; + phonon_qt5_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { + qt5 = qt54; + }; physfs = callPackage ../development/libraries/physfs { }; @@ -7183,13 +7250,26 @@ let polkit_qt5 = callPackage ../development/libraries/polkit-qt-1 { withQt5 = true; + qt5 = qt54; }; policykit = callPackage ../development/libraries/policykit { }; poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; - popplerQt4 = poppler.poppler_qt4; - poppler_qt5 = poppler.poppler_qt5; + + poppler_qt4 = poppler.override { + inherit qt4; + qt4Support = true; + suffix = "qt4"; + }; + + poppler_qt5 = poppler.override { + qt5 = qt54; + qt5Support = true; + suffix = "qt5"; + }; + + poppler_utils = poppler.override { suffix = "utils"; utils = true; }; popt = callPackage ../development/libraries/popt { }; @@ -7219,9 +7299,7 @@ let re2 = callPackage ../development/libraries/re2 { }; - qca2 = callPackage ../development/libraries/qca2 {}; - - qca2_ossl = callPackage ../development/libraries/qca2/ossl.nix {}; + qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; qimageblitz = callPackage ../development/libraries/qimageblitz {}; @@ -7261,7 +7339,7 @@ let qtLib = qt48Full; }; - qt53 = callPackage ../development/libraries/qt-5/5.3 { + qt5 = callPackage ../development/libraries/qt-5/5.3 { mesa = mesa_noglu; cups = if stdenv.isLinux then cups else null; # GNOME dependencies are not used unless gtkStyle == true @@ -7271,9 +7349,7 @@ let qt54 = callPackage ../development/libraries/qt-5/5.4 {}; - qt5 = qt54; - - qt5Full = appendToName "full" (qt53.override { + qt5Full = appendToName "full" (qt5.override { buildDocs = true; buildExamples = true; buildTests = true; @@ -7402,6 +7478,8 @@ let serf = callPackage ../development/libraries/serf {}; + sfsexp = callPackage ../development/libraries/sfsexp {}; + silgraphite = callPackage ../development/libraries/silgraphite {}; graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {}; @@ -7525,8 +7603,6 @@ let tcltls = callPackage ../development/libraries/tcltls { }; - ctdb = callPackage ../development/libraries/ctdb { }; - ntdb = callPackage ../development/libraries/ntdb { python = python2; }; @@ -7770,30 +7846,30 @@ let agda = callPackage ../build-support/agda { glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null; - extension = self : super : {}; - Agda = haskellPackages.Agda; + extension = self : super : { }; + inherit (haskellngPackages) Agda; inherit writeScriptBin; }; - agdaBase = callPackage ../development/libraries/agda/agda-base {}; + agdaBase = callPackage ../development/libraries/agda/agda-base { }; - agdaIowaStdlib = callPackage ../development/libraries/agda/agda-iowa-stdlib {}; + agdaIowaStdlib = callPackage ../development/libraries/agda/agda-iowa-stdlib { }; - agdaPrelude = callPackage ../development/libraries/agda/agda-prelude {}; + agdaPrelude = callPackage ../development/libraries/agda/agda-prelude { }; - AgdaStdlib = callPackage ../development/compilers/agda/stdlib.nix { - inherit (haskellPackages) ghc filemanip; + AgdaStdlib = callPackage ../development/libraries/agda/agda-stdlib { + inherit (haskellngPackages) ghcWithPackages; }; - AgdaSheaves = callPackage ../development/libraries/agda/AgdaSheaves {}; + AgdaSheaves = callPackage ../development/libraries/agda/Agda-Sheaves { }; - bitvector = callPackage ../development/libraries/agda/bitvector {}; + bitvector = callPackage ../development/libraries/agda/bitvector { }; - categories = callPackage ../development/libraries/agda/categories {}; + categories = callPackage ../development/libraries/agda/categories { }; - pretty = callPackage ../development/libraries/agda/pretty {}; + pretty = callPackage ../development/libraries/agda/pretty { }; - TotalParserCombinators = callPackage ../development/libraries/agda/TotalParserCombinators {}; + TotalParserCombinators = callPackage ../development/libraries/agda/TotalParserCombinators { }; ### DEVELOPMENT / LIBRARIES / JAVA @@ -8461,9 +8537,19 @@ let samba3 = callPackage ../servers/samba/3.x.nix { }; samba4 = callPackage ../servers/samba/4.x.nix { - libgcrypt = libgcrypt_1_6; python = python2; pythonPackages = python2Packages; + kerberos = heimdal; + libgcrypt = libgcrypt_1_6; + cups = if stdenv.isDarwin then null else cups; + pam = if stdenv.isDarwin then null else pam; + libaio = if stdenv.isDarwin then null else libaio; + ceph = if stdenv.isDarwin then null else ceph; + glusterfs = if stdenv.isDarwin then null else glusterfs; + dbus = if stdenv.isLinux then dbus else null; + libibverbs = if stdenv.isLinux then libibverbs else null; + librdmacm = if stdenv.isLinux then librdmacm else null; + systemd = if stdenv.isLinux then systemd else null; }; samba = samba4; @@ -8484,6 +8570,7 @@ let samba4_light = lowPrio (samba4.override { # source3/wscript optionals kerberos = null; + zlib = null; openldap = null; cups = null; pam = null; @@ -8504,9 +8591,12 @@ let libgpgerror = null; # other optionals - zlib = null; ncurses = null; - libcap = null; + libunwind = null; + dbus = null; + libibverbs = null; + librdmacm = null; + systemd = null; }); samba_light = samba4_light; @@ -8515,6 +8605,8 @@ let seyren = callPackage ../servers/monitoring/seyren { }; + sensu = callPackage ../servers/monitoring/sensu { }; + shishi = callPackage ../servers/shishi { }; sipcmd = callPackage ../applications/networking/sipcmd { }; @@ -8687,7 +8779,9 @@ let cifs_utils = callPackage ../os-specific/linux/cifs-utils { }; - conky = callPackage ../os-specific/linux/conky (config.conky or {}); + conky = callPackage ../os-specific/linux/conky ({ + lua = lua5_1; # conky can use 5.2, but toluapp can not + } // config.conky or {}); conntrack_tools = callPackage ../os-specific/linux/conntrack-tools { }; @@ -9060,6 +9154,7 @@ let nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { }; nvidia_x11_legacy340 = callPackage ../os-specific/linux/nvidia-x11/legacy340.nix { }; + nvidia_x11_beta = callPackage ../os-specific/linux/nvidia-x11/beta.nix { }; nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; openafsClient = callPackage ../servers/openafs-client { }; @@ -9463,7 +9558,7 @@ let }); v4l_utils = callPackage ../os-specific/linux/v4l-utils { - withQt4 = true; + qt5 = null; }; windows = rec { @@ -9641,6 +9736,8 @@ let gentium = callPackage ../data/fonts/gentium {}; + geolite-legacy = callPackage ../data/misc/geolite-legacy { }; + gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { }; inherit (gnome3) gsettings_desktop_schemas; @@ -9950,7 +10047,6 @@ let calibre = callPackage ../applications/misc/calibre { inherit (pythonPackages) pyqt5 sip_4_16; - qt5 = qt53; # depends on pyqt5 }; camlistore = callPackage ../applications/misc/camlistore { }; @@ -10613,7 +10709,7 @@ let libquvi = callPackage ../applications/video/quvi/library.nix { }; - linssid = callPackage ../applications/networking/linssid { qt5 = qt53; }; + linssid = callPackage ../applications/networking/linssid { }; mi2ly = callPackage ../applications/audio/mi2ly {}; @@ -10830,7 +10926,7 @@ let ghostscript = if stdenv.isDarwin then null else ghostscript; perl = null; # Currently Broken }; - + imagemagickBig = imagemagick; # Impressive, formerly known as "KeyJNote". @@ -10862,6 +10958,8 @@ let bip = callPackage ../applications/networking/irc/bip { }; + jabref = callPackage ../applications/office/jabref/default.nix { }; + jack_capture = callPackage ../applications/audio/jack-capture { }; jack_oscrolloscope = callPackage ../applications/audio/jack-oscrolloscope { }; @@ -10898,7 +10996,10 @@ let kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 { kf5 = kf57; - inherit pkgs; + qt5 = qt54; + pkgs = pkgs // { + cmake = cmake-3_2; + }; kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; }; }); kdeApps_stable = kdeApps_14_12; @@ -10970,8 +11071,9 @@ let inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2 gnome_vfs; zip = zip.override { enableNLS = false; }; - boost = boost155; - glm = glm_0954; + #boost = boost155; + #glm = glm_0954; + bluez5 = bluez5_28; fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf xorg.fontmiscmisc xorg.fontbhttf @@ -10982,7 +11084,6 @@ let harfbuzz = harfbuzz.override { withIcu = true; withGraphite2 = true; }; - bluez5 = bluez5_28; }; liferea = callPackage ../applications/networking/newsreaders/liferea { @@ -11138,10 +11239,6 @@ let mopidy-mopify = callPackage ../applications/audio/mopidy-mopify { }; - mozilla = callPackage ../applications/networking/browsers/mozilla { - inherit (gnome) libIDL; - }; - mozplugger = builderDefsPackage (import ../applications/networking/browsers/mozilla-plugins/mozplugger) { inherit firefox; inherit (xlibs) libX11 xproto; @@ -11171,19 +11268,17 @@ let normalize = callPackage ../applications/audio/normalize { }; - mplayer = callPackage ../applications/video/mplayer { + mplayer = callPackage ../applications/video/mplayer ({ pulseSupport = config.pulseaudio or false; - vdpauSupport = config.mplayer.vdpauSupport or false; - }; + } // (config.mplayer or {})); mplayer2 = callPackage ../applications/video/mplayer2 { ffmpeg = libav_9; # see https://trac.macports.org/ticket/44386 }; MPlayerPlugin = browser: - import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in { + callPackage ../applications/networking/browsers/mozilla-plugins/mplayerplug-in { inherit browser; - inherit fetchurl stdenv pkgconfig gettext; inherit (xlibs) libXpm; # !!! should depend on MPlayer }; @@ -11243,7 +11338,7 @@ let pcmanfm = callPackage ../applications/misc/pcmanfm { }; - shotcut = callPackage ../applications/video/shotcut { mlt = mlt-qt5; qt5 = qt53; }; + shotcut = callPackage ../applications/video/shotcut { mlt = mlt-qt5; }; smplayer = callPackage ../applications/video/smplayer { }; @@ -11318,6 +11413,8 @@ let novaclient = callPackage ../applications/virtualization/nova/client.nix { }; + nova-filters = callPackage ../applications/audio/nova-filters { }; + nspluginwrapper = callPackage ../applications/networking/browsers/mozilla-plugins/nspluginwrapper {}; nvi = callPackage ../applications/editors/nvi { }; @@ -11328,6 +11425,8 @@ let inherit (gnome) libglade; }; + obs-studio = callPackage ../applications/video/obs-studio { }; + ocrad = callPackage ../applications/graphics/ocrad { }; offrss = callPackage ../applications/networking/offrss { }; @@ -11493,7 +11592,7 @@ let client = false; withKDE = false; useQt5 = true; - qt = qt5; + qt = qt54; dconf = gnome3.dconf; tag = "-qt5"; }; @@ -11583,10 +11682,13 @@ let urxvt_perls = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perls { }; urxvt_tabbedex = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-tabbedex { }; - rxvt_unicode_with-plugins = callPackage ../applications/misc/rxvt_unicode/wrapper.nix { + rxvt_unicode-with-plugins = callPackage ../applications/misc/rxvt_unicode/wrapper.nix { plugins = [ urxvt_perls urxvt_tabbedex ]; }; + # FIXME: remove somewhere in future + rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; + sakura = callPackage ../applications/misc/sakura { inherit (gnome3) vte; }; @@ -11623,6 +11725,8 @@ let gtk = gtk3; }; + simple-scan = callPackage ../applications/graphics/simple-scan { }; + siproxd = callPackage ../applications/networking/siproxd { }; skype = callPackage_i686 ../applications/networking/instant-messengers/skype { }; @@ -11637,6 +11741,8 @@ let sooperlooper = callPackage ../applications/audio/sooperlooper { }; + sound-juicer = callPackage ../applications/audio/sound-juicer { }; + spideroak = callPackage ../applications/networking/spideroak { }; ssvnc = callPackage ../applications/networking/remote/ssvnc { }; @@ -11661,11 +11767,15 @@ let sxiv = callPackage ../applications/graphics/sxiv { }; - bittorrentSync = callPackage ../applications/networking/bittorrentsync { }; + bittorrentSync = bittorrentSync14; + bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { }; + bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { }; copy-com = callPackage ../applications/networking/copy-com { }; - dropbox = callPackage ../applications/networking/dropbox { }; + dropbox = callPackage ../applications/networking/dropbox { + qt5 = qt54; + }; dropbox-cli = callPackage ../applications/networking/dropbox-cli { }; @@ -11686,7 +11796,9 @@ let printrun = callPackage ../applications/misc/printrun { }; - sddm = callPackage ../applications/display-managers/sddm { }; + sddm = callPackage ../applications/display-managers/sddm { + qt5 = qt54; + }; slim = callPackage ../applications/display-managers/slim { libpng = libpng12; @@ -11712,7 +11824,6 @@ let inherit (pkgs.vamp) vampSDK; inherit (pkgs.xlibs) libX11; fftw = pkgs.fftwSinglePrec; - qt5 = qt53; }; sox = callPackage ../applications/misc/audio/sox { }; @@ -11738,7 +11849,6 @@ let stp = callPackage ../applications/science/logic/stp {}; - stumpwmContrib = callPackage ../applications/window-managers/stumpwm/contrib.nix { }; stumpwm = callPackage ../applications/window-managers/stumpwm { sbcl = sbcl_1_2_5; lispPackages = lispPackagesFor (wrapLisp sbcl_1_2_5); @@ -11773,10 +11883,7 @@ let swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; - sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { - sslSupport = true; - gpgSupport = true; - }; + sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { }; symlinks = callPackage ../tools/system/symlinks { }; @@ -12057,6 +12164,7 @@ let vlc_qt5 = vlc.override { qt4 = null; + qt5 = qt54; withQt5 = true; }; @@ -12202,16 +12310,6 @@ let cores = retroArchCores; }; - wrapXBMC = { xbmc }: import ../applications/video/xbmc/wrapper.nix { - inherit stdenv lib makeWrapper xbmc; - plugins = let inherit (lib) optional; in with xbmcPlugins; - ([] - ++ optional (config.xbmc.enableAdvancedLauncher or false) advanced-launcher - ++ optional (config.xbmc.enableGenesis or false) genesis - ++ optional (config.xbmc.enableSVTPlay or false) svtplay - ); - }; - wrapKodi = { kodi }: import ../applications/video/kodi/wrapper.nix { inherit stdenv lib makeWrapper kodi; plugins = let inherit (lib) optional; in with kodiPlugins; @@ -12253,37 +12351,24 @@ let gtk = gtk2; }; - xbmcPlain = callPackage ../applications/video/xbmc { - ffmpeg = ffmpeg_1; - }; - - xbmcPlugins = recurseIntoAttrs (callPackage ../applications/video/xbmc/plugins.nix { - xbmc = xbmcPlain; - }); - - xbmc = wrapXBMC { - xbmc = xbmcPlain; - }; - kodiPlain = callPackage ../applications/video/kodi { }; + xbmcPlain = kodiPlain; kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix { kodi = kodiPlain; }); + xbmcPlugins = kodiPlugins; kodi = wrapKodi { kodi = kodiPlain; }; - - xbmc-retroarch-advanced-launchers = - callPackage ../misc/emulators/retroarch/xbmc-advanced-launchers.nix { - cores = retroArchCores; - }; + xbmc = kodi; kodi-retroarch-advanced-launchers = callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix { cores = retroArchCores; }; + xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; xca = callPackage ../applications/misc/xca { }; @@ -12353,7 +12438,7 @@ let xkblayout-state = callPackage ../applications/misc/xkblayout-state { }; xmonad-with-packages = callPackage ../applications/window-managers/xmonad/wrapper.nix { - ghcWithPackages = haskellngPackages.ghcWithPackages; + inherit (haskellngPackages) ghcWithPackages; packages = self: []; }; @@ -13066,11 +13151,11 @@ let kwooty = callPackage ../applications/networking/newsreaders/kwooty { }; }; - callPackageOrig = newScope extra; + callPackageOrig = newScope (extra // { cmake = cmake-3_2; }); makePackages = extra: let - callPackage = newScope (extra // self); + callPackage = newScope (extra // { cmake = cmake-3_2; } // self); kde4 = callPackageOrig dir { inherit callPackage callPackageOrig; }; self = kde4 @@ -13118,9 +13203,10 @@ let numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { }; plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 { + qt5 = qt54; kf5 = kf57; }); - plasma5_latest = plasma52.override { kf5 = kf58; }; + plasma5_latest = plasma52; plasma5_stable = plasma52; kde5 = kf5_stable // plasma5_stable // kdeApps_stable; @@ -13393,6 +13479,8 @@ let verifast = callPackage ../applications/science/logic/verifast {}; + veriT = callPackage ../applications/science/logic/verit {}; + why3 = callPackage ../applications/science/logic/why3 {}; yices = callPackage ../applications/science/logic/yices {}; @@ -13552,9 +13640,7 @@ let beep = callPackage ../misc/beep { }; - cups = callPackage ../misc/cups { - libusb = libusb1; - }; + cups = callPackage ../misc/cups { libusb = libusb1; }; cups_filters = callPackage ../misc/cups/filters.nix { }; @@ -13590,10 +13676,21 @@ let fakenes = callPackage ../misc/emulators/fakenes { }; - faust = callPackage ../applications/audio/faust { }; - faust-compiler = callPackage ../applications/audio/faust-compiler { }; + faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { }; + + faust2alsa = callPackage ../applications/audio/faust/faust2alsa.nix { }; + + faust2csound = callPackage ../applications/audio/faust/faust2csound.nix { }; + + faust2firefox = callPackage ../applications/audio/faust/faust2firefox.nix { }; + + faust2jack = callPackage ../applications/audio/faust/faust2jack.nix { }; + + faust2jaqt = callPackage ../applications/audio/faust/faust2jaqt.nix { }; + + faust2lv2 = callPackage ../applications/audio/faust/faust2lv2.nix { }; fceux = callPackage ../misc/emulators/fceux { }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 4b23992d12a..3cf2f60386f 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -30,6 +30,8 @@ let self = _self // overrides; callPackage = lib.callPackageWith (self // removeAttrs args ["overrides" "external"]); _self = with self; { + inherit emacs; + ## START HERE ac-haskell-process = melpaBuild rec { @@ -370,7 +372,7 @@ let self = _self // overrides; pname = "evil"; version = "20141020"; src = fetchgit { - url = "https://gitorious.org/evil/evil.git"; + url = "https://github.com/emacsmirror/evil.git"; rev = "999ec15587f85100311c031aa8efb5d50c35afe4"; sha256 = "5f67643d19a31172e68f2f195959d33bcd26c2786eb71e67eb27eb52f5bf387a"; }; @@ -461,12 +463,12 @@ let self = _self // overrides; git-commit-mode = melpaBuild rec { pname = "git-commit-mode"; - version = "0.15.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; rev = version; - sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; + sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0"; }; files = [ "git-commit-mode.el" ]; meta = { license = gpl3Plus; }; @@ -474,12 +476,12 @@ let self = _self // overrides; git-rebase-mode = melpaBuild rec { pname = "git-rebase-mode"; - version = "0.15.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; rev = version; - sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; + sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0"; }; files = [ "git-rebase-mode.el" ]; meta = { license = gpl3Plus; }; @@ -487,12 +489,12 @@ let self = _self // overrides; gitattributes-mode = melpaBuild rec { pname = "gitattributes-mode"; - version = "0.15.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; rev = version; - sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; + sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0"; }; files = [ "gitattributes-mode.el" ]; meta = { license = gpl3Plus; }; @@ -500,12 +502,12 @@ let self = _self // overrides; gitconfig-mode = melpaBuild rec { pname = "gitconfig-mode"; - version = "0.15.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; rev = version; - sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; + sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0"; }; files = [ "gitconfig-mode.el" ]; meta = { license = gpl3Plus; }; @@ -513,12 +515,12 @@ let self = _self // overrides; gitignore-mode = melpaBuild rec { pname = "gitignore-mode"; - version = "0.15.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; rev = version; - sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; + sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0"; }; files = [ "gitignore-mode.el" ]; meta = { license = gpl3Plus; }; @@ -695,12 +697,12 @@ let self = _self // overrides; magit = melpaBuild rec { pname = "magit"; - version = "20141025"; + version = "1.4.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "50c08522c8a3c67e0f3b821fe4df61e8bd456ff9"; - sha256 = "0mzyx72pidzvla1x2qszn3c60n2j0n8i5k875c4difvd1n4p0vsk"; + rev = version; + sha256 = "0x8bvfw47bfpzsv9yr98aays4idbbwvnkp0pag1q78gcn9h2k9vi"; }; packageRequires = [ git-commit-mode git-rebase-mode ]; meta = { license = gpl3Plus; }; @@ -1067,12 +1069,12 @@ let self = _self // overrides; weechat = melpaBuild rec { pname = "weechat.el"; - version = "20141016"; + version = "0.2.2"; src = fetchFromGitHub { owner = "the-kenny"; repo = pname; - rev = "4cb2ced1eda5167ce774e04657d2cd077b63c706"; - sha256 = "003sihp7irm0qqba778dx0gf8xhkxd1xk7ig5kgkryvl2jyirk28"; + rev = version; + sha256 = "0f90m2s40jish4wjwfpmbgw024r7n2l5b9q9wr6rd3vdcwks3mcl"; }; postPatch = lib.optionalString (!stdenv.isLinux) '' rm weechat-sauron.el weechat-secrets.el diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0d724e21080..b2cebf63fff 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2037,7 +2037,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pop3client = callPackage ../development/libraries/haskell/pop3-client {}; poppler = callPackage ../development/libraries/haskell/poppler { - popplerGlib = pkgs.poppler.poppler_glib; + popplerGlib = pkgs.poppler; libc = pkgs.stdenv.cc.libc; }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 3ed9123a3ac..ce75904418d 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -282,6 +282,12 @@ let }; buildInputs = [ unzip ]; + preBuild = '' + makeFlagsArray=(CC=$CC); + ''; + + buildFlags = if stdenv.isDarwin then "macosx" else ""; + installPhase = '' mkdir -p $out/lib/lua/${lua.luaversion} install -p lpeg.so $out/lib/lua/${lua.luaversion} @@ -290,7 +296,7 @@ let meta = { homepage = "http://www.inf.puc-rio.br/~roberto/lpeg/"; - hydraPlatforms = stdenv.lib.platforms.linux; + hydraPlatforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.mit; }; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ef3f2409041..f49c7ecb993 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -205,6 +205,20 @@ let self = _self // overrides; _self = with self; { }; }; + Appcpanminus = buildPerlPackage { + name = "App-cpanminus-1.7027"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7027.tar.gz; + sha256 = "6853359493f8465abbe556d7409e7c0abecd1b48b6a63d2f851af83839c34b31"; + }; + meta = { + homepage = https://github.com/miyagawa/cpanminus; + description = "Get, unpack, build and install modules from CPAN"; + license = "perl"; + platforms = stdenv.lib.platforms.all; + }; + }; + Appperlbrew = buildPerlPackage { name = "App-perlbrew-0.71"; src = fetchurl { @@ -5489,10 +5503,10 @@ let self = _self // overrides; _self = with self; { MathClipper = buildPerlModule rec { - name = "Math-Clipper-1.22"; + name = "Math-Clipper-1.23"; src = fetchurl { url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; - sha256 = "0p5iblg979v3pb6a8kyhjdv33yadr5997nhz9asjksgvww328nfa"; + sha256 = "0i9wzvig7ayijc9nvh5x5rryk1jrcj1hcvfmlcj449rnnxx24dav"; }; propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsXSpp ExtUtilsTypemapsDefault TestDeep ]; }; @@ -7043,6 +7057,15 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [IOSocketSSL DigestHMAC]; }; + NetSMTPTLSButMaintained = buildPerlPackage { + name = "Net-SMTP-TLS-ButMaintained-0.24"; + src = fetchurl { + url = mirror://cpan/authors/id/F/FA/FAYLAND/Net-SMTP-TLS-ButMaintained-0.24.tar.gz; + sha256 = "0vi5cv7f9i96hgp3q3jpxzn1ysn802kh5xc304f8b7apf67w15bb"; + }; + propagatedBuildInputs = [NetSSLeay DigestHMAC IOSocketSSL]; + }; + NetSNMP = buildPerlPackage rec { name = "Net-SNMP-6.0.1"; src = fetchurl { @@ -7430,12 +7453,12 @@ let self = _self // overrides; _self = with self; { }; PerlMagick = buildPerlPackage rec { - name = "PerlMagick-6.87"; + name = "PerlMagick-6.89-1"; src = fetchurl { url = "mirror://cpan/authors/id/J/JC/JCRISTY/${name}.tar.gz"; - sha256 = "1bf2g80wdny2dfrrmfgk7cqrxzflx3qp1dnd3919grvrqdviyh16"; + sha256 = "0n9afy1z5bhf9phrbahnkwhgcmijn8jggpbzwrivw1zhliliiy68"; }; - buildInputs = [pkgs.imagemagick]; + buildInputs = [ pkgs.imagemagick ]; preConfigure = '' sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick}/include/ImageMagick";|' Makefile.PL diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 30709098ea5..9ae641af660 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -380,6 +380,27 @@ let }; + amqp = buildPythonPackage rec { + name = "amqp-${version}"; + version = "1.4.6"; + disabled = pythonOlder "2.6"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/a/amqp/${name}.tar.gz"; + sha256 = "0h76dnqfbc6fslwr7lx86n2gyslfv2x1vl8lpbszjs2svrkwikzb"; + md5 = "a061581b6864f838bffd62b6a3d0fb9f"; + }; + + buildInputs = with self; [ mock coverage nose-cover3 unittest2 ]; + + meta = { + homepage = http://github.com/celery/py-amqp; + description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project."; + license = licenses.lgpl21; + }; + }; + + amqplib = buildPythonPackage rec { name = "amqplib-0.6.1"; @@ -968,6 +989,31 @@ let }; + billiard = buildPythonPackage rec { + name = "billiard-${version}"; + version = "3.3.0.19"; + + disabled = isPyPy; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/b/billiard/${name}.tar.gz"; + sha256 = "06bs1kl7dji6lwpj3dkfi61mmrfq2mi7wz3ka683i2avwk38wsvf"; + md5 = "7e473b9da01956ce91a650f99fe8d4ad"; + }; + + buildInputs = with self; [ nose unittest2 mock ]; + + # i can't imagine these were intentionally installed + postInstall = "rm -r $out/${python.sitePackages}/funtests"; + + meta = { + homepage = https://github.com/celery/billiard; + description = "Python multiprocessing fork with improvements and bugfixes"; + license = licenses.bsd3; + }; + }; + + bitbucket_api = buildPythonPackage rec { name = "bitbucket-api-0.4.4"; @@ -1442,6 +1488,33 @@ let }; }; + + celery = buildPythonPackage rec { + name = "celery-${version}"; + version = "3.1.17"; + + disabled = pythonOlder "2.6"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/c/celery/${name}.tar.gz"; + sha256 = "0qh38xnbgbj7awpjxxvjlddyafxyyy3fhxcas3i8dmcb4r9vdqng"; + md5 = "e37f5d93b960bf68fc26c1325f30fd16"; + }; + + buildInputs = with self; [ mock nose unittest2 ]; + propagatedBuildInputs = with self; [ kombu billiard pytz anyjson ]; + + # tests broken on python 2.6? https://github.com/nose-devs/nose/issues/806 + doCheck = pythonAtLeast "2.7"; + + meta = { + homepage = https://github.com/celery/celery/; + description = "Distributed task queue"; + license = licenses.bsd3; + }; + }; + + certifi = buildPythonPackage rec { name = "certifi-${version}"; version = "14.05.14"; @@ -2056,6 +2129,71 @@ let }; }; + pytestcache = buildPythonPackage rec { + name = "pytest-cache-1.0"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pytest-cache/pytest-cache-1.0.tar.gz"; + sha256 = "1a873fihw4rhshc722j4h6j7g3nj7xpgsna9hhg3zn6ksknnhx5y"; + }; + + propagatedBuildInputs = with self ; [ pytest execnet ]; + + meta = { + license = stdenv.lib.licenses.mit; + website = "https://pypi.python.org/pypi/pytest-cache/"; + description = "pytest plugin with mechanisms for caching across test runs"; + }; + }; + + pytestflakes = buildPythonPackage rec { + name = "pytset-flakes-0.2"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pytest-flakes/pytest-flakes-0.2.zip"; + sha256 = "0n4mc2kaqasxmj8jid7jlss7nwgz4qgglcwdyrqvh08dilnp354i"; + }; + + propagatedBuildInputs = with self ; [ pytest pyflakes pytestcache ]; + + meta = { + license = stdenv.lib.licenses.mit; + website = "https://pypi.python.org/pypi/pytest-flakes"; + description = "pytest plugin to check source code with pyflakes"; + }; + }; + + pytestpep8 = buildPythonPackage rec { + name = "pytest-pep8"; + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/p/pytest-pep8/pytest-pep8-1.0.6.tar.gz"; + sha256 = "06032agzhw1i9d9qlhfblnl3dw5hcyxhagn7b120zhrszbjzfbh3"; + }; + + propagatedBuildInputs = with self ; [ pytest pytestcache pep8 ]; + + meta = { + license = stdenv.lib.licenses.mit; + website = "https://pypi.python.org/pypi/pytest-pep8"; + description = "pytest plugin to check PEP8 requirements"; + }; + }; + + pytestquickcheck = buildPythonPackage rec { + name = "pytest-quickcheck-0.8.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pytest-quickcheck/pytest-quickcheck-0.8.2.tar.gz"; + sha256 = "047w4zwdsnlzmsc5f3rapzbzd2frlvz9nnp8v4b48fjmqmxassh3"; + }; + + propagatedBuildInputs = with self ; [ pytest pytestflakes pytestpep8 tox ]; + + meta = { + license = stdenv.lib.licenses.asl20; + website = "https://pypi.python.org/pypi/pytest-quickcheck"; + description = "pytest plugin to generate random data inspired by QuickCheck"; + }; + }; + pytestcov = buildPythonPackage (rec { name = "pytest-cov-1.8.1"; @@ -3009,6 +3147,30 @@ let }; }; + hovercraft = buildPythonPackage rec { + disabled = ! isPy3k; + name = "hovercraft-${version}"; + version = "2.0b1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/h/hovercraft/${name}.zip"; + sha256 = "1l88xp563miwwkahil1sxn4kz9khjcx6z85j8d6mq8gjc8rxz3j6"; + }; + + propagatedBuildInputs = with self; [ docutils lxml manuel pygments svg-path watchdog ]; + + # one test assumes we have docutils 0.12 + # TODO: enable tests after upgrading docutils to 0.12 + doCheck = false; + + meta = { + description = "A tool to make impress.js presentations from reStructuredText"; + homepage = https://github.com/regebro/hovercraft; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + }; + }; + itsdangerous = buildPythonPackage rec { name = "itsdangerous-0.24"; @@ -3132,6 +3294,22 @@ let }; }; + pathtools = buildPythonPackage rec { + name = "pathtools-${version}"; + version = "0.1.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pathtools/${name}.tar.gz"; + sha256 = "1h7iam33vwxk8bvslfj4qlsdprdnwf8bvzhqh3jq5frr391cadbw"; + }; + + meta = { + description = "Pattern matching and various utilities for file systems paths"; + homepage = http://github.com/gorakhargosh/pathtools; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + }; + }; paver = buildPythonPackage rec { version = "1.2.2"; @@ -3224,10 +3402,10 @@ let md5 = "9c4c5a59b878aed78e96a6ae58c6c185"; }; - propagatedBuildInputs = [ pkgs.pyqt4 pkgs.pkgconfig pkgs.popplerQt4 ]; + propagatedBuildInputs = [ pkgs.pyqt4 pkgs.pkgconfig pkgs.poppler_qt4 ]; preBuild = "${python}/bin/${python.executable} setup.py build_ext" + - " --include-dirs=${pkgs.popplerQt4}/include/poppler/"; + " --include-dirs=${pkgs.poppler_qt4}/include/poppler/"; meta = with stdenv.lib; { description = "A Python binding to Poppler-Qt4"; @@ -3721,6 +3899,24 @@ let }; + svg-path = buildPythonPackage rec { + name = "svg.path-${version}"; + version = "2.0b1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/svg.path/${name}.zip"; + sha256 = "038x4wqkbvcs71x6n6kzr4kn99csyv8v4gqzssr8pqylqpxi56bm"; + }; + + meta = { + description = "SVG path objects and parser"; + homepage = https://github.com/regebro/svg.path; + license = licenses.cc0; + maintainers = [ maintainers.goibhniu ]; + }; + }; + + repoze_lru = buildPythonPackage rec { name = "repoze.lru-0.6"; @@ -3780,6 +3976,28 @@ let }; }; + watchdog = buildPythonPackage rec { + name = "watchdog-${version}"; + version = "0.8.3"; + + propagatedBuildInputs = with self; [ argh pathtools pyyaml ]; + + doCheck = false; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/w/watchdog/${name}.tar.gz"; + sha256 = "0qj1vqszxwfx6d1s66s96jmfmy2j94bywxiqdydh6ikpvcm8hrby"; + }; + + meta = { + description = "Python API and shell utilities to monitor file system events"; + homepage = http://github.com/gorakhargosh/watchdog; + license = licenses.asl20; + maintainers = [ maintainers.goibhniu ]; + }; + }; + + zope_tales = buildPythonPackage rec { name = "zope.tales-4.0.2"; @@ -4289,13 +4507,22 @@ let }; enum34 = buildPythonPackage rec { - name = "enum34-1.0"; + name = "enum34-${version}"; + version = "1.0.4"; + disabled = pythonAtLeast "3.4"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/e/enum34/${name}.tar.gz"; - md5 = "9d57f5454c70c11707998ea26c1b0a7c"; + sha256 = "0iz4jjdvdgvfllnpmd92qxj5fnfxqpgmjpvpik0jjim3lqk9zhfk"; }; + buildInputs = optional isPy26 self.ordereddict; + + meta = { + homepage = https://pypi.python.org/pypi/enum34; + description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4"; + license = "BSD"; + }; }; epc = buildPythonPackage rec { @@ -4858,13 +5085,15 @@ let }; gdrivefs = buildPythonPackage rec { - version = "0.14.2"; + version = "0.14.3"; name = "gdrivefs-${version}"; disabled = !isPy27; - src = pkgs.fetchurl { - url = "https://github.com/dsoprea/GDriveFS/archive/${version}.tar.gz"; - sha256 = "0cfx9y1kqikrn3ngyl93k9f939hf1h7adqv0lpfri8m8glszhchz"; + src = pkgs.fetchFromGitHub { + sha256 = "1ljkh1871lwzn5lhhgbmbf2hfnbnajr3ddz3q5n1kid25qb3l086"; + rev = version; + repo = "GDriveFS"; + owner = "dsoprea"; }; buildInputs = with self; [ gipc greenlet httplib2 six ]; @@ -5711,6 +5940,34 @@ let }; }; + kombu = buildPythonPackage rec { + name = "kombu-${version}"; + version = "3.0.24"; + + disabled = pythonOlder "2.6"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/k/kombu/${name}.tar.gz"; + sha256 = "13dzybciispin9c4znpiyvgha354mz124lgx06ksw4vic0vh9zxr"; + md5 = "37c8b5084ac83b8a6f5ff9f157cac0e9"; + }; + + buildInputs = with self; optionals (!isPy3k) [ anyjson mock unittest2 nose ]; + + propagatedBuildInputs = with self; [ amqp ] ++ + (optionals (pythonOlder "2.7") [ importlib ordereddict ]); + + # tests broken on python 2.6? https://github.com/nose-devs/nose/issues/806 + # tests also appear to depend on anyjson, which has Py3k problems + doCheck = (pythonAtLeast "2.7") && !isPy3k ; + + meta = with stdenv.lib; { + description = "Messaging library for Python"; + homepage = "http://github.com/celery/kombu"; + license = licenses.bsd3; + }; + }; + konfig = buildPythonPackage rec { name = "konfig-${version}"; version = "0.9"; @@ -6469,11 +6726,11 @@ let msgpack = buildPythonPackage rec { name = "msgpack-python-${version}"; - version = "0.4.2"; + version = "0.4.6"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/m/msgpack-python/${name}.tar.gz"; - md5 = "e3a0fdfd864c72c958bb501d39b39caf"; + md5 = "8b317669314cf1bc881716cccdaccb30"; }; propagatedBuildInputs = with self; [ ]; @@ -6697,6 +6954,22 @@ let }); + nameparser = buildPythonPackage rec { + name = "nameparser-${version}"; + version = "0.3.4"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/n/nameparser/${name}.tar.gz"; + sha256 = "1zi94m99ziwwd6kkip3w2xpnl05r2cfv9iq68inz7np81c3g8vag"; + }; + + meta = { + description = "A simple Python module for parsing human names into their individual components"; + homepage = https://github.com/derek73/python-nameparser; + license = stdenv.lib.licenses.lgpl21Plus; + }; + }; + nbxmpp = buildPythonPackage rec { name = "nbxmpp-0.5.2"; @@ -6867,6 +7140,25 @@ let doCheck = false; }); + nose-cover3 = buildPythonPackage rec { + name = "nose-cover3-${version}"; + version = "0.1.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/n/nose-cover3/${name}.tar.gz"; + sha256 = "1la4hhc1yszjpcchvkqk5xmzlb2g1b3fgxj9wwc58qc549whlcc1"; + md5 = "82f981eaa007b430679899256050fa0c"; + }; + + propagatedBuildInputs = with self; [ nose ]; + + meta = { + description = "Coverage 3.x support for Nose"; + homepage = https://github.com/ask/nosecover3; + license = stdenv.lib.licenses.lgpl21; + }; + }; + nosexcover = buildPythonPackage (rec { name = "nosexcover-1.0.10"; @@ -6947,7 +7239,7 @@ let src = pkgs.notmuch.src; - sourceRoot = "${pkgs.notmuch.src.name}/bindings/python"; + sourceRoot = pkgs.notmuch.pythonSourceRoot; buildInputs = with self; [ python pkgs.notmuch ]; @@ -7407,6 +7699,23 @@ let }; }; + pathlib = buildPythonPackage rec { + name = "pathlib-${version}"; + version = "1.0.1"; + disabled = pythonAtLeast "3.4"; # Was added to std library in Python 3.4 + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pathlib/${name}.tar.gz"; + sha256 = "17zajiw4mjbkkv6ahp3xf025qglkj0805m9s41c45zryzj6p2h39"; + }; + + meta = { + description = "Object-oriented filesystem paths"; + homepage = "https://pathlib.readthedocs.org/"; + license = stdenv.lib.licenses.mit; + }; + }; + pathpy = buildPythonPackage rec { name = "path.py-5.2"; @@ -7588,10 +7897,10 @@ let pgcli = buildPythonPackage rec { name = "pgcli-${version}"; - version = "0.16.2"; + version = "0.16.3"; src = pkgs.fetchFromGitHub { - sha256 = "1f30f9v2iz2206aqzwc6jjadlxd7snicazrp9bcy5sizpha3r55i"; + sha256 = "12zizpj3fqbf90kj43zylpaqi3hhlihfg9xpzqa0aysiqri0ydx2"; rev = "v${version}"; repo = "pgcli"; owner = "amjith"; @@ -8613,6 +8922,115 @@ let }; }; + mmpython = buildPythonPackage rec { + version = "0.4.10"; + name = "mmpython-${version}"; + + src = pkgs.fetchurl { + url = http://sourceforge.net/projects/mmpython/files/latest/download; + sha256 = "1b7qfad3shgakj37gcj1b9h78j1hxlz6wp9k7h76pb4sq4bfyihy"; + name = "${name}.tar.gz"; + }; + + disabled = isPyPy || isPy3k; + + meta = with stdenv.lib; { + description = "Media Meta Data retrieval framework"; + homepage = http://sourceforge.net/projects/mmpython/; + license = licenses.gpl2; + maintainers = [ maintainers.DamienCassou ]; + }; + }; + + kaa-base = buildPythonPackage rec { + version = "0.99.2dev-384-2b73caca"; + name = "kaa-base-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/k/kaa-base/kaa-base-0.99.2dev-384-2b73caca.tar.gz"; + sha256 = "0k3zzz84wzz9q1fl3vvqr2ys96z9pcf4viq9q6s2a63zaysmcfd2"; + }; + + doCheck = false; + + disabled = isPyPy || isPy3k; + + # Same as in buildPythonPackage except that it does not pass --old-and-unmanageable + installPhase = '' + runHook preInstall + + mkdir -p "$out/lib/${python.libPrefix}/site-packages" + + export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + + ${python}/bin/${python.executable} setup.py install \ + --install-lib=$out/lib/${python.libPrefix}/site-packages \ + --prefix="$out" + + eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth + if [ -e "$eapth" ]; then + mv "$eapth" $(dirname "$eapth")/${name}.pth + fi + + rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Generic application framework, providing the foundation for other modules"; + homepage = https://github.com/freevo/kaa-base; + license = licenses.lgpl21; + maintainers = [ maintainers.DamienCassou ]; + }; + }; + + kaa-metadata = buildPythonPackage rec { + version = "0.7.8dev-r4569-20111003"; + name = "kaa-metadata-${version}"; + + doCheck = false; + + buildInputs = [ pkgs.libdvdread ]; + + disabled = isPyPy || isPy3k; + + # Same as in buildPythonPackage except that it does not pass --old-and-unmanageable + installPhase = '' + runHook preInstall + + mkdir -p "$out/lib/${python.libPrefix}/site-packages" + + export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + + ${python}/bin/${python.executable} setup.py install \ + --install-lib=$out/lib/${python.libPrefix}/site-packages \ + --prefix="$out" + + eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth + if [ -e "$eapth" ]; then + mv "$eapth" $(dirname "$eapth")/${name}.pth + fi + + rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* + + runHook postInstall + ''; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/k/kaa-metadata/kaa-metadata-0.7.8dev-r4569-20111003.tar.gz"; + sha256 = "0bkbzfgxvmby8lvzkqjp86anxvv3vjd9nksv2g4l7shsk1n7y27a"; + }; + + propagatedBuildInputs = with self; [ kaa-base ]; + + meta = with stdenv.lib; { + description = "Python library for parsing media metadata, which can extract metadata (e.g., such as id3 tags) from a wide range of media files"; + homepage = https://github.com/freevo/kaa-metadata; + license = licenses.gpl2; + maintainers = [ maintainers.DamienCassou ]; + }; + }; pyinotify = pkgs.stdenv.mkDerivation rec { name = "python-pyinotify-${version}"; @@ -9156,6 +9574,25 @@ let }; }); + pyscss = buildPythonPackage rec { + name = "pyScss-${version}"; + version = "1.3.4"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyScss/${name}.tar.gz"; + sha256 = "03lcp853kgr66aqrw2jd1q9jhs9h049w7zlwp7bfmly7xh832cnh"; + }; + + propagatedBuildInputs = with self; [ six ] + ++ (optionals (pythonOlder "3.4") [ enum34 pathlib ]) + ++ (optionals (pythonOlder "2.7") [ ordereddict ]); + + meta = { + description = "A Scss compiler for Python"; + homepage = http://pyscss.readthedocs.org/en/latest/; + license = stdenv.lib.licenses.mit; + }; + }; pyserial = buildPythonPackage rec { name = "pyserial-2.7"; @@ -10436,15 +10873,16 @@ let }; argh = buildPythonPackage rec { - name = "argh-0.23.3"; + name = "argh-0.26.1"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/a/argh/${name}.tar.gz"; - md5 = "25bb02c6552b42875f2c36714e0ff16c"; + sha256 = "1nqham81ihffc9xmw85dz3rg3v90rw7h0dp3dy0bh3qkp4n499q6"; }; - preCheck = '' + checkPhase = '' export LANG="en_US.UTF-8" + py.test ''; buildInputs = with self; [ pytest py mock pkgs.glibcLocales ]; @@ -10977,6 +11415,65 @@ let }; }); + subdownloader = buildPythonPackage rec { + version = "2.0.18"; + name = "subdownloader-${version}"; + + src = pkgs.fetchurl { + url = "https://launchpad.net/subdownloader/trunk/2.0.18/+download/subdownloader_2.0.18.orig.tar.gz"; + sha256 = "0manlfdpb585niw23ibb8n21mindd1bazp0pnxvmdjrp2mnw97ig"; + }; + + propagatedBuildInputs = with self; [ mmpython pyqt4 ]; + + setup = '' + import os + import sys + + try: + if os.environ.get("NO_SETUPTOOLS"): + raise ImportError() + from setuptools import setup, Extension + SETUPTOOLS = True + except ImportError: + SETUPTOOLS = False + # Use distutils.core as a fallback. + # We won t be able to build the Wheel file on Windows. + from distutils.core import setup, Extension + + with open("README") as fp: + long_description = fp.read() + + requirements = [ ] + + install_options = { + "name": "subdownloader", + "version": "2.0.18", + "description": "Tool for automatic download/upload subtitles for videofiles using fast hashing", + "long_description": long_description, + "url": "http://www.subdownloader.net", + + "scripts": ["run.py"], + "packages": ["cli", "FileManagement", "gui", "languages", "modules"], + + } + if SETUPTOOLS: + install_options["install_requires"] = requirements + + setup(**install_options) + ''; + + postUnpack = '' + echo '${setup}' > $sourceRoot/setup.py + ''; + + meta = with stdenv.lib; { + description = "Tool for automatic download/upload subtitles for videofiles using fast hashing"; + homepage = http://www.subdownloader.net; + license = licenses.gpl3; + maintainers = [ maintainers.DamienCassou ]; + }; + }; subunit = stdenv.mkDerivation rec { name = "subunit-${version}"; @@ -13422,11 +13919,11 @@ let pyspotify = buildPythonPackage rec { name = "pyspotify-${version}"; - version = "1.11"; + version = "1.12"; src = pkgs.fetchurl { - url = "https://github.com/mopidy/pyspotify/archive/v1.11.tar.gz"; - sha256 = "089ml6pqr3f2d15n70jpzbaqjp5pjgqlyv4algkxw92xscjw2izg"; + url = "https://github.com/mopidy/pyspotify/archive/v${version}.tar.gz"; + sha256 = "0bj6p4hafj1yp0j5n1rxww39nvi3w6y3azadz8a8nxb3b4a8f1xn"; }; buildInputs = with self; [ pkgs.libspotify ] @@ -13588,17 +14085,15 @@ let }; searx = buildPythonPackage rec { - name = "searx-${rev}"; - rev = "44d3af9fb2482cd0df1a8ababbe2fdf27ab33172"; + name = "searx-0.7.0"; - src = pkgs.fetchgit { - url = "git://github.com/asciimoo/searx"; - inherit rev; - sha256 = "1w505pzdkkcglq782wg7f5fxrw9i5jzp7px20c2xz18pps2m3rsm"; + src = pkgs.fetchurl { + url = "https://github.com/asciimoo/searx/archive/v0.7.0.tar.gz"; + sha256 = "0vq2zjdr1c8mr3zkycqq3732zf4pybbbrs3kzplqgf851k9zfpbw"; }; propagatedBuildInputs = with self; [ pyyaml lxml grequests flaskbabel flask requests - gevent speaklater Babel pytz dateutil ]; + gevent speaklater Babel pytz dateutil pygments ]; meta = { homepage = https://github.com/asciimoo/searx; @@ -14173,4 +14668,41 @@ let }; }; + basemap = buildPythonPackage rec { + name = "basemap-1.0.7"; + + src = pkgs.fetchurl { + url = "mirror://sourceforge/project/matplotlib/matplotlib-toolkits/basemap-1.0.7/basemap-1.0.7.tar.gz"; + sha256 = "0ca522zirj5sj10vg3fshlmgi615zy5gw2assapcj91vsvhc4zp0"; + }; + + propagatedBuildInputs = with self; [ numpy matplotlib pillow ]; + buildInputs = with self; with pkgs ; [ setuptools geos proj ]; + + # Standard configurePhase from `buildPythonPackage` seems to break the setup.py script + configurePhase = '' + export GEOS_DIR=${pkgs.geos} + ''; + + # The installer does not support the '--old-and-unmanageable' option + installPhase = '' + ${python.interpreter} setup.py install --prefix $out + ''; + + # The 'check' target is not supported by the `setup.py` script. + # TODO : do the post install checks (`cd examples && ${python.interpreter} run_all.py`) + doCheck = false; + + meta = { + homepage = "http://matplotlib.org/basemap/"; + description = "Plot data on map projections with matplotlib"; + longDescription = '' + An add-on toolkit for matplotlib that lets you plot data on map projections with + coastlines, lakes, rivers and political boundaries. See + http://matplotlib.github.com/basemap/users/examples.html for examples of what it can do. + ''; + licences = [ licenses.mit licenses.gpl2 ]; + }; + }; + }); in pythonPackages diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 8f2c548bebc..e8956b5a0da 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -116,7 +116,6 @@ with import ./release-lib.nix { inherit supportedSystems; }; mpg321 = linux; mutt = linux; mysql = linux; - mysql51 = linux; ncat = linux; netcat = all; nfs-utils = linux;