From 83434becf0f9aec303cc8947d87a25040af2ff9d Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Mon, 23 Feb 2015 20:14:44 +0300 Subject: [PATCH 001/615] add information about git-based pkgs --- doc/coding-conventions.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml index 61d373738f90..04adcdea1cb2 100644 --- a/doc/coding-conventions.xml +++ b/doc/coding-conventions.xml @@ -256,6 +256,12 @@ bound to the variable name e2fsprogs in a package named hello-svn by nix-env. + If package is fetched from git's commit then + the version part of the name must be the date of that + (fetched) commit. The date must be in "YYYY-MM-DD" format. + Also add "git" to the name - e.g., + "pkgname-git-2014-09-23". + Dashes in the package name should be preserved in new variable names, rather than converted to underscores (which was convention up to around 2013 and most names From b8c7afb824c4d7c4ea0808c27c0adf2bef3b0a01 Mon Sep 17 00:00:00 2001 From: Chris Double Date: Wed, 25 Mar 2015 15:42:12 +1300 Subject: [PATCH 002/615] Update aliceml from git to get fix for tooltips in IDE --- pkgs/development/compilers/aliceml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index 5059cdf21587..a57cd5b60064 100644 --- a/pkgs/development/compilers/aliceml/default.nix +++ b/pkgs/development/compilers/aliceml/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation { src = fetchgit { url = "https://github.com/aliceml/aliceml"; - rev = "493cd3565f0bc3b35790185ec358fb91b7b43037"; - sha256 = "12fbaf0a474e53f40a71f16bf61c52b7ffe044f4d0993e208e69552df3054d45"; + rev = "7d44dc8e4097c6f85888bbf4ff86d51fe05b0a08"; + sha256 = "ab2d5bf05c40905b02cb1ec975d4980ae4437757856eeb1f587ede2c45a1917f"; fetchSubmodules = true; }; From 771c7fb4965833b91a2e11a5d562902e479c1490 Mon Sep 17 00:00:00 2001 From: Forkk Date: Fri, 17 Apr 2015 14:45:10 -0500 Subject: [PATCH 003/615] plex: add support for managing plugins via Nix Added support for managing Plex plugins via Nix. This is done via an "extraPlugins" configuration option which takes a list of paths to plugin bundles, which are then symlinked into Plex's plugin directory when the service is started. --- nixos/modules/services/misc/plex.nix | 59 ++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index f4642b5157ee..f5f0a8c18161 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -30,6 +30,30 @@ in default = "plex"; description = "Group under which Plex runs."; }; + + + managePlugins = mkOption { + type = types.bool; + default = true; + description = '' + If set to true, this option will cause all of the symlinks in Plex's + plugin directory to be removed and symlinks for paths specified in + to be added. + ''; + }; + + extraPlugins = mkOption { + type = types.listOf types.path; + default = []; + description = '' + A list of paths to extra plugin bundles to install in Plex's plugin + directory. Every time the systemd unit for Plex starts up, all of the + symlinks in Plex's plugin directory will be cleared and this module + will symlink all of the paths specified here to that directory. If + this behavior is undesired, set to + false. + ''; + }; }; }; @@ -45,13 +69,48 @@ in mkdir -p "${cfg.dataDir}" chown -R ${cfg.user}:${cfg.group} "${cfg.dataDir}" } + # Copy the database skeleton files to /var/lib/plex/.skeleton + # See the the Nix expression for Plex's package for more information on + # why this is done. test -d "${cfg.dataDir}/.skeleton" || mkdir "${cfg.dataDir}/.skeleton" for db in "com.plexapp.plugins.library.db"; do cp "${plex}/usr/lib/plexmediaserver/Resources/base_$db" "${cfg.dataDir}/.skeleton/$db" chmod u+w "${cfg.dataDir}/.skeleton/$db" chown ${cfg.user}:${cfg.group} "${cfg.dataDir}/.skeleton/$db" done + + # If managePlugins is enabled, setup symlinks for plugins. + ${optionalString cfg.managePlugins '' + echo "Preparing plugin directory." + PLUGINDIR="${cfg.dataDir}/Plex Media Server/Plug-ins" + test -d "$PLUGINDIR" || { + mkdir -p "$PLUGINDIR"; + chown ${cfg.user}:${cfg.group} "$PLUGINDIR"; + } + + echo "Removing old symlinks." + # First, remove all of the symlinks in the directory. + for f in `ls "$PLUGINDIR/"`; do + if [[ -L "$PLUGINDIR/$f" ]]; then + echo "Removing plugin symlink $PLUGINDIR/$f." + rm "$PLUGINDIR/$f" + fi + done + + echo "Symlinking plugins." + for path in ${toString cfg.extraPlugins}; do + dest="$PLUGINDIR/$(basename $path)" + if [[ ! -d "$path" ]]; then + echo "Error symlinking plugin from $path: no such directory." + elif [[ -d "$dest" || -L "$dest" ]]; then + echo "Error symlinking plugin from $path to $dest: file or directory already exists." + else + echo "Symlinking plugin at $path..." + ln -s "$path" "$dest" + fi + done + ''} ''; serviceConfig = { Type = "simple"; From b1b4092ad5d12ee17e934c35fdd84119fce060ad Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 15 Apr 2015 13:22:39 +0000 Subject: [PATCH 004/615] rustcMaster: Update from 2015-04-13 -> 2015-04-15 --- pkgs/development/compilers/rustc/head.nix | 6 +++--- .../compilers/rustc/patches/head.patch | 20 ++++++++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index 99012ba6d94d..00e87f30e2cd 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -2,9 +2,9 @@ callPackage ./makeRustcDerivation.nix { shortVersion = "1.0.0-dev"; isRelease = false; - # src rev for master on 2015/04/13 - srcRev = "0cf99c3e06e84d20d68da649c888d63c72f33971"; - srcSha = "0brnzsbxmidjnmvi36sz582k3kw6wk813y2y837zpmyxg9fjah0l"; + # src rev for master on 2015-04-15 + srcRev = "a691f1eefea586f154700be6ee1b991158f82b7f"; + srcSha = "1afypvxahhwhva9rssagm2q08wgidv6xcjrx85lqwzy6abyl1hsz"; snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec"; snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349"; snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234"; diff --git a/pkgs/development/compilers/rustc/patches/head.patch b/pkgs/development/compilers/rustc/patches/head.patch index 3cbf8717cd1d..cd2320e84dfe 100644 --- a/pkgs/development/compilers/rustc/patches/head.patch +++ b/pkgs/development/compilers/rustc/patches/head.patch @@ -15,7 +15,7 @@ index ca59b1c..65ee7bf 100755 # do not fail if one of the above fails, as all we need is a working rustc! exit 0 diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs -index ed44bf8..2b84627 100644 +index 9f5751c..c98828f 100644 --- a/src/librustc_back/archive.rs +++ b/src/librustc_back/archive.rs @@ -57,7 +57,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option, @@ -28,10 +28,10 @@ index ed44bf8..2b84627 100644 let mut cmd = Command::new(ar); diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs -index 3087a8e..578448f 100644 +index ad77735..1764f71 100644 --- a/src/librustc_trans/back/link.rs +++ b/src/librustc_trans/back/link.rs -@@ -352,8 +352,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri +@@ -360,8 +360,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri pub fn get_cc_prog(sess: &Session) -> String { match sess.opts.cg.linker { @@ -41,3 +41,17 @@ index 3087a8e..578448f 100644 + None => "@ccPath@".to_string(), } } + +diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs +index 8b5e6f8..480ad79 100644 +--- a/src/test/run-pass/issue-20797.rs ++++ b/src/test/run-pass/issue-20797.rs +@@ -97,7 +97,7 @@ impl Iterator for Subpaths { + } + + fn _foo() { +- let _walker: Subpaths = Subpaths::walk(&PathBuf::from("/home")).unwrap(); ++ let _walker: Subpaths = Subpaths::walk(&PathBuf::from("/tmp")).unwrap(); + } + + fn main() {} From c55c7e1c1e09dfa57e1a44d08c777f995493d2c9 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Mon, 20 Apr 2015 14:25:14 +0200 Subject: [PATCH 005/615] fetchgit: Add support for specifying branch name This is useful when `leaveDotGit = true` and some other derivation expects some branch name to exist. Previously, `nix-prefetch-git` always created a branch with a hard-coded name (`fetchgit`). --- pkgs/build-support/fetchgit/builder.sh | 3 ++- pkgs/build-support/fetchgit/default.nix | 3 ++- pkgs/build-support/fetchgit/nix-prefetch-git | 12 +++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index 71374d1f2383..64eea4ae1000 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -9,6 +9,7 @@ header "exporting $url (rev $rev) into $out" $fetcher --builder --url "$url" --out "$out" --rev "$rev" \ ${leaveDotGit:+--leave-dotGit} \ ${deepClone:+--deepClone} \ - ${fetchSubmodules:+--fetch-submodules} + ${fetchSubmodules:+--fetch-submodules} \ + ${branchName:+--branch-name "$branchName"} stopNest diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index bb89a8f55329..e5ad7200cecf 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -13,6 +13,7 @@ in { url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? deepClone , fetchSubmodules ? true, deepClone ? false +, branchName ? null , name ? urlToName url rev }: @@ -51,7 +52,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = if sha256 == "" then md5 else sha256; - inherit url rev leaveDotGit fetchSubmodules deepClone; + inherit url rev leaveDotGit fetchSubmodules deepClone branchName; GIT_SSL_CAINFO = "${cacert}/etc/ca-bundle.crt"; diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 486fd3acafb7..b45ce81f8801 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -8,6 +8,7 @@ deepClone=$NIX_PREFETCH_GIT_DEEP_CLONE leaveDotGit=$NIX_PREFETCH_GIT_LEAVE_DOT_GIT fetchSubmodules= builder= +branchName=$NIX_PREFETCH_GIT_BRANCH_NAME if test -n "$deepClone"; then deepClone=true @@ -31,6 +32,7 @@ for arg; do --url) argfun=set_url;; --rev) argfun=set_rev;; --hash) argfun=set_hashType;; + --branch-name) argfun=set_branchName;; --deepClone) deepClone=true;; --no-deepClone) deepClone=false;; --leave-dotGit) leaveDotGit=true;; @@ -108,7 +110,7 @@ checkout_hash(){ fi git fetch ${builder:+--progress} origin || return 1 - git checkout -b fetchgit $hash || return 1 + git checkout -b $branchName $hash || return 1 } # Fetch only a branch/tag and checkout it. @@ -131,7 +133,7 @@ checkout_ref(){ if test -n "$ref"; then # --depth option is ignored on http repository. git fetch ${builder:+--progress} --depth 1 origin +"$ref" || return 1 - git checkout -b fetchgit FETCH_HEAD || return 1 + git checkout -b $branchName FETCH_HEAD || return 1 else return 1 fi @@ -251,7 +253,7 @@ clone_user_rev() { fi;; esac - local full_revision=$(cd $dir && (git rev-parse $rev 2> /dev/null || git rev-parse refs/heads/fetchgit) | tail -n1) + local full_revision=$(cd $dir && (git rev-parse $rev 2> /dev/null || git rev-parse refs/heads/$branchName) | tail -n1) echo "git revision is $full_revision" echo "git human-readable version is $(cd $dir && (git describe $full_revision 2> /dev/null || git describe --tags $full_revision 2> /dev/null || echo -- none --))" >&2 echo "Commit date is $(cd $dir && git show --no-patch --pretty=%ci $full_revision)" @@ -268,6 +270,10 @@ clone_user_rev() { fi } +if test -z "$branchName"; then + branchName=fetchgit +fi + if test -n "$builder"; then test -n "$out" -a -n "$url" -a -n "$rev" || usage mkdir $out From 7d67efa3f23f7d5c494c90b79a63756a3917be6e Mon Sep 17 00:00:00 2001 From: Georges Dubus Date: Fri, 10 Oct 2014 16:59:37 +0200 Subject: [PATCH 006/615] Add support for building cargo'ed Rust programs --- pkgs/build-support/fetchgit/nix-prefetch-git | 2 +- pkgs/build-support/rust/default.nix | 52 ++++++++ pkgs/build-support/rust/fetch-builder.sh | 17 +++ pkgs/build-support/rust/fetch-cargo-deps | 119 ++++++++++++++++++ pkgs/build-support/rust/fetchcargo.nix | 19 +++ .../tools/build-managers/cargo/common.nix | 12 +- .../tools/build-managers/cargo/default.nix | 32 +++++ .../tools/build-managers/cargo/setup-hook.sh | 6 + .../tools/build-managers/cargo/snapshot.nix | 11 +- pkgs/development/tools/rust/racer/default.nix | 12 +- pkgs/top-level/all-packages.nix | 27 +++- pkgs/top-level/rust-packages.nix | 19 +++ 12 files changed, 310 insertions(+), 18 deletions(-) create mode 100644 pkgs/build-support/rust/default.nix create mode 100644 pkgs/build-support/rust/fetch-builder.sh create mode 100755 pkgs/build-support/rust/fetch-cargo-deps create mode 100644 pkgs/build-support/rust/fetchcargo.nix create mode 100644 pkgs/development/tools/build-managers/cargo/default.nix create mode 100644 pkgs/development/tools/build-managers/cargo/setup-hook.sh create mode 100644 pkgs/top-level/rust-packages.nix diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index b45ce81f8801..ceedf313f28e 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -224,7 +224,7 @@ make_deterministic_repo(){ fi done - # Do a full repack. Must run single-threaded, or else we loose determinism. + # Do a full repack. Must run single-threaded, or else we lose determinism. git config pack.threads 1 git repack -A -d -f rm -f .git/config diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix new file mode 100644 index 000000000000..a02163f73faf --- /dev/null +++ b/pkgs/build-support/rust/default.nix @@ -0,0 +1,52 @@ +{ stdenv, cacert, git, rustc, cargo, rustRegistry }: +{ name, src, depsSha256, buildInputs ? [], ... } @ args: + +let + fetchDeps = import ./fetchcargo.nix { + inherit stdenv cacert git rustc cargo rustRegistry; + }; + + cargoDeps = fetchDeps { + inherit name src; + sha256 = depsSha256; + }; + +in stdenv.mkDerivation (args // { + inherit cargoDeps rustRegistry; + + buildInputs = [ git cargo rustc ] ++ buildInputs; + + configurePhase = args.configurePhase or "true"; + + postUnpack = '' + echo "Using rust registry from $rustRegistry" + ( + cd $sourceRoot + ln -s $rustRegistry ./cargo-rust-registry + cargo clean + cargo fetch + ) + '' + (args.postUnpack or ""); + + # TODO: Probably not the best way to do this, but it should work for now + prePatch = '' + for dir in ../deps/registry/src/*/pkg-config-*; do + [ -d "$dir" ] || continue + + substituteInPlace "$dir/src/lib.rs" \ + --replace '"/usr"' '"/nix/store/"' + done + '' + (args.prePatch or ""); + + buildPhase = args.buildPhase or '' + echo "Running cargo build" + cargo build --release + ''; + + installPhase = args.installPhase or '' + mkdir -p $out/bin + for f in $(find target/release -maxdepth 1 -type f); do + cp $f $out/bin + done; + ''; +}) diff --git a/pkgs/build-support/rust/fetch-builder.sh b/pkgs/build-support/rust/fetch-builder.sh new file mode 100644 index 000000000000..faa17e653289 --- /dev/null +++ b/pkgs/build-support/rust/fetch-builder.sh @@ -0,0 +1,17 @@ +source $stdenv/setup + +# cargo-fetch needs to write to Cargo.lock, even to do nothing. We +# create a fake checkout with symlinks and and editable Cargo.lock. +mkdir copy +cd copy +for f in $(ls $src); do + ln -s $src/"$f" . +done +rm Cargo.lock +cp $src/Cargo.lock . +chmod +w Cargo.lock + +$fetcher . $out + +cd .. +rm -rf copy diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps new file mode 100755 index 000000000000..d6579fe94bda --- /dev/null +++ b/pkgs/build-support/rust/fetch-cargo-deps @@ -0,0 +1,119 @@ +#! /bin/sh -eu + +set -o pipefail + +src=$(realpath $1) +out=$(realpath $2) + +echo "Fetching $src to $out" + +mkdir $out + +# Configure cargo to fetch from a local copy of the crates.io registry +# +# Unfortunately, `cargo fetch` will create an output directory named after a +# hash of the registry index URL. +# +# This makes things difficult for us because we don't want our output to change +# just because the path to the registry changed, otherwise we'd have to update +# all deps' SHA256 hashes whenever we simply update the registry to a newer +# commit. +# +# Also, since cargo doesn't seem to support relative URLs in the format +# file://../path, we use a hack to make sure the registry index path/URL is +# always the same: we'll create a symlink in the current working directory to +# the real registry path, while pointing cargo to the following fixed absolute +# path: +# +# file:///proc/self/cwd/symlink-name + +ln -s $rustRegistry $src/cargo-rust-registry + +# TODO: replace /proc/self/cwd hack with normal relative path. Probably +# needs cargo fix. +cat < $out/config +[registry] +index = "file:///proc/self/cwd/cargo-rust-registry" +EOF + +export CARGO_HOME=$out +cd $src +cargo fetch --verbose + +# TODO: check that Cargo.lock exists, and hasn't changed +# TODO: this should be done by cargo itself + +# Make it deterministic + +# The registry index changes all the time, so it's not deterministic +rm -rf $out/registry/index + +# Make git DBs deterministic +# TODO: test with git submodules +[[ ! -d $out/git/checkouts ]] || (cd $out/git/checkouts && for name in *; do + cd "$out/git/checkouts/$name" + revs="" + for branch in *; do + cd "$branch" + rev="$(git rev-parse HEAD)" + revs="$revs $rev" + cd .. + done + + ( + # The following code was adapted from nix-prefetch-git + + cd "$out/git/db/$name" + + export GIT_DIR=. + + # Remove all remote branches + git branch -r | while read branch; do + git branch -rD "$branch" >&2 + done + + # Remove tags that don't point to any HEAD + git tag | while read tag; do + rev="$(git rev-parse $tag)" + if [[ $revs != *" $rev"* ]]; then + git tag -d "$tag" >&2 + fi + done + + # Remove branches that don't point to any HEAD + branchrefs=() + eval "$(git for-each-ref --shell --format='branchrefs+=(%(refname))' refs/heads/)" + + for branchref in "${branchrefs[@]}"; do + echo "Examining $branchref" + rev="$(git rev-parse "$branchref")" + echo "Has rev $rev" + echo "List of revs: $revs" + if [[ $revs != *" $rev"* ]]; then + echo "Deleting $branchref" + git update-ref -d "$branchref" >&2 + fi + done + + echo "$revs" | while read rev; do + echo "git branch b_$rev $rev" + git branch b_$rev $rev + done + + # Remove files that have timestamps or otherwise have non-deterministic + # properties. + rm -rf logs/ hooks/ index FETCH_HEAD ORIG_HEAD refs/remotes/origin/HEAD config + + # Do a full repack. Must run single-threaded, or else we lose determinism. + git config pack.threads 1 + git repack -A -d -f + rm -f config + + # Garbage collect unreferenced objects. + git gc --prune=all + ) +done) + +# Remove unneeded outputs +[[ ! -d $out/registry/src ]] || rm -rf $out/registry/src +[[ ! -d $out/git/checkouts ]] || rm -rf $out/git/checkouts diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix new file mode 100644 index 000000000000..cd5d69e06d0d --- /dev/null +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -0,0 +1,19 @@ +{ stdenv, cacert, git, rustc, cargo, rustRegistry }: +{ name ? "cargo-deps", src, sha256 }: + +stdenv.mkDerivation { + name = "${name}-fetch"; + buildInputs = [ rustc cargo git ]; + builder = ./fetch-builder.sh; + fetcher = ./fetch-cargo-deps; + inherit src rustRegistry; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = sha256; + + SSL_CERT_FILE = "${cacert}/etc/ca-bundle.crt"; + + impureEnvVars = [ "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ]; + preferLocalBuild = true; +} diff --git a/pkgs/development/tools/build-managers/cargo/common.nix b/pkgs/development/tools/build-managers/cargo/common.nix index f0d8f92dfaa3..d993681b28f8 100644 --- a/pkgs/development/tools/build-managers/cargo/common.nix +++ b/pkgs/development/tools/build-managers/cargo/common.nix @@ -3,6 +3,16 @@ { inherit version; + name = "cargo-${version}"; + + postInstall = '' + rm "$out/lib/rustlib/components" \ + "$out/lib/rustlib/install.log" \ + "$out/lib/rustlib/rust-installer-version" \ + "$out/lib/rustlib/uninstall.sh" \ + "$out/lib/rustlib/manifest-cargo" + ''; + platform = if stdenv.system == "i686-linux" then "i686-unknown-linux-gnu" else if stdenv.system == "x86_64-linux" @@ -20,5 +30,5 @@ platforms = platforms.linux; }; - name = "cargo-${version}"; + setupHook = ./setup-hook.sh; } diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix new file mode 100644 index 000000000000..5f21ab1235d3 --- /dev/null +++ b/pkgs/development/tools/build-managers/cargo/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl +, cmake, zlib }: + +with ((import ./common.nix) { inherit stdenv; version = "2015-04-14"; }); + +with rustPlatform; + +buildRustPackage rec { + inherit name version meta setupHook; + + src = fetchgit { + url = "https://github.com/rust-lang/cargo.git"; + rev = "d49b44358ed800351647571144257d35ac0886cf"; + sha256 = "1kaims28237mvp1qpw2cfgb3684jr54ivkdag0lw8iv9xap4i35y"; + leaveDotGit = true; + }; + + depsSha256 = "1yi39asmnrya8w83jrjxym658cf1a5ffp8ym8502rqqvx30y0yx4"; + + buildInputs = [ file curl pkgconfig python openssl cmake zlib ]; + + configurePhase = '' + ./configure --prefix=$out --local-cargo=${cargo}/bin/cargo + ''; + + buildPhase = "make"; + + installPhase = '' + make install + ${postInstall} + ''; +} diff --git a/pkgs/development/tools/build-managers/cargo/setup-hook.sh b/pkgs/development/tools/build-managers/cargo/setup-hook.sh new file mode 100644 index 000000000000..91a7f0f5bc8e --- /dev/null +++ b/pkgs/development/tools/build-managers/cargo/setup-hook.sh @@ -0,0 +1,6 @@ +if [[ -n "$cargoDeps" ]]; then + echo "Using cargo deps from $cargoDeps" + cp -r $cargoDeps deps + chmod +w deps -R + export CARGO_HOME=$(realpath deps) +fi diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix index 64aeb0736c17..cc950af3f50d 100644 --- a/pkgs/development/tools/build-managers/cargo/snapshot.nix +++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix @@ -19,11 +19,8 @@ let snapshotHash = if stdenv.system == "i686-linux" snapshotName = "cargo-nightly-${platform}.tar.gz"; in - stdenv.mkDerivation { - inherit name; - inherit version; - inherit meta; + inherit name version meta setupHook; src = fetchurl { url = "https://static-rust-lang-org.s3.amazonaws.com/cargo-dist/${snapshotDate}/${snapshotName}"; @@ -35,10 +32,8 @@ stdenv.mkDerivation { installPhase = '' mkdir -p "$out" ./install.sh "--prefix=$out" - rm "$out/lib/rustlib/components" \ - "$out/lib/rustlib/install.log" \ - "$out/lib/rustlib/rust-installer-version" \ - "$out/lib/rustlib/uninstall.sh" + + ${postInstall} '' + (if stdenv.isLinux then '' patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \ --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib}/lib" \ diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 341088dc0f2d..c22ee64b7423 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -1,6 +1,8 @@ -{stdenv, fetchgit, rustc, cargo, makeWrapper }: +{stdenv, fetchgit, rustPlatform, makeWrapper }: -stdenv.mkDerivation rec { +with rustPlatform; + +buildRustPackage rec { #TODO add emacs support name = "racer-git-2015-04-12"; src = fetchgit { @@ -9,11 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0a768gvjry86l0xa5q0122iyq7zn2h9adfniglsgrbs4fan49xyn"; }; - buildInputs = [ rustc cargo makeWrapper ]; + depsSha256 = "0x1rq012k04ci18w5fll56jn011f1yyprs38pb3r223bag94ivsy"; - buildPhase = '' - CARGO_HOME="$NIX_BUILD_TOP/.cargo" cargo build --release - ''; + buildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a3c5228f871..8e820c4dde5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4337,6 +4337,24 @@ let rustcMaster = callPackage ../development/compilers/rustc/head.nix {}; rustc = rustcBeta; + rustPlatform = rustStable; + + rustStable = recurseIntoAttrs (makeRustPlatform rustc cargo rustStable); + rustUnstable = recurseIntoAttrs (makeRustPlatform rustcMaster cargo rustUnstable); + + # rust platform to build cargo itself (with cargoSnapshot) + rustCargoPlatform = makeRustPlatform rustcMaster cargoSnapshot rustCargoPlatform; + + makeRustPlatform = rustc: cargo: self: + let + callPackage = newScope self; + in { + inherit rustc cargo; + + rustRegistry = callPackage ./rust-packages.nix { }; + + buildRustPackage = callPackage ../build-support/rust { }; + }; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl = callPackage ../development/compilers/sbcl { @@ -4938,6 +4956,11 @@ let byacc = callPackage ../development/tools/parsing/byacc { }; + cargo = callPackage ../development/tools/build-managers/cargo { + # cargo needs to be built with rustCargoPlatform, which uses cargoSnapshot + rustPlatform = rustCargoPlatform; + }; + cargoSnapshot = callPackage ../development/tools/build-managers/cargo/snapshot.nix { }; casperjs = callPackage ../development/tools/casperjs { }; @@ -5263,8 +5286,8 @@ let premake = premake4; racerRust = callPackage ../development/tools/rust/racer { - rustc = rustcMaster; - cargo = cargoSnapshot; + # racerRust still uses unstable features from the standard library + rustPlatform = rustUnstable; }; radare = callPackage ../development/tools/analysis/radare { diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix new file mode 100644 index 000000000000..2ad93feec0b3 --- /dev/null +++ b/pkgs/top-level/rust-packages.nix @@ -0,0 +1,19 @@ +# This file defines the source of Rust / cargo's crates registry +# +# buildRustPackage will automatically download dependencies from the registry +# version that we define here. If you're having problems downloading / finding +# a Rust library, try updating this to a newer commit. + +{ fetchgit }: + +fetchgit { + url = git://github.com/rust-lang/crates.io-index.git; + + # 2015-04-20 + rev = "c7112fed5f973e438bb600946016c5083e66b1c9"; + sha256 = "0vyrz7d6zvh79hx5fg557g93r9qm40wx1g4hx7304lina4smk30h"; + + # cargo needs the 'master' branch to exist + leaveDotGit = true; + branchName = "master"; +} From 5e8a4477390332e4315397a21a919d63af94595a Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 21 Apr 2015 20:17:05 +0200 Subject: [PATCH 007/615] cargo: Build optimized binary --- pkgs/development/tools/build-managers/cargo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix index 5f21ab1235d3..dadc3a093dc7 100644 --- a/pkgs/development/tools/build-managers/cargo/default.nix +++ b/pkgs/development/tools/build-managers/cargo/default.nix @@ -20,7 +20,7 @@ buildRustPackage rec { buildInputs = [ file curl pkgconfig python openssl cmake zlib ]; configurePhase = '' - ./configure --prefix=$out --local-cargo=${cargo}/bin/cargo + ./configure --enable-optimize --prefix=$out --local-cargo=${cargo}/bin/cargo ''; buildPhase = "make"; From d648be67246e771126defb34989ecb9f88292c64 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 21 Apr 2015 20:34:26 +0200 Subject: [PATCH 008/615] buildRustPackage: Add check phase and enable it by default Also disable check phase in cargo as there are lots of failures (some probably due to trying to access the network). --- pkgs/build-support/rust/default.nix | 9 ++++++++- pkgs/development/tools/build-managers/cargo/default.nix | 4 ++++ pkgs/development/tools/rust/racer/default.nix | 4 ++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index a02163f73faf..45d706b8c562 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -39,10 +39,17 @@ in stdenv.mkDerivation (args // { '' + (args.prePatch or ""); buildPhase = args.buildPhase or '' - echo "Running cargo build" + echo "Running cargo build --release" cargo build --release ''; + checkPhase = args.checkPhase or '' + echo "Running cargo test" + cargo test + ''; + + doCheck = args.doCheck or true; + installPhase = args.installPhase or '' mkdir -p $out/bin for f in $(find target/release -maxdepth 1 -type f); do diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix index dadc3a093dc7..894b77b96e32 100644 --- a/pkgs/development/tools/build-managers/cargo/default.nix +++ b/pkgs/development/tools/build-managers/cargo/default.nix @@ -25,6 +25,10 @@ buildRustPackage rec { buildPhase = "make"; + # Disable check phase as there are lots of failures (some probably due to + # trying to access the network). + doCheck = false; + installPhase = '' make install ${postInstall} diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index c22ee64b7423..baa29f356edc 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -15,6 +15,10 @@ buildRustPackage rec { buildInputs = [ makeWrapper ]; + preCheck = '' + export RUST_SRC_PATH="${rustc.src}/src" + ''; + installPhase = '' mkdir -p $out/bin cp -p target/release/racer $out/bin/ From e42c17ee9709c8fddbaee7d79c0d13f330443582 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 23 Apr 2015 02:43:11 +0200 Subject: [PATCH 009/615] buildRustPackage: Fix Cargo.lock being ignored It turns out that `cargo`, with respect to registry dependencies, was ignoring the package versions locked in `Cargo.lock` because we changed the registry index URL. Therefore, every time `rustRegistry` would be updated, we'd always try to use the latest version available for every dependency and as a result the deps' SHA256 hashes would almost always have to be changed. To fix this, now we do a string substitution in `Cargo.lock` of the `crates.io` registry URL with our URL. This should be safe because our registry is just a copy of the `crates.io` registry at a certain point in time. Since now we don't always use the latest version of every dependency, the build of `cargo` actually started to fail because two of the dependencies specified in its `Cargo.lock` file have build failures. To fix the latter problem, I've added a `cargoUpdateHook` variable that gets ran both when fetching dependencies and just before building the program. The purpose of `cargoUpdateHook` is to do any ad-hoc updating of dependencies necessary to get the package to build. The use of the '--precise' flag is needed so that cargo doesn't try to fetch an even newer version whenever `rustRegistry` is updated (and therefore have to change depsSha256 as a consequence). --- pkgs/build-support/rust/default.nix | 15 +++++++++++---- pkgs/build-support/rust/fetch-cargo-deps | 15 +++++++++++++-- pkgs/build-support/rust/fetchcargo.nix | 4 ++-- .../tools/build-managers/cargo/default.nix | 10 +++++++++- 4 files changed, 35 insertions(+), 9 deletions(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 45d706b8c562..6a5e4b86194f 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,5 +1,5 @@ { stdenv, cacert, git, rustc, cargo, rustRegistry }: -{ name, src, depsSha256, buildInputs ? [], ... } @ args: +{ name, src, depsSha256, buildInputs ? [], cargoUpdateHook ? "", ... } @ args: let fetchDeps = import ./fetchcargo.nix { @@ -7,12 +7,12 @@ let }; cargoDeps = fetchDeps { - inherit name src; + inherit name src cargoUpdateHook; sha256 = depsSha256; }; in stdenv.mkDerivation (args // { - inherit cargoDeps rustRegistry; + inherit cargoDeps rustRegistry cargoUpdateHook; buildInputs = [ git cargo rustc ] ++ buildInputs; @@ -23,8 +23,15 @@ in stdenv.mkDerivation (args // { ( cd $sourceRoot ln -s $rustRegistry ./cargo-rust-registry - cargo clean + + substituteInPlace Cargo.lock \ + --replace "registry+https://github.com/rust-lang/crates.io-index" \ + "registry+file:///proc/self/cwd/cargo-rust-registry" + + eval "$cargoUpdateHook" + cargo fetch + cargo clean ) '' + (args.postUnpack or ""); diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps index d6579fe94bda..f0a21e673cd9 100755 --- a/pkgs/build-support/rust/fetch-cargo-deps +++ b/pkgs/build-support/rust/fetch-cargo-deps @@ -1,6 +1,8 @@ -#! /bin/sh -eu +#! /bin/sh -set -o pipefail +source $stdenv/setup + +set -euo pipefail src=$(realpath $1) out=$(realpath $2) @@ -38,6 +40,15 @@ EOF export CARGO_HOME=$out cd $src + +set +u +substituteInPlace Cargo.lock \ + --replace "registry+https://github.com/rust-lang/crates.io-index" \ + "registry+file:///proc/self/cwd/cargo-rust-registry" +set -u + +eval "$cargoUpdateHook" + cargo fetch --verbose # TODO: check that Cargo.lock exists, and hasn't changed diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index cd5d69e06d0d..7ebd02a485d7 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -1,12 +1,12 @@ { stdenv, cacert, git, rustc, cargo, rustRegistry }: -{ name ? "cargo-deps", src, sha256 }: +{ name ? "cargo-deps", src, sha256, cargoUpdateHook ? "" }: stdenv.mkDerivation { name = "${name}-fetch"; buildInputs = [ rustc cargo git ]; builder = ./fetch-builder.sh; fetcher = ./fetch-cargo-deps; - inherit src rustRegistry; + inherit src rustRegistry cargoUpdateHook; outputHashAlgo = "sha256"; outputHashMode = "recursive"; diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix index 894b77b96e32..3235157b015f 100644 --- a/pkgs/development/tools/build-managers/cargo/default.nix +++ b/pkgs/development/tools/build-managers/cargo/default.nix @@ -15,7 +15,15 @@ buildRustPackage rec { leaveDotGit = true; }; - depsSha256 = "1yi39asmnrya8w83jrjxym658cf1a5ffp8ym8502rqqvx30y0yx4"; + cargoUpdateHook = '' + # Updating because version 2.1.4 has an invalid Cargo.toml + cargo update -p libressl-pnacl-sys --precise 2.1.5 + + # Updating because version 0.1.3 has a build failure with recent rustc + cargo update -p threadpool --precise 0.1.4 + ''; + + depsSha256 = "12d2v4b85qabagrypvqiam2iybd4jwcg0sky0gqarfhjh2dhwfm6"; buildInputs = [ file curl pkgconfig python openssl cmake zlib ]; From 0cde1dc52425f12be6f7311737abe98813e43c29 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 23 Apr 2015 15:14:34 +0200 Subject: [PATCH 010/615] cargo: Remove setupHook Instead, move that code into buildRustPackage. The setup hook was only doing part of the work anyway, and having it in a separate place was obscuring what was really going on. --- pkgs/build-support/rust/default.nix | 6 ++++++ pkgs/development/tools/build-managers/cargo/common.nix | 2 -- pkgs/development/tools/build-managers/cargo/default.nix | 2 +- pkgs/development/tools/build-managers/cargo/setup-hook.sh | 6 ------ pkgs/development/tools/build-managers/cargo/snapshot.nix | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/cargo/setup-hook.sh diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 6a5e4b86194f..37175114d81e 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -19,6 +19,12 @@ in stdenv.mkDerivation (args // { configurePhase = args.configurePhase or "true"; postUnpack = '' + echo "Using cargo deps from $cargoDeps" + cp -r $cargoDeps deps + chmod +w deps -R + + export CARGO_HOME=$(realpath deps) + echo "Using rust registry from $rustRegistry" ( cd $sourceRoot diff --git a/pkgs/development/tools/build-managers/cargo/common.nix b/pkgs/development/tools/build-managers/cargo/common.nix index d993681b28f8..84158e65a4d8 100644 --- a/pkgs/development/tools/build-managers/cargo/common.nix +++ b/pkgs/development/tools/build-managers/cargo/common.nix @@ -29,6 +29,4 @@ license = [ licenses.mit licenses.asl20 ]; platforms = platforms.linux; }; - - setupHook = ./setup-hook.sh; } diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix index 3235157b015f..0e70cb9232b1 100644 --- a/pkgs/development/tools/build-managers/cargo/default.nix +++ b/pkgs/development/tools/build-managers/cargo/default.nix @@ -6,7 +6,7 @@ with ((import ./common.nix) { inherit stdenv; version = "2015-04-14"; }); with rustPlatform; buildRustPackage rec { - inherit name version meta setupHook; + inherit name version meta; src = fetchgit { url = "https://github.com/rust-lang/cargo.git"; diff --git a/pkgs/development/tools/build-managers/cargo/setup-hook.sh b/pkgs/development/tools/build-managers/cargo/setup-hook.sh deleted file mode 100644 index 91a7f0f5bc8e..000000000000 --- a/pkgs/development/tools/build-managers/cargo/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [[ -n "$cargoDeps" ]]; then - echo "Using cargo deps from $cargoDeps" - cp -r $cargoDeps deps - chmod +w deps -R - export CARGO_HOME=$(realpath deps) -fi diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix index cc950af3f50d..a76fb4601e8b 100644 --- a/pkgs/development/tools/build-managers/cargo/snapshot.nix +++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix @@ -20,7 +20,7 @@ let snapshotHash = if stdenv.system == "i686-linux" in stdenv.mkDerivation { - inherit name version meta setupHook; + inherit name version meta; src = fetchurl { url = "https://static-rust-lang-org.s3.amazonaws.com/cargo-dist/${snapshotDate}/${snapshotName}"; From b993c2113c8191ca9b454abfc79d02196b6a2bd0 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 23 Apr 2015 16:37:52 +0200 Subject: [PATCH 011/615] buildRustPackage: Add a mechanism to patch registry deps ... in a more generic way. With this commit, if you need to patch a registry package to make it work with Nix, you just need to add a script to patch-registry-deps in the same style as the `pkg-config` script. --- pkgs/build-support/rust/default.nix | 20 +++++++++++++------ .../rust/patch-registry-deps/pkg-config | 8 ++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 pkgs/build-support/rust/patch-registry-deps/pkg-config diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 37175114d81e..2a890a0d232b 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -14,6 +14,8 @@ let in stdenv.mkDerivation (args // { inherit cargoDeps rustRegistry cargoUpdateHook; + patchRegistryDeps = ./patch-registry-deps; + buildInputs = [ git cargo rustc ] ++ buildInputs; configurePhase = args.configurePhase or "true"; @@ -41,14 +43,20 @@ in stdenv.mkDerivation (args // { ) '' + (args.postUnpack or ""); - # TODO: Probably not the best way to do this, but it should work for now prePatch = '' - for dir in ../deps/registry/src/*/pkg-config-*; do - [ -d "$dir" ] || continue + # Patch registry dependencies, using the scripts in $patchRegistryDeps + ( + cd ../deps/registry/src/* - substituteInPlace "$dir/src/lib.rs" \ - --replace '"/usr"' '"/nix/store/"' - done + set -euo pipefail + + for script in $patchRegistryDeps/*; do + # Run in a subshell so that directory changes and shell options don't + # affect any following commands + + ( . $script) + done + ) '' + (args.prePatch or ""); buildPhase = args.buildPhase or '' diff --git a/pkgs/build-support/rust/patch-registry-deps/pkg-config b/pkgs/build-support/rust/patch-registry-deps/pkg-config new file mode 100644 index 000000000000..2acf489851e9 --- /dev/null +++ b/pkgs/build-support/rust/patch-registry-deps/pkg-config @@ -0,0 +1,8 @@ +for dir in pkg-config-*; do + [ -d "$dir" ] || continue + + echo "Patching pkg-config registry dep" + + substituteInPlace "$dir/src/lib.rs" \ + --replace '"/usr"' '"/nix/store/"' +done From d6093505cc59c7cf5540afd044dea9ab8d5c1e9b Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 23 Apr 2015 20:15:47 +0200 Subject: [PATCH 012/615] buildRustPackage: Get rid of /proc/self/cwd hack This makes buildRustPackage portable to non-Linux platforms. Additionally, now we also save the `Cargo.lock` file into the fetch output, so that we don't have to run $cargoUpdateHook again just before building. --- pkgs/build-support/rust/default.nix | 37 +++-- pkgs/build-support/rust/fetch-cargo-deps | 127 ++++++++++++------ .../tools/build-managers/cargo/default.nix | 2 +- pkgs/development/tools/rust/racer/default.nix | 2 +- 4 files changed, 114 insertions(+), 54 deletions(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 2a890a0d232b..ddf2fce3cae5 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -11,8 +11,16 @@ let sha256 = depsSha256; }; + # The following is the directory name cargo creates when the registry index + # URL is file:///dev/null + # + # It's OK to use /dev/null as the URL because by the time we do this, cargo + # won't attempt to update the registry anymore, so the URL is more or less + # irrelevant + registryIndexDirName = "-ba82b75dd6681d6f"; + in stdenv.mkDerivation (args // { - inherit cargoDeps rustRegistry cargoUpdateHook; + inherit cargoDeps rustRegistry; patchRegistryDeps = ./patch-registry-deps; @@ -22,21 +30,26 @@ in stdenv.mkDerivation (args // { postUnpack = '' echo "Using cargo deps from $cargoDeps" - cp -r $cargoDeps deps + + cp -r "$cargoDeps" deps chmod +w deps -R - export CARGO_HOME=$(realpath deps) + cat < deps/config + [registry] + index = "file:///dev/null" + EOF echo "Using rust registry from $rustRegistry" + + ln -s "$rustRegistry" "deps/registry/index/${registryIndexDirName}" + + export CARGO_HOME="$(realpath deps)" + + # Retrieved the Cargo.lock file which we saved during the fetch + mv deps/Cargo.lock $sourceRoot/ + ( cd $sourceRoot - ln -s $rustRegistry ./cargo-rust-registry - - substituteInPlace Cargo.lock \ - --replace "registry+https://github.com/rust-lang/crates.io-index" \ - "registry+file:///proc/self/cwd/cargo-rust-registry" - - eval "$cargoUpdateHook" cargo fetch cargo clean @@ -46,10 +59,10 @@ in stdenv.mkDerivation (args // { prePatch = '' # Patch registry dependencies, using the scripts in $patchRegistryDeps ( - cd ../deps/registry/src/* - set -euo pipefail + cd ../deps/registry/src/* + for script in $patchRegistryDeps/*; do # Run in a subshell so that directory changes and shell options don't # affect any following commands diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps index f0a21e673cd9..c7799fb1b1f6 100755 --- a/pkgs/build-support/rust/fetch-cargo-deps +++ b/pkgs/build-support/rust/fetch-cargo-deps @@ -12,52 +12,108 @@ echo "Fetching $src to $out" mkdir $out # Configure cargo to fetch from a local copy of the crates.io registry -# -# Unfortunately, `cargo fetch` will create an output directory named after a -# hash of the registry index URL. -# -# This makes things difficult for us because we don't want our output to change -# just because the path to the registry changed, otherwise we'd have to update -# all deps' SHA256 hashes whenever we simply update the registry to a newer -# commit. -# -# Also, since cargo doesn't seem to support relative URLs in the format -# file://../path, we use a hack to make sure the registry index path/URL is -# always the same: we'll create a symlink in the current working directory to -# the real registry path, while pointing cargo to the following fixed absolute -# path: -# -# file:///proc/self/cwd/symlink-name -ln -s $rustRegistry $src/cargo-rust-registry +echo "Using rust registry from $rustRegistry" -# TODO: replace /proc/self/cwd hack with normal relative path. Probably -# needs cargo fix. cat < $out/config [registry] -index = "file:///proc/self/cwd/cargo-rust-registry" +index = "file://$rustRegistry" EOF export CARGO_HOME=$out cd $src +if [[ ! -f Cargo.lock ]]; then + echo "ERROR: The Cargo.lock file doesn't exist" + echo + echo "Cargo.lock is needed to make sure that depsSha256 doesn't change" + echo "when the registry is updated." + + exit 1 +fi + +# We need to do the following string replacement so that 'cargo fetch' +# doesn't ignore the versions specified in Cargo.lock set +u substituteInPlace Cargo.lock \ --replace "registry+https://github.com/rust-lang/crates.io-index" \ - "registry+file:///proc/self/cwd/cargo-rust-registry" + "registry+file://$rustRegistry" set -u +# Do any possible 'cargo update -p --precise ' ad-hoc updates eval "$cargoUpdateHook" +# Do the fetch cargo fetch --verbose -# TODO: check that Cargo.lock exists, and hasn't changed -# TODO: this should be done by cargo itself +# Now that we have fetched everything, let's make the output deterministic -# Make it deterministic +# Cargo uses the following directory structure for fetched data, where +# $indexHash is a hash of the registry index URL: +# +# +# /config: +# +# Cargo config file. We'll delete this because it's not deterministic, +# and instead recreate it just before running 'cargo build'. +# +# /registry/cache/$indexHash/: +# +# This is where tarballs of registry package dependencies are kept +# We'll need to keep this, but make sure $indexHash is a fixed name. +# +# /registry/index/$indexHash/: +# +# A copy of the registry index is kept here. We can delete this, and +# instead, just before running 'cargo build', we'll symlink this +# directory to our static copy of the registry in the Nix store. +# +# /registry/src/$indexHash/{pkgName-pkgVersion}/: +# +# Here cargo keeps extracted sources of the cached tarballs. +# We'll just delete this because cargo will re-populate them from the +# tarballs. +# +# /git/db/{domain-hash}/: +# +# Here cargo keeps the `.git` directories of git dependencies. +# We'll need to keep these, but make them deterministic. +# +# /git/checkouts/{domain-hash}/{branchName}/: +# +# Here cargo keeps checked-out sources of the git dependencies. +# We can delete this, because cargo will re-populate them from the above +# `.git` directories. +# +# Let's start + +# Remove cargo config file, which points to the ever-changing registry +rm $out/config + +# Save the Cargo.lock file into the output, so that we don't have to do another +# 'cargo update' during the build (which would try to access the network) for +# any ad-hoc package updates (through $cargoUpdateHook). +# +# We need to replace the rustRegistry URL with something deterministic. +# Since the URL won't actually be accessed anymore, it's fine to use /dev/null. + +set +u +substituteInPlace Cargo.lock \ + --replace "registry+file://$rustRegistry" \ + "registry+file:///dev/null" +set -u +mv Cargo.lock $out/ + +# The following is the $indexHash cargo uses for the registry index when +# its URL is file:///dev/null, which is the registry index URL we use to make +# sure our output is deterministic. + +registryIndexDirName="-ba82b75dd6681d6f" +mv $out/registry/cache/* $out/registry/cache/$registryIndexDirName # The registry index changes all the time, so it's not deterministic -rm -rf $out/registry/index +# We'll symlink it before running 'cargo build' +rm -rf $out/registry/index/* # Make git DBs deterministic # TODO: test with git submodules @@ -83,31 +139,22 @@ rm -rf $out/registry/index git branch -rD "$branch" >&2 done - # Remove tags that don't point to any HEAD + # Remove all tags git tag | while read tag; do - rev="$(git rev-parse $tag)" - if [[ $revs != *" $rev"* ]]; then - git tag -d "$tag" >&2 - fi + git tag -d "$tag" >&2 done - # Remove branches that don't point to any HEAD + # Remove all local branches branchrefs=() eval "$(git for-each-ref --shell --format='branchrefs+=(%(refname))' refs/heads/)" for branchref in "${branchrefs[@]}"; do - echo "Examining $branchref" - rev="$(git rev-parse "$branchref")" - echo "Has rev $rev" - echo "List of revs: $revs" - if [[ $revs != *" $rev"* ]]; then - echo "Deleting $branchref" - git update-ref -d "$branchref" >&2 - fi + git update-ref -d "$branchref" >&2 done + # Create ad-hoc branches for the revs we need echo "$revs" | while read rev; do - echo "git branch b_$rev $rev" + echo "Creating git branch b_$rev $rev" git branch b_$rev $rev done diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix index 0e70cb9232b1..05e07b4afa2b 100644 --- a/pkgs/development/tools/build-managers/cargo/default.nix +++ b/pkgs/development/tools/build-managers/cargo/default.nix @@ -23,7 +23,7 @@ buildRustPackage rec { cargo update -p threadpool --precise 0.1.4 ''; - depsSha256 = "12d2v4b85qabagrypvqiam2iybd4jwcg0sky0gqarfhjh2dhwfm6"; + depsSha256 = "1gj3mnjj17h5p0r1jcm3m3pm3p3l1rbfdz3l7v1cykng78dsabnq"; buildInputs = [ file curl pkgconfig python openssl cmake zlib ]; diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index baa29f356edc..4887736a8591 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -11,7 +11,7 @@ buildRustPackage rec { sha256 = "0a768gvjry86l0xa5q0122iyq7zn2h9adfniglsgrbs4fan49xyn"; }; - depsSha256 = "0x1rq012k04ci18w5fll56jn011f1yyprs38pb3r223bag94ivsy"; + depsSha256 = "13rnxr5inrfnmg5mg2vap17fd2jp32g2a70pfi1sshi6vjr8kpap"; buildInputs = [ makeWrapper ]; From 916b20ae3695682d6af8b1bfdc8c24936815f248 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 23 Apr 2015 20:42:06 +0200 Subject: [PATCH 013/615] rustRegistry: Fix "Target OID..." cargo failure. For some reason, `cargo` doesn't like git repositories downloaded with `fetchgit`. It will sometimes fail with the error message "Target OID for the reference doesn't exist on the repository". To workaround this, we'll just have to create a new git repo from scratch... --- pkgs/top-level/rust-packages.nix | 49 +++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 2ad93feec0b3..2f2465a2b179 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -4,16 +4,45 @@ # version that we define here. If you're having problems downloading / finding # a Rust library, try updating this to a newer commit. -{ fetchgit }: +{ runCommand, fetchgit, git }: -fetchgit { - url = git://github.com/rust-lang/crates.io-index.git; +let + version = "2015-04-20"; - # 2015-04-20 - rev = "c7112fed5f973e438bb600946016c5083e66b1c9"; - sha256 = "0vyrz7d6zvh79hx5fg557g93r9qm40wx1g4hx7304lina4smk30h"; + src = fetchgit { + url = git://github.com/rust-lang/crates.io-index.git; - # cargo needs the 'master' branch to exist - leaveDotGit = true; - branchName = "master"; -} + rev = "c7112fed5f973e438bb600946016c5083e66b1c9"; + sha256 = "0vyrz7d6zvh79hx5fg557g93r9qm40wx1g4hx7304lina4smk30h"; + + # cargo needs the 'master' branch to exist + leaveDotGit = true; + branchName = "master"; + }; + +in + +runCommand "rustRegistry-${version}-${builtins.substring 0 7 src.rev}" {} '' + # For some reason, cargo doesn't like fetchgit's git repositories, not even + # if we clone them (tested with registry rev + # 965b634156cc5c6f10c7a458392bfd6f27436e7e), failing with the message: + # + # "Target OID for the reference doesn't exist on the repository" + # + # So we'll just have to create a new git repository from scratch with the + # contents downloaded with fetchgit... + + mkdir -p $out + + cp -r ${src}/* $out/ + + cd $out + + git="${git}/bin/git" + + $git init + $git config --local user.email "example@example.com" + $git config --local user.name "example" + $git add . + $git commit -m 'Rust registry commit' +'' From a5c0a06ee59f6a51594c9138a5f467f69b465b9c Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 24 Apr 2015 01:01:33 +0200 Subject: [PATCH 014/615] rustRegistry: Update --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 2f2465a2b179..8cbc4a73d28f 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,13 +7,13 @@ { runCommand, fetchgit, git }: let - version = "2015-04-20"; + version = "2015-04-23"; src = fetchgit { url = git://github.com/rust-lang/crates.io-index.git; - rev = "c7112fed5f973e438bb600946016c5083e66b1c9"; - sha256 = "0vyrz7d6zvh79hx5fg557g93r9qm40wx1g4hx7304lina4smk30h"; + rev = "965b634156cc5c6f10c7a458392bfd6f27436e7e"; + sha256 = "1hbl3g1d6yz6x2fm76dxmcn8rdrmri4l9n6flvv0pkn4hsid7zw1"; # cargo needs the 'master' branch to exist leaveDotGit = true; From 4b0a59b3fe08c884109b8b2d390fd3ff9b2684cf Mon Sep 17 00:00:00 2001 From: Markus Kohlhase Date: Thu, 30 Apr 2015 16:48:57 +0200 Subject: [PATCH 015/615] pkgs: added ArangoDB 2.5.2 --- pkgs/servers/nosql/arangodb/default.nix | 33 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/servers/nosql/arangodb/default.nix diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix new file mode 100644 index 000000000000..847d56b1f0aa --- /dev/null +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit, openssl, zlib, python, gyp, bash, go, readline }: + +stdenv.mkDerivation rec { + version = "2.5.2"; + name = "arangodb-${version}"; + + src = fetchgit { + url = https://github.com/arangodb/arangodb.git; + rev = "refs/tags/v${version}"; + sha256 = "04l9palmh0jwbylapsss7d1s0h54wb6kng30zqsl3dq9l91ii6s0"; + }; + + buildInputs = [ + openssl zlib python gyp go readline + ]; + + configureFlagsArray = [ "--with-openssl-lib=${openssl}/lib" ]; + + patchPhase = '' + substituteInPlace 3rdParty/V8-3.31.74.1/build/gyp/gyp --replace /bin/bash ${bash}/bin/bash + substituteInPlace 3rdParty/etcd/build --replace /bin/bash ${bash}/bin/bash + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/arangodb/arangodb"; + description = "A native multi-model database with flexible data models for documents, graphs, and key-values"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = [ maintainers.flosse ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab48e4e367aa..889e5a7ff8be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -544,6 +544,10 @@ let arandr = callPackage ../tools/X11/arandr { }; + arangodb = callPackage ../servers/nosql/arangodb { + inherit (pythonPackages) gyp; + }; + arcanist = callPackage ../development/tools/misc/arcanist {}; arduino = arduino-core.override { withGui = true; }; From 5f9ee33df53d1c24a7c37a92f5c0b4cfe2dbc0ee Mon Sep 17 00:00:00 2001 From: Markus Kohlhase Date: Sat, 2 May 2015 14:37:31 +0200 Subject: [PATCH 016/615] pkgs: arangodb 2.5.2 -> 2.5.3 --- pkgs/servers/nosql/arangodb/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 847d56b1f0aa..4ff12f630c9b 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, openssl, zlib, python, gyp, bash, go, readline }: +{ stdenv, fetchFromGitHub, openssl, zlib, python, gyp, bash, go, readline }: stdenv.mkDerivation rec { - version = "2.5.2"; + version = "2.5.3"; name = "arangodb-${version}"; - src = fetchgit { - url = https://github.com/arangodb/arangodb.git; - rev = "refs/tags/v${version}"; - sha256 = "04l9palmh0jwbylapsss7d1s0h54wb6kng30zqsl3dq9l91ii6s0"; + src = fetchFromGitHub { + repo = "arangodb"; + owner = "arangodb"; + rev = "67d995aa22ea341129398326fa10c5f6c14e94e9"; + sha256 = "1v07fghf2jd2mvkfqhag0xblf6sxw7kx9kmhs2xpyrpns58lirvc"; }; buildInputs = [ From e9b093bc9851a05eac2e1a0a9340c0c3a8d4e605 Mon Sep 17 00:00:00 2001 From: codyopel Date: Thu, 7 May 2015 06:04:20 -0400 Subject: [PATCH 017/615] stxxl: refactor --- pkgs/development/libraries/stxxl/default.nix | 30 ++++++++++++++------ 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index 23590f17ca88..9fb25aa36e0a 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -1,24 +1,38 @@ -{stdenv, fetchurl, cmake, parallel ? true }: +{ stdenv, fetchurl, cmake +, parallel ? true +}: + +let + mkFlag = optset: flag: if optset then "-D${flag}=ON" else "-D${flag}=OFF"; +in stdenv.mkDerivation rec { - name = "stxxl-1.4.1"; + name = "stxxl-${version}"; + version = "1.4.1"; src = fetchurl { - url = "https://github.com/stxxl/stxxl/archive/1.4.1.tar.gz"; + url = "https://github.com/stxxl/stxxl/archive/${version}.tar.gz"; sha256 = "54006a5fccd1435abc2f3ec201997a4d7dacddb984d2717f62191798e5372f6c"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; - cmakeFlags = let parallel_str = if parallel then "ON" else "OFF"; in "-DUSE_GNU_PARALLEL=${parallel_str}"; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_STATIC_LIBS=OFF" + "-DCMAKE_BUILD_TYPE=Release" + (mkFlag parallel "USE_GNU_PARALLEL") + ]; passthru = { inherit parallel; }; - meta = { - homepage = https://github.com/stxxl/stxxl; + meta = with stdenv.lib; { description = "An implementation of the C++ standard template library STL for external memory (out-of-core) computations"; - license = stdenv.lib.licenses.boost; + homepage = https://github.com/stxxl/stxxl; + license = licenses.boost; + maintainers = with maintainers; [ ]; + platforms = platforms.all; }; } From 73f0339c3596728f0902579a99c9ec3dadc5bf78 Mon Sep 17 00:00:00 2001 From: Eric Merritt Date: Thu, 7 May 2015 18:59:52 -0500 Subject: [PATCH 018/615] crypto++: fix build issue on OSX (10.9.5 at least) --- .../libraries/crypto++/GNUmakefile.patch | 13 +++++++++++++ pkgs/development/libraries/crypto++/default.nix | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/crypto++/GNUmakefile.patch diff --git a/pkgs/development/libraries/crypto++/GNUmakefile.patch b/pkgs/development/libraries/crypto++/GNUmakefile.patch new file mode 100644 index 000000000000..48fdfe420482 --- /dev/null +++ b/pkgs/development/libraries/crypto++/GNUmakefile.patch @@ -0,0 +1,13 @@ +--- crypto++/GNUmakefile 2013-02-20 10:30:52.000000000 -0500 ++++ crypto++/GNUmakefile 2015-05-07 18:34:25.000000000 -0500 +@@ -87,8 +87,8 @@ + endif + + ifeq ($(UNAME),Darwin) +-AR = libtool +-ARFLAGS = -static -o ++AR = ar ++ARFLAGS = cru + CXX = c++ + IS_GCC2 = $(shell $(CXX) -v 2>&1 | $(EGREP) -c gcc-932) + ifeq ($(IS_GCC2),1) diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index cf22a775b14d..053937f1c56d 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0x1mqpz1v071cfrw4grbw7z734cxnpry1qh2b6rsmcx6nkyd5gsw"; }; - patches = stdenv.lib.optional (stdenv.system != "i686-cygwin") ./dll.patch; + patches = (stdenv.lib.optional (stdenv.system != "i686-cygwin") ./dll.patch) + ++ (stdenv.lib.optional stdenv.isDarwin ./GNUmakefile.patch); buildInputs = [ unzip libtool ]; From f392d36b17918eb27621c213b0b3ad512aecf1e6 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Sat, 9 May 2015 17:13:51 +0000 Subject: [PATCH 019/615] libuv: version 1.5.0 --- pkgs/development/libraries/libuv/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index f85c2bef1853..37f09d4adf00 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -105,5 +105,5 @@ in // mapAttrs (v: h: mkWithAutotools stable (toVersion v) h) { v1_2_0 = "1nbp8qpgw64gl9nrjzxw0ndv1m64cfms0cy5a2883vw6877kizmx"; - v1_4_2 = "03ffyjyz92ipi2im05hvlx7jypv9c8fyp90zqyr91w7vszskxnxw"; + v1_5_0 = "1j0871mxw97680ghlqy0dpyfmr26kqa0lk26a2bgcqf4ghqap24x"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4372d2283cdf..74ed1b7190de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1884,7 +1884,7 @@ let else nodePackages_0_12; - iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_2; }; + iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_5_0; }; iojsPackages = callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; }; @@ -6936,7 +6936,7 @@ let automake = automake113x; # fails with 14 }); - libuv = libuvVersions.v1_4_2; + libuv = libuvVersions.v1_5_0; libv4l = lowPrio (v4l_utils.override { alsaLib = null; From 5927faa13893f09d0c7065d9f9f8deef05346ce5 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 10 May 2015 14:07:25 +0200 Subject: [PATCH 020/615] add Lassulus to maintainers.nix --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 8f148ba91c40..8a8ff7ffa09f 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -116,6 +116,7 @@ kovirobi = "Kovacsics Robert "; kragniz = "Louis Taylor "; ktosiek = "Tomasz Kontusz "; + lassulus = "Lassulus "; lethalman = "Luca Bruno "; lhvwb = "Nathaniel Baxter "; linquize = "Linquize "; From 6305e506b307fccca6ab15331825e0abb8433b44 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Sun, 10 May 2015 12:46:09 -0600 Subject: [PATCH 021/615] Fix Hydra build of EventStore Need to patch the build.sh shebang to make it pure. --- pkgs/servers/nosql/eventstore/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index e13d99c104d4..fd83ba889b96 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { ln -s ${icu}/lib/libicui18n.so src/libs/libicui18n.so ln -s ${icu}/lib/libicuuc.so src/libs/libicuuc.so + patchShebangs build.sh ./build.sh js1 ./build.sh quick ${version} ''; From 6f634e3c3abdffdaac9405c872f683f4fcf465fe Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Mon, 11 May 2015 01:57:15 +0800 Subject: [PATCH 022/615] Add kbdlight package and setuid wrapper update nixos/modules/programs/kbdlight.nix to use mkEnableOption --- lib/maintainers.nix | 1 + nixos/modules/module-list.nix | 1 + nixos/modules/programs/kbdlight.nix | 16 +++++++++++++ pkgs/os-specific/linux/kbdlight/default.nix | 26 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 46 insertions(+) create mode 100644 nixos/modules/programs/kbdlight.nix create mode 100644 pkgs/os-specific/linux/kbdlight/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 6906abd2c78c..b1d44ba51474 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -221,6 +221,7 @@ winden = "Antonio Vargas Gonzalez "; wizeman = "Ricardo M. Correia "; wjlroe = "William Roe "; + womfoo = "Kranium Gikos Mendoza "; wkennington = "William A. Kennington III "; wmertens = "Wout Mertens "; wscott = "Wayne Scott "; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bf70715cea4c..959d19a25ab6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -62,6 +62,7 @@ ./programs/environment.nix ./programs/info.nix ./programs/ibus.nix + ./programs/kbdlight.nix ./programs/light.nix ./programs/nano.nix ./programs/screen.nix diff --git a/nixos/modules/programs/kbdlight.nix b/nixos/modules/programs/kbdlight.nix new file mode 100644 index 000000000000..0172368e968f --- /dev/null +++ b/nixos/modules/programs/kbdlight.nix @@ -0,0 +1,16 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.kbdlight; + +in +{ + options.programs.kbdlight.enable = mkEnableOption "kbdlight"; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.kbdlight ]; + security.setuidPrograms = [ "kbdlight" ]; + }; +} diff --git a/pkgs/os-specific/linux/kbdlight/default.nix b/pkgs/os-specific/linux/kbdlight/default.nix new file mode 100644 index 000000000000..1bc07f357a8a --- /dev/null +++ b/pkgs/os-specific/linux/kbdlight/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "kbdlight-${version}"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "hobarrera"; + repo = "kbdlight"; + rev = "v${version}"; + sha256 = "1f08aid1xrbl4sb5447gkip9lnvkia1c4ap0v8zih5s9w8v72bny"; + }; + + preConfigure = '' + substituteInPlace Makefile \ + --replace /usr/local $out + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/hobarrera/kbdlight; + description = "A very simple application that changes MacBooks' keyboard backlight level"; + license = licenses.isc; + maintainers = [ maintainers.womfoo ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 739878d1a743..4e713f0c91a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9155,6 +9155,8 @@ let kbd = callPackage ../os-specific/linux/kbd { }; + kbdlight = callPackage ../os-specific/linux/kbdlight { }; + kmscon = callPackage ../os-specific/linux/kmscon { }; latencytop = callPackage ../os-specific/linux/latencytop { }; From b8f1d6c9dbc456930ac33347c01f789c0525e70a Mon Sep 17 00:00:00 2001 From: codyopel Date: Mon, 11 May 2015 04:22:26 -0400 Subject: [PATCH 023/615] global: refactor --- .../development/tools/misc/global/default.nix | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 7b61d96e3e7e..0fa547097885 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -1,5 +1,6 @@ -{ fetchurl, stdenv, libtool, ncurses, ctags, sqlite -, pythonPackages, makeWrapper }: +{ fetchurl, stdenv, libtool, makeWrapper +, coreutils, ctags, ncurses, pythonPackages, sqlite, pkgconfig +}: stdenv.mkDerivation rec { name = "global-6.4"; @@ -9,16 +10,20 @@ stdenv.mkDerivation rec { sha256 = "13i4zwx6gaibc4j79wd0hgxysw8ibxz9c018zxhydnxlyadzcnri"; }; - buildInputs = [ libtool ncurses makeWrapper ]; + nativeBuildInputs = [ libtool makeWrapper ]; + + buildInputs = [ ncurses ]; + 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-sqlite3=${sqlite} '' - + ''--with-exuberant-ctags=${ctags}/bin/ctags''; + configureFlags = [ + "--with-ltdl-include=${libtool}/include" + "--with-ltdl-lib=${libtool}/lib" + "--with-ncurses=${ncurses}" + "--with-sqlite3=${sqlite}" + "--with-exuberant-ctags=${ctags}/bin/ctags" + "--with-posix-sort=${coreutils}/bin/sort" + ]; doCheck = true; @@ -34,7 +39,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Source code tag system"; - longDescription = '' GNU GLOBAL is a source code tagging system that works the same way across diverse environments (Emacs, vi, less, Bash, web browser, etc). @@ -45,11 +49,8 @@ stdenv.mkDerivation rec { independence of any editor. It runs on a UNIX (POSIX) compatible operating system like GNU and BSD. ''; - - license = licenses.gpl3Plus; - homepage = http://www.gnu.org/software/global/; - + license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; }; From 1199d23a39a4ffd97476176b5fd29b36f8a5112d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 10 May 2015 23:15:46 -0700 Subject: [PATCH 024/615] ceph: 0.94.1 -> 0.94.1.1 --- pkgs/tools/filesystems/ceph/0.94.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix index a14259184a57..b8d87506b7e5 100644 --- a/pkgs/tools/filesystems/ceph/0.94.nix +++ b/pkgs/tools/filesystems/ceph/0.94.nix @@ -1,12 +1,12 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "0.94.1"; + version = "0.94.1.1"; src = fetchgit { url = "https://github.com/ceph/ceph.git"; rev = "refs/tags/v${version}"; - sha256 = "0rrl10vda4xv22al2c5ccd8v8drs26186dvkrxndvqz8p9999cjx"; + sha256 = "1qvjj2iqzv2xz5037ksbk7mqjv6gsx2jsprizdzzzij3hnlricp5"; }; patches = [ ./fix-pgrefdebugging.patch ]; From 4cba460737bcaace3609a4bc78fecf6805293e4b Mon Sep 17 00:00:00 2001 From: codyopel Date: Mon, 11 May 2015 05:27:53 -0400 Subject: [PATCH 025/615] ctags: 804 -> 816 --- pkgs/development/tools/misc/ctags/default.nix | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix index bf13a5daa666..26b186c11eab 100644 --- a/pkgs/development/tools/misc/ctags/default.nix +++ b/pkgs/development/tools/misc/ctags/default.nix @@ -1,27 +1,22 @@ -{ stdenv, fetchsvn, automake, autoconf}: +{ stdenv, fetchsvn, autoreconfHook }: stdenv.mkDerivation rec { name = "ctags-${revision}"; - revision = "804"; + revision = "816"; src = fetchsvn { - url = "http://ctags.svn.sourceforge.net/svnroot/ctags/trunk"; + url = "https://ctags.svn.sourceforge.net/svnroot/ctags/trunk"; rev = revision; - sha256 = "16gln1mah2jqp32ki1z0187dwkbjx1xcnmyiardcq6c9w3p4qwcr"; + sha256 = "0jmbkrmscbl64j71qffcc39x005jrmphx8kirs1g2ws44wil39hf"; }; - buildInputs = [ automake autoconf ]; - - preConfigure = "autoreconf -i"; + nativeBuildInputs = [ autoreconfHook ]; # don't use $T(E)MP which is set to the build directory - configureFlags="--enable-tmpdir=/tmp"; + configureFlags= [ "--enable-tmpdir=/tmp" ]; - meta = { - homepage = "http://ctags.sourceforge.net/"; + meta = with stdenv.lib; { description = "A tool for fast source code browsing (exuberant ctags)"; - license = stdenv.lib.licenses.gpl2Plus; - longDescription = '' Ctags generates an index (or tag) file of language objects found in source files that allows these items to be quickly and easily @@ -30,9 +25,10 @@ stdenv.mkDerivation rec { alternatively, the index entry created for that object). Many programming languages are supported. ''; - - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; + homepage = http://ctags.sourceforge.net/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ simons ]; + platforms = platforms.unix; }; } From caf62e8bfb7924f52af0b22f27b899ec9ec1b17b Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 9 May 2015 20:39:49 +0200 Subject: [PATCH 026/615] add charybdis to nixpkgs --- pkgs/servers/irc/charybdis/default.nix | 34 +++++++++++++++++++ .../servers/irc/charybdis/remove-setenv.patch | 12 +++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 48 insertions(+) create mode 100644 pkgs/servers/irc/charybdis/default.nix create mode 100644 pkgs/servers/irc/charybdis/remove-setenv.patch diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix new file mode 100644 index 000000000000..ab0ba4fd9343 --- /dev/null +++ b/pkgs/servers/irc/charybdis/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchgit, bison, flex, openssl }: + +stdenv.mkDerivation rec { + name = "charybdis-3.5.0-rc1"; + + src = fetchgit { + url = "https://github.com/atheme/charybdis.git"; + rev = "43a9b61c427cd0f3fa2c192890b8a48d9ea6fb7f"; + sha256 = "ae2c8a72e6a29c901f9b51759b542ee12c4ec918050a2d9d65e5635077a0fcef"; + }; + + patches = [ + ./remove-setenv.patch + ]; + + configureFlags = [ + "--enable-epoll" + "--enable-ipv6" + "--enable-openssl=${openssl}" + "--with-program-prefix=charybdis-" + ]; + + buildInputs = [ bison flex openssl ]; + + meta = { + description = "An extremely scalable ircd with some cooperation with the ratbox and ircu guys"; + homepage = https://github.com/atheme/charybdis; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.lassulus ]; + platforms = stdenv.lib.platforms.all; + }; + + +} diff --git a/pkgs/servers/irc/charybdis/remove-setenv.patch b/pkgs/servers/irc/charybdis/remove-setenv.patch new file mode 100644 index 000000000000..c53c1ff294e0 --- /dev/null +++ b/pkgs/servers/irc/charybdis/remove-setenv.patch @@ -0,0 +1,12 @@ +diff --git a/src/bandbi.c b/src/bandbi.c +index 03dd907..3698e85 100644 +--- a/src/bandbi.c ++++ b/src/bandbi.c +@@ -82,7 +82,6 @@ start_bandb(void) + const char *suffix = ""; + #endif + +- rb_setenv("BANDB_DBPATH", PKGLOCALSTATEDIR "/ban.db", 1); + if(bandb_path == NULL) + { + rb_snprintf(fullpath, sizeof(fullpath), "%s/bandb%s", PKGLIBEXECDIR, suffix); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9936330936c2..c38831625f69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8371,6 +8371,8 @@ let bosun = callPackage ../servers/monitoring/bosun {}; scollector = callPackage ../servers/monitoring/bosun/scollector.nix {}; + charybdis = callPackage ../servers/irc/charybdis {}; + couchdb = callPackage ../servers/http/couchdb { spidermonkey = spidermonkey_185; python = python27; From 304cab2b4648070859a3e55b6004fb5d0adadfe8 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 9 May 2015 21:35:29 +0200 Subject: [PATCH 027/615] add charybdis nixos module --- nixos/modules/module-list.nix | 1 + .../modules/services/networking/charybdis.nix | 98 +++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 nixos/modules/services/networking/charybdis.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d182359b5cff..6333baf1d6cc 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -252,6 +252,7 @@ ./services/networking/bind.nix ./services/networking/bitlbee.nix ./services/networking/btsync.nix + ./services/networking/charybdis.nix ./services/networking/chrony.nix ./services/networking/cjdns.nix ./services/networking/cntlm.nix diff --git a/nixos/modules/services/networking/charybdis.nix b/nixos/modules/services/networking/charybdis.nix new file mode 100644 index 000000000000..91729ebd60a5 --- /dev/null +++ b/nixos/modules/services/networking/charybdis.nix @@ -0,0 +1,98 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkEnableOption mkIf mkOption singleton types; + inherit (pkgs) coreutils charybdis; + cfg = config.services.charybdis; + + configFile = pkgs.writeText "charybdis.conf" '' + ${cfg.config} + ''; +in + +{ + + ###### interface + + options = { + + services.charybdis = { + + enable = mkEnableOption "Charybdis IRC daemon"; + + config = mkOption { + type = types.string; + description = '' + Charybdis IRC daemon configuration file. + ''; + }; + + statedir = mkOption { + type = types.string; + default = "/var/lib/charybdis"; + description = '' + Location of the state directory of charybdis. + ''; + }; + + user = mkOption { + type = types.string; + default = "ircd"; + description = '' + Charybdis IRC daemon user. + ''; + }; + + group = mkOption { + type = types.string; + default = "ircd"; + description = '' + Charybdis IRC daemon group. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + users.extraUsers = singleton { + name = cfg.user; + description = "Charybdis IRC daemon user"; + uid = config.ids.uids.ircd; + group = cfg.group; + }; + + users.extraGroups = singleton { + name = cfg.group; + gid = config.ids.gids.ircd; + }; + + systemd.services.charybdis = { + description = "Charybdis IRC daemon"; + wantedBy = [ "multi-user.target" ]; + environment = { + BANDB_DBPATH = "${cfg.statedir}/ban.db"; + }; + serviceConfig = { + ExecStart = "${charybdis}/bin/charybdis-ircd -foreground -logfile /dev/stdout -configfile ${configFile}"; + Group = cfg.group; + User = cfg.user; + PermissionsStartOnly = true; # preStart needs to run with root permissions + }; + preStart = '' + if ! test -d /var/lib/charybdis; then + ${coreutils}/bin/mkdir -p ${cfg.statedir} + ${coreutils}/bin/chown ${cfg.user}:${cfg.group} ${cfg.statedir} + fi + ''; + + }; + + }; + +} From 748be0b5d00a8270cf7c7bbd757a3caf698da2a2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 May 2015 11:46:57 +0200 Subject: [PATCH 028/615] thunderbird: Update to 31.6.0 Fixes various critical vulnerabilities. --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 5124b78d071f..6d5dd577bf22 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -13,7 +13,7 @@ enableOfficialBranding ? false }: -let version = "31.4.0"; in +let version = "31.6.0"; in let verName = "${version}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2"; - sha1 = "00b55e28f55b84e3cd257407d797e07a363aeef8"; + sha1 = "147ba0f3c7da29a7814ee9ce4265fb107744559e"; }; buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx From 46d30ae22f741e58c24d14755c76a337c88c9404 Mon Sep 17 00:00:00 2001 From: codyopel Date: Mon, 11 May 2015 06:20:12 -0400 Subject: [PATCH 029/615] mkvtoolnix: 7.8.0 -> 7.9.0 --- .../applications/video/mkvtoolnix/default.nix | 81 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 01d96542c2e7..0dbf42713831 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,49 +1,74 @@ -{ stdenv, fetchurl -, libmatroska -, flac -, libvorbis -, file -, boost -, xdg_utils -, expat -, withGUI ? true -, wxGTK -, zlib -, ruby -, gettext -, pkgconfig -, curl +{ stdenv, fetchurl, gettext, pkgconfig, ruby +, boost, expat, file, flac, libebml, libmatroska, libogg, libvorbis, xdg_utils, zlib +# pugixml (not packaged) +, buildConfig ? "all" +, withGUI ? false, qt5 ? null # Disabled for now until upstream issues are resolved +, legacyGUI ? true, wxGTK ? null +# For now both qt5 and wxwidgets gui's are enabled, if wxwidgets is disabled the +# build system doesn't install desktop entries, icons, etc... }: -assert withGUI -> wxGTK != null; +let + inherit (stdenv.lib) enableFeature optional; +in + +assert withGUI -> qt5 != null; +assert legacyGUI -> wxGTK != null; stdenv.mkDerivation rec { - version = "7.8.0"; name = "mkvtoolnix-${version}"; + version = "7.9.0"; src = fetchurl { url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz"; - sha256 = "0m7y9115bkfsm95hv2nq0hnd9w73jymsm071jm798w11vdskm8af"; + sha256 = "0jmsgfkxrnplpmwlzynqdb4xf3x1z3dminz97gmddswwgnjqyy1r"; }; - buildInputs = [ - libmatroska flac libvorbis file boost xdg_utils - expat zlib ruby gettext pkgconfig curl - ] ++ stdenv.lib.optional withGUI wxGTK; + patchPhase = '' + patchShebangs ./rake.d/ + patchShebangs ./Rakefile + # Force ruby encoding to use UTF-8 or else when enabling qt5 the Rakefile may + # fail with `invalid byte sequence in US-ASCII' due to UTF-8 characters + # This workaround replaces an arbitrary comment in the drake file + sed -e 's,#--,Encoding.default_external = Encoding::UTF_8,' -i ./drake + ''; + + configureFlags = [ + "--with-boost-libdir=${boost.lib}/lib" + "--without-curl" + ] ++ ( + if (withGUI || legacyGUI) then [ + "--with-mkvtoolnix-gui" + "--enable-gui" + (enableFeature withGUI "qt") + (enableFeature legacyGUI "wxwidgets") + ] else [ + "--disable-gui" + ] + ); + + nativeBuildInputs = [ gettext pkgconfig ruby ]; + + buildInputs = [ + boost expat file flac libebml libmatroska libogg libvorbis xdg_utils zlib + ] ++ optional withGUI qt5 + ++ optional legacyGUI wxGTK; + + enableParallelBuilding = true; - configureFlags = "--with-boost-libdir=${boost.lib}/lib"; buildPhase = '' - ruby ./drake + ./drake ''; installPhase = '' - ruby ./drake install + ./drake install ''; - meta = { + meta = with stdenv.lib; { description = "Cross-platform tools for Matroska"; homepage = http://www.bunkus.org/videotools/mkvtoolnix/; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + license = licenses.gpl2; + maintainers = with maintainers; [ codyopel fuuzetsu ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 716349d60741..9ac1bd592e34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7144,6 +7144,8 @@ let mkvtoolnix-cli = mkvtoolnix.override { withGUI = false; + qt5 = null; + legacyGUI = false; wxGTK = null; }; From c13f189b19e16e25d49152ed176b2f62b65057dc Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 11 May 2015 06:41:53 -0400 Subject: [PATCH 030/615] ats-extsolve: bump --- .../compilers/ats-extsolve/default.nix | 11 +- .../compilers/ats-extsolve/misc-fixes.patch | 136 ------------------ 2 files changed, 5 insertions(+), 142 deletions(-) delete mode 100644 pkgs/development/compilers/ats-extsolve/misc-fixes.patch diff --git a/pkgs/development/compilers/ats-extsolve/default.nix b/pkgs/development/compilers/ats-extsolve/default.nix index 9cd6d3adb324..c1a7f2882a0a 100644 --- a/pkgs/development/compilers/ats-extsolve/default.nix +++ b/pkgs/development/compilers/ats-extsolve/default.nix @@ -1,22 +1,21 @@ { stdenv, fetchurl, ats2, python, z3, pkgconfig, json_c }: stdenv.mkDerivation { - name = "ats-extsolve-0pre6a9b752"; + name = "ats-extsolve-0pre11177d9"; buildInputs = [ python z3 ats2 pkgconfig json_c ]; src = fetchurl { - url = "https://github.com/githwxi/ATS-Postiats-contrib/archive/6a9b752efb8af1e4f77213f9e81fc2b7fa050877.tar.gz"; - sha256 = "1zz4fqjm1rdvpm0m0sdck6vx55iiqlk2p8z078fca2q9xyxqjkqd"; + url = "https://github.com/wdblair/ATS-Postiats-contrib/archive/11177d9194b852392d5e92e67d0ecc7b6abc02bf.tar.gz"; + sha256 = "12fhlcpq5b4pc3h21w1i7yv1ymrll2g4zlf1pvg0v8cr6aa6i813"; }; postUnpack = '' - export PATSHOMERELOC="$PWD/$sourceRoot"; + export PATSHOMERELOC="$PWD/$sourceRoot" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$PATSHOMERELOC" + export INCLUDE_ATS="-IATS $PATSHOMERELOC" ''; - patches = [ ./misc-fixes.patch ]; - preBuild = "cd projects/MEDIUM/ATS-extsolve"; buildFlags = [ "setup" "patsolve" ]; diff --git a/pkgs/development/compilers/ats-extsolve/misc-fixes.patch b/pkgs/development/compilers/ats-extsolve/misc-fixes.patch deleted file mode 100644 index 8775bb83ba4c..000000000000 --- a/pkgs/development/compilers/ats-extsolve/misc-fixes.patch +++ /dev/null @@ -1,136 +0,0 @@ -From bfc7216250e666a59e304f3b7518f8b0bccccbae Mon Sep 17 00:00:00 2001 -From: Shea Levy -Date: Thu, 30 Apr 2015 16:50:47 -0400 -Subject: [PATCH] Add missing case in fprint_s2rt - ---- - projects/MEDIUM/ATS-extsolve/constraint/constraint_s2rt.dats | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/projects/MEDIUM/ATS-extsolve/constraint/constraint_s2rt.dats b/projects/MEDIUM/ATS-extsolve/constraint/constraint_s2rt.dats -index a841b5f..5bc28d7 100644 ---- a/projects/MEDIUM/ATS-extsolve/constraint/constraint_s2rt.dats -+++ b/projects/MEDIUM/ATS-extsolve/constraint/constraint_s2rt.dats -@@ -113,6 +113,7 @@ case+ s2t0 of - | S2RTfun (args, ret) => fprint (out, "S2RTfun()") - | S2RTtup () => fprint (out, "S2RTtup()") - | S2RTerr () => fprint (out, "S2RTerr()") -+| S2RTuninterp (str) => fprint! (out, "S2RTuninterp(", str, ")") - // - | S2RTignored () => fprint (out, "S2RTignored()") - // -From 9d4c7669d0d3bc8725648684391a2962ed5a922e Mon Sep 17 00:00:00 2001 -From: Shea Levy -Date: Thu, 30 Apr 2015 17:13:35 -0400 -Subject: [PATCH] ATS-extsolve: Get rid of verbose . overload - ---- - projects/MEDIUM/ATS-extsolve/solving/solver.dats | 2 +- - projects/MEDIUM/ATS-extsolve/solving/solver.sats | 6 ------ - 2 files changed, 1 insertion(+), 7 deletions(-) - -diff --git a/projects/MEDIUM/ATS-extsolve/solving/solver.dats b/projects/MEDIUM/ATS-extsolve/solving/solver.dats -index 8446cd5..f2f77b4 100644 ---- a/projects/MEDIUM/ATS-extsolve/solving/solver.dats -+++ b/projects/MEDIUM/ATS-extsolve/solving/solver.dats -@@ -250,7 +250,7 @@ end // end of [c3nstr_solve_main] - implement c3nstr_solve (c3t, scripts, verbose) = let - var env : smtenv - val _ = smtenv_nil (env) -- val () = env.verbose (verbose) -+ val () = smtenv_set_verbose(env, verbose) - val () = - case+ scripts of - | list_nil () => () -diff --git a/projects/MEDIUM/ATS-extsolve/solving/solver.sats b/projects/MEDIUM/ATS-extsolve/solving/solver.sats -index e43a028..dae452c 100644 ---- a/projects/MEDIUM/ATS-extsolve/solving/solver.sats -+++ b/projects/MEDIUM/ATS-extsolve/solving/solver.sats -@@ -39,14 +39,8 @@ fun smtenv_load_scripts (env: &smtenv, scripts: List0(string)): void - - fun smtenv_get_solver (env: &smtenv): solver - --fun smtenv_get_verbose (env: &smtenv): bool -- --overload .verbose with smtenv_get_verbose -- - fun smtenv_set_verbose (env: &smtenv, verbose: bool): void - --overload .verbose with smtenv_set_verbose -- - fun formula_cst (s2c: s2cst): formula - - (* ****** ****** *) -From e3473a8d9dc7c56cda1111a439db7123254d00b4 Mon Sep 17 00:00:00 2001 -From: Shea Levy -Date: Thu, 30 Apr 2015 18:09:33 -0400 -Subject: [PATCH 1/2] solver_smt.dats: Don't use mapfree on linear list of - non-linear values - ---- - projects/MEDIUM/ATS-extsolve/solving/solver_smt.dats | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/projects/MEDIUM/ATS-extsolve/solving/solver_smt.dats b/projects/MEDIUM/ATS-extsolve/solving/solver_smt.dats -index 04055b9..b49602d 100644 ---- a/projects/MEDIUM/ATS-extsolve/solving/solver_smt.dats -+++ b/projects/MEDIUM/ATS-extsolve/solving/solver_smt.dats -@@ -348,7 +348,7 @@ in - // - val () = assertloc (length(pairs) > 0) - // -- implement list_vt_mapfree$fopr<@(s2exp,s2exp)>(x) = let -+ implement list_vt_map$fopr<@(s2exp,s2exp)>(x) = let - val (pf, fpf | Env) = $UN.ptr1_vtake{smtenv}(addr@ env) - val met = formula_make (!Env, x.0) - val bound = formula_make (!Env, x.1) -@@ -362,7 +362,8 @@ in - end - // - val assertions = -- list_vt_mapfree<(s2exp,s2exp)> (pairs) -+ list_vt_map<(s2exp,s2exp)> (pairs) -+ val () = list_vt_free(pairs) - // - implement - list_vt_fold$init (x) = x - -From 50de956561e6bf43190d7efb385bb6da658f1637 Mon Sep 17 00:00:00 2001 -From: Shea Levy -Date: Thu, 30 Apr 2015 18:18:56 -0400 -Subject: [PATCH 2/2] ats-extsolve/main.dats: Don't use mapfree on linear list - of non-linear values - ---- - projects/MEDIUM/ATS-extsolve/main.dats | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/projects/MEDIUM/ATS-extsolve/main.dats b/projects/MEDIUM/ATS-extsolve/main.dats -index ac30ca0..930697d 100644 ---- a/projects/MEDIUM/ATS-extsolve/main.dats -+++ b/projects/MEDIUM/ATS-extsolve/main.dats -@@ -34,7 +34,7 @@ dynload "commarg.dats" - - (* ****** ****** *) - --overload mapfree with list_vt_mapfree -+overload map with list_vt_map - overload filter with list_vt_filter - - (* ****** ****** *) -@@ -56,12 +56,13 @@ implement main0 (argc, argv) = let - | Script (s) => true - | _ =>> false - implement -- list_vt_mapfree$fopr (x) = -+ list_vt_map$fopr (x) = - case- x of - | Script (s) => s - // - val scriptargs = filter (list_vt_copy (args)) -- val scripts = mapfree (scriptargs) -+ val scripts = map (scriptargs) -+ val () = list_vt_free (scriptargs) - // - implement - list_find$pred (x) = From 492471b453d0b3fd9c8ffac58e274d97306878da Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 May 2015 12:39:37 +0200 Subject: [PATCH 031/615] Apply some overrides to upstream systemd units This removes the need for the following patches: https://github.com/edolstra/systemd/commit/9a6cade993f432b520d4a2f77d0a15e08abc4dfa https://github.com/edolstra/systemd/commit/9f7e832c901815d80d0ef38c3cbb68abb07fd914 --- nixos/modules/system/boot/systemd.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 0f210d506881..1fde720bba0d 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -736,10 +736,18 @@ in ${concatStringsSep "\n" cfg.tmpfiles.rules} ''; + # Some overrides to upstream units. + systemd.services."systemd-backlight@".restartIfChanged = false; + systemd.services."systemd-rfkill@".restartIfChanged = false; systemd.services."user@".restartIfChanged = false; - - systemd.services.systemd-remount-fs.restartIfChanged = false; systemd.services.systemd-journal-flush.restartIfChanged = false; + systemd.services.systemd-journald.restartIfChanged = false; # FIXME: shouldn't be necessary with systemd 219 + systemd.services.systemd-random-seed.restartIfChanged = false; + systemd.services.systemd-remount-fs.restartIfChanged = false; + systemd.services.systemd-update-utmp.restartIfChanged = false; + systemd.services.systemd-user-sessions.restartIfChanged = false; # Restart kills all active sessions. + systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true; + systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; }; From 61432ad2a6a266aef8381a1edf0211a8d2e6546a Mon Sep 17 00:00:00 2001 From: Michel Kuhlmann Date: Mon, 11 May 2015 13:12:24 +0200 Subject: [PATCH 032/615] qgis: update to 2.8.2 --- pkgs/applications/gis/qgis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index f3141a30bf15..08e804b7ae93 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -2,7 +2,7 @@ pyqt4, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }: stdenv.mkDerivation rec { - name = "qgis-2.8.1"; + name = "qgis-2.8.2"; buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt qscintilla fcgi libspatialindex libspatialite postgresql ] ++ @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "19acb74e4e2739238b87bf64f2750e10e366e9d61d070a4b8ca341ce01ca9741"; + sha256 = "fd3c01e48224f611c3bb279b0af9cc1dff3844cdc93f7b45e4f37cf8f350bc4b"; }; postInstall = '' From c206c9cd95811749ec8ee11905422d0ea046470d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 May 2015 14:44:24 +0200 Subject: [PATCH 033/615] libmicrohttpd: Don't enable some expensive features by default Commit c5d13d4fe96674a4fcb04b54ea552847302e13ee caused libmicrohttpd to be not so micro anymore, increasing its closure size from 40 MiB to 283 MiB, which is annoying for packages like systemd that use it. So don't enable httpd/spdy support by default. --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0053a5f17759..07e8d91a477c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6763,7 +6763,10 @@ let libmemcached = callPackage ../development/libraries/libmemcached { }; - libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { }; + libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { + openssl = null; + gnutls = null; + }; libmikmod = callPackage ../development/libraries/libmikmod { }; From c7893e960d0dc179812139d352d1c51ae4ecc6e8 Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Mon, 11 May 2015 14:25:17 +0000 Subject: [PATCH 034/615] efibootmgr/var: upgrade --- pkgs/tools/system/efibootmgr/default.nix | 6 +++--- pkgs/tools/system/efivar/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index 67b97ea75b15..3f26760e621b 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "efibootmgr-${version}"; - version = "0.7.0"; + version = "0.11.0"; buildInputs = [ perl efivar pciutils zlib ]; src = fetchgit { - url = "git://github.com/vathpela/efibootmgr.git"; + url = "git://github.com/rhinstaller/efibootmgr.git"; rev = "refs/tags/${name}"; - sha256 = "1nazmqxppx2xa8clv4bjdb1b6gyyimgjdj85n2hmf1smqr8krrmz"; + sha256 = "1di7cipi6jh4qaiq1ckyk6aimgpagb85yr37k3c1kj1m9p5qra4j"; }; postPatch = '' diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index 618623146baa..fadf99f9b977 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "efivar-${version}"; - version = "0.10"; + version = "0.15"; src = fetchgit { - url = "git://github.com/vathpela/efivar.git"; + url = "git://github.com/rhinstaller/efivar.git"; rev = "refs/tags/${version}"; - sha256 = "04fznbmrf860b4d4i8rshx3mgwbx06v187wf1rddvxxnpkq8920w"; + sha256 = "1k5krjghb2r04wv6kxnhs1amqwzk7khzm7bsh0wnbsz7qn92masr"; }; buildInputs = [ popt ]; From 4ead7bc0b79c2b99b10954de28114f9b43e8b732 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 10 May 2015 22:42:27 +0200 Subject: [PATCH 035/615] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/65d3f6a305833c5dabde5fa93e130ab575bdedbe with hackage2nix revision 4c63d4ad559c7c9569df1ea07557f92a1cfb5a3e --- .../haskell-modules/hackage-packages.nix | 293 +++++++++++------- 1 file changed, 189 insertions(+), 104 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7ed9ef9195d8..2361129113d0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -10641,6 +10641,7 @@ self: { hashtables intern stringable system-filepath text unordered-containers vector vector-th-unbox ]; + jailbreak = true; homepage = "http://www.bioinf.uni-leipzig.de/~choener/"; description = "Alphabet and word representations"; license = stdenv.lib.licenses.bsd3; @@ -13186,6 +13187,7 @@ self: { version = "0.3.0.1"; sha256 = "0w14kra36ksa8jn72rr9b01f36gff33fi6ffrcws640v4pwisrg5"; buildDepends = [ attoparsec base bytestring cereal text ]; + jailbreak = true; homepage = "http://github.com/bergey/STL"; description = "STL 3D geometry format parsing and pretty-printing"; license = stdenv.lib.licenses.bsd3; @@ -17266,22 +17268,22 @@ self: { "aeson" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , containers, deepseq, dlist, ghc-prim, hashable, HUnit, mtl - , QuickCheck, scientific, syb, template-haskell, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , unordered-containers, vector + , old-locale, QuickCheck, scientific, syb, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, transformers, unordered-containers, vector }: mkDerivation { pname = "aeson"; - version = "0.8.0.2"; - sha256 = "1mc8cwmswx69r77wv7dfim525jqajnlxbcx5xf3ygpszzf6mh1q7"; + version = "0.8.1.0"; + sha256 = "0dr0pnql4hlb6fxg9wvzg8a7ssjnzc89gpv0rxlkpaqrbb2hk32m"; buildDepends = [ attoparsec base blaze-builder bytestring containers deepseq dlist ghc-prim hashable mtl scientific syb template-haskell text time - unordered-containers vector + transformers unordered-containers vector ]; testDepends = [ - attoparsec base bytestring containers ghc-prim HUnit QuickCheck - template-haskell test-framework test-framework-hunit + attoparsec base bytestring containers ghc-prim HUnit old-locale + QuickCheck template-haskell test-framework test-framework-hunit test-framework-quickcheck2 text time unordered-containers vector ]; homepage = "https://github.com/bos/aeson"; @@ -17452,8 +17454,8 @@ self: { }: mkDerivation { pname = "aeson-schema"; - version = "0.3.0.4"; - sha256 = "05iizrs50q0ndrh3p20hj1pfv45b5q678njhaxd22fcpqypvr56k"; + version = "0.3.0.5"; + sha256 = "04hnllvvgpd941bgjymd0spqv31rww1khaidbvdnrqa3i9gpmvjp"; buildDepends = [ aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck regex-base regex-compat regex-pcre scientific syb template-haskell @@ -17557,8 +17559,8 @@ self: { }: mkDerivation { pname = "aeson-utils"; - version = "0.3"; - sha256 = "12rb5dfhcr5rahk14nxc5ac416sxpzsihyciwk551kyyvahmrp3v"; + version = "0.3.0.1"; + sha256 = "1y6nm841y3bvd7kixhwqk7h0pf7ipvfwj2hdq15ij08nlr48dzyl"; buildDepends = [ aeson attoparsec base bytestring scientific text ]; @@ -19657,6 +19659,7 @@ self: { aeson base bytestring Cabal containers 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; @@ -21445,18 +21448,20 @@ self: { "attoparsec" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , QuickCheck, quickcheck-unicode, scientific, test-framework - , test-framework-quickcheck2, text, vector + , test-framework-quickcheck2, text, transformers, vector }: mkDerivation { pname = "attoparsec"; - version = "0.12.1.6"; - sha256 = "1a06vhg0ykix94q7qxvmh30v017fjl9j2i1b860wjb937a6bc2yf"; + version = "0.13.0.0"; + sha256 = "12b4xi6nlnhpwz8apn4mk880mkhcv1sfvf4j3z1h5dgkadi2zgbi"; buildDepends = [ array base bytestring containers deepseq scientific text + transformers ]; testDepends = [ array base bytestring deepseq QuickCheck quickcheck-unicode - scientific test-framework test-framework-quickcheck2 text vector + scientific test-framework test-framework-quickcheck2 text + transformers vector ]; homepage = "https://github.com/bos/attoparsec"; description = "Fast combinator parsing for bytestrings and text"; @@ -21518,6 +21523,7 @@ self: { version = "0.3.3"; sha256 = "0z57bbw97v92dkjp57zj9nfzsdas2n1qfw472k1aa84iqb6hbw9w"; buildDepends = [ attoparsec base bytestring enumerator text ]; + jailbreak = true; homepage = "https://john-millikin.com/software/attoparsec-enumerator/"; description = "Pass input from an enumerator to an Attoparsec parser"; license = stdenv.lib.licenses.mit; @@ -21527,8 +21533,8 @@ self: { ({ mkDerivation, attoparsec, base }: mkDerivation { pname = "attoparsec-expr"; - version = "0.1.1.1"; - sha256 = "09305lp9q3cgvpv4d878c34dk07g7p13hc07hrp2xlwl7rc3nac3"; + version = "0.1.1.2"; + sha256 = "0z25pc3rq98ysk92jclr90n35982a566sxri51yh1s9c24vd8k4d"; buildDepends = [ attoparsec base ]; description = "Port of parsec's expression parser to attoparsec"; license = stdenv.lib.licenses.bsd3; @@ -22040,6 +22046,7 @@ self: { mtl QuickCheck quickcheck-instances resourcet tagged tasty tasty-quickcheck text time transformers transformers-base ]; + jailbreak = true; homepage = "http://github.com/aristidb/aws"; description = "Amazon Web Services (AWS) for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -22875,6 +22882,7 @@ self: { attoparsec base HUnit test-framework test-framework-hunit text vector ]; + jailbreak = true; homepage = "https://github.com/fanjam/banwords"; description = "Generalized word blacklister"; license = stdenv.lib.licenses.mit; @@ -25313,8 +25321,8 @@ self: { }: mkDerivation { pname = "bitcoin-api"; - version = "0.11.0"; - sha256 = "1k2ca8bszj13g5lsm3rm1mrfkrh4c7knl50alpn2l9zlwsg7whqx"; + version = "0.11.1"; + sha256 = "16slfsqwmpr8c5sl2zpf763d21sqgii7jgmw0ra1nidv6zl01glb"; buildDepends = [ aeson base base58string binary bitcoin-block bitcoin-script bitcoin-tx bitcoin-types bytestring hexstring lens lens-aeson text @@ -25357,8 +25365,8 @@ self: { }: mkDerivation { pname = "bitcoin-block"; - version = "0.13.0"; - sha256 = "0xiljk9dfd4g2kqphj8xf03kx8d7jd296s8i5rgflc4140npaz20"; + version = "0.13.1"; + sha256 = "0nkx86fwv65x9vz6ni6qgz61afnvcifw2g92bnwdli8hww7prxfp"; buildDepends = [ base binary bitcoin-tx bitcoin-types bytestring cryptohash hexstring largeword lens @@ -25402,8 +25410,8 @@ self: { }: mkDerivation { pname = "bitcoin-script"; - version = "0.11.0"; - sha256 = "010vkqma0nx3msg4hgazi7700a64x51p8zaajayli7px6yffblw1"; + version = "0.11.1"; + sha256 = "0k3v35p6qpgh88gc5rqpcmh202xrn2rind9641dinwqqx631v31r"; buildDepends = [ base base16-bytestring binary bytestring text ]; testDepends = [ base bytestring hspec ]; homepage = "http://www.leonmergen.com/opensource.html"; @@ -25417,8 +25425,8 @@ self: { }: mkDerivation { pname = "bitcoin-tx"; - version = "0.13.0"; - sha256 = "13iv72l8b2scz6l8319r1yshwn7h67l3dn1z8fl181njkiz5xk0w"; + version = "0.13.1"; + sha256 = "006c55l6q6cknxw0k0kzr8vkv8azapfb4mkax6ac6rih6mjq5f1v"; buildDepends = [ base binary bitcoin-script bitcoin-types bytestring cryptohash hexstring lens @@ -27196,6 +27204,7 @@ self: { mtl old-time process text time transformers unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/JPMoresmau/BuildWrapper"; description = "A library and an executable that provide an easy API for a Haskell IDE"; license = stdenv.lib.licenses.bsd3; @@ -29568,6 +29577,7 @@ self: { testDepends = [ base HTF HUnit loch-th placeholders QuickCheck text ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/cases"; description = "A converter for spinal, snake and camel cases"; license = stdenv.lib.licenses.mit; @@ -29641,6 +29651,7 @@ self: { test-framework-hunit test-framework-quickcheck2 text unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/tibbe/cassava"; description = "A CSV parsing and encoding library"; license = stdenv.lib.licenses.bsd3; @@ -29859,16 +29870,15 @@ self: { }: mkDerivation { pname = "cayley-client"; - version = "0.1.2.1"; - sha256 = "0c2n37p8530awkpwnygrpz7zssv22ycjjml2623f61x7q8ilb8p6"; + version = "0.1.3.0"; + sha256 = "0wzpnylzlyx0lanjqg44b134s2irb55072dz5s8ljq76acg1jmfl"; buildDepends = [ aeson attoparsec base bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/MichelBoucey/cayley-client"; - description = "A Haskell client for Cayley graph database"; + description = "A Haskell client for the Cayley graph database"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -34271,6 +34281,7 @@ self: { 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; }) {}; @@ -37497,11 +37508,12 @@ self: { ({ mkDerivation, array, attoparsec, base, base16-bytestring, binary , bytestring, cmdargs, containers, cryptohash, curl, data-ordlist , dataenc, directory, filepath, FindBin, ghc, hashable, haskeline - , html, HUnit, mmap, mtl, old-time, parsec, process, QuickCheck - , random, regex-applicative, regex-compat-tdfa, shelly, split, tar - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, time, transformers, transformers-compat, unix, unix-compat - , utf8-string, vector, zip-archive, zlib + , html, HTTP, HUnit, mmap, mtl, network, old-locale, old-time + , parsec, process, QuickCheck, random, regex-applicative + , regex-compat-tdfa, shelly, split, tar, terminfo, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, time + , transformers, transformers-compat, unix, unix-compat, utf8-string + , vector, zip-archive, zlib }: mkDerivation { pname = "darcs"; @@ -37512,10 +37524,10 @@ self: { buildDepends = [ array attoparsec base base16-bytestring binary bytestring containers cryptohash data-ordlist dataenc directory filepath - hashable haskeline html mmap mtl old-time parsec process random - regex-applicative regex-compat-tdfa tar text time transformers - transformers-compat unix unix-compat utf8-string vector zip-archive - zlib + hashable haskeline html HTTP mmap mtl network old-locale old-time + parsec process random regex-applicative regex-compat-tdfa tar + terminfo text time transformers transformers-compat unix + unix-compat utf8-string vector zip-archive zlib ]; testDepends = [ array base binary bytestring cmdargs containers cryptohash dataenc @@ -37526,6 +37538,7 @@ self: { ]; extraLibraries = [ curl ]; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; + jailbreak = true; postInstall = '' mkdir -p $out/etc/bash_completion.d mv contrib/darcs_completion $out/etc/bash_completion.d/darcs @@ -44976,10 +44989,8 @@ self: { }: mkDerivation { pname = "email-validate"; - version = "2.1.1"; - revision = "1"; - sha256 = "1wka2zd6s8zf99d33z6mzprxq3aaxmm9z9rnfjs4j83930h61qdq"; - editedCabalFile = "ec98fb65657fbd6705b80a2fbad8836246515f7ed84f3f382d88e0ee2d92645f"; + version = "2.1.2"; + sha256 = "13r67kk5rjl54mwk4shap1rf8jdp1hsd6wpg4hgkf10vzk5vara5"; buildDepends = [ attoparsec base bytestring ghc-prim ]; testDepends = [ base bytestring HUnit QuickCheck test-framework @@ -45152,6 +45163,7 @@ self: { free monad-loops mwc-random stm stm-delay text transformers unordered-containers vector websockets ]; + jailbreak = true; homepage = "http://github.com/ocharles/engine.io"; description = "A Haskell implementation of Engine.IO"; license = stdenv.lib.licenses.bsd3; @@ -45891,6 +45903,7 @@ self: { aeson attoparsec attoparsec-expr base bytestring regex-compat text unordered-containers vector yaml ]; + jailbreak = true; homepage = "https://bitbucket.org/kayo/ert"; description = "Easy Runtime Templates"; license = stdenv.lib.licenses.gpl3; @@ -51307,10 +51320,8 @@ self: { }: mkDerivation { pname = "generic-aeson"; - version = "0.2.0.4"; - revision = "1"; - sha256 = "1h5vj66dx25iais9yia33ia95nr0ywxsbnrcm71v50jvj73ywhbx"; - editedCabalFile = "1f690c3d9f5359349399f9409ba65dc79bd5a13301cb98ad0961db1b2241c643"; + version = "0.2.0.5"; + sha256 = "109jxrny3r1wsf2kr23vvgdid4rmq5lpqjlfbk4n7yxb9bvdbhy5"; buildDepends = [ aeson attoparsec base generic-deriving mtl tagged text unordered-containers vector @@ -52533,6 +52544,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ghcjs-websockets" = callPackage + ({ mkDerivation, base, base64-bytestring, binary, bytestring + , ghcjs-base, text + }: + mkDerivation { + pname = "ghcjs-websockets"; + version = "0.3.0.0"; + revision = "1"; + sha256 = "09ll2fyfbbflciq6mxhclgypn800qmm7l8dk9gcclphraf2x9jy3"; + editedCabalFile = "cfc25baa01cf440b2f965ca3ee738467f8138adb74f759b9a225717ed183c66a"; + buildDepends = [ + base base64-bytestring binary bytestring ghcjs-base text + ]; + jailbreak = true; + homepage = "http://github.com/mstksg/ghcjs-websockets"; + description = "GHCJS interface for the Javascript Websocket API"; + license = stdenv.lib.licenses.mit; + broken = true; + }) { ghcjs-base = null;}; + "ghclive" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, diagrams-lib, diagrams-svg, directory, file-embed @@ -53615,8 +53646,8 @@ self: { }: mkDerivation { pname = "gloss"; - version = "1.9.3.1"; - sha256 = "01a4l164f7ffwskd626q10z9klsbn6dkh3nbik3iq68426jryvns"; + version = "1.9.4.1"; + sha256 = "1rdgcv9jmawzgvshnc6pgdl7f2p6a3f09jwjnhmkfxx3gdwr8q5i"; buildDepends = [ base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL ]; @@ -53642,8 +53673,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, gloss }: mkDerivation { pname = "gloss-algorithms"; - version = "1.9.3.1"; - sha256 = "1fdbjnrc1f42jxzgi362wccdx8fdhb1ws6bg3ds7cfanffkkf6an"; + version = "1.9.4.1"; + sha256 = "0j8n0769690ikrqwbqp4ba6zz2l4i6211alic3l7mqc2h6rggjs0"; buildDepends = [ base containers ghc-prim gloss ]; homepage = "http://gloss.ouroborus.net"; description = "Data structures and algorithms for working with 2D graphics"; @@ -53683,8 +53714,8 @@ self: { }: mkDerivation { pname = "gloss-examples"; - version = "1.9.3.1"; - sha256 = "0d9wh50n2n6ia9vds2pnd8p9wdyxl423c7s135bbjx1iwrsvyq11"; + version = "1.9.4.1"; + sha256 = "02qsxxbrg8d4338mcj3ka3l2f9qyf3r515b32dm5iingjb8dn5ly"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -53730,8 +53761,8 @@ self: { }: mkDerivation { pname = "gloss-raster"; - version = "1.9.3.1"; - sha256 = "1siwsmx8n0yaalcbm0c2dwxfxk5im1gpddbc2nkbf9br5yvn7py5"; + version = "1.9.4.1"; + sha256 = "0q6mqgmi3gx2yx8a3rq4nzk2mz2iidnzl26b5h4zhjgmgz8jawv9"; buildDepends = [ base containers ghc-prim gloss gloss-rendering repa ]; @@ -57420,8 +57451,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.6.8.1"; - sha256 = "0f8c2b9zy55pscmkmwjb72qqsm2kmrjlwfhkl6igpj631r804iyr"; + version = "4.6.9.0"; + sha256 = "0z0gfs7czqwrkgd43pcx6rjdsgwpkhan5pmgfbkiixih993f9s2l"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -57441,7 +57472,6 @@ self: { system-filepath tagsoup test-framework test-framework-hunit test-framework-quickcheck2 text time time-locale-compat ]; - jailbreak = true; homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; @@ -61094,6 +61124,7 @@ self: { old-locale postgresql-binary QuickCheck quickcheck-instances scientific text time vector ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/hasql-postgres"; description = "A \"PostgreSQL\" backend for the \"hasql\" library"; license = stdenv.lib.licenses.mit; @@ -62436,6 +62467,7 @@ self: { map-syntax MonadCatchIO-transformers mtl process random text time transformers unordered-containers vector xmlhtml ]; + jailbreak = true; homepage = "http://snapframework.com/"; description = "An Haskell template system supporting both HTML5 and XML"; license = stdenv.lib.licenses.bsd3; @@ -64173,8 +64205,8 @@ self: { }: mkDerivation { pname = "hipbot"; - version = "0.2"; - sha256 = "1fi96mfkdn3dr1wzz4a1bab4ynlzfdm0j5626dh460m2bdb2lfw6"; + version = "0.2.1"; + sha256 = "12rixjkgxg43nwi93sr04vv8c9cw3v6rsyfpyklcpibcjg0yn6yn"; buildDepends = [ aeson base bifunctors blaze-builder bytestring either exceptions http-client http-client-tls http-types jwt lens mtl network-uri @@ -67191,6 +67223,7 @@ self: { ]; testDepends = [ aeson attoparsec base QuickCheck text vector ]; extraLibraries = [ ruby ]; + jailbreak = true; description = "Embed a Ruby intepreter in your Haskell program !"; license = stdenv.lib.licenses.bsd3; }) { inherit (pkgs) ruby;}; @@ -68315,8 +68348,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "hscolour"; - version = "1.22"; - sha256 = "1iqmxvpvj3icg7mhx4450p2wqjsfx1xh3lwgrrmxvm339hksx3rw"; + version = "1.23"; + sha256 = "1c4i2zpami8g3w9949nm3f92g7xwh5c94vkx658zz7ihrjp7w5lp"; isLibrary = true; isExecutable = true; buildDepends = [ base containers ]; @@ -70342,6 +70375,7 @@ self: { attoparsec base-prelude text unordered-containers ]; testDepends = [ base base-prelude directory doctest filepath ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/html-entities"; description = "A codec library for HTML-escaped text and HTML-entities"; license = stdenv.lib.licenses.mit; @@ -70398,6 +70432,7 @@ self: { conversion-case-insensitive conversion-text text ]; testDepends = [ base base-prelude directory doctest filepath ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/html-tokenizer"; description = "An \"attoparsec\"-based HTML tokenizer"; license = stdenv.lib.licenses.mit; @@ -70859,8 +70894,8 @@ self: { }: mkDerivation { pname = "http-date"; - version = "0.0.6"; - sha256 = "0f1s4bfazckl016pi2nzrmmiv0f6pnr9mgvsdj33ysvknp0md3c9"; + version = "0.0.6.1"; + sha256 = "0dknh28kyarnzqrsc80ssalxjrq0qbv7ir49247p2grb7rh0dqgj"; buildDepends = [ array attoparsec base bytestring ]; testDepends = [ base bytestring doctest hspec old-locale time ]; description = "HTTP Date parser/formatter"; @@ -72716,8 +72751,8 @@ self: { }: mkDerivation { pname = "ide-backend"; - version = "0.9.0.8"; - sha256 = "0jrjpx7kx5q9lixvi4c02xb5sjq7wsd4mkh07b2ak4w784gndz8q"; + version = "0.9.0.9"; + sha256 = "0zpavp3q70h8mnjz7w4shxfbh6dzdv00f9igldygzhhr9xmr192m"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -72748,8 +72783,8 @@ self: { }: mkDerivation { pname = "ide-backend-common"; - version = "0.9.1"; - sha256 = "1gix76gbc9ccx1hkddymk8hfx418kf1i7caajyzmdp6k8snvkc12"; + version = "0.9.1.1"; + sha256 = "1k3sp9byqmhk80l918jnklck635dp1cfx48akah483jkhzjph0fj"; buildDepends = [ aeson async attoparsec base binary bytestring bytestring-trie containers crypto-api data-accessor directory filepath fingertree @@ -74049,6 +74084,7 @@ self: { base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck tasty-th text vector ]; + jailbreak = true; homepage = "https://github.com/maoe/influxdb-haskell"; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; @@ -74673,6 +74709,7 @@ self: { time transformers vector zlib zlib-bindings ]; configureFlags = [ "-fnointeractivetests" ]; + jailbreak = true; description = "Simple, composable, and easy-to-use stream I/O"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -75027,6 +75064,7 @@ self: { free haskell-lexer lens network old-locale split stm text time tls transformers vty x509 x509-store x509-system x509-validation ]; + jailbreak = true; homepage = "https://github.com/glguy/irc-core"; description = "An IRC client library and text client"; license = stdenv.lib.licenses.bsd3; @@ -76706,8 +76744,8 @@ self: { }: mkDerivation { pname = "json-schema"; - version = "0.7.3.4"; - sha256 = "0p9m706hl8phl12zb9inn6hkrgzxgd3k9lg2p1kav53j5mz17w0p"; + version = "0.7.3.5"; + sha256 = "1x7bm83745nsf947kb4m3h8zh4li1548dpbcm2yz16ppg5db182h"; buildDepends = [ aeson base containers generic-aeson generic-deriving mtl scientific text time unordered-containers vector @@ -76877,6 +76915,7 @@ self: { aeson attoparsec base bytestring conduit conduit-extra mtl text transformers unordered-containers ]; + jailbreak = true; description = "JSON-RPC 2.0 server over a Conduit."; license = stdenv.lib.licenses.gpl3; }) {}; @@ -78015,6 +78054,7 @@ self: { attoparsec base-prelude either record system-fileio system-filepath template-haskell text transformers ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/laika"; description = "Minimalistic type-checked compile-time template engine"; license = stdenv.lib.licenses.mit; @@ -79075,6 +79115,7 @@ self: { isLibrary = true; isExecutable = true; buildDepends = [ attoparsec base bytestring ]; + jailbreak = true; homepage = "http://www.github.com/bgamari/language-openscad"; description = "A simple parser for OpenSCAD"; license = stdenv.lib.licenses.bsd3; @@ -79948,8 +79989,8 @@ self: { }: mkDerivation { pname = "lens-aeson"; - version = "1.0.0.3"; - sha256 = "0wfbnazarwcza5dn3icsdvsmkyf9ki5lr5d5yidmgijhs63ak7ac"; + version = "1.0.0.4"; + sha256 = "0zjl645y4bwg3pvld8z4vj9rdpdy6fja2cx63d85k37zp5n98y7v"; buildDepends = [ aeson attoparsec base bytestring lens scientific text unordered-containers vector @@ -81817,6 +81858,7 @@ self: { testDepends = [ attoparsec base-prelude either hspec list-t list-t-text text ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/list-t-attoparsec"; description = "An \"attoparsec\" adapter for \"list-t\""; license = stdenv.lib.licenses.mit; @@ -84421,6 +84463,7 @@ self: { template-haskell text time tls transformers transformers-base unordered-containers utf8-string vector wai warp x509-system ]; + jailbreak = true; homepage = "https://github.com/prowdsponsor/mangopay"; description = "Bindings to the MangoPay API"; license = stdenv.lib.licenses.bsd3; @@ -85514,6 +85557,7 @@ self: { base bytestring cereal containers QuickCheck test-framework test-framework-quickcheck2 test-framework-th text ]; + jailbreak = true; homepage = "https://github.com/rodrigosetti/messagepack"; description = "Serialize instance for Message Pack Object"; license = stdenv.lib.licenses.mit; @@ -87457,15 +87501,16 @@ self: { "monad-unlift" = callPackage ({ mkDerivation, base, constraints, exceptions, monad-control, mtl - , mutable-containers, stm, transformers, transformers-base + , mutable-containers, resourcet, stm, transformers + , transformers-base }: mkDerivation { pname = "monad-unlift"; - version = "0.1.0.1"; - sha256 = "0mgz9yxyvsrxp7l01frr7qdlpqg2krci472fj4id2ndnn7gk4mmf"; + version = "0.1.1.0"; + sha256 = "1x86xpgirp97rda1y22129xf3fbkyb442jndpjsb9j1k4lplh7y2"; buildDepends = [ base constraints exceptions monad-control mtl mutable-containers - stm transformers transformers-base + resourcet stm transformers transformers-base ]; homepage = "https://github.com/fpco/monad-unlift"; description = "Typeclasses for representing monad transformer unlifting"; @@ -90723,6 +90768,7 @@ self: { aeson attoparsec base bytestring case-insensitive http-client http-client-tls http-types text time tls ]; + jailbreak = true; homepage = "https://github.com/markhibberd/network-api-support"; description = "Toolkit for building http client libraries over Network.Http.Conduit"; license = stdenv.lib.licenses.bsd3; @@ -90766,6 +90812,7 @@ self: { aeson attoparsec base bytestring cookie HTTP http-client http-types network QuickCheck text time unordered-containers vector ]; + jailbreak = true; homepage = "http://github.com/mndrix/network-bitcoin"; description = "An interface to bitcoind"; license = stdenv.lib.licenses.bsd3; @@ -92398,6 +92445,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "numtype-dk" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "numtype-dk"; + version = "0.5"; + sha256 = "0gd1a5hf0bw4vc56f1n7y143bsjkdc97pysv4q1gxpwrnj1sgbxd"; + buildDepends = [ base ]; + homepage = "https://github.com/bjornbm/numtype-dk"; + description = "Type-level integers, using TypeNats, Data Kinds, and Closed Type Families"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "numtype-tf" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -92972,6 +93031,7 @@ self: { testDepends = [ base postgresql-simple product-profunctors profunctors time ]; + jailbreak = true; homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; @@ -93768,8 +93828,8 @@ self: { }: mkDerivation { pname = "orgmode-parse"; - version = "0.1.0.4"; - sha256 = "098zl8nyph459zyla0y2mkqiy78zp74yzadrnwa6xv07i5zs125h"; + version = "0.1.1.0"; + sha256 = "1hrbfifm9476n28l2gxyr9m00hjibnl78anc5m7inqm8wr1s3cl0"; buildDepends = [ aeson attoparsec base bytestring containers free hashable old-locale text thyme unordered-containers @@ -93830,6 +93890,7 @@ self: { buildDepends = [ attoparsec base binary bytestring data-binary-ieee754 network ]; + jailbreak = true; homepage = "https://github.com/peacememories/haskell-osc"; description = "A library to handle messages in the OSC protocol"; license = stdenv.lib.licenses.bsd3; @@ -94868,15 +94929,16 @@ self: { "parsers" = callPackage ({ mkDerivation, attoparsec, base, bytestring, charset, containers , directory, doctest, filepath, parsec, QuickCheck - , quickcheck-instances, text, transformers, unordered-containers + , quickcheck-instances, scientific, text, transformers + , unordered-containers }: mkDerivation { pname = "parsers"; - version = "0.12.1.1"; - sha256 = "1yx75xbmg3lms0hj79r5w9fl81g5cbsm842lijhd9jnnbli2mzfw"; + version = "0.12.2.1"; + sha256 = "0wrzqx282ygc3m05nff2zkshgnx4lkws8d54qhkd9pjxja0fbjn7"; buildDepends = [ - attoparsec base charset containers parsec text transformers - unordered-containers + attoparsec base charset containers parsec scientific text + transformers unordered-containers ]; testDepends = [ attoparsec base bytestring containers directory doctest filepath @@ -95105,8 +95167,8 @@ self: { }: mkDerivation { pname = "path"; - version = "0.0.0"; - sha256 = "1gk9z25d7swhg7zi6nxd076wcqfw2hxvq29hxqzc3drdaas2sc0b"; + version = "0.1.0"; + sha256 = "04yj79cw4l4zkfhmfjc382zjkmimhxm523fgq9ijn4dcj6v5z9yw"; buildDepends = [ base exceptions filepath template-haskell ]; testDepends = [ base hspec HUnit mtl ]; description = "Path"; @@ -96891,6 +96953,7 @@ self: { aeson attoparsec base bytestring pipes pipes-attoparsec pipes-bytestring pipes-parse transformers ]; + jailbreak = true; homepage = "https://github.com/k0001/pipes-aeson"; description = "Encode and decode JSON streams using Aeson and Pipes"; license = stdenv.lib.licenses.bsd3; @@ -96911,6 +96974,7 @@ self: { attoparsec base HUnit mmorph pipes pipes-parse tasty tasty-hunit text transformers ]; + jailbreak = true; homepage = "https://github.com/k0001/pipes-attoparsec"; description = "Attoparsec and Pipes integration"; license = stdenv.lib.licenses.bsd3; @@ -98658,6 +98722,7 @@ self: { base-prelude bytestring HTF postgresql-libpq QuickCheck quickcheck-instances scientific text time uuid ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/postgresql-binary"; description = "Encoders and decoders for the PostgreSQL's binary format"; license = stdenv.lib.licenses.mit; @@ -100047,6 +100112,7 @@ self: { aeson attoparsec base bytestring filepath text unordered-containers vector ]; + jailbreak = true; homepage = "http://github.com/jaspervdj/profiteur"; description = "Treemap visualiser for GHC prof files"; license = stdenv.lib.licenses.bsd3; @@ -100599,8 +100665,8 @@ self: { }: mkDerivation { pname = "psqueues"; - version = "0.2.0.1"; - sha256 = "1c1m5dzglpn3la61gxd6cz1b9fdmn9fkc9y5xnl4wf12fwpsg8bf"; + version = "0.2.0.2"; + sha256 = "1mv86li4acx7jchlbh1nfyqyy9wqf7nifzmlph06wd1kvcs0cj73"; buildDepends = [ base deepseq ghc-prim hashable ]; testDepends = [ array base deepseq ghc-prim hashable HUnit QuickCheck tagged @@ -107964,6 +108030,7 @@ self: { resourcet tar text transformers unix unordered-containers utf8-string vector zlib ]; + jailbreak = true; homepage = "http://github.com/JPMoresmau/scion-class-browser"; description = "Command-line interface for browsing and searching packages documentation"; license = stdenv.lib.licenses.bsd3; @@ -108556,8 +108623,8 @@ self: { }: mkDerivation { pname = "second-transfer"; - version = "0.3.0.4"; - sha256 = "0hw3a43fz11sys8z8ngsfl7nc6prfaa4j6vzs1j8m3cni3hmrl5v"; + version = "0.4.0.0"; + sha256 = "1xmlfdvcic11pi8ik9pasljq4h61nsnxpykcw2c9i9pgkl6bkwj9"; buildDepends = [ base base16-bytestring binary bytestring conduit containers exceptions hashable hashtables hslogger http2 lens network @@ -108567,7 +108634,7 @@ self: { buildTools = [ cpphs ]; extraLibraries = [ openssl ]; jailbreak = true; - homepage = "https://github.com/alcidesv/second-transfer"; + homepage = "https://www.httptwo.com/second-transfer/"; description = "Second Transfer HTTP/2 web server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -109276,7 +109343,9 @@ self: { mkDerivation { pname = "servant"; version = "0.4.0"; + revision = "1"; sha256 = "17954b85wj965wkhzr1jd34sia32px4qhnqjl2wn4rymj9lv25f5"; + editedCabalFile = "b9f6399d21ba876a4e30cb8e48cb040a972fe82dbac93c62691dc6eae530c25b"; buildDepends = [ aeson attoparsec base bytestring bytestring-conversion case-insensitive http-media http-types network-uri @@ -109313,7 +109382,9 @@ self: { mkDerivation { pname = "servant-client"; version = "0.4.0"; + revision = "1"; sha256 = "0nvbhiakxfjkb9v5ijv6zapjfbppc6ygd3g8rv5i9paj59ifwxmm"; + editedCabalFile = "9a7ca5856ef66a4345f4732e7ca5680f55502b899bbe1e2f1397b0e55d33ad37"; buildDepends = [ aeson attoparsec base bytestring either exceptions http-client http-client-tls http-media http-types network-uri safe servant @@ -109474,7 +109545,9 @@ self: { mkDerivation { pname = "servant-server"; version = "0.4.0"; + revision = "1"; sha256 = "0wr1rn1gvbph07ycx97qcm4j4jp15xnhvrk5y49bsiv6w6d9xxgx"; + editedCabalFile = "2e024f79e857aa5ad15cf171c1883b99eb45e901ec888eb68d9c6099c88bbbe8"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -109488,6 +109561,7 @@ self: { parsec QuickCheck servant string-conversions temporary text transformers wai wai-extra warp ]; + jailbreak = true; homepage = "http://haskell-servant.github.io/"; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; @@ -112160,6 +112234,7 @@ self: { stm syb template-haskell text time transformers unordered-containers vector vector-algorithms xmlhtml ]; + jailbreak = true; homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; license = stdenv.lib.licenses.bsd3; @@ -112267,6 +112342,7 @@ self: { hashable HUnit MonadCatchIO-transformers mtl random regex-posix text time unix unix-compat unordered-containers vector zlib-enum ]; + jailbreak = true; homepage = "http://snapframework.com/"; description = "Snap: A Haskell Web Framework (core interfaces and types)"; license = stdenv.lib.licenses.bsd3; @@ -112285,6 +112361,7 @@ self: { attoparsec base bytestring case-insensitive hashable network network-uri snap text transformers unordered-containers ]; + jailbreak = true; homepage = "http://github.com/ocharles/snap-cors"; description = "Add CORS headers to Snap applications"; license = stdenv.lib.licenses.bsd3; @@ -112433,6 +112510,7 @@ self: { old-locale snap-core text time unix unix-compat ]; configureFlags = [ "-fopenssl" ]; + jailbreak = true; homepage = "http://snapframework.com/"; description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -113508,6 +113586,7 @@ self: { aeson attoparsec base bytestring engine-io mtl stm text transformers unordered-containers vector ]; + jailbreak = true; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -113584,8 +113663,8 @@ self: { }: mkDerivation { pname = "som"; - version = "8.0.3"; - sha256 = "0pb4hdcs9pfs12nflbnvp5ja1nxbrijjjqvybzg4pn81kaps897m"; + version = "8.0.4"; + sha256 = "0jax009wbqlkkdhli5g0d01cgl7lvc8j2a86lp6p1msdk8rb6nls"; buildDepends = [ base containers grid MonadRandom ]; testDepends = [ base containers grid MonadRandom QuickCheck random test-framework @@ -113667,8 +113746,8 @@ self: { ({ mkDerivation, base, deepseq }: mkDerivation { pname = "sorted-list"; - version = "0.1.4.1"; - sha256 = "119h4dz8bkwgpl0w9x5q7q7s50jf5zsr7bikh1l446xqzyax2wi4"; + version = "0.1.4.2"; + sha256 = "1prfxpfvsx03lvk5q33azpcif2a3j80v4naw2kn48r1kb84r60m1"; buildDepends = [ base deepseq ]; homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md"; description = "Type-enforced sorted lists and related functions"; @@ -115225,15 +115304,15 @@ self: { "stackage-types" = callPackage ({ mkDerivation, aeson, base, Cabal, containers, exceptions - , hashable, semigroups, text, unordered-containers, vector + , hashable, semigroups, text, time, unordered-containers, vector }: mkDerivation { pname = "stackage-types"; - version = "1.0.0"; - sha256 = "17077awl2bfrhpdlqsl4dxb7hxq4dr5hxqcviyv1cbxlk6z38a4z"; + version = "1.0.1"; + sha256 = "0dgxkpx97ndmc9m46ql5chsg42f3ibzzqj0brh89xc5dvd5gdhhd"; buildDepends = [ aeson base Cabal containers exceptions hashable semigroups text - unordered-containers vector + time unordered-containers vector ]; homepage = "https://github.com/fpco/stackage-types"; description = "Shared data types between various Stackage packages"; @@ -115244,8 +115323,8 @@ self: { ({ mkDerivation, base, directory, filepath, process }: mkDerivation { pname = "stackage-update"; - version = "0.1.1.1"; - sha256 = "1w5d3kgpr6cyy9wzifhgh54x3sbx8k1sy7l7yzrjjiypy4ij29gb"; + version = "0.1.1.3"; + sha256 = "01f9809scpkix54w0yfw4yjf1aak4y612bq7mjn1j573s10xa2iy"; isLibrary = true; isExecutable = true; buildDepends = [ base directory filepath process ]; @@ -117370,6 +117449,7 @@ self: { version = "0.1.2"; sha256 = "1p2rnx045zw9qqd88m5ldx5p3xmbsi6rkdh1bfk6ab1a0krjiifa"; buildDepends = [ attoparsec base bytestring containers ]; + jailbreak = true; homepage = "http://github.com/bgamari/svm-light-utils"; description = "Parsers and formatters for the SVMlight input file format"; license = stdenv.lib.licenses.bsd3; @@ -120712,6 +120792,7 @@ self: { sha256 = "1xnpfj1890l2zqqhr6b95qpqacpssi8qzgqgnpdxml8wfzan8xwl"; buildDepends = [ attoparsec base text text-icu ]; testDepends = [ base hspec QuickCheck smallcheck text text-icu ]; + jailbreak = true; description = "Easy replacement when using text-icu regexes"; license = stdenv.lib.licenses.asl20; }) {}; @@ -122579,8 +122660,8 @@ self: { }: mkDerivation { pname = "tn"; - version = "1.0.2"; - sha256 = "0rk7zqzwxc1sjar0n3k919snjpxw7an9vgxjh6b407mkzvz62n94"; + version = "1.0.2.1"; + sha256 = "07jhbg8b33h9b0x94di5x8dskm4mq6r7mkjcx6zzcvr26ymmyrmy"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -122797,6 +122878,7 @@ self: { buildDepends = [ attoparsec base bytestring containers old-locale time ]; + jailbreak = true; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -127370,6 +127452,7 @@ self: { testDepends = [ attoparsec base directory filepath process QuickCheck text ]; + jailbreak = true; homepage = "https://github.com/hamishmack/vado"; description = "Runs commands on remote machines using ssh"; license = stdenv.lib.licenses.mit; @@ -130236,6 +130319,7 @@ self: { http-media http-types lens mtl 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; @@ -130297,6 +130381,7 @@ self: { transformers-base unordered-containers vector zip-archive ]; testDepends = [ base parallel text ]; + jailbreak = true; homepage = "https://github.com/kallisti-dev/hs-webdriver"; description = "a Haskell client for the Selenium WebDriver protocol"; license = stdenv.lib.licenses.bsd3; @@ -130513,8 +130598,8 @@ self: { }: mkDerivation { pname = "websockets"; - version = "0.9.3.1"; - sha256 = "0yqq2jj22a17n0cqcd54f0a7vjwwak2zr3wybbh1iq6gz0p5qf76"; + version = "0.9.4.0"; + sha256 = "0wpiy5i5vs2506s8xy24rxs9szpzga73xdhf1kfmdhl3gka0q7g0"; buildDepends = [ attoparsec base base64-bytestring binary blaze-builder bytestring case-insensitive containers entropy mtl network random SHA text From d9383746e6b0562c682a60e3bab1bb36fb029c22 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 11 May 2015 18:15:14 +0200 Subject: [PATCH 036/615] bgs: update from 0.6 to 0.7 --- pkgs/tools/X11/bgs/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix index 00cf9a54fb7e..984fc9158cca 100644 --- a/pkgs/tools/X11/bgs/default.nix +++ b/pkgs/tools/X11/bgs/default.nix @@ -3,21 +3,21 @@ stdenv.mkDerivation rec { name = "bgs-${version}"; - version = "0.6"; + version = "0.7"; src = fetchurl { - url = "https://github.com/Gottox/bgs/archive/${version}.tar.gz"; - sha256 = "19xwslh74686qln0ylaql28z3ng45c7srrb3cxxvfp35lz7hjpf0"; + url = "https://github.com/Gottox/bgs/archive/v${version}.tar.gz"; + sha256 = "1w1zz9nzj0a0r9rlnq5psjj7n2ff1zfghcs6j268i5c7nkyaw28a"; }; buildInputs = [ libX11 libXinerama imlib2 ]; preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk''; - meta = { - description = "Extremely fast and small background setter for X"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [pSub]; + meta = with stdenv.lib; { + description = "Extremely fast and small background setter for X"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; }; } From 5cbf69564b59c12aea5db02eb017d0d7d6b8ade6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 May 2015 17:53:08 +0200 Subject: [PATCH 037/615] pulseaudio: Combat dependency bloat In particular, don't depend on GTK+ 3. --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07e8d91a477c..95eabc5a3c4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8625,6 +8625,10 @@ let bluez5 = null; tdb = null; gdbm = null; + gtk3 = null; + webrtc-audio-processing = null; + gconf = null; + libasyncns = null; }; pulseaudioFull = callPackage ../servers/pulseaudio { From a3e14b94cb622bd6ff6d3f97f9939745122d28d4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 11 May 2015 21:24:41 +0200 Subject: [PATCH 038/615] llpp: update to HEAD Current latest tagged version (v21) has been broken since mupdf has been updated to 1.7. --- pkgs/applications/misc/llpp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index f2e23e0babfe..bbae8aca2b8b 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -4,12 +4,12 @@ let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; in stdenv.mkDerivation rec { name = "llpp-${version}"; - version = "21"; + version = "21-git-2015-04-27"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; - rev = "refs/tags/v${version}"; - sha256 = "0rxdq6j3bs4drnhlxgm0gcwkhxi98vmxm22lnkpic7h67lgsz51q"; + rev = "66868744188151eaa433d42c807e1efc5f623aa4"; + sha256 = "04hjbkzxixw88xmrpbr1smq486wfw3q9hvy7b4bfcb9j32mazk5c"; }; buildInputs = [ pkgconfig ninja makeWrapper ocaml findlib mupdf lablgl From a4fc6eb5968c18d46a8a2b441b3176c6e5951ddf Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Mon, 11 May 2015 22:46:41 +0300 Subject: [PATCH 039/615] vimPlugins: update --- pkgs/misc/vim-plugins/default.nix | 278 +++++++++++++++--------------- 1 file changed, 140 insertions(+), 138 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 8155d4942fd9..9b1c181c2a47 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -19,6 +19,16 @@ in rec { ### section I: manually mantained plugins + airline = vim-airline; + alternative = a; # backwards compat, added 2014-10-21 + command_T = command-t; # backwards compat, added 2014-10-18 + gitgutter = vim-gitgutter; + haskellConceal = haskellconceal; # backwards compat, added 2014-10-18 + necoGhc = neco-ghc; # backwards compat, added 2014-10-18 + nerdcommenter = The_NERD_Commenter; + stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18 + tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18 + youcompleteme = YouCompleteMe; a = buildVimPlugin { name = "a-git-2010-11-06"; @@ -33,8 +43,6 @@ rec { }; }; - airline = vim-airline; - align = buildVimPlugin { name = "align-git-2012-08-07"; src = fetchgit { @@ -48,27 +56,26 @@ rec { }; }; - alternative = a; # backwards compat, added 2014-10-21 - calendar = buildVimPlugin { - name = "calendar-git-2015-03-19"; + name = "calendar-git-2015-04-24"; src = fetchgit { url = "https://github.com/itchyny/calendar.vim.git"; - rev = "a1b9d1a11e301a25bc48350da833469ef8bb6c9f"; - sha256 = "a3a8da7890c5eedba72e2def86760b79092b3b5cf2ca3999deda5fa8eddecd49"; + rev = "4149b7bdbe159d9a7670fea9238fe3acac618d67"; + sha256 = "4a04a03343f94fcbdb0eca44ba1eef8e1669f31e7aa5bf411e6fca4e5b8cdb30"; }; meta = { - homepage = https://github.com/itchyny/calendar.vim; + homepage = https://github.com/itchyny/calendar.vim.git; maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; - command-t = buildVimPlugin rec { - name = "command-t-git-2015-01-12"; + + command-t = buildVimPlugin { + name = "command-t-git-2015-04-29"; src = fetchgit { url = "https://github.com/wincent/Command-T"; - rev = "13760a725779b65fa0f2ebef51806f3c05a52550"; - sha256 = "0cb284w1m8sxcc8ph64pm0cvqslpixss593a1ffnx9c09g6d7m8w"; + rev = "f7344ebbe95c532b2ad01f19877d6d611db0193b"; + sha256 = "0l0ajdi3dj2w0zfvgy5fkyl8wln6r8x6ikqvr31rxxzkpwmyxmr1"; }; buildInputs = [ perl ruby ]; buildPhase = '' @@ -79,27 +86,26 @@ rec { ''; }; - command_T = command-t; # backwards compat, added 2014-10-18 - easymotion = buildVimPlugin { - name = "easymotion-git-2015-02-24"; + name = "easymotion-git-2015-04-21"; src = fetchgit { - url = "https://github.com/lokaltog/vim-easymotion.git"; - rev = "8acdfc60e58bb0600ded42a4f752bec6e3b6d882"; - sha256 = "1177d1c06a16fe7c1e681a729d158a6cacf3fed9c14bd8c4ece35a069f21dc07"; + url = "https://github.com/lokaltog/vim-easymotion"; + rev = "9f1c449edfce6d61c7f620e3a9c1389b7b7e334f"; + sha256 = "ba358f3acc120d9cf1854205bde0fa345d156e7f69a1854987e74bb137889c54"; }; meta = { homepage = https://github.com/lokaltog/vim-easymotion; maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; - + + eighties = buildVimPlugin { - name = "eighties-git-2015-02-12"; + name = "eighties-git-2015-04-16"; src = fetchgit { url = "https://github.com/justincampbell/vim-eighties"; - rev = "5d0ebf5424adb8017bec049de0cd51f6fa427281"; - sha256 = "b4216c805e54f923efcbd8d914f97883f135c989f33e87d2eee69b488b57e747"; + rev = "d202e6015163bbb4f7c9973f2eac66c2351e8c24"; + sha256 = "ad7341c8d7ab659b062a67f893962b08596466a6a3a3395f28a4f4031a36eb9c"; }; buildPhase = ":"; meta = with stdenv.lib; { @@ -112,7 +118,6 @@ rec { }; - gitgutter = vim-gitgutter; golang = buildVimPlugin { name = "golang-git-2014-08-06"; @@ -153,7 +158,6 @@ rec { }; }; - haskellConceal = haskellconceal; # backwards compat, added 2014-10-18 hasksyn = buildVimPlugin { name = "hasksyn-git-2014-09-03"; @@ -222,11 +226,11 @@ rec { }; latex-box = buildVimPlugin { - name = "latex-box-git-2015-03-05"; + name = "latex-box-git-2015-05-11"; src = fetchgit { - url = "https://github.com/latex-box-team/latex-box.git"; - rev = "0992511ad9b250cbe53bccbec3b0cb24feca64ec"; - sha256 = "8e73020a4ad275dfb8887bfc6a85c8aa059a081feefb680b2fd7c85267137440"; + url = "https://github.com/latex-box-team/latex-box"; + rev = "ede8371663e89c6e033f8ae387590422b8ea6dd0"; + sha256 = "1d0f5244e681cc5c972ad043ebc2b8b5f751ba216ca44d4c07821dcb641c5f3d"; }; meta = { homepage = https://github.com/latex-box-team/latex-box; @@ -248,11 +252,11 @@ rec { }; neco-ghc = buildVimPlugin { - name = "neco-ghc-git-2015-03-21"; + name = "neco-ghc-git-2015-04-07"; src = fetchgit { - url = "https://github.com/eagletmt/neco-ghc.git"; - rev = "7d2c360736679064986925873b8d1e2b1978d9f8"; - sha256 = "3c4d1b00c79953e56379792a64df036075a456cb10a7b891e1691d04c9f15310"; + url = "https://github.com/eagletmt/neco-ghc"; + rev = "a45f4f98ee3f25eaa64a39328c253d4f78cd5fda"; + sha256 = "50bd8530b435c3ba0e0f01b230d7717074002ec229ddcc0cb20ee59ef2a28d59"; }; meta = { homepage = https://github.com/eagletmt/neco-ghc; @@ -260,14 +264,12 @@ rec { }; }; - necoGhc = neco-ghc; # backwards compat, added 2014-10-18 - neocomplete = buildVimPlugin { - name = "neocomplete-git-2015-03-24"; + name = "neocomplete-git-2015-05-11"; src = fetchgit { - url = "https://github.com/Shougo/neocomplete.vim.git"; - rev = "1ef1c33cfdcae43d8b3c6381c4f54f0e93a17287"; - sha256 = "5c61629c30906aacc00924ab5aaad720aba0011df348ea8835b6aaa53199550a"; + url = "https://github.com/Shougo/neocomplete.vim"; + rev = "425eaacdaa126db647c1fc24c3357e6326c48bdc"; + sha256 = "bb7dac68562fa5456aad0f993ee2caf962d53425e29659b7c5ae3d33d815a3ed"; }; meta = { homepage = https://github.com/Shougo/neocomplete.vim; @@ -275,12 +277,13 @@ rec { }; }; + neosnippet = buildVimPlugin { - name = "neosnippet-git-2015-01-19"; + name = "neosnippet-git-2015-05-04"; src = fetchgit { - url = "https://github.com/Shougo/neosnippet.vim.git"; - rev = "044c9cb8ca46a5e27eec37198990c26fe707b02a"; - sha256 = "c448fac34e432a496ec1d76e07b478b27e66e6e4ec99c1b3923e66c781b74fc8"; + url = "https://github.com/Shougo/neosnippet.vim"; + rev = "48689a972d41256b423aa635dff689868a48e5bd"; + sha256 = "a46be238526e0e39b4561c9a53351bbb43a5fec3a912bdf0b86ab2f031ccc383"; }; meta = { homepage = https://github.com/Shougo/neosnippet.vim; @@ -288,12 +291,13 @@ rec { }; }; + neosnippet-snippets = buildVimPlugin { - name = "neosnippet-snippets-git-2015-03-25"; + name = "neosnippet-snippets-git-2015-05-10"; src = fetchgit { - url = "https://github.com/Shougo/neosnippet-snippets.git"; - rev = "dfa436157c9e72f16f0f0d088fa181b37e226c2f"; - sha256 = "00a65d1f6a1309acef42c0ca70f333ab355db521319c14db8247be38d28da730"; + url = "https://github.com/Shougo/neosnippet-snippets"; + rev = "c35446a74d3a5c11838a96b9f2e3673e56ced384"; + sha256 = "92be7af28c0a64e8e3f0c5c7973fee36f7401d943ff97bd5deffe3f0e2760e5d"; }; meta = { homepage = https://github.com/Shougo/neosnippet-snippets; @@ -302,27 +306,26 @@ rec { }; - nerdcommenter = The_NERD_Commenter; - quickrun = buildVimPlugin { - name = "quickrun-git-2015-03-26"; + name = "quickrun-git-2015-05-02"; src = fetchgit { - url = "https://github.com/thinca/vim-quickrun.git"; - rev = "2d03b3a7405da0e95ff7f6f617843ba9f536395f"; - sha256 = "803e902a083b79c70ea3f826a89864b8879897cd36a655d9e789a0d651127eb3"; - }; + url = "https://github.com/thinca/vim-quickrun"; + rev = "b40cdc36c3600fd096323d3e08c3bbd5d55ec8a8"; + sha256 = "32e5870ff9bb7ae3fdd2c279c6580935c0f3cd9b306ce34a9e14b227d59e193b"; + }; meta = { - homepage = https://github.com/thinca/vim-quickrun; + homepage = https://github.com/thinca/vim-quickrun; maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; + racer = buildVimPlugin { - name = "racer-git-2015-03-23"; + name = "racer-git-2015-05-04"; src = fetchgit { url = "https://github.com/phildawes/racer"; - rev = "c6f557bfd9a22d45476651fa95f7d8415ed897a8"; - sha256 = "697d92e0acbb3a8c1d691eaebc008bec422060df10e3c4cf6fad448b30391852"; + rev = "bf2373ec08b0be03598283bd610c5b61bdb8738c"; + sha256 = "938516aef0674053886fcf032faa5ae87d14e4412c77aadd981dbe145a01ae51"; }; buildPhase = '' find . -type f -not -name 'racer.vim' -exec rm -rf {} \; @@ -348,19 +351,18 @@ rec { }; stylish-haskell = buildVimPlugin { - name = "stylish-haskell-git-2014-07-14"; + name = "stylish-haskell-git-2015-05-10"; src = fetchgit { - url = "https://github.com/nbouscal/vim-stylish-haskell.git"; - rev = "453fd203aee3d7305ea8e4088ff53bd1f5933d75"; - sha256 = "c0e5010e1e8e56b179ce500387afb569f051c45b37ce92feb4350f293df96a8c"; - }; + url = "https://github.com/nbouscal/vim-stylish-haskell"; + rev = "c664376ba814de3f87cb7641f90b2c6a9dd53671"; + sha256 = "12a9aad40112200060c3ee86f96589a264db287bdfeb3eb6fdf0f22a6656a5f6"; + }; meta = { - homepage = https://github.com/nbouscal/vim-stylish-haskell; + homepage = https://github.com/nbouscal/vim-stylish-haskell; maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; - stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18 tabmerge = buildVimPlugin { name = "tabmerge-git-2010-10-17"; @@ -424,7 +426,6 @@ rec { }; }; - tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18 tslime = buildVimPlugin { name = "tslime-git-2015-02-10"; @@ -484,11 +485,11 @@ rec { }; vimproc = buildVimPlugin { - name = "vimproc-git-2015-02-23"; + name = "vimproc-git-2015-05-10"; src = fetchgit { - url = "https://github.com/shougo/vimproc.vim.git"; - rev = "0f68bcd93399ecbcde3eaa4efd09107314c9bdee"; - sha256 = "850cb6d347f4c353782c48533f2dc6e3150a3982dc71efbd5f6b0a921264f939"; + url = "https://github.com/shougo/vimproc.vim"; + rev = "421827f0971a62ba3d67e2ed158a7d282c5d05bb"; + sha256 = "158d6d3990528730dbf699326cfb402c33ab3322e5d7ab6c95d84b0bd6292aee"; }; buildInputs = [ which ]; @@ -503,12 +504,12 @@ rec { }; }; - vimshell = buildVimPlugin rec { - name = "vimshell-git-2015-03-24"; + vimshell = buildVimPlugin { + name = "vimshell-git-2015-05-01"; src = fetchgit { url = "https://github.com/Shougo/vimshell.vim"; - rev = "41d3ad325852e80588ab57c64433fa338789d6ac"; - sha256 = "bf76ee252a3cbb121013ce10547cee7d31a64d10c46687ddfaa988e7c5baf095"; + rev = "4939e10609c434becf6423b2f3876bb9c2be3464"; + sha256 = "72bc6ca7b8ebcdf1d4617c73fc2688486f71a9f8b8601627fbbada3a4cfb28ca"; }; meta = with stdenv.lib; { description = "An extreme shell that doesn't depend on external shells and is written completely in Vim script"; @@ -548,14 +549,14 @@ rec { }; watchdogs = buildVimPlugin { - name = "watchdogs-git-2015-03-20"; + name = "watchdogs-git-2015-04-16"; src = fetchgit { - url = "https://github.com/osyo-manga/vim-watchdogs.git"; - rev = "01ba53074fd3bedd81f5aed2dcc4fec092f62ba9"; - sha256 = "7b363779a0b035a0aaec025653a29e2f4dbd9e1518a34a6e993c43e8ec810d57"; - }; + url = "https://github.com/osyo-manga/vim-watchdogs"; + rev = "5e3d1db592297f7d4c563900a6d224ff559f533e"; + sha256 = "3d4c9624d86815dd47d7655eb58a703574f2ecb92238ae4e65dc67fc9960820a"; + }; meta = { - homepage = https://github.com/osyo-manga/vim-watchdogs; + homepage = https://github.com/osyo-manga/vim-watchdogs; maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; @@ -588,13 +589,14 @@ rec { }; }; - YouCompleteMe = buildVimPlugin { + + YouCompleteMe = buildVimPlugin { + name = "YouCompleteMe-git-2015-05-07"; src = fetchgit { - rev = "2f8109020644ad28e5cd795c29bc1150f87b3cb4"; url = "https://github.com/Valloric/YouCompleteMe"; - sha256 = "15d3dhxan602qxz2wixjf4pjrf210qwa51ckzyjyh5kqak9lx8pi"; - }; - name = "youcompleteme-2015-03-27"; + rev = "295769ccfd304246c1fae847416a2a15771f7d98"; + sha256 = "04qcbbxm3qhb2f3awhrwprffm3jh54z4ag6r49aa8xk0l9k8i8sp"; + }; buildInputs = [ python cmake @@ -633,7 +635,6 @@ rec { }; }; - youcompleteme = YouCompleteMe; YUNOcommit = buildVimPlugin { name = "YUNOcommit"; @@ -681,7 +682,6 @@ rec { ### The following derivations are generated by nix#ExportPluginsForNix - "Colour_Sampler_Pack" = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "Colour_Sampler_Pack"; src = fetchurl { @@ -698,11 +698,11 @@ rec { }; "Gist" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Gist-2015-03-25"; + name = "Gist-2015-05-06"; src = fetchgit { url = "git://github.com/mattn/gist-vim"; - rev = "22eeb3a72f116818dec0e2f9fe3ea46443141b95"; - sha256 = "9ecaa593267958c5860d6e34be5fc1e3280da5265a1fb35bdb2904163049325f"; + rev = "6130b8ee438ad55572c5de1cb974ef824163a1f4"; + sha256 = "5142abefc6f5eaf5f2cce4f5222782b7d9e1033a3e54db7bca0dcf2bd7575853"; }; dependencies = []; @@ -748,11 +748,11 @@ rec { }; "Syntastic" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2015-03-25"; + name = "Syntastic-2015-05-09"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "dac07db61758590c71d655ed5403181af4e845a2"; - sha256 = "96ae43056b79a50c34272f483c5c7a3cf55f5aa8699b319fe9ed5f7ba12ed0d7"; + rev = "5dba05af4fb9e69472a994bb1228c6b86a47911a"; + sha256 = "a6f2a77dec55d2bb2abe742e24865d2311c12f030290f31ad9219e4d787a6d3c"; }; dependencies = []; @@ -768,11 +768,11 @@ rec { }; "Tagbar" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tagbar-2015-03-17"; + name = "Tagbar-2015-05-10"; src = fetchgit { url = "git://github.com/majutsushi/tagbar"; - rev = "3634e7ab4feeab8ad49166e9e716638c20f1637c"; - sha256 = "cecbb15e025b300f688a7a67cc886a2e8a8afaf3e8fdca4a4d8ba73dabda8ab2"; + rev = "399b75256ac7333d7119d11047f6b3aff8fa2828"; + sha256 = "8562fac0f2d690537b4c1049ba67b440116135167b48b9feb21655c9931b875c"; }; dependencies = []; @@ -788,21 +788,21 @@ rec { }; "The_NERD_tree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2014-11-20"; + name = "The_NERD_tree-2015-05-06"; src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; - rev = "3b98a7fcae8f9fff356907171f0406ff8cd28921"; - sha256 = "deec2ce33249829ae3925478d7d1925ea99e20c37dcc86db7c3bfac4fdc706e0"; + rev = "a87b1bf3c566c3f80090996a2a2a1201318478a8"; + sha256 = "4422563a44f14aa008b5e7ef8b7df1f7fc1ffdca1323a3cb1c115409e325a87e"; }; dependencies = []; }; "UltiSnips" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2015-03-05"; + name = "UltiSnips-2015-05-11"; src = fetchgit { url = "git://github.com/sirver/ultisnips"; - rev = "1971030b506a8f0e2e0398fb166f21a5341f8c7a"; - sha256 = "84c07f73ea22a34422c843c5ccb40aa8d3967175ff38ab6155303ba3c039e859"; + rev = "188e00f7b87297ea7737f9494d531c7073637332"; + sha256 = "9fb127b32bd0e2ae139b3b6008849f4566cfb1c29087e787570428c770a3430c"; }; dependencies = []; @@ -873,11 +873,11 @@ rec { }; "fugitive" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2015-02-20"; + name = "fugitive-2015-03-31"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "0095769029709b531d2505ee6ad9907dd9bd72a0"; - sha256 = "83184b527538d0aac01783074ec29addfa18b62880ec8959dae6e404c6ff3d11"; + rev = "4cc201cbe3a0c3faa4cde1b82ba941d410e5e81c"; + sha256 = "f7e79b5e823639d0b9e2c46c29cdae621b22b3bb0c601dce058083877dad2e13"; }; dependencies = []; @@ -964,21 +964,21 @@ rec { }; "sensible" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sensible-2014-11-24"; + name = "sensible-2015-04-04"; src = fetchgit { url = "git://github.com/tpope/vim-sensible"; - rev = "b30dcf387af977acfa21732592bfca05598b2188"; - sha256 = "6a9fc68c3eb0ee500ac59bdbc2c48d98e88a2936ee544f7203fa1a0296002b5f"; + rev = "d0beb8ab42627bea2c747564ca46ec663e3ba0ba"; + sha256 = "c1893990e7b0b3f409b2ec4f4e1fb7f00f61a5146b94314ad28d86231d3ab6f7"; }; dependencies = []; }; "snipmate" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "snipmate-2015-03-21"; + name = "snipmate-2015-04-04"; src = fetchgit { url = "git://github.com/garbas/vim-snipmate"; - rev = "2079ea5aadaada568f78acfc6b565945625ed97d"; - sha256 = "47f5d131485f8a57389a0b455c6e83f8f543d71a04cbaa7af594b3abe9099d9f"; + rev = "2d3e8ddc4424088d8e19c33764fff077f3116f55"; + sha256 = "fe23f38cf074b12082879256a5c4c16e6f55233e0af0735867b4d5c21b72ff09"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; @@ -1004,21 +1004,21 @@ rec { }; "table-mode" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "table-mode-2015-03-17"; + name = "table-mode-2015-04-21"; src = fetchgit { url = "git://github.com/dhruvasagar/vim-table-mode"; - rev = "c0a6d43f2191b841c01cec0638a33a8116f7f920"; - sha256 = "222532a9803f855b5f261eb311359980625606716c1b9419703b97874554c49d"; + rev = "cc723fe8cdab054f325292c288103229b0193147"; + sha256 = "4daee279dc4e9c48af41a70bc45385136fa02546bdc8525f68ce44404db7a84a"; }; dependencies = []; }; "tlib" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tlib-2015-02-23"; + name = "tlib-2015-05-04"; src = fetchgit { url = "git://github.com/tomtom/tlib_vim"; - rev = "2376d1233e7d1db8157fdc3157278dda7a2c796f"; - sha256 = "07966a0f2a073ae07e8d2a63a8a265ec0053997721545b41cedff910bcc24de0"; + rev = "ecf9e08de8b8ed8cf5e1f69f69471b04b7d55652"; + sha256 = "5d3d5f066b23be90c3c4de54967056378fff931594154c4e5541a3bcd424b795"; }; dependencies = []; @@ -1234,11 +1234,11 @@ rec { }; "vim-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-coffee-script-2014-10-10"; + name = "vim-coffee-script-2015-04-20"; src = fetchgit { url = "git://github.com/kchmck/vim-coffee-script"; - rev = "827e4a38b07479433b619091469a7495a392df8a"; - sha256 = "89ee4c7cce9f3310be502df6b2dd2e70a715c0b06882afc9c8169fbf58b207d0"; + rev = "32fe889b8cafd3a4921ef8e6485156453ff58c42"; + sha256 = "d7162b2546c9949c96811d7a72c17ae2db9871697ee65ed0b1a8f0287d278690"; }; dependencies = []; @@ -1252,13 +1252,23 @@ rec { }; dependencies = []; + }; + "vim-gista" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-gista-2015-01-29"; + src = fetchgit { + url = "git://github.com/lambdalisue/vim-gista"; + rev = "e450417a6eaeb99d3982b880507697dce85b7217"; + sha256 = "a7665dbc63a35d1fe9b7679a498deafb80c8dfb05fced37ac4722212c673f2ec"; + }; + dependencies = []; + }; "vim-gitgutter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2015-03-23"; + name = "vim-gitgutter-2015-05-08"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "8345c35770ffc6fc4088c36406d1e24170aabcc6"; - sha256 = "f7580832ebfd60f0b7cf05e697ac44e4b59a0f606fe49b7ef392052a50c69ad3"; + rev = "339f8ba079ed7d465ca442c9032b36bc56c21f61"; + sha256 = "f306cc7bac8560fe2864161be675545c1023486b950900da8d8c74f98d568e15"; }; dependencies = []; @@ -1284,31 +1294,21 @@ rec { }; "vim-signature" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature-2015-01-12"; + name = "vim-signature-2015-04-24"; src = fetchgit { url = "git://github.com/kshenoy/vim-signature"; - rev = "b4ac4f38528313456f98b1a50722cfc9a06bfc45"; - sha256 = "c065eb81669fd76a8bf6d19e220c85ad07ede73e6a9b3dd12634611146303675"; - }; - dependencies = []; - - }; - "vim-gista" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gista-2015-01-29"; - src = fetchgit { - url = "git://github.com/lambdalisue/vim-gista"; - rev = "e450417a6eaeb99d3982b880507697dce85b7217"; - sha256 = "a7665dbc63a35d1fe9b7679a498deafb80c8dfb05fced37ac4722212c673f2ec"; + rev = "7586613e5dcfd2f09d32197aa5a10ed025da21f4"; + sha256 = "0bce1c37adc06a386438e13c6e3e0af5829a13e4e65fbd703234680bc3d769fc"; }; dependencies = []; }; "vim-snippets" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2015-03-24"; + name = "vim-snippets-2015-05-05"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "707f005ccddaa15a0b8c207a7a711b0a9590578a"; - sha256 = "0c5807b82e18530a6b83f4f1c0010564a1a4b39f687672ab235b95e694095d03"; + rev = "1327c1ba54c8c367995b536b8cb7d8e7cc7c4c03"; + sha256 = "fb6a7a2fa0939a64f8bac4411dfa36dc5a6e1385e5016978045614039ab89720"; }; dependencies = []; @@ -1346,6 +1346,8 @@ rec { url = "http://www.vim.org/scripts/script.php?script_id=2465"; }; + }; + } From 087892c42d581aedb747be70d7f5fd14f903c356 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 May 2015 19:56:16 +0200 Subject: [PATCH 040/615] haskell-aeson test suite is broken. haskell-email-validate test suite has been fixed. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2a83cab3ad4f..36ae1a181d79 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -801,7 +801,7 @@ self: super: { # https://github.com/adamwalker/sdr/issues/1 sdr = dontCheck super.sdr; - # https://github.com/Porges/email-validate-hs/issues/12 - email-validate = dontCheck super.email-validate; + # https://github.com/bos/aeson/issues/253 + aeson = dontCheck super.aeson; } From c7c10f28ad5fb5add4484c6981299a45bac74ec0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 May 2015 05:16:20 +0200 Subject: [PATCH 041/615] netsniff-ng -> 0.5.9 --- pkgs/tools/networking/netsniff-ng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 8e3f5d34f1ea..967504a00047 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -2,7 +2,7 @@ , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl , pkgconfig, zlib }: -let version = "v0.5.9-rc5-22-gdafb89c"; in +let version = "0.5.9"; in stdenv.mkDerivation { name = "netsniff-ng-${version}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; - rev = "dafb89c7a307272189b29a5c74bd6e33068ac831"; - sha256 = "0j6gii9jw93pdnbdk8yxddcc67g30623r2xvgdvrbhg3v2q6k1qm"; + rev = "9118e9e8673eb88ebf4f7af33d8ed9856f3ed554"; + sha256 = "0zxwkpaad0mjgkhgnii4bj8sfji3inqqf1zqbv7807nk34bqr6qp"; }; buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl From 6e8d1f84f229bc481b2c0aafdeac986f4f3deb8c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 May 2015 22:52:43 +0200 Subject: [PATCH 042/615] python-packages: SQLAlchemy: build Fix test failure by adding pysqlite dependency (buildInputs only). --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e9469160546..32fea28dc45c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11892,7 +11892,7 @@ let md5 = "470ca4da4a0081efc830f0d90dd91682"; }; - buildInputs = with self; [ nose mock ]; + buildInputs = with self; [ nose mock pysqlite ]; propagatedBuildInputs = with self; [ modules.sqlite3 ]; From 1eec4a4a10997ccb58d8b242999d00007babf287 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 May 2015 23:15:29 +0200 Subject: [PATCH 043/615] python-SQLAlchemy: add pysqlite module to fix the test suite http://hydra.cryp.to/build/817910/nixlog/1/raw --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 32fea28dc45c..a7807504c725 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11866,6 +11866,7 @@ let preConfigure = optionalString isPy3k '' python3 sa2to3.py --no-diffs -w lib test examples ''; + propagatedBuildInputs = [self.pysqlite]; }; sqlalchemy8 = self.sqlalchemy9.override rec { @@ -11880,6 +11881,7 @@ let preConfigure = optionalString isPy3k '' python3 sa2to3.py --no-diffs -w lib test examples ''; + propagatedBuildInputs = [self.pysqlite]; }; sqlalchemy9 = buildPythonPackage rec { @@ -11894,7 +11896,7 @@ let buildInputs = with self; [ nose mock pysqlite ]; - propagatedBuildInputs = with self; [ modules.sqlite3 ]; + propagatedBuildInputs = with self; [ modules.sqlite3 pysqlite ]; checkPhase = '' ${python.executable} sqla_nose.py From d9e83b77a6a4e4dcaa42630ab2e07fac1816b778 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 May 2015 23:21:18 +0200 Subject: [PATCH 044/615] python-packages.nix: drop trailing whitespace --- pkgs/top-level/python-packages.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a7807504c725..cddec5dfafd0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2088,7 +2088,7 @@ let buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors self.iso8601 self.pyasn1 self.pytest ]; - propagatedBuildInputs = [ self.six ] ++ optional (!isPyPy) self.cffi; + propagatedBuildInputs = [ self.six ] ++ optional (!isPyPy) self.cffi; }; cryptography_vectors = buildPythonPackage rec { @@ -15367,7 +15367,7 @@ let }; }; - + markdown2 = buildPythonPackage rec { name = "markdown2-${version}"; version = "2.3.0"; @@ -15384,8 +15384,8 @@ let maintainers = with maintainers; [ hbunke ]; }; }; - - + + evernote = buildPythonPackage rec { name = "evernote-${version}"; version = "1.25.0"; @@ -15405,7 +15405,7 @@ let maintainers = with maintainers; [ hbunke ]; }; }; - + thrift = buildPythonPackage rec { name = "thrift-${version}"; version = "0.9.2"; @@ -15423,11 +15423,11 @@ let }; }; - + geeknote = buildPythonPackage rec { version = "2015-03-02"; name = "geeknote-${version}"; - disabled = ! isPy27; + disabled = ! isPy27; src = pkgs.fetchFromGitHub { owner = "VitaliyRodnenko"; @@ -15436,13 +15436,13 @@ let sha256 = "0lw3m8g7r8r7dxhqih08x0i6agd201q2ig35a59rd4vygr3xqw2j"; }; - /* build with tests fails with "Can not create application dirictory : + /* build with tests fails with "Can not create application dirictory : /homeless-shelter/.geeknotebuilder". */ doCheck = false; - propagatedBuildInputs = with self; [ - thrift - beautifulsoup4 + propagatedBuildInputs = with self; [ + thrift + beautifulsoup4 markdown2 sqlalchemy html2text From b37e68b09f1701a14817e5d2851785c1c37ae51c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 May 2015 23:25:37 +0200 Subject: [PATCH 045/615] python-packages.nix: fix Emacs syntax highlighting --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cddec5dfafd0..7b4a3fcbcd84 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10687,7 +10687,7 @@ let # Remove Windows .bat files postInstall = '' - rm "$out"/bin/*.bat + rm "$out/bin/"*.bat ''; meta = with stdenv.lib; { @@ -14831,7 +14831,7 @@ let propagatedBuildInputs = with self; [ pkgs.gobjectIntrospection pkgs.gtk3 pyyaml pygobject3 pkgs.libnotify pkgs.udisks2 pkgs.gettext self.docopt ]; preFixup = '' - wrapProgram $out/bin/* \ + wrapProgram "$out/bin/"* \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" ''; From c6ca7a0be151d3cb90ac2cc1483ddcfc728d03f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 May 2015 23:29:19 +0200 Subject: [PATCH 046/615] anki: update to SQLAlchemy 9 --- pkgs/games/anki/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index dab4e2b6afff..cbe02824c8f3 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0g5rmg0yqh40a3g8ci3y3if7vw4jl5nrpq8ki1a13a3xmgch13rr"; }; - pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy py.pyaudio ] + pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy9 py.pyaudio ] ++ lib.optional plotsSupport py.matplotlib; buildInputs = [ python py.wrapPython lame mplayer pulseaudio ]; From f5d8fb8409e250032de65c16a4cee2a603b2d24a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 May 2015 23:30:15 +0200 Subject: [PATCH 047/615] anki: fix Emacs syntax highlighting --- pkgs/games/anki/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index cbe02824c8f3..145ffed94f2a 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p "$out/lib/${python.libPrefix}/site-packages" - ln -s $out/share/anki/* $out/lib/${python.libPrefix}/site-packages/ + ln -s "$out/share/anki/"* $out/lib/${python.libPrefix}/site-packages/ export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" wrapPythonPrograms ''; From 0c32585e67279c00336ee26777aab8f02c82a1a1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 May 2015 23:30:50 +0200 Subject: [PATCH 048/615] anki: polish meta section --- pkgs/games/anki/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 145ffed94f2a..8cb38c859ed1 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -51,7 +51,8 @@ stdenv.mkDerivation rec { meta = { homepage = http://ankisrs.net/; description = "Spaced repetition flashcard program"; - # Copy-pasted from the homepage + license = stdenv.lib.licenses.gpl3; + longDescription = '' Anki is a program which makes remembering things easy. Because it is a lot more efficient than traditional study methods, you can either greatly @@ -60,15 +61,11 @@ stdenv.mkDerivation rec { Anyone who needs to remember things in their daily life can benefit from Anki. Since it is content-agnostic and supports images, audio, videos and scientific markup (via LaTeX), the possibilities are endless. For example: - - * learning a language - * studying for medical and law exams - * memorizing people's names and faces - * brushing up on geography - * mastering long poems - * even practicing guitar chords! + learning a language, studying for medical and law exams, memorizing + people's names and faces, brushing up on geography, mastering long poems, + or even practicing guitar chords! ''; - license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; From ea0c877858e071d2258680cb4779786ff1f0dea0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 May 2015 23:36:13 +0200 Subject: [PATCH 049/615] python-SQLAlchemy: test suite dependencies don't need to propagate --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b4a3fcbcd84..623f96d37bcf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11866,7 +11866,7 @@ let preConfigure = optionalString isPy3k '' python3 sa2to3.py --no-diffs -w lib test examples ''; - propagatedBuildInputs = [self.pysqlite]; + buildInputs = [self.pysqlite]; }; sqlalchemy8 = self.sqlalchemy9.override rec { @@ -11881,7 +11881,7 @@ let preConfigure = optionalString isPy3k '' python3 sa2to3.py --no-diffs -w lib test examples ''; - propagatedBuildInputs = [self.pysqlite]; + buildInputs = [self.pysqlite]; }; sqlalchemy9 = buildPythonPackage rec { @@ -11896,7 +11896,7 @@ let buildInputs = with self; [ nose mock pysqlite ]; - propagatedBuildInputs = with self; [ modules.sqlite3 pysqlite ]; + propagatedBuildInputs = with self; [ modules.sqlite3 ]; checkPhase = '' ${python.executable} sqla_nose.py From 395829686d0219b3e14fe6ffae60a24b4e50370b Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Mon, 11 May 2015 14:30:13 -0700 Subject: [PATCH 050/615] add is{GNU,Clang} attrs to cc-wrapper. These will be more pleasant to use than the existing (cc.cc.isClang or false) nonsense we currently do. --- pkgs/build-support/cc-wrapper/default.nix | 3 ++- pkgs/stdenv/darwin/default.nix | 14 ++++++++------ pkgs/stdenv/linux/default.nix | 2 ++ pkgs/stdenv/nix/default.nix | 1 + pkgs/top-level/all-packages.nix | 4 ++++ 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index f6826c837ca1..c8af548a2ca4 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -10,6 +10,7 @@ , zlib ? null, extraPackages ? [] , dyld ? null # TODO: should this be a setup-hook on dyld? , setupHook ? ./setup-hook.sh +, isGNU ? false, isClang ? false }: with stdenv.lib; @@ -41,7 +42,7 @@ stdenv.mkDerivation { # The wrapper scripts use 'cat', so we may need coreutils. coreutils = if nativeTools then null else coreutils; - passthru = { inherit nativeTools nativeLibc nativePrefix; }; + passthru = { inherit nativeTools nativeLibc nativePrefix isGNU isClang; }; buildCommand = '' diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index f06170b5cb10..ac396ecdf12b 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -90,6 +90,7 @@ rec { cc = "/usr"; outPath = nativePrefix; }; + isClang = true; }; }; pkgs = allPackages { @@ -129,13 +130,14 @@ rec { cc = import ../../build-support/cc-wrapper { inherit stdenv; - nativeTools = false; - nativeLibc = true; - binutils = pkgs.darwin.cctools; - cc = pkgs.llvmPackages.clang-unwrapped; - coreutils = pkgs.coreutils; - shell = "${pkgs.bash}/bin/bash"; + nativeTools = false; + nativeLibc = true; + binutils = pkgs.darwin.cctools; + cc = pkgs.llvmPackages.clang-unwrapped; + coreutils = pkgs.coreutils; + shell = "${pkgs.bash}/bin/bash"; extraPackages = [ pkgs.libcxx ]; + isClang = true; }; shell = "${pkgs.bash}/bin/bash"; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index d432206a9e13..722d40bf7fbe 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -91,6 +91,7 @@ rec { nativeTools = false; nativeLibc = false; cc = gccPlain; + isGNU = true; libc = glibc; inherit binutils coreutils; name = name; @@ -234,6 +235,7 @@ rec { gcc = lib.makeOverridable (import ../../build-support/cc-wrapper) { nativeTools = false; nativeLibc = false; + isGNU = true; cc = stage4.stdenv.cc.cc; libc = stage4.pkgs.glibc; inherit (stage4.pkgs) binutils coreutils; diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 79c9fb3a1378..75e1c3814ed0 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -20,6 +20,7 @@ import ../generic rec { inherit stdenv; binutils = pkgs.binutils; cc = pkgs.gcc.cc; + isGNU = true; coreutils = pkgs.coreutils; shell = pkgs.bash + "/bin/sh"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95eabc5a3c4b..5ab8b2fb69f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3433,6 +3433,7 @@ let clangWrapSelf = build: (import ../build-support/cc-wrapper) { cc = build; + isClang = true; stdenv = clangStdenv; libc = glibc; binutils = binutils; @@ -4479,6 +4480,8 @@ let nativePrefix = stdenv.cc.nativePrefix or ""; cc = baseCC; libc = libc; + isGNU = baseCC.isGNU or false; + isClang = baseCC.isClang or false; inherit stdenv binutils coreutils zlib; }; @@ -4518,6 +4521,7 @@ let nativePrefix = stdenv.cc.nativePrefix or ""; cc = baseGCC; libc = glibc; + isGNU = true; inherit stdenv binutils coreutils zlib; setupHook = ../build-support/cc-wrapper/setup-hook-stdinc.sh; }; From 662a6b1ca62b2e44115f6e29999f30896ddfa075 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Mon, 11 May 2015 14:37:53 -0700 Subject: [PATCH 051/615] remove all references to `stdenv.cc.cc.is{GNU,Clang}` use the new `stdenv.cc.is{GNU,Clang}` instead, which will always be defined. --- pkgs/applications/graphics/inkscape/default.nix | 2 +- pkgs/applications/networking/browsers/opera/default.nix | 2 +- pkgs/development/compilers/gcl/default.nix | 2 +- pkgs/development/compilers/llvm/3.5/clang.nix | 2 +- pkgs/development/compilers/llvm/3.6/clang/default.nix | 2 +- pkgs/development/guile-modules/guile-lib/default.nix | 2 +- pkgs/development/libraries/ffmpeg/generic.nix | 2 +- pkgs/development/libraries/fftw/default.nix | 2 +- pkgs/development/libraries/gamin/default.nix | 2 +- pkgs/development/libraries/glib/default.nix | 2 +- pkgs/development/libraries/glibc/default.nix | 2 +- pkgs/development/libraries/gsm/default.nix | 2 +- pkgs/development/libraries/jbigkit/default.nix | 2 +- pkgs/development/libraries/judy/default.nix | 2 +- pkgs/development/libraries/libcdr/default.nix | 2 +- pkgs/development/libraries/libfpx/default.nix | 2 +- pkgs/development/libraries/libmad/default.nix | 2 +- pkgs/development/libraries/librevenge/default.nix | 2 +- pkgs/development/libraries/libsodium/default.nix | 2 +- pkgs/development/libraries/pixman/default.nix | 2 +- pkgs/development/tools/misc/astyle/default.nix | 2 +- pkgs/servers/x11/xorg/overrides.nix | 2 +- pkgs/tools/networking/atftp/default.nix | 2 +- pkgs/tools/security/tor/default.nix | 2 +- pkgs/tools/video/rtmpdump/default.nix | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index ca52a4f2766d..41531ed0de84 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patchShebangs share/extensions '' # Clang gets misdetected, so hardcode the right answer - + stdenv.lib.optionalString (stdenv.cc.cc.isClang or false) '' + + stdenv.lib.optionalString stdenv.cc.isClang '' substituteInPlace src/ui/tool/node.h \ --replace "#if __cplusplus >= 201103L" "#if true" ''; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index ced16da5f7ee..b29f2d1974c0 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -6,7 +6,7 @@ , kdeSupport ? false, qt4, kdelibs }: -assert stdenv.isLinux && stdenv.cc.cc.isGNU or false && stdenv.cc.libc != null; +assert stdenv.isLinux && stdenv.cc.isGNU && stdenv.cc.libc != null; let mirror = http://get.geo.opera.com/pub/opera; diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index a31517afbeb1..f1844a1a632b 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -10,7 +10,7 @@ in ( assert a.stdenv ? cc ; -assert a.stdenv.cc.cc.isGNU or false ; +assert a.stdenv.cc.isGNU ; assert a.stdenv.cc ? libc ; assert a.stdenv.cc.libc != null ; diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index 2398b0c59ac5..05ac4be01e5f 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -1,6 +1,6 @@ { stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }: let - gcc = if stdenv.cc.cc.isGNU or false then stdenv.cc.cc else stdenv.cc.cc.gcc; + gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation { name = "clang-${version}"; diff --git a/pkgs/development/compilers/llvm/3.6/clang/default.nix b/pkgs/development/compilers/llvm/3.6/clang/default.nix index 7be535ada1e5..898ca37558e4 100644 --- a/pkgs/development/compilers/llvm/3.6/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.6/clang/default.nix @@ -1,7 +1,7 @@ { stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }: let - gcc = if stdenv.cc.cc.isGNU or false then stdenv.cc.cc else stdenv.cc.cc.gcc; + gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation { name = "clang-${version}"; diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 10d98dbf7c3d..7cce27c387e0 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, guile, texinfo}: -assert stdenv ? cc && stdenv.cc.cc.isGNU or false; +assert stdenv ? cc && stdenv.cc.isGNU; stdenv.mkDerivation rec { name = "guile-lib-0.2.2"; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 1f127d948afc..9a373c522786 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { "--disable-stripping" # Disable mmx support for 0.6.90 (verFix null "0.6.90" "--disable-mmx") - ] ++ optional (stdenv.cc.cc.isClang or false) "--cc=clang"; + ] ++ optional stdenv.cc.isClang "--cc=clang"; nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 104b7229bb19..2bcc1cd69a70 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ++ optional (precision != "double") "--enable-${precision}" # all x86_64 have sse2 ++ optional stdenv.isx86_64 "--enable-sse2" - ++ optional (stdenv.cc.cc.isGNU or false) "--enable-openmp"; + ++ optional stdenv.cc.isGNU "--enable-openmp"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index 0b22aa501e64..e6b1875a9e0c 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (rec { patches = [ ./deadlock.patch ] ++ map fetchurl (import ./debian-patches.nix) - ++ stdenv.lib.optional (stdenv.cc.cc.isClang or false) ./returnval.patch; + ++ stdenv.lib.optional stdenv.cc.isClang ./returnval.patch; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 91832ac650e6..7d61bea64e11 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; -assert !stdenv.isDarwin -> stdenv.cc.cc.isGNU or false; +assert !stdenv.isDarwin -> stdenv.cc.isGNU; # TODO: # * Add gio-module-fam diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index ccf6d2c0686e..08eaf555e02d 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -8,7 +8,7 @@ , withGd ? false, gd ? null, libpng ? null }: -assert stdenv.cc.cc.isGNU or false; +assert stdenv.cc.isGNU; let build = import ./common.nix; diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index 706bd7692193..fb9ff8eb0fbc 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { makeFlags = [ "SHELL=${stdenv.shell}" "INSTALL_ROOT=$(out)" - ] ++ optional (stdenv.cc.cc.isClang or false) "CC=clang"; + ] ++ optional stdenv.cc.isClang "CC=clang"; preInstall = "mkdir -p $out/{bin,lib,man/man1,man/man3,include/gsm}"; diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index 2e0c75c14526..7dba9e025198 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i 's/^\(CFLAGS.*\)$/\1 -fPIC/' Makefile - '' + stdenv.lib.optionalString (stdenv.cc.cc.isClang or false) '' + '' + stdenv.lib.optionalString stdenv.cc.isClang '' substituteInPlace Makefile libjbig/Makefile pbmtools/Makefile \ --replace "CC = gcc" "CC = clang" ''; diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix index 13b50286380f..6e2c085f3ba2 100644 --- a/pkgs/development/libraries/judy/default.nix +++ b/pkgs/development/libraries/judy/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { # gcc 4.8 optimisations break judy. # http://sourceforge.net/p/judy/mailman/message/31995144/ - preConfigure = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) '' + preConfigure = stdenv.lib.optionalString stdenv.cc.isGNU '' configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations") ''; diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 21666ed3034e..90318e3e9917 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - configureFlags = if (stdenv.cc.cc.isClang or false) + configureFlags = if stdenv.cc.isClang then [ "--disable-werror" ] else null; CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index 2540d22b8d4d..9616461177e6 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { 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 '' + postPatch = if stdenv.cc.isClang then '' substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" "" '' else null; diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index 7739c3627ec9..37823af12e9a 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # 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 ]; + ++ stdenv.lib.optional stdenv.cc.isClang [ ./optimize.diff ]; nativeBuildInputs = [ autoconf ]; diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix index ff7886d0513a..b35432361581 100644 --- a/pkgs/development/libraries/librevenge/default.nix +++ b/pkgs/development/libraries/librevenge/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { # Clang generates warnings in Boost's header files # -Werror causes these warnings to be interpreted as errors # Simplest solution: disable -Werror - configureFlags = if (stdenv.cc.cc.isClang or false) + configureFlags = if stdenv.cc.isClang then [ "--disable-werror" ] else null; meta = { diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index f824ab864a16..0b0656df4f66 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "120jkda2q58p0n68banh64vsfm3hgqnacagj425d218cr4ycdkyb"; }; - NIX_LDFLAGS = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) "-lssp"; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lssp"; doCheck = true; diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index 14529c6c643b..d50c0c5d69c5 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postInstall = glib.flattenInclude; - patches = stdenv.lib.optional (stdenv.cc.cc.isClang or false) ./fix-clang36.patch; + patches = stdenv.lib.optional stdenv.cc.isClang ./fix-clang36.patch; meta = { homepage = http://pixman.org; diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index 770162c237e4..3951212495d4 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1b0f4wm1qmgcswmixv9mwbp86hbdqxk754hml8cjv5vajvqwdpzv"; }; - sourceRoot = if (stdenv.cc.cc.isClang or false) + sourceRoot = if stdenv.cc.isClang then "astyle/build/clang" else "astyle/build/gcc"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 0965a72c43c7..e7a5bdb1018a 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -80,7 +80,7 @@ in }; libxkbfile = attrs: attrs // { - patches = lib.optional (stdenv.cc.cc.isClang or false) ./libxkbfile-clang36.patch; + patches = lib.optional stdenv.cc.isClang ./libxkbfile-clang36.patch; }; libpciaccess = attrs : attrs // { diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index 930d9f4968b6..c98dc5baea5f 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper }: assert stdenv.isLinux; -assert stdenv.cc.cc.isGNU or false; +assert stdenv.cc.isGNU; let version = "0.7"; debianPatch = fetchurl { diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 1237890f6214..603dd05fc659 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # ./configure time check for any of this. buildInputs = [ libevent openssl zlib torsocks ]; - CFLAGS = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) "-lgcc_s"; + CFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; # Patch 'torify' to point directly to torsocks. patchPhase = '' diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 552023278b6a..de26cc41d744 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ++ optional gnutlsSupport "CRYPTO=GNUTLS" ++ optional opensslSupport "CRYPTO=OPENSSL" ++ optional stdenv.isDarwin "SYS=darwin" - ++ optional (stdenv.cc.cc.isClang or false) "CC=clang"; + ++ optional stdenv.cc.isClang "CC=clang"; buildInputs = [ zlib ] ++ optional gnutlsSupport gnutls From 3e5a0c0034ab68aed388796b2918d50e9d4cee62 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 11 May 2015 14:59:05 -0700 Subject: [PATCH 052/615] pulseaudio: Fix logic --- pkgs/servers/pulseaudio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index df5a26e42c11..1161d73c28f3 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -39,7 +39,7 @@ let optAlsaLib = if libOnly then null else shouldUsePkg alsaLib; optEsound = if libOnly then null else shouldUsePkg esound; optGlib = if libOnly then null else shouldUsePkg glib; - optGtk3 = if libOnly || hasXlibs then null else shouldUsePkg gtk3; + optGtk3 = if libOnly || !hasXlibs then null else shouldUsePkg gtk3; optGconf = if libOnly then null else shouldUsePkg gconf; optAvahi = if libOnly then null else shouldUsePkg avahi; optLibjack2 = if libOnly then null else shouldUsePkg libjack2; From 26c37ded73ce084275d748be26887cf4023c91d6 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 11 May 2015 15:12:38 -0700 Subject: [PATCH 053/615] curl: Improve .pc and .la patching --- pkgs/tools/networking/curl/default.nix | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index f8b3ad9355ad..689dc3d7d5ef 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -103,24 +103,30 @@ stdenv.mkDerivation rec { ]; # Fix all broken refernces to dependencies in .la and .pc files - postInstall = optionalString (optZlib != null) '' - sed -i 's,\(-lz\),-L${optZlib}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} + postInstall = '' + sed -i \ + '' + optionalString (optZlib != null) '' + -e 's,\(-lz\),-L${optZlib}/lib \1,' \ '' + optionalString (optOpenssl != null) '' - sed -i 's,\(-lssl\|-lcrypto\),-L${optOpenssl}/lib \1,' $out/lib/pkgconfig/libcurl.pc + -e 's,\(-lssl\|-lcrypto\),-L${optOpenssl}/lib \1,' \ '' + optionalString (optLibssh2 != null) '' - sed -i 's,\(-lssh2\),-L${optLibssh2}/lib \1,' $out/lib/pkgconfig/libcurl.pc + -e 's,\(-lssh2\),-L${optLibssh2}/lib \1,' \ '' + optionalString (optLibnghttp2 != null) '' - sed -i 's,\(-lnghttp2\),-L${optLibnghttp2}/lib \1,' $out/lib/pkgconfig/libcurl.pc + -e 's,\(-lnghttp2\),-L${optLibnghttp2}/lib \1,' \ '' + optionalString (optC-ares != null) '' - sed -i 's,\(-lcares\),-L${optC-ares}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} + -e 's,\(-lcares\),-L${optC-ares}/lib \1,' \ '' + optionalString (optGss != null) '' - sed -i 's,\(-lgss\),-L${optGss}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} + -e 's,\(-lgss\),-L${optGss}/lib \1,' \ '' + optionalString (optRtmpdump != null) '' - sed -i 's,\(-lrtmp\),-L${optRtmpdump}/lib \1,' $out/lib/pkgconfig/libcurl.pc + -e 's,\(-lrtmp\),-L${optRtmpdump}/lib \1,' \ '' + optionalString (optOpenldap != null) '' - sed -i 's,\(-lgss\),-L${optOpenldap}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} + -e 's,\(-lgss\),-L${optOpenldap}/lib \1,' \ '' + optionalString (optLibidn != null) '' - sed -i 's,\(-lidn\),-L${optLibidn}/lib \1,' $out/lib/pkgconfig/libcurl.pc + -e 's,\(-lidn\),-L${optLibidn}/lib \1,' \ + '' + optionalString (!stdenv.isDarwin) '' + $out/lib/libcurl.la \ + '' + '' + $out/lib/pkgconfig/libcurl.pc ''; meta = { From 0b3af3074ef66724c2083ae0e9c6a0a5567be67a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 11 May 2015 15:14:22 -0700 Subject: [PATCH 054/615] libgcrypt: Fix darwin build --- pkgs/development/libraries/libgcrypt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index bbc625173a95..7d327a499bcc 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # Also make sure includes are fixed for callers who don't use libgpgcrypt-config postInstall = '' sed -i 's,#include ,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/gcrypt.h - '' + stdenv.lib.optionalString (optLibcap != null) '' + '' + stdenv.lib.optionalString (!stdenv.isDarwin && optLibcap != null) '' sed -i 's,\(-lcap\),-L${optLibcap}/lib \1,' $out/lib/libgcrypt.la ''; From 5eda8246a46d885b99eea582ad2165e081f71c92 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 11 May 2015 15:15:04 -0700 Subject: [PATCH 055/615] gss: Fix on darwin --- pkgs/development/libraries/gss/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index 71dd8c78edae..71652e3cae38 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = true; # Fixup .la files - postInstall = stdenv.lib.optionalString (shishi != null) '' + postInstall = stdenv.lib.optionalString (!stdenv.isDarwin && shishi != null) '' sed -i 's,\(-lshishi\),-L${shishi}/lib \1,' $out/lib/libgss.la ''; From 2c9481e0fdea4ce96053d6c0720adbdba21db334 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 11 May 2015 15:18:08 -0700 Subject: [PATCH 056/615] libssh2: Fix for darwin --- pkgs/development/libraries/libssh2/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index dfaee9096206..3434fde1a623 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -55,13 +55,17 @@ stdenv.mkDerivation rec { (mkEnable false "examples-build" null) ]; - postInstall = optionalString (optZlib != null) '' - sed -i 's,\(-lz\),-L${optZlib}/lib \1,' $out/lib/libssh2.la + postInstall = optionalString (!stdenv.isDarwin) ('' + sed -i \ + '' + optionalString (optZlib != null) '' + -e 's,\(-lz\),-L${optZlib}/lib \1,' \ '' + optionalString (cryptoStr == "openssl") '' - sed -i 's,\(-lssl\|-lcrypto\),-L${openssl}/lib \1,' $out/lib/libssh2.la + -e 's,\(-lssl\|-lcrypto\),-L${openssl}/lib \1,' \ '' + optionalString (cryptoStr == "libgcrypt") '' - sed -i 's,\(-lgcrypt\),-L${libgcrypt}/lib \1,' $out/lib/libssh2.la - ''; + -e 's,\(-lgcrypt\),-L${libgcrypt}/lib \1,' \ + '' + '' + $out/lib/libssh2.la + ''); meta = { description = "A client-side C library implementing the SSH2 protocol"; From 430c3e08b47f4adb3202cf137529bcc3f79236f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 12 May 2015 00:34:12 +0200 Subject: [PATCH 057/615] python-SQLAlchemy: the buildInput attributes in the derived expressions are unnecessary --- pkgs/top-level/python-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 623f96d37bcf..92d3a5f52d49 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11866,7 +11866,6 @@ let preConfigure = optionalString isPy3k '' python3 sa2to3.py --no-diffs -w lib test examples ''; - buildInputs = [self.pysqlite]; }; sqlalchemy8 = self.sqlalchemy9.override rec { @@ -11881,7 +11880,6 @@ let preConfigure = optionalString isPy3k '' python3 sa2to3.py --no-diffs -w lib test examples ''; - buildInputs = [self.pysqlite]; }; sqlalchemy9 = buildPythonPackage rec { From bd69c51ddf12d313734e940ee7745c852ad6158b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 11 May 2015 15:03:07 -0700 Subject: [PATCH 058/615] trousers: Fix darwin build --- pkgs/tools/security/trousers/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index 38ff4acc43bd..9d15b16a1885 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lgcc_s"; # Fix broken libtool file - preFixup = '' + preFixup = stdenv.lib.optionalString (!stdenv.isDarwin) '' sed 's,-lcrypto,-L${openssl}/lib -lcrypto,' -i $out/lib/libtspi.la ''; From 1938dc9b54963ecc79c5f74ae502e09235873300 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 11 May 2015 16:27:53 -0700 Subject: [PATCH 059/615] nixos/consul: Remove the joinNodes and joinRetries options as they are now built in consul options --- nixos/modules/services/networking/consul.nix | 37 ++------------------ 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index 5308fd995085..23e5b2f5e7ea 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -6,11 +6,9 @@ let dataDir = "/var/lib/consul"; cfg = config.services.consul; - configOptions = { - data_dir = dataDir; - } - // (if cfg.webUi then { ui_dir = "${pkgs.consul.ui}"; } else { }) - // cfg.extraConfig; + configOptions = { data_dir = dataDir; } // + (if cfg.webUi then { ui_dir = "${pkgs.consul.ui}"; } else { }) // + cfg.extraConfig; configFiles = [ "/etc/consul.json" "/etc/consul-addrs.json" ] ++ cfg.extraConfigFiles; @@ -52,23 +50,6 @@ in ''; }; - joinNodes = mkOption { - type = types.listOf types.str; - default = [ ]; - description = '' - A list of addresses of nodes which should be joined at startup if the - current node is in a left state. - ''; - }; - - joinRetries = mkOption { - type = types.int; - default = 10; - description = '' - The number of times to retry connecting to the join nodes. - ''; - }; - interface = { advertise = mkOption { @@ -219,18 +200,6 @@ in + '' echo "}" >> /etc/consul-addrs.json ''; - postStart = '' - # Issues joins to nodes which we statically connect to - ${flip concatMapStrings cfg.joinNodes (addr: '' - for i in {0..${toString cfg.joinRetries}}; do - # Try to join the other nodes ${toString cfg.joinRetries} times before failing - consul join "${addr}" && break - sleep 1 - done & - '')} - wait - exit 0 - ''; }; systemd.services.consul-alerts = mkIf (cfg.alerts.enable) { From b6e26aa8df5fc37c0d7f9e89f3c2716871697d2d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 11 May 2015 16:45:04 -0700 Subject: [PATCH 060/615] nixos/consul: Support a config directory for health checks --- nixos/modules/services/networking/consul.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index 23e5b2f5e7ea..75e2a6921410 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -144,6 +144,8 @@ in environment = { etc."consul.json".text = builtins.toJSON configOptions; + # We need consul.d to exist for consul to start + etc."consul.d/dummy.json".text = "{ }"; systemPackages = with pkgs; [ consul ]; }; @@ -151,10 +153,12 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ] ++ systemdDevices; bindsTo = systemdDevices; - restartTriggers = [ config.environment.etc."consul.json".source ]; + restartTriggers = [ config.environment.etc."consul.json".source ] + ++ mapAttrsToList (_: d: d.source) + (filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc); serviceConfig = { - ExecStart = "@${pkgs.consul}/bin/consul consul agent" + ExecStart = "@${pkgs.consul}/bin/consul consul agent -config-dir /etc/consul.d" + concatMapStrings (n: " -config-file ${n}") configFiles; ExecReload = "${pkgs.consul}/bin/consul reload"; PermissionsStartOnly = true; From 2806491cc410527aace39395fa521d6df1326967 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 11 May 2015 17:44:07 -0700 Subject: [PATCH 061/615] nixos/consul: Add shell for health checks --- nixos/modules/services/networking/consul.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index 75e2a6921410..53a9f4626254 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -140,6 +140,8 @@ in users.extraUsers."consul" = { description = "Consul agent daemon user"; uid = config.ids.uids.consul; + # The shell is needed for health checks + shell = "/run/current-system/sw/bin/bash"; }; environment = { From 1677b3316249f198a7b3941586861d518b8ebf91 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Mon, 11 May 2015 20:54:17 -0400 Subject: [PATCH 062/615] networkmanager: enable nmtui, the curses interface --- pkgs/tools/networking/network-manager/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index c39d1a9f5ba6..899577c6d19b 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz , udev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables , libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline -, gobjectIntrospection, modemmanager, openresolv, libndp }: +, gobjectIntrospection, modemmanager, openresolv, libndp, newt }: stdenv.mkDerivation rec { name = "network-manager-${version}"; @@ -39,10 +39,11 @@ stdenv.mkDerivation rec { "--with-kernel-firmware-dir=/run/current-system/firmware" "--with-session-tracking=systemd" "--with-modem-manager-1" + "--with-nmtui" ]; buildInputs = [ wirelesstools udev libnl libuuid polkit ppp libndp - xz bluez5 gobjectIntrospection modemmanager readline ]; + xz bluez5 gobjectIntrospection modemmanager readline newt ]; propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ]; From aabee7eb462f606329b38b8293012596caac5639 Mon Sep 17 00:00:00 2001 From: Michel Kuhlmann Date: Mon, 11 May 2015 16:53:28 +0200 Subject: [PATCH 063/615] r-modules: regenerate 2015-05-11T14:48:00+0100 --- pkgs/development/r-modules/cran-packages.nix | 846 +++++++++++-------- pkgs/development/r-modules/default.nix | 3 +- 2 files changed, 475 insertions(+), 374 deletions(-) diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 23cc654d6a51..79770b6a620a 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -6,7 +6,7 @@ { self, derive }: with self; { A3 = derive { name="A3"; version="0.9.2"; sha256="01s7znhph2mr3snpscci3y7nbcisa6kg6hy7im3742r6ah0z3jv7"; depends=[xtable pbapply]; }; ABCExtremes = derive { name="ABCExtremes"; version="1.0"; sha256="032bc9a6cxy4war95n8v4vaax3q96k2wryjbcipi3z55b2l8hdny"; depends=[SpatialExtremes combinat]; }; -ABCanalysis = derive { name="ABCanalysis"; version="1.0"; sha256="0qmy11lv4x1zgbjifpcy2zhkf3ba5a5b4jbiazcqws35j1p3q835"; depends=[Hmisc plotrix]; }; +ABCanalysis = derive { name="ABCanalysis"; version="1.0.1"; sha256="1q1ms76nzg93sf71r0v3d3yx3a8agpccndlv9lz49cr6asa9iwl0"; depends=[Hmisc plotrix]; }; ABCoptim = derive { name="ABCoptim"; version="0.13.11"; sha256="1j2pbfl5g9x71gq9f7vg6wznsds8sn8dj3q2h5fhjcv58di3gjhl"; depends=[]; }; ABCp2 = derive { name="ABCp2"; version="1.1"; sha256="0s0lbwlc8nycm7b8vx0v01f8dmy91r1zqcj9zgrlj7dnpg4cpkml"; depends=[MASS]; }; ACCLMA = derive { name="ACCLMA"; version="1.0"; sha256="1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v"; depends=[]; }; @@ -16,6 +16,7 @@ ACTCD = derive { name="ACTCD"; version="1.0-0"; sha256="0zn8f6l5vmn4w1lqjnpcxvfb ADDT = derive { name="ADDT"; version="1.0"; sha256="1jx7rxi0yfn34pf3cf9zpf434rapgn5qn2mn5rkq5lysr3kwdw91"; depends=[]; }; ADGofTest = derive { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; }; ADM3 = derive { name="ADM3"; version="1.3"; sha256="1hg9wjdhckilqd13dr4cim4j6jsh2sdwm18i3pfmfdj8cyswm3h0"; depends=[]; }; +ADPclust = derive { name="ADPclust"; version="0.6.3"; sha256="0lr4zkjhqr9azqxnxpxp9i0ppn8wi8ndb61ki7h2dzfgv27fingk"; depends=[dplyr cluster fields knitr]; }; AER = derive { name="AER"; version="1.2-3"; sha256="0823zjpl0b7fzhszi28lg1paa41vbxq2xpjil1d4f6dxdysalxlx"; depends=[car lmtest sandwich survival zoo Formula]; }; AFLPsim = derive { name="AFLPsim"; version="0.3-4"; sha256="0xqp1d3cn8rcrsx0yipqh0k4xynv446acxpcammbflsz01xsgx9v"; depends=[adegenet introgress]; }; AGD = derive { name="AGD"; version="0.32"; sha256="1jjkclqylh43vm1bj1g4cml7a84sxdl94kmhxgmk04rdkmgf8c47"; depends=[gamlss gamlss_dist]; }; @@ -38,7 +39,7 @@ AR1seg = derive { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0by ARPobservation = derive { name="ARPobservation"; version="1.1"; sha256="1cdhn11jf1nf03jyvs17ygmjq9pb5rvmyyrq9fp7ifmvcgbkwsms"; depends=[]; }; ARTP = derive { name="ARTP"; version="2.0.4"; sha256="1f6ay9lyaqsc33b0larb8v6imp5adaycya84wif2sg32rv4gx3yl"; depends=[]; }; ARTool = derive { name="ARTool"; version="0.9.3"; sha256="188k3whgm93jm2kpvh711d4l73gickn9iwidz95srwdcdlf9cf1y"; depends=[lme4 car plyr pbkrtest]; }; -ASMap = derive { name="ASMap"; version="0.4"; sha256="0nfycg62y6bq3z11ldkdfgv469k4zw6jl9mv7qlczm8f01dh5r1m"; depends=[qtl gtools fields lattice]; }; +ASMap = derive { name="ASMap"; version="0.4-1"; sha256="0nslmzhf99vl1zkp702xgcrd36xvis45yb5b0hx0mvf4dfv233lm"; depends=[qtl gtools fields lattice]; }; ASPBay = derive { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp Rcpp RcppArmadillo]; }; ATE = derive { name="ATE"; version="0.2.0"; sha256="1i46ivb7q61kq11z9v1rlnwad914nsdjcz9bagqx17vjk160mc0a"; depends=[]; }; ATmet = derive { name="ATmet"; version="1.2"; sha256="047ibxxf5si45zw22zy8a1kpj36q0pd3bsmxwvn0dhf4h65ah0zz"; depends=[DiceDesign lhs metRology msm sensitivity]; }; @@ -68,8 +69,10 @@ AnnotLists = derive { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zc AntWeb = derive { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[rjson plyr assertthat httr leafletR]; }; AnthropMMD = derive { name="AnthropMMD"; version="0.9.9"; sha256="10wn0fkcli5yz3fhngsz8sg1mfllqkvjrpjggd9qynay2zrpiw1n"; depends=[tcltk2]; }; Anthropometry = derive { name="Anthropometry"; version="1.1"; sha256="1yqdps5n07jl05nv7136jwhfndn01vim2kx9s76mk4alvsw7s8ls"; depends=[shapes rgl archetypes nnls depth FNN ICGE cluster biclust]; }; +ApacheLogProcessor = derive { name="ApacheLogProcessor"; version="0.1"; sha256="0wdf9438c5rww0fm5k44ahvivg95vzn3dpnhf4mhpvrjd1am546z"; depends=[foreach doParallel]; }; AppliedPredictiveModeling = derive { name="AppliedPredictiveModeling"; version="1.1-6"; sha256="004d2k3mhl45inb7kx1ph8xc8h9bgm7f7l3prmvqrl5792400cn4"; depends=[CORElearn MASS plyr reshape2]; }; AquaEnv = derive { name="AquaEnv"; version="1.0-3"; sha256="1hkygw09w70im9f6l6q5yxk86mdl5pkczqfqrwc4wl1yhz7z1gjb"; depends=[minpack_lm deSolve]; }; +ArArRedux = derive { name="ArArRedux"; version="0.1"; sha256="1fgll399plraijbh1xrhf1nmc308daqhhsi5krq2lm7q2cn584pc"; depends=[]; }; ArDec = derive { name="ArDec"; version="2.0"; sha256="14niggcq7xlvpdhxhy8j870gb11cpk4rwn9gwsfmcfvh49g58i80"; depends=[]; }; ArfimaMLM = derive { name="ArfimaMLM"; version="1.3"; sha256="0s5igf703zzvagsbdxf5yv4gn0vdq51b7fvbc8xkgvlmv91yy372"; depends=[lme4 fractal fracdiff]; }; ArrayBin = derive { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[]; }; @@ -88,7 +91,7 @@ BAMMtools = derive { name="BAMMtools"; version="2.0.5"; sha256="1xrhif8872w5rwib BANFF = derive { name="BANFF"; version="0.3"; sha256="0z7hwplp12m8sypkndjkjkmanbh67h47k8j9wm60qg6nnyqry9np"; depends=[foreach doParallel DPpackage igraph mclust pscl tmvtnorm network coda]; }; BANOVA = derive { name="BANOVA"; version="0.2"; sha256="1zgn9wxh4c89rris58hhj5fh37mmy8wjvligr02id7a1pcw177m3"; depends=[rjags runjags coda]; }; BASIX = derive { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; }; -BAT = derive { name="BAT"; version="1.2.1"; sha256="073qqx2xmiccf4h7allfavmr2sxhvwc1njnkc0slmyn46nlsk7sl"; depends=[vegan spatstat nls2]; }; +BAT = derive { name="BAT"; version="1.3.0"; sha256="0a8l3hzlgxyp604dg20qm9hvxl97dyh1lm0hj85p6s6nz0qwi8jy"; depends=[vegan spatstat nls2]; }; BAYSTAR = derive { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[mvtnorm coda]; }; BB = derive { name="BB"; version="2014.10-1"; sha256="1lig3vxhyxy8cnic5bczms8pajmdvwr2ijad1rkdndpglving7x0"; depends=[quadprog]; }; BBEST = derive { name="BBEST"; version="0.1-4"; sha256="0yqsz97lljlydhphiy0fb7vwbqxpjzn5v0v665c39dlprxv3jg3b"; depends=[DEoptim wmtsa ggplot2 reshape2 shiny]; }; @@ -99,9 +102,10 @@ BCA = derive { name="BCA"; version="0.9-3"; sha256="0ksd6b0ykydgdn33x29bwwqkrp23 BCBCSF = derive { name="BCBCSF"; version="1.0-0"; sha256="1ag8wz8a9vh1x4jgppimgchfs53rr6hbg5xzzr6k2h4bfsg7pmn3"; depends=[abind]; }; BCDating = derive { name="BCDating"; version="0.9.7"; sha256="0z3a95sc481p0n33mhg7qlsf1jynbm1vbfds0n03bsjrwvqkzpb2"; depends=[]; }; BCE = derive { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; }; -BCEA = derive { name="BCEA"; version="2.1-0"; sha256="120xmgd7ipnrbiyh8h7z80i0bw9iv9rjf8nnb3f988h9bx8xiwp4"; depends=[]; }; +BCEA = derive { name="BCEA"; version="2.1-1"; sha256="1j2zb2icv5b6kwgbjzvidbzvciag89227ina6qcb2m4g6spyxcrm"; depends=[]; }; BCEs0 = derive { name="BCEs0"; version="1.1"; sha256="0q63bkmk0kk9p5d3xb0f5srzfrbr743isyw4v2h9ch5yyxizcizb"; depends=[]; }; -BDgraph = derive { name="BDgraph"; version="2.17"; sha256="03r44x6wvnirw46hq1kjvj12n83l8d9wzdxxivxw6rdi7pvv51yz"; depends=[Matrix igraph]; }; +BCRA = derive { name="BCRA"; version="1.0"; sha256="1bbxh1kf35h31c4k565kk6grdhp5pnn8vr3nr6vnp32dp4pc05zh"; depends=[]; }; +BDgraph = derive { name="BDgraph"; version="2.18"; sha256="08cm4lk587ffrbr57s4krvwgb7fdpnd767g4adnadq0hv0r27xqq"; depends=[Matrix igraph]; }; BEANSP = derive { name="BEANSP"; version="1.0"; sha256="0xcb81pk3iidb3dz9l4hm6cwx8hrbg5qz0sfi59yx2f7nsazr4xk"; depends=[]; }; BEDASSLE = derive { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[MASS matrixcalc emdbook]; }; BEQI2 = derive { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[knitr markdown jsonlite xtable plyr reshape2]; }; @@ -122,7 +126,7 @@ BMN = derive { name="BMN"; version="1.02"; sha256="12gyq01cn6a9ixqgki1ihx5jrp2gw BMS = derive { name="BMS"; version="0.3.3"; sha256="1yj9vi8jvhkwpcjkclf0zbah0dayridklpj65ay6r18fyf4crnd2"; depends=[]; }; BMhyd = derive { name="BMhyd"; version="1.2-2"; sha256="09gb1pq9y3gq9avpaqrlxdsm9iqsxpbnr0bg2mw1vkhc0d5z8zv7"; depends=[corpcor numDeriv]; }; BNDataGenerator = derive { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; }; -BNPTSclust = derive { name="BNPTSclust"; version="1.0"; sha256="04qryrhbhi4qfp9rckw3x0g3292lyfrvphcwgb1p5ig661pxgg7p"; depends=[mvtnorm MASS]; }; +BNPTSclust = derive { name="BNPTSclust"; version="1.1"; sha256="1zmxwg6zn3nqqm1sw2n4pvq47mv7ygb4lf1c6yhn3xaf1rqmf26s"; depends=[mvtnorm MASS]; }; BNPdensity = derive { name="BNPdensity"; version="2013.8"; sha256="1qlhav764ji289kcibbmqjj62mmxiw3zsiwjz1gkifzgpmzyar85"; depends=[]; }; BNSP = derive { name="BNSP"; version="1.0.2"; sha256="0hbrx02mybfrzfab5g7kwi6g68jdzj2dc69zxkn3hpyf4rqwbw4x"; depends=[]; }; BOG = derive { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[hash DIME]; }; @@ -194,6 +198,7 @@ BioStatR = derive { name="BioStatR"; version="2.0.0"; sha256="1k3z337lj8r06xgrqg Biodem = derive { name="Biodem"; version="0.3"; sha256="0wfyypr46awki2nrvhcjwacmaxrr2wvhdv9hddnf10msssflvshc"; depends=[]; }; BiodiversityR = derive { name="BiodiversityR"; version="2.5-2"; sha256="0l23nlibv7wjmkv1jnssaab3iwm2i5wrkzjji2x9rr5131aj82gn"; depends=[vegan Rcmdr]; }; Biograph = derive { name="Biograph"; version="2.0.4"; sha256="1mik5yvbi28xnyzha8p3xjaa064x29wgn18yx766wha7djxxr353"; depends=[etm msm Epi lubridate reshape plyr survival mstate ggplot2]; }; +BivarP = derive { name="BivarP"; version="1.0"; sha256="08f7sphylaj3kximy1avaf29hxj2n800adsnssh01p9bcxnzb2i4"; depends=[dfoptim survival copula]; }; BlakerCI = derive { name="BlakerCI"; version="1.0-4"; sha256="1sa9qq5frjjcw46p3ankn7v3gj0gwn9lww6jacz8flf5qpplhn4l"; depends=[]; }; BlandAltmanLeh = derive { name="BlandAltmanLeh"; version="0.1.0"; sha256="0y35zkxiallp4x09646qb8wj9bayh7mpnjg43qmzhxkm7l95b78r"; depends=[]; }; Blaunet = derive { name="Blaunet"; version="1.0.1"; sha256="1qcp5wag4081pcjg5paryxz3hk3rqql15v891ppqc1injni7rljz"; depends=[network]; }; @@ -238,7 +243,7 @@ CCpop = derive { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk CDFt = derive { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; }; CDLasso = derive { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; }; CDM = derive { name="CDM"; version="4.2-12"; sha256="18ix2l3mlk9vzv7iks16mdi4h0194bfjcvsxmya5219dfmw5vqfz"; depends=[mvtnorm Rcpp psych MASS polycor sfsmisc plyr WrightMap lattice Rcpp RcppArmadillo]; }; -CDNmoney = derive { name="CDNmoney"; version="2012.4-1"; sha256="1bnfsygbzdd70m5s9qq7524b1fybdws46axxjbw9dhwqpr8w85id"; depends=[]; }; +CDNmoney = derive { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; }; CDVine = derive { name="CDVine"; version="1.2"; sha256="1qfjbzdfz2dydkfw3b0jjma4csn62177j5sgzh6rszf0nifsi97g"; depends=[MASS mvtnorm igraph]; }; CEC = derive { name="CEC"; version="0.9.3"; sha256="05cgd281p0hxkni4nqb0d4l71aah3f3s6jxdnzgw8lqxaxz4194i"; depends=[]; }; CEGO = derive { name="CEGO"; version="1.0.1108"; sha256="0klj9g656rnfqhj36r4v8y6mv4cazlzyrvws6yqa0r61abfbxy68"; depends=[MASS DEoptim]; }; @@ -314,6 +319,7 @@ CircNNTSR = derive { name="CircNNTSR"; version="2.1"; sha256="1rl17kw6bl5xf7pgsc CircStats = derive { name="CircStats"; version="0.2-4"; sha256="1f2pf1ppp843raa82s2qxm3xlcv6zpi578zc4pl0d7qyxqnh603s"; depends=[MASS boot]; }; CityPlot = derive { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; }; Ckmeans_1d_dp = derive { name="Ckmeans.1d.dp"; version="3.3.1"; sha256="0gzwcg6f3p1vr30lyniqiq4893kjxri4y2vjzh6qrldnay42kqf9"; depends=[]; }; +Claddis = derive { name="Claddis"; version="0.1"; sha256="1dxsz62x856lpapw5xpvvr2qpyj3j93m9dn07m0bjbpmx0y0bm9c"; depends=[gdata ape phytools strap]; }; ClickClust = derive { name="ClickClust"; version="1.1.4"; sha256="17r8jzhzwqa5h04bxdcyv31jhk6c709sx5m1z53jh3yf9zmkilvi"; depends=[]; }; ClimClass = derive { name="ClimClass"; version="1.0"; sha256="07jl8vwqyyj4q2hav8qbg69yjs73s3kbms5bd9hqs1y938rrp2l5"; depends=[geosphere ggplot2 reshape2]; }; ClueR = derive { name="ClueR"; version="1.0"; sha256="1ak8pgbzm5xrk7pjnkbiqdwyvvyvrm6k6h50ycc86w3zy7fnqhds"; depends=[e1071]; }; @@ -329,7 +335,7 @@ CombinePValue = derive { name="CombinePValue"; version="1.0"; sha256="0mlngyz2nq CommonJavaJars = derive { name="CommonJavaJars"; version="1.0-5"; sha256="0kwf504g1izyy7hxss21dgz26w0spxibdlacrjdh7q10z799hfhh"; depends=[]; }; CommonTrend = derive { name="CommonTrend"; version="0.7-1"; sha256="088pg2hy2g2jgs84xawrnsf7gpvrpqjsimkx7g0i5r5fmkx169f9"; depends=[MASS urca]; }; CommunityCorrelogram = derive { name="CommunityCorrelogram"; version="1.0"; sha256="1wkrm5lil595sc4ih3qsf4sgvfipzlav0n7339ixqw9zxm2pg4nj"; depends=[vegan]; }; -Comp2ROC = derive { name="Comp2ROC"; version="1.0"; sha256="0vymjbxdlvm5dvss4z4zjdc7y7040s3j972gh2138wfygji1szg7"; depends=[ROCR boot]; }; +Comp2ROC = derive { name="Comp2ROC"; version="1.1"; sha256="0vhpw6k9barcx5fl3kw3r7152mcrlpr127i5b70bx64g8g9ffs1v"; depends=[ROCR boot]; }; CompGLM = derive { name="CompGLM"; version="1.0"; sha256="04bjal92r0m7is5ygqpd0mdz3fb3pwcr7rc3mbxg9sg57nff3kf5"; depends=[Rcpp Rcpp]; }; CompLognormal = derive { name="CompLognormal"; version="3.0"; sha256="1dhgr9l713l2n889bpa47lbg2qab0fz0r15qa928c0b9nz688ddm"; depends=[numDeriv]; }; CompQuadForm = derive { name="CompQuadForm"; version="1.4.1"; sha256="1kv4bdkwidkjw0hgn2krv42p9v1a03p47g0p03lja3flhfbmiifj"; depends=[]; }; @@ -351,6 +357,7 @@ CopulaRegression = derive { name="CopulaRegression"; version="0.1-5"; sha256="0d CopyDetect = derive { name="CopyDetect"; version="1.1"; sha256="0h9bf7ay5yr6dwk7q28b6xxfzy6smljkq6qwjkzfscy5hnmwxkpa"; depends=[irtoys]; }; CorReg = derive { name="CorReg"; version="1.0"; sha256="061lb443wydlrgrnrpi9ibrwa0xw328wcyhsx7lndzjrni9mhcbp"; depends=[Rcpp lars Rmixmod elasticnet corrplot Matrix ridge rpart MASS mvtnorm mclust Rcpp RcppEigen]; }; CorrBin = derive { name="CorrBin"; version="1.5"; sha256="1kg8kms76z127j2vmf7v162n0sh2jqylw4i7c35x5sig4q22m9gy"; depends=[boot combinat geepack dirmult mvtnorm]; }; +CorrMixed = derive { name="CorrMixed"; version="0.1-11"; sha256="18n70yx6yysvcn3wsf1zmnp4z2hs3783mr1n0pjp2ph5yd9xk4mg"; depends=[nlme psych]; }; Correlplot = derive { name="Correlplot"; version="1.0-2"; sha256="0prxnbi7ga5d23i0i4qpynfb3zrsgjxam47km6nsj1prakdkrq7w"; depends=[calibrate xtable]; }; CosmoPhotoz = derive { name="CosmoPhotoz"; version="0.1"; sha256="04girid6wvgyrk8ha81mdqjx2mmzifz57l1hzcgrdnzmjmm3vlmp"; depends=[ggplot2 ggthemes arm COUNT gridExtra pcaPP mvtnorm shiny]; }; CountsEPPM = derive { name="CountsEPPM"; version="2.0"; sha256="0bwd2jc8g62xpvnnq759cxhjvip94abbj63yk6n1awlh5hb4ni3b"; depends=[Formula expm numDeriv]; }; @@ -393,12 +400,13 @@ DEoptim = derive { name="DEoptim"; version="2.2-3"; sha256="0pcs7kkhad139c3nhmg7 DEoptimR = derive { name="DEoptimR"; version="1.0-2"; sha256="00viy7x3br3094az635lmjydm826d48vv2f14rwmdhqmv03066kq"; depends=[]; }; DFIT = derive { name="DFIT"; version="1.0-2"; sha256="1kn3av6pnkmf9703yp3cn0zbdzjzxrlm6nbbcg7lwv9550jw2c4n"; depends=[simex mvtnorm ggplot2]; }; DIFlasso = derive { name="DIFlasso"; version="1.0-1"; sha256="048d5x9nzksphsdk9lwfagl165bb40r0pvjq2ihvhqvxspgpar4b"; depends=[grplasso penalized miscTools]; }; +DIFtree = derive { name="DIFtree"; version="1.0.0"; sha256="08s6ba44517xq783fysksb1h53zkqsk7zakaibi1c2npq1gzny9p"; depends=[penalized plotrix]; }; DIME = derive { name="DIME"; version="1.2"; sha256="11l6mk6i3kqphrnq4iwk4b0ridbbpg2pr4pyqaqbsb06ng899xw0"; depends=[]; }; DIRECT = derive { name="DIRECT"; version="1.0"; sha256="129bx45zmd6h7j6ilbzj2hjg4bcdc08dvm2igggi8ajndl1l5q9j"; depends=[]; }; DLMtool = derive { name="DLMtool"; version="1.34"; sha256="0ir1131r408ya235k7syg854bfgsim39hh2k1498n5hrbaa99xfx"; depends=[snowfall boot MASS]; }; DMR = derive { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9y569148qfhy94m319fcpzm"; depends=[magic]; }; DMwR = derive { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[lattice xts quantmod zoo abind rpart class ROCR]; }; -DNAprofiles = derive { name="DNAprofiles"; version="0.2"; sha256="15la7csf45175g4hkfdz41jgbj5njad5d4jwfhpadxkb9v2mgaw4"; depends=[RcppProgress Rcpp bit Rcpp RcppProgress]; }; +DNAprofiles = derive { name="DNAprofiles"; version="0.3.1"; sha256="0chsndrmanb2swmhfan9iz1bzz3jsvk24n7j9fnjxibckmn2fdpv"; depends=[RcppProgress Rcpp bit Rcpp RcppProgress]; }; DNAtools = derive { name="DNAtools"; version="0.1-21"; sha256="1ncx2rmxb0ip804x6xznfv8brjpp518fhnm1653mlrsl3hpzrh88"; depends=[Rsolnp multicool Rcpp Rcpp]; }; DNMF = derive { name="DNMF"; version="1.0"; sha256="0s484hzzvvkqdh4s5cb6znz26wx07f9k7y940ghx3dkdc7rb0hrx"; depends=[]; }; DOBAD = derive { name="DOBAD"; version="1.0.4"; sha256="1hslwgs4q05xm29my5cq6g3vvjc0arvdmlx734wardj9dy29p1v5"; depends=[numDeriv lattice]; }; @@ -414,8 +422,8 @@ DTComPair = derive { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjc DTDA = derive { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2h6jh7sz9jpgbi0p0i80xg8jnn3"; depends=[]; }; DTK = derive { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; }; DTMCPack = derive { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; }; -DTR = derive { name="DTR"; version="1.5"; sha256="1c73ay0j6jkjm4iv32waz3wnn0qy399k1h72l7rwfzpyidnaprvi"; depends=[survival ggplot2 gridExtra aod proto]; }; -DVHmetrics = derive { name="DVHmetrics"; version="0.2"; sha256="04161py13kcj5h5xpd3zpzyr99hjl0x51m8a83l8hm4ip9gpymy1"; depends=[ggplot2 reshape2 shiny KernSmooth markdown]; }; +DTR = derive { name="DTR"; version="1.6"; sha256="186qgrx9alzmj1vdy2yvfqs5xgidmwddm0zgg041s5q992cih36g"; depends=[survival ggplot2 gridExtra aod proto]; }; +DVHmetrics = derive { name="DVHmetrics"; version="0.3"; sha256="1ndrzd5q12kabpk3yj95s24kn7ri61w1h4aa50zw9qb12f5dzc98"; depends=[ggplot2 reshape2 shiny KernSmooth markdown]; }; Daim = derive { name="Daim"; version="1.1.0"; sha256="19s0p3a4db89i169n2jz7lf8r7pdmrksw7m3cp9n275b5h8yjimx"; depends=[rms]; }; DandEFA = derive { name="DandEFA"; version="1.5"; sha256="0d82rjkgqf4w7qg7irlqvzzav1f23i2gmygkbf8jycaa6xhli80d"; depends=[gplots polycor]; }; DatABEL = derive { name="DatABEL"; version="0.9-6"; sha256="1w0w3gwacqrbqjdcngdp44d2gb16pq9grq2f8j2bhbxc4nkx12n1"; depends=[]; }; @@ -433,17 +441,17 @@ Demerelate = derive { name="Demerelate"; version="0.8-1"; sha256="1qngwlzzpd2cmi DendSer = derive { name="DendSer"; version="1.0.1"; sha256="0id6pqx54zjg5bcc7qbxiigx3wyic771xn9n0hbm7yhybz6p3gz9"; depends=[gclus seriation]; }; Density_T_HoldOut = derive { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; }; DepthProc = derive { name="DepthProc"; version="1.0.3"; sha256="0xil3pl33224sizn1wy9x3lcngw017qjl22hfqzss9iy73cmxqnc"; depends=[ggplot2 Rcpp rrcov MASS np lattice sm geometry colorspace Rcpp RcppArmadillo]; }; -Deriv = derive { name="Deriv"; version="3.2"; sha256="025br1w6s7av1qm2jifms23qsyq3hy6842y0k6vgrs2rzdb9iyyb"; depends=[]; }; +Deriv = derive { name="Deriv"; version="3.4"; sha256="03fawwlcc3lxp7y3labbhvhpzcp9yfxhbwq7bq8av1fvq92l4xi6"; depends=[]; }; DescTools = derive { name="DescTools"; version="0.99.10"; sha256="0sfjx1bmp0864l55yj7f0zgf4s9kyi2y1p1dajaaxq8mnclqdfz2"; depends=[manipulate boot mvtnorm]; }; DescribeDisplay = derive { name="DescribeDisplay"; version="0.2.4"; sha256="13npxq1314n4n08j6hbmij7qinl1xrxrgc5hxpbbpbd16d75c7iw"; depends=[proto reshape2 ggplot2 plyr scales GGally]; }; DetMCD = derive { name="DetMCD"; version="0.0.2"; sha256="0z4zs0k8c8gsd2fry984p06l3p17fdyfky8fv9kvypk7xdg52whc"; depends=[robustbase Rcpp RcppEigen]; }; DetSel = derive { name="DetSel"; version="1.0.2"; sha256="0igkccclmjwzk7sl414zlhiykym0qwaz5p76wf4i7yrpjgk7mhl9"; depends=[ash]; }; Devore7 = derive { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[MASS lattice]; }; DiagTest3Grp = derive { name="DiagTest3Grp"; version="1.6"; sha256="04dxyyqv333rkjf2vlfpal59m7klhw6y7qilym6nw78qb1kqqys7"; depends=[car KernSmooth gplots]; }; -DiagrammeR = derive { name="DiagrammeR"; version="0.5"; sha256="1h8j4yahn7w7lf0fsv3rb4zlm3806106n7x23m673cmczqyq7m32"; depends=[htmlwidgets rstudioapi V8]; }; +DiagrammeR = derive { name="DiagrammeR"; version="0.6"; sha256="021i1nvw5airli3392rwz9vq1zxwm2pdlw1y6wqw4968g8yc0k9f"; depends=[htmlwidgets rstudioapi]; }; DiceDesign = derive { name="DiceDesign"; version="1.6"; sha256="1djq7clga3cvpgfycs3zjj106213yhfj9909sqrni70nj1nwdpj9"; depends=[]; }; DiceEval = derive { name="DiceEval"; version="1.3"; sha256="1vp9zwd09cwl3c8066jr9d3w4yic70fvd40r7hsj2y8d0bhiwl82"; depends=[DiceKriging]; }; -DiceKriging = derive { name="DiceKriging"; version="1.5.4"; sha256="09i92jj5qlxr13a3x05aiy3q1z6pxz7ddar6639g4jq87vqq2vd9"; depends=[]; }; +DiceKriging = derive { name="DiceKriging"; version="1.5.5"; sha256="035kbk633v4kfb44wiyb556sayl73c24fc1w09r3f33shqgidzjm"; depends=[]; }; DiceOptim = derive { name="DiceOptim"; version="1.5"; sha256="0ajqn5p7sl9rdj35wy45vmmzxl2d97jgz5wdq6ghdzxq523vfkz3"; depends=[DiceKriging rgenoud MASS lhs mnormt]; }; DiceView = derive { name="DiceView"; version="1.3-1"; sha256="0c7i1jy13d5bj822q1rp0d7gmmfjd00jaah34pnj8fzwyrq404z9"; depends=[DiceKriging DiceEval rgl]; }; DiffCorr = derive { name="DiffCorr"; version="0.4.1"; sha256="1kxp9dbiww086rmvmjvfhbk7jl36dkj88qwii6zg57llf7l5l4hm"; depends=[igraph fdrtool]; }; @@ -485,7 +493,7 @@ EIAdata = derive { name="EIAdata"; version="0.0.3"; sha256="12jgw3vi2fminwa4lszc EILA = derive { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; }; EL = derive { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; }; ELT = derive { name="ELT"; version="1.3"; sha256="0q6gc3npwxqq0hz1ardssv5wfxjnx93pi4l1viqsb0wp2kkfq3w6"; depends=[locfit lattice latticeExtra xlsx]; }; -ELYP = derive { name="ELYP"; version="0.7-1"; sha256="0z0j3s943bs5xmy8x866kiqvflwwfwbh1n8v54g5p6k5wcrgjhd7"; depends=[survival]; }; +ELYP = derive { name="ELYP"; version="0.7-2"; sha256="1aji3b9mixhzc6zv7qksacx328drpi0q7pgv3gi6iazira7lybdy"; depends=[survival]; }; EMA = derive { name="EMA"; version="1.4.4"; sha256="1hqkan9k6ps4qckjrhsgxzham106fm38m5rgayz8i2ji3spvbfca"; depends=[survival xtable heatmap_plus GSA MASS FactoMineR cluster]; }; EMC = derive { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgvynna09xkkpdj21mpml23p6"; depends=[mvtnorm MASS]; }; EMCC = derive { name="EMCC"; version="1.2"; sha256="1qff8yvw7iqdsrqkvwb7m14xh7gcnjcrf8gw00g4j6aq0h0cgk2z"; depends=[MASS mclust EMC]; }; @@ -512,6 +520,7 @@ ESGtoolkit = derive { name="ESGtoolkit"; version="0.1"; sha256="0r09arhsvamdyahi ETAS = derive { name="ETAS"; version="0.0-1"; sha256="1p38ay3vnca8b8wszm66whxap8k58c004l1nlsk7zkynyia0im6c"; depends=[spatstat]; }; ETC = derive { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; }; ETLUtils = derive { name="ETLUtils"; version="1.2"; sha256="0mlfq23v7nl6lslscknk9mdx4dxk8xyc5imnvzlhzhag0k50mqj2"; depends=[ff]; }; +EW = derive { name="EW"; version="1.1"; sha256="0wc3v9qisiikvlp28xhlgsxb92fhkm6vslia6d0vpihyai0p1h1g"; depends=[]; }; EWGoF = derive { name="EWGoF"; version="2.0"; sha256="07kpzaqfd7ihpmh2y5806mz5h64dcajia5v36pp9myl04fvpjapp"; depends=[Rcpp maxLik miscTools Rcpp]; }; EasyABC = derive { name="EasyABC"; version="1.4"; sha256="0v3i7vlx2pnfkcqxka4g7ss8k8zphyx3vq5l0c1b433qp0fnjwf3"; depends=[abc pls mnormt MASS lhs]; }; EasyHTMLReport = derive { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc markdown knitr ggplot2 scales xtable reshape2]; }; @@ -525,8 +534,9 @@ EcoHydRology = derive { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s EcoSimR = derive { name="EcoSimR"; version="0.1.0"; sha256="13ni3vdfahqjyb9xrv7fmnbj5m5n3jwfh1bl9r0bvhi5w72kb7rj"; depends=[MASS]; }; EcoTroph = derive { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; }; EcoVirtual = derive { name="EcoVirtual"; version="0.1"; sha256="1c815kxljk4qhw0zs28w16ggasfyyyb6aggffx1m1q21s63h6c8h"; depends=[]; }; +EffectLiteR = derive { name="EffectLiteR"; version="0.3-3"; sha256="14v5samvkzpiy0gq6lq1vs5jqi084sq1if2sih0lk57qxz2647qh"; depends=[lavaan shiny foreign ggplot2 nnet survey lavaan_survey car]; }; EffectStars = derive { name="EffectStars"; version="1.5"; sha256="0j2jxxxpcsrsjzszz4mfk3892ain3qkswa1dkpsmfsk4zs06g0s4"; depends=[VGAM]; }; -EffectTreat = derive { name="EffectTreat"; version="0.1-1"; sha256="1kcd1ns6m0l88qdz6ch3v85i69kl3z2mlvnlrbcnckyxvhpscy4n"; depends=[]; }; +EffectTreat = derive { name="EffectTreat"; version="0.1-11"; sha256="1ps3jac3wc1v325maf4vx9jkirxbc1dfflr218xbzbgrj0zx9diz"; depends=[]; }; EffectsRelBaseline = derive { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; }; ElemStatLearn = derive { name="ElemStatLearn"; version="2012.04-0"; sha256="107x2mybadqgw03j3yq8ibq3ljs4fpx90chvsirpylqhv77wsabl"; depends=[]; }; EloRating = derive { name="EloRating"; version="0.43"; sha256="0gzpi4qjiqn0lzjwy37pkz6fg7dkp2hv2dfqgzfk32wsj0bswgab"; depends=[zoo]; }; @@ -551,7 +561,7 @@ Eplot = derive { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5 EstCRM = derive { name="EstCRM"; version="1.3"; sha256="0fmnlh0pnprskq01iq3rfassyxq7fywiprvqw0xdlh8yxl3w2c9n"; depends=[Hmisc lattice]; }; EstSimPDMP = derive { name="EstSimPDMP"; version="1.2"; sha256="05gp0gdix4d98111sky8y88p33qr5w4vffkp6mg9klggn37kdj8j"; depends=[]; }; EvCombR = derive { name="EvCombR"; version="0.1-2"; sha256="1f5idjaza91npf64hvcnpgnr72mpb7y6kf91dp57xy9m14k7jx5g"; depends=[]; }; -EvalEst = derive { name="EvalEst"; version="2012.4-1"; sha256="19yn4haxkny9kij0jhkwdbp34c9h2cc5l2n2b14khjhv1msqcfmi"; depends=[setRNG tframe tfplot dse]; }; +EvalEst = derive { name="EvalEst"; version="2015.4-2"; sha256="1jkis39iz3zvi5yfd0arvw7bym6naq45f5cravywg8c37n9v967x"; depends=[tfplot dse setRNG tframe]; }; Evapotranspiration = derive { name="Evapotranspiration"; version="1.5"; sha256="181s9wwil07740n79gz2ar9c1bjxy45v4fyxxkqjmdfly72la542"; depends=[zoo]; }; EvoRAG = derive { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; }; ExPosition = derive { name="ExPosition"; version="2.8.19"; sha256="04s9kk8x6khvnryg6lqdwnyn79860dzrjk8a9jyxgzp94rgalnnz"; depends=[prettyGraphs]; }; @@ -621,7 +631,7 @@ FastRWeb = derive { name="FastRWeb"; version="1.1-0"; sha256="1hiabi7ibp69n5wi5x FatTailsR = derive { name="FatTailsR"; version="1.0-3"; sha256="0r9n18qlr70p6y4v1xv1lxi1lzm9qp29qy4w51chllqjn15kmv7l"; depends=[minpack_lm]; }; FeaLect = derive { name="FeaLect"; version="1.8"; sha256="04vmf89kgn7hh9wzj6b654546d3jvz0zz675xhcd11gjzlsp8pgc"; depends=[lars rms]; }; FeatureHashing = derive { name="FeatureHashing"; version="0.9"; sha256="1xbzmyah22kjrkd7ln1pjzwyn5w0zmhdhs9w1a3p8rjxrwmx6ssf"; depends=[Rcpp Matrix digest magrittr Rcpp digest BH]; }; -FedData = derive { name="FedData"; version="1.0"; sha256="1rg35w0450fsy41i3q1j5zdxsik6r47zryba6878pzc429lrx2sn"; depends=[sp raster rgdal igraph Hmisc]; }; +FedData = derive { name="FedData"; version="1.1.0"; sha256="0s5blfhlizl4lv22lxjhqrwrf10mxgy2cd5z4a9xg05k419q7alr"; depends=[sp rgdal raster RCurl rgeos igraph data_table devtools soilDB]; }; FeedbackTS = derive { name="FeedbackTS"; version="1.3.1"; sha256="1zx64wbl5pzqn69bjhshd3nayxx4wlg7n1zwv7ilh68raxfxnbbx"; depends=[maps mapdata proj4 geoR sp]; }; FieldSim = derive { name="FieldSim"; version="3.2.1"; sha256="1snz2wja3lsgxys0mdlrjjvk5575cyd64mjipafibwcs97bva5x1"; depends=[rgl RColorBrewer]; }; FinAsym = derive { name="FinAsym"; version="1.0"; sha256="0v15ydz4sq9djwcdcfp90mk8l951rry7h91d7asgg53mddbxjj6f"; depends=[]; }; @@ -641,14 +651,14 @@ FluOMatic = derive { name="FluOMatic"; version="1.0"; sha256="06hww6viynisnfiphv Flury = derive { name="Flury"; version="0.1-3"; sha256="105fv9azjkd8bsb9b8ba3gpy3pjnyyyp753qhrd11byp3d0bbxy0"; depends=[]; }; ForIT = derive { name="ForIT"; version="1.0"; sha256="0mi2cw09mbc54s8qwcwxin2na1gfyi60cdssy2ncynma7alq3733"; depends=[]; }; ForImp = derive { name="ForImp"; version="1.0.3"; sha256="0ai4i6q233sdsi8xilpbkxjqdf4pxw93clkdkhcxal6q43rnf7vd"; depends=[homals sampling mvtnorm]; }; -ForeCA = derive { name="ForeCA"; version="0.2.0"; sha256="06p8rcaswl85658w2insfi3qw3ygqdp13zccxn6c2dgj5qxkydpd"; depends=[ifultools MASS sapa]; }; +ForeCA = derive { name="ForeCA"; version="0.2.2"; sha256="1iszhiqn0vg3l2c8cgshk8qir0dqml4jsl942hdsmjm6raxlb6n9"; depends=[ifultools MASS sapa]; }; FormalSeries = derive { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; }; Formula = derive { name="Formula"; version="1.2-1"; sha256="02in5325zzrqbhlygx6s0dinj6ymw845q70y56frqacv25ayzcax"; depends=[]; }; ForwardSearch = derive { name="ForwardSearch"; version="1.0"; sha256="0yd47832piqxzjxgl7bc8pn0c8f7vbgsm9z6894rzyi615kjl70b"; depends=[robustbase]; }; FourScores = derive { name="FourScores"; version="1.0"; sha256="0d21mrl9bzsvhljv7ymiyck508smp66w9qivrb2rp0p803h9yibm"; depends=[]; }; FrF2 = derive { name="FrF2"; version="1.7-1"; sha256="0i9hfx7n0g866imdsmalqzs8v95vx08cz97hi8311v1wc3pqsn1j"; depends=[DoE_base sfsmisc BsMD scatterplot3d igraph]; }; FrF2_catlg128 = derive { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; }; -Frames2 = derive { name="Frames2"; version="0.1.0"; sha256="06rmpp2ckdy42zi65f0xg9x8hgfh8hdx9an53nq3xgpz3vhaxavg"; depends=[sampling]; }; +Frames2 = derive { name="Frames2"; version="0.1.1"; sha256="004h3w5bfnbbxa8yczlcd8m0bc9xq91dg5ph6yql28ivibw24q1l"; depends=[sampling]; }; FreeSortR = derive { name="FreeSortR"; version="1.1"; sha256="03z5wmr88gr6raa2cg7w4j6y5vgxr3g8b8axzhbd7jipswr5x1jf"; depends=[smacof vegan ellipse]; }; FunChisq = derive { name="FunChisq"; version="2.0.2"; sha256="0j767iwf1hr7r532hdkrl9q2xiz997gd3rc7aca18fj743w6ras9"; depends=[Rcpp BH Rcpp RcppClassic]; }; FunCluster = derive { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[Hmisc cluster]; }; @@ -673,13 +683,14 @@ GAR = derive { name="GAR"; version="1.0"; sha256="1278rdln23pl5ay87nb6w15ywdh6ls GAabbreviate = derive { name="GAabbreviate"; version="1.0"; sha256="0c9407i6dq7psw744fpkf190as99fssd9n9k0xbvwif10agm278l"; depends=[GA psych]; }; GB2 = derive { name="GB2"; version="1.2"; sha256="1b5mkgn8c26bmi9ndzsqqp22vxqssy4nya1yysrl5wssjgicpdzs"; depends=[cubature hypergeo laeken numDeriv]; }; GCAI_bias = derive { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; }; -GCD = derive { name="GCD"; version="3.0.4"; sha256="1mrgscbrljfyzxprclyw9rcwlkcnifm15kkkapkv56c5ms2ic2i5"; depends=[sp raster ggplot2]; }; +GCD = derive { name="GCD"; version="3.0.5"; sha256="1ami5xw5xx464pxr9y1z9bb3dvj46vx3wrbh19w4g7sk8yjvh5nl"; depends=[]; }; GCPM = derive { name="GCPM"; version="1.1.1"; sha256="1wm7nmqj88j1pd2s1lvi6z1fizm3q3cl7vbzp88vbhpij4rnk4jl"; depends=[Rcpp RcppProgress Rcpp RcppProgress]; }; +GDAdata = derive { name="GDAdata"; version="0.93"; sha256="13ks97i289rc4i7gpqrifwbj0m9rx8csjhnfg8mad10qmjwz7p8b"; depends=[]; }; GDAtools = derive { name="GDAtools"; version="1.3"; sha256="1av29mllix0az4n85vxh1344j6jmy103hd78ibjwxalm620rp7ns"; depends=[FactoMineR]; }; GDELTtools = derive { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; }; GENEAread = derive { name="GENEAread"; version="1.1.1"; sha256="0c3d76yl8dqclk8zhhgrd6bv6b599vkpbyg3hjspb6npdw6zs6k8"; depends=[bitops]; }; -GENLIB = derive { name="GENLIB"; version="1.0.3"; sha256="0c1x9kjff1071d0jkzjhj9j6syb442r0a4d929daq6j9jcbly4q6"; depends=[Rcpp kinship2 bootstrap Matrix lattice quadprog foreach doParallel Rcpp]; }; -GEOmap = derive { name="GEOmap"; version="2.2-2"; sha256="1kp9sdp51zcz98bk03pknya9g5fhz2i677wgacabq402yjhfgn80"; depends=[RPMG splancs MBA]; }; +GENLIB = derive { name="GENLIB"; version="1.0.4"; sha256="1gl8qsgm9iy57rlajgc47lfxah52jsg7lpj131a6813kj0c639l7"; depends=[Rcpp kinship2 bootstrap Matrix lattice quadprog foreach doParallel Rcpp]; }; +GEOmap = derive { name="GEOmap"; version="2.3-5"; sha256="11sxlijfcswxmry6p9pb4g6prrql0qnqcqc21f72a0jp3k3670nc"; depends=[RPMG splancs fields]; }; GESTr = derive { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[mclust gtools]; }; GEVStableGarch = derive { name="GEVStableGarch"; version="1.0"; sha256="007s7lbfpp1bqnyg08rwarsmkxlx16p4is1k3736fmnri9sfp7z6"; depends=[fGarch fExtremes stabledist skewt Rsolnp]; }; GEVcdn = derive { name="GEVcdn"; version="1.1.3"; sha256="13p6hkdybs8s2i363z2a65yijqarwj9swvy22ljk61shf2nzbk80"; depends=[VGAM]; }; @@ -694,7 +705,7 @@ GISTools = derive { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9c GLDEX = derive { name="GLDEX"; version="2.0.0.2"; sha256="16vy50jgk9b57h9f48097m17zrla6ksmi3wm4z2yadfg81sg8721"; depends=[cluster]; }; GLDreg = derive { name="GLDreg"; version="1.0.2"; sha256="179qjcsfgzcw39gmmwlz9h608cq865kz2lvh76dwgyyn519l3y8g"; depends=[GLDEX]; }; GLSME = derive { name="GLSME"; version="1.0.2"; sha256="1zdqrji8x0f3wjl8bhpbnwdfklihv3ii20iz2y2gsm53yzw7dlwq"; depends=[mvtnorm corpcor]; }; -GMCM = derive { name="GMCM"; version="1.2"; sha256="13nafnj86pg50svqzlicsw0pdps2bnbh1xdd81i9d7hgm1v7nmjp"; depends=[Rcpp Rcpp RcppArmadillo]; }; +GMCM = derive { name="GMCM"; version="1.2.1"; sha256="1s45xmbx64h3sb10py8n444jpxcgsz4pc36cz3zinfq55amf8r6r"; depends=[Rcpp Rcpp RcppArmadillo]; }; GMD = derive { name="GMD"; version="0.3.3"; sha256="0hdya8ai210wxnkfra9bzyswk3gib5fm53fs61rh0nsmg3ysdga6"; depends=[gplots]; }; GMDH = derive { name="GMDH"; version="1.0"; sha256="194bx1gg0d50fq9002ga8lwx288csfk5vfr1qwkn886wiw97wl9n"; depends=[MASS]; }; GMMBoost = derive { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[minqa magic]; }; @@ -708,6 +719,7 @@ GPFDA = derive { name="GPFDA"; version="2.2"; sha256="1xqk03g8b8hi1vdqh6a9wml8ln GPLTR = derive { name="GPLTR"; version="1.1"; sha256="0yp4b3ddvcd6s7rjpbmszl3a0x8qq6s138jjkm135yvbgp1jk5jz"; depends=[rpart]; }; GPareto = derive { name="GPareto"; version="1.0.0"; sha256="0mzrl4xs7f5rkx0m4lkqy1456dnsa232hprmbg3bpris1rla780b"; depends=[DiceKriging emoa Rcpp rgenoud pbivnorm pso randtoolbox KrigInv MASS Rcpp]; }; GPfit = derive { name="GPfit"; version="1.0-0"; sha256="0g0g343ncqsqh88qq9qrf4xv5n3sa980kqbvklcx534dmn6a7n2i"; depends=[lhs lattice]; }; +GPlab = derive { name="GPlab"; version="0.1.0"; sha256="05lp5hm5f9pwqcw88x2206babb8yd0nw5smsd6j555qikx8nv88i"; depends=[Rcpp testthat MASS numDeriv Rcpp]; }; GPseq = derive { name="GPseq"; version="0.5"; sha256="0k5xif44qk2ppvcyja16xshmfciq1h84l1w6d8dfkyryfajbc8ai"; depends=[]; }; GPvam = derive { name="GPvam"; version="3.0-2"; sha256="160j0zwbcmvzvia1b5p5midf395xfv1frk2w6w3v2zpbn8h6pdz5"; depends=[Rcpp RcppArmadillo Matrix numDeriv Rcpp RcppArmadillo]; }; GRTo = derive { name="GRTo"; version="1.2"; sha256="0x65g8a39vrb8m3hqajxi0ksmdavz0p6mlamqprkdn9p6ikf5c73"; depends=[bootstrap]; }; @@ -715,17 +727,18 @@ GRaF = derive { name="GRaF"; version="0.1-12"; sha256="1d7mr2z49v6ch4jbzh0dj2yjy GSA = derive { name="GSA"; version="1.03"; sha256="1h1sbpn1rrdh44w4fx2avc7x24ba40mvpd8b2x5wfrc7a294zf6z"; depends=[]; }; GSAgm = derive { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[survival]; }; GSE = derive { name="GSE"; version="3.1"; sha256="08xr7w6dsmgs3l8ayihadcvwy0xdzn78fllxa42sk7nfz6waadr3"; depends=[Rcpp MASS ggplot2 Rcpp RcppArmadillo]; }; -GSIF = derive { name="GSIF"; version="0.4-4"; sha256="1z1wa8vlm12dfbidr09zsw98a47jyji9hm0yiplpz593x5c75dji"; depends=[sp RSAGA dismo rgdal raster aqp plotKML gstat plyr]; }; +GSIF = derive { name="GSIF"; version="0.4-5"; sha256="041w4jvg7cwf90l03wl0jff24vf3lkzm3xqvl15117piix82lsf4"; depends=[sp RSAGA dismo rgdal raster aqp plotKML gstat plyr]; }; GSM = derive { name="GSM"; version="1.3.1"; sha256="1ay6znw31qnhz5k6fa0aiccr2xxmnj7v3vzrvlk6y5v5smlvybd0"; depends=[gtools]; }; GUIDE = derive { name="GUIDE"; version="1.0.9"; sha256="1y0y6rwv1khd9bdaz5rl9nmxiangx0jckgihg16wb6hx6kf8kzc1"; depends=[rpanel tkrplot]; }; -GUILDS = derive { name="GUILDS"; version="1.2"; sha256="0nirrbq8z7axnrgwbykv5886yf3akf64zynza8l2m96nvzlkzf4y"; depends=[Rcpp pracma subplex Rcpp]; }; +GUILDS = derive { name="GUILDS"; version="1.2.1"; sha256="1z90qjgrx16yk956phbifcr7jd3w59h7akzz7p6g5ymrcjzih4qf"; depends=[Rcpp pracma subplex Rcpp]; }; GUIProfiler = derive { name="GUIProfiler"; version="0.1.2"; sha256="1k56clda6xr649xfacnigi3c2s7ih1whchwcfqm7aa2d44vv3axz"; depends=[Nozzle_R1 MASS]; }; -GUTS = derive { name="GUTS"; version="0.5.2"; sha256="13i3653364lqw53wjc4va139yd78kplkchv1r95c9j9kzd0dvx36"; depends=[Rcpp Rcpp BH]; }; +GUTS = derive { name="GUTS"; version="0.9.1"; sha256="1rxgvhpy8ss2a5vaidv1ay3rvq3msv7hv3rcyykmdxj34nvz19bb"; depends=[Rcpp Rcpp BH]; }; GUniFrac = derive { name="GUniFrac"; version="1.0"; sha256="0xr68yv3h2lwn7sxy8l5p9g1z3q9hihg9jamsyl70jj9b2ic80jn"; depends=[vegan ape]; }; GWAF = derive { name="GWAF"; version="2.2"; sha256="11lk1dy24y1d0biihy2aypdvlx569lw1pfjs51m54rhgpwzkw6yd"; depends=[geepack coxme lme4]; }; GWASExactHW = derive { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; }; GWG = derive { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; }; -GWRM = derive { name="GWRM"; version="1.1"; sha256="1l8rw2nksd1vskjb7kjn93vgrs39bcrr8zz1j66rmkcc399pf6nf"; depends=[]; }; +GWLelast = derive { name="GWLelast"; version="1.1"; sha256="0c3mcvmvxvgibja6rb8j2mhmmjny825wgvi1dw0pz8pq1kg1q0ay"; depends=[doParallel geosphere sp spgwr glmnet foreach]; }; +GWRM = derive { name="GWRM"; version="2.0"; sha256="1dfrwxr12dn6i39mv6i3j6k341f9rvd76skh0350jn6zx1cdkj9k"; depends=[SuppDists]; }; GWmodel = derive { name="GWmodel"; version="1.2-5"; sha256="14pp1hy4bqr6kg9fy9nchjm6kb3l85f58rl2449b7wv7vsk3yfvk"; depends=[maptools robustbase sp]; }; GWsignif = derive { name="GWsignif"; version="1.0"; sha256="04663qgy3xmijrx8m1s5ql7zj70mgsd58dl08ci742l1fzmfya5f"; depends=[]; }; GaDiFPT = derive { name="GaDiFPT"; version="1.0"; sha256="15fnj1w30h0zdj032f3js0bbb1qlyk4b54a4aclykwzicqdgalkg"; depends=[]; }; @@ -759,6 +772,7 @@ GibbsACOV = derive { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527 GillespieSSA = derive { name="GillespieSSA"; version="0.5-4"; sha256="0bs16g8vm9yrv74g94lj8fdfmf1rjj0f04lcnaya7gyak3jhk36q"; depends=[]; }; Giza = derive { name="Giza"; version="1.0"; sha256="13nkm8mk1v7s85kmp6psvnr1v97vi0gid8rsqyq3x6046pyl5z6v"; depends=[reshape lattice lattice]; }; GlobalDeviance = derive { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; }; +GlobalFit = derive { name="GlobalFit"; version="1.0"; sha256="0cx4jpr5yhjdqbvnswqjwx7542mnmk73dy99klwg8bsz0c36ii5k"; depends=[sybil]; }; GlobalOptions = derive { name="GlobalOptions"; version="0.0.6"; sha256="0g10zf3hn4ns7faffqzc9xbscz9p84vcqhlg4jp9jl063ma2pvqm"; depends=[]; }; Gmisc = derive { name="Gmisc"; version="1.1"; sha256="1dcnnsjxap50zfx984rxgksjcvqgbb9zxxd03186h4669slh1d0d"; depends=[Rcpp htmlTable lattice Hmisc forestplot abind knitr magrittr Rcpp]; }; GoFKernel = derive { name="GoFKernel"; version="2.0-5"; sha256="030gcj608nkalscjqs2ad73pwhk4gp5gl1lvm4mc9b39jhki0r70"; depends=[KernSmooth]; }; @@ -831,7 +845,7 @@ HistDAWass = derive { name="HistDAWass"; version="0.1.2"; sha256="16c4b9nfl6rbca HistData = derive { name="HistData"; version="0.7-5"; sha256="17s64hfs7r77p0wjzpbgz9wp3gjzbly2d0v784f9m2bka8gj6xhr"; depends=[]; }; HistogramTools = derive { name="HistogramTools"; version="0.3.1"; sha256="0cc3saly5q2kn1gr2mam7g901ddcipmlrn1m0amgrnbkakby2320"; depends=[Hmisc ash stringr]; }; HiveR = derive { name="HiveR"; version="0.2-28"; sha256="1zz1cg7cf4yyv1bymqlyh50nzj5lgdv4clzm0l2vladcxzjvgk8c"; depends=[RColorBrewer plyr jpeg png rgl xtable tkrgl]; }; -Hmisc = derive { name="Hmisc"; version="3.15-0"; sha256="0i2k64yji4c3sicfa89af220hz48hz74dqjfqdjs0417nzs5sn8q"; depends=[lattice survival Formula ggplot2 proto scales latticeExtra cluster rpart nnet acepack foreign]; }; +Hmisc = derive { name="Hmisc"; version="3.16-0"; sha256="03d372bld4mikyrvmfw00ljiz6jf7szkmhrlgxs5vqk3v81kkp2f"; depends=[lattice survival Formula ggplot2 proto scales latticeExtra cluster rpart nnet acepack foreign gtable gridExtra]; }; Holidays = derive { name="Holidays"; version="1.0-6"; sha256="031vddjf7s3pirv041y2mw694db63gjajlbczmmya8b1zp2f3vzk"; depends=[TimeWarp]; }; HomoPolymer = derive { name="HomoPolymer"; version="1.0"; sha256="1bxc33dx9y9rr9aii4vn9d1j9v5pd4c0xayfdldz8d9m2010xr4a"; depends=[RGtk2 MenuCollection deSolve]; }; HotDeckImputation = derive { name="HotDeckImputation"; version="1.0.0"; sha256="0zb02wcpq09lr7lr4wcgrbw9x7jcvhi34g7f4s6h88zz7xg9daw5"; depends=[Rglpk]; }; @@ -890,7 +904,7 @@ InteractiveIGraph = derive { name="InteractiveIGraph"; version="1.0.6.1"; sha256 Interatrix = derive { name="Interatrix"; version="1.0"; sha256="1lkkjckxc0fc8hg1livgzrgphqwcp53cib0r0vii5jp4zkcna595"; depends=[MASS tkrplot]; }; Interpol = derive { name="Interpol"; version="1.3.1"; sha256="1598lnnrcxihxysdljphqxig15fd8z7linw9byjmqypwcpk6r5jn"; depends=[]; }; Interpol_T = derive { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[date chron]; }; -InvariantCausalPrediction = derive { name="InvariantCausalPrediction"; version="0.3-1"; sha256="0j2zy3dwb8p16akl2iq3b1200blb7nd28xdjdzf429b69gc01lin"; depends=[glmnet mboost jointDiag]; }; +InvariantCausalPrediction = derive { name="InvariantCausalPrediction"; version="0.3-2"; sha256="09s6jwcb6wyi6p1nqxvyfvv4140fq6svfv7w681nk8g57xlgc1h1"; depends=[glmnet mboost jointDiag]; }; InventorymodelPackage = derive { name="InventorymodelPackage"; version="1.0.2"; sha256="1w35idsagl9v93ci3qmal3xbf11sy6h1k7xnv25c59ivfnpjpkva"; depends=[e1071]; }; IsingFit = derive { name="IsingFit"; version="0.3.0"; sha256="0imgj3g6sankzmycjkzzz3bgai3jjycgsinhs5zy9k4vgqjg27d6"; depends=[qgraph Matrix glmnet]; }; IsingSampler = derive { name="IsingSampler"; version="0.2"; sha256="16vwb5pcqjvvsk9wsgj10mzhgh72iz1q6n8nmkva6y1l7xv54c8w"; depends=[Rcpp plyr magrittr nnet Rcpp]; }; @@ -905,7 +919,7 @@ JBTools = derive { name="JBTools"; version="0.7.2.6"; sha256="1wpkv8841kzpw2iqac JGL = derive { name="JGL"; version="2.3"; sha256="1351iq547ln06nklrgx192dqlfnn03hkwj3hrliqzfbmsls098qc"; depends=[igraph]; }; JGR = derive { name="JGR"; version="1.7-16"; sha256="0iv659mjsv7apzpzvmq23w514h6yq50hi70ym7jrv948qrzh64pg"; depends=[rJava JavaGD iplots]; }; JM = derive { name="JM"; version="1.3-0"; sha256="0yn33dvy9kp7xaxlqk11f86qaichdcxpmq04gpnbcs8w8cdjjz3m"; depends=[MASS nlme survival]; }; -JMbayes = derive { name="JMbayes"; version="0.7-0"; sha256="03cm3h2f4m96bhpgk53c4g5mpypc3b6s63srlyrx8ndwgx0aqzf3"; depends=[MASS nlme survival]; }; +JMbayes = derive { name="JMbayes"; version="0.7-2"; sha256="087brgljj158my1xc0vmbjkh4hqr0509zf8j4fq1b9lj52z7rdl5"; depends=[MASS nlme survival]; }; JMdesign = derive { name="JMdesign"; version="1.1"; sha256="0w5nzhp82g0k7j5704fif16sf95rpckd76jjz9fbd71pp2d80vlh"; depends=[]; }; JOP = derive { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[Rsolnp dglm]; }; JPSurv = derive { name="JPSurv"; version="1.0.1"; sha256="11hfji0nyfmw1d7y2cijpp7ivlv5s9k8g771kmgwy14wflkyf7g2"; depends=[]; }; @@ -918,7 +932,7 @@ JointRegBC = derive { name="JointRegBC"; version="0.1.1"; sha256="0w7ygs3pvlqkkb Julia = derive { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; }; KANT = derive { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[]; }; KATforDCEMRI = derive { name="KATforDCEMRI"; version="0.740"; sha256="1k8fihd9m26k14rvc5d5x0d9xc3mh8d49hs64p55np1acqfhg2sy"; depends=[locfit R_matlab matlab]; }; -KFAS = derive { name="KFAS"; version="1.0.4-1"; sha256="0s9mrqb1mvs77z57hx734kajbyqddcc9j20wrsmrbf8g97in61s7"; depends=[]; }; +KFAS = derive { name="KFAS"; version="1.1.1"; sha256="16r86kcx5av11j1p0dad8qvcj4dszh3kvcy8zp7kaw247kjvr3pv"; depends=[]; }; KFKSDS = derive { name="KFKSDS"; version="1.6"; sha256="1g11f936p554bfxlm4slxhfxki5vqkks1mrbqw4w83v2rcb50f8d"; depends=[]; }; KMDA = derive { name="KMDA"; version="1.0"; sha256="0x4kjjdd59wvgg699vrj99wqg3s1qbkbskis1c34xv9b8bzcv94j"; depends=[]; }; KMsurv = derive { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; }; @@ -930,7 +944,7 @@ KappaV = derive { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb66 Kendall = derive { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; }; KernSmooth = derive { name="KernSmooth"; version="2.23-14"; sha256="1dl22pncdlrlysmny0q89yg1s6iafdh75dh31l2hjy16gzlrbhk0"; depends=[]; }; KernSmoothIRT = derive { name="KernSmoothIRT"; version="6.1"; sha256="1hq4sykddh9sg24qrnccii89nqxmq7hnldhn8wl6y62aj0h1nrqm"; depends=[Rcpp plotrix rgl Rcpp]; }; -Kernelheaping = derive { name="Kernelheaping"; version="0.2"; sha256="1063ic6bgnppgh0cpbva5rdrd6kp7z5znkcf7xc3987ywnymsb30"; depends=[plyr evmix MASS]; }; +Kernelheaping = derive { name="Kernelheaping"; version="0.5"; sha256="02hvb1w7z04nn44czxkkg7g1c1fyq0ki0v4shrpi5akwaac30dgj"; depends=[plyr evmix MASS corpcor]; }; Kmisc = derive { name="Kmisc"; version="0.5.0"; sha256="0pbj3gf0bxkzczl6k4vgnxdss2wmsffqvcf73zjwvzvr8ibi5d95"; depends=[Rcpp data_table lattice knitr markdown Rcpp]; }; KoNLP = derive { name="KoNLP"; version="0.76.9"; sha256="1q72irl4izb7f5bb99plpqnmpfdq4x4ymp4wm2bsyfjcxm649ya8"; depends=[rJava stringr hash tau Sejong]; }; Kpart = derive { name="Kpart"; version="1.1"; sha256="1cyml48i1jvwy4xzymijwraqpnssnkrd81q3m7nyjd5m2czjvihv"; depends=[leaps]; }; @@ -955,7 +969,7 @@ LIHNPSD = derive { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh0 LIM = derive { name="LIM"; version="1.4.6"; sha256="03x1gnm06bw1wrzc01110bjzd2mvjdzbc2mbrazh22jrmb32w5d8"; depends=[limSolve diagram]; }; LINselect = derive { name="LINselect"; version="0.0-1"; sha256="1n6nsspdp1ig8v9bclyga072hxqj2hb9n1smrqia8jrma07yaydl"; depends=[]; }; LIStest = derive { name="LIStest"; version="2.1"; sha256="1gk253v3f1jcr4z5ps8nrqf1n7isjhbynxsi9jq729w7h725806a"; depends=[]; }; -LLSR = derive { name="LLSR"; version="0.0.1.9015"; sha256="1dmk7km1qbc9m90qh8dp95g44jxqhvama9svzyh7vqxpww2hs9sb"; depends=[rootSolve]; }; +LLSR = derive { name="LLSR"; version="0.0.1.9225"; sha256="0jn1svnzn89d55hal64fadhv5bmrc37g4qz3pmcd196s5frvyhai"; depends=[rootSolve XLConnect digest]; }; LMERConvenienceFunctions = derive { name="LMERConvenienceFunctions"; version="2.10"; sha256="08jz0i7sv7gn3bqckphbmnx0kc6yjnfvi06iyf7pcdzjaybxhj06"; depends=[Matrix lme4 LCFdata rgl fields mgcv]; }; LMest = derive { name="LMest"; version="2.1"; sha256="1jbwbmamgxbbipzdpjmr7l9csydx55by4zd9h13lnaibdxr4xn5q"; depends=[MASS MultiLCIRT]; }; LOGICOIL = derive { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; }; @@ -967,7 +981,7 @@ LPTime = derive { name="LPTime"; version="1.0-2"; sha256="08lb6884kj9pg12mzx67fd LPmerge = derive { name="LPmerge"; version="1.6"; sha256="0xc06s2p7n151lzrp0dcrrxk8zmd816dc7qbnbcail5c1bhvdqhd"; depends=[Rglpk Matrix]; }; LS2W = derive { name="LS2W"; version="1.3-3"; sha256="0pdsv7ld0j116rh94m5y1i2mwrzc80fqxmc6ykc51i1sj6ws3i5k"; depends=[wavethresh]; }; LS2Wstat = derive { name="LS2Wstat"; version="2.0-3"; sha256="0wkh1a6xbp3qg5favxsj166jcgdza16zki675gswxckana6s4is7"; depends=[LS2W matrixStats geoR RandomFields spdep]; }; -LSAfun = derive { name="LSAfun"; version="0.3.2"; sha256="1pxa3paq7kq07h3a14hdkx4s3g3dq4wn2q5nvp1083gg0zk0fpgh"; depends=[lsa rgl]; }; +LSAfun = derive { name="LSAfun"; version="0.4"; sha256="178lbk5f2vjcpxand15l1dlqf77zkxap22i9lid5db1bmqh9rpk9"; depends=[lsa rgl]; }; LSC = derive { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[LICORS RColorBrewer fields gam Matrix]; }; LSD = derive { name="LSD"; version="3.0"; sha256="069p33aw6iwikp82b7b8wa77wlyjqwr4hcwvrgaxgwqdgn6jjg3k"; depends=[]; }; LSMonteCarlo = derive { name="LSMonteCarlo"; version="1.0"; sha256="0w5042phkba5dw92r67ppp2s4khjpw5mm701dh9dya9lhj88bz6s"; depends=[mvtnorm fBasics]; }; @@ -979,20 +993,21 @@ LaF = derive { name="LaF"; version="0.6.2"; sha256="180xsqilpkql8my0dimsxj1kpmb3 Lahman = derive { name="Lahman"; version="3.0-1"; sha256="0w7vp3vjxhigyyqmmka4bw5v4pp5z3jzmf0krq8biwzrpx5qp86x"; depends=[]; }; LakeMetabolizer = derive { name="LakeMetabolizer"; version="1.3.1"; sha256="1k764w8f30jfz1xkq9xjm9rwfdll5kp7jv3zc4932ck8cgqam3jv"; depends=[rLakeAnalyzer plyr]; }; Lambda4 = derive { name="Lambda4"; version="3.0"; sha256="04ikkflfr0nmy1gr3gfldlh2v8mpl82k1wwnzp57d2kn75m9vbxz"; depends=[]; }; -LambertW = derive { name="LambertW"; version="0.5"; sha256="19xkm27015q552g1c1j9bsckg4z4jb0avzxs2vs6hscyf5vh41zr"; depends=[moments MASS gsl]; }; +LambertW = derive { name="LambertW"; version="0.5.1"; sha256="0mhw748nkikaq96azps7yyzkz5glibhb8rh6f748vj9lrq3wa5mn"; depends=[moments MASS gsl]; }; Laterality = derive { name="Laterality"; version="0.9.3"; sha256="0pl5bfbkzhgxjjzzh99s6rh4jsq0pbcgc902i0z2lmmivgs5qmd6"; depends=[ade4]; }; LatticeKrig = derive { name="LatticeKrig"; version="3.4"; sha256="0qa16sxzj40nk4kmzcb7n4xxn7bqlkx7ar66qpqvh2dvcvi1d70d"; depends=[spam fields]; }; LeLogicielR = derive { name="LeLogicielR"; version="1.2"; sha256="0h52pzrksi1mn55mnxbfi61hl7x61cnkhp450slfrk68f6kp30x6"; depends=[xtable RColorBrewer gdata IndependenceTests]; }; LeafAngle = derive { name="LeafAngle"; version="1.2-1"; sha256="0g3i5300f3rvjz7g7z8s5n8xdcsp41gf1vnr4g36m1likddfpxlx"; depends=[]; }; -LeafArea = derive { name="LeafArea"; version="0.0.6"; sha256="0n5znjxs1ixnlzx248jkhjpglzvb3wzxaqng9vi02smwlwaszvwn"; depends=[]; }; +LeafArea = derive { name="LeafArea"; version="0.1.0"; sha256="0gl31iv1pqb9w352h70y4x57dgfs4v15391fyhsc221803hk2fdn"; depends=[]; }; LearnBayes = derive { name="LearnBayes"; version="2.15"; sha256="0cz2rgqy1cmdz2h1qbdvfqxmmdzmg2z1scdlxr7k385anha13ja5"; depends=[]; }; LiblineaR = derive { name="LiblineaR"; version="1.94-2"; sha256="11q3xydd4navpfcy9yx0fld8ixb6nvnkc7qxwrhvackiy810q86i"; depends=[]; }; LifeTables = derive { name="LifeTables"; version="0.2"; sha256="1n4mqypxm0rbi77ykpr6bpzxfxvq8mm9bmfvcqz7k3ajb78cdr0d"; depends=[mclust]; }; LinCal = derive { name="LinCal"; version="1.0"; sha256="1xr9jnna20hh78dh9wjg70jm8fhaxvdwql894kdp0y5h4pchkdph"; depends=[]; }; -LinRegInteractive = derive { name="LinRegInteractive"; version="0.3-0"; sha256="0yk5ys8rc8ilxrbdkf1kmqpkny66lcm47fbip90m0n83v21f1jkk"; depends=[rpanel xtable]; }; -LindenmayeR = derive { name="LindenmayeR"; version="0.1-0"; sha256="0pkb6wgbn2iqszq4zr088x90k16jkk0r8pzmfpvzxv6k3m2lrv87"; depends=[stringr]; }; +LinRegInteractive = derive { name="LinRegInteractive"; version="0.3-1"; sha256="0w7s3i6i2wnydh88l8lnzrh6w5zqkcwvms91iizis0mwd9af2jdl"; depends=[rpanel xtable]; }; +LindenmayeR = derive { name="LindenmayeR"; version="0.1.4"; sha256="05aq7qmzb7a6kw24pwlg78ch17y945ggrxqn7l2rypn1vfm0br9x"; depends=[stringr]; }; LinearizedSVR = derive { name="LinearizedSVR"; version="1.3"; sha256="0h3xmlnd5x37r5hdhcz90z5n1hsbr2ci3m939i89p1x9644i2l5g"; depends=[kernlab LiblineaR expectreg]; }; Lmoments = derive { name="Lmoments"; version="1.1-6"; sha256="0jffnlamll5mwxrfqrb1qr8kjcn40y57kzd10kkm98vzfjcwg4y4"; depends=[]; }; +LocFDRPois = derive { name="LocFDRPois"; version="1.0.0"; sha256="0zzdp9wgwr6wn3grimghpj4vq34x37c8bqg8acfzlzih8frqal3r"; depends=[dplyr ggplot2]; }; Lock5Data = derive { name="Lock5Data"; version="2.6"; sha256="0ckaac00ck5vyv0gv25l1zhgkm3char6ks1p4fl3vdl5gdyrc1pp"; depends=[]; }; LogConcDEAD = derive { name="LogConcDEAD"; version="1.5-9"; sha256="135vkp70q6gn75ds43aq08y13vrsgsgykssmnhrh6545i86vmhhi"; depends=[MASS mvtnorm]; }; LogicForest = derive { name="LogicForest"; version="2.1.0"; sha256="0zdyyi6wka0568414f1kw91rx04y76n1k11wxd4r8svb5wybjhp5"; depends=[LogicReg CircStats gtools plotrix]; }; @@ -1002,10 +1017,10 @@ LogitNet = derive { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24 LogrankA = derive { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; }; LoopAnalyst = derive { name="LoopAnalyst"; version="1.2-3"; sha256="0xbiy1xa2c6acfrzh6p9pa6wrds8ipskxq0f86ia9g5zkp1rjk2j"; depends=[nlme]; }; LowRankQP = derive { name="LowRankQP"; version="1.0.2"; sha256="0is7v4cy4w1g3wn4wa32iqv4awd1nwvfcb71b3yk5wj59lpm8gs3"; depends=[]; }; -Luminescence = derive { name="Luminescence"; version="0.4.2"; sha256="042dpx26yqfsaqpqnz0bss7w9w2prhxrggpzapxmjl50sy39ziwk"; depends=[XML shape rgl matrixStats raster sp zoo bbmle data_table Rcpp Rcpp]; }; +Luminescence = derive { name="Luminescence"; version="0.4.3"; sha256="11nrgi403ryjj7y1p995fxcyqz117qawyharv1yad8f33l610d5m"; depends=[XML shape rgl matrixStats raster sp zoo bbmle data_table Rcpp minpack_lm Rcpp]; }; M3 = derive { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[ncdf4 rgdal maps mapdata]; }; MADAM = derive { name="MADAM"; version="1.2.2"; sha256="09w5liqa3mpkbyvkwlabcgyg2b4316qpzq7pbpl0wxl74bsh76vq"; depends=[]; }; -MAINT_Data = derive { name="MAINT.Data"; version="0.3"; sha256="1qh7kdcnwfibzyhr53inqjz61srbpypcqjri60zdl32jpf109vng"; depends=[MASS miscTools]; }; +MAINT_Data = derive { name="MAINT.Data"; version="0.4"; sha256="0338q1yh7b0mbnmh3rbli8vq0fzxyx4qxx0143p615ahsf68jw1c"; depends=[]; }; MALDIquant = derive { name="MALDIquant"; version="1.11"; sha256="1jnpmv44j9zry64wvnv37hcda61570hypnv16z99arjazpi4nzmn"; depends=[]; }; MALDIquantForeign = derive { name="MALDIquantForeign"; version="0.9"; sha256="0bs6frqz462hrad16kjvbmq2s66bv3kpriav4hdz5a4klra389gl"; depends=[MALDIquant base64enc digest downloader readBrukerFlexData readMzXmlData XML]; }; MAMA = derive { name="MAMA"; version="2.2.1"; sha256="1dcyfir6jv28jzvphiqrjns3jh2zg2201iwcvjzbmddl2isk9h0i"; depends=[metaMA xtable gtools xtable]; }; @@ -1018,9 +1033,9 @@ MARSS = derive { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z MASS = derive { name="MASS"; version="7.3-40"; sha256="05mmbhswp5dqjd2c6v9w1z1710sm46d53j3prq8maj6bc9qr634y"; depends=[]; }; MASSTIMATE = derive { name="MASSTIMATE"; version="1.2"; sha256="1j9l8b5d518ag9ivzr1z4dd2m23y2ia1wdshx1krmshn8xsd6lwp"; depends=[]; }; MAT = derive { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp Rcpp RcppArmadillo]; }; -MATA = derive { name="MATA"; version="0.2"; sha256="0jmsgis1jkyqywa4i5rq5inb72hsgc9s4xwmaqyfdnfa6lw44sfx"; depends=[]; }; +MATA = derive { name="MATA"; version="0.3"; sha256="006mnc4wqh9vdigfzrzx4csgczi0idvlwb6r23w5mmsfbn0ysdm5"; depends=[]; }; MATTOOLS = derive { name="MATTOOLS"; version="1.1"; sha256="1nzrkm3a08rpsd9vplyf33rrkadlrd0ln70k95qxj98ndh2v97px"; depends=[]; }; -MAVIS = derive { name="MAVIS"; version="1.0"; sha256="0xx8axy9c6g20r8in57zdphjdf3yb046w5gqqsi8y4ph46rpy5xk"; depends=[shiny shinyAce metafor MAd MAc quantreg ggplot2 compute_es]; }; +MAVIS = derive { name="MAVIS"; version="1.1"; sha256="1nbvm6nfwymim63xvfqpvyk1w5fv6cwfh6cl2089myimid22ws1l"; depends=[shiny shinyAce metafor MAc MAd quantreg ggplot2 compute_es SCMA SCRT shinyBS]; }; MAVTgsa = derive { name="MAVTgsa"; version="1.3"; sha256="0rzal9nsi8y873cbf6hrdyzyxnpd4r1yr9fj66cn0s1c8g93ls0y"; depends=[corpcor foreach multcomp randomForest MASS]; }; MAc = derive { name="MAc"; version="1.1"; sha256="1lshi5rb8l2mpd302wskhlk5vz1wjidvbss9y69l63zjqdwjs7ch"; depends=[]; }; MAclinical = derive { name="MAclinical"; version="1.0-5"; sha256="1g0ka1kqww2xim8rp5rznkzn0a541zvf841s3lbphfh9k3y3ixs3"; depends=[party plsgenomics st e1071]; }; @@ -1036,7 +1051,7 @@ MCAvariants = derive { name="MCAvariants"; version="1.0"; sha256="08c5qpklilj41a MCDA = derive { name="MCDA"; version="0.0.8"; sha256="0zpjbshvv88dvqf6a6yw9zhzzh2j90b9yx8yg7q52c3l7a9lks6w"; depends=[Rglpk Kendall glpkAPI]; }; MCL = derive { name="MCL"; version="1.0"; sha256="1w36h4vhd525h57pz6ik3abbsrvxnkcqypl2aj1ijb6wm7nfp4ri"; depends=[expm]; }; MCMC_OTU = derive { name="MCMC.OTU"; version="1.0.8"; sha256="1bdmvwxkm162m3237bgf42dm5kp3q0giwf0avrkla8qd834gqch0"; depends=[MCMCglmm ggplot2]; }; -MCMC_qpcr = derive { name="MCMC.qpcr"; version="1.1.5"; sha256="19dznc7iyifkc3lap9nlsq7n8c0h4xbqrxqb6nj1aqa0nlfi0aqw"; depends=[MCMCglmm ggplot2 coda]; }; +MCMC_qpcr = derive { name="MCMC.qpcr"; version="1.1.7"; sha256="0hqbl38r2acvwmxkx7j6lab6an90ykia4bffjmy9a319l0dps5l4"; depends=[MCMCglmm ggplot2 coda]; }; MCMC4Extremes = derive { name="MCMC4Extremes"; version="1.0"; sha256="1ib3rllvqjni9xg3634ankrr66f1lj376kl3xhfwnwbfsbi4a8pw"; depends=[evir]; }; MCMCglmm = derive { name="MCMCglmm"; version="2.21"; sha256="1mjjp65w7pg2kxrx2qf0lh1kdi9d21xxj7s39zhi3q8ixw35h95r"; depends=[Matrix coda ape corpcor tensorA]; }; MCMCpack = derive { name="MCMCpack"; version="1.3-3"; sha256="0s1j3047qp2fkwdix9galm05lp7jk7qxyic6lwpbd70hmj8ggs76"; depends=[coda MASS]; }; @@ -1071,6 +1086,7 @@ MLCM = derive { name="MLCM"; version="0.4.1"; sha256="1g6lmw75qdiq0fshxr3sqwm1a3 MLDS = derive { name="MLDS"; version="0.4.3"; sha256="1vql92y2dy1ba5l5xdysqzkzvkrr4bhclmjabn49c8qb2xc2rl40"; depends=[MASS]; }; MLEcens = derive { name="MLEcens"; version="0.1-4"; sha256="0zlmrcjraypscgs2v0w4s4hm7qccsmaz4hjsgqpn0058vx622945"; depends=[]; }; MLRMPA = derive { name="MLRMPA"; version="1.0"; sha256="0gfbi70b15ivv76l3i0zlm14cq398nlny40aci3vqxxd0m2lyyx5"; depends=[ClustOfVar]; }; +MLmetrics = derive { name="MLmetrics"; version="1.0.0"; sha256="05j8hwcvfrsslib5k4w3xwkllb3rxdxazsld26zpjf3dc643ag9a"; depends=[]; }; MM = derive { name="MM"; version="1.6-2"; sha256="1z7i8ggd54qjmlxw9ks686hqgm272lwwhgw2s00d9946rxhb3ffi"; depends=[magic partitions emulator Oarray]; }; MMIX = derive { name="MMIX"; version="1.2"; sha256="02c74qp48ixqh5cjp2006zgg4xz4bgxxq3csyhjl219if19kmj5m"; depends=[]; }; MMMS = derive { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[survival glmnet]; }; @@ -1085,12 +1101,12 @@ MPAgenomics = derive { name="MPAgenomics"; version="1.1.2"; sha256="1gwglzkip54s MPDiR = derive { name="MPDiR"; version="0.1-16"; sha256="10g4dnysjnzf106qibqqcrxz3xw2nfh4ck1n1dlciwahr0f80j13"; depends=[]; }; MPINet = derive { name="MPINet"; version="1.0"; sha256="1zw3piqhhpagg5qahc2xahxxfdwdk8w94aass1virlpl0f52ik8s"; depends=[BiasedUrn mgcv]; }; MPSEM = derive { name="MPSEM"; version="0.2-6"; sha256="1vmdjnhxl8v7xw71kd1m66vhgaa1q0vvifd67v8fmii0i0i5i35y"; depends=[ape MASS]; }; -MPTinR = derive { name="MPTinR"; version="1.7.5"; sha256="0bxakcar4i30nhjbnwi00wxnbbl0qdzyx6pwwihcl3zvcbclvc79"; depends=[numDeriv Brobdingnag Rcpp Rcpp RcppEigen]; }; +MPTinR = derive { name="MPTinR"; version="1.8.0"; sha256="0nxiicjdq41bbpfwgzlczm1zrgdilx29nyspvs8m1lx58br1hh8i"; depends=[numDeriv Brobdingnag Rcpp Rcpp RcppEigen]; }; MPV = derive { name="MPV"; version="1.38"; sha256="1w3b0lszqmsz0yqvaz56x08xmy1m5ngl9m6p2pg9pjv13k8dv190"; depends=[]; }; MRCE = derive { name="MRCE"; version="2.0"; sha256="0fnd7ykcxi04pv1af5zbmavsp577vkw6pcrh011na5pzy2xrc49z"; depends=[QUIC]; }; MRCV = derive { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; }; MRH = derive { name="MRH"; version="2.0"; sha256="0d6zfhyy8a0pjrr74lj0mcagh49pjh15yp4wa7g7j4qv8wfw5pkv"; depends=[survival KMsurv coda]; }; -MRIaggr = derive { name="MRIaggr"; version="1.0"; sha256="17p3syy1n00vanisc0r8l8g5v7f3xdbvqbg9p6zsxirdpm9mq075"; depends=[Rcpp RANN spam Matrix ROCR fields mritc oro_dicom oro_nifti Rcpp RcppArmadillo]; }; +MRIaggr = derive { name="MRIaggr"; version="1.1"; sha256="0yq5qjc04rgssjb8pskvrcnr3xv1dlzakily39p9ya526zm9lrmv"; depends=[Rcpp spam Matrix Rcpp RcppArmadillo]; }; MRMR = derive { name="MRMR"; version="0.1.3"; sha256="1b3a4bkpcncl4sh7d81nk6b2dzhzqn9zhqdxv31jgippsqm2s3k2"; depends=[reshape2 ggplot2 lubridate lmtest plyr]; }; MRSP = derive { name="MRSP"; version="0.4.3"; sha256="0zv22xiq3qh9x3r2ckkvq1vv0vkcirh8y87053bqvw1m20j7q1by"; depends=[matrixcalc Formula]; }; MRsurv = derive { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[survival mvtnorm]; }; @@ -1116,7 +1132,7 @@ MaXact = derive { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb Maeswrap = derive { name="Maeswrap"; version="1.4.11"; sha256="15i36xj2bdzhly78614077s8k2z75a1gmzl2crsfgvhyyjdax8r7"; depends=[rgl lattice geometry]; }; ManyTests = derive { name="ManyTests"; version="1.1"; sha256="11xk3j2q7w6b6ljmp7b8gni0khpmpvcvzwxypy0w8ihi2gaczsxj"; depends=[]; }; Map2NCBI = derive { name="Map2NCBI"; version="1.0"; sha256="02cgmayrhkyji0cwr6n0f439njq29mzna7sgzkq6ml45njm9m5nh"; depends=[]; }; -MapGAM = derive { name="MapGAM"; version="0.7-4"; sha256="1y1f0xmbssc7k6fw1dcs2kg06brza9mj5a2c33b8ln226hvnhk3z"; depends=[sp gam maptools]; }; +MapGAM = derive { name="MapGAM"; version="0.7-5"; sha256="0bpswdi7iic7hsqrwcxwv27n4095m292nv5db6d4mj9gvp13h7i7"; depends=[sp gam maptools]; }; MareyMap = derive { name="MareyMap"; version="1.2"; sha256="1l7s1ffl9bg1zx5nyb1r3dba188mxiaprdda3gqm2cr1f33jmr51"; depends=[tkrplot]; }; MarkowitzR = derive { name="MarkowitzR"; version="0.1502"; sha256="0srrmzr4msn04w5f6s6qs51db8jccpfj10sighsv1l7d056n2xjn"; depends=[matrixcalc sandwich gtools]; }; MasterBayes = derive { name="MasterBayes"; version="2.52"; sha256="12ka2l4x6psij7wzbb98lwx5shgwzn5v44qfpiw1i6g236yp0mhm"; depends=[coda genetics gtools kinship2]; }; @@ -1162,7 +1178,7 @@ MissMech = derive { name="MissMech"; version="1.0.2"; sha256="1b7i1balfl1cqr3l4l MissingDataGUI = derive { name="MissingDataGUI"; version="0.2-2"; sha256="07a3y8l0r7a0f7zmp5pg2aqkf7hyk8cf562x3m8b38w96vir4vr0"; depends=[gWidgetsRGtk2 ggplot2 GGally cairoDevice reshape]; }; MitISEM = derive { name="MitISEM"; version="1.0"; sha256="03305ds3rgr29z4idaxzsm83igiygna2sqd5vpixklngsrp8w341"; depends=[mvtnorm]; }; MixAll = derive { name="MixAll"; version="1.0.2"; sha256="10jwiri659i2h0gkaxc41gjvff4v465syxr0nppn1qqz5910jql0"; depends=[rtkpp Rcpp rtkpp]; }; -MixGHD = derive { name="MixGHD"; version="1.4"; sha256="0c7d9yf4hl7s8a1alzxjs12kcq98s9wna277vw20rnxa60b6dsqm"; depends=[MASS mclust Bessel mvtnorm ghyp numDeriv]; }; +MixGHD = derive { name="MixGHD"; version="1.5"; sha256="1wjjz300yr9mj5kwrpybdji0znqrh26i2jlhbjcxkn3j4frkhlh3"; depends=[MASS mclust Bessel mvtnorm ghyp numDeriv mixture]; }; MixMAP = derive { name="MixMAP"; version="1.3.1"; sha256="0m6m9wi0ain7z96s6z6kmwjisfqm3al6m459y5zr2l1cdbdpxfpv"; depends=[lme4]; }; MixSim = derive { name="MixSim"; version="1.0-9"; sha256="16kg12784z82x8f1vscv9d5yakmki2m8gqr4hy9417c31xfkk3zy"; depends=[MASS]; }; MixedTS = derive { name="MixedTS"; version="1.0.1"; sha256="0ljal2jxscwrv439blavf5gjxbi3k3jfqqmwblzfvc05dqgvdk0b"; depends=[MASS]; }; @@ -1184,6 +1200,7 @@ MuMIn = derive { name="MuMIn"; version="1.13.4"; sha256="1zk8glw5laismhhfgkbxk05 MultEq = derive { name="MultEq"; version="2.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; }; MultNonParam = derive { name="MultNonParam"; version="1.0"; sha256="0xff81wjmyw2d38r0v3n7vv0dasg9rlrc0zrdwsmfd83zpvxqj5m"; depends=[]; }; MultiCNVDetect = derive { name="MultiCNVDetect"; version="0.1-1"; sha256="0mfisblw3skm4y8phfg4wa0rdchl01wccarsq79hv63y78pfhh13"; depends=[]; }; +MultiJoin = derive { name="MultiJoin"; version="0.1"; sha256="02wdn2rcci4n553jjd7ivw3afp6w6zcjc002yj0pvi0ai3jw6p92"; depends=[]; }; MultiLCIRT = derive { name="MultiLCIRT"; version="2.9"; sha256="0anb041nd56rrryhv5w1pb0axxsfkqas177r6yf5h5gbc4vn3758"; depends=[MASS limSolve]; }; MultiMeta = derive { name="MultiMeta"; version="0.1"; sha256="0gj0wk39fqd21xjcah20jk16jlfrcjarspbjk5xv74c9k4p5gmak"; depends=[gtable mvtnorm expm ggplot2 reshape2]; }; MultiOrd = derive { name="MultiOrd"; version="2.1"; sha256="12y5cg06qyaz72gk3bi5pqkd55n72rz056y9va49znlsqph09x2x"; depends=[mvtnorm corpcor Matrix psych]; }; @@ -1194,7 +1211,7 @@ MultinomialCI = derive { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102 Myrrix = derive { name="Myrrix"; version="1.1"; sha256="15w1dic6p983g2gajbm4pws743z68y0k2hxrdwx6ppnzn9rk07rs"; depends=[Myrrixjars rJava]; }; Myrrixjars = derive { name="Myrrixjars"; version="1.0-1"; sha256="0dy82l0903pl4c31hbllscfmxrv3bd5my5b2kv5d3x5zq0x99df0"; depends=[rJava]; }; NADA = derive { name="NADA"; version="1.5-6"; sha256="0y7njsvaypcarzygsqpqla20h5xmidzjmya4rbq39gg6gkc0ky27"; depends=[survival]; }; -NAM = derive { name="NAM"; version="1.2"; sha256="17jjg8ilxka00k90ca1zjg59g4d2l4s0dj3dsszpa4ab6nddc2zl"; depends=[Rcpp missForest Rcpp]; }; +NAM = derive { name="NAM"; version="1.3.2"; sha256="0rzhqs9qcry3w4q1lcfzmp4fndbmj4bm8981i7nn4cipcjfx7635"; depends=[Rcpp randomForest Rcpp]; }; NAPPA = derive { name="NAPPA"; version="2.0.1"; sha256="0nn4wgl8bs7sy7v56xfif7i9az6kdz9xw7m98z1gnvl2g7damvn3"; depends=[plyr NanoStringNorm]; }; NB = derive { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx3a6vr96w43jfwmgi2diq"; depends=[]; }; NBDdirichlet = derive { name="NBDdirichlet"; version="1.01"; sha256="07j9pcha6clrji8p4iw466hscgs6w43q0f7278xykqcdnk39gkyv"; depends=[]; }; @@ -1207,20 +1224,22 @@ NHMM = derive { name="NHMM"; version="3.5"; sha256="03il5y6vz5zyadydhk3qg6sd6fms NHPoisson = derive { name="NHPoisson"; version="3.1"; sha256="1gr682kxgw227yqw9w0iw9lrijsz5iszhnfk0mdhi6m1w9s28kcn"; depends=[car]; }; NISTnls = derive { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; }; NISTunits = derive { name="NISTunits"; version="1.0.0"; sha256="156rk3wams52lw3inf55s9v7mi5x29mmb41p8kvryimnzgi904ca"; depends=[]; }; -NLP = derive { name="NLP"; version="0.1-6"; sha256="19ynrfzj70swlk6z1r8bh23dzdk2qk8z0bk3xn39vpv0wplyc9i3"; depends=[]; }; -NLPutils = derive { name="NLPutils"; version="0.0-1"; sha256="036pafnjcbz7ihdgsjss4jq8fb420j8fmxyymv7kr4pr78wjysbx"; depends=[NLP SnowballC qdap]; }; +NLP = derive { name="NLP"; version="0.1-7"; sha256="1r7m6mq7i6xcf2qxzwvwx129fq89gx6f8kxqn76iw5a5nfarq87w"; depends=[]; }; +NLPutils = derive { name="NLPutils"; version="0.0-2"; sha256="1ny1q4b4pd1pl6d3lgv9zfkrw5wjd6pvhwlahj82fr1z3nq46bwb"; depends=[NLP SnowballC qdap]; }; NLRoot = derive { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; }; NMF = derive { name="NMF"; version="0.20.5"; sha256="1j91vklzi4qjlix5sn9qh86dwx6vxnla2p4ag81apkr441jkvynr"; depends=[pkgmaker registry rngtools cluster stringr digest gridBase colorspace RColorBrewer foreach doParallel ggplot2 reshape2]; }; NMFN = derive { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; }; -NMOF = derive { name="NMOF"; version="0.34-1"; sha256="0agh22p4rr3dfq1wipm2435hvb932wf9vp0r5992g3wbfnphs29g"; depends=[]; }; +NMOF = derive { name="NMOF"; version="0.34-2"; sha256="1hqq0gypry614jfc8hcagwkf6xz6z98pb9hzkl9ygykv4rfs5bms"; depends=[]; }; +NNTbiomarker = derive { name="NNTbiomarker"; version="0.28"; sha256="1y9lkn12a7p1qwi10pzzidhjgkzazn6lfflihnc46phf6yzgdrs6"; depends=[shiny xtable stringr]; }; NORMT3 = derive { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; }; NORRRM = derive { name="NORRRM"; version="1.0.0"; sha256="06bdd5m46c8bbgmr1xkqfw72mm38pafxsvwi9p8y7znzyd0i6ag3"; depends=[ggplot2 SDMTools]; }; NORTARA = derive { name="NORTARA"; version="1.0.0"; sha256="1q4dmn5q939d920spmxxw08afacs3pzhr2gzwyqa5kn8xiz4ffg8"; depends=[corpcor Matrix]; }; NPBayesImpute = derive { name="NPBayesImpute"; version="0.5"; sha256="0ym227hz6g51bfn218k1g377ci66j4i2sx9zmm5n62sg1dzj3xaj"; depends=[Rcpp Rcpp]; }; -NPCD = derive { name="NPCD"; version="1.0-7"; sha256="11h460h1q50qixr2hk4wd4v6wgwblp3cqvksbzqkdcinzzp8z6zh"; depends=[BB R_oo R_methodsS3]; }; +NPC = derive { name="NPC"; version="1.0.0"; sha256="0cx1rqbzn1bmizixf86idqyxz29yip8aq55mbi6l7bfnqp1hq105"; depends=[permute dplyr coin matlab]; }; +NPCD = derive { name="NPCD"; version="1.0-8"; sha256="0wpyxcq2s97iy155sz4pihcgwk8wgk56s7cgszbkz2hl6cijjcbb"; depends=[BB R_oo R_methodsS3]; }; NPCirc = derive { name="NPCirc"; version="2.0.1"; sha256="1pyckjvf4vzns9hxnhnk7cm4abllmdj3f142pvjhnilyqwndqgyc"; depends=[circular misc3d movMF plotrix rgl shape]; }; NPHMC = derive { name="NPHMC"; version="2.2"; sha256="000x9y00gfkaj5lf00a55b9qx15x05yp3g3nmp8slyzsnfv66p5d"; depends=[survival smcure]; }; -NPMLEcmprsk = derive { name="NPMLEcmprsk"; version="2.0"; sha256="0x8pfsi79rb7d29908hlnkqh521csccz6vz04r412z9znsj4pnkl"; depends=[]; }; +NPMLEcmprsk = derive { name="NPMLEcmprsk"; version="2.1"; sha256="1v15ylgflbdr03pgh55fan1l6mymd1d5n6h9jhbcqahjlcsxkwq3"; depends=[]; }; NPMPM = derive { name="NPMPM"; version="1.0"; sha256="14rjj48vfj4wv1na5v181jby016afx4ak1fs0f3g1fif4kbgbdx0"; depends=[]; }; NPMVCP = derive { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; }; NPS = derive { name="NPS"; version="1.1"; sha256="02idja149a2sj97sks4lhsaflpifyxi6n0rjlcq9993f84szfgsi"; depends=[]; }; @@ -1238,7 +1257,7 @@ NetComp = derive { name="NetComp"; version="1.6"; sha256="11rxpdihn575diqfvc7yvx NetData = derive { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; }; NetIndices = derive { name="NetIndices"; version="1.4.4"; sha256="0ydivbri8l8zkxi18ghj9h66915scyhca8i9mcyq4b06mjfigss8"; depends=[MASS]; }; NetSim = derive { name="NetSim"; version="0.9"; sha256="07h4qwz64k8zj8c2mx23cbnhg4rqrb4nfh20xw98kspz7cisdg6d"; depends=[Rcpp Rcpp]; }; -NeuralNetTools = derive { name="NeuralNetTools"; version="1.0.1"; sha256="1gxlv595jxbvpis1vp1bxkspwhqk32f0d0lhkzah8d5ijjzdqihf"; depends=[ggplot2 neuralnet nnet reshape2 RSNNS scales]; }; +NeuralNetTools = derive { name="NeuralNetTools"; version="1.3.1"; sha256="0nk2rs1rfv1lp99kfmqfcwgli92pljzrf4dgxp5q3icgpyf88kqv"; depends=[ggplot2 neuralnet nnet reshape2 RSNNS scales]; }; Newdistns = derive { name="Newdistns"; version="2.0"; sha256="1jgv9jl6pvsjgjsbjvmjg8qwjx4gsmp4kd27pbqxldp0qp0q9mjf"; depends=[AdequacyModel]; }; NightDay = derive { name="NightDay"; version="1.0.1"; sha256="0vkpr2jwhgghiiiaiglaj1b9pz25fcsl628c9nsp9zyl67982wz1"; depends=[maps]; }; Nippon = derive { name="Nippon"; version="0.5.3"; sha256="02m591aljlaxn95k7sl8gfsviv4ywqv9mrkjf6g19kfrc9pbgjqg"; depends=[maptools]; }; @@ -1308,7 +1327,7 @@ PBD = derive { name="PBD"; version="1.0"; sha256="1q8ijjmcwxi8f3wgggpj4y522wmxad PBImisc = derive { name="PBImisc"; version="0.999"; sha256="0igwl78wj8w6jzmk5m8y9rf4j72qrcjyhb83kz44is72ddzsyss6"; depends=[MASS lme4 Matrix]; }; PBSadmb = derive { name="PBSadmb"; version="0.68.104"; sha256="01akimdsp0bkvz3a5d75yyy3ph0mff85n8qsnr59fla5b5cm4qlj"; depends=[PBSmodelling]; }; PBSddesolve = derive { name="PBSddesolve"; version="1.11.29"; sha256="13vprr66hh5d19xambpyw7k7fvqxb8mj5s9ba19ls7xgypw22cmm"; depends=[]; }; -PBSmapping = derive { name="PBSmapping"; version="2.68.68"; sha256="1g58jz7mc7fkrv2c739pkg048pcgmklq650800wf6px073db2kc3"; depends=[]; }; +PBSmapping = derive { name="PBSmapping"; version="2.69.76"; sha256="1fci7mx5m3jqy92nqfaw5w5yd5rw6f0bk5kya1v0mmvf7j715kar"; depends=[]; }; PBSmodelling = derive { name="PBSmodelling"; version="2.67.266"; sha256="0ych9k20x0m71gkdrpwv5jnx6pfsk45wwsaaamy32cmnhd3y14sq"; depends=[XML]; }; PCAmixdata = derive { name="PCAmixdata"; version="2.2"; sha256="0gbmiy2mhz8lgp0pcjby4ny8a28wlx1xrsa2lknzxn4d0m2csxjn"; depends=[]; }; PCDSpline = derive { name="PCDSpline"; version="1.0"; sha256="15kmvcwvwlsr1107n7mfajvf9b1kcslnhsdx0drjjhsvq193qrqa"; depends=[nleqslv matrixcalc]; }; @@ -1317,7 +1336,7 @@ PCICt = derive { name="PCICt"; version="0.5-4"; sha256="1g17hxs00dlnb6p0av6l7j99 PCIT = derive { name="PCIT"; version="1.5-3"; sha256="0gi28i2qd09pkaja4w7abcl7sz43jnk98897vc2905fnk9nks65j"; depends=[]; }; PCPS = derive { name="PCPS"; version="1.0.2"; sha256="17gjj88zq123nxg4dh2w304sh9c1c4myad2g8x31wn1z7bmawv3y"; depends=[SYNCSA vegan ape picante phylobase plotrix]; }; PCS = derive { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kwls8cazmpw3wspnaqvl2n4s"; depends=[statmod]; }; -PCovR = derive { name="PCovR"; version="2.5"; sha256="1as3qd2gqznfy95mil8k31nkqrf36sgpja5s9zdwvk0vpaxv1fr7"; depends=[GPArotation ThreeWay MASS Matrix]; }; +PCovR = derive { name="PCovR"; version="2.6"; sha256="0b1bbf6namll2afxh61qz4xz4ipzipdnfhbcqlragmyj9pisaf45"; depends=[GPArotation ThreeWay MASS Matrix]; }; PDQutils = derive { name="PDQutils"; version="0.1.1"; sha256="0klzh7ilgs02i0cvb5j6jd65dxyg2c3yk5rc82wcjn9ixhr8ks9b"; depends=[orthopolynom moments]; }; PDSCE = derive { name="PDSCE"; version="1.2"; sha256="17lc6d8ly6jbvjijpzg45dvqrzrh5s1sp415nycazgpbg9ypwr2h"; depends=[]; }; PEIP = derive { name="PEIP"; version="1.7"; sha256="1bagi1kr8vd3b3r524vrk747bqmd9insny1nxj8bdvdk0a9yr949"; depends=[bvls Matrix RSEIS pracma]; }; @@ -1328,7 +1347,7 @@ PF = derive { name="PF"; version="9.5"; sha256="1y99brdabj78s5kxyv0136s40kaaj3zy PGICA = derive { name="PGICA"; version="1.0"; sha256="0qxa5hw2s3mndjvk8lb82pcbyj1kbdclx4j4xa8jq0lcj180abi9"; depends=[fastICA]; }; PGM2 = derive { name="PGM2"; version="1.0"; sha256="18azh6k271p9dvc23q402pv7wrilr1yk02vqqy6qjppnvq6jxahg"; depends=[]; }; PGRdup = derive { name="PGRdup"; version="0.2"; sha256="12vxdw4093xmmpcl6ars7h03f1a21gjl5p29r5d19hp68h4hchi1"; depends=[data_table igraph stringdist stringi]; }; -PHENIX = derive { name="PHENIX"; version="1.1"; sha256="0bdb31hqhjz73dz4659i11y9qh0r0j139024285ci7z3xx22cdy5"; depends=[ppcor SuppDists]; }; +PHENIX = derive { name="PHENIX"; version="1.2"; sha256="0fnrx2xf6q9ng9pwfxbbbzvcf6kqj12byd81x0q0vfl85h1xddws"; depends=[ppcor SuppDists]; }; PHYLOGR = derive { name="PHYLOGR"; version="1.0.8"; sha256="17lmjfbwf8j68zzzhdvppyjacdsmy4zmcfj0pcjsw5j6m361hvh6"; depends=[]; }; PHeval = derive { name="PHeval"; version="0.5.2"; sha256="1q0cyq7b8d42jgiw7ra9vjdjw1zcxpyg6wgb3zgygkmd744ifggp"; depends=[survival]; }; PIGE = derive { name="PIGE"; version="0.9"; sha256="1x8ml25mm69dvlszm9p2ycph92nxcsgd52ydj7ha0dwrrpcv2law"; depends=[snowfall ARTP xtable survival]; }; @@ -1348,6 +1367,7 @@ PMA = derive { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3m PMCMR = derive { name="PMCMR"; version="1.1"; sha256="0f3882rjyxlcr183qa9y22bxh8nqp307v065aiy61ii0kizj9f70"; depends=[]; }; PP = derive { name="PP"; version="0.5.3"; sha256="17y1v2536n7ap0kvllwkmndmdjf4wgwl171c053ph45krv37mscf"; depends=[Rcpp Rcpp]; }; PPtree = derive { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; }; +PPtreeViz = derive { name="PPtreeViz"; version="1.0.1"; sha256="0010ixyxgal7q5vwpsslvw6p6bb8qkhbysh41rf0ymdwn37p085p"; depends=[gridExtra ggplot2 Rcpp reshape2 Rcpp RcppArmadillo]; }; PRISMA = derive { name="PRISMA"; version="0.2-5"; sha256="06z4z1rbsk5a8kpbs6ymm0m02i8dwbmv783c3l2pn4q3pf6ncmd5"; depends=[Matrix gplots ggplot2]; }; PROFANCY = derive { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[Matrix lattice igraph]; }; PROTOLIDAR = derive { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; }; @@ -1377,7 +1397,7 @@ PearsonDS = derive { name="PearsonDS"; version="0.97"; sha256="0bsdj4zir12zkv8yh PearsonICA = derive { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf72ffki47wymsdmd50smkdhvpzvanv4y2rmqfhvg"; depends=[]; }; PedCNV = derive { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[Rcpp RcppArmadillo ggplot2 Rcpp RcppArmadillo]; }; PepPrep = derive { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[stringr]; }; -Peptides = derive { name="Peptides"; version="1.0.3"; sha256="06q4sdm3yy5rjkfr6yqkmgjsr1bhrbpghyjqkzqh416wc4lnp073"; depends=[]; }; +Peptides = derive { name="Peptides"; version="1.0.4"; sha256="0qpppbdsz7c3dw6l5m3sxggma4xxdx0vflwlxpa0d7wynqpsn3wn"; depends=[]; }; PerFit = derive { name="PerFit"; version="1.3.1"; sha256="0zmhafr5fk3z66cp46gasgcxcza2q02821sg8zcs0vk5k80md9a7"; depends=[ltm mirt fda Hmisc irtoys MASS Matrix]; }; PerMallows = derive { name="PerMallows"; version="1.8"; sha256="1p0rnphhjc0rr1zpbff71mk75lnyph994k4p5whwn2fyfzi1pn0f"; depends=[Rcpp Rcpp]; }; PerfMeas = derive { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[]; }; @@ -1405,9 +1425,10 @@ Pomic = derive { name="Pomic"; version="1.0.2"; sha256="1i3zsz7gc4n4vid3yi3srrv0 PopED = derive { name="PopED"; version="0.2.0"; sha256="00qbwabzjb4ns9y9a4gg73zxpx02xcycbm19bdk9z1mv06fkg9dj"; depends=[ggplot2 MASS mvtnorm nlme dplyr codetools]; }; PopGenKit = derive { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; }; PopGenReport = derive { name="PopGenReport"; version="2.1"; sha256="040h7cvnh1xqlbsyg1lkfiz88421myr47r63v466bxidwb17bqg2"; depends=[knitr adegenet raster lattice RgoogleMaps gap calibrate xtable plyr dismo reshape ggplot2 R_utils ade4 pegas genetics rgdal gdistance vegan sp mmod GGally]; }; -PopGenome = derive { name="PopGenome"; version="2.1.0"; sha256="150n0fdi047nx4iyfdm7ql4gn98wcj1v99llcpaaba78ca7dm83n"; depends=[ff]; }; -PopVar = derive { name="PopVar"; version="1.0"; sha256="1gn6skjw7l4ljqs8c7vyx3gq9i7qp96vj84grld6bhsg63m0vbwh"; depends=[BGLR qtl rrBLUP]; }; +PopGenome = derive { name="PopGenome"; version="2.1.6"; sha256="1wk5k5f80l7k6haiaikhgaqn67q5n7gm632i3yz3frj1ph7bwjb7"; depends=[ff]; }; +PopVar = derive { name="PopVar"; version="1.1"; sha256="1125yynxdg13r84wzbm2h50yqhw1if0zrkaqlcjvmavymmx0vln2"; depends=[BGLR qtl rrBLUP]; }; PortRisk = derive { name="PortRisk"; version="1.0"; sha256="0vyzvi56lmdlhxpbxcxcfqa8271jv2l45w7x1kzzwl6q0wm4bjln"; depends=[zoo]; }; +PortfolioAnalytics = derive { name="PortfolioAnalytics"; version="1.0.3636"; sha256="0xva3ff8lz05f1jvx8hgn8rpgr658fjhf3xyh9ga1r7dii13ld50"; depends=[zoo xts foreach PerformanceAnalytics]; }; PottsUtils = derive { name="PottsUtils"; version="0.3-2"; sha256="05ds0a7jq63zxr3jh66a0df0idzhis76qv6inydsjk2majadj3zv"; depends=[miscF]; }; PoweR = derive { name="PoweR"; version="1.0.4"; sha256="00y0dvrsbvz8mr8mdw7fk17s5dfgm0f641qg96039y6g3hk2rn77"; depends=[Rcpp Rcpp RcppArmadillo]; }; Power2Stage = derive { name="Power2Stage"; version="0.3-1"; sha256="0a5llzbhl6s71bh21ka2x50pjissl9gg7f5sskailzcmi60yz2zk"; depends=[PowerTOST]; }; @@ -1436,6 +1457,7 @@ PwrGSD = derive { name="PwrGSD"; version="2.000"; sha256="0qxvws9mfrnqw5s24qhqk6 QCA = derive { name="QCA"; version="1.1-4"; sha256="0wg2yfg61bmcxmkxvm9zjrnz4766f176y4gyqvfp5hsp9pp0h2lm"; depends=[lpSolve]; }; QCA3 = derive { name="QCA3"; version="0.0-7"; sha256="0i9i2i633sjnzsywq51r2l7fkbd4ip217hp0vnkj78sfl7zf1270"; depends=[lpSolveAPI]; }; QCAGUI = derive { name="QCAGUI"; version="1.9-6"; sha256="020ngni02j2w2ylhyidimm51d426pym2g1hg7gnpb7aplxx67n6x"; depends=[abind QCA]; }; +QCAfalsePositive = derive { name="QCAfalsePositive"; version="1.0"; sha256="0rv2pfaj5fh8zva47k2r2rwzpnilj48jigaazkw2ibs8zq5f3qwz"; depends=[]; }; QCAtools = derive { name="QCAtools"; version="0.1"; sha256="1fcssxpyw0kfm6xgihkv4qxqmg628ahfr1bk36b9di9d29w6vgn9"; depends=[stringr QCA ggplot2 directlabels]; }; QCGWAS = derive { name="QCGWAS"; version="1.0-8"; sha256="1wn1kddgfmqv326pihnavbgsbd2yxrlq5s2xgi6kbprssxvj8bk1"; depends=[]; }; QRM = derive { name="QRM"; version="0.4-10"; sha256="1fkxjqyb9yqki4qwk393ra66wg5dnbr5b5sgypm8wk973crbhcj0"; depends=[gsl Matrix mvtnorm numDeriv timeSeries Rcpp mgcv Rcpp]; }; @@ -1446,34 +1468,34 @@ QZ = derive { name="QZ"; version="0.1-4"; sha256="1k657i1rf6ayavn0lgfvlh8am3kzyp QoLR = derive { name="QoLR"; version="1.0"; sha256="1ah6x1fcs4l571jvgm0c257cgxhhpkzfhqimwbb9j7xbz3h55lp3"; depends=[survival zoo]; }; QuACN = derive { name="QuACN"; version="1.8.0"; sha256="1597blp8gqc5djvbgpfzi8wamvy0x50wh5amxj9cy99qa0jlglxi"; depends=[combinat igraph]; }; QualInt = derive { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[survival ggplot2]; }; -Quandl = derive { name="Quandl"; version="2.4.0"; sha256="0apgwc85ija33dl9qgb8nr2wj5rx0xv6wlmg427nkxnr8pnar8ih"; depends=[xts RCurl RJSONIO zoo]; }; +Quandl = derive { name="Quandl"; version="2.6.0"; sha256="1mz39sj7dxfh9p5kdq7bxlifbg9izqz04l3ilnfchva7qq1ij01q"; depends=[xts httr zoo]; }; QuantPsyc = derive { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; }; -QuantifQuantile = derive { name="QuantifQuantile"; version="1.0"; sha256="0r3yz8k68z6c751r0ryxv744spch4aws50313miq498r5mvr4w1y"; depends=[rgl]; }; +QuantifQuantile = derive { name="QuantifQuantile"; version="2.1"; sha256="1d3dcpri8d98mn2c0nfipp1pdr67a8h35p0y7bdil6il71h4qldm"; depends=[rgl]; }; QuasiSeq = derive { name="QuasiSeq"; version="1.0-6"; sha256="0hv6fmw8kqdg82nwdiqb9naryw4x42rv9xw1zmahgqyxr9ffnrgr"; depends=[Matrix mgcv]; }; Quor = derive { name="Quor"; version="0.1"; sha256="1ncl4pj472m881fqndcm6jzn4jkwbnzpc639c9vy5mxa4z569i1g"; depends=[combinat]; }; R_cache = derive { name="R.cache"; version="0.10.0"; sha256="0y8q3w9z9cyzsg60x95kkc81ksc2d5vpdaqg5njq5bgjyw7yjqvs"; depends=[R_methodsS3 R_oo R_utils]; }; R_devices = derive { name="R.devices"; version="2.13.0"; sha256="1ys4sxns2y5cgqb18scclsv99jfkyy3l9mq0jcnh76c48gpzaisp"; depends=[R_methodsS3 R_oo R_utils base64enc]; }; -R_filesets = derive { name="R.filesets"; version="2.7.0"; sha256="12aghswi40qr6n6rzyv2bpy1wlp61ij7h1yblbhlmdk3p4rd0bs1"; depends=[R_oo R_methodsS3 R_utils R_cache digest]; }; +R_filesets = derive { name="R.filesets"; version="2.7.1"; sha256="0awvjqkk5h8wzbdgn255m3gy3w5dsnlqp4wj7gzqgqm5mwg4jdyh"; depends=[R_oo R_methodsS3 R_utils R_cache digest]; }; R_huge = derive { name="R.huge"; version="0.9.0"; sha256="13p558qalv60pgr24nsm6mi92ryj65rsbqa6pgdwy0snjqx12bgi"; depends=[R_methodsS3 R_oo R_utils]; }; R_matlab = derive { name="R.matlab"; version="3.2.0"; sha256="1c87m6pv62ciqwpmsp8l7rkixcv04s9nkdn4yjbgyqvcslfaw26m"; depends=[R_methodsS3 R_oo R_utils]; }; R_methodsS3 = derive { name="R.methodsS3"; version="1.7.0"; sha256="1dg4bbrwr8jcsqisjrrwxs942mrjq72zw8yvl2br4djdm0md8zz5"; depends=[]; }; R_oo = derive { name="R.oo"; version="1.19.0"; sha256="15rm1qb9a212bqazhcpk7m48hcp7jq8rh4yhd9c6zfyvdqszfmsb"; depends=[R_methodsS3]; }; R_rsp = derive { name="R.rsp"; version="0.20.0"; sha256="06vq9qq5hdz3hqc99q82622mab6ix7jwap20h4za6ap6gnwqs0fv"; depends=[R_methodsS3 R_oo R_utils R_cache]; }; -R_utils = derive { name="R.utils"; version="2.0.0"; sha256="1ldrz6nj45mnggk1zsx8j479kzfi2pjp402zid5yrnqmh50q61sb"; depends=[R_oo R_methodsS3]; }; +R_utils = derive { name="R.utils"; version="2.0.2"; sha256="1bqykygqbgx2wwqypvgj9siyiqa77cbchjnqw0qgg1rg8q2ldw65"; depends=[R_oo R_methodsS3]; }; R0 = derive { name="R0"; version="1.2-5"; sha256="13f0dvxf1gz9j8ih1n8giyhb4s7nrh1r7ncc5smvh06kjgr5b341"; depends=[MASS]; }; -R1magic = derive { name="R1magic"; version="0.2"; sha256="07kqpdpf2grmgkv609l79f3w6ljkldfsyrn9l1yg6birzp3p69v1"; depends=[]; }; +R1magic = derive { name="R1magic"; version="0.3.2"; sha256="1xfldr5y7pfdi6qljjvckknsv2wi9rnzwmqxkpgnyc96md2fvwjr"; depends=[]; }; R2BayesX = derive { name="R2BayesX"; version="1.0-0"; sha256="1p60n14gaqciskzah5haskflpms1g5lh4n57653yysa7fvmfgdhw"; depends=[BayesXsrc colorspace mgcv]; }; R2Cuba = derive { name="R2Cuba"; version="1.0-11"; sha256="1kgcxqn83yskh0dv6vyz66d0z32qy55par36jj987qglpl25zmax"; depends=[]; }; R2G2 = derive { name="R2G2"; version="1.0-2"; sha256="05d5vybvsi4pyr099916nk1l8sqszs9gaj2vhsx1jxxks8981na7"; depends=[]; }; R2GUESS = derive { name="R2GUESS"; version="1.6"; sha256="1lh73zjch2jaspas065mkcsq13v6s323k4wdhvkydmvyhlgvlpcl"; depends=[fields MCMCpack mixOmics mvtnorm snowfall]; }; R2HTML = derive { name="R2HTML"; version="2.3.1"; sha256="01mycvmz4xd1729kkb8nv5cl30v3qy3k4fmrlr2m1112hf5cmp59"; depends=[]; }; -R2MLwiN = derive { name="R2MLwiN"; version="0.8-0"; sha256="1fjns3v6prjkd4iwdcj846sj5ji1bg4b7axxx18wlsvrin83gd9k"; depends=[lattice coda Matrix foreign rbugs digest]; }; +R2MLwiN = derive { name="R2MLwiN"; version="0.8-1"; sha256="0gkp5jvvbf9rppxirs1s7vr5nbfkrlykaph3lv20xq8cc8nz9zzx"; depends=[lattice coda Matrix foreign rbugs digest]; }; R2OpenBUGS = derive { name="R2OpenBUGS"; version="3.2-3.1"; sha256="1nnyfhpqgx6wd4n039c4d42png80b2xcwalyj08bmq0cgl32cjgk"; depends=[coda boot]; }; R2STATS = derive { name="R2STATS"; version="0.68-38"; sha256="1v8mvkvs4fjch0dpjidr51jk6ynnw82zhhylyccyrad9f775j2if"; depends=[proto Matrix lattice lme4 cairoDevice gWidgets gWidgetsRGtk2 RGtk2Extras MASS latticeExtra statmod]; }; R2SWF = derive { name="R2SWF"; version="0.9"; sha256="0c3lkmm8wgpix3fv7dxql6zpklwbcsv1y30r26yws12fnavw4y1k"; depends=[sysfonts]; }; R2WinBUGS = derive { name="R2WinBUGS"; version="2.1-19"; sha256="03bvxv46lhhnbfjq3w5ig50icncwn1bdq7lsh6w1szdk90ah2zgh"; depends=[coda boot]; }; R2admb = derive { name="R2admb"; version="0.7.13"; sha256="0sjli498pz1vk5wmw65mca08mramwhzlfli2aih15xj7qzvp0nky"; depends=[coda lattice]; }; -R2jags = derive { name="R2jags"; version="0.05-03"; sha256="02r68g005cmcc7dg1a52awdyak2sg2pszpl6ckw4bw19sk9nnd48"; depends=[rjags abind coda R2WinBUGS]; }; +R2jags = derive { name="R2jags"; version="0.5-6"; sha256="0zknl9qrypp96qz6rx7bkxg7bslvsnlhrgh749q4q566fz944n1g"; depends=[rjags abind coda R2WinBUGS]; }; R330 = derive { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[s20x leaps rgl lattice]; }; R4CDISC = derive { name="R4CDISC"; version="0.3"; sha256="0443mzkhsbrvsl7vawfpabsdqbqr9yjyyhsw1y07yncy55ylc2v5"; depends=[XML]; }; R4CouchDB = derive { name="R4CouchDB"; version="0.7.1"; sha256="08s999m1kfjzabng41d5fpkag7nrdbricnw7m4jvj1ssqfnil2hj"; depends=[bitops RCurl RJSONIO]; }; @@ -1484,10 +1506,11 @@ RADami = derive { name="RADami"; version="1.0-3"; sha256="0rg07dsh2rlldajcj0gq5s RAM = derive { name="RAM"; version="1.2.0"; sha256="1xf296a2xqv9nq3m5lswnbfy023s6dp0yv8y0hr8xq0mw9mym3v3"; depends=[vegan ggplot2 gridExtra RColorBrewer gplots plyr reshape2 scales labdsv ggmap permute VennDiagram data_table FD MASS RgoogleMaps ape lattice reshape]; }; RAMP = derive { name="RAMP"; version="1.0"; sha256="18cz8gvb49j1hic71dzfcl17hz5gjdcabqvq84yr1h7iqkrq95cq"; depends=[]; }; RAMpath = derive { name="RAMpath"; version="0.3.8"; sha256="1p1l6iirb314n5246kyyz0r3ja4v05xb5a6aq9k26wsb5m42x85k"; depends=[lavaan ellipse]; }; -RANN = derive { name="RANN"; version="2.4.1"; sha256="13d2wi3r4b190f6s6y4zipqf43gy9c1h71b9j7qmc3lqca4nvzmd"; depends=[]; }; +RANN = derive { name="RANN"; version="2.5"; sha256="007cgqg9bybg2zlljbv5m6cmlm3r6i251018rpgjcn0xnm9sjsj7"; depends=[]; }; +RANN_L1 = derive { name="RANN.L1"; version="2.5"; sha256="0sjf92hdw9jczvq1wl5syckhvik7wv0k9vrrgw4nnnsabc25v9pf"; depends=[]; }; RAP = derive { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; }; RAPIDR = derive { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[data_table PropCIs]; }; -RAdwords = derive { name="RAdwords"; version="0.1.3"; sha256="1i9s28q58571y8lx3gfc3div9iy1j2bcxbrf6n1v4lis0xn60vl1"; depends=[RCurl rjson]; }; +RAdwords = derive { name="RAdwords"; version="0.1.4"; sha256="0zqxvspza60sh65k0fr3c51qdxk8mzkrh8fm421lyd6054n6az21"; depends=[RCurl rjson]; }; RApiSerialize = derive { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; }; RAppArmor = derive { name="RAppArmor"; version="1.0.1"; sha256="06j7ghmzw2rrlk8nsarmpk1ab2gg88qs52zpw37rhqchpyzwwkfb"; depends=[]; }; RArcInfo = derive { name="RArcInfo"; version="0.4-12"; sha256="1j1c27g2gmnxwslff4l0zivi48qxvpshmi7s9wd21cf5id0y4za4"; depends=[RColorBrewer]; }; @@ -1504,9 +1527,9 @@ RClimMAWGEN = derive { name="RClimMAWGEN"; version="1.1"; sha256="0icy560llfd10m RColorBrewer = derive { name="RColorBrewer"; version="1.1-2"; sha256="1pfcl8z1pnsssfaaz9dvdckyfnnc6rcq56dhislbf571hhg7isgk"; depends=[]; }; RConics = derive { name="RConics"; version="1.0"; sha256="1lwr7hi1102gm8fi9k5ra24s0rjmnkccihhqn3byckqx6y8kq7ds"; depends=[]; }; RCryptsy = derive { name="RCryptsy"; version="0.2"; sha256="1sm6l2jbaxia53dqivii5g7pqbczvjk53c2v2vz65qz1qnrmrybj"; depends=[RJSONIO RCurl]; }; -RCurl = derive { name="RCurl"; version="1.95-4.5"; sha256="0a99awma5ylcagr6y9adv82hr5wk5cg4i5flra5q0cpvhp9w8sd2"; depends=[bitops]; }; +RCurl = derive { name="RCurl"; version="1.95-4.6"; sha256="145li081kqa07w3bzb5zaad6jkr3zr0hcpkjwar76ybrvc4jyi4s"; depends=[bitops]; }; RDIDQ = derive { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; }; -RDML = derive { name="RDML"; version="0.8-3"; sha256="077mz3j3iy0ddbsr05a21l2lqlm24mxgnafxnijnkiqxci3nj5rl"; depends=[R6 assertthat XML plyr dplyr]; }; +RDML = derive { name="RDML"; version="0.8-4"; sha256="0zrzi81rlxz8hrpz19g7v470fh930n5y6brn6mjq52shn0ap742m"; depends=[R6 assertthat XML plyr dplyr]; }; RDS = derive { name="RDS"; version="0.7-1"; sha256="1vkrplzak95yqykrxgzjxgvyb4g255rnk6msh1yi5mgrd32f0gdl"; depends=[gridExtra ggplot2 Hmisc igraph reshape2 scales]; }; RDSTK = derive { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr rjson RCurl]; }; RDataCanvas = derive { name="RDataCanvas"; version="0.1"; sha256="1aw19lmdphxwva5cs3f4fb8hllirzfkk48nqdgrarz32l11y5z5j"; depends=[jsonlite]; }; @@ -1546,8 +1569,8 @@ RI2by2 = derive { name="RI2by2"; version="1.2"; sha256="0387ncq1nhpz8521nwsjybsd RIFS = derive { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; }; RIGHT = derive { name="RIGHT"; version="0.2.0"; sha256="1mwm7l5l2hj67j03d895rx1181hax31a0nn3nq7rjcgpbljd2gjx"; depends=[ggplot2 plyr rjson shiny]; }; RISmed = derive { name="RISmed"; version="2.1.5"; sha256="03c2b6iqq147kwrpx6wh440y1p2sy5c4i3v2yph99326pzxbyw7q"; depends=[]; }; -RImageJROI = derive { name="RImageJROI"; version="0.1"; sha256="06x8p8wpzmsc6f2330m74x4dmh21dn0gqicand2l198knahp3kf7"; depends=[spatstat]; }; -RImpala = derive { name="RImpala"; version="0.1.5"; sha256="0kx2h6gkjxrsp6c33p1j7irs205rn5lpknlmc8as3v1ziigi4d51"; depends=[rJava]; }; +RImageJROI = derive { name="RImageJROI"; version="0.1.1"; sha256="0a4sa60klbpl31qxxvjjbksdhvs3vwm9na1v7014v93fzxy6bjas"; depends=[spatstat]; }; +RImpala = derive { name="RImpala"; version="0.1.6"; sha256="03f4cq4bcrydpy78ypir7smj7abrcfynz0zzlgwgc60vh7vl79lz"; depends=[rJava]; }; RInSp = derive { name="RInSp"; version="1.2"; sha256="0zg46qw44wx17ydcz592gl4k9qq08dycmsshxxqkjf92r3g3l6wm"; depends=[]; }; RInside = derive { name="RInside"; version="0.2.12"; sha256="09dx9md5i4vdgadmqfzcchs5nhkml4nwr8ckgmmqll0y3xph2f3h"; depends=[Rcpp Rcpp]; }; RItools = derive { name="RItools"; version="0.1-12"; sha256="0zdwj5y355d8jnwmjic3djwn6zy7h1iyl58j9hmnmc3m369cir0s"; depends=[lattice SparseM xtable svd abind]; }; @@ -1555,6 +1578,7 @@ RJDBC = derive { name="RJDBC"; version="0.2-5"; sha256="0cdqil9g4w5mfpwq85pdq4vp RJSDMX = derive { name="RJSDMX"; version="1.3"; sha256="1z4l6iw404qn3syk2877msywkr8369nic5zzvnx1qj0gj9x2mm2p"; depends=[rJava zoo]; }; RJSONIO = derive { name="RJSONIO"; version="1.3-0"; sha256="1dwgyiy19sixhy6yclqcaaxswbmpq7digyjjxhy1qv0wfsvk94qi"; depends=[]; }; RJaCGH = derive { name="RJaCGH"; version="2.0.3"; sha256="0wz7vhlgzf8smzl7gx01dx070266fnmzw66wpl0im20nxfy8mr0l"; depends=[]; }; +RJafroc = derive { name="RJafroc"; version="0.0.1"; sha256="0zjyr7qz50wvzkais6q9kyf3wp29g15kan73b8wdqrvab0f5rjqs"; depends=[xlsx ggplot2 stringr]; }; RKEA = derive { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[RKEAjars rJava tm]; }; RKEAjars = derive { name="RKEAjars"; version="5.0-1"; sha256="00bva6ksdnmwa0i2zvr36n40xp429c0sqyp20a8n3zsblawiralc"; depends=[rJava]; }; RLRsim = derive { name="RLRsim"; version="3.0"; sha256="16bqsp15b8ikgix18p63k6sf81d1al4djbb51r08imjs4z9jppg4"; depends=[Rcpp mgcv Rcpp]; }; @@ -1571,12 +1595,12 @@ RMallow = derive { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw RMark = derive { name="RMark"; version="2.1.12"; sha256="0b8yzng9c74yxl1a1nkc4knf2a9114mjkis19b1pdnclyxcnx45z"; depends=[snowfall matrixcalc msm coda]; }; RMediation = derive { name="RMediation"; version="1.1.3"; sha256="07ck74dl1wwb88229fhkh2czlynddff7zvjyhisxk53qmdb0wvmw"; depends=[MASS lavaan e1071]; }; RMongo = derive { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; }; -RMySQL = derive { name="RMySQL"; version="0.10.2"; sha256="1yzlldgnncbd8aqkhphnwb8bk164ds4ql3hq1h2qdlicf6x806kz"; depends=[DBI]; }; +RMySQL = derive { name="RMySQL"; version="0.10.3"; sha256="0791pshzr7rjjcnlm9md7gfsqkzizhzr9vwgnk2acc7sw5hikga6"; depends=[DBI]; }; RNCBIEUtilsLibs = derive { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; }; RNCEP = derive { name="RNCEP"; version="1.0.7"; sha256="0yvddsdpdrsg2dafmba081q4a34q15d7g2z5zr4qnzqb8wjwh6q2"; depends=[maps RColorBrewer abind fields fossil tgp sp]; }; RND = derive { name="RND"; version="1.1"; sha256="1rbnjkfrsvm68xp90l4awixbvpid9nxnhg6i6fndpdmqwly2fwdp"; depends=[]; }; -RNeXML = derive { name="RNeXML"; version="2.0.1"; sha256="10p9njlrpkwgnyjkcz7w579dwi0nwdmksyl2gpbq106fzqvh0s47"; depends=[ape XML plyr taxize reshape2 httr uuid]; }; -RNetCDF = derive { name="RNetCDF"; version="1.6.3-1"; sha256="0c112qwxzml3mbdss69607amxvhpkfgs7ihymxidgkv0s3ra7cp5"; depends=[]; }; +RNeXML = derive { name="RNeXML"; version="2.0.2"; sha256="1giqwpcvr3v7na0z25qwps3qlrnffji0frcx694ifdfa89fn0s4d"; depends=[ape XML plyr taxize reshape2 httr uuid]; }; +RNetCDF = derive { name="RNetCDF"; version="1.7-3"; sha256="1blpwkmdi7scm876mvk9m23k4kfx83rc6hcy342236rbmxdzahhg"; depends=[]; }; RNetLogo = derive { name="RNetLogo"; version="1.0-1"; sha256="051yx7l8qbnvb4gn67m00wnl6v0jrmavmp7n7zygjn7p1xi3w22c"; depends=[rJava igraph]; }; RNiftyReg = derive { name="RNiftyReg"; version="1.1.3"; sha256="1z980rwlq7wg4zjslppzs9d2cxhj7l63sgg8x8g6zgs5ag3pzgi7"; depends=[reportr oro_nifti]; }; ROAuth = derive { name="ROAuth"; version="0.9.6"; sha256="0vhsp8qybrl94898m2znqs7hmlnlbsh8sm0q093dwdb2lzrqww4m"; depends=[RCurl digest]; }; @@ -1600,7 +1624,8 @@ ROptRegTS = derive { name="ROptRegTS"; version="0.9.1"; sha256="1a8pbn63wh2w2n40 ROracle = derive { name="ROracle"; version="1.1-12"; sha256="1ydmckr0wzjgvhhh410l4ih7idbr8140g6v11avh655wffk02q5p"; depends=[DBI]; }; RPANDA = derive { name="RPANDA"; version="1.0"; sha256="1q8chhmdgn697a4qp4f7prdviar29z0py050748qw7ab326lqp5d"; depends=[ape picante pspline deSolve]; }; RPCLR = derive { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; }; -RPMG = derive { name="RPMG"; version="2.1-5"; sha256="1ck6bz72h1kwi7gg8vd0zw1q61pqv23rish84zri2p18z7nd9kvh"; depends=[]; }; +RPEnsemble = derive { name="RPEnsemble"; version="0.2"; sha256="1kbgpbk7gma0vhl0aybdj7bk2chhbggzh7h1w7snddgdvvj6cz10"; depends=[MASS class]; }; +RPMG = derive { name="RPMG"; version="2.1-7"; sha256="1nkmnqrys65vg377mys6qzpbwfh43adgy76c6jfdg336nf8qx2wd"; depends=[]; }; RPMM = derive { name="RPMM"; version="1.20"; sha256="09rwrcd8jz0nii1vx0n3b4daidiq0kp0vf88bvi84y4i06743il7"; depends=[cluster]; }; RPPairwiseDesign = derive { name="RPPairwiseDesign"; version="1.0"; sha256="0k2vh698rhs5a0b5vhyvrnnwqnagdzs591zx6hn9vbmm8rm4y1dm"; depends=[]; }; RPostgreSQL = derive { name="RPostgreSQL"; version="0.4"; sha256="0gpmbpiaiqvjzyl84l2l8v2jnz3h41v8jl99sp1qvvyrjrickra2"; depends=[DBI]; }; @@ -1610,13 +1635,14 @@ RPushbullet = derive { name="RPushbullet"; version="0.2.0"; sha256="1h9yvw9kw7df RQDA = derive { name="RQDA"; version="0.2-7"; sha256="05h2f5sk0a14bhzqng5xp87li24b6n11p5lcxf9xpy7sbmh5ig6g"; depends=[RSQLite gWidgetsRGtk2 RGtk2 DBI igraph gWidgets]; }; RQuantLib = derive { name="RQuantLib"; version="0.4.0"; sha256="1p2hd7wa5yi5ian2akb70pjr4glfni4dvwgglyg5pqmmm2j45k2d"; depends=[Rcpp Rcpp]; }; RRF = derive { name="RRF"; version="1.6"; sha256="1gp224mracrz53vnxwfvd7bln18v8x7w130wslhfgcdl0n4f2d28"; depends=[]; }; +RRTCS = derive { name="RRTCS"; version="0.0.1"; sha256="05ws5n2ajisdh4gfzmilvkz6jvvbl6fiwkcjzwm8bll2rhl916z4"; depends=[sampling samplingVarEst]; }; RRreg = derive { name="RRreg"; version="0.3.0"; sha256="0pip05wk76h436mvcsddhn2p25ihms3yf1lb23k7ygpx6jx4mdn3"; depends=[doParallel foreach]; }; RSA = derive { name="RSA"; version="0.9.8"; sha256="1pqblhimhj79ss8js0nf8w24ga2kdmgw64rh496iib36g27asn8n"; depends=[lavaan ggplot2 lattice tkrplot plyr RColorBrewer aplpack]; }; RSADBE = derive { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; }; RSAGA = derive { name="RSAGA"; version="0.93-6"; sha256="0wqiww0rx5fz4rbsb1x6pr2q0wz5dacj5fc0asj70igxwmh5x0p8"; depends=[gstat shapefiles plyr]; }; RSAP = derive { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[yaml reshape]; }; RSDA = derive { name="RSDA"; version="1.2"; sha256="06sa3x0abm2gnf4i4y3d5mlqj1wl7mzzal27sa1x65awzi6rs2kz"; depends=[sqldf XML scales FactoMineR ggplot2 glmnet abind scatterplot3d]; }; -RSEIS = derive { name="RSEIS"; version="3.3-3"; sha256="13fb4mx3sgnbrcn1kkxy0a490kikjrq49ii3x14xw2s8ci030wlr"; depends=[RPMG Rwave]; }; +RSEIS = derive { name="RSEIS"; version="3.4-5"; sha256="0wh7977vm721hb566lh721mwn6b4x0p7x6xb7gv0nvrd3kpsw9zn"; depends=[RPMG Rwave]; }; RSGHB = derive { name="RSGHB"; version="1.0.2"; sha256="0ffdx9lscbgknfqhvjdh3rwnlhiqxbpqa55jkn111a1vfv726v3d"; depends=[]; }; RSKC = derive { name="RSKC"; version="2.4.1"; sha256="1dvzxf001a9dg71l4bh8z3aia7mymqy800268qf7qzy9n6552g59"; depends=[flexclust]; }; RSNNS = derive { name="RSNNS"; version="0.4-6"; sha256="1p4gv2v9vzbgaksiibg66l9l9nabnm5lblc17md2cdcb6rygh3hp"; depends=[Rcpp Rcpp]; }; @@ -1629,6 +1655,7 @@ RSeed = derive { name="RSeed"; version="0.1.31"; sha256="0wljchzkp8800v9zcgjapkb RSelenium = derive { name="RSelenium"; version="1.3.5"; sha256="15pnmnljl4dm9gbcgnad5j58k6cgs6qm34829kdgyb0ygs9q7ya0"; depends=[RCurl RJSONIO XML caTools]; }; RSiena = derive { name="RSiena"; version="1.1-232"; sha256="0qp3bqq5p19bg47m37s2dw8m4q91hnkc2zxwhsgb076q0xvvv9xq"; depends=[Matrix]; }; RSiteCatalyst = derive { name="RSiteCatalyst"; version="1.4.3"; sha256="003mazcwz7w814pm8i9zdfmsbijf02n80w48ml4grmjjn1v7x5ar"; depends=[jsonlite httr plyr base64enc digest stringr]; }; +RSocrata = derive { name="RSocrata"; version="1.6.0-12"; sha256="0db1p3bxlh07d43rlg4cmj2gbasqd21mg8qnrrp8zkqasmjdzhn7"; depends=[httr jsonlite mime curl]; }; RSofia = derive { name="RSofia"; version="1.1"; sha256="0q931y9rcf6slb0s2lsxhgqrzy4yqwh8hb1124nxg0bjbxvjbihn"; depends=[Rcpp Rcpp]; }; RStars = derive { name="RStars"; version="1.0"; sha256="1siwqm8sp8wqbb56961drkwcnkv3w1xiy81hxy0zcr2z7rscv7mh"; depends=[RJSONIO RCurl]; }; RStorm = derive { name="RStorm"; version="0.902"; sha256="1apk358jwzg5hkrcq8h39rax1prgz9bhkz9z51glmci88qrw1frv"; depends=[plyr]; }; @@ -1637,7 +1664,7 @@ RSurvey = derive { name="RSurvey"; version="0.8-3"; sha256="0dqrajd3m2v5cd3afl9l RSvgDevice = derive { name="RSvgDevice"; version="0.6.4.4"; sha256="0vplac5jzg6bmvbpmj4nhiiimsr9jlbk8mzyifnnndk9iyf2lcmz"; depends=[]; }; RTConnect = derive { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; }; RTDE = derive { name="RTDE"; version="0.1-0"; sha256="00hh1axipp2blrhjwl9mc4fkqv3l132gxlhi9hdy52w20yhwigin"; depends=[]; }; -RTOMO = derive { name="RTOMO"; version="1.1-2"; sha256="15swp7jx5xmj87hjcfdar3r5sqnnb795qclf8b7l4bvx80h9nh2i"; depends=[RPMG GEOmap RSEIS splancs]; }; +RTOMO = derive { name="RTOMO"; version="1.1-3"; sha256="10qkqdx2zj2m854z9s57ddf5jbzagac9mq5v6z5393c0s8bx10x8"; depends=[RPMG GEOmap RSEIS splancs]; }; RTextTools = derive { name="RTextTools"; version="1.4.2"; sha256="1j3zfywq8xgax51mbizxz704i3ys4vzp8hyi5kkjzq6g2lw7ywq2"; depends=[SparseM randomForest tree nnet tm e1071 ipred caTools maxent glmnet tau]; }; RTextureMetrics = derive { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; }; RTriangle = derive { name="RTriangle"; version="1.6-0.6"; sha256="1g4dp792awbvsl35nvyd8gkx99p2njdcafin16qysfrjl43f5i4s"; depends=[]; }; @@ -1658,14 +1685,14 @@ RXKCD = derive { name="RXKCD"; version="1.7-5"; sha256="0dsds1bv2vfq61gfppar2ai2 RXMCDA = derive { name="RXMCDA"; version="1.5.3"; sha256="1pc52kvihxzq12p95r4srmnawxcsvd4r7252dajby338p56d1lw8"; depends=[XML kappalab]; }; RXshrink = derive { name="RXshrink"; version="1.0-8"; sha256="0l4aknr1vxrkxqsgkjcffs0731jskyzvl055a01vd8h4a0826n5s"; depends=[lars]; }; RYoudaoTranslate = derive { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; }; -RadOnc = derive { name="RadOnc"; version="1.0.9"; sha256="13fr838l38cvx84dx0k55p6riw5v86n7m51lg25is2fcyn17bq2r"; depends=[rgl geometry oro_dicom ptinpoly]; }; +RadOnc = derive { name="RadOnc"; version="1.1.0"; sha256="0gjrs78aaqbizzlcyjshc785ams3nclr503p4s2xsmd6sxj4khwi"; depends=[rgl geometry oro_dicom ptinpoly]; }; RadTran = derive { name="RadTran"; version="1.0"; sha256="1sb8d4y3b37akbxhdavxrkp34zn3ip061b7gzy0ga57pyn76cvpn"; depends=[ReacTran rootSolve]; }; RadioSonde = derive { name="RadioSonde"; version="1.4"; sha256="1v9jdpynmb01m3syhas1s08xxlvjawhlvjkyhils2iggi4xw4hiq"; depends=[]; }; Rambo = derive { name="Rambo"; version="1.1"; sha256="1yc04xsfkc54y19g5iwambgnlc49ixjjvfrafsgis2zh5w6rjwv8"; depends=[sna]; }; Ramd = derive { name="Ramd"; version="0.2"; sha256="0a64rp4dwhfr6vxsmya16x7wy7rxj4n98sdhhyy0ll850rdzlxd8"; depends=[]; }; RandVar = derive { name="RandVar"; version="0.9.2"; sha256="04hw4v2d9aa8z9f8wvwbzhbfy8zjl5q8mpl9b91q86fhh1yq5cz4"; depends=[distr distrEx]; }; RandomFields = derive { name="RandomFields"; version="3.0.62"; sha256="1v2dmwl3nq3mw88439z6hjaf3gkz9sf7dqm9iipgk333qw1s6sfk"; depends=[sp]; }; -RandomFieldsUtils = derive { name="RandomFieldsUtils"; version="0.0.1"; sha256="1nxq4sbgza0bsrspgs24mq9a7py9dhyx1dcaflpsvharc5m41ywc"; depends=[]; }; +RandomFieldsUtils = derive { name="RandomFieldsUtils"; version="0.0.2"; sha256="12vja6ilihy2xq78h6nj1i60vgd5b6pqr2knpw7yq1nix22v4qn9"; depends=[]; }; RankAggreg = derive { name="RankAggreg"; version="0.5"; sha256="1c5ckk2pfkdxs3l24wgai2xg817wv218fzp7w1r3rcshxf0dcz2i"; depends=[gtools]; }; RankResponse = derive { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; }; Rankcluster = derive { name="Rankcluster"; version="0.92.9"; sha256="172jjsyc6a5y32s2fb8z6lgcq6rcwjbk3xnc5vvkhj64amlyxla6"; depends=[Rcpp Rcpp RcppEigen]; }; @@ -1677,7 +1704,7 @@ Rbitcoin = derive { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhp Rborist = derive { name="Rborist"; version="0.1-0"; sha256="1irb9scl68m7skqdwny9kvnzg7f1r0q1c0whzqyhhj9l4lw16hmr"; depends=[Rcpp Rcpp RcppArmadillo]; }; Rcapture = derive { name="Rcapture"; version="1.4-2"; sha256="1nsxy5vpfv7fj03i6l5pgzjm0cldwqxxycnvqkfkshbryjcyl0ps"; depends=[]; }; Rcgmin = derive { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; }; -Rchoice = derive { name="Rchoice"; version="0.2"; sha256="06xlz8ii1w42wcvkymxv68dn8pzvnn3xbyarplmdalv4p8c4jchk"; depends=[Formula maxLik msm plm plotrix]; }; +Rchoice = derive { name="Rchoice"; version="0.3"; sha256="1ac2nw03g66z2rgxzv8jqad74cp4c9ry0hvnw77d57ddaxszkrva"; depends=[Formula maxLik msm plm plotrix]; }; Rclusterpp = derive { name="Rclusterpp"; version="0.2.3"; sha256="02s5gmmmd0l98wd1y884pjl3h289dyd9p9s7dh7yl2zaslqs2094"; depends=[Rcpp RcppEigen Rcpp RcppEigen]; }; Rcmdr = derive { name="Rcmdr"; version="2.1-7"; sha256="1qn0bfh36shdnm2qbjwggjv19vqkkhng82x39sdbljx0z3g3bmdg"; depends=[RcmdrMisc car tcltk2 abind]; }; RcmdrMisc = derive { name="RcmdrMisc"; version="1.0-2"; sha256="18by1b1iz7q6lbnhxj5l5w58fqsvki84d830sv7iyzrs2q6n7vhq"; depends=[car sandwich abind Hmisc MASS e1071]; }; @@ -1720,11 +1747,11 @@ RcmdrPlugin_survival = derive { name="RcmdrPlugin.survival"; version="1.0-5"; sh RcmdrPlugin_temis = derive { name="RcmdrPlugin.temis"; version="0.7.3"; sha256="1ssnky8basr135lhnagq7dlwlj1c9qrvm14hbdm0k3g9gnqmxkgh"; depends=[tm NLP slam zoo lattice Rcmdr tcltk2 ca R2HTML RColorBrewer latticeExtra stringi]; }; Rcolombos = derive { name="Rcolombos"; version="1.5.2"; sha256="1whjn447jk2bjyjf0fwl0165f8x41fjzmkmagl6dfq1c4373sf27"; depends=[httr]; }; Rcplex = derive { name="Rcplex"; version="0.3-2"; sha256="1hx9s327af7yawzyq5isvx8n6pvr0481lrfajgh8nihj7g69nmk7"; depends=[slam]; }; -Rcpp = derive { name="Rcpp"; version="0.11.5"; sha256="0vmdprnf2i0hvy4pz5v0zdvwgyfv1kgmiwdgjjxppz5p84n59xs9"; depends=[]; }; +Rcpp = derive { name="Rcpp"; version="0.11.6"; sha256="153gwzg2inxmzs5qrr87r3zabjvfh32i8kdivdy77b3c5yfrl5za"; depends=[]; }; Rcpp11 = derive { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; }; RcppAPT = derive { name="RcppAPT"; version="0.0.1"; sha256="0fyya80bd3w22qbsbznj9y21dwlj30a16d8a8kww4x8bpvmyil5z"; depends=[Rcpp Rcpp]; }; -RcppAnnoy = derive { name="RcppAnnoy"; version="0.0.5"; sha256="1acgwwcgb7qqvwg3j0qk7jvk3nb76zw0lqn8bswywvgawalw49ah"; depends=[Rcpp Rcpp BH]; }; -RcppArmadillo = derive { name="RcppArmadillo"; version="0.4.650.1.1"; sha256="1i11nnkbzhk0sckj29fza32g45jkkjh11yx4q78byhawpr8s30jq"; depends=[Rcpp Rcpp]; }; +RcppAnnoy = derive { name="RcppAnnoy"; version="0.0.6"; sha256="1n4wrllhxn95lgkralvw5jjgff93nay5wdlyihih7f195fq5wqms"; depends=[Rcpp Rcpp]; }; +RcppArmadillo = derive { name="RcppArmadillo"; version="0.5.100.1.0"; sha256="0126g932fq24ns4yzj3z2dwagdy9qb7ckprk30zs7alq6rayfmn5"; depends=[Rcpp Rcpp]; }; RcppBDT = derive { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[Rcpp Rcpp BH]; }; RcppCNPy = derive { name="RcppCNPy"; version="0.2.4"; sha256="1cawaxghbliy7hgvqz3y69asl43bl9mxf46nwpbxc0vx3cq15fnk"; depends=[Rcpp Rcpp]; }; RcppClassic = derive { name="RcppClassic"; version="0.9.6"; sha256="1xhjama6f1iy7nagnx1y1pkqffrq8iyplllcar24vxr0zirgi1xi"; depends=[Rcpp Rcpp]; }; @@ -1742,11 +1769,12 @@ RcppRedis = derive { name="RcppRedis"; version="0.1.3"; sha256="0xpldiny2n121dp7 RcppRoll = derive { name="RcppRoll"; version="0.2.2"; sha256="19xzvxym8zbighndygkq4imfwc0abh4hqyq3qrr8aakyd096iisi"; depends=[Rcpp Rcpp]; }; RcppSMC = derive { name="RcppSMC"; version="0.1.4"; sha256="1gcqffb6rkw029cpzv7bzsxaq0a5b032zjvriw6yjzyrpi944ip7"; depends=[Rcpp Rcpp]; }; RcppStreams = derive { name="RcppStreams"; version="0.1.0"; sha256="0pb9ri2jajfh7643wx730bkmpvjvvmip682ynm2yn6x6brjll6jf"; depends=[Rcpp Rcpp BH]; }; +RcppTOML = derive { name="RcppTOML"; version="0.0.3"; sha256="0v9gxbr5gb7k273ld6vx2n0vzy22px13s7cvackbm7mhc68bp5jw"; depends=[Rcpp Rcpp]; }; RcppXts = derive { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts Rcpp xts]; }; RcppZiggurat = derive { name="RcppZiggurat"; version="0.1.2"; sha256="05ai6s2j025fvr4znpmsvhxj4x7xyw2wsb9j3c5sv7aw1byfs0bb"; depends=[Rcpp Rcpp RcppGSL]; }; Rcsdp = derive { name="Rcsdp"; version="0.1.53"; sha256="0x91hyx6z9f4zd7djxlq7dnznmr9skyzwbbcbjyid9hxbcfyvhcp"; depends=[]; }; Rd2roxygen = derive { name="Rd2roxygen"; version="1.6"; sha256="0y0vh1dfflh8lrgrdj9wfmwh70ywd9kiia49f09h849mv1ln1z60"; depends=[roxygen2 formatR]; }; -Rdistance = derive { name="Rdistance"; version="1.2.1"; sha256="0ci0dg8j28a6b4s4i53p3sahcr4czw9fhrkd14q30wcd9is8dgkz"; depends=[]; }; +Rdistance = derive { name="Rdistance"; version="1.2.2"; sha256="0njfcgcaw8vkvayd102wd5cdp1ai9ghqhi8zsijv6iifxs6yvwq9"; depends=[]; }; Rdpack = derive { name="Rdpack"; version="0.4-14"; sha256="19vscr9l63c074n76b6a6jbl956sphjhz0d50yiwp3cvqf28yssf"; depends=[gbRd bibtex]; }; Rdsdp = derive { name="Rdsdp"; version="1.0.2"; sha256="0rpy3897dargrfrn6qd5m1j6i1pvfk2qa3cny0iacqkgqbg8a4wx"; depends=[]; }; Rdsm = derive { name="Rdsm"; version="2.1.1"; sha256="07fc6c2hv0vvg15va552y54cla1mrqsd75w3zh02vc7yd226l4rj"; depends=[bigmemory]; }; @@ -1762,7 +1790,7 @@ RegressionFactory = derive { name="RegressionFactory"; version="0.7.1"; sha256=" RelValAnalysis = derive { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; }; Reliability = derive { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; }; ReliabilityTheory = derive { name="ReliabilityTheory"; version="0.1.4"; sha256="1faab4z3rp0xqc0s0rrkw4kxgyc332xz3sjaz1wd4p6kiydds2hi"; depends=[igraph sfsmisc combinat FRACTION mcmc PhaseType actuar HI]; }; -Renext = derive { name="Renext"; version="2.1-0"; sha256="19920kb3qd97vm285zbxqarpq8dyyrx1k6sks990xjbgpy7vyj3y"; depends=[evd numDeriv]; }; +Renext = derive { name="Renext"; version="2.1-10"; sha256="1c18v9xya73j8qnqvkb4fc7bfvzxnw904z5n9n9rgch70nrccqfn"; depends=[evd numDeriv]; }; RenextGUI = derive { name="RenextGUI"; version="1.0-2"; sha256="0ghs8bwb6qdyvhghxvdy51cibylgm7bdbzgqsn1nbxam39yhvfv9"; depends=[gWidgets gWidgetstcltk Renext]; }; Reol = derive { name="Reol"; version="1.55"; sha256="0147x3fvafc47zd2chgv3b40k480pcjpji8vm1d741i1p6ml448p"; depends=[XML RCurl ape]; }; ReorderCluster = derive { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp Rcpp]; }; @@ -1786,6 +1814,7 @@ Rjpstatdb = derive { name="Rjpstatdb"; version="0.1"; sha256="0iwgsp3mblp7bsx88w Rlab = derive { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; }; Rlabkey = derive { name="Rlabkey"; version="2.1.127"; sha256="1bacl4ax9bgn27180hgh6gr4y0bwl3q4y18mc0cyb06yagzci5d9"; depends=[RCurl rjson]; }; Rlibeemd = derive { name="Rlibeemd"; version="1.3.2"; sha256="0db6x2cry011ymmfy1pxgdyjdn6l93d8wmixp59r51yij2s775xq"; depends=[Rcpp Rcpp]; }; +Rlinkedin = derive { name="Rlinkedin"; version="0.1"; sha256="0w30zv4a842vckk4yqsh8hhkdz2gy650a0x29aacp77p9y79g9yn"; depends=[httr XML httpuv]; }; Rmalschains = derive { name="Rmalschains"; version="0.2-2"; sha256="1ki3igj78sk4kk1cvbzrgzjdvw6kbdb7dmqglh6ws2nmr5b6a7fx"; depends=[Rcpp Rcpp]; }; Rmisc = derive { name="Rmisc"; version="1.5"; sha256="1ijjhfy3v91fspid77rrkc5dkcb2lav37wc3f4k5lwrn24wzy5y8"; depends=[lattice plyr]; }; Rmixmod = derive { name="Rmixmod"; version="2.0.2"; sha256="1qv6zymkgsbplrq4aa87lvcsv75dssj8qqq2h9665v31jsgx84lr"; depends=[Rcpp Rcpp]; }; @@ -1813,7 +1842,7 @@ RoughSets = derive { name="RoughSets"; version="1.2-1"; sha256="06bykfd26qdll0xa Rpdb = derive { name="Rpdb"; version="2.2"; sha256="0gf6qab05a3ky8skbbjiadizi1gs4pcw3zp25qj5gn82lb6382pd"; depends=[rgl]; }; Rphylip = derive { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; }; Rpoppler = derive { name="Rpoppler"; version="0.0-1"; sha256="01zsbm538yhwm1cyz5j6x2ngz05yqj16yxyvyxqhn6jp8d0885jh"; depends=[]; }; -Rquake = derive { name="Rquake"; version="2.2"; sha256="0gkarqqhmiakc968ffwywkwy7npm1ly5gd6bbhr8fjfwdnhjam5n"; depends=[RPMG RSEIS GEOmap MBA minpack_lm rgl]; }; +Rquake = derive { name="Rquake"; version="2.3-1"; sha256="0xb8j76jjv6k3r8nzjxdddic4rq1yj7qsh85asl38qwj7483cyc4"; depends=[RPMG RSEIS GEOmap MBA minpack_lm rgl cda]; }; Rramas = derive { name="Rramas"; version="0.1-4"; sha256="191rm2ylvf3ffc9i4wpjvfbsinmw7s1m0wcq24j4qs4fxg8qqzyq"; depends=[diagram]; }; Rrdrand = derive { name="Rrdrand"; version="0.1-10"; sha256="1j72v44scmghm29jxjdy0651qlkhsnrb3bb5qff82451mbd17bzb"; depends=[]; }; Rsampletrees = derive { name="Rsampletrees"; version="0.1"; sha256="02wh99nxlhyrivr655825nqcl3w0mvppnmvc9yrkdbkjw0l1zsjd"; depends=[haplo_stats ape]; }; @@ -1832,7 +1861,7 @@ Runuran = derive { name="Runuran"; version="0.21.0"; sha256="1p33z9h2zj6fx42rlq6 RunuranGUI = derive { name="RunuranGUI"; version="0.1"; sha256="0wm91mzgd01qjinj94fr53m0gkxjvx7yjhmwbkrxsjn6mjklq72l"; depends=[Runuran rvgtest gWidgets gWidgetsRGtk2 cairoDevice]; }; Rvcg = derive { name="Rvcg"; version="0.11"; sha256="0id732zhncy6x47qdbyddcm3f8l1r4j53ya4qj3zcf81q15dadw0"; depends=[Rcpp Rcpp RcppEigen]; }; Rvmmin = derive { name="Rvmmin"; version="2013-11.12"; sha256="1ljzydvizbbv0jv5lbfinypkixfy7zsvplisb866f8w45amd152a"; depends=[optextras]; }; -Rwave = derive { name="Rwave"; version="2.2"; sha256="1aqscnq7cr53nnddbjdqfjyrj8l76h9wcqr43i7fpa7g6hamvbwd"; depends=[]; }; +Rwave = derive { name="Rwave"; version="2.4"; sha256="1ynj6higx0j6iv033lx8h3i9hlg5b53nl2gv6fwjny4ygm8b1mjm"; depends=[]; }; Rwinsteps = derive { name="Rwinsteps"; version="1.0-1"; sha256="0kzngkan9vydibnr3xm4pyz4v6kz0r4h19f0ngqpri07fkhdsxzd"; depends=[]; }; RxCEcolInf = derive { name="RxCEcolInf"; version="0.1-3"; sha256="04d6ffl4qs2vjbk0ibvyq17i2l26qnvxr72s6p3f8q4px33rh4kh"; depends=[MASS MCMCpack mvtnorm lattice]; }; RxnSim = derive { name="RxnSim"; version="1.0.1"; sha256="17agz3kw7pj4mpl25y1n8l9lqfj63wn70rqpdkcpnx7j6s6933vx"; depends=[rJava fingerprint data_table rcdk]; }; @@ -1869,7 +1898,7 @@ SE_IGE = derive { name="SE.IGE"; version="1.0"; sha256="0gx3kdsdl3rjms6fxabxz51z SEAsic = derive { name="SEAsic"; version="0.1"; sha256="1mg01sag6n1qldjvmvbasac86s7sbhi4k99kdkav2hdh6n9jg467"; depends=[]; }; SECP = derive { name="SECP"; version="0.1-4"; sha256="0a4j0ggrbs0jzcph70hc4f5alln4kdn2mrkp3jbh321a6494kwl1"; depends=[SPSL]; }; SEER2R = derive { name="SEER2R"; version="1.0"; sha256="0lk0kkp8sv3nl19zwqd7449mmjxsj3pqpzdmqf70qf8xh2pqyvzd"; depends=[]; }; -SEERaBomb = derive { name="SEERaBomb"; version="2014.4.1"; sha256="1vlk6hcn05vdjfc7c8dhvsd1hc2yq1pdmhb7i48b689lkxg82igz"; depends=[RSQLite LaF]; }; +SEERaBomb = derive { name="SEERaBomb"; version="2015.1"; sha256="1pab5088pjhsx0lwh2xgm7hril0qpb0jprwm61d8c30bgrrqxni9"; depends=[RSQLite LaF dplyr rgl XLConnect Rcpp reshape2 mgcv DBI Rcpp]; }; SEL = derive { name="SEL"; version="1.0-2"; sha256="1nrk0fx6ff330abq8askvp0790xnfv00m3sraqcr32hciw6ks421"; depends=[quadprog lattice]; }; SEMID = derive { name="SEMID"; version="0.1"; sha256="1bxdjdyqlvxz339jdgw90qi6kvfhjdmga38vhfl3ldlxfv2s9gfk"; depends=[igraph]; }; SEMModComp = derive { name="SEMModComp"; version="1.0"; sha256="1za67470f13z8jsy3z588c7iiiz993d3vjqrb8v9fann2r6sf1md"; depends=[mvtnorm]; }; @@ -1886,9 +1915,10 @@ SIMMS = derive { name="SIMMS"; version="1.0.1"; sha256="08kl9kzxqmzlacs8jfys0w7r SIN = derive { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; }; SINGLE = derive { name="SINGLE"; version="1.3"; sha256="0wd7jzys51rnwr5rhf2llpygqxydjrv0dill19v8sz9w0madkil4"; depends=[flsa igraph dse Matrix]; }; SIS = derive { name="SIS"; version="0.7-5"; sha256="197zf4s4f5wm8sl9h5vxwywmml7n05fwqlxbldn6wkpxix7gx0xm"; depends=[glmnet ncvreg survival]; }; -SKAT = derive { name="SKAT"; version="1.0.1"; sha256="03kc9df36kg9q1qr5l5zvfq3i5h5gz5f2m0mh054m6x76s796k1z"; depends=[]; }; +SKAT = derive { name="SKAT"; version="1.0.7"; sha256="0f8ln37871qsnxfcfcrnq91krcgwd85cz6g0p78px4yg3g4jwsn3"; depends=[]; }; SLC = derive { name="SLC"; version="0.3"; sha256="0l0y1sjj0glsb7vwla99ijclcgaq2y85bgz1wqm348n4shsmm2rs"; depends=[]; }; SLHD = derive { name="SLHD"; version="2.1-1"; sha256="0y3ilxd0phmks8zkmpgw7p5zrkwq4k95h976cwk58pavvhfwj9kb"; depends=[]; }; +SLOPE = derive { name="SLOPE"; version="0.1.1"; sha256="1v58jcd60i7hhs8wirdfqr1sskdrynnwcnqsr3q19vgnj4x1dn8f"; depends=[Rcpp Rcpp]; }; SMC = derive { name="SMC"; version="1.1"; sha256="1r4ajgi785lmpnlxrba0n6phmk1f0mb6b5yqk6hx8gng2w8ggclz"; depends=[]; }; SMCP = derive { name="SMCP"; version="1.1.3"; sha256="0ksx2ibz849vhrz2px9p7z8hlgvspz7kxhadvhk5mhkfbhrnpdf0"; depends=[]; }; SMCRM = derive { name="SMCRM"; version="0.0-3"; sha256="1x06w00sdijhg5h1s61q4ym5wgk97pw9md6api7if2cxjv7h5zcy"; depends=[]; }; @@ -1922,7 +1952,7 @@ SPIAssay = derive { name="SPIAssay"; version="1.0.0"; sha256="1rwa2iicwdm7z8khln SPIn = derive { name="SPIn"; version="1.1"; sha256="109xxrg7bsmmfd6ik85kxrw2qclxbh5ipsh5mmrdl4hki3hnyp2s"; depends=[quadprog]; }; SPMS = derive { name="SPMS"; version="2.0"; sha256="150kb4gjiksp3kc7p9j5zqc4955rq4fb27as71z89h23mkswz5r5"; depends=[Matrix]; }; SPODT = derive { name="SPODT"; version="0.9-1"; sha256="01yq429a4s63855bwpn2mqjj2k3cz4187kfpi7n7qqdpdvmxz109"; depends=[rgdal sp tree]; }; -SPOT = derive { name="SPOT"; version="1.0.4184"; sha256="0rikfs2rha7q2xbycvky8si2ccgmamcn662g8ni105cr6m9hvvpc"; depends=[rpart emoa]; }; +SPOT = derive { name="SPOT"; version="1.0.5543"; sha256="0y8rj0wxy8sdk7si9k11i4pb96vp1q78h48ihs4r7d383zykk827"; depends=[rpart emoa twiddler rgl AlgDesign randomForest rsm MASS mco]; }; SPREDA = derive { name="SPREDA"; version="1.0"; sha256="1dyqsra899fd1nbk1b7vkw8gs455c6pbcvzw84q9iri77186xqhv"; depends=[survival nlme]; }; SPRT = derive { name="SPRT"; version="1.0"; sha256="1r4pfqh8k5avi8qgpk5x1cy8lmkn341yvjvd2r7wqwb3mr242r0v"; depends=[]; }; SPSL = derive { name="SPSL"; version="0.1-8"; sha256="1jg1nfhz8qml1wwqa4d0w7vkdmbgdy5xlfqx0h2pdw2z8iij3xxc"; depends=[]; }; @@ -1932,8 +1962,8 @@ SQN = derive { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghf SQUAREM = derive { name="SQUAREM"; version="2014.8-1"; sha256="17fn37da4zslbfq5h4f3dfwyw1dxj5y2rgly3vjl2c4k5bnwxxqw"; depends=[]; }; SRCS = derive { name="SRCS"; version="1.0"; sha256="0aha9fqdigvsx8dvck4y2yb8c7v58rivz50z0xwi0bhwzdddx52f"; depends=[]; }; SRRS = derive { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[tcltk2 gtools]; }; -SSDforR = derive { name="SSDforR"; version="1.4.8"; sha256="0bypbcb2d79cc4pl2i7c95l9lg65p66h5xl4sf2akpmffb3vf953"; depends=[psych TTR MASS TSA]; }; -SSN = derive { name="SSN"; version="1.1.4"; sha256="0n6xxbhvbqs15zn7w66vsr98adibfyr2qa0w7pfbw6vmrrmmn23z"; depends=[RSQLite sp MASS igraph maptools lattice BH]; }; +SSDforR = derive { name="SSDforR"; version="1.4.9"; sha256="1ka6zy77ml4kccfqjszvijh9dvlhzcp7fhsd2zsirsn6sdz0wrp0"; depends=[psych TTR MASS TSA]; }; +SSN = derive { name="SSN"; version="1.1.5"; sha256="1iymq6zzs3zfbjkz7h2ss8djdzvw2b3n68qazvw8vnrnkq3iyzry"; depends=[RSQLite sp MASS igraph maptools lattice BH]; }; SSrat = derive { name="SSrat"; version="1.0"; sha256="1qpsdfdngsgxx3mqgn4avl65w4v5v4jwsh1nnxzfn9iqi9mg4bhi"; depends=[plyr sna]; }; SSsimple = derive { name="SSsimple"; version="0.6.4"; sha256="0p7d4hx7mhn5myq8ajcij6hhg79rjxigk5v8z93yfdw4gjcb5wad"; depends=[mvtnorm]; }; STAR = derive { name="STAR"; version="0.3-7"; sha256="1g78j4iyh78li1jaa3zz5qv4p41cg0imhmvbfakd34l32ppih4ll"; depends=[survival mgcv R2HTML gss codetools]; }; @@ -1951,6 +1981,7 @@ SampleSizeMeans = derive { name="SampleSizeMeans"; version="1.1"; sha256="1wbc46 SampleSizeProportions = derive { name="SampleSizeProportions"; version="1.0"; sha256="0mvkvx3nni0l8ys68sq3h2zlbjvksdcdzxqlf03k0ca5bbcmdf9l"; depends=[]; }; SamplerCompare = derive { name="SamplerCompare"; version="1.2.6"; sha256="1n94fp6frawlbxcnvi0v6lhgs3yyc47lj1r46y3jg6zb9z3va3fa"; depends=[mvtnorm]; }; SamplingStrata = derive { name="SamplingStrata"; version="1.0-3"; sha256="16nrcv5hbbvn4rgckzagi84i7h49bd878mnpknlzmzr5ykzywsay"; depends=[]; }; +Scale = derive { name="Scale"; version="1.0.4"; sha256="1fa3840kji34qpbw6mxfavk8wq0vq0vx2w6ya71idbkxnvwc3y06"; depends=[psych Hmisc MASS]; }; SciViews = derive { name="SciViews"; version="0.9-5"; sha256="199waafpn0ndg7szwfhw2jlgcx1f0pv7j0vix2vzz60knwm698xb"; depends=[MASS ellipse]; }; SciencesPo = derive { name="SciencesPo"; version="1.02.12"; sha256="0v947xjfwyidl2fa6i7drvv9vnskz06kq4rmz46qzns7g0lwfjnq"; depends=[ggplot2 foreign MASS data_table lubridate xtable]; }; ScoreGGUM = derive { name="ScoreGGUM"; version="1.0"; sha256="0f7sjfr3a8b8y1n9lrwyiyyljls3rbz84d9s93psi2fnmjj0kvgw"; depends=[]; }; @@ -2017,9 +2048,11 @@ SpatialEpi = derive { name="SpatialEpi"; version="1.2.1"; sha256="02mvahpbrlcnxm SpatialExtremes = derive { name="SpatialExtremes"; version="2.0-0"; sha256="0fjh4cjzljwzxk4bhcrff9wnkskaiawbj7z6swrj1xl35mq4dljx"; depends=[]; }; SpatialNP = derive { name="SpatialNP"; version="1.1-1"; sha256="108gxk0gbbjck9bgxvqb9h216ww21lmh2by0hrhzwx5r63hhcbmd"; depends=[]; }; SpatialPack = derive { name="SpatialPack"; version="0.2-3"; sha256="1gs0x3wj3hj663m6kszwhy3ibcx0lrslr127miy1rhz8683ij71c"; depends=[]; }; +SpatialPosition = derive { name="SpatialPosition"; version="0.9"; sha256="0w09yrn32pis4w3hkbghkgwpyy7mnnzzkhhp289xl738lymv207a"; depends=[raster sp]; }; SpatialTools = derive { name="SpatialTools"; version="0.5.8"; sha256="18zchr8bfjqdr9j6vh6365mhrj2n0ns1ixvmas5s0ppiim59jl7j"; depends=[spBayes Rcpp Rcpp RcppArmadillo]; }; SpatialVx = derive { name="SpatialVx"; version="0.2-2"; sha256="16qww58az1523pk8b4b5hzqnpb8djgvph2ykf6bjp8zz5qdfyhjs"; depends=[spatstat fields smoothie smatr turboEM distillery maps boot CircStats fastcluster waveslim]; }; SpatioTemporal = derive { name="SpatioTemporal"; version="1.1.7"; sha256="0rc5zf8cnjw59azgqmslfz2dl5i17dfmb7ls5c849qybp2gn2zdv"; depends=[Matrix MASS]; }; +SpecHelpers = derive { name="SpecHelpers"; version="0.1.6"; sha256="1h14a1rsk7x5qafn4hcpmannkdf2wdphkzaa3b6nbb9jqjs1szi0"; depends=[gsubfn]; }; SpeciesMix = derive { name="SpeciesMix"; version="0.3.1"; sha256="0wl15k00d7n9pmnp1kr28p05z4vrziprcdndw77kwkcgv51cvllk"; depends=[MASS numDeriv]; }; SpecsVerification = derive { name="SpecsVerification"; version="0.3-0"; sha256="19vr4xlx9gx0ph6k2kf59bpbhmzncm1mmzz7ld3pjc7k4jfba3np"; depends=[]; }; SpherWave = derive { name="SpherWave"; version="1.2.2"; sha256="1wd9pql97m1zl0axzpkfq9sxadrm5cfax0gxh0ncqadaq7w7lml4"; depends=[fields]; }; @@ -2033,7 +2066,7 @@ Stack = derive { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvl StanHeaders = derive { name="StanHeaders"; version="2.6.0-10"; sha256="0bw11myc16ddi1qhh8dcsf8dqg6dcp1wjbyrp5p98dcc1rym7kmg"; depends=[]; }; StandardizeText = derive { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; }; Stat2Data = derive { name="Stat2Data"; version="1.6"; sha256="0pk68ffc6ffpddfpf9wi8ch39h6k3r80kldld3z5pnql18rc8nvx"; depends=[]; }; -StatDA = derive { name="StatDA"; version="1.6.7"; sha256="140hqg56axwg5ckfr4n4rr453ppsgf5bmmd7kg4mai1xnj4wmg8b"; depends=[geoR sgeostat cluster e1071 MASS MBA mgcv rgl robustbase xtable]; }; +StatDA = derive { name="StatDA"; version="1.6.9"; sha256="01bjygis14b3yfsfkjbvy0zlhjxysjf46cfcw8p4a4lwik3qp03b"; depends=[geoR sgeostat cluster e1071 MASS MBA mgcv rgl robustbase xtable]; }; StatDataML = derive { name="StatDataML"; version="1.0-25"; sha256="05s9kbrjl2wsfccgav34b02m06q62r3iyjd0ndr6xcqlw9x2w2ya"; depends=[XML]; }; StatMatch = derive { name="StatMatch"; version="1.2.3"; sha256="10y9xaclxrw65v3k9qwdm7lvvf1kxpssc9nx0f15m8xkw5hhm7pa"; depends=[proxy clue survey RANN lpSolve]; }; StatMeasures = derive { name="StatMeasures"; version="1.0"; sha256="1bnbz803xx8kqhy1cx545b35si6f10za0mp5z82qfvd4kv9a9izz"; depends=[data_table]; }; @@ -2045,7 +2078,7 @@ StereoMorph = derive { name="StereoMorph"; version="1.4"; sha256="0xar1vx05q6dbf Storm = derive { name="Storm"; version="1.2"; sha256="1fg8y9my9yp6px1gh43mr3m2s2z262mzq03pj52mqg3n186vk8z3"; depends=[permute rjson]; }; StrainRanking = derive { name="StrainRanking"; version="1.1"; sha256="0q6k90if74320mrs2ccq2izynylr8zakciwbc2c6ms0v57aalwic"; depends=[]; }; StratSel = derive { name="StratSel"; version="1.1"; sha256="0l08v71qmd170027y5vjnvgfm8kqvgaqrpms9msxhv8g5974kla8"; depends=[MASS memisc Formula mnormt]; }; -StreamMetabolism = derive { name="StreamMetabolism"; version="1.0"; sha256="03pr7i1c3qddqwibfc2x08d2nh8fih02k7a1xhqs1awfs43x56is"; depends=[zoo chron maptools]; }; +StreamMetabolism = derive { name="StreamMetabolism"; version="1.1.1"; sha256="1r9p6awf3a2d08w9rdlggkwlfhksn14xbhdhdnmxz79ym5mgdd8f"; depends=[zoo chron maptools]; }; StressStrength = derive { name="StressStrength"; version="1.0.1"; sha256="15sgdisgz8zcq4i9z4zm7isr5ckyd7bk6yl1g7a5kngams282ipx"; depends=[]; }; SubCultCon = derive { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; }; SubLasso = derive { name="SubLasso"; version="1.0"; sha256="12m7ynlqhikjhavd12bhsd04s9cpv8aq5xgm875i10mb3ldpd1bd"; depends=[glmnet psych gplots]; }; @@ -2071,8 +2104,9 @@ TAQMNGR = derive { name="TAQMNGR"; version="2015.2-1"; sha256="0j7qb15xy4g4ff0cm TBEST = derive { name="TBEST"; version="5.0"; sha256="15piy507vv8x59xgga17splxszy0vm87qjbfgxycvba633jishsa"; depends=[signal fdrtool]; }; TBSSurvival = derive { name="TBSSurvival"; version="1.2"; sha256="12ipgffympqjjg8l9gbich5pgz0pqr5g07b0il26rr721xiyxk5v"; depends=[normalp survival mcmc R_utils coda Rsolnp BMS]; }; TDA = derive { name="TDA"; version="1.3"; sha256="1f9f5v8c0ynxz8p4kr9w08c4icf0840h7iay8k1ydh5zmr43d7lk"; depends=[FNN igraph scales]; }; +TDCor = derive { name="TDCor"; version="0.1-1"; sha256="001rmwi2v4vy1b2d7wwvvca4xnkizz8dmys3q3xbjv7wrfxyvai8"; depends=[deSolve]; }; TDD = derive { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[signal RSEIS pracma]; }; -TDMR = derive { name="TDMR"; version="1.2"; sha256="0w056qxh7c56m3p6jlrp8fv2j2r1njxzgwzk3l1lhyxr94gff263"; depends=[testit SPOT]; }; +TDMR = derive { name="TDMR"; version="1.3"; sha256="0bbd2an18ayxaxprsjqrybb877lkk74dpxbvbv7qdwc1ivqm8g96"; depends=[SPOT twiddler testit adabag]; }; TDboost = derive { name="TDboost"; version="1.1"; sha256="1pyqssqxkr9bwyz4h1l5isbb78asmvddy20vyxq8snxra2r06hbf"; depends=[lattice]; }; TED = derive { name="TED"; version="1.1.1"; sha256="0nb2arx7c1m8ymnkmj3jwbcw23vhkr1f3vlym2hqs0pq0lnsl4g0"; depends=[foreach zoo fields animation geoR RcppArmadillo]; }; TEEReg = derive { name="TEEReg"; version="1.0"; sha256="1xpr4m8yamifjx7njb7dyqv51rsbjym9c5avflf69r9sazf3n503"; depends=[]; }; @@ -2086,7 +2120,7 @@ TFX = derive { name="TFX"; version="0.1.0"; sha256="0xrjdbvg0ng4i0s8ql1pfyma10x4 TH_data = derive { name="TH.data"; version="1.0-6"; sha256="1kx6z8lj1l2vxi7vhx47sly65grjkm3wvrbr3nl52q1vdmy1xsgm"; depends=[]; }; TIMP = derive { name="TIMP"; version="1.12.1"; sha256="06zjpa9j4sr62f2lspa75i7n8xcf4xdgxq2zjbzsx4f0p0nf5ymj"; depends=[fields vcd gplots colorspace gclus nnls deSolve minpack_lm MASS]; }; TInPosition = derive { name="TInPosition"; version="0.13.6"; sha256="1cxxrfpbiyknaivv6gyp79lz0rxwhrndcd054smksxq8zcfz0v7c"; depends=[prettyGraphs TExPosition ExPosition InPosition]; }; -TKF = derive { name="TKF"; version="0.0.3"; sha256="0kdrza02nn4vkfpc5kwpywls24adhj3kywa5w83v4wpx8dmmh10z"; depends=[expm numDeriv]; }; +TKF = derive { name="TKF"; version="0.0.8"; sha256="1db87lwx26ayv1x2k8qd9dfr6j3jkvdl9ykisaxr42l6akqy21nr"; depends=[expm numDeriv ape phytools phangorn]; }; TPmsm = derive { name="TPmsm"; version="1.2.0"; sha256="1670b9g6sqlg5xk76x77cph1wzp44yp957sn8px5k7kkb1hgi0pl"; depends=[KernSmooth]; }; TR8 = derive { name="TR8"; version="0.9.13"; sha256="07wrqwa5gf1l1y3b07mganr5xkzxdzrh6lrv7gf01m9b7bsz564m"; depends=[RCurl XML taxize plyr rappdirs gWidgets gWidgetstcltk gdata]; }; TRAMPR = derive { name="TRAMPR"; version="1.0-7"; sha256="135ylhijhpdxpznfdbdzwfsvy8bhw1yx28c3520a3lyrqvinpawg"; depends=[]; }; @@ -2096,24 +2130,22 @@ TRSbook = derive { name="TRSbook"; version="1.0.1"; sha256="1w2yl5pchw2vn9l3qnm1 TSA = derive { name="TSA"; version="1.01"; sha256="0cm97hwxm6vfgy9mc3kgwq6dnmn86p8a4avnfjbai048qnwrn6hx"; depends=[leaps locfit mgcv tseries]; }; TSEN = derive { name="TSEN"; version="1.0"; sha256="1pn313g2ylbjc37rqcakd797vffnh7v0rgg1xl5wjyvcgmm5mxix"; depends=[ncdf]; }; TSHRC = derive { name="TSHRC"; version="0.1-3"; sha256="18ygg7bqwg1pdqi52l1lf33gcd277895rlf5853yzh7ln2ivssmi"; depends=[]; }; -TSMySQL = derive { name="TSMySQL"; version="2013.9-1"; sha256="1ls3mpp5xq707vgv8l14cfbw1vn4ygy4d9n19nw5mnl3izz4p0pk"; depends=[TSdbi RMySQL DBI tframe TSsql]; }; +TSMySQL = derive { name="TSMySQL"; version="2015.4-1"; sha256="1gdda7li320ba9qfxfl5c4cwl2ln5jdbvid98cryj175g0nbmx7b"; depends=[TSdbi DBI tframe TSsql RMySQL]; }; TSP = derive { name="TSP"; version="1.1-0"; sha256="0d38n6z531jcg34q39fv0qsmccjbx5yil14fw5pmvyympyjsf5kq"; depends=[foreach]; }; -TSPostgreSQL = derive { name="TSPostgreSQL"; version="2013.9-1"; sha256="0ihfz0q1faxb7mk4jm10czfb9fz168x4z8890vql98djsxzjxpz4"; depends=[TSdbi RPostgreSQL DBI tframe tframePlus TSsql]; }; +TSPostgreSQL = derive { name="TSPostgreSQL"; version="2015.4-1"; sha256="11201zpbrva6gwc9hg8pynadrps6d8pb3syzba9nyjpv2ck6x3ry"; depends=[TSdbi DBI tframe tframePlus TSsql RPostgreSQL]; }; TSPred = derive { name="TSPred"; version="2.0"; sha256="0p4msk12n8jc1ss8p7m15rxd0ip7v83c5p78v26nk5dz21a4xprp"; depends=[forecast]; }; -TSSQLite = derive { name="TSSQLite"; version="2013.9-1"; sha256="0yw5whn95dvv3wbwmlhfgkapwp66nk94fjfl1r8irbqvrscmjin0"; depends=[TSdbi RSQLite DBI tframe tframePlus TSsql]; }; +TSSQLite = derive { name="TSSQLite"; version="2015.4-1"; sha256="10z8s967wmapkb56hh2brb5bafgqr8flwh0sr72yqqv0ca2d06sc"; depends=[TSdbi DBI tframe tframePlus TSsql RSQLite]; }; TSTutorial = derive { name="TSTutorial"; version="1.2.3"; sha256="0hpk6k3lc72p8pdz5aad04lcjsz9k443h5gs09dc3i10wqw3yhxs"; depends=[MASS]; }; TSclust = derive { name="TSclust"; version="1.2.3"; sha256="0m04svw4z2rhvzyckn8l4pg4rmwfn8xlzd9k839c47ldbzgb4z6l"; depends=[wmtsa pdc cluster locpol KernSmooth dtw longitudinalData]; }; -TScompare = derive { name="TScompare"; version="2013.9-1"; sha256="1gghr7xsg524sc9lhy1ymlhigaz6pi69fnccgn784ff2hl3w6d8w"; depends=[TSdbi tframe tfplot]; }; -TSdata = derive { name="TSdata"; version="2013.9-1"; sha256="1r3x6w17517if2jpcz2mr8jk5i080dkx4nlffblrcsxjhfvlz0xh"; depends=[]; }; -TSdbi = derive { name="TSdbi"; version="2013.9-1"; sha256="12v9dv7hrq626q44v3lws950m241fq5fsfsnmgvfbbyya5ixis86"; depends=[DBI tframe]; }; +TScompare = derive { name="TScompare"; version="2015.4-1"; sha256="0jmxnrbsdg368f29bp70rc9i88si5zjblbcn8rcjyn2k9vpd3q2f"; depends=[TSdbi tframe tfplot DBI]; }; +TSdata = derive { name="TSdata"; version="2015.4-1"; sha256="0h8gxgfal4ak2jmxmql02qpq4lcgj8m263aq9h83l5gmvzd173q7"; depends=[]; }; +TSdbi = derive { name="TSdbi"; version="2015.1-1"; sha256="1bqxpd4g0ppm1261srgwjzghfwwl53vybkihz99azckky0539m1s"; depends=[DBI tframe]; }; TSdist = derive { name="TSdist"; version="2.2"; sha256="1zqqy2pxjzxlj1d32d086qrkf9rlgj9vn9smzbcfix8wlgvxfi1l"; depends=[proxy zoo xts dtw TSclust KernSmooth locpol pdc longitudinalData cluster]; }; -TSfame = derive { name="TSfame"; version="2013.8-2"; sha256="19awl7jrx97y93wsms3h87w8qdgpdrkbbpsjsa2aqsnyq5vgy82l"; depends=[TSdbi DBI tframe tframePlus fame tis]; }; -TSgetSymbol = derive { name="TSgetSymbol"; version="2013.9-1"; sha256="1hn78xrfdnwhjrgcnn71ihvdgv4qwdxhpjwcqp0pbkgbxj3q5w3k"; depends=[TSdbi quantmod DBI zoo tframe tframePlus]; }; -TShistQuote = derive { name="TShistQuote"; version="2013.9-1"; sha256="06din7frxmbk4qxkpv0z5srh8nh0wkmrfl9lz17y7cwsmldl4hvr"; depends=[TSdbi DBI tframe tframePlus zoo tseries]; }; -TSodbc = derive { name="TSodbc"; version="2013.9-1"; sha256="0s0bgid5slvyqlsrc0jvybqd73qjbs7qb0klws4ynk51rw6rilml"; depends=[TSdbi RODBC DBI tframe tframePlus TSsql]; }; -TSsql = derive { name="TSsql"; version="2014.4-1"; sha256="10h83z0d9xjc1g0pnjvr4idz5c2vwf36x6qx1lpa48ybap50s215"; depends=[DBI tframe TSdbi]; }; -TSxls = derive { name="TSxls"; version="2013.8-2"; sha256="1a0cmw41jf9jqibg25s4s04lawdb86c5r4bkxp8bznzkkhihpxn1"; depends=[TSdbi DBI tframe tframePlus gdata]; }; -TSzip = derive { name="TSzip"; version="2013.9-1"; sha256="09fqjsppj7qmbiiy19s64j77kf6drqfiphk5dfz25w5df1lzdw0f"; depends=[TSdbi DBI tframe tframePlus gdata]; }; +TSfame = derive { name="TSfame"; version="2015.4-1"; sha256="197v123mkxr7qlksnb5iadms5zbc8xqbpgr2cspb8x1krz6phssz"; depends=[TSdbi DBI tframe tframePlus fame tis]; }; +TSmisc = derive { name="TSmisc"; version="2015.1-3"; sha256="1hv1q9p7vp7pxx9s4s9w3vkif1w1xr4y656x3zaf48ijxf6c6a90"; depends=[TSdbi DBI tframe tframePlus zoo xts its tseries quantmod gdata]; }; +TSodbc = derive { name="TSodbc"; version="2015.4-1"; sha256="0m6r97gs483jg6jlmfkbzxg3jvf6q140kvpidjccj224zb1sqlcq"; depends=[TSdbi DBI tframe tframePlus TSsql RODBC]; }; +TSsdmx = derive { name="TSsdmx"; version="2015.2-2"; sha256="1xwriyg0raqd6812r6vf34dljs0cjhxls9gpal4w0bjmvmc67khb"; depends=[TSdbi DBI tframe tframePlus RJSDMX rJava]; }; +TSsql = derive { name="TSsql"; version="2015.1-2"; sha256="1hpi2cssnkzqgnaj91wrvb94fs8zpfg8hi4m1zwswzyl3az0l9sc"; depends=[DBI tframe TSdbi tframePlus zoo]; }; TTAinterfaceTrendAnalysis = derive { name="TTAinterfaceTrendAnalysis"; version="1.5.1"; sha256="1i9p5s7xj3py8465yjjaqs2m7krjxzzqd86lkpbgzxnxjdnxcx5i"; depends=[Hmisc pastecs reshape wq e1071 timeSeries fBasics relimp multcomp nlme lubridate tcltk2]; }; TTR = derive { name="TTR"; version="0.22-0"; sha256="0aackwmmakjcynpq4nxi8xw1x3688rkg6kypgd5jiprzzdhsz5rq"; depends=[xts xts]; }; TUWmodel = derive { name="TUWmodel"; version="0.1-4"; sha256="1xxbrcs3dddzcya15pj4k86z05vnv06fnwblfvygx0zkw0m292av"; depends=[]; }; @@ -2127,14 +2159,15 @@ Taxonstand = derive { name="Taxonstand"; version="1.7"; sha256="0xs2kdsd6sa5vpxa TcGSA = derive { name="TcGSA"; version="0.9.8"; sha256="19gp3pj4p2svrfyviccvv13q82qj7584nck8zbba90hzv9g4xy86"; depends=[lme4 ggplot2 GSA reshape2 gtools gplots cluster stringr]; }; TeachNet = derive { name="TeachNet"; version="0.7"; sha256="1p39bsf846r7zwz4lrrv2bpyx9yrkqzrnacajwrz3jjqj6qpp6cn"; depends=[]; }; TeachingDemos = derive { name="TeachingDemos"; version="2.9"; sha256="160xch4812darv77qk2xjblm6nfnna5x2rxy335bwdsdjzcx4x9m"; depends=[]; }; -TeachingSampling = derive { name="TeachingSampling"; version="3.2.1"; sha256="1diw8qz6yi3g7d1ysklrvxwbzda9ybi039yr6agzw0w0b2b59jj4"; depends=[]; }; -TestScorer = derive { name="TestScorer"; version="1.6"; sha256="11125i0dwh961q5xbg57lli5bzzls3y482iw5f0qwalwkppk7sv0"; depends=[]; }; +TeachingSampling = derive { name="TeachingSampling"; version="3.2.2"; sha256="07c1wx7hl246kvj9ah55kdjpag8a9zbzh3jy0680w5nnv8vzsxxs"; depends=[]; }; +TestScorer = derive { name="TestScorer"; version="1.7"; sha256="1rzpy4aa61l21qx2qxrmk16cxrvbygacxk4rkm766769aq2jqa09"; depends=[]; }; TestSurvRec = derive { name="TestSurvRec"; version="1.2.1"; sha256="05f5gc8hvz09hx015jzis6ikki9c1brdq7l7a9bxm9bqbcc9f2f9"; depends=[survrec boot]; }; Thermimage = derive { name="Thermimage"; version="1.0.1"; sha256="16wpmwqfqjghhp4g5wpmgzf0ii2aa0gawcq74rfn4frfizzdy0ad"; depends=[]; }; Thinknum = derive { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95aprq0xm0dk720xk5zmiijxasg92sfp0va6n"; depends=[RCurl RJSONIO]; }; ThreeArmedTrials = derive { name="ThreeArmedTrials"; version="0.1-0"; sha256="1pafm8k90yv0hrk5a9adfv37087l2in0psslhkxha6mkmdh6a5f6"; depends=[MASS]; }; ThreeWay = derive { name="ThreeWay"; version="1.1.2"; sha256="1vf71im3bs2b2v05j12l8qn181kah0mch4h13n71zqik1ykly6jf"; depends=[]; }; ThresholdROC = derive { name="ThresholdROC"; version="1.0"; sha256="1w7bjw1w09skxyc5w3d72wivljlvnck6vbchihjx7m5k6djn7pxi"; depends=[]; }; +TickExec = derive { name="TickExec"; version="1.0"; sha256="0ylmf0mxp9hnijnq9rq6l4xahzsyrh8pfjjbgzz6v77ycvzzz5sh"; depends=[]; }; TiddlyWikiR = derive { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; }; Tides = derive { name="Tides"; version="1.1"; sha256="0w2xjnw2zv4s49kvzbnfvy30mfkn8hqdz6p155xm1kfqwvyb28qq"; depends=[]; }; TilePlot = derive { name="TilePlot"; version="1.3.1"; sha256="0yfzjyzc743rv5piw9mb7y0rr558hkxszgz49lya2w3i1mqvxbzy"; depends=[]; }; @@ -2152,7 +2185,7 @@ TreeSim = derive { name="TreeSim"; version="2.1"; sha256="01izfzlvrak65mzwpz4bn5 TreeSimGM = derive { name="TreeSimGM"; version="1.2"; sha256="0y6hadwx3apw11jy5d4al3dav3his8b4xvkv7s5d5rd92l7yrw0r"; depends=[TreeSim]; }; TriMatch = derive { name="TriMatch"; version="0.9.4"; sha256="008mi58sv82ykvwzil229z3zq3addyn3bik0xzfajcx4h7sdmsfg"; depends=[ggplot2 scales reshape2 ez psych PSAgraphics gridExtra]; }; TrialSize = derive { name="TrialSize"; version="1.3"; sha256="1hikhw2l7d3c7cg4p7zzrgdwhy9g4rv06znpw5mc6kwinyakp75q"; depends=[]; }; -TripleR = derive { name="TripleR"; version="1.4"; sha256="1hzfdip9n390cizk329k6bdpz1vkxj76khc8lxm0yx9jbc50ng6d"; depends=[ggplot2 reshape2 plyr]; }; +TripleR = derive { name="TripleR"; version="1.4.1"; sha256="028xvy3l72n1jhhfzv1fx1a51ya9bx008icz81ixjdwghzqr0wmi"; depends=[ggplot2 reshape2 plyr]; }; Tsphere = derive { name="Tsphere"; version="1.0"; sha256="0xgxw2hfj40k5s0b54dcmz7savl8wy4midmmgc7lq4pyb8vd58xx"; depends=[glasso rms]; }; TukeyC = derive { name="TukeyC"; version="1.1-5"; sha256="08s9scsd2l6wavc7qqlffjbf89vkd6xpb4iawvbqf7jh8jiyvw17"; depends=[]; }; TunePareto = derive { name="TunePareto"; version="2.4"; sha256="0pljl3q5s9yqc4ph70y66ff9ci9w8gwj8jsy8srxqkgqvahc8arf"; depends=[]; }; @@ -2174,8 +2207,9 @@ V8 = derive { name="V8"; version="0.6"; sha256="1cr9nm5wvi3b2766fpdgihnfmn1ckrwr VAR_etp = derive { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; }; VBLPCM = derive { name="VBLPCM"; version="2.4.3"; sha256="0aibjkqlc8l3f17m52ifb25s639gkydvgdj2gkijk5mk0g681qdj"; depends=[ergm sna mclust]; }; VBmix = derive { name="VBmix"; version="0.2.17"; sha256="0fhx2vk5ffq147kfgsqjbqwgv64m7z9mbz4gchj90440ih7kyxa5"; depends=[lattice pixmap mnormt]; }; +VCA = derive { name="VCA"; version="1.1.1"; sha256="14xm220ymg5p1m2h2xvjkbgaqfhi7dmf8fmi4zmfm5gksgf4v351"; depends=[Matrix numDeriv]; }; VDA = derive { name="VDA"; version="1.3"; sha256="063mpwbyykx4f46wzfvrgnlq73ar7i06gxr4mjzbhqcfrsybi72b"; depends=[rgl]; }; -VGAM = derive { name="VGAM"; version="0.9-7"; sha256="0477y0flxzvw06qi5dk1ky8s19b67jvw0lzxz7pzffzdbv9mj806"; depends=[]; }; +VGAM = derive { name="VGAM"; version="0.9-8"; sha256="0wizv2r1k79ifg9m0z9m2l80bshvfmajanznk5a5370ih3fih33a"; depends=[]; }; VGAMdata = derive { name="VGAMdata"; version="0.9-7"; sha256="0fkm90nbmj0gjzxmh54qbf90alcbaiz27rs0zc0i5jhh2cv716y6"; depends=[]; }; VHDClassification = derive { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; }; VIF = derive { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; }; @@ -2183,7 +2217,7 @@ VIFCP = derive { name="VIFCP"; version="1.0"; sha256="19jpwhbw5ml46ic8mzkl0ll7qa VIM = derive { name="VIM"; version="4.1.0"; sha256="15nmywg8mhknvivg9bfszif2allim5vf1hjfbfyl053jphjpax26"; depends=[colorspace data_table car robustbase sp vcd MASS nnet e1071 Rcpp Rcpp]; }; VIMGUI = derive { name="VIMGUI"; version="0.9.0"; sha256="195lakyik597sjkq6c5v3881p35111gzmj2r5f5nr53vi6bn4pzm"; depends=[tkrplot VIM survey gWidgetsRGtk2 foreign RGtk2 Cairo Hmisc]; }; VLF = derive { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; }; -VLMC = derive { name="VLMC"; version="1.4-0"; sha256="0ifrmwq095xpmn3r303l3b9z31fri224nk3jn7aim6chcjmy1r71"; depends=[MASS]; }; +VLMC = derive { name="VLMC"; version="1.4-1"; sha256="0y91cl9pv1d5s8956grdx3y4xa5l1fabrh1wl5hn11fjgyz1dcij"; depends=[MASS]; }; VNM = derive { name="VNM"; version="4.0"; sha256="0dc2wvj8f09yrsf5lhg6djhfnkgslngs6a13g54d5q9aa4nnxm8w"; depends=[]; }; VPdtw = derive { name="VPdtw"; version="2.1-10"; sha256="1sipiqbk766czd1jxam3bc2hfq7wsn72x51j5ssn2s2q0gvpl7m1"; depends=[]; }; VSURF = derive { name="VSURF"; version="0.8.2"; sha256="1d9irh8s49i8i9q8psmfl41jnr95wvm3libxin0ir8r297rq82z3"; depends=[randomForest rpart doParallel]; }; @@ -2203,7 +2237,7 @@ VizOR = derive { name="VizOR"; version="0.7-9"; sha256="1xw06y86nsrwpri6asrwh8kc Voss = derive { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; }; VoxR = derive { name="VoxR"; version="0.5.1"; sha256="07lsp6lrkq0gv55m84dl9w7gz5246d9avypqnkz96n3rbbgd0w5z"; depends=[]; }; W2CWM2C = derive { name="W2CWM2C"; version="1.0"; sha256="14q1y4vpmrx8qz5nav8bbjkxqsqk646zcwr8h7yzi7cfa85b4cxz"; depends=[waveslim wavemulcor]; }; -W3CMarkupValidator = derive { name="W3CMarkupValidator"; version="0.1-1"; sha256="1bxgsm6yl62adp3apvkihvvw40130z5ki49gnriv3syaw2bgwa0r"; depends=[XML RCurl]; }; +W3CMarkupValidator = derive { name="W3CMarkupValidator"; version="0.1-2"; sha256="162bjf8g94xxif86c6545kjvn2m06v618kna6ic2b3alyx577fww"; depends=[XML RCurl]; }; WARN = derive { name="WARN"; version="1.1"; sha256="0rnzsc8vbm116g4cwdivmxqv1zyg4givjrrlahvbf4xl5pbryg6d"; depends=[MASS]; }; WCE = derive { name="WCE"; version="1.0"; sha256="1kb1z67ymnz8cgwxq6m5fpqgxmmrfiwh2q3x4rhanac2sinagyn4"; depends=[plyr survival]; }; WCQ = derive { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; }; @@ -2213,6 +2247,7 @@ WMCapacity = derive { name="WMCapacity"; version="0.9.6.6"; sha256="19x6l06srh59 WMDB = derive { name="WMDB"; version="1.0"; sha256="10wdjy3g2qg975yf1dhy09w9b8rs3w6iszhbzqx9igfqvi8isrr1"; depends=[]; }; WRS2 = derive { name="WRS2"; version="0.3-1"; sha256="11i9zv7p7808v3hvnhjn58yl7mwh26zhis6hh9n73dw3hn22xdng"; depends=[MASS reshape plyr]; }; WWGbook = derive { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; }; +WaterML = derive { name="WaterML"; version="1.0.0"; sha256="125aivc23qgarndbwxif3xmqjp4n32vyk8cb7f7a2v3y51z332j2"; depends=[XML RJSONIO httr]; }; Watersheds = derive { name="Watersheds"; version="1.0"; sha256="11hrprl8ldbgk1j1f8z4cb327c8d94x1fc29dpacqck48gdb4wmp"; depends=[sp maptools rgeos lattice splancs]; }; Wats = derive { name="Wats"; version="0.2-16"; sha256="1wbyyllmjsmh8wb8npzizlfn3hsvfpqp9p3b5wx3zpsavqw839wy"; depends=[colorspace ggplot2 lubridate plyr RColorBrewer testit zoo]; }; WaveCD = derive { name="WaveCD"; version="1.0"; sha256="0gracn8lknw96nnir1m8fg5va3f45vvbiy69rxx8vibnfdg1q3l9"; depends=[waveslim lattice]; }; @@ -2224,11 +2259,12 @@ WhiteStripe = derive { name="WhiteStripe"; version="1.0"; sha256="0j8f10dwc14a0y WhopGenome = derive { name="WhopGenome"; version="0.9.2"; sha256="0nhl3qanwvyxvkrdc0wngzdx6id0yfzbf9wp170mcsyd4qh7pxzs"; depends=[]; }; WideLM = derive { name="WideLM"; version="0.1-1"; sha256="0spxl960pgzh0cn1gkw2ayixpi982rr85qajcdqahmn9msk877h8"; depends=[Rcpp Rcpp]; }; WikipediR = derive { name="WikipediR"; version="1.1.0"; sha256="19hc1vmyv0bnf00q8vwmfr6jxrcd1h5xzb9pphy5grghbj01bcl8"; depends=[httr jsonlite]; }; +WikipediaR = derive { name="WikipediaR"; version="1.0"; sha256="0kx966q5zn7jq1m7b8w1y1zllxvslr66bz6ji1lr11vk0fykl3kn"; depends=[XML]; }; WilcoxCV = derive { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; }; WordPools = derive { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; }; WrightMap = derive { name="WrightMap"; version="1.1"; sha256="0dmximp549gr37ps56vz8mnlii7753dc5v0wl3s78cymjmnmyr0z"; depends=[]; }; WriteXLS = derive { name="WriteXLS"; version="3.5.1"; sha256="0grhwwlibdpvzjlm1vc5ykl54jcz0jmg6rkhis00rjn5yqccx0in"; depends=[]; }; -XBRL = derive { name="XBRL"; version="0.99.15"; sha256="0fscvl7i205h0ax8g78v5n75bfqbna6cr7lg8jkicjbf4v791hhz"; depends=[Rcpp Rcpp]; }; +XBRL = derive { name="XBRL"; version="0.99.16"; sha256="1wrcm8srn185qrba7rig3fvwjz1n2ab296i0jr71vhyp9417h40q"; depends=[Rcpp Rcpp]; }; XLConnect = derive { name="XLConnect"; version="0.2-11"; sha256="02wxnr6h06h125dqszs8mzq4av842g445ndr59xgscxr03fyvi8p"; depends=[XLConnectJars rJava]; }; XLConnectJars = derive { name="XLConnectJars"; version="0.2-9"; sha256="0js79297himq628cwx5cc3pcq3iv6p16bn4bpd5diyjaya4x27g3"; depends=[rJava]; }; XML = derive { name="XML"; version="3.98-1.1"; sha256="0n9i6746211wihglbpsgalj2cyvggn4rv6a4fbavqwnjw3h1hwwl"; depends=[]; }; @@ -2252,7 +2288,8 @@ aCRM = derive { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0 aLFQ = derive { name="aLFQ"; version="1.3.2"; sha256="1963np2b2x7gbpgwcx0rqxd2psfdfmh72ap1y4p7f37ibjm8g45m"; depends=[data_table plyr caret seqinr lattice randomForest ROCR reshape2 protiq]; }; aRpsDCA = derive { name="aRpsDCA"; version="1.0.0"; sha256="035888scbl5333sz25f9n6xh1zis7l2752p4nhsbs2g44q38l9h6"; depends=[]; }; aRxiv = derive { name="aRxiv"; version="0.5.8"; sha256="0kwphz9x4ljsznvxxvm03mmbrv3ipyy2fh8lgik4zvv4c63mlxsh"; depends=[httr XML]; }; -abc = derive { name="abc"; version="2.0"; sha256="0fs6hxyk95c61mn3p642xs3ib9wfjii2v9a74pf488iaywc1kd7d"; depends=[nnet quantreg MASS locfit]; }; +abc = derive { name="abc"; version="2.1"; sha256="0ngzaaz2y2s03fhngvwipmy4kq38xrmyddaz6a6l858rxvadrlhb"; depends=[abc_data nnet quantreg MASS locfit]; }; +abc_data = derive { name="abc.data"; version="1.0"; sha256="1bv1n68ah714ws58cf285n2s2v5vn7382lfjca4jxph57lyg8hmj"; depends=[]; }; abcdeFBA = derive { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[Rglpk rgl corrplot lattice]; }; abctools = derive { name="abctools"; version="1.0"; sha256="0kaw2saghjyysj2bcsij2018ls3lrzh9188m0yqhmv71k5vh68rd"; depends=[abc abind plyr]; }; abd = derive { name="abd"; version="0.2-7"; sha256="0zkqwdcpz1v9k509vvzfbf9732v43q919hwd9yq3q0dg67d32ai7"; depends=[nlme lattice mosaic]; }; @@ -2287,7 +2324,7 @@ addreg = derive { name="addreg"; version="1.2"; sha256="1xgf9q0z3prvchyba1vaai6i ade4 = derive { name="ade4"; version="1.7-2"; sha256="01pchn70jpz8v9l86ng34a2vgn3pv4v5iwxz5n39f685p9lkc2nn"; depends=[]; }; ade4TkGUI = derive { name="ade4TkGUI"; version="0.2-6"; sha256="010ggsxcmljh0cdba4lcfnsd9r49pwqs6kbw88syfn2qv65hh5kq"; depends=[ade4]; }; adegenet = derive { name="adegenet"; version="1.4-2"; sha256="13fglxy40rnwi5hsmmvwlfcvfn8dybxyy3k5qhpml8jgpbl3fsdb"; depends=[ade4 MASS igraph ape shiny ggplot2]; }; -adegraphics = derive { name="adegraphics"; version="1.0-1"; sha256="1gj7x43n0x24gaq4lhdhgdzmflv5dyvcjak82m5qmbxn34pasrv9"; depends=[ade4 KernSmooth lattice RColorBrewer sp]; }; +adegraphics = derive { name="adegraphics"; version="1.0-2"; sha256="1jhi761rhrq1k27gxfns46j67x0ajbff6mz9cwl5jkcqg2mbcg8q"; depends=[ade4 KernSmooth lattice RColorBrewer sp]; }; adehabitat = derive { name="adehabitat"; version="1.8.17"; sha256="0cy98fd6mcbjc152vv41mnh5xj19xdfag8n950fvffbrpvpgbcpb"; depends=[ade4 tkrplot shapefiles sp]; }; adehabitatHR = derive { name="adehabitatHR"; version="0.4.13"; sha256="140ar1naf67v996d5p0i2v07g02pf9c4c6h1pjicai5n59s7z72v"; depends=[sp deldir ade4 adehabitatMA adehabitatLT]; }; adehabitatHS = derive { name="adehabitatHS"; version="0.3.11"; sha256="0sbhc1mvdc8pxq56plbgk0ry65chxcv3zjry4151hiv7yxpn39ri"; depends=[sp ade4 adehabitatMA adehabitatHR]; }; @@ -2321,6 +2358,7 @@ alleHap = derive { name="alleHap"; version="0.7.2"; sha256="1x10grrv732a0iidr2c9 allelematch = derive { name="allelematch"; version="2.5"; sha256="1kws6y3igq6l85cfjrck2dzcfpgr56ridbc6w071h8kjw19mlzas"; depends=[dynamicTreeCut]; }; allelic = derive { name="allelic"; version="0.1"; sha256="0xs4kd3vqb5ph8kqc3lcqgirrdkz8b627pvnczvci2g0sr3cl18j"; depends=[]; }; alm = derive { name="alm"; version="0.4.0"; sha256="125cl5b1sps33ipsh2pygrw79mhin1qj374lq56ny7c9rp4n9w7p"; depends=[ggplot2 plyr stringr reshape reshape2 httr jsonlite lubridate]; }; +alphaOutlier = derive { name="alphaOutlier"; version="1.0.0"; sha256="1f4jma487sp5csrvp5z7rx7k78kj8d4rkw7i3ql764rmm0pbk1h8"; depends=[Rsolnp nleqslv quantreg]; }; alphahull = derive { name="alphahull"; version="2.0"; sha256="1z8kbh3y5clh3hn018g0fci2psd0l36nz4a08pgg7md2bbhripbl"; depends=[ggplot2 tripack sgeostat spatstat splancs]; }; alphashape3d = derive { name="alphashape3d"; version="1.1"; sha256="1hfxvzqgirc587vxyggxdqii90nvypzi3wddvd2zdw2h95v9kfyg"; depends=[geometry rgl]; }; alr3 = derive { name="alr3"; version="2.0.5"; sha256="0zrrsv2kjq3cky3bhk6gp32p1qpr1i5k2lx7c1w08bql0nb1x740"; depends=[car]; }; @@ -2346,7 +2384,7 @@ anominate = derive { name="anominate"; version="0.5"; sha256="0qhq3ngxi1d3yln6ba antitrust = derive { name="antitrust"; version="0.94"; sha256="1k768lmx5vv069bd9fzly1205rxr9mkqi1p8jjx67kwmyhhw5sd2"; depends=[MASS evd BB numDeriv ggplot2]; }; aod = derive { name="aod"; version="1.3"; sha256="1a6xs5d5289w69xd2salsxwikjjhjzvsnplqrq78b1sr6kzfyxz3"; depends=[]; }; aods3 = derive { name="aods3"; version="0.4-1"; sha256="074c16wmgd1vc2yvwx1y84bg55hvmm5yi8zgpwh51jcsbqlhbpgn"; depends=[lme4 boot]; }; -aoos = derive { name="aoos"; version="0.1.0"; sha256="06jnkw8sw77rjag8sqbbp2g60p8vvc3vxl4l4gxzldk400wlkcnq"; depends=[]; }; +aoos = derive { name="aoos"; version="0.2.0"; sha256="0dnhbynkc02mi1a5xsl992dqks44k57z9a05q7k2s25953bqfqq3"; depends=[]; }; aoristic = derive { name="aoristic"; version="0.6"; sha256="0b9h2l59vvrvbjjwwb43j74frvwa8lsj4x5kwhwpsfjfch1yqwjl"; depends=[ggplot2 spatstat GISTools lubridate classInt reshape2 rgdal plotKML MASS sp maptools RColorBrewer]; }; apTreeshape = derive { name="apTreeshape"; version="1.4-5"; sha256="0mvnjchhfbpbnrgnplb6qxa7r2kkvw29gqiprwggkf553wi6zl48"; depends=[ape quantreg]; }; apc = derive { name="apc"; version="1.1"; sha256="0gnjniy7gm5fh4wn7vwml3z5bw6ydd1xxq5npvqljbzy4vhh8k5a"; depends=[]; }; @@ -2359,13 +2397,13 @@ apmsWAPP = derive { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nq appell = derive { name="appell"; version="0.0-4"; sha256="0g7pzhxqgscnyf07xycbrpyimp1z1hljgcr3nqigpx09w7zi5wlw"; depends=[]; }; apple = derive { name="apple"; version="0.3"; sha256="194z2f6hwdjjxdkjwlmfhpfp26p9yp3gparklhdbb6zlb4a9nnhz"; depends=[MASS]; }; approximator = derive { name="approximator"; version="1.2-6"; sha256="165qvx5946wkv1qsgbmjhmwvik7m23r1vbpnp7claylflgj1ycnm"; depends=[emulator]; }; -aprean3 = derive { name="aprean3"; version="1.0"; sha256="1ar83xnd9wwn5avz37qzwz5wsknrf5q3fb2a4w98g3nm0qy8yxhd"; depends=[]; }; +aprean3 = derive { name="aprean3"; version="1.0.1"; sha256="17rnq02sncl6rzwyln10200s43b8z1s2j0kdi9kgcb6qr51v12rv"; depends=[]; }; aprof = derive { name="aprof"; version="0.2.4"; sha256="0gw5qj6c5ygjc6nwx2lb8biykkk73fv2x3j1xxabpgnsfq1whwyc"; depends=[]; }; -apsimr = derive { name="apsimr"; version="0.1"; sha256="03j1g16drch5xkxb86czxmihs9a96f0v2kxjp73k7vig9md625dy"; depends=[ggplot2 XML lubridate reshape2]; }; +apsimr = derive { name="apsimr"; version="1.0"; sha256="1lk8n0vb20sxs02s6xx16d2xrh09p08b6i50b99bx9k7dhlgn6cf"; depends=[ggplot2 XML lubridate reshape2 MASS mgcv]; }; apsrtable = derive { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; }; apt = derive { name="apt"; version="2.3"; sha256="0yrgxdqzwa5zv6rv8d8nnlraxngq60i1f0yrkygwsj4kngv2yhyv"; depends=[erer gWidgets car urca copula]; }; aqfig = derive { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; }; -aqp = derive { name="aqp"; version="1.8"; sha256="12z8lsnjwjrnxj5a79can2r2h9sdmp39jfnx9kxn8zwm9klzl3jg"; depends=[plyr reshape lattice cluster sp Hmisc stringr scales plotrix RColorBrewer MASS]; }; +aqp = derive { name="aqp"; version="1.8-6"; sha256="03gwvb5sm9l4vyl0jh9rzjs3ka2qmw4qqh40ywahq3dchpbxmlzd"; depends=[plyr reshape lattice cluster sp Hmisc stringr scales plotrix RColorBrewer MASS digest]; }; aqr = derive { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[xts RCurl]; }; archdata = derive { name="archdata"; version="0.1"; sha256="1k7cpqwgvkwfz25a9db0c8g6ii6xsbhkj3c9alghhaafs7x8n47w"; depends=[]; }; archetypes = derive { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; }; @@ -2388,6 +2426,7 @@ arules = derive { name="arules"; version="1.1-6"; sha256="0xq0j4phwqw9cx2yzxx8xx arulesNBMiner = derive { name="arulesNBMiner"; version="0.1-4"; sha256="05vj7pzzh84xr6d0m16dhzr7bw50hkiyq99vl46zinak648my338"; depends=[arules rJava]; }; arulesSequences = derive { name="arulesSequences"; version="0.2-6"; sha256="1fvph6c8dy3hj0h63h85bzzzka8dx0cc0lcncz9svyahy1j4q3z0"; depends=[arules]; }; arulesViz = derive { name="arulesViz"; version="1.0-0"; sha256="0g4bqfn8jya992r2wbi044v68mj508h52snrdcd5ijhdhw8xq9xc"; depends=[arules scatterplot3d vcd seriation igraph]; }; +asVPC = derive { name="asVPC"; version="1.0.2"; sha256="07nfwr0lsfpwgfdgzcdn1svw8dnjfni5ga9q77yjd1bj0wf76ci2"; depends=[ggplot2 plyr]; }; asbio = derive { name="asbio"; version="1.1-5"; sha256="1br9rhj6nghwx54i2hpjrsdhwg8v38s66cy8fc4pg97zypdnikpj"; depends=[scatterplot3d pixmap tkrplot plotrix mvtnorm deSolve lattice multcompView]; }; ascii = derive { name="ascii"; version="2.1"; sha256="19dfbp7k4bjxjn8wdzhbmz7g3za6gn8vcnd5qkm4dz7gg1fg7b8p"; depends=[]; }; ascrda = derive { name="ascrda"; version="1.15"; sha256="17anzlhcjmrk13s5gs752rsc735y5wvba6r3w1nbv0cnkpnyk8i7"; depends=[class nnet rda MASS sfsmisc e1071 pamr]; }; @@ -2452,7 +2491,7 @@ bayesQR = derive { name="bayesQR"; version="2.2"; sha256="0w5fg7hdwpgs2dg4vzcdsm bayesSurv = derive { name="bayesSurv"; version="2.4"; sha256="014jxlx4w6lzzq9axdk8mwwlppmly0yj9i14zhmngdbr7mxh3f87"; depends=[survival coda smoothSurv]; }; bayesTFR = derive { name="bayesTFR"; version="4.1-2"; sha256="17qv25yrprj099vx1jj46ycgxnc4ldx6qcqx42h5gz38qqzz2q4s"; depends=[mvtnorm MASS coda wpp2012]; }; bayesclust = derive { name="bayesclust"; version="3.1"; sha256="0zxjd64nz8c6vg6jwb2xh6kbw41a2pcmlwq5cl6k2kbplqbm2jdf"; depends=[]; }; -bayescount = derive { name="bayescount"; version="0.9.99-4"; sha256="1ylz7wwc3kdff9b7gs8k36i90bc7pa8z207mhnxn0qzjv1qwjq6r"; depends=[runjags rjags coda]; }; +bayescount = derive { name="bayescount"; version="0.9.99-5"; sha256="0c2b54768wn72mk297va3k244256xlsis9cd6zn6q5n1l7ispj6j"; depends=[runjags rjags coda]; }; bayesm = derive { name="bayesm"; version="2.2-5"; sha256="16cnm1i7vwviqxwq3yhj5r9a46qaanq2mb4snd0659rkia6p8h7a"; depends=[]; }; bayesmix = derive { name="bayesmix"; version="0.7-3"; sha256="142132aslmmm35yai4n1d2hqqkczvrnm8ln9gwxvbczmxaggnc01"; depends=[rjags coda]; }; bayespref = derive { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; }; @@ -2482,7 +2521,7 @@ beadarrayMSV = derive { name="beadarrayMSV"; version="1.1.0"; sha256="0785vmjsli beanplot = derive { name="beanplot"; version="1.2"; sha256="0wmkr704fl8kdxkjwmaxw2a2h5dwzfgsgpncnk2p2wd4768jknj9"; depends=[]; }; bear = derive { name="bear"; version="2.6.4"; sha256="1v5rcb7aqzc7zjbbwwcy02z79crxq90mxs32k2gfvf7jzky09hpy"; depends=[reshape nlme gdata ICSNP sciplot plotrix ggplot2 png]; }; beepr = derive { name="beepr"; version="1.1"; sha256="187gww50yc8hzrzwz6j9ib101196g6ci9fx3dqyhg764ydn8if1n"; depends=[stringr audio]; }; -beeswarm = derive { name="beeswarm"; version="0.1.6"; sha256="05n2a1fqmh4m7d0b8vmcprss5ivgb0dlyly07jywj3vrf2z81yhy"; depends=[]; }; +beeswarm = derive { name="beeswarm"; version="0.2.0"; sha256="05yhddljmls35xdffp7iikgwh3jh5s4b7w5d2gw89w7l8hr62ypz"; depends=[]; }; benchden = derive { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; }; benchmark = derive { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nzbh0v57b06vdikrqc1d29wirzficxxbjk1hih"; depends=[proto ggplot2 relations psychotools reshape scales plyr]; }; benford_analysis = derive { name="benford.analysis"; version="0.1.1"; sha256="00ynk1af5nbq8bn8y77sckx4w32g5zxcp06pdpcxwvp38d7hxhvc"; depends=[data_table]; }; @@ -2547,9 +2586,10 @@ biom = derive { name="biom"; version="0.3.12"; sha256="18fmzp2zqjk7wm39yjlln7mpw biomod2 = derive { name="biomod2"; version="3.1-64"; sha256="0ymqscsdp5plhnzyl256ws9namqdcdxq3w5g79ymfpymfav10h3a"; depends=[sp raster reshape ggplot2 abind rasterVis pROC nnet gbm mda randomForest rpart MASS]; }; bionetdata = derive { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; }; biopara = derive { name="biopara"; version="1.5"; sha256="1fhhs6lkm3iphlkx6wklh9sgr1mkjkka9wv2m8fnk0xw01bdsyl5"; depends=[]; }; +biorxivr = derive { name="biorxivr"; version="0.1.0"; sha256="0277kand29vsxczjg1wnlvx494w67x6pd1ybg735ni62is567adg"; depends=[XML]; }; bios2mds = derive { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap e1071 scales cluster rgl]; }; biosignalEMG = derive { name="biosignalEMG"; version="1.0.2"; sha256="0ywb59w3rgac59gif1jba8qi7rjdsdj7y5czj7kv8lf01vd5dl3l"; depends=[]; }; -biotools = derive { name="biotools"; version="2.0"; sha256="02yw5pfj9858j02yi30bvll5pp67dpkzx3y5ka5bwwz7a5g7dvx3"; depends=[rpanel tkrplot MASS boot]; }; +biotools = derive { name="biotools"; version="2.1"; sha256="15ncx700v5ignr3gggz5zfspskzpj3kpzsy6rg2y4pnjm1vlndgj"; depends=[rpanel tkrplot MASS boot]; }; bipartite = derive { name="bipartite"; version="2.05"; sha256="05w3ypdxy2lfygdlvg9xv88dpsf21i60rsbvvz058zwpfzr39hfh"; depends=[vegan sna fields igraph MASS permute]; }; biplotbootGUI = derive { name="biplotbootGUI"; version="1.0"; sha256="0pgm31nhh1b78a8ciqjxw7gf3j7hh9wjc3myj29jpl92flbqmsw0"; depends=[rgl tkrplot vegan tcltk2]; }; birdring = derive { name="birdring"; version="1.2"; sha256="1jhhvdipsx3kw8n6gw6amm1vq0m83l48dkark9vvi2hpd730ca1y"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; }; @@ -2560,7 +2600,7 @@ bit = derive { name="bit"; version="1.1-12"; sha256="0a6ig6nnjzq80r2ll4hc74za3xw bit64 = derive { name="bit64"; version="0.9-4"; sha256="1w734l5ayr7w17a3gk2kmkqwz7v5jm830kfhyqmnd15i816lnjb9"; depends=[bit]; }; bitops = derive { name="bitops"; version="1.0-6"; sha256="176nr5wpnkavn5z0yy9f7d47l37ndnn2w3gv854xav8nnybi6wwv"; depends=[]; }; bivarRIpower = derive { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; }; -biwavelet = derive { name="biwavelet"; version="0.17.5"; sha256="01zhpwq1a3g1pjwbjqh3p1q9jhqqngrxcs9vp4r2zrj3rn9d5x38"; depends=[fields]; }; +biwavelet = derive { name="biwavelet"; version="0.17.10"; sha256="0rvlpqfrgajaw5bifc3103ixj2akdhpcxqhgw9fv0r1c5kv98qz0"; depends=[fields]; }; biwt = derive { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[rrcov MASS]; }; bizdays = derive { name="bizdays"; version="0.2.2"; sha256="1n2bh7vy0fhxq20s4lnbhgig1012di34kfl61i0ap7pc6464kg8d"; depends=[]; }; blender = derive { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; }; @@ -2573,9 +2613,9 @@ blockTools = derive { name="blockTools"; version="0.6-2"; sha256="0h04179ybklwbs blockcluster = derive { name="blockcluster"; version="3.0.2"; sha256="1qd92lj3ckrj7cvl9zs85igb0974wy5s4zwdnvfyvrsi2bqi3qp8"; depends=[Rcpp Rcpp RcppEigen]; }; blockmatrix = derive { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; }; blockmodeling = derive { name="blockmodeling"; version="0.1.8"; sha256="0x71w1kysj9x6v6vsirq0nndsf6f3wzkf8pbsq3x68sf4cdji1xl"; depends=[]; }; -blockmodels = derive { name="blockmodels"; version="1.0.4"; sha256="0xnnb1knz2x702aqcdxynskp1b85b4x6ik0r2g2jry569clhvxl0"; depends=[Rcpp digest Rcpp RcppArmadillo]; }; +blockmodels = derive { name="blockmodels"; version="1.1.1"; sha256="088629i4g63m8rnqmrv50dgpqbnxd1a4zl5wr3ga0pdpqhmd53wp"; depends=[Rcpp digest Rcpp RcppArmadillo]; }; blockrand = derive { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; }; -blocksdesign = derive { name="blocksdesign"; version="1.5"; sha256="06i8yphfp5g5bhs6s0gl0mb51vdk8idqifv18bkaqlh9qvbrd6rd"; depends=[crossdes]; }; +blocksdesign = derive { name="blocksdesign"; version="1.6"; sha256="1d188c1lyf5zvdffcw3w7imzjxxmr7nmr29zj9z1b64p1ddrryh4"; depends=[crossdes]; }; blowtorch = derive { name="blowtorch"; version="1.0.2"; sha256="0ymhkzfdrfcsq2qc5hbn9i0p58xqf90vwd46960cszxacyzzcnrb"; depends=[ggplot2 foreach iterators]; }; blsAPI = derive { name="blsAPI"; version="0.1.1"; sha256="1d9mzhhr9yrx1kca6mzrq3gqqismv2q5wf1zx76srqvpaja2wszq"; depends=[rjson RCurl]; }; bmd = derive { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; }; @@ -2584,12 +2624,12 @@ bmk = derive { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834l bmmix = derive { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; }; bmp = derive { name="bmp"; version="0.2"; sha256="059ps1sy02b22xs138ba99fkxq92vzgfbyf2z5pyxwzszahgy869"; depends=[]; }; bmrm = derive { name="bmrm"; version="3.0"; sha256="0ix5hfsvs2vnca0l1aflynddw6z85cqdyxn0y7xynkkapk182g4p"; depends=[lpSolve LowRankQP]; }; -bnlearn = derive { name="bnlearn"; version="3.7.1"; sha256="0wfly2c3il48c31jz3fvmhz285z4kapw6v0k993608gjli0sg86m"; depends=[]; }; +bnlearn = derive { name="bnlearn"; version="3.8"; sha256="1jy47sy8pqjwjykdrcfrrdjzrgwgvmzpjxcnh73pgaa2scm9lpk6"; depends=[]; }; bnormnlr = derive { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; }; bnpmr = derive { name="bnpmr"; version="1.1"; sha256="0hvwkdbs2p2l0iw0425nca614qy3gsqfq4mifipy98yxxvgh8qgc"; depends=[]; }; boa = derive { name="boa"; version="1.1.7-2"; sha256="1n7i0i8jq2sa1kzhbgyqzl9d53wja7fsxd7rligc8xjm0sdsb386"; depends=[]; }; -boilerpipeR = derive { name="boilerpipeR"; version="1.2.2"; sha256="0hcjlinzq2778zhwvsdyif099w8qjz5yidvpsyhphk4r6jyk4k2w"; depends=[rJava]; }; -bold = derive { name="bold"; version="0.2.0"; sha256="06dnhhf2bmiqxizarsqd6l2dcsldz4135srqa7yz90flsl9ihzwx"; depends=[XML httr stringr assertthat jsonlite reshape plyr]; }; +boilerpipeR = derive { name="boilerpipeR"; version="1.3"; sha256="0467bjqhdmi3p02fp0r7rgm00x9ry464f2hniav990qzsw8i16q6"; depends=[rJava]; }; +bold = derive { name="bold"; version="0.2.6"; sha256="15hnbspp5s293v2jykmirf9rvdgpkd71h431gizz71ssayanzp67"; depends=[XML httr stringr assertthat jsonlite reshape plyr]; }; boolean3 = derive { name="boolean3"; version="3.1.6"; sha256="00s6ljhqy8gpwa3kxfnm500r528iml53q364bjcl4dli2x85wa9p"; depends=[optimx numDeriv lattice rgenoud mvtnorm rlecuyer]; }; boostSeq = derive { name="boostSeq"; version="1.0"; sha256="0sikyzhn1i6f6n7jnk1kb82j0x72rj8g5cimp2qx3fxz33i0asx6"; depends=[genetics lpSolveAPI]; }; boostr = derive { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; }; @@ -2597,7 +2637,7 @@ boot = derive { name="boot"; version="1.3-15"; sha256="0pyznvhbb8237nqab6ylmis73 bootES = derive { name="bootES"; version="1.01"; sha256="00y901d5cjdpzras5w6mv851h5zgp36m5ib6dazs4vqrfpqymva8"; depends=[boot]; }; bootLR = derive { name="bootLR"; version="0.9"; sha256="0p4hq8nfdd8jw8r8dmlb6va4g7jjnkbsah69hissa9lqawbj9pi7"; depends=[boot]; }; bootRes = derive { name="bootRes"; version="1.2.3"; sha256="0bb7w6wyp9wjrrdcyd3wh44f5sgdj07p5sz5anhdnm97rn1ib6dz"; depends=[]; }; -bootSVD = derive { name="bootSVD"; version="0.1"; sha256="1rzwp8kadyc0dg6lscag586xliapp1ninz7qxczl8jmxa9sx9z89"; depends=[]; }; +bootSVD = derive { name="bootSVD"; version="0.2"; sha256="1b31gxlbysng5ysa18mzlp3vlc9jhn51hia0z1j9g47wi0r0f274"; depends=[ff]; }; bootStepAIC = derive { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; }; bootnet = derive { name="bootnet"; version="0.1"; sha256="18bx0za81z8za0hswj1qwl7a721xbvfpjz0hsih7glf6n5hn0cyp"; depends=[ggplot2 IsingFit qgraph dplyr gtools corpcor]; }; bootruin = derive { name="bootruin"; version="1.2-1"; sha256="1ii1fcj8sn9x82w23yfzxkgngrgsncnyrik4gcqn6kv7sl58f4r3"; depends=[]; }; @@ -2624,11 +2664,12 @@ brew = derive { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6y brewdata = derive { name="brewdata"; version="0.4"; sha256="1i8i3yhyph212m6jjsij61hz65a5rplxw8y2xqf6daqiisam5q6i"; depends=[RCurl XML stringdist]; }; brglm = derive { name="brglm"; version="0.5-9"; sha256="14hxjamxyd0npak8wyfmmb17qclj5f86wz2y9qq3gbyi2s1bqw2v"; depends=[profileModel]; }; bride = derive { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; }; +brms = derive { name="brms"; version="0.1.0"; sha256="0cx01d65vwsrxlhvxwwlaviz1lvxhl0hd8qw0bna99w8ypsqfp3i"; depends=[ggplot2 Rcpp coda ggmcmc gridExtra]; }; brnn = derive { name="brnn"; version="0.5"; sha256="0kf2fdgshk8i3jlxjfgpdfq08kzlz3k9s7rdp4bg4lg3khmah9d1"; depends=[Formula]; }; -broman = derive { name="broman"; version="0.48-2"; sha256="0w3fxs753ds2d4vzz7mck3cdjh4d1mjbwdbzqkb2rxdx5l4w2jp8"; depends=[assertthat]; }; -broom = derive { name="broom"; version="0.3.6"; sha256="0z3np7g9yidsyj58y5mnxqzcn6n841pfmxhwbiy2d6sm5i463lmh"; depends=[plyr dplyr tidyr psych stringr]; }; +broman = derive { name="broman"; version="0.55-2"; sha256="04pg362gmxg5lvrv333mjq06lv0q3a1mq6wrbmy87jch6f10lazi"; depends=[assertthat RPushbullet jsonlite ggplot2]; }; +broom = derive { name="broom"; version="0.3.7"; sha256="00z4kwxdqp6g35g4x6js9rc96z8i40hzgvhf5frj9dwfpxclk145"; depends=[plyr dplyr tidyr psych stringr]; }; bshazard = derive { name="bshazard"; version="1.0"; sha256="151c63pyapddc4z77bgkhmd7rsa1jl47x8s2n2s8yc6alwmj6dvs"; depends=[survival Epi]; }; -bspec = derive { name="bspec"; version="1.4"; sha256="1iq66hx4d0f5pvsh6qcsd2kzm913aqil4w66bfshj192fwbfziix"; depends=[]; }; +bspec = derive { name="bspec"; version="1.5"; sha256="0jynvir7z4q1vrvhdn6wijdrjfrkk4544nlawabw2fnfxss91a91"; depends=[]; }; bspmma = derive { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; }; bst = derive { name="bst"; version="0.3-4"; sha256="1s7qv2q9mcgg1c5mhblqg3nk9hary4pq6z0xgi3a6rs1929mgdyf"; depends=[rpart gbm]; }; bsts = derive { name="bsts"; version="0.6.1"; sha256="0hs2inbwwpafpcr6y51qnmxms121z8cy8mil6acjfhrfc27f1msd"; depends=[BoomSpikeSlab zoo xts Boom Boom BH]; }; @@ -2654,17 +2695,17 @@ calibrator = derive { name="calibrator"; version="1.2-6"; sha256="1arprrqmczbhc1 calmate = derive { name="calmate"; version="0.12.0"; sha256="1jd1ag1v10bpgkqpf5134av0yc7xph1679q40y541kyr59df0lxw"; depends=[R_utils aroma_core MASS R_methodsS3 R_oo matrixStats R_filesets]; }; camel = derive { name="camel"; version="0.2.0"; sha256="0krilird8j69zbll96k46pcys4gfkcnkisww138wslwbicl52334"; depends=[lattice igraph MASS Matrix]; }; cancerTiming = derive { name="cancerTiming"; version="3.0.0"; sha256="1sc5mz2gnrzvkc9kfnspq9vddk48a0a99yyywkwy1vvj0q2dgmyn"; depends=[LearnBayes gplots]; }; -candisc = derive { name="candisc"; version="0.6-5"; sha256="0rbmfyhnyaq1j7sql2sgi47ahrggbb71z2z5pw2gg16kd2f465qk"; depends=[car heplots]; }; +candisc = derive { name="candisc"; version="0.6-7"; sha256="1g2vypcniy94h462kylmzraa6q3ys9m0r1cn21dm8rzzjxid9g3g"; depends=[car heplots]; }; cape = derive { name="cape"; version="1.3"; sha256="1qvjbnxydc16mflg1rmgp2kgljcna8vi88w34cs6k12wpgxmvz1f"; depends=[corpcor evd qpcR Matrix igraph fdrtool shape]; }; caper = derive { name="caper"; version="0.5.2"; sha256="1l773sxmh1nyxlrjz8brnwhwraff826scwixrqmgdciqk7046d35"; depends=[ape MASS mvtnorm]; }; -capm = derive { name="capm"; version="0.7.0"; sha256="00bvrc5km6k9zvlznvqc6gj806fgb3r0x0yrnmxyk21b0acl5g20"; depends=[deSolve FME survey ggplot2 reshape2 shiny rgdal maptools sp]; }; +capm = derive { name="capm"; version="0.8.0"; sha256="1vz17x0v5cjs5kdqkbay08f91kclsx4rcli5vgh9yxlk4ih9w4dd"; depends=[deSolve FME survey ggplot2 reshape2 shiny rgdal maptools sp]; }; capushe = derive { name="capushe"; version="1.0"; sha256="0dwxaiqnz0qbsk4icjapklaa9bpjfl4gqvk1f92livy97jmf1r44"; depends=[MASS]; }; capwire = derive { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; }; car = derive { name="car"; version="2.0-25"; sha256="1h7fndsypg9jqfc4xlr8aszjgs477jsvvw4lkpgjxrlb4j779yyj"; depends=[MASS mgcv nnet pbkrtest quantreg]; }; -carcass = derive { name="carcass"; version="1.3"; sha256="1psxdxdqlc999xylizj5vg1p1pzyrikg9gjqvpv4k0q9b5h0nrpj"; depends=[lme4 survival expm arm MASS]; }; +carcass = derive { name="carcass"; version="1.4"; sha256="16apmiackw194p5n0fivkgd2ymca9bfajasypl82xqyfk6amh088"; depends=[lme4 survival expm arm MASS]; }; cardidates = derive { name="cardidates"; version="0.4.6"; sha256="02ib56fvn2z63sbinhwnlw123y86h6xazbkzw68sa9klqaxv69yl"; depends=[boot pastecs lattice]; }; care = derive { name="care"; version="1.1.8"; sha256="0r1j2q23rz54rcx528n53m3hmhvb8ndqjpmmzm6j1y6lmixpqh41"; depends=[corpcor]; }; -caret = derive { name="caret"; version="6.0-41"; sha256="0dwh6j1gvyd34my88kykrpifmnj3slp8q1if5vi428hp1p151cz7"; depends=[lattice ggplot2 car reshape2 foreach plyr nlme BradleyTerry2]; }; +caret = derive { name="caret"; version="6.0-47"; sha256="0mpmch0435gcszj5yq4p7jpq7y9q8jk1bz3i1c9ij7a73kq2368i"; depends=[lattice ggplot2 car reshape2 foreach plyr nlme BradleyTerry2]; }; caretEnsemble = derive { name="caretEnsemble"; version="1.0.0"; sha256="16qibyx034gi06rs8wnazfdicvrwpdsys3mvgwmb35qgzldqfizy"; depends=[caret caTools pbapply ggplot2 digest plyr lattice gridExtra]; }; caribou = derive { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; }; caroline = derive { name="caroline"; version="0.7.6"; sha256="1afxxbrd7w628l4pxdmvwbs7mbgxlhnfq3nxk2s93w47gn7r9fp7"; depends=[]; }; @@ -2678,7 +2719,7 @@ catenary = derive { name="catenary"; version="1.1"; sha256="0khdk61fh8ngr70qf9i2 cati = derive { name="cati"; version="0.96"; sha256="07vvhar1skcmx0sqkp4bcrrlmb88llqpgg4vmdi4nqhw48kjyjqn"; depends=[nlme ade4 ape e1071 mice rasterVis hypervolume FD geometry vegan]; }; catnet = derive { name="catnet"; version="1.14.8"; sha256="03y7ddjyra3cjq7savdgickmw82ncx4k01rn752sks6rpl6bjslc"; depends=[]; }; catspec = derive { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; }; -causaleffect = derive { name="causaleffect"; version="1.0"; sha256="1xg0dczqk10nnybm3i9rcnsqr34y86dngb7p6vl1n7bhxrn580jf"; depends=[igraph XML]; }; +causaleffect = derive { name="causaleffect"; version="1.1.1"; sha256="1rsn3zfi24vv1s03ki0aghw4kjls95dr25473fpbmsrmm8n48cqi"; depends=[ggm igraph XML]; }; causalsens = derive { name="causalsens"; version="0.1"; sha256="1v72zjplsa073f92qdza1zvwa1fwxlpmh8f6w5z8qcyiwqcbmifr"; depends=[]; }; cba = derive { name="cba"; version="0.2-14"; sha256="067rm1rfz0rrq8xkzibd81pwvc9rx7ki46bncim4j5ra6i9pn24n"; depends=[proxy]; }; ccChooser = derive { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; }; @@ -2698,6 +2739,7 @@ cec2005benchmark = derive { name="cec2005benchmark"; version="1.0.4"; sha256="0b cec2013 = derive { name="cec2013"; version="0.1-5"; sha256="07i2vp1x3qaw5di5vr5z70d47hh9174pjckjlhgv0f2w97slwc1i"; depends=[]; }; celestial = derive { name="celestial"; version="1.2"; sha256="1bwxr37vkgxavl230jmvk1yp3acnkcpc8im10fsxh1nfxys254ap"; depends=[]; }; cellVolumeDist = derive { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[minpack_lm gplots]; }; +cellranger = derive { name="cellranger"; version="0.1.0"; sha256="1nfvh0bd99q7cili0hj6ifcg8r57fxv5k4634b7vkshy5rbc5fw1"; depends=[]; }; cem = derive { name="cem"; version="1.1.10"; sha256="0lykr7sksii30nk4z8pvn4bdmvhm5952grrsvb63qblazg3b84qc"; depends=[nlme lattice randomForest combinat]; }; censNID = derive { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; }; censReg = derive { name="censReg"; version="0.5-20"; sha256="15k7iq4275dyah3r47vgxsx6g6mr7ma53lkv6d1n89bczzys72kx"; depends=[maxLik glmmML sandwich miscTools]; }; @@ -2717,8 +2759,8 @@ changepoint = derive { name="changepoint"; version="1.1.5"; sha256="090rak3ydlh9 cheb = derive { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; }; chebpol = derive { name="chebpol"; version="1.3-1367"; sha256="0w1yfnag0sjqjn7g5yn3wd19kkwzcchb491335h70rm360m1kr0y"; depends=[]; }; checkmate = derive { name="checkmate"; version="1.5.2"; sha256="0sllckm82lxiar3mm3sl4zcf9nhp7x7hfhpz1kiawaxfq7z9436g"; depends=[]; }; -checkpoint = derive { name="checkpoint"; version="0.3.9"; sha256="1qgjma8nbg4gixzj44q4zr24kca1bnznrnksqpjjy58vxi69s61n"; depends=[]; }; -cheddar = derive { name="cheddar"; version="0.1-626"; sha256="16dl267zbqnix739827mvdgchg5xzgz5q14hh8cw2fq089frjlz9"; depends=[]; }; +checkpoint = derive { name="checkpoint"; version="0.3.10"; sha256="147phhsv5g8k23fd355jqjqpjjj8n3s0bblm8mv5c3d0322li7ac"; depends=[]; }; +cheddar = derive { name="cheddar"; version="0.1-629"; sha256="13fmr37jj7dky5jrpr20z1iai9jbnpmwsh2pbzjwvib7561pyd6x"; depends=[]; }; chemCal = derive { name="chemCal"; version="0.1-34"; sha256="0sn0mhp2d9a9rddfpkiv1pkrmvnv4sy18c1x2ks0lwpaklg78fbs"; depends=[]; }; chemometrics = derive { name="chemometrics"; version="1.3.9"; sha256="089zlp4ba6yyxjh2p7fcph29lnxyk1gifb44fw7lsslvg19xlgjm"; depends=[rpart class e1071 MASS nnet pcaPP robustbase som lars pls mclust]; }; chemosensors = derive { name="chemosensors"; version="0.7.8"; sha256="0zphfag0q6zskd301z1dldazzxr2fam6h41cpyivphaxpaljiv0m"; depends=[pls plyr reshape2 ggplot2 LearnBayes quadprog RColorBrewer]; }; @@ -2731,7 +2773,7 @@ choiceDes = derive { name="choiceDes"; version="0.9-1"; sha256="07nnqqczi9p3cffd choplump = derive { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; }; chopthin = derive { name="chopthin"; version="0.1"; sha256="1xnyd5mvgqksk7c0mf4irrnshkjgih2h19b55yi4finxh6wrn8l4"; depends=[Rcpp Rcpp]; }; chords = derive { name="chords"; version="0.90"; sha256="0wz5glm15615xb3cicc0m34zg78qzng3lpmysswbrfhc8x4kkchh"; depends=[MASS]; }; -choroplethr = derive { name="choroplethr"; version="3.0.0"; sha256="1fj0gklqcr884l42c78crn6f7s5rk336ywlnqqm5ba7kxjs464k5"; depends=[scales Hmisc stringr ggplot2 dplyr R6 acs WDI]; }; +choroplethr = derive { name="choroplethr"; version="3.1.0"; sha256="0nv47hx8z06xh58a1ff63zncl1776pakxa6dbf1skhc23wfafi86"; depends=[scales Hmisc stringr ggplot2 dplyr R6 acs WDI]; }; choroplethrAdmin1 = derive { name="choroplethrAdmin1"; version="1.0.0"; sha256="1pnj5155h809sh9mp703y72348mi7mxnwid07kp1s489512ysfwr"; depends=[ggplot2]; }; choroplethrMaps = derive { name="choroplethrMaps"; version="1.0"; sha256="00dgwikfxm1p1dqz1ybsxj1j8jcmrwa08m2d3zsww2invd55pk7g"; depends=[]; }; chromer = derive { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[dplyr httr data_table]; }; @@ -2779,6 +2821,7 @@ clusterSEs = derive { name="clusterSEs"; version="1.2"; sha256="0ykfwvibps20w62x clusterSim = derive { name="clusterSim"; version="0.44-2"; sha256="1xf3byri6mwlf89n896bxffmf3c6yqqh992npg9sqznx955hcggv"; depends=[cluster MASS ade4 e1071 rgl R2HTML]; }; clusterfly = derive { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[rggobi e1071 reshape2 plyr RGtk2]; }; clustergas = derive { name="clustergas"; version="1.0"; sha256="1vf4czpwk71yxd26vm5sal0ml20ssjrq4bmk31yzxydpxn495fg8"; depends=[cluster]; }; +clustering_sc_dp = derive { name="clustering.sc.dp"; version="1.0"; sha256="0cppka7613cbjjf1q2yp6fln511wbqdhh8d4gs6p0fbq379kzmvc"; depends=[]; }; clusteval = derive { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp Rcpp]; }; clustrd = derive { name="clustrd"; version="0.1.2"; sha256="022lzp1wvbaa20d8hribgq9miy6i7jxm5m1p3p52h9b7bzga3q6g"; depends=[corpcor e1071 ggplot2 irlba]; }; clustsig = derive { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; }; @@ -2790,7 +2833,7 @@ cmprsk = derive { name="cmprsk"; version="2.2-7"; sha256="1imr3wpnj4g57n2x4ryahl cmprskQR = derive { name="cmprskQR"; version="0.9.0"; sha256="1vnrfhlmmyamkpd8lsfznfpcq0mspkiwn3j23yj4sarfx5n32s9a"; depends=[survival quantreg]; }; cmrutils = derive { name="cmrutils"; version="1.2-2"; sha256="0gc4sx8g9364sybmrqdjdvddqjd9ps6v205kaw0nqdx30xn96hmm"; depends=[chron]; }; cmvnorm = derive { name="cmvnorm"; version="1.0-1"; sha256="00cm7zfxbc5md3p6sakan64a6rzz7nbq0bqq9ys2iyxpilxalj3m"; depends=[emulator elliptic]; }; -cna = derive { name="cna"; version="1.0-2"; sha256="06q335jr4kdydk79s8f1fg67wflhcb5ngl6gk1fqb096zkmhszxf"; depends=[]; }; +cna = derive { name="cna"; version="1.0-3"; sha256="1iy0ispazhib30kh5wp3jziiyf0992nrdklrq80n0w3zhjyi21rh"; depends=[]; }; cncaGUI = derive { name="cncaGUI"; version="0.0-2"; sha256="0iwsaqqnh142syag91rzwwsc9n2qiw4xh5x1gjsgc74ywdm4g5fz"; depends=[rgl tcltk2 tkrplot]; }; coalescentMCMC = derive { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; }; coarseDataTools = derive { name="coarseDataTools"; version="0.6-2"; sha256="1nnh61kfw294cxawz9i8yf37ddzsn5s532vvkaz0ychk0390wmi5"; depends=[MCMCpack]; }; @@ -2829,7 +2872,7 @@ compareGroups = derive { name="compareGroups"; version="3.0"; sha256="0dgh72virr compareODM = derive { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; }; comparison = derive { name="comparison"; version="1.0-4"; sha256="0pc462rhk8gr8zrf08ksi315kmhydlp027q5gd40ap5mmhk7rd82"; depends=[isotone]; }; compeir = derive { name="compeir"; version="1.0"; sha256="1bb5459wcqpjic2b9kjn0l0qdn7sqmmx34hdb2aqg80q22mhx5dv"; depends=[lattice etm]; }; -compendiumdb = derive { name="compendiumdb"; version="0.1.0"; sha256="1dvgkbrsj2fw3mr454mfqhjcz0lbhvz848hgj1ld76p10zhs2vyk"; depends=[RMySQL]; }; +compendiumdb = derive { name="compendiumdb"; version="1.0.0"; sha256="14dpfyknb4rnig3k2k7684ly45mwx8b22q8bffbiqx1ah827nrna"; depends=[RMySQL]; }; complmrob = derive { name="complmrob"; version="0.5.8"; sha256="0hhn6w8kvwzs2qflqf8qiqac0n93pi4rkbh8idbcfn8shkhnjzjs"; depends=[robustbase ggplot2 boot scales]; }; compoisson = derive { name="compoisson"; version="0.3"; sha256="0v5dl7xydqi4p97nipn4hyhpq2gghmx81ygvl0vc8b65jhq89y0p"; depends=[MASS]; }; compositions = derive { name="compositions"; version="1.40-1"; sha256="1hn139g86bc1q3dj6kj9f21042v4x0xgrp4ni1zvx1zx8xmy3h8b"; depends=[tensorA robustbase energy bayesm]; }; @@ -2845,10 +2888,10 @@ coneproj = derive { name="coneproj"; version="1.5"; sha256="1xk6v5hp5v5hcxnl8fhb conf_design = derive { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; }; confidence = derive { name="confidence"; version="1.1-0"; sha256="11y2mjh9ykmsgf6km6f2w5rql1vqwick4jzmxg5gkfkiisvsq1cp"; depends=[knitr markdown plyr xtable ggplot2]; }; conformal = derive { name="conformal"; version="0.1"; sha256="0syb1p35r6fir7qimp2k51hpvl3xw45ma2hi7qz2xzw8cwhlii3a"; depends=[caret ggplot2 randomForest e1071]; }; -confreq = derive { name="confreq"; version="1.3"; sha256="0dxd7zdcrgj95f4x19izysqjixgpwi1xx752bwdc28d7h1ds2ym5"; depends=[gmp]; }; +confreq = derive { name="confreq"; version="1.3-1"; sha256="1d4ianimksnfwkld7cg9mkhbpwiaqy5bcilwfy45dwby5bai6cjx"; depends=[gmp]; }; conics = derive { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9py45296dk0m6n8s2n3bzh3aal5nzq"; depends=[]; }; conjoint = derive { name="conjoint"; version="1.39"; sha256="0f8fwf419js9c292i3ac89rlrwxs2idhwxml1qd8xd2ggwfh6w5m"; depends=[AlgDesign clusterSim]; }; -constrainedKriging = derive { name="constrainedKriging"; version="0.2.3"; sha256="1hppfc0pv0jphmj7pip1cn65sfrcwvnpymlvpyp7sbn3nmy2qqrb"; depends=[sp spatialCovariance rgeos RandomFields]; }; +constrainedKriging = derive { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[sp spatialCovariance rgeos RandomFields]; }; contfrac = derive { name="contfrac"; version="1.1-9"; sha256="16yl96bmr16a18qfz6y5zf7p02ky1jy2iimcb1wp50g7imlcq840"; depends=[]; }; conting = derive { name="conting"; version="1.5"; sha256="02vkpzdcwsny40jdcxgjfrx89lw1gq864s3fgswa9bfxfps9p58h"; depends=[mvtnorm BMS gtools tseries coda]; }; contrast = derive { name="contrast"; version="0.19"; sha256="1kc3scz3msa52lplc79mmn4z99kq1p2vlb18wqxa9q2ma133x6pl"; depends=[rms]; }; @@ -2883,7 +2926,7 @@ covLCA = derive { name="covLCA"; version="1.0"; sha256="15jsjrlaws1cqyrwvh4lzbhx covRobust = derive { name="covRobust"; version="1.1-0"; sha256="1nvy5cqs4g565qj2hhgk5spr58ps2bhas3i752rf7wvrskb89fk7"; depends=[]; }; covTest = derive { name="covTest"; version="1.02"; sha256="0p4di8bdjghsq5jd678dprlhiwnxr5piqlx2z7hi2bjjpvvl5657"; depends=[lars glmnet glmpath MASS]; }; covreg = derive { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; }; -coxinterval = derive { name="coxinterval"; version="1.0"; sha256="0x6xnc5wf5sivwn0hd99lmb52wj5swj01r9wrky9f61nji3fjv4v"; depends=[Matrix survival timereg]; }; +coxinterval = derive { name="coxinterval"; version="1.2"; sha256="0vb7vmzbb2dsihx04jbp2yvzcr033g435mywmwimqhfqdrmjx3fi"; depends=[survival timereg Matrix]; }; coxme = derive { name="coxme"; version="2.2-4"; sha256="186867w9lcx6il2nfa79g4fbljhak2imjn7hcwczmwz7k7sfa4nk"; depends=[survival bdsmatrix nlme Matrix bdsmatrix]; }; coxphf = derive { name="coxphf"; version="1.11"; sha256="0494szmhc7qp1qynrqf3kmna26h4ams40qr6w7qj4al54mkp0346"; depends=[survival]; }; coxphw = derive { name="coxphw"; version="3.0.0"; sha256="11pyd09dwkbixjz1riv8rz3jrp1ix6cbn1fw9nm8vnrc19x5lkz5"; depends=[survival]; }; @@ -2899,12 +2942,14 @@ cquad = derive { name="cquad"; version="1.0"; sha256="0pfga45lpq5lgw0jbvp5wasj5m crackR = derive { name="crackR"; version="0.3-9"; sha256="18fr3d6ywcvmdbisqbrbqsr92v33paigxfbslcxf7pk26nzn2lly"; depends=[Hmisc evd]; }; cramer = derive { name="cramer"; version="0.9-1"; sha256="1dlapmqizff911v3jv8064ddg8viw28nq05hs77y5p4pi36gpyw4"; depends=[boot]; }; crank = derive { name="crank"; version="1.0-7"; sha256="1ni5icg1c9ypvcvcxrr7dcp1zbk4iwyns421rrqsgmpns06s59w6"; depends=[]; }; +cranlogs = derive { name="cranlogs"; version="2.0.0"; sha256="13c8sa3s1xvb5naj4cy7d5azcbf716l0gp4x086sqd5dg1hqdy8b"; depends=[httr jsonlite]; }; crantastic = derive { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; }; crawl = derive { name="crawl"; version="1.4-1"; sha256="175w5933h5hhhjnrc0l1kg5q24b8pclnf5sf36gj1pmg8s58d1gp"; depends=[mvtnorm sp raster]; }; crayon = derive { name="crayon"; version="1.2.0"; sha256="1qgc1bakj5hp4fwmm2m6bzqf0mi84v6zcvw04dgck3lk00dxd0k9"; depends=[memoise]; }; crblocks = derive { name="crblocks"; version="0.9-1"; sha256="1m6yy6jb1dld7m9jaasms5ps8sn3v039jvlk8b0c08hmm7y0rm3z"; depends=[]; }; crch = derive { name="crch"; version="0.1-0"; sha256="1f4y2dd6lxsryyjjv569bxh1b4ymcnma0m9k7j150anzvkbrgnjn"; depends=[Formula ordinal]; }; crimCV = derive { name="crimCV"; version="0.9.3"; sha256="1p2cma78fb9a2ckmwdvpb6fc0818xw2mvq565dgiimgkdmmr0iid"; depends=[]; }; +crimelinkage = derive { name="crimelinkage"; version="0.0.3"; sha256="018ni9jgnm4k8vybz99drsx8phb0ar3x0raa5ydkfpgqp525sayi"; depends=[igraph geosphere]; }; crmn = derive { name="crmn"; version="0.0.20"; sha256="1kl1k1s2gm63f9768cg8w4j6y1gq4hws3i7hdfhj7k9015s0a25p"; depends=[]; }; crn = derive { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; }; crossReg = derive { name="crossReg"; version="1.0"; sha256="1866jhfnksv9rk89vw7w4gaxi76bxfjvqxx7cfa8nlrcsmaqd7rf"; depends=[]; }; @@ -2916,12 +2961,12 @@ crqa = derive { name="crqa"; version="1.0.5"; sha256="0kiw90p89mf207mmky98g2d4l9 crrSC = derive { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; }; crrstep = derive { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; }; crs = derive { name="crs"; version="0.15-24"; sha256="08k8vim4n85ll16zpkwbf3riz641kafn699qsg0h746zqzi1kfn7"; depends=[boot np quantreg rgl]; }; -crunch = derive { name="crunch"; version="1.0.2"; sha256="0rfiqsd7hn3yngavw484dbzw0sg91dc0q4wp7v4gll7y5n2xf2b4"; depends=[httr RJSONIO RCurl]; }; +crunch = derive { name="crunch"; version="1.1.1"; sha256="0a1nja6nnhga4f9kq4wy330pdrl8mj9c2mr75fdqkqgdll7dd96j"; depends=[httr jsonlite RCurl]; }; csSAM = derive { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; }; csampling = derive { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; }; cshapes = derive { name="cshapes"; version="0.4-2"; sha256="015mkh0iwdbhpbk8gpnq48pp026mfidd69rj70arpmg3knd2jvff"; depends=[sp maptools plyr]; }; cslogistic = derive { name="cslogistic"; version="0.1-3"; sha256="1s8p3qpz81nn6zr0pzw6h9ca3p6ahd8zj640vy5gcb5waqwj6bfj"; depends=[mvtnorm]; }; -csn = derive { name="csn"; version="1.1.1"; sha256="0ns92jqbsc7hnwwkph47mi8z53mj5ygrpys75l9n4d0qmdgpw0nn"; depends=[mnormt]; }; +csn = derive { name="csn"; version="1.1.3"; sha256="102w1qh9hgz4j9lh5hnbw1z3b7p034si73q4pkk564a2mhzlksw4"; depends=[mvtnorm]; }; csrplus = derive { name="csrplus"; version="1.03-0"; sha256="0kljndmiwblsvvdnxfywida9k0dmdwjq63d934l5yl6z7k4zd0xa"; depends=[sp]; }; cstar = derive { name="cstar"; version="1.0"; sha256="1zws4cq5d37hqdxdk86g85p2wwihbqnkdsg48vx66sgffsf1fgxd"; depends=[]; }; csvread = derive { name="csvread"; version="1.2"; sha256="1zx43g4f4kr7jcmiplzjqk2nw1g5kmmfap85wk88phf6fp0w8l5p"; depends=[]; }; @@ -2952,9 +2997,9 @@ cycloids = derive { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bf cyphid = derive { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; }; cytoDiv = derive { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; }; d3Network = derive { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; }; -dae = derive { name="dae"; version="2.4-0"; sha256="1gf3x751if3g2p7yy8jsvpn612w36mjhkz8qkh0y0kajm0nipzkb"; depends=[ggplot2]; }; +dae = derive { name="dae"; version="2.7-0"; sha256="1pfd3zyvs29ij8xa1ngz2din4srl45rjnjc576h1mz16l7h5kx53"; depends=[ggplot2]; }; daewr = derive { name="daewr"; version="1.1-4"; sha256="0pmz4721999vf023hpvsf17k5fgqpwnisnwssmav46glhmzl2cyj"; depends=[lattice FrF2 BsMD]; }; -daff = derive { name="daff"; version="0.1.2"; sha256="17ixi2yvh6wxwnhzbg8xsjmxbakh7lyazin5a93q33160vvsiday"; depends=[V8 jsonlite]; }; +daff = derive { name="daff"; version="0.1.4"; sha256="1g08m9qyrlwxdy9w18132dc9klz6ayw5jbn700vkzvqibfc1l7cx"; depends=[V8 jsonlite]; }; dafs = derive { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; }; dagR = derive { name="dagR"; version="1.1.3"; sha256="13jyhwjvvrjjja18rqzfdcw9ck90qm5yjwd25nygxgdf1894y03b"; depends=[]; }; dagbag = derive { name="dagbag"; version="1.1"; sha256="1hpg7fs1yhnycziahscymkr0s3a2lyasfpj0cg677va73nrpdz12"; depends=[]; }; @@ -2965,8 +3010,8 @@ dashboard = derive { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q data_table = derive { name="data.table"; version="1.9.4"; sha256="0gsnjjly3mxwfs6q0kjr42vr234mprp8kcyzcsa4dqf2ya2gs1s6"; depends=[chron reshape2]; }; data_tree = derive { name="data.tree"; version="0.1.6"; sha256="09pk4c5jkj69m6sxa2pbs1wh1w4rsg799w72fx9ib4jv22hjvrhc"; depends=[R6]; }; dataQualityR = derive { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; }; -dataRetrieval = derive { name="dataRetrieval"; version="2.2.0"; sha256="17vjmyrp0mymh9ns2afzphkc95a70sp8h3gqlq64g56n2jcsi35w"; depends=[XML RCurl reshape2 lubridate plyr]; }; -datacheck = derive { name="datacheck"; version="1.0.4"; sha256="1ns5cmsvmqswzpa33mqcmj92b4j3l32v29ki3crg0kayrpdmyrbw"; depends=[Hmisc shiny stringr]; }; +dataRetrieval = derive { name="dataRetrieval"; version="2.2.1"; sha256="1mq32blqdsc1zj3l7wbxdc9asl2nkrby5kijdk0rix574cxml9qm"; depends=[XML RCurl reshape2 lubridate plyr]; }; +datacheck = derive { name="datacheck"; version="1.2.2"; sha256="1i3n5g1b6ix8gpn4c74s7ll1dbrllrzgpb1f3hk449d6p4kmisq6"; depends=[stringr Hmisc shiny]; }; dataframes2xls = derive { name="dataframes2xls"; version="0.4.6"; sha256="18m4cbr3pxdn5ynxwd8klwwli3cyfjcn83pl17sn1rbavqlnkq5c"; depends=[]; }; datalist = derive { name="datalist"; version="0.2"; sha256="0q82wira0sfi63cn66f5cfyd15f19ig7pbmpk56j38a3115l2fmn"; depends=[assertthat]; }; datamap = derive { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; }; @@ -2986,12 +3031,13 @@ dblcens = derive { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8clj dbmss = derive { name="dbmss"; version="2.2.0"; sha256="0ngf7l7nsp03jvspa7xfhal2ccaxcvjny5sd5aypfwfgrndrd71z"; depends=[spatstat Rcpp cubature Rcpp]; }; dbstats = derive { name="dbstats"; version="1.0.4"; sha256="1miba5h5hkpb79kv9v9hqb5p66sinxpqvrw9hy9l5z4li6849yy1"; depends=[cluster pls]; }; dcGOR = derive { name="dcGOR"; version="1.0.4"; sha256="1vvij7f2vw9xaky32wyr7h1iwcq5m3s2s46kn9vjq1jllw85phgl"; depends=[Matrix igraph dnet]; }; -dcemriS4 = derive { name="dcemriS4"; version="0.51"; sha256="14ir9g4jg8asim8f33wizmvj6vm96583h212yygsa6yc301bhad8"; depends=[oro_nifti]; }; +dcemriS4 = derive { name="dcemriS4"; version="0.55"; sha256="15x4hjc5fwpn80h90q5x9a3p84pp3mxsmcx4hq5l0j52l9dy9nv3"; depends=[oro_nifti]; }; dclone = derive { name="dclone"; version="2.0-0"; sha256="1j8g955rvdgcmc9vnz3xizlkq8w1bslav5h72igvzzffcvqbj9hq"; depends=[coda]; }; dcmle = derive { name="dcmle"; version="0.2-4"; sha256="0ddb0x0lwk8jgx05k747sa33d2rrj4g2p4aj0m5bw1c9d5gril0m"; depends=[dclone rjags coda lattice]; }; dcmr = derive { name="dcmr"; version="1.0"; sha256="1a89wr1n8sykjbwa316zlmcffaysksrqnbd89anxqj8sgw9xv6jq"; depends=[ggplot2 KFAS plyr reshape2 tableplot]; }; dcv = derive { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; }; ddalpha = derive { name="ddalpha"; version="1.1.0"; sha256="0kij4s24v4zchlfk4za5373ispapd1yzkp9ld2bwv4w562amnl5w"; depends=[MASS class robustbase Rcpp BH Rcpp]; }; +ddeploy = derive { name="ddeploy"; version="1.0.2"; sha256="115k379l39gzddvn0l45l0sr0wyd7r486i28qs2hfyjnk1288vrs"; depends=[httr jsonlite]; }; ddst = derive { name="ddst"; version="1.03"; sha256="0zbqw4qmrh80jjgn8jzbnq3kykj1v5bsg6k751vircc0x9vnig3j"; depends=[orthopolynom evd]; }; deSolve = derive { name="deSolve"; version="1.11"; sha256="014fbrgzlarg2w27kq9qy7631hvhlf7ldrn5g8x2xibb260832s1"; depends=[]; }; deTestSet = derive { name="deTestSet"; version="1.1.2"; sha256="142261xjlz6h9vakiks04rz7hgv9b5j6s77acavd5s5mpi51ysh7"; depends=[deSolve]; }; @@ -3005,7 +3051,7 @@ decon = derive { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9j deducorrect = derive { name="deducorrect"; version="1.3-5"; sha256="06lcqnay36fgkzvgbiq7b67r9lfgll3lxfr1pmx14vmivshb6mmm"; depends=[editrules]; }; deepnet = derive { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; }; degenes = derive { name="degenes"; version="1.1"; sha256="1xxn5j06qizywimrp1pl8z3yjdy1a167b9jnm77gmv87rp6j240c"; depends=[]; }; -degreenet = derive { name="degreenet"; version="1.3"; sha256="06f22n8wz7i1w9qm6zxvspwnmcgaynlhf8m5qpmwzjqs823qf2qd"; depends=[igraph network]; }; +degreenet = derive { name="degreenet"; version="1.3-1"; sha256="0k0a1c1bv7zclrarfzf0d6avbd8zjnc3zd155jzmhi8dacr6r73w"; depends=[igraph network]; }; deldir = derive { name="deldir"; version="0.1-9"; sha256="0shzyqfqdkbhpf4hcwjjfzzizh6z56iamx2blhj79izg8xkvl2h9"; depends=[]; }; deltaPlotR = derive { name="deltaPlotR"; version="1.5"; sha256="0hbaibl4b50pg9ypyhz4700w6kir4jiyyl0230a8hjmb92aqn303"; depends=[MASS]; }; demi = derive { name="demi"; version="1.1.2"; sha256="04dq4db9ibvv91nm0gz8dfbgv1gpmalf9hv6i78dwhh1xzjg1mig"; depends=[R_utils plyr devtools]; }; @@ -3020,13 +3066,13 @@ denovolyzeR = derive { name="denovolyzeR"; version="0.1.0"; sha256="0ys8pi3wp2cv denpro = derive { name="denpro"; version="0.9.1"; sha256="0ihgk300njhp6dzm1gsmknlx4c5h6kiwprgv3l3f29s6gdxx4f6n"; depends=[]; }; densityClust = derive { name="densityClust"; version="0.1-1"; sha256="1apv9n871dshln5ccg8x3pwqi8yfx73ijfqsvzcljqnv36qpqpqd"; depends=[]; }; denstrip = derive { name="denstrip"; version="1.5.3"; sha256="10h8ivs7nd6gkf93zvqzqjb1lzfabvvs182636m67f86jfn6d4y4"; depends=[]; }; -depend_truncation = derive { name="depend.truncation"; version="2.2"; sha256="0frszpsnhf5ci471h6izsp0qan87li8spvpdvr47kklg3qxq0py2"; depends=[mvtnorm]; }; +depend_truncation = derive { name="depend.truncation"; version="2.3"; sha256="1n0v5cwmgpdyapr185s9przdsrxwaqf32038zm1na0yna8qmj8wl"; depends=[mvtnorm]; }; depmix = derive { name="depmix"; version="0.9.13"; sha256="1dkwc1bjq19hjzichh78b41qslklgwib8mglbn23q9dsys8a3ccz"; depends=[MASS]; }; depmixS4 = derive { name="depmixS4"; version="1.3-2"; sha256="18xmn5fv9wszh86ph91yypfnyrxy7j2gqrzzgkb84986fjp2sxlq"; depends=[nnet MASS Rsolnp]; }; depth = derive { name="depth"; version="2.0-0"; sha256="1aj4cch3iwb6vz0bzj4w5r6jp2qs39g8lxi2nmpbi3m7a6qrgr2q"; depends=[abind rgl circular]; }; depthTools = derive { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; }; descomponer = derive { name="descomponer"; version="1.2"; sha256="08hc3p4l8dy1h2z8ijifwlgidmac9b29g1k725yzwzbdr5jzvnzl"; depends=[taRifx]; }; -descr = derive { name="descr"; version="1.1"; sha256="0qqhzwnklz97gqklscr5j299g56f7wdzkhigxd7bgm0l1mwq44hc"; depends=[xtable]; }; +descr = derive { name="descr"; version="1.1.1"; sha256="1flnz05j390izwadsv2l5bcxgl6zmq4vzz1aycfifjz75zyqqy8s"; depends=[xtable]; }; deseasonalize = derive { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[lattice FitAR]; }; designGG = derive { name="designGG"; version="1.1"; sha256="1x043j36llwd7kd4skbpl2smz2ybsxjqf5yd1xwqmardq60gdv2w"; depends=[]; }; desirability = derive { name="desirability"; version="1.9"; sha256="1p3w4xk4is22gqgy2gyxj80vib8s40lgllqc2fnz66kb2cln10n6"; depends=[]; }; @@ -3034,13 +3080,14 @@ desire = derive { name="desire"; version="1.0.7"; sha256="0jmj644nj6ck0gsk7c30af detect = derive { name="detect"; version="0.3-2"; sha256="1mjc8h3xb2zbj4dxala8yqbdl94knf9q0qvkc37ag1b2w4y2d2b0"; depends=[Formula]; }; detrendeR = derive { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; }; devEMF = derive { name="devEMF"; version="2.0"; sha256="19wraakvf7xsf1i108dz3ipl1hdixgwa6h0bizxfyajw5yqmw8mw"; depends=[]; }; -devtools = derive { name="devtools"; version="1.7.0"; sha256="0d1hic61niw4fkjw9jnzslc25jcvprjn8mn6wapfpxpkm63499ff"; depends=[httr RCurl memoise whisker evaluate digest rstudioapi jsonlite roxygen2]; }; +devtools = derive { name="devtools"; version="1.8.0"; sha256="14q1c6jfnvljn50ccl2irfq8awa03z8fni3n5fdsdv4l9cdwj29p"; depends=[httr RCurl memoise whisker evaluate digest rstudioapi jsonlite roxygen2 rversions git2r]; }; df2json = derive { name="df2json"; version="0.0.2"; sha256="10m7xn7rm4aql1bzpckjcx5kvdw44m1pxgzqkgkd40lzqb1cwk18"; depends=[rjson]; }; -dfcomb = derive { name="dfcomb"; version="2.0-2"; sha256="0a3larpfm9v195kmiv17njv8l4qnmlxav9rcg9pxvlhbni5pv3dw"; depends=[RcppArmadillo BH RcppProgress Rcpp]; }; +dfcomb = derive { name="dfcomb"; version="2.1-3"; sha256="0mjvk0yc229x80z97dmnmbph9lpgfxpqagwdf57369mkwzms5kx2"; depends=[RcppArmadillo BH RcppProgress Rcpp]; }; dfcrm = derive { name="dfcrm"; version="0.2-2"; sha256="1kwgxfqnz2bcicyb27lp6bnvrj30lqjpn5fg7kaqshgkj53g0s4f"; depends=[]; }; dfexplore = derive { name="dfexplore"; version="0.2.1"; sha256="04nbhn59l1kas26nwj4qflkjvvr33sj1mm7zg7fhvya85gvlhrbf"; depends=[ggplot2]; }; -dfmta = derive { name="dfmta"; version="1.1-2"; sha256="147d3qakv2mpcr1rl4pshmw6kg1xah46j45crz1fr2iigy9ail14"; depends=[RcppArmadillo BH RcppProgress Rcpp]; }; +dfmta = derive { name="dfmta"; version="1.3-2"; sha256="1x3hz6by82mjcs8y6h7n380wr884dlx2pjpfsbz84zrk78hhnh5g"; depends=[RcppArmadillo BH RcppProgress Rcpp]; }; dfoptim = derive { name="dfoptim"; version="2011.8-1"; sha256="19j0h5xdrbmykz2nrjrwqwaw7466zvqaiwafrm1jc12mk5azfcqx"; depends=[]; }; +dga = derive { name="dga"; version="1.2"; sha256="13mfampnghcs5xplzq69bw948lqhw561pn54j3gb0ydsg5bm5vmr"; depends=[chron]; }; dglars = derive { name="dglars"; version="1.0.5"; sha256="02g8x4p98jv3cfwfxvh68aivb72651w4977g4xqksq0p4nqcs636"; depends=[]; }; dglm = derive { name="dglm"; version="1.8.1"; sha256="12q49nf30ji4c7vysf2s48bif7crwlmqn8cx0wy23xlhj5x2p4b3"; depends=[statmod]; }; dgmb = derive { name="dgmb"; version="1.1"; sha256="134ckgq7rsdypg3c586kkhr9rx5ya34smp38i9lzvbdanzrpf33w"; depends=[MASS abind]; }; @@ -3052,7 +3099,7 @@ dice = derive { name="dice"; version="1.2"; sha256="0gic7lqnsdmwv3dbzwwmcwdfyfql dichromat = derive { name="dichromat"; version="2.0-0"; sha256="1l8db1nk29ccqg3mkbafvfiw0775iq4gapysf88xq2zp6spiw59i"; depends=[]; }; dicionariosIBGE = derive { name="dicionariosIBGE"; version="1.6"; sha256="1rss1ydhcn6sma2lmlpq6s0h3dglwc20w499x1jzkcjnzc1rc7gl"; depends=[]; }; dielectric = derive { name="dielectric"; version="0.2.3"; sha256="1p1c0w7a67zxp1cb99yinylk5r1v89mmpfybcy94ydydhydbhivk"; depends=[]; }; -difR = derive { name="difR"; version="4.5"; sha256="0qlaqpywyjggw74h5y5r2aivcyknc6b7l8b1p69g3lyx4d2hz8wp"; depends=[lme4 ltm]; }; +difR = derive { name="difR"; version="4.6"; sha256="1803j0ql1g8gdy9i0wy4sz9sbl52dqjqcwbnknyrb34r51jmij5k"; depends=[lme4 ltm]; }; diffEq = derive { name="diffEq"; version="1.0-1"; sha256="1xmb19hs0x913g45szmm26xx5xp85v182wqf0lnl4raxaf47yhkm"; depends=[deSolve rootSolve bvpSolve ReacTran deTestSet shape]; }; diffIRT = derive { name="diffIRT"; version="1.4"; sha256="13axwzsrlr1akj4viwsyaplh11krixg3l07qi58c81jrcrmqpgv1"; depends=[statmod]; }; diffdepprop = derive { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee rootSolve PropCIs]; }; @@ -3067,10 +3114,11 @@ diptest = derive { name="diptest"; version="0.75-6"; sha256="158azvdf76h5mp26lw2 directPA = derive { name="directPA"; version="1.1"; sha256="0sri3981vk997qjl3c3zchn3vx0h3pdbnagcvds4bnrpycvn4bz8"; depends=[rgl calibrate]; }; directlabels = derive { name="directlabels"; version="2013.6.15"; sha256="083cwahz320r4w4jbh62pxmzn1i1hixp398zm8f2fpzh4qp5y44g"; depends=[quadprog]; }; dirmult = derive { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; }; +discSurv = derive { name="discSurv"; version="1.0.0"; sha256="0yq0vpdg6n21ar2r3jbgv2kxy7jn6gssyrrs6vfw4rk1q0bw6b2w"; depends=[functional Matrix matrixcalc mvtnorm numDeriv caret mgcv]; }; disclap = derive { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; }; disclapmix = derive { name="disclapmix"; version="1.6"; sha256="0g1yg4n4pfy0295faw2scfh45m978ymmlx9bl3h8849kfaizkysi"; depends=[Rcpp disclap cluster Rcpp]; }; discreteMTP = derive { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; }; -discreteRV = derive { name="discreteRV"; version="1.2"; sha256="04brc3yg5vqiprkjfmw1kdd4j8dk7557an7zkqwas5n891np8d3m"; depends=[plyr MASS]; }; +discreteRV = derive { name="discreteRV"; version="1.2.1"; sha256="06gvfn5v54gbal7kpnfcxwaacbq8354yvc47kjipn29bqpw9b6mb"; depends=[plyr MASS]; }; discretization = derive { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; }; discrimARTs = derive { name="discrimARTs"; version="0.2"; sha256="088v4awic4bhzqcr7nvk2nldf8cm1jqshg2pzjd2l2p1cgwmlxib"; depends=[RUnit]; }; diseasemapping = derive { name="diseasemapping"; version="1.2.0"; sha256="1l6w1f4zxfp1hrhvmxgijj2kwy7x0na2yf75ifqrbh1i499j8zjq"; depends=[sp]; }; @@ -3107,7 +3155,7 @@ dlmap = derive { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0 dlmodeler = derive { name="dlmodeler"; version="1.4-2"; sha256="06gqvk2wrzz4kpsh4vyrbqwmxirsvg78qj7clvcxdac0sfqn4gl7"; depends=[KFAS]; }; dlnm = derive { name="dlnm"; version="2.1.3"; sha256="044khdhk4dgd09cwmidsfa2rgd43h7wnd48bmmrnsvj3314bic0f"; depends=[nlme]; }; dma = derive { name="dma"; version="1.2-2"; sha256="18v40rr4qx98ap38vr77xxvl7y3a6cqfky3z4s5zc87q6y1z5g2s"; depends=[MASS mnormt]; }; -dmm = derive { name="dmm"; version="1.5-1"; sha256="0rblwhlr0gms7zlxgfc6wajf9mphzk2xlg9dk1agd5pdnffljxb9"; depends=[MASS Matrix nadiv robustbase pls]; }; +dmm = derive { name="dmm"; version="1.6-1"; sha256="0bls3ka8fwnsd0v74ncy8nbgxk0a3z1gw9dgm3vibz1lsypfs72a"; depends=[MASS Matrix nadiv robustbase pls]; }; dmt = derive { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[mvtnorm MASS Matrix]; }; dna = derive { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; }; dnet = derive { name="dnet"; version="1.0.6"; sha256="0zhv2yfrlhfwjbgbvjzmw3c5g5rj33n8l2npdf6b4nqz0c0hc1jn"; depends=[igraph Matrix]; }; @@ -3118,7 +3166,7 @@ doParallel = derive { name="doParallel"; version="1.0.8"; sha256="1z6cwqnjvqsbck doRNG = derive { name="doRNG"; version="1.6"; sha256="0yvg4052gfdh54drn6xnpiqyd77p8765yi525nag3ismw2yn9y58"; depends=[foreach rngtools iterators pkgmaker]; }; doRedis = derive { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9bf5wbfm6y9gi233s8qgsk4dnr84n3nizx"; depends=[rredis foreach iterators]; }; doSNOW = derive { name="doSNOW"; version="1.0.12"; sha256="0j71n0l9lbvwllw9iigvjgv0x8z2j57grl3yazkgcyzy0mcgf741"; depends=[foreach iterators snow]; }; -docopt = derive { name="docopt"; version="0.4.2"; sha256="0x2n79iw1818qsmdvyjyglaa8jzp91nahrijd9aijdqxdhb1mp8r"; depends=[stringr]; }; +docopt = derive { name="docopt"; version="0.4.3.3"; sha256="1vpq5q3kfgwijrgblvfipxqkw0m75rahnlmddpiyfgziyszbmidm"; depends=[stringr]; }; documair = derive { name="documair"; version="0.6-0"; sha256="1pphcbx90n9xn8a7gvfrwzfapwqgpbl3gg2grm7chfxgcp7i99i2"; depends=[]; }; domino = derive { name="domino"; version="0.2-6"; sha256="0xbp9gb38gxfdxfbzm792g4fnjsfp2ncncm8cmyra5wja6qwcwl8"; depends=[]; }; dosresmeta = derive { name="dosresmeta"; version="1.3.0"; sha256="0yfm8dkds8abdl6jrib5vvgkyrd5cl5a99qs27safxx0fcpdiz4k"; depends=[mvmeta aod Matrix]; }; @@ -3137,7 +3185,7 @@ drat = derive { name="drat"; version="0.0.3"; sha256="1dxgicvjdkhiwkyadxwb6lfvvi drawExpression = derive { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; }; drc = derive { name="drc"; version="2.5-12"; sha256="1gw78n0w262wl6mdm5wvyp3f0hvrb2kj714acdxz84h2znxr9879"; depends=[MASS car gtools multcomp plotrix scales]; }; drfit = derive { name="drfit"; version="0.6.3"; sha256="0vx5niw6mfg85937sbjmc0z0gdgf9aj43rmkn1gljky7pq4j3hfn"; depends=[MASS RODBC drc]; }; -drgee = derive { name="drgee"; version="1.0.1"; sha256="0vrmi3q6dhmk9z5168pdfhi18nkm4pgj4zx8d24r4k1jcqvgckl0"; depends=[nleqslv]; }; +drgee = derive { name="drgee"; version="1.1.1"; sha256="0fb5k26c76d5hh09z97mhzx02fr52y2wixgxfgndbp48w826iqpc"; depends=[nleqslv survival]; }; drm = derive { name="drm"; version="0.5-8"; sha256="1p6ixd7hnv41gfmvan3rv9xzz1279hmrnvfrl6pxwzs9zcnbb53a"; depends=[]; }; drmdel = derive { name="drmdel"; version="1.3.1"; sha256="1bpm9jj9dxk2daxp1yb7pn9jd750p27qa84vdfxpacm5r0mggnys"; depends=[]; }; dropR = derive { name="dropR"; version="0.1"; sha256="0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs"; depends=[plyr shiny]; }; @@ -3153,15 +3201,16 @@ dtt = derive { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9di dtw = derive { name="dtw"; version="1.17-1"; sha256="0kbf38a14k112vdi7yaql18w0sj694smlm6pmdw5q4sqpk7azhqg"; depends=[proxy]; }; dualScale = derive { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[matrixcalc ff vcd lattice Matrix]; }; dummies = derive { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; }; -dummy = derive { name="dummy"; version="0.1.2"; sha256="1rvq6fp9blhgy42bj7ynbf69j1x9yl2w4b7hlmhawdkr6qzk1iap"; depends=[]; }; -dunn_test = derive { name="dunn.test"; version="1.2.3"; sha256="1p9bmjq3rj674mss1ml2m94nzfrqpg95cb2l6vfrcldc5zja0z7l"; depends=[]; }; +dummy = derive { name="dummy"; version="0.1.3"; sha256="081a5h33gw6ym4isy91h6mcf247c2vsdygv9ll07a3mgjcjnk79p"; depends=[]; }; +dunn_test = derive { name="dunn.test"; version="1.2.4"; sha256="01z9rxhp9mli9b21in9gvrjiyxlkx5imspfangg2qvkyrb8jl9i5"; depends=[]; }; dupiR = derive { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; }; dvfBm = derive { name="dvfBm"; version="1.0"; sha256="0gx11dxkbnh759ysd1lxdarlddgr3l5gwd5b0klwvwsgck6jv529"; depends=[wmtsa]; }; dvn = derive { name="dvn"; version="0.3.3"; sha256="14ncna67qgknh20xdvxqddjhagj61niwpvz4ava9k0z68rgzmk5h"; depends=[RCurl XML]; }; dygraphs = derive { name="dygraphs"; version="0.4.3"; sha256="1pg23lsmjg46nlb17r4shmr6aal3c3pqzkcznfadcc6cgm0afqp2"; depends=[magrittr htmlwidgets zoo xts]; }; dyn = derive { name="dyn"; version="0.2-9"; sha256="16zd32567aj0gqv9chbcdgi6sj78pnnfy5k8si15v5pnfvkkwslp"; depends=[zoo]; }; -dynBiplotGUI = derive { name="dynBiplotGUI"; version="1.1.2"; sha256="1lcd164lxrrmzxr3rp3xwvwsnpa7am6c916vrbwy74ccg2bpbv7m"; depends=[tcltk2 tkrplot]; }; +dynBiplotGUI = derive { name="dynBiplotGUI"; version="1.1.3"; sha256="1wgxxn0nlmza7npvjbkfq6nmp30n719yqrav6jzxcp00dk3ymg6g"; depends=[tcltk2 tkrplot]; }; dynCorr = derive { name="dynCorr"; version="0.1-2"; sha256="0qzhhfhkwpq6mwg7y6sxpqvcj8klvivnfv69g7x3ycha1kw2xk3w"; depends=[lpridge]; }; +dynRB = derive { name="dynRB"; version="0.1"; sha256="16klhc3lrz9jnpd2br4niqsxzcbqri5y8qr2pr1fnqm64dvhnc8x"; depends=[]; }; dynaTree = derive { name="dynaTree"; version="1.2-7"; sha256="06pw78j6wwx7yc175bns1m2p5kg5400vg8x14v4hbrz3ydagx4dn"; depends=[]; }; dynamicGraph = derive { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; }; dynamicTreeCut = derive { name="dynamicTreeCut"; version="1.62"; sha256="1y11gg6k32wpsyb10kdv176ivczx2jlizs1xsrjrs6iwbncwzrkp"; depends=[]; }; @@ -3171,14 +3220,15 @@ dynlm = derive { name="dynlm"; version="0.3-3"; sha256="0ym23gv2vkvvnxvzk5kh6xy4 dynsim = derive { name="dynsim"; version="1.0"; sha256="0w4brs8kcps6gkamkic57nj61iz7zdxq972jwzs17i43wfcrw32c"; depends=[ggplot2 gridExtra MASS]; }; dynsurv = derive { name="dynsurv"; version="0.2-2"; sha256="0418r7adki48pg3h7i1mgv3xpbryi520va3jpd03dx15zrq8zaqg"; depends=[survival reshape plyr nleqslv ggplot2 BH]; }; e1071 = derive { name="e1071"; version="1.6-4"; sha256="0hakqawy8bz4hvjzz9dbc2pbqhaf1qjsgl0agz3qfg63974whw2i"; depends=[class]; }; -eHOF = derive { name="eHOF"; version="1.5.7"; sha256="05xvhnq0c8ddpq4x7mncspwy2lh54pl76yz6y38ibw5p8c0gazbs"; depends=[mgcv lattice]; }; +eHOF = derive { name="eHOF"; version="1.5.8"; sha256="19zs0krz13m7rbiw72clnhh1rbb6qgzp85ndchqbparw7f9yji1s"; depends=[mgcv lattice]; }; eRm = derive { name="eRm"; version="0.15-5"; sha256="0g4avcr709brvzcbmqmq35c7zvgx1hkf5nq6djsprzkgvh6rznjn"; depends=[MASS Matrix lattice]; }; eVenn = derive { name="eVenn"; version="2.2"; sha256="0k6m61z902spxxrc38504l73h022w5v74g39h4azd1ibr35yrl7j"; depends=[]; }; eaf = derive { name="eaf"; version="1.07"; sha256="0310lrqfm1l0lifak7wa6xn21bzzn27kbrrx0bidj4hibwv7sa4l"; depends=[modeltools]; }; earlywarnings = derive { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[ggplot2 moments tgp tseries fields nortest quadprog Kendall KernSmooth lmtest som spam]; }; -earth = derive { name="earth"; version="4.2.0"; sha256="11fkjl8bvzsalrwc0v6vmk2xkzd1np7z2frygckpy5kyr9zs9l5l"; depends=[plotmo plotrix]; }; +earth = derive { name="earth"; version="4.3.0"; sha256="1i52gm0ib1n6ffamb29np88b665l8vdigv482kvzh545kxc1z0jh"; depends=[plotmo]; }; easyanova = derive { name="easyanova"; version="4.0"; sha256="1d8fkgyqzphipvla7x8ipcf0by07iqx8xran15d2q82yq9iik5g9"; depends=[car nlme]; }; easynls = derive { name="easynls"; version="4.0"; sha256="1j2crqvgsf84bpwzf4qh5xkzn5mhxhfx9c0y3p8dbyn8bg7zc2rf"; depends=[]; }; +ebGenotyping = derive { name="ebGenotyping"; version="1.0"; sha256="07dpvxl9xspkzvzkywclg8whgcw7vyakls38pshfypjpyd6iv8ga"; depends=[]; }; ebSNP = derive { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfvdgpiq8i7sqdp5assb8z1823w0b"; depends=[]; }; eba = derive { name="eba"; version="1.7-1"; sha256="0kxdhl7bc4f570m9rbxxzg748zvq0q7a0slvfr4w1f45vfzhyh17"; depends=[nlme]; }; ebal = derive { name="ebal"; version="0.1-6"; sha256="1cpinmbrgxxv0fzi9qi2inv4hw2lz7iq4b0ggp316rdqqb5bj9r0"; depends=[]; }; @@ -3205,19 +3255,19 @@ eegkit = derive { name="eegkit"; version="1.0-2"; sha256="10dksmc5lrl0ypifvmmv96 eegkitdata = derive { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8sa1yfl7injvrc4vv3p88ps1mpn8hibk5g51m"; depends=[]; }; eeptools = derive { name="eeptools"; version="0.3.1"; sha256="0m6i0hiw565wgziknlf19rh2fq8zvzq2v5a0ppnwcv8vhbhyph3g"; depends=[ggplot2 MASS stringr maptools arm data_table memisc]; }; effects = derive { name="effects"; version="3.0-3"; sha256="10v99rv18jl10q0zhd4rvkx7dgab3b8w46jv1npqk9lx172iaf1y"; depends=[pbkrtest lme4 nnet lattice colorspace]; }; -effsize = derive { name="effsize"; version="0.5.2"; sha256="0xhrq1a7vjcbipvmslmkw4widnp0scfcir80sr5npcx5pvxagsq3"; depends=[]; }; +effsize = derive { name="effsize"; version="0.5.4"; sha256="1dc90avbnb83nrm70wh0h45g3c6dcg8zh2ynklc2x86cqk7b264b"; depends=[]; }; ega = derive { name="ega"; version="1.0.1"; sha256="02mbadv505jz6nk1yp9xl12c9l9wnwpl5bajfbhgs837pdca438g"; depends=[ggplot2]; }; egcm = derive { name="egcm"; version="1.0.6"; sha256="1j499f94ibr9rx544mwbpwjrwhzbdlvv1p156kj8pfnd7qin26xl"; depends=[zoo xts TTR ggplot2 tseries MASS urca fArma]; }; eggCounts = derive { name="eggCounts"; version="0.4-1"; sha256="16prkcmpfjl1lab8m9hm0sfbdlh94ds3wi6ra9n2wnrpdn32fl20"; depends=[actuar boot coda]; }; egonet = derive { name="egonet"; version="1.2"; sha256="1f0fbqyk2ilmhirxvf1iwgfappi5r7807ag77r89lbaf5jq8akl0"; depends=[sna]; }; -eha = derive { name="eha"; version="2.4-2"; sha256="0n3j9zl4xs5pc87j01symnj4yz523fng1gysrj8pz4wra4zlg83m"; depends=[survival]; }; +eha = derive { name="eha"; version="2.4-3"; sha256="1dfilgw9m4m78ny3fd89nl8f9c9y5z5bnj912hpbfff3v5yfm3iq"; depends=[survival]; }; eiPack = derive { name="eiPack"; version="0.1-7"; sha256="1cxk31bj012ijm85sf6l4rjrwayw94j2d6aav8p9g1f0raha2s6y"; depends=[MASS coda msm]; }; eigeninv = derive { name="eigeninv"; version="2011.8-1"; sha256="18dh29js824d7mrvmq3a33gl05fyldzvgi8mmmr477573iy9r30g"; depends=[]; }; eigenmodel = derive { name="eigenmodel"; version="1.01"; sha256="0p9n28x5gg46nszzd2z9ky5fhv6qa070673i1df6bhjh962aqgaf"; depends=[]; }; eigenprcomp = derive { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; }; eive = derive { name="eive"; version="2.1"; sha256="1vazl5dnrvljd07csy9rjs4302w09h94i411gffg9fvxn70km7qg"; depends=[Rcpp Rcpp]; }; eiwild = derive { name="eiwild"; version="0.6.7"; sha256="1fp4kvlmcjjnzn2a5cmlzaf6y5q6cdbbi2nmvjyqc4y1bmwh3srf"; depends=[gtools coda lattice]; }; -elastic = derive { name="elastic"; version="0.3.0"; sha256="1lr2g7badfmmxdpv9z3gzjnd99di2nn0c2mhmrvjdclwzv4pk83c"; depends=[httr jsonlite]; }; +elastic = derive { name="elastic"; version="0.4.0"; sha256="03cj0vljad4bkz7zmlp7cr6y734pddngmlzwa1h4ja1nr8nv8xf4"; depends=[httr RCurl jsonlite]; }; elasticnet = derive { name="elasticnet"; version="1.1"; sha256="1x8rwqb275lz86vi044m1fy8xanmvs7f7irr1vczps1w45nsmqr2"; depends=[lars]; }; elec = derive { name="elec"; version="0.1.2"; sha256="0f7ahrjb52w8a8l5v00xla6z9afpz2zrckl9v04xalp34snhdwan"; depends=[]; }; elec_strat = derive { name="elec.strat"; version="0.1.1"; sha256="09196k5c3jsikh98d33bn70izwcbx0wb5ki9fv1ij0dw9mnv4c3p"; depends=[elec]; }; @@ -3228,16 +3278,17 @@ elmNN = derive { name="elmNN"; version="1.0"; sha256="129r6d3qa48gqvqxks53hdmyk3 elrm = derive { name="elrm"; version="1.2.2"; sha256="0wz0l703v0iyp7nswdmh65n0cy3a7rfvyxd795a6nzk3nich8bfg"; depends=[coda]; }; emIRT = derive { name="emIRT"; version="0.0.5"; sha256="0n94iqdzbml0hx3gd046958vmv3y0hymj5kly53gvvlcidsn15c4"; depends=[pscl Rcpp Rcpp RcppArmadillo]; }; embryogrowth = derive { name="embryogrowth"; version="6.0"; sha256="0l08imqagn2w1q8s4f84bb1zlc17zjkfc5qz1gpmqc7dbw9nvxph"; depends=[deSolve HelpersMG coda polynom]; }; -emdatr = derive { name="emdatr"; version="0.2"; sha256="11s9yiziswgll12c1sm3jb7hvy469ks64zx6w8dk1b36cx4lzf3h"; depends=[RCurl]; }; -emdbook = derive { name="emdbook"; version="1.3.7"; sha256="134j9mkf975h1bh4bjg5kl3gjzfii9acj4a20k1c4jnbz5v272a1"; depends=[MASS lattice plyr rgl coda bbmle]; }; +emdatr = derive { name="emdatr"; version="0.3"; sha256="1ccm45al90wa467n19dqs33q2w74in4qnwdrsh94g3d67cw5fsfc"; depends=[RCurl]; }; +emdbook = derive { name="emdbook"; version="1.3.8"; sha256="10qmppacfww8wg1hhd9fpadrvrivrvfgfn1qgm87xlf3a8jpffjj"; depends=[MASS lattice plyr rgl coda bbmle]; }; emdist = derive { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; }; +emg = derive { name="emg"; version="1.0.6"; sha256="1kzmxs224m6scmk8gg5ckx5c7is99hwgwv28yl26hnrbkm59skyh"; depends=[]; }; emil = derive { name="emil"; version="1.1-6"; sha256="1qk655swpl8f492y9smzlfxf7aysbwashfs6whnsi7f9dbigw6cd"; depends=[]; }; emma = derive { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[earth clusterSim]; }; emme2 = derive { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; }; emoa = derive { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; }; emov = derive { name="emov"; version="0.1"; sha256="1jzssxk7c26ylfb70p9s631bz63fgvrqc105p7536n0kgxy21f7b"; depends=[]; }; empiricalFDR_DESeq2 = derive { name="empiricalFDR.DESeq2"; version="1.0.1"; sha256="12w3ald2ngaj01rm98k445ai3xl3ggr58y27mfxzlsg697yrx83c"; depends=[]; }; -emplik = derive { name="emplik"; version="0.9-9-6"; sha256="0qrrsws9hnb9f2zv50q4v9zx467n6hm83g841h3ba511iwjpp32r"; depends=[quantreg]; }; +emplik = derive { name="emplik"; version="1.0-1"; sha256="1kwgikdnxh52wsmzrzqv7sp8s55w9q40aq9kpfd3zshkflx7w8g1"; depends=[quantreg]; }; emplik2 = derive { name="emplik2"; version="1.20"; sha256="0qdsfmnvds01qa4f112knv905k0fzccrqj9fwaqrqcy48cigm8pd"; depends=[]; }; emulator = derive { name="emulator"; version="1.2-15"; sha256="1rp7q7zs8b49jzdkbzm4s1g8554h41hcabf4d78k9jhhys2z28g2"; depends=[mvtnorm]; }; enRich = derive { name="enRich"; version="2.0"; sha256="13ahwdifm33h4h5mvmc49v39fbhiy291rbdwm4c8kxjrqjq9ip66"; depends=[]; }; @@ -3251,7 +3302,7 @@ enpls = derive { name="enpls"; version="1.0"; sha256="1grnabrb0kzjvjvwp9rx1xqflj enrichvs = derive { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; }; ensembleBMA = derive { name="ensembleBMA"; version="5.1.1"; sha256="1apzfapzycpjhdn4f2cj77rifc9xrxshq35b1j53rb6qqns7ydyz"; depends=[chron]; }; ensembleMOS = derive { name="ensembleMOS"; version="0.7"; sha256="0g5qzdic5jvgn6wv7zh0jnz8malfgfxn26l7lg30y96vcmi4hk54"; depends=[ensembleBMA chron]; }; -ensurer = derive { name="ensurer"; version="1.0"; sha256="07bjiq9sk5njksb1dyi5kqx3k4a454x8jy0q5v6n1m5lpyqf0py7"; depends=[]; }; +ensurer = derive { name="ensurer"; version="1.1"; sha256="1gbbni73ayzcmzhxb88pz6xx418lqjbp37sdkggbrxcyhsxpdkid"; depends=[]; }; entropart = derive { name="entropart"; version="1.2.1"; sha256="14cn0zkfk6w8qrbzis9nxhs0vmhpxn4ksa95j5zxr7lxn77piznz"; depends=[ade4]; }; entropy = derive { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; }; enviPat = derive { name="enviPat"; version="1.9"; sha256="0xm23gv4ixmsal9rf0cbq0lwvlpagpmapskz3c4d8qzvhr8qrl3b"; depends=[]; }; @@ -3285,24 +3336,24 @@ esotericR = derive { name="esotericR"; version="1.0"; sha256="0kl9c2z2mpg3mk8jnl estimability = derive { name="estimability"; version="1.1"; sha256="1inw2ir83bzz40gynwfcjzx7f6v99pqlphq7p3rmql01ikd2b6r9"; depends=[]; }; estout = derive { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; }; etable = derive { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[xtable Hmisc]; }; -etasFLP = derive { name="etasFLP"; version="1.2.0"; sha256="0h81fm71q8qb2h0gz669cvqpzcd8jwq5yk2b8vwsiv4jlgfiq85g"; depends=[mapdata rgl fields maps]; }; +etasFLP = derive { name="etasFLP"; version="1.2.1"; sha256="1jkkpzvnkf3n3jalqj90brk5n4r4znc521kgx13n45y9j8b6ni50"; depends=[mapdata rgl fields maps]; }; etm = derive { name="etm"; version="0.6-2"; sha256="0sdsm6h502bkrxc9admshkrkqjczivh3av55sha7542pr6nhl085"; depends=[survival lattice]; }; eulerian = derive { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[]; }; eurostat = derive { name="eurostat"; version="1.0.16"; sha256="017ri3vvlp60r9h5b0y4j2adggkrkjbapkjynpl0vg92islspqkz"; depends=[plyr tidyr]; }; -evaluate = derive { name="evaluate"; version="0.6"; sha256="1ma3ry07b9r7rkbsq8fgxnyg4qva6lyfx8vfhgxrnj1nik9qgxy0"; depends=[stringr]; }; +evaluate = derive { name="evaluate"; version="0.7"; sha256="0sh58pysabz1iinl8gp0f2v03fwzawpagbk18jbsnfr2vvc927bk"; depends=[stringr]; }; evd = derive { name="evd"; version="2.3-0"; sha256="1h3dkssgw2x7pblvknfr0l8k7q25nikxyl7kl9x95ganjpi2452v"; depends=[]; }; evdbayes = derive { name="evdbayes"; version="1.1-1"; sha256="0lfjfkvswnw3mqcjsamxnl8hpvz08rba05xcg0r47h5vkgpw5lgd"; depends=[]; }; eventInterval = derive { name="eventInterval"; version="1.2"; sha256="15g934n7flkl1g5q8qhxv60iakx8i9ndpx88yiqqr3n38hcnifrs"; depends=[MASS]; }; events = derive { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; }; eventstudies = derive { name="eventstudies"; version="1.1"; sha256="13l2yhmlpiid9r3njnmvja231l00ym7gvwfbv0m9fk2k5j6gm5id"; depends=[zoo xts boot]; }; evir = derive { name="evir"; version="1.7-3"; sha256="1kn139vvzdrx5r9jayjb4b0803b0bbppxk68z00gdb50mxgvi593"; depends=[]; }; -evmix = derive { name="evmix"; version="2.4"; sha256="0a2mdvv5ckg58f7lc5x63c33pmcaf7drhv3z9xzi0ramgrmx8ahm"; depends=[MASS gsl SparseM]; }; +evmix = derive { name="evmix"; version="2.5"; sha256="0v1raxxxj0qhampaia2q00asprl7ra7vk3s7vvcfpzmg4476vm50"; depends=[MASS gsl SparseM]; }; evobiR = derive { name="evobiR"; version="1.0"; sha256="12j01qzc4yrjpxbj39bl29f5ypxwk33c6qf0mjjbgpwn5g6fgsi4"; depends=[seqinr ape stringr geiger taxize]; }; evolvability = derive { name="evolvability"; version="1.0"; sha256="17vkmb5208q4lx6jslx96nbhsl9m2c4ra6264bparbgrg34byg9x"; depends=[coda]; }; evora = derive { name="evora"; version="1.0"; sha256="0blq28ldynbq3v6rh0yk89wy1sjp4621h6iwnyyiipqwzihwrhz2"; depends=[Hmisc]; }; evt0 = derive { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; }; evtree = derive { name="evtree"; version="1.0-0"; sha256="0i37lkdfzvgby98888ndd5wzxs7y11sxf9mh6pqpqgwif05p4z3i"; depends=[partykit]; }; -exCon = derive { name="exCon"; version="0.1-3"; sha256="0z09nwv721ld3dbi7c14rd2pjz96kj9pniljmwy9r41fhz36i4yf"; depends=[jsonlite]; }; +exCon = derive { name="exCon"; version="0.1.5"; sha256="08gq257qp814960ykp16qdk9xpc7ag9mxs1qhnnzlk1v2cnhilaq"; depends=[jsonlite]; }; exact2x2 = derive { name="exact2x2"; version="1.4.1"; sha256="1a4cg8j8kdgwkj27qza6xm5x16m9sb2vczb1b9im8k4pas6v6jpk"; depends=[exactci ssanv]; }; exactLoglinTest = derive { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; }; exactRankTests = derive { name="exactRankTests"; version="0.8-28"; sha256="1n6rr0wax265y9w341x7m2pqwx3cv8iqx1k5qla29z8lqn4ng1nd"; depends=[]; }; @@ -3368,7 +3419,7 @@ fame = derive { name="fame"; version="2.18"; sha256="132wb59d15bs94fga5hwxxr9pkl fanc = derive { name="fanc"; version="1.23"; sha256="01bsny14r3i0a0yxbq3c670vh6m17g0lcjiphm6g5427rkn70whq"; depends=[Matrix]; }; fanovaGraph = derive { name="fanovaGraph"; version="1.4.7"; sha256="19bzl6yrmi5lgyx6nq3f7i0rdaz2ig580h8116axrsxpx8c4d52x"; depends=[sensitivity igraph DiceKriging]; }; fanplot = derive { name="fanplot"; version="3.4.0"; sha256="1arb10jxksicrdpgj8fq8r0sdnzvvdjjbw357aplqh422x54w4mp"; depends=[]; }; -faoutlier = derive { name="faoutlier"; version="0.4"; sha256="113qpwil669jr89kpqs6c6xzh0z3vp2hzfy98mh1dr2dvaznd06f"; depends=[sem lattice lavaan MASS]; }; +faoutlier = derive { name="faoutlier"; version="0.5"; sha256="1via1gggcj6cpdkyn61fbvlvhl47dwv9hi81x2jlq15lh340ljd4"; depends=[sem mvtnorm lattice lavaan mirt MASS]; }; far = derive { name="far"; version="0.6-4"; sha256="166lhswdd1shx591wvx8a3lwzjini60mc37rbb3qvm6fxrb6fl55"; depends=[nlme]; }; faraway = derive { name="faraway"; version="1.0.6"; sha256="10vj38chfnlz595pdi16v8gcwsbmn8a7p4gb0mm98dncyin5p2a3"; depends=[]; }; farsi = derive { name="farsi"; version="1.0"; sha256="0y14f86bccwjirdx33383wa605y7l7lr0w7ygvg8r7f7izkv7r3n"; depends=[]; }; @@ -3379,7 +3430,7 @@ fastICA = derive { name="fastICA"; version="1.2-0"; sha256="0ykk78fsk5da2g16i4wj fastM = derive { name="fastM"; version="0.0-2"; sha256="0q5dz47sqj6d4r3k6l6q34l5ajb8fjbf7xam75scp0mg3czswnfn"; depends=[Rcpp Rcpp RcppArmadillo]; }; fastR = derive { name="fastR"; version="0.8-1"; sha256="08p03i72zn0cbwjsxpnsknk0148dx3pfwkw740x7f52c3jgbb1gi"; depends=[mosaic lattice mosaicData]; }; fastSOM = derive { name="fastSOM"; version="0.9"; sha256="03501d5289lrlr4qcgxciz160hqc6nhqb9ab266fr132fkbiv4id"; depends=[]; }; -fastclime = derive { name="fastclime"; version="1.2.4"; sha256="0z91khjzffwy4mbqgkfw4l9mw32sg4p5pvcg4v24z1q44pgnwn4y"; depends=[lattice igraph MASS Matrix]; }; +fastclime = derive { name="fastclime"; version="1.2.5"; sha256="12k7bkq4gkkyh8lr2whmi73mzcy7wmfzwgi20kli7r4g39n3a1kv"; depends=[lattice igraph MASS Matrix]; }; fastcluster = derive { name="fastcluster"; version="1.1.16"; sha256="0x2prrsnqi5iqx23ki6y2agndjq8058ph6s703i4avrqi1q1w1q8"; depends=[]; }; fastcox = derive { name="fastcox"; version="1.1.1"; sha256="1a5i0ragl0r6p29iamkn04igakiwyysykfbs2p6ybgy8pfdq69sv"; depends=[Matrix]; }; fastmatch = derive { name="fastmatch"; version="1.0-4"; sha256="16gfizfb1p7rjybrfm57nb6hdm30iirbppva8p8xf8pndz35fjbs"; depends=[]; }; @@ -3387,6 +3438,7 @@ fastpseudo = derive { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j fat2Lpoly = derive { name="fat2Lpoly"; version="1.1.1"; sha256="0xgxlx9m6lgcn784892g2xvnabyq8k45wi3xrszrbdxxa7zqd1i4"; depends=[kinship2 multgee]; }; fbRanks = derive { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; }; fbati = derive { name="fbati"; version="1.0-1"; sha256="1ia67dg9b61kc14mjg7065v0c6n6agdp8cjdviasyzga00wzsyxj"; depends=[pbatR fgui rootSolve]; }; +fbroc = derive { name="fbroc"; version="0.1.0"; sha256="1zpg796day8qlvah3d4qy8118knxx7vfa3gf50jcsv97b8r15dmz"; depends=[ggplot2 Rcpp Rcpp]; }; fcd = derive { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[glmnet MASS combinat]; }; fclust = derive { name="fclust"; version="1.1"; sha256="1nimfgirpcff5dqqx2jqn25ma9j0agffimymrv9x5ivfdncdflbg"; depends=[]; }; fcros = derive { name="fcros"; version="1.3"; sha256="1ylkma69gfc5ij3vvf1axyasya31qm5bwj2bjlvj12byf52wsiy8"; depends=[]; }; @@ -3414,6 +3466,7 @@ fgac = derive { name="fgac"; version="0.6-1"; sha256="0paddf5a4w0g2i0ay7my0bppwh fgof = derive { name="fgof"; version="0.2-1"; sha256="0bclkb3as0fl2gyggqxczndfyj9pfnni5pa3inpn5msrnjg4g2j2"; depends=[mvtnorm numDeriv]; }; fgpt = derive { name="fgpt"; version="2.3"; sha256="1d0qzsn4b68jhk07k97iv765jpmzzh1gwqpid0r76vg4cwqfs3n7"; depends=[]; }; fgui = derive { name="fgui"; version="1.0-5"; sha256="0gzwxzvf2y9p5rlfk862d7l1dm2sdwjhjpcb8p494cj4g1xshazg"; depends=[]; }; +fheatmap = derive { name="fheatmap"; version="1.0.0"; sha256="0braywpc0zghv1lnwb0c83p8ls2w7b8d2gbvv0p4123rhax5limw"; depends=[RColorBrewer gdata ggplot2 reshape2 gplots]; }; fields = derive { name="fields"; version="8.2-1"; sha256="1zsi3ngp50f61nn93lh1v895as4lp63znf7bzn2q3hsl6ncaylbc"; depends=[spam maps]; }; fifer = derive { name="fifer"; version="1.0"; sha256="0vbkks6y6pacgpiixm10fbfa34lmk5r9kwd30lfjf0g7r51fhvv9"; depends=[xtable MASS]; }; filehash = derive { name="filehash"; version="2.2-2"; sha256="0766wrc42qh7r99bd2zy50vvdnqlz0vkzplskzkm5f4g63qdhjxh"; depends=[]; }; @@ -3426,7 +3479,7 @@ finiteruinprob = derive { name="finiteruinprob"; version="0.4"; sha256="0wcllbqk fishMod = derive { name="fishMod"; version="0.25"; sha256="0mg1bziz2ia406m4ilc7hw1bghrgdibm537hnlf9ffhfayjc4kid"; depends=[]; }; fisheyeR = derive { name="fisheyeR"; version="0.9"; sha256="1w6va7gakqq2q8hsvdszpn8s2ysdfc648bk5p5v3wbl5s403bci8"; depends=[tkrplot]; }; fishmethods = derive { name="fishmethods"; version="1.7-0"; sha256="0kgfv78f8a460nfvpfrrqfiy3ipbl3775axydal3vm1zf4l6k2z3"; depends=[MASS boot bootstrap]; }; -fishmove = derive { name="fishmove"; version="0.3-1"; sha256="1k0kl68j8n1bw72ywgjwxjy20ccjclfkzblqb8rq063a8pyp91nn"; depends=[ggplot2 plyr MASS boot]; }; +fishmove = derive { name="fishmove"; version="0.3-3"; sha256="1knbv087cg0czjcgdbrlpg69pp1dxb57b7ak5j1mcy7ay3a41a9h"; depends=[ggplot2 plyr MASS boot]; }; fit_models = derive { name="fit.models"; version="0.5-10"; sha256="06pj26dbnq6mf9wxinvjzwyn36656f66a4bmky36r7fzi92gf3d8"; depends=[lattice]; }; fit4NM = derive { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[gWidgets tkrplot RGtk2 gWidgetsRGtk2 cairoDevice]; }; fitDRC = derive { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yvcmi53h5cvm0wwv9hsb92x5zfhxn9"; depends=[]; }; @@ -3457,12 +3510,12 @@ foodweb = derive { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28 forams = derive { name="forams"; version="2.0-4"; sha256="1kvxlqdyzb3rqa45hp7jxjm009w0r6h78nr3yh9bqcz594zqidbq"; depends=[vegan]; }; foreach = derive { name="foreach"; version="1.4.2"; sha256="097zk7cwyjxgw2i8i547y437y0gg2fmyc5g4i8bbkn99004qzzfl"; depends=[codetools iterators]; }; forecTheta = derive { name="forecTheta"; version="1.0"; sha256="1ip6l27d37xqnmg8w285lq1y5j6akrjrviq4338c8sq075d8hckn"; depends=[forecast]; }; -forecast = derive { name="forecast"; version="5.9"; sha256="0x77jdr0qsb3mn9gwzm6gbbhnnn9yhsd1b1hsldj9lpf5ykzf4qc"; depends=[zoo timeDate tseries fracdiff Rcpp nnet colorspace Rcpp RcppArmadillo]; }; +forecast = derive { name="forecast"; version="6.0"; sha256="13pim2jz14jy9czjjaliv8x86iqcdaglzvdl9dz3xjj47c5nhhac"; depends=[zoo timeDate tseries fracdiff Rcpp nnet colorspace Rcpp RcppArmadillo]; }; foreign = derive { name="foreign"; version="0.8-63"; sha256="1g5hl8drcmh2c9kpkr4443nw7dsxjwqsqs1q4bnhvw2lizs8bfb2"; depends=[]; }; forensic = derive { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[genetics combinat]; }; forensim = derive { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; }; forestplot = derive { name="forestplot"; version="1.1"; sha256="1h28lwqdizs450bm5hb8zfbmx633n8v5bj2p8mi4cl814sjjylr0"; depends=[]; }; -formatR = derive { name="formatR"; version="1.1"; sha256="0pds6s4byykrlzm5fgkjky4nfj1y7dxci84pyjbav8w468vxbh73"; depends=[]; }; +formatR = derive { name="formatR"; version="1.2"; sha256="0dlj728qdm7wmxcxvw1ip64pl4ajgmi8ax69zafrn3306pg9y136"; depends=[]; }; formula_tools = derive { name="formula.tools"; version="1.3.4"; sha256="1xxl45x88fpskwvfj6sbcbfng84plpf8sjrkwawzki9a41ydhwaq"; depends=[operator_tools]; }; fortunes = derive { name="fortunes"; version="1.5-2"; sha256="1wv1x055v388ay4gnd1l8y6dgvamyfvmsd0ik9fziygwsaljb049"; depends=[]; }; forward = derive { name="forward"; version="1.0.3"; sha256="0swn5ysp3f660kl9jpmkck9324j1g3yhj2hl238rfrcr5wihxifc"; depends=[MASS]; }; @@ -3474,6 +3527,7 @@ fpow = derive { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh7 fpp = derive { name="fpp"; version="0.5"; sha256="1jqnx6bgpvnbbj2fa2b6m6aj8jd5cb9kz877r8kp7a5qj62xv1ww"; depends=[forecast fma expsmooth lmtest tseries]; }; fptdApprox = derive { name="fptdApprox"; version="2.0"; sha256="152bajs76wrapp0zdbkckff6kdkkm6sqqlqd2w220hsi96l2p9dh"; depends=[]; }; fracdiff = derive { name="fracdiff"; version="1.4-2"; sha256="03l5dqpqwwi5c8fwc2vissfawcsignai60h2zalknkibvk782dwq"; depends=[]; }; +fracprolif = derive { name="fracprolif"; version="1.0.6"; sha256="1cpb71yk1245j6qz4mqvpqc3s3lrmav4blp5wlxasjizn3ilwh66"; depends=[emg numDeriv]; }; fractal = derive { name="fractal"; version="2.0-0"; sha256="17wz3c9f1l1rphzdn7j27j5nb1ll6j84f9ihk0z6fni41050szv7"; depends=[splus2R ifultools sapa wmtsa scatterplot3d]; }; fractaldim = derive { name="fractaldim"; version="0.8-4"; sha256="0fln4qn0d79agnnlzi8b9g9qn90zynq1cg9v5isiyi71345v45nr"; depends=[abind]; }; fractalrock = derive { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8khgq269669ri16qxhar9646w40cw7wzh79r9gpf00"; depends=[futile_any futile_logger timeDate quantmod]; }; @@ -3493,7 +3547,7 @@ frmqa = derive { name="frmqa"; version="0.1-5"; sha256="0vd5jnjzhkc0vd4cqn4cs6a3 frontier = derive { name="frontier"; version="1.1-0"; sha256="0k2ap22qddzki63biikr1jzi5vmqz4j06d7qrf1y8axdq1q1cr44"; depends=[micEcon lmtest moments Formula miscTools]; }; frontiles = derive { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34wggyj0hwdlxfs9rfs8gjqsrg50xccchniqi"; depends=[classInt colorspace rgl sp]; }; frt = derive { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; }; -fscaret = derive { name="fscaret"; version="0.9.3"; sha256="0jfksc0m2jjgik2zbrmhjb8ngr5s58nxqrx68wd59vpnxixn0fv4"; depends=[caret gsubfn hmeasure]; }; +fscaret = derive { name="fscaret"; version="0.9.4"; sha256="0cna1cixq021lka7c8jgfqr6h8vvyvylckkbfay10ng7cxpqa44c"; depends=[caret gsubfn hmeasure]; }; fsia = derive { name="fsia"; version="1.0"; sha256="0qa4avd1xiwh1ih1cj067r7vipab2ngspq7hfd0xbapwx87fggrg"; depends=[]; }; fslr = derive { name="fslr"; version="1.3"; sha256="0668fpr3avqhyq42an9la71ln40kfjnf108nmkrwndvwl864i99w"; depends=[stringr oro_nifti matrixStats]; }; fso = derive { name="fso"; version="2.0-1"; sha256="02dr12bssiwn8s1aa1941hfpa4007gd65f3l4s74gs2vgjzdxf8s"; depends=[labdsv rgl]; }; @@ -3509,7 +3563,7 @@ functional = derive { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9 funreg = derive { name="funreg"; version="1.1"; sha256="1sxr4mylcpbya197d55yi6d7g5pfspaf59xxbwjgmwgjw06rl76r"; depends=[MASS mgcv mvtnorm]; }; funtimes = derive { name="funtimes"; version="1.0"; sha256="0jdl09x0fvfz08xyg1yfyhn0lgg8ycqbli4ag9js0yva8pwab7lh"; depends=[Jmisc]; }; futile_any = derive { name="futile.any"; version="1.3.0"; sha256="1c7pj64kz09qzwrxvkp1w1w8mvxwq36zkj6w4b7yyi8v7x3daq2a"; depends=[lambda_r]; }; -futile_logger = derive { name="futile.logger"; version="1.4"; sha256="1sn28kmphjxxq1bqyjbsv75bnh71pwngcfar5l18jr8x9ymjq4zk"; depends=[lambda_r futile_options]; }; +futile_logger = derive { name="futile.logger"; version="1.4.1"; sha256="1plld1icxrcay7llplbd4i8inpg97crpnczk58mbk26j8glqbr51"; depends=[lambda_r futile_options]; }; futile_matrix = derive { name="futile.matrix"; version="1.2.2"; sha256="1cb975n93ck5fma0gvvbzainp7hv3nr8fc6b3qi8gnxy0d2i029m"; depends=[lambda_r lambda_tools futile_logger RMTstat]; }; futile_options = derive { name="futile.options"; version="1.0.0"; sha256="1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"; depends=[]; }; futile_paradigm = derive { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; }; @@ -3575,15 +3629,16 @@ gazepath = derive { name="gazepath"; version="1.0"; sha256="00k6617wra9pcvyr94mr gb = derive { name="gb"; version="1.1.8-8"; sha256="18n9wqz82mjxjgzk8vc68kyz3b6lk21d2f16551d6fikjla03adf"; depends=[boot]; }; gbRd = derive { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; }; gbm = derive { name="gbm"; version="2.1.1"; sha256="0jkjr09w9cgfb21aznvr9nivxjmj1zxfsl7gafy4mwh719jzygy0"; depends=[survival lattice]; }; +gbm2sas = derive { name="gbm2sas"; version="1.0"; sha256="0khw1nqc4yl2719h3zc70yl26s4lmngfz5iqw00pcv838z8myc0i"; depends=[gbm]; }; gbs = derive { name="gbs"; version="1.0"; sha256="19zcsvd258ibrj356zlwgryjqylcs56agg3z6d44xbnf8prg05ig"; depends=[nlme]; }; gcbd = derive { name="gcbd"; version="0.2.5"; sha256="0fkg6vk0jkl6680n1hljyv783j4hd84mql0k4pfblvqafwv4nhm3"; depends=[RSQLite plyr reshape lattice]; }; gcdnet = derive { name="gcdnet"; version="1.0.4"; sha256="0fmy0li06rahch4ir0xa81yilvrd0zqyhmpl4hfxjahhl3npw370"; depends=[Matrix]; }; gclus = derive { name="gclus"; version="1.3.1"; sha256="02ba6zj9bjwrzykamjp40ajynx9xjx9h2i85n0ym0r5lcki4x6fn"; depends=[cluster]; }; -gcmr = derive { name="gcmr"; version="0.6.1"; sha256="0a47xpgi6bfsc0nn7vkid1q9r29h01q0vjkysaxh1i4zbmxnx5dl"; depends=[nlme sandwich geoR betareg Formula]; }; +gcmr = derive { name="gcmr"; version="0.7.0"; sha256="17wv1qgshakn390719r8zzd8fbbvnkfjhlbcwk2rd2pic05x8msm"; depends=[nlme sandwich geoR betareg Formula car sp]; }; gconcord = derive { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz1n164f9vi7mig8pcd07c4wxnm5ir9dagy"; depends=[]; }; gcookbook = derive { name="gcookbook"; version="1.0"; sha256="0hb52zfi5bl2j0h8lazz4gzhhcvpicb4ld6xm2vkvi4cj47piyy8"; depends=[]; }; gdalUtils = derive { name="gdalUtils"; version="0.3.1"; sha256="1a6sg3x5yfffa9xrkvc98i2hm3lvna4jw7p89gn2bf74kzphqpmy"; depends=[sp foreach R_utils]; }; -gdata = derive { name="gdata"; version="2.13.3"; sha256="05k5l4gz0381z89sp64xhngcsykazzznwmankwsnimx5alwrfk2m"; depends=[gtools]; }; +gdata = derive { name="gdata"; version="2.16.1"; sha256="14ssq8z45zf1wwgfgxlc33i6hsdhc0b71kfncfclxz5ahxaqdkdm"; depends=[gtools]; }; gdimap = derive { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[rgl oro_nifti movMF gridExtra colorspace geometry gsl abind]; }; gdistance = derive { name="gdistance"; version="1.1-7"; sha256="1wcpjx76pnkpc6kmqx7bq73qbvzfzjb9s46qb7gi7kabpkya97il"; depends=[raster igraph Matrix sp]; }; gdm = derive { name="gdm"; version="1.0"; sha256="08wafxvds4sxaxv7mbbkbzilkpfz1xnzdc5jdw3pldvmbgk861vd"; depends=[Rcpp raster reshape2 vegan plyr Rcpp]; }; @@ -3595,7 +3650,7 @@ geigen = derive { name="geigen"; version="1.5"; sha256="06k4fc7j8asqv1winmz28hb3 geiger = derive { name="geiger"; version="2.0.3"; sha256="1wqihvscmq44i34205fzv79wk7j2a72qd8y6ycgrv74plql0316c"; depends=[ape MASS mvtnorm subplex deSolve digest Rcpp coda Rcpp]; }; gelnet = derive { name="gelnet"; version="1.0"; sha256="06cyd5g5yxmyqiqjvp02f2k2ha50sk8qjqmmwcfxhaxysk9vbaag"; depends=[]; }; gems = derive { name="gems"; version="1.0.0"; sha256="0h8z3ih24hxdv8bah4xf8f797pnwihby8hj93z6zw5sq9dyszxwa"; depends=[MASS msm plyr data_table]; }; -gemtc = derive { name="gemtc"; version="0.6-1"; sha256="1da5z1gvad5rgc5cm3w69x58qjqfg7x65z71h91g89f5nvwxkl2c"; depends=[coda igraph meta XML]; }; +gemtc = derive { name="gemtc"; version="0.6-2"; sha256="0bkcbyh71aq3p7w75w78l472gfschfb2qf9wcv7s2vyy6ypbvh2q"; depends=[coda igraph meta XML plyr]; }; gemtc_jar = derive { name="gemtc.jar"; version="0.14.3"; sha256="18hbiygpsv67flc4v6z6mir0rfq41v1vsh11dg9phmdr8bx4kcl1"; depends=[rJava]; }; genMOSS = derive { name="genMOSS"; version="1.2"; sha256="18qinckzz7wsw222skrq30izbj6s85i8hq6iicj9nng8gh6jydr8"; depends=[ROCR]; }; genMOSSplus = derive { name="genMOSSplus"; version="1.0"; sha256="1n3ngx1piy3l14k5k95wrgvrjw9238jkygfqanl3xg2na2mmkr26"; depends=[]; }; @@ -3604,7 +3659,7 @@ genalg = derive { name="genalg"; version="0.2.0"; sha256="1wzfamq8k5yhwbdx0wy1w5 genasis = derive { name="genasis"; version="1.0"; sha256="1r0733cc2hss3f8dp19s1ji55yp72mds7p3x1zvvpiks2r7w712p"; depends=[Kendall fitdistrplus]; }; gendata = derive { name="gendata"; version="1.1"; sha256="1r5bhmfblhk6d31v0byhp4a0pmpri6vk697zmmx9b0hvhda7mllf"; depends=[]; }; gender = derive { name="gender"; version="0.4.3"; sha256="0dhwhv2b86arpmyr89g69h8ikw0f2x27ig420jngfb9gxljj9phc"; depends=[devtools dplyr httr jsonlite]; }; -genderizeR = derive { name="genderizeR"; version="1.0.0"; sha256="1a4zjbg8v7ig6hglbkvxbsp4q9hyy3zr751vmcsv529ikgiikkji"; depends=[jsonlite stringr tm data_table magrittr RCurl]; }; +genderizeR = derive { name="genderizeR"; version="1.1.0"; sha256="0hdphzmjqlzwk1gnhncidsdqrbc1lra3a4nl992ap9gfk890rvi4"; depends=[stringr httr tm data_table magrittr]; }; geneListPie = derive { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; }; geneSignatureFinder = derive { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[survival cluster class]; }; genepi = derive { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; }; @@ -3616,14 +3671,15 @@ genridge = derive { name="genridge"; version="0.6-5"; sha256="0ms8n1yrga5qqg9ni4 gensemble = derive { name="gensemble"; version="1.0"; sha256="0yyi7djzqx4yhxp6yy1rjgvzidjlna79ds89bgj6m6zj3aav6yw2"; depends=[]; }; geoBayes = derive { name="geoBayes"; version="0.2.150402"; sha256="123b2xds69clkgjvczkdbl673cahmiprrr1cki2alspryy37icar"; depends=[coda sp]; }; geoCount = derive { name="geoCount"; version="1.150120"; sha256="1kcjqls91r6p8ykn901c5p3v2lzbyainahhjpnr5c3a57v8s73ms"; depends=[Rcpp Rcpp RcppArmadillo]; }; -geoR = derive { name="geoR"; version="1.7-4.1"; sha256="19mafynvnpabwm5i6m4ax6d9rrh3fgyg9sslb552v6ry9nfq31h0"; depends=[sp MASS splancs RandomFields]; }; -geoRglm = derive { name="geoRglm"; version="0.9-4"; sha256="1wzq8p4xi40j4cagg7ji8qz9kynrwlyrlcvv0358pbl19nvg7hxb"; depends=[geoR]; }; +geoR = derive { name="geoR"; version="1.7-5.1"; sha256="10rxlvlsg2avrf63p03a22lnq4ysyc4zq06mxidkjpviwk1kvzqy"; depends=[MASS sp splancs RandomFields]; }; +geoRglm = derive { name="geoRglm"; version="0.9-8"; sha256="1zncqsw62m0p4a1wchhb8xsf0152z2xxk3c4xqdr5wbzxf32jhvh"; depends=[geoR sp]; }; geocodeHERE = derive { name="geocodeHERE"; version="0.1.2"; sha256="0sr8r6f41bpi0rncjcf0aydda68wnsrbmqzsgc1f1has2rb1g9p0"; depends=[httr]; }; +geojsonio = derive { name="geojsonio"; version="0.1.0"; sha256="17nv7xn80sf2nn6fvmlbnbcgg66n6bh8x725wdfnhk3gg1rb64g5"; depends=[sp rgdal rgeos httr maptools jsonlite magrittr V8]; }; geomapdata = derive { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; }; geometry = derive { name="geometry"; version="0.3-5"; sha256="1x1dhdbqnq1wi1r4njj3l1g8yag2dig19rna3a5pwf1j1gxbl0i8"; depends=[magic]; }; geomorph = derive { name="geomorph"; version="2.1.4"; sha256="19zf9g0lpkrdl3pkkjryzas42h3ng9q01ap182xxd36vr8p55sd8"; depends=[rgl jpeg ape geiger phytools]; }; geonames = derive { name="geonames"; version="0.998"; sha256="1p0x260i383ddr2fwv54pxpqz9vy6vdr0lrn1xj7178vxic1dwyy"; depends=[rjson]; }; -geophys = derive { name="geophys"; version="1.3-6"; sha256="1yfhilgc2nv5jfp0n7iah0wl041an2850c2qnzrvx0vv9fywgw9g"; depends=[RPMG RSEIS RFOC GEOmap cluster]; }; +geophys = derive { name="geophys"; version="1.3-8"; sha256="0nw4m30r46892cf1n575jkfjgdjc14wic9xzmzcnskbk8cd50hp2"; depends=[RPMG RSEIS RFOC GEOmap cluster]; }; georob = derive { name="georob"; version="0.1-5"; sha256="0awcqcpv82pn2z7lgir73pg2b0whvrrfy55gi0jrjn7lzyakhqaq"; depends=[sp constrainedKriging lmtest nlme nleqslv quantreg RandomFields robustbase snowfall]; }; geoscale = derive { name="geoscale"; version="1.1"; sha256="1xmn8y33jz1f16sjbzrld20gy7w54awrr79lhs9s4r8k1gmn0zqg"; depends=[]; }; geospacom = derive { name="geospacom"; version="0.5-7"; sha256="00yi2wwnjh2z8xhzfbp1jhh5fhq2z885s0gv937xsin4a63m76fd"; depends=[rgeos classInt sp maptools geosphere]; }; @@ -3657,8 +3713,8 @@ ghyp = derive { name="ghyp"; version="1.5.6"; sha256="0y3915jxb2rf01f7r6111p88ij giRaph = derive { name="giRaph"; version="0.1.2"; sha256="137c39fz4vz37lpws3nqhrsf4qsyf2l0mr1ml3rq49zz4146i0rz"; depends=[]; }; gibbs_met = derive { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; }; gimme = derive { name="gimme"; version="0.1-1"; sha256="1snzlwq6d86ygpn778m3inlfqpymp0l05pdlrdkm8ip4wgir0hvs"; depends=[lavaan qgraph]; }; -gistr = derive { name="gistr"; version="0.1.0"; sha256="1izas53whxa4n8gdkifv1a9c8f3fpi21vs81kn2dk51xmhs8qhh2"; depends=[jsonlite httr magrittr knitr]; }; -git2r = derive { name="git2r"; version="0.7"; sha256="02b4p7knrywr1sqijg85mxnm5y4mlp5z3rgylia8vdz473z6prr9"; depends=[]; }; +gistr = derive { name="gistr"; version="0.2.0"; sha256="1812qh3f4nwbpqaiq4gfkalfckwqvn84j7v7qfj69gd4jzxcwywz"; depends=[jsonlite httr magrittr assertthat knitr rmarkdown dplyr]; }; +git2r = derive { name="git2r"; version="0.10.1"; sha256="1damlhxf3ma0flqw4am42wj2dxk3m232wh0wpl1ikgx0dcfn9l8f"; depends=[]; }; gitter = derive { name="gitter"; version="1.0.4"; sha256="1pvl8k8mb15mcfz1074y246s9basmi5vbpw2n1ca0d8wm5wdidap"; depends=[jpeg tiff logging PET ggplot2]; }; glarma = derive { name="glarma"; version="1.3-0"; sha256="0fp354zxkddc4giynhwjlf9mg4sklcmqi0gdn8nxm1pkdpb86rba"; depends=[MASS]; }; glasso = derive { name="glasso"; version="1.8"; sha256="0gcapw7kyxb19wvdyxq1vsmc5j7yyd0rvqxs2i71k31q352sg6zw"; depends=[]; }; @@ -3674,10 +3730,10 @@ glmc = derive { name="glmc"; version="0.2-4"; sha256="03m1ym9w0b0gqib13pnh1yrjij glmdm = derive { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; }; glmgraph = derive { name="glmgraph"; version="1.0.1"; sha256="1jzkz2lri7nbxxkryhf95503wd651ic59h6iafkx9ahwpmibyv4l"; depends=[Rcpp Rcpp RcppArmadillo]; }; glmlep = derive { name="glmlep"; version="0.1"; sha256="0jnm3cf2r9fyncxzpk87g4pnxbryqcxxrc5y2a80pv48al3sxlzk"; depends=[]; }; -glmm = derive { name="glmm"; version="1.0.2"; sha256="0qlsqg1sp4p4qy95k52dc7c58lfmlxh0vk0jdpqzpi4rrh7ngpan"; depends=[trust mvtnorm Matrix]; }; +glmm = derive { name="glmm"; version="1.0.3"; sha256="0bs543x9czg8mbgpy0zhgnfll2nrmj8xz5kwkddf3k6hp859h0v8"; depends=[trust mvtnorm Matrix]; }; glmmBUGS = derive { name="glmmBUGS"; version="2.3"; sha256="1j96c1c2lqplhjvyigpj494yxj85bpmc7cnd1hl1rc8b552jr192"; depends=[MASS abind]; }; glmmGS = derive { name="glmmGS"; version="0.5-1"; sha256="1aqyxw3nrjri8k8wlwvddy25dj7mjqndssd5p5arax8vaqgrdnjz"; depends=[]; }; -glmmLasso = derive { name="glmmLasso"; version="1.3.3"; sha256="122dl5l4ngl9xvyz1kr58hryyxmld0zpwp5437ckwbnkf9bv1ldk"; depends=[minqa]; }; +glmmLasso = derive { name="glmmLasso"; version="1.3.4"; sha256="14x74640vvyrg72pq19gqb8db7wq97xhc30iakh84fdh1llyykpn"; depends=[minqa]; }; glmmML = derive { name="glmmML"; version="1.0"; sha256="0b1q5mj325xga3lfks28r03363bjfa31rlgjzwk4s0a6g21bdl4a"; depends=[]; }; glmnet = derive { name="glmnet"; version="2.0-2"; sha256="1nfbh1y41ly09lcdb5z02dy8l4qkll21yicmwg25wlkzk5sxb3z3"; depends=[Matrix foreach]; }; glmnetcr = derive { name="glmnetcr"; version="1.0.2"; sha256="1pyg23hdqksiaqdcrsaqz9vb7mgclm41hh0vb7ndkdv284bzzlbz"; depends=[glmnet]; }; @@ -3699,7 +3755,7 @@ gmnl = derive { name="gmnl"; version="1.0"; sha256="1nvk6x5412bfqdg54051hnisbnfm gmodels = derive { name="gmodels"; version="2.15.4.1"; sha256="1yizjw181bg0ml6j96calflz3k3wpvpxh61hfd3pdba013ixjib5"; depends=[MASS gdata]; }; gmp = derive { name="gmp"; version="0.5-12"; sha256="10fpvcli526a8j6jaryn0mwk78c24xy7whdpcvqzzvb41l6nnkma"; depends=[]; }; gmt = derive { name="gmt"; version="1.2-0"; sha256="09az2iwwhyrls4mr619vwzhzmaks6klm67lnir48bh40hynsvibp"; depends=[]; }; -gnm = derive { name="gnm"; version="1.0-7"; sha256="1jnh39i4462ky9vwnrlwq30d8qbp0jg73p8mwm6hnl8sdh53nkr1"; depends=[MASS Matrix nnet qvcalc relimp]; }; +gnm = derive { name="gnm"; version="1.0-8"; sha256="1581lzkb1v3y0arrq7x1bg7c91cii87bifxcdi1jzyc5rxj261la"; depends=[MASS Matrix nnet qvcalc relimp]; }; gnmf = derive { name="gnmf"; version="0.7"; sha256="00y1dx1c66gv769yiwnb91xbr77wpidf36x0n0dzaqfn7s9yh6xq"; depends=[]; }; gnumeric = derive { name="gnumeric"; version="0.7-2"; sha256="14c7a8aiqvqfbrjb1akpfjwidrzdhrw8a07ask083krki6vbi7hh"; depends=[XML]; }; goalprog = derive { name="goalprog"; version="1.0-2"; sha256="1h3nd3d53hbz5hl3494lpfjnp1ddklc17nhgw18362jd1nk14awy"; depends=[lpSolve]; }; @@ -3715,7 +3771,7 @@ gpairs = derive { name="gpairs"; version="1.2"; sha256="09mkdbs9hklxnmqcsnf65s3d gpclib = derive { name="gpclib"; version="1.5-5"; sha256="08j81b8wymsgin20n54gvm6m54rmdic51p6qzs9cz4pmgl7dkkjv"; depends=[]; }; gpk = derive { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; }; gplm = derive { name="gplm"; version="0.7-2"; sha256="0pr39fbkv61iwd110lq76p2fi4dvx9qz6mjsvg6bpja9pfbb6wc0"; depends=[AER]; }; -gplots = derive { name="gplots"; version="2.16.0"; sha256="19xz8225ckjw0a44mwvfj0gk8m47x2xkgnxjqrxsbjg5qiqwl9nh"; depends=[gtools gdata caTools KernSmooth]; }; +gplots = derive { name="gplots"; version="2.17.0"; sha256="0dyysysl595khv00m4h68s7zx7xlfnpxzfkc49av1s3fc58bvmr5"; depends=[gtools gdata caTools KernSmooth]; }; gpmap = derive { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw0gans048vsn7chyzjhyr7ah5xrfg"; depends=[isotone plyr ggplot2 foreach]; }; gpr = derive { name="gpr"; version="1.1"; sha256="03ywik11kc6cnaqrzzzi94jkrdbd378m3sf26f2vpb7d834nl728"; depends=[]; }; gptk = derive { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[Matrix fields]; }; @@ -3728,7 +3784,7 @@ granovaGG = derive { name="granovaGG"; version="1.3"; sha256="1bsxad2h7rmbkmmg5z graphicalVAR = derive { name="graphicalVAR"; version="0.1.2"; sha256="0vc2x58z4w1hhvkqpxya3wr78p2b1irfyivc7njxw8a2595rc347"; depends=[Rcpp Matrix glasso glmnet mvtnorm qgraph Rcpp RcppArmadillo]; }; graphicsQC = derive { name="graphicsQC"; version="1.0-6"; sha256="07kzz0r8rh4m7qqxnlab0d4prr56jz5kspx782byspkcm5l4xrsl"; depends=[XML]; }; graphscan = derive { name="graphscan"; version="1.0"; sha256="15kdpp2k2gpfr8qq6wr08gva5hlxqha2h48zi1j3p6r766j07082"; depends=[ape sp snowfall rgl]; }; -greport = derive { name="greport"; version="0.5-2"; sha256="0lmska9m29hsz9f4myix6my6mg53awr5abigg642i3i2axv7cjd7"; depends=[Hmisc data_table rms lattice latticeExtra Formula survival]; }; +greport = derive { name="greport"; version="0.5-3"; sha256="0cd7rqzrk1yb22ksbmva1fl9k388bxxm586c20j8k8z5zympi9g1"; depends=[Hmisc data_table rms lattice latticeExtra ggplot2 Formula survival]; }; gridBase = derive { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; }; gridDebug = derive { name="gridDebug"; version="0.4-0"; sha256="1nbcdjip6ghnlv0j7cf45bpqdpirwn636pg324f0hgiqj4rifn09"; depends=[gridGraphviz gridSVG]; }; gridExtra = derive { name="gridExtra"; version="0.9.1"; sha256="15pj5w5wlrf8gw4z01i9j88gk6bm4kni64fpip9icmxkn887y3hx"; depends=[]; }; @@ -3736,7 +3792,7 @@ gridGraphics = derive { name="gridGraphics"; version="0.1-3"; sha256="09ml9vy4lz gridGraphviz = derive { name="gridGraphviz"; version="0.1"; sha256="14zcr0w2c9cgdw6ij93w52k3bkmgdmx809snh9jjf2amy08p2gbg"; depends=[]; }; gridSVG = derive { name="gridSVG"; version="1.4-3"; sha256="1jgrhckjbvccp5zqbkkiw9glhdljwxlc8kkr1fgkbrwmsi053iwk"; depends=[RJSONIO XML]; }; grnn = derive { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; }; -groc = derive { name="groc"; version="1.0.4"; sha256="1v32gwr8ghv47dmzp1x02n3aaqv3cfywh7xzx2486v4p960s42gc"; depends=[rrcov pls mgcv robust robustbase MASS]; }; +groc = derive { name="groc"; version="1.0.5"; sha256="1kqcdyq1y80gd62jpn38yz6q1qmg84b7k8qcniip5h948vfzkddg"; depends=[rrcov pls mgcv robust robustbase MASS]; }; grofit = derive { name="grofit"; version="1.1.1-1"; sha256="1rnym5fxbg3bin2idmymrwvf1fcd646bipbgjd6wby8my69zy4c5"; depends=[]; }; groupRemMap = derive { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; }; grouped = derive { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; }; @@ -3777,12 +3833,14 @@ gvlma = derive { name="gvlma"; version="1.0.0.2"; sha256="0gj52hg665nmlwgbjh9yvz gwerAM = derive { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; }; gwrr = derive { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; }; h2o = derive { name="h2o"; version="2.8.4.4"; sha256="03mj2p5wsgdn0jnv1fsrj7012v2am0mvyayj24zp7q56sfsgxigf"; depends=[statmod survival RCurl rjson]; }; +h5 = derive { name="h5"; version="0.9.1"; sha256="1q20i5hnfzr88kb63yvvgn7z39cvk514fj2770i29lm71jdph00q"; depends=[Rcpp Rcpp]; }; hSDM = derive { name="hSDM"; version="1.4"; sha256="1jq6hdnyv446ng62srip0b48kccf0qw3xqym3fprg74mjdy3inqr"; depends=[coda]; }; haarfisz = derive { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; }; hamlet = derive { name="hamlet"; version="0.7"; sha256="0f3gl5xvgdksaxk76dyv46hahc41f2j3pf9wp0rc0q7wpp5nfsjl"; depends=[]; }; -hapassoc = derive { name="hapassoc"; version="1.2-7"; sha256="1cyx68fzazyyihhp2r237c6igspnfklswnja2k4z3my528ggbq7k"; depends=[]; }; +hapassoc = derive { name="hapassoc"; version="1.2-8"; sha256="0qs5jl0snzfchgpp6pabncwywxcmi743g91jvjiyyzw0lw85yv4s"; depends=[]; }; haplo_ccs = derive { name="haplo.ccs"; version="1.3.1"; sha256="0cs90zxxbvglz1af0lh37dw1gxa04k0kawzxamz2was3dbh19lbz"; depends=[haplo_stats survival]; }; haplo_stats = derive { name="haplo.stats"; version="1.6.11"; sha256="0j3zh4n2rly8dij8srm8ck6fl63haw6d27m3nfnrxywr87pljg14"; depends=[]; }; +haplotypes = derive { name="haplotypes"; version="1.0"; sha256="0pwihfi6g4jrnkha9s9rksq0fc8j04mlrwf0295rmy49y19rg84s"; depends=[network]; }; harvestr = derive { name="harvestr"; version="0.6.0"; sha256="1jg4d98bwx2cm3hliayqrazq43sa9kd9ynpaid6x4ld3mz5y8mlq"; depends=[plyr digest]; }; hash = derive { name="hash"; version="2.2.6"; sha256="0mkx59bmni3b283znvbndnkbar85fzavzdfgmwrhskidsqcz34yz"; depends=[]; }; hashFunction = derive { name="hashFunction"; version="1.0"; sha256="1v57xj8xwv6xhxvgp0zxgvs5vcjw8z5k2ciwbn0jxf4ilyd66cgj"; depends=[]; }; @@ -3810,11 +3868,11 @@ heatmap3 = derive { name="heatmap3"; version="1.1.1"; sha256="14zkij0gr9awzic71k heatmapFit = derive { name="heatmapFit"; version="2.0.2"; sha256="00p39y6x13yxrxfqx6gzmb80fk1hsyi8wa6brx40hj37pyyfis0p"; depends=[]; }; heavy = derive { name="heavy"; version="0.2-35"; sha256="04aw0r2hgnxf9nsd18q2b5d130vj578nyv5wacivikgfifyy0y39"; depends=[]; }; helloJavaWorld = derive { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; }; -helsinki = derive { name="helsinki"; version="0.9.24"; sha256="1ljqgwcmvcmir8fq3izym4k8ljakwqpgq94wfhrdxp0q393zb8rq"; depends=[maptools RCurl rjson sp]; }; -heplots = derive { name="heplots"; version="1.0-12"; sha256="064kanmqm4b0sbyw60wfb19adclpdagm23l6p86vi0hyx0dr0ykz"; depends=[car MASS]; }; +helsinki = derive { name="helsinki"; version="0.9.27"; sha256="1vhzlxjkk2hgzjlin9ksvjk3bi2ly5nm4361777m49lb84ncs7dr"; depends=[maptools RCurl rjson sp]; }; +heplots = derive { name="heplots"; version="1.0-15"; sha256="0sl5pqc57lhhh8s8hym0l874saq974hms6vsq7ll6g60rifx4lbq"; depends=[car MASS]; }; hergm = derive { name="hergm"; version="2.2-1"; sha256="0pii3dgpjgh4s5a1cjj0nyw3p8g0b7f0hhfbfc9mwr5mz84yidlh"; depends=[ergm latentnet network sna]; }; heritability = derive { name="heritability"; version="1.1"; sha256="05vcprf3rk65197njnhw7n5l19hvy7hfp4fdigkwzvch4rnicidf"; depends=[MASS]; }; -hermite = derive { name="hermite"; version="1.0.2"; sha256="0hmh3vpla3xjr4gasv9jsq4ldpchzip8hqbz31c2a77kkhbmrg22"; depends=[maxLik]; }; +hermite = derive { name="hermite"; version="1.1.0"; sha256="184f7iixsmpli5hp4f0frjxfwpxpicjn1yrk6sf8y4il49cx0s4v"; depends=[maxLik]; }; het_test = derive { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; }; hett = derive { name="hett"; version="0.3-1"; sha256="1y0hr9g2pjwzc5azh095h33qidxhhmlvd1csamjnhwdphj5drzz0"; depends=[MASS lattice]; }; hexView = derive { name="hexView"; version="0.3-3"; sha256="0cx5hl70sk1wk24na21vjyv50b2358z1plvvcw604qf1zij4icwn"; depends=[]; }; @@ -3833,11 +3891,12 @@ hierDiversity = derive { name="hierDiversity"; version="0.1"; sha256="1n4jg003h9 hierNet = derive { name="hierNet"; version="1.6"; sha256="08lifk92caa4l9nfb89rl6vby8sd1ba3ay7z29ffirsg7cx07qiw"; depends=[]; }; hierarchicalDS = derive { name="hierarchicalDS"; version="2.9"; sha256="0ckxy4pww5iik4m4kqs714f00g7lfzsarjdbpd0bcalvq4lmaal2"; depends=[truncnorm mvtnorm Matrix coda xtable mc2d ggplot2 rgeos]; }; hierfstat = derive { name="hierfstat"; version="0.04-14"; sha256="0zbl5cq0cidv0glgi1g2q0azfw393lnb7hp8m69sxwdjn3y3912c"; depends=[gtools ade4]; }; +hiertest = derive { name="hiertest"; version="1.1"; sha256="17maf1w4vkqknxff3f00fzv136j3dbbigyzl4vq4sln9j27w10r3"; depends=[]; }; highD2pop = derive { name="highD2pop"; version="1.0"; sha256="1s4v6m2d3vzvxsgmjzczv1zj3kv3ygvv6gbkkbjwsdhkvc1rdmf0"; depends=[fastclime]; }; highTtest = derive { name="highTtest"; version="1.1"; sha256="18hgxlr0y8y1d4ldqmfcg4536lhyn5p6w88sq1vj74qr5wzydga1"; depends=[]; }; highfrequency = derive { name="highfrequency"; version="0.4"; sha256="0kzadnkvmxcrb8flsxlx8vd9c2yad7hh1pij05dhdcpaidrc9acq"; depends=[xts zoo]; }; -highlight = derive { name="highlight"; version="0.4.5"; sha256="004ncg3dhfj4dywa2pk32r2pwcm90dp0vnanip0fqflkgwn1qbbp"; depends=[]; }; -highr = derive { name="highr"; version="0.4.1"; sha256="1ssjq92p8351i8ry4k239s1n6dkail9aj5al8asb7h9z6ibfwvhw"; depends=[]; }; +highlight = derive { name="highlight"; version="0.4.7"; sha256="1gpwj4phq45hhx4x6r8rf6wc6ak6y4fkbad9v23fl8wldb4a8dyg"; depends=[]; }; +highr = derive { name="highr"; version="0.5"; sha256="0jnab5pk5sg4f5krsg5jdamr4y40z2pzxhp5h6fb6wys3m75hzny"; depends=[]; }; hillmakeR = derive { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; }; hint = derive { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; }; hisemi = derive { name="hisemi"; version="1.0-319"; sha256="0pm7dsaaqrdhkvxsk2cjvk6qd2rqqmddmv012smnrivi7mpnvd4w"; depends=[Matrix Iso fda]; }; @@ -3845,7 +3904,7 @@ hisse = derive { name="hisse"; version="1.0"; sha256="0vbwc006ypn9jcaw86dcvmg2hy histmdl = derive { name="histmdl"; version="0.4-1"; sha256="0kiz95hdi658j5s7aqlf8n9k35s30pshc5nymif88gjik9gvrxd0"; depends=[]; }; histogram = derive { name="histogram"; version="0.0-23"; sha256="0hrhk423wdybqbvgsjn7dxgb95bkvmbh573q1696634hvzfdm68c"; depends=[]; }; historydata = derive { name="historydata"; version="0.1"; sha256="1h69x3iig542d43p9zm8x83p4dq48iwsw606j4fndnqhx99vzkw6"; depends=[]; }; -hitandrun = derive { name="hitandrun"; version="0.5"; sha256="1f7h963hqyhir3c26dyi0gvv5pf0a7x8sw2km3wh4ncwx2barfzq"; depends=[rcdd]; }; +hitandrun = derive { name="hitandrun"; version="0.5-1"; sha256="0qgja0xw6687hr9qw4cwl9gq1vbv8gdnh6fkq2wx5cahgjz1p3bj"; depends=[rcdd]; }; hive = derive { name="hive"; version="0.1-16"; sha256="1xaxnr8nfkji2b5f5dq2h01pkl20rm24wxnf1y1xv695v3j58ibd"; depends=[rJava XML]; }; hlr = derive { name="hlr"; version="0.0-4"; sha256="04w1hzjfg2ly9vm9ynh676fy74d9ncy3a1mak209z2ddgr3m7r2y"; depends=[MASS]; }; hmeasure = derive { name="hmeasure"; version="1.0"; sha256="0wr0xq956glmhvy4yis3qq7cfqv9x82ci9fzx3wjvaykd16h0sx9"; depends=[]; }; @@ -3865,11 +3924,11 @@ hpcwld = derive { name="hpcwld"; version="0.5"; sha256="17k4mw41gygwgvh7h78m0jgz hpoPlot = derive { name="hpoPlot"; version="2.0"; sha256="080jzi1zw510clbbkmf2wkwbfgna06kfz91i7d90b9pqi7krj28j"; depends=[functional magrittr]; }; hqmisc = derive { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; }; hrr = derive { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw6k2n25sisnam6h1a39b96byn"; depends=[]; }; -hsdar = derive { name="hsdar"; version="0.1.2"; sha256="1zzz0drvykcs4mfj7xxcvvzcmk6l2038l0ngpjx52ih05yzajzxi"; depends=[sp raster rgdal rootSolve signal]; }; +hsdar = derive { name="hsdar"; version="0.1.3"; sha256="0vwiavzzfxz81iskgjy0af8gwh8fkjiyzhql82s2n9snvy7d36fk"; depends=[sp raster rgdal rootSolve signal]; }; hsicCCA = derive { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; }; hsmm = derive { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; }; hsphase = derive { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[snowfall Rcpp RcppArmadillo Rcpp]; }; -htmlTable = derive { name="htmlTable"; version="1.2"; sha256="06hbc3wvymksr83cxy9rjkfw860sfg513ylipgdnxzr5h986hfad"; depends=[stringr knitr magrittr]; }; +htmlTable = derive { name="htmlTable"; version="1.3"; sha256="00zcismapanyb68657gng5l6g3hsmpls84naracshj4gfk2l1cfs"; depends=[stringr knitr magrittr]; }; htmltools = derive { name="htmltools"; version="0.2.6"; sha256="1gp6f6388xy3cvnb08q08vraidjp740gfxlafdd19m2s04v5hncz"; depends=[digest]; }; htmlwidgets = derive { name="htmlwidgets"; version="0.3.2"; sha256="1r0n3c2xvj9k7x892nbqyclpc66lq5wyxc2y0nybs5wcz3jx9s2p"; depends=[htmltools RJSONIO yaml]; }; hts = derive { name="hts"; version="4.4"; sha256="1dpm669lc4khjkcs49m1nh7i61sclsqy7xbcn4mqqjhfgs7sg7sk"; depends=[forecast SparseM]; }; @@ -3922,10 +3981,11 @@ ic_infer = derive { name="ic.infer"; version="1.1-5"; sha256="0nmx7ijczzvrv1j432 ic50 = derive { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; }; ica = derive { name="ica"; version="1.0-0"; sha256="009xv1ycgbnw6ysx1wxrgygny7qa2wd2mcjrg2fwxg958mzyrx4z"; depends=[]; }; icaOcularCorrection = derive { name="icaOcularCorrection"; version="3.0.0"; sha256="1vmvarc2apipd0vlhprc5wpgh8i38m5myj1gqdymjrnky0azq17f"; depends=[fastICA mgcv]; }; -icamix = derive { name="icamix"; version="1.0.1"; sha256="06jaznzgixglbrrmvmp3cnghdldv30h5nfjghvdymia27m7ssdrr"; depends=[Rcpp Rcpp RcppArmadillo]; }; +icamix = derive { name="icamix"; version="1.0.2"; sha256="0rpqx9q5p3nb5gd76zlkqls52a8qiw7y9r26jwxs71nxl85clqcs"; depends=[Rcpp Rcpp RcppArmadillo]; }; icapca = derive { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; }; iccbeta = derive { name="iccbeta"; version="1.0"; sha256="0zsf2b5nrv39pssi5walf82892fr8p1f802c96hjjknh78q7gh0h"; depends=[lme4 Rcpp Rcpp RcppArmadillo]; }; -icd9 = derive { name="icd9"; version="1.1"; sha256="10swy0zhzip412icc9nf324za3czcjfpby6d9ha480504073fakm"; depends=[Rcpp checkmate Rcpp]; }; +icd9 = derive { name="icd9"; version="1.2"; sha256="0d0dgd5951chyfimzjb00cphdvqzml8p8wr7sad3qfhv44dsypn7"; depends=[Rcpp checkmate Rcpp]; }; +icenReg = derive { name="icenReg"; version="1.1.1"; sha256="0q1h94r6sv56jxrg1lxc8ms1drrcrqf7k888jb63qmg4wscp33bi"; depends=[survival foreach]; }; icensmis = derive { name="icensmis"; version="1.2.1"; sha256="1h4l9irip4hv34hr92j8756qgmy455mfdblr7ypgsgvr27cgax8h"; depends=[Rcpp Rcpp]; }; idbg = derive { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; }; identity = derive { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; }; @@ -3934,6 +3994,7 @@ ieeeround = derive { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4f ifa = derive { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; }; ifs = derive { name="ifs"; version="0.1.4"; sha256="0fzani8rnn4rdwlghq967hhi4zfjnk3gwpk3v6wys738xj7yfwp1"; depends=[]; }; ifultools = derive { name="ifultools"; version="2.0-1"; sha256="16lrmajyfa15akgjq71w9xlfsr4y9aqfw7y0jf6gydaz4y6jq9b9"; depends=[splus2R MASS]; }; +ig_vancouver_2014_topcolour = derive { name="ig.vancouver.2014.topcolour"; version="0.1.2.0"; sha256="0yclvm6xppf4w1qf25nf82hg1pliah68z7h3f683svv0j62q748h"; depends=[]; }; igraph = derive { name="igraph"; version="0.7.1"; sha256="1nvb30zjjw861idbd8zap9qqg22k87zdi6qqvjf1s29v7hkx7kq7"; depends=[Matrix]; }; igraphdata = derive { name="igraphdata"; version="0.2.2"; sha256="0lmgz9zglz0rn0iyjs9kdcm1xp09kh21sv91wnj74666jp0wsg4x"; depends=[]; }; igraphtosonia = derive { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; }; @@ -3951,7 +4012,7 @@ inTrees = derive { name="inTrees"; version="1.1"; sha256="1b88zy4rarcx1qxzv3089g inarmix = derive { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp Rcpp]; }; incReg = derive { name="incReg"; version="1.0"; sha256="1kckx64hn8g9wvjg7g9xild5hclim1rs7z2m7rgmbdwlbayxpwgv"; depends=[car]; }; indicoio = derive { name="indicoio"; version="0.3"; sha256="04c2j4l103fiiibf83z7iq95wfnlv9rj46cyp9xy68bzqkbwdi3m"; depends=[httr rjson stringr png]; }; -indicspecies = derive { name="indicspecies"; version="1.7.4"; sha256="1b9fgdsprh89siqps30v2yz0hsvfxffz2ynp1z74dmvx52iih4vs"; depends=[permute sp rgeos]; }; +indicspecies = derive { name="indicspecies"; version="1.7.5"; sha256="16m4pnfnmaskin4aaalm2cmv3vwzg94045max8nhkgw02kpskz1r"; depends=[permute]; }; ineq = derive { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; }; inference = derive { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; }; inferference = derive { name="inferference"; version="0.4.61"; sha256="02rsirwh4arqkgxpw3vnd0m2k055ir2074mlz27gbzmwz0ycpfzk"; depends=[numDeriv lme4 Formula]; }; @@ -3977,7 +4038,7 @@ interAdapt = derive { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm interferenceCI = derive { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; }; intergraph = derive { name="intergraph"; version="2.0-1"; sha256="03ycay3x4wd3j7r0mad9qgi4h77krapg613ans3jf9qa4ys2njlv"; depends=[network igraph]; }; internetarchive = derive { name="internetarchive"; version="0.1.2"; sha256="08gbkqbzx963c1jy3a540fsd0ff9ylr7la1clwjn46lp4cc4yv1h"; depends=[httr jsonlite dplyr]; }; -interpretR = derive { name="interpretR"; version="0.2.1"; sha256="02k1a864ldb6ych76vk0rdpv8idxpjynwhdh0d85y013xi5fsc3k"; depends=[randomForest AUC]; }; +interpretR = derive { name="interpretR"; version="0.2.2"; sha256="048qhq9mf3qna48v8ml7hfa7imrsrhrl0hrb44arh1ik3i5a2xx6"; depends=[randomForest AUC]; }; interval = derive { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[survival perm MLEcens]; }; intervals = derive { name="intervals"; version="0.15.0"; sha256="0lvxaq5ia7hj65n00awz454a2vdxpskxjw45wsakgh0sc60hk8yz"; depends=[]; }; interventionalDBN = derive { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; }; @@ -4015,7 +4076,7 @@ isva = derive { name="isva"; version="1.8"; sha256="09mrvvk09j460dzi45z8hwdpmibf iteRates = derive { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[partitions VGAM MASS ape apTreeshape geiger gtools]; }; iterLap = derive { name="iterLap"; version="1.1-2"; sha256="0ixh9aw115496ib0iswfsj97rjcd2f02z116dg57vl9hhzh28f13"; depends=[quadprog randtoolbox]; }; iterators = derive { name="iterators"; version="1.0.7"; sha256="1zwqawhcpi95fx4qqj4cy31v5qln2z503f7cvv9v5ch3ard4xxqv"; depends=[]; }; -iterpc = derive { name="iterpc"; version="0.2.6"; sha256="1pr8b349cs40364mdkcicm7sccjghxrmhy46zzv6cdk8fs0fn2fi"; depends=[Rcpp polynom Rcpp]; }; +iterpc = derive { name="iterpc"; version="0.2.7"; sha256="041gihbcv9i7f1jzvlldkyfm58p86pyv2sf4hbk09xp00azp8ahf"; depends=[Rcpp polynom Rcpp]; }; itertools = derive { name="itertools"; version="0.1-3"; sha256="1ls5biiva10pb1dj3ph4griykb9vam02hkrdmlr5a5wf660hg6xn"; depends=[iterators]; }; itertools2 = derive { name="itertools2"; version="0.1.1"; sha256="0yra3x9ddvn5pp3jibm69205zazv81bz0cflw4mdvxpqadaf9f96"; depends=[iterators]; }; itree = derive { name="itree"; version="0.1"; sha256="164zgr142hcp9plnbccs6m823p4m0prk73bvp54bc7bqnqmc3d9a"; depends=[]; }; @@ -4026,6 +4087,7 @@ ivbma = derive { name="ivbma"; version="1.05"; sha256="0d7kg6pkdx1aj1i6kqs2r7j1k ivfixed = derive { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; }; ivivc = derive { name="ivivc"; version="0.2.2"; sha256="1qychbszcg9lmbmrnpv65xcv1i5k2xarsa374fs6gw7zlp5nrvap"; depends=[reshape optimx sciplot png deSolve minpack_lm]; }; ivlewbel = derive { name="ivlewbel"; version="1.1"; sha256="0ykcfikm2i28s3fm6zzx8cjvpwhksg8an0rfr0b35gf7p69brgag"; depends=[gmm plyr lmtest]; }; +ivmodel = derive { name="ivmodel"; version="1.0"; sha256="14ic49vyikx5fiz2ccjmd53f0vcg3jh3fs6fqhl8w3hm9z9x4qvz"; depends=[Matrix]; }; ivpack = derive { name="ivpack"; version="1.2"; sha256="0cr5acjrn41d3q0b77hlg2jmsbf1msvys9gcavm1blsryg2bc03c"; depends=[AER sandwich lmtest]; }; ivpanel = derive { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr0hihlhd9acsbaznh88lknx53ijc2qv"; depends=[Formula]; }; ivprobit = derive { name="ivprobit"; version="1.0"; sha256="1kijq7k6iv2ybaxb08kqzm2s2k6wp2z50r01kxcq023pmyfjczwy"; depends=[]; }; @@ -4034,7 +4096,7 @@ jaatha = derive { name="jaatha"; version="2.7.0"; sha256="1ibk84x38j03hbdrf9pi0b jackstraw = derive { name="jackstraw"; version="1.0"; sha256="1irfzivy7c9fb2pr98flx05s5hkk6sid1hkd5b3k9m9mgs6ixbfy"; depends=[corpcor]; }; jagsUI = derive { name="jagsUI"; version="1.3.1"; sha256="18g755dxmlwv5abjdv3sip5qxpd13sx79f85wb0ji5i4fjax26ky"; depends=[lattice rjags coda]; }; james_analysis = derive { name="james.analysis"; version="1.0.0"; sha256="01nbwhph22nfl0biwcgvb1q76jp79qj7qfn2fxpyx2dkkhzxzrmv"; depends=[rjson naturalsort]; }; -jiebaR = derive { name="jiebaR"; version="0.4"; sha256="0vm41z2kc5zvvqmamwfqacc1ndpa0npk515zn7v4bd6gv6dw2lgn"; depends=[jiebaRD Rcpp Rcpp]; }; +jiebaR = derive { name="jiebaR"; version="0.5"; sha256="1x41jqc1ai3v1fn9f65dk7k4g2llf3pk9z3bwqihb95qf80mhd4v"; depends=[jiebaRD Rcpp Rcpp]; }; jiebaRD = derive { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; }; jmetrik = derive { name="jmetrik"; version="1.0"; sha256="0xnbvby03fqbxgg0i0qxrrzjv98783n6d7c1fywj81x487qlj77j"; depends=[]; }; joineR = derive { name="joineR"; version="1.0-3"; sha256="0q98nswbxk5dz8sazzd66jhlg7hv5x7wyzcvjc6zkr6ffvrl8xj7"; depends=[nlme MASS boot survival lattice statmod gdata]; }; @@ -4079,7 +4141,7 @@ kml3d = derive { name="kml3d"; version="2.2"; sha256="1n94kfi49rgb9149bgc9043f0y kmlcov = derive { name="kmlcov"; version="1.0.1"; sha256="09s9ganfsnwp22msha78g6pjr45ppyfyqjf6ci64w3w15q5qlcd9"; depends=[]; }; kmodR = derive { name="kmodR"; version="0.1.0"; sha256="1y1pqrrralklflyb1dw8bslfcyqrw8ryijfbhkwba7ykpxcf9fda"; depends=[]; }; knitcitations = derive { name="knitcitations"; version="1.0.5"; sha256="1a9lw9gdb31akdwiif5xzbs4s0s9xkhm3n735xnkiyc9n6afwzn3"; depends=[RefManageR digest httr]; }; -knitr = derive { name="knitr"; version="1.9"; sha256="17kwz14n16c3zjrpvm3c6rfn501gwlzgiikzwmc6krxvxafghik9"; depends=[evaluate digest formatR highr markdown stringr]; }; +knitr = derive { name="knitr"; version="1.10.5"; sha256="1qxpsnjwb4bdq44k3nglfrznpvqaqj18njx4imbpk3njzcjif7a7"; depends=[evaluate digest formatR highr markdown stringr yaml]; }; knitrBootstrap = derive { name="knitrBootstrap"; version="0.9.0"; sha256="1cw5dvhjiypk6847qypxphfl9an54qjvd6qv029znhwijsg56mmg"; depends=[knitr markdown]; }; knnGarden = derive { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; }; knnIndep = derive { name="knnIndep"; version="2.0"; sha256="1fwkldgs2994svf3sj90pwsfx6r22cwwa22b30hdmd24l8v9kzn7"; depends=[]; }; @@ -4105,7 +4167,7 @@ kzft = derive { name="kzft"; version="0.17"; sha256="1y6almhs1x21cr4bbf5fj3mnhp6 kzs = derive { name="kzs"; version="1.4"; sha256="1srffwfg0ps8zx0c6hs2rc2y2p01qjl5g1ypqsbhq88vkcppx1w9"; depends=[lattice]; }; l2boost = derive { name="l2boost"; version="1.0"; sha256="1p0sbvlnax4ba4wjkh3r0bmjs601k590g7bdfk6wxvlj42jxcnkl"; depends=[MASS]; }; laGP = derive { name="laGP"; version="1.1-3"; sha256="11blzdnil0nw3q5vf4y1rv7l4zxjx8ilynv9jpkm14azv5dsr8jw"; depends=[tgp]; }; -labdsv = derive { name="labdsv"; version="1.6-1"; sha256="0bcsjznq9w1arv503895060hkri0447fnc49nj4ynry7fi35ci22"; depends=[mgcv MASS]; }; +labdsv = derive { name="labdsv"; version="1.7-0"; sha256="1r5vbmdijcrw0n3phdmfv8wiy7s08pidvhac4pnsxfmf98f74jby"; depends=[mgcv MASS rgl cluster]; }; label_switching = derive { name="label.switching"; version="1.3"; sha256="05kbxvrp0lm5913lhy7pgxr9cq64sm5hiz6ydmmgfmbmfirrcqyx"; depends=[combinat lpSolve]; }; labeledLoop = derive { name="labeledLoop"; version="0.1"; sha256="0gq392h0sab8k7k8bzx6m7z5xpdsflldhwbpdf92zbmkbzxsz00m"; depends=[]; }; labeling = derive { name="labeling"; version="0.3"; sha256="13sk7zrrrzry6ky1bp8mmnzcl9jhvkig8j4id9nny7z993mnk00d"; depends=[]; }; @@ -4157,11 +4219,13 @@ leafletR = derive { name="leafletR"; version="0.3-2"; sha256="183qrfmcanb4c5n3w0 leapp = derive { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[MASS corpcor]; }; leaps = derive { name="leaps"; version="2.9"; sha256="1ax9v983401hvb6cdswkc1k7j62j8yk6ds22qdj24vdidhdz5979"; depends=[]; }; learningr = derive { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; }; +learnstats = derive { name="learnstats"; version="0.1.0"; sha256="03rlyh7ynxxvnkx8r8611ss36aqc8mdk6w2kjajmmsdwzp81lgnc"; depends=[RcmdrPlugin_epack ggplot2 shiny rmarkdown Rcmdr]; }; lefse = derive { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape picante geiger fBasics SDMTools vegan]; }; leiv = derive { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; }; -lessR = derive { name="lessR"; version="3.3"; sha256="0hzvf85x81p5lcszrpf897azh4fgpij2zyk0z5icma67aifdf5bf"; depends=[car leaps MBESS foreign gdata triangle]; }; +lessR = derive { name="lessR"; version="3.3.1"; sha256="1nwvkxi9q7fsjgrfpa16ry54cyk2ja5cy4cq0xzqya6wn04mbicg"; depends=[car leaps MBESS foreign gdata triangle]; }; lestat = derive { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; }; -letsR = derive { name="letsR"; version="2.0"; sha256="0z695c2mcswhw064cfq9nj7ai2mfxd9hjy764wgjdnwp4x1bnjh8"; depends=[raster maps XML geosphere fields maptools sp rgdal]; }; +letsR = derive { name="letsR"; version="2.1"; sha256="0jgc6k2hbpbr7kl42n01mff7pzjz60zd8mchrfhzgd797pwcqlbq"; depends=[raster maps XML geosphere fields maptools sp rgdal]; }; +lfactors = derive { name="lfactors"; version="0.4.0"; sha256="1f4p5mp6m11njrj421vjl5398laicgyg8m04srshfmpi74hf1nb9"; depends=[]; }; lfe = derive { name="lfe"; version="2.2-1699"; sha256="1a2y4f25isvnvk0yg6j36s729makr8b1bzwivx4x67aqg8fd09rv"; depends=[Matrix Formula xtable]; }; lfl = derive { name="lfl"; version="1.0"; sha256="10ypsnzjzygihz019clwnf3gv5b64d873231pjkp772k1n3wgv9a"; depends=[Rcpp foreach forecast plyr tseries e1071 zoo Rcpp]; }; lfstat = derive { name="lfstat"; version="0.6.1"; sha256="0i3zrinvjxlg9w5zqrv8wzy15vxvi2gw3jrlfs4rddkxnp98ya9d"; depends=[lattice lmom lmomRFA latticeExtra]; }; @@ -4171,7 +4235,7 @@ lgcp = derive { name="lgcp"; version="1.3-9"; sha256="093rxvb4irmf04nx1j5zrgh8k0 lgtdl = derive { name="lgtdl"; version="1.1.3"; sha256="00lffc60aq1qjyy66nygaypdky9rypy607mr8brwimjn8k1f0gx4"; depends=[]; }; lhs = derive { name="lhs"; version="0.10"; sha256="1hc23g04b6nsg8xffkscwsq2mr725r6s296iqll887b3mnm3xaqz"; depends=[]; }; libamtrack = derive { name="libamtrack"; version="0.5.5"; sha256="0v2h4ficf87ai3h2liw8j7428k0bzzb59zini2vskwhcqb7ky7yw"; depends=[]; }; -lifecontingencies = derive { name="lifecontingencies"; version="1.1.5"; sha256="0v4rdq4ajd12ri1agn9i57nigxpgvg67clpskks761b7n1b6l77v"; depends=[markovchain]; }; +lifecontingencies = derive { name="lifecontingencies"; version="1.1.6"; sha256="07gvq93p2f8s4a43h596xmzifnx1jwnfyg5giqhlfvxnq6wdbvrr"; depends=[markovchain Rcpp Rcpp]; }; likeLTD = derive { name="likeLTD"; version="5.5.0"; sha256="111wdszkk2bdi9sz6gfih32kib0ig9bp4xlq6wl5r5zx3nrlj5zb"; depends=[DEoptim ggplot2 gtools rtf gdata]; }; likelihood = derive { name="likelihood"; version="1.7"; sha256="0q8lvwzlniijyzsznb3ys4mv1cqy7ibj9nc3wgyb4rf8676k4f8v"; depends=[nlme]; }; likert = derive { name="likert"; version="1.2"; sha256="1x1mlaqzwr15xzcfq9934jxb3m5irvw6yivirrj45wscxn3kz5s1"; depends=[ggplot2 xtable psych reshape gridExtra plyr]; }; @@ -4203,7 +4267,7 @@ lmeSplines = derive { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqk lmeVarComp = derive { name="lmeVarComp"; version="1.0"; sha256="17zrl33h4lcd8lpdv3d12h5afj8nxr2lyw6699zq4fds2chbq66l"; depends=[]; }; lmec = derive { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; }; lmenssp = derive { name="lmenssp"; version="1.0"; sha256="0a1q9ax0pnz9gcv4nzgay9lznaz9gp27jj6vp6la7vfhrfg5qcg6"; depends=[MASS nlme]; }; -lmerTest = derive { name="lmerTest"; version="2.0-20"; sha256="1x3h78lnj7j002lzx0yxg36vl98z5xmk913k3h2wssxfva9ljp0w"; depends=[Matrix lme4 plyr numDeriv MASS Hmisc gplots]; }; +lmerTest = derive { name="lmerTest"; version="2.0-25"; sha256="13psyrll5srxahyk4fhp77fds9mxgnargpv2wxjpy3cv8f5b1vpm"; depends=[Matrix lme4 plyr MASS Hmisc ggplot2]; }; lmf = derive { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; }; lmfor = derive { name="lmfor"; version="1.1"; sha256="0bbcgpcx0xjla128w80xlxp6i6hnrk4wjwqih66zvyjaf5sz7wx9"; depends=[nlme MASS]; }; lmm = derive { name="lmm"; version="1.0"; sha256="0x5ikb1db99dsn476mf4253dlznlxa1cwnykg1nwnm2vy5qym2fq"; depends=[]; }; @@ -4214,7 +4278,7 @@ lmms = derive { name="lmms"; version="1.2"; sha256="12wli7iwnihq42pa1jy1ml4y3l93 lmodel2 = derive { name="lmodel2"; version="1.7-2"; sha256="0dyzxflr82k7ns824zlycj502jx3qmgrck125im2k2da34ir3m3q"; depends=[]; }; lmom = derive { name="lmom"; version="2.5"; sha256="0s2x8k6p71hxdqggy8ajk7p9p040b9xr3lm49g31z3kcsmzvk23q"; depends=[]; }; lmomRFA = derive { name="lmomRFA"; version="3.0-1"; sha256="0lf8n6bhdv3px6p60smghvmwsbgawvjrmgy2dfhs517n67pxg30i"; depends=[lmom]; }; -lmomco = derive { name="lmomco"; version="2.1.3"; sha256="1baxs9c385rgcw73hr1616gknb7fs5v81bv5jv5g1fwzr1qxxm7k"; depends=[]; }; +lmomco = derive { name="lmomco"; version="2.1.4"; sha256="02c2yhfr08hzlyn2nmfdfvmc3xrc3pp4agc6nkg4w6kk74r003h1"; depends=[]; }; lmtest = derive { name="lmtest"; version="0.9-33"; sha256="1ycmxjrxf41mnbgakdmn4y2kmgp4rkj7v3nqwqnlc6gdfdmac73s"; depends=[zoo]; }; loa = derive { name="loa"; version="0.2.22"; sha256="13j4d4d35nd2ssmkghpd6azysmy7g8mc9y3glkzjnddp1xxz8icn"; depends=[lattice MASS png RgoogleMaps RColorBrewer]; }; localdepth = derive { name="localdepth"; version="0.5-7"; sha256="0h0y74xnhdqa7y51ljmpz7ayznppvy2ll06wfds6200lb9cxgr7k"; depends=[circular]; }; @@ -4237,7 +4301,7 @@ logistf = derive { name="logistf"; version="1.21"; sha256="0cwbmd0mvj4wywpx7p4lh logitchoice = derive { name="logitchoice"; version="0.9.4"; sha256="1vkw7cwp7nwrsj9ifn4gz21zbw9da5rph9lr3w466zxkzdkbldqj"; depends=[]; }; logitnorm = derive { name="logitnorm"; version="0.8.29"; sha256="0wbdxh3n44nzb6c0ahyd8gndfql1y56fns2bkmzqi3nxy9blhx18"; depends=[]; }; loglognorm = derive { name="loglognorm"; version="1.0.1"; sha256="0rhx769a5nmidpbpngs2vglsbkpgw9badz3kj3jfmpj873jfnbln"; depends=[]; }; -logmult = derive { name="logmult"; version="0.6.1"; sha256="1wa6srl7fk2cpgszxa0nsd8dqrjk3ksyzm3yfna841l3rss823qv"; depends=[gnm qvcalc]; }; +logmult = derive { name="logmult"; version="0.6.2"; sha256="0i6sabg56x52aw5n7i61ick4n0hsbs28iagyzp0nvd2qrvz8p9ma"; depends=[gnm qvcalc]; }; logspline = derive { name="logspline"; version="2.1.5"; sha256="18hpzcg71v3zjzp92whgxgn7w87cadgxr65pp7nv6m5pvj130i3p"; depends=[]; }; lokern = derive { name="lokern"; version="1.1-6"; sha256="0iixxs23zsb0qadppcwmwf6vbxcjnm8zmwyz1xkkmhrpp06sa3jw"; depends=[sfsmisc]; }; lomb = derive { name="lomb"; version="1.0"; sha256="06lbk7s1ilqx6xsgj628wzdwmnvbs0p03hdpx8665fhddcxh3ryy"; depends=[]; }; @@ -4248,6 +4312,7 @@ longitudinalData = derive { name="longitudinalData"; version="2.2"; sha256="1kdg longmemo = derive { name="longmemo"; version="1.0-0"; sha256="1jnck5nfwxywj74awl4s9i9jn431655mmi85g0nfbg4y71aprzdc"; depends=[]; }; longpower = derive { name="longpower"; version="1.0-11"; sha256="1l1icy653d67wlvigcya8glhqh2746cr1vh1khx36qjhfjz6wgyf"; depends=[Matrix lme4 nlme]; }; loop = derive { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; }; +loopr = derive { name="loopr"; version="1.0.0"; sha256="19gk3phi45ylkvdfyyr0j0r13ndz7wxl73x0znp2n59vazdgy24w"; depends=[plyr dplyr magrittr lazyeval R6]; }; lordif = derive { name="lordif"; version="0.2-2"; sha256="0898k5w9wky318k8x0zknjqdzdify0yyrnb1506j341l4n1bm04s"; depends=[MASS msm mvtnorm polycor sfsmisc ltm Hmisc rms]; }; lorec = derive { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; }; lpSolve = derive { name="lpSolve"; version="5.6.11"; sha256="0mgpns9wflqaz9ynwxwkvmc1694yhf275wgrqfjfy3qxz1hxq7s0"; depends=[]; }; @@ -4260,18 +4325,18 @@ lpridge = derive { name="lpridge"; version="1.0-7"; sha256="0nkl70fwzra308bzlhjf lqa = derive { name="lqa"; version="1.0-3"; sha256="141r2cd9kybi6n9jbdsvhza8jdxxqch4z3qizvpazjy8qifng29q"; depends=[]; }; lqmm = derive { name="lqmm"; version="1.5.1"; sha256="1myv2v2059vlni1npxyv6ii846aiqz1mvyz9r9n5vpzgz92abizi"; depends=[SparseGrid nlme]; }; lrmest = derive { name="lrmest"; version="1.0"; sha256="1gdj8pmmzvs1li05pwhad63blhibq45xd1acajxsx06k7k21ajs7"; depends=[MASS]; }; -lsa = derive { name="lsa"; version="0.73"; sha256="041wa1i85i90qvm5sxvd9nidis8s069cvf9nw1r68ajkvds65y91"; depends=[SnowballC]; }; +lsa = derive { name="lsa"; version="0.73.1"; sha256="1af8s32hkri1hpngl9skd6s5x6vb8nqzgnkv0s38yvgsja4xm1g5"; depends=[SnowballC]; }; lsbclust = derive { name="lsbclust"; version="1.0.2"; sha256="03vaf9l0fy3pdr3cqb937nw8s7ky25njc3fnl4hdpc8rj7m44hwf"; depends=[ggplot2 plyr clue gridExtra reshape2 Rcpp Rcpp]; }; lsdv = derive { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; }; lsgl = derive { name="lsgl"; version="1.0.123.1"; sha256="10q3f56yjgs3kvyk7b7d1xi06sa16pv9y3c6lsp1461whqvinpj4"; depends=[sglOptim Matrix sglOptim Rcpp RcppProgress RcppArmadillo BH]; }; lshorth = derive { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; }; -lsmeans = derive { name="lsmeans"; version="2.16"; sha256="1cmxg4cxf7snmpnargdwvgr061acpbish934pcdmnhslr1k2sj9j"; depends=[estimability multcomp plyr Matrix mvtnorm]; }; +lsmeans = derive { name="lsmeans"; version="2.17"; sha256="0jpyqrc84w1zxgw7vbrp2263fcbk8rahxq2lqhcf8by47xcgk5kk"; depends=[estimability coda multcomp plyr mvtnorm]; }; lspls = derive { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; }; lsr = derive { name="lsr"; version="0.5"; sha256="0q385a3q19i8462lm9fx2bw779n4n8azra5ydrzw59zilprhn03f"; depends=[]; }; lss = derive { name="lss"; version="0.52"; sha256="1fvs8p9rhx81xfn450smnd0i1ym06ar6nwwcpl74a66pfi9a5sbp"; depends=[quantreg]; }; ltbayes = derive { name="ltbayes"; version="0.3"; sha256="1b35bwli08yzgv3idg86wz8fzpx7r5sx0ryr950rdh0n2jdml09q"; depends=[mcmc MHadaptive numDeriv]; }; ltm = derive { name="ltm"; version="1.0-0"; sha256="1igkgb0jy3mzlnp9s6avhcpplwijz5g3x26a3lavyy3d9fjpmfpa"; depends=[MASS msm polycor]; }; -ltmle = derive { name="ltmle"; version="0.9.3-1"; sha256="0nvcxl55nmcabsz79vkjxmnifzm2vxg0lgwcjqiwsj242vhnfjhh"; depends=[]; }; +ltmle = derive { name="ltmle"; version="0.9-5"; sha256="07z576ry6i73l4jp073l360gvhzfdq845x43vrpfq258h7mqhgg4"; depends=[Matrix]; }; ltsa = derive { name="ltsa"; version="1.4.4"; sha256="06db0d4j0kqp4q6rpa3sawcsm5rfgdhzl8fl7cxivjbbyrfnszqp"; depends=[]; }; ltsbase = derive { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jfi0a3fbw5wdqs3si69sjbn8f5qs2hz7yp"; depends=[MASS robustbase]; }; ltsk = derive { name="ltsk"; version="1.0.3"; sha256="17l4mwggd4s39l6x1b6gvwgd6gjl0h37wfis1i6l9k6hiaqhb6vr"; depends=[fields]; }; @@ -4303,25 +4368,27 @@ mail = derive { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sg mailR = derive { name="mailR"; version="0.4.1"; sha256="1bfh3fxdqx9f9y3fgklxyslpcvhr9gcj7wsamaxzgrcsaxm8fdlw"; depends=[rJava stringr R_utils]; }; makeProject = derive { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; }; mallet = derive { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; }; -managelocalrepo = derive { name="managelocalrepo"; version="0.1.4"; sha256="060r9wkrn2v6wij926l7qlxlw8k2zbgrmwf2awf1x6llfs4vaiby"; depends=[stringr assertthat]; }; +managelocalrepo = derive { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[stringr assertthat]; }; +manifestoR = derive { name="manifestoR"; version="0.9-12"; sha256="1hz45555941b9jplac4l8l6h4dn387fp4nk873c17mds7xaxzidq"; depends=[NLP tm dplyr httr jsonlite functional]; }; manipulate = derive { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; }; mapDK = derive { name="mapDK"; version="0.3.0"; sha256="03ksg47caxx3y97p3nsflwpc7i788jw874cixr9gjz756avwkmwp"; depends=[ggplot2 stringi]; }; -mapStats = derive { name="mapStats"; version="2.3"; sha256="0kws795f8s6rgbwyzjz90vzlh2ipp0c0mwdbsry5aasg4qj97ns0"; depends=[survey lattice maptools RColorBrewer Hmisc classInt sp colorspace reshape2]; }; +mapStats = derive { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[survey lattice maptools RColorBrewer Hmisc classInt sp colorspace reshape2]; }; mapdata = derive { name="mapdata"; version="2.2-3"; sha256="1fhj34cgq6rniy0339qv2ghbs0aiq38h9jfwx7szb83yj37v7wm6"; depends=[maps]; }; mapfit = derive { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; }; mapmisc = derive { name="mapmisc"; version="1.2.1"; sha256="1sds83cbsdfb6ac2y13fy1lm7bi27qzkkpjv1cjml8yjwcazfbfj"; depends=[sp raster]; }; mapplots = derive { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; }; mapproj = derive { name="mapproj"; version="1.2-2"; sha256="1fdb72hvcp6jm7rhvs8zdkya6ifs92lfqnmq5vj5amwckkxfidc6"; depends=[maps]; }; maps = derive { name="maps"; version="2.3-9"; sha256="1gzy81sl4vpr4hsnh4jsp5rd26jdkzsw99qxwfmbadjyf55q06wv"; depends=[]; }; -maptools = derive { name="maptools"; version="0.8-34"; sha256="1ii4vgapdbf0i9f71agfmv85lmw1da686igw1252kgfrbf2mjdfw"; depends=[sp foreign lattice]; }; +maptools = derive { name="maptools"; version="0.8-36"; sha256="0064b9qqv7241298dswv5kkkqf6y2iyn7dhjcyvfkqn4kvc9g2m8"; depends=[sp foreign lattice]; }; maptpx = derive { name="maptpx"; version="1.9-2"; sha256="1i5djmjg0lsi7xlkbvn90njq1lbyi74zwc2nldisay4xsbgqg7fj"; depends=[slam]; }; maptree = derive { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; }; mar1s = derive { name="mar1s"; version="2.1"; sha256="0psjva7nsgar5sj03adjx44pw0sdqnsd96m4g6k8d76pv30m1g7l"; depends=[cmrutils fda zoo]; }; marelac = derive { name="marelac"; version="2.1.4"; sha256="0mm1rmaxrbhk6r9z62ns832p2q9fajq0jpvd3if3rg2wgdbb1505"; depends=[shape seacarb]; }; marg = derive { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9pl4smmsp4b7ywlga7r1ga38g82r"; depends=[statmod survival]; }; -markdown = derive { name="markdown"; version="0.7.4"; sha256="09bqwv75mvfnjwbsz4v0zr9mmjdccwwgayiv7f6db48lngijng4f"; depends=[mime]; }; +markdown = derive { name="markdown"; version="0.7.7"; sha256="00j1hlib3il50azs2vlcyhi0bjpx1r50mxr9w9dl5g1bwjjc71hb"; depends=[mime]; }; marked = derive { name="marked"; version="1.1.8"; sha256="1xsg0iy8mcy9b98bxmjr3y413xwblbhks3fcydbvjnry0k03gd5i"; depends=[lme4 R2admb truncnorm coda ggplot2 Matrix numDeriv Rcpp plyr optimx expm Rcpp]; }; -markovchain = derive { name="markovchain"; version="0.1.1"; sha256="1y4f4xf8557jq20yd8n2sl4sjhx2pkdjyr6fqikrfh1m4cydrz73"; depends=[igraph Matrix matlab expm]; }; +markovchain = derive { name="markovchain"; version="0.2"; sha256="03lmvnfdcn4s274ydi5i8xwwm8bl4fv64dwm8mb61nf0i5d0w6ky"; depends=[igraph Matrix matlab expm Rcpp RcppParallel Rcpp RcppParallel]; }; +marl = derive { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; }; marmap = derive { name="marmap"; version="0.9.2"; sha256="1csi6v6z2p3nmyqwy8bmbj036693rzmxrc317g0a45gsqxggp3n4"; depends=[DBI RSQLite gdistance geosphere sp raster ncdf plotrix shape reshape2 adehabitatMA ggplot2]; }; marqLevAlg = derive { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; }; matR = derive { name="matR"; version="0.9"; sha256="0lih3g2z6rxykprl3s529xcf466bpzpsv4l20dkgx1fgfslfcl2p"; depends=[MGRASTer BIOM_utils]; }; @@ -4337,8 +4404,8 @@ maxLik = derive { name="maxLik"; version="1.2-4"; sha256="1b2qr16s2w76nxqdlq3hfl maxent = derive { name="maxent"; version="1.3.3.1"; sha256="1skc7d0p6kg0gi1bpgaqn2dmxjzbvcphx5x3idpscxfbplm5v96p"; depends=[SparseM tm Rcpp Rcpp]; }; maxlike = derive { name="maxlike"; version="0.1-5"; sha256="0h544wr7qsyb70vmbk648hfyb6arrsb41gw39svcin412rhw9k9j"; depends=[raster]; }; maxstat = derive { name="maxstat"; version="0.7-22"; sha256="0fgpc5y3c5cidy7hxil10hxzdjxfmag2pp2ksh02z9smb8m0sdqb"; depends=[exactRankTests mvtnorm]; }; -mbbefd = derive { name="mbbefd"; version="0.6.1"; sha256="18vi4cans7h7lykfablrzvpvzd1zvfp2ycjf47gwjvg54ri1nnml"; depends=[Rcpp Rcpp]; }; -mbest = derive { name="mbest"; version="0.1"; sha256="0dz54rgbl40cbrv6670qd441ymz43lj16dvd9fnq3znfafc1790n"; depends=[lme4]; }; +mbbefd = derive { name="mbbefd"; version="0.7"; sha256="0l8dq1j1ky83jl1cka0mrjcf7rcby36jkp0zn7wmpnxjrmdrixgb"; depends=[actuar gsl Rcpp Rcpp]; }; +mbest = derive { name="mbest"; version="0.3"; sha256="0j6v6c1s11gvzwcnj5dnd9anj11hpmy7c83c8ribb7lx75mwj4k4"; depends=[lme4]; }; mblm = derive { name="mblm"; version="0.12"; sha256="17h65bapvz89g5in3gkxq541bxgpj9pciz6i5hzhqn0bdbsb3k6r"; depends=[]; }; mbmdr = derive { name="mbmdr"; version="2.6"; sha256="0ss5w66hcgd8v8j9bbbp12a720sblhr2hy9kidqfr8hgjaqlch86"; depends=[logistf]; }; mboost = derive { name="mboost"; version="2.4-2"; sha256="104qs8hbsm4ps5ybzxrdz6lz0lqn925xy4k3m4rmbk4r62wj9v61"; depends=[stabs Matrix survival lattice nnls quadprog]; }; @@ -4353,7 +4420,7 @@ mcgibbsit = derive { name="mcgibbsit"; version="1.1.0"; sha256="09ydcbjz3abmh469 mcheatmaps = derive { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; }; mcll = derive { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[statmod locfit]; }; mclogit = derive { name="mclogit"; version="0.3-1"; sha256="0zyms6v9qjh6a5ccahfanarp4sg49yingb8wpjcz61skqvm8j7qx"; depends=[Matrix]; }; -mclust = derive { name="mclust"; version="5.0.0"; sha256="0ny6px5qf4ks16l19m7ffzibvcgsylih96cxs3wnw4rnhglilvwh"; depends=[]; }; +mclust = derive { name="mclust"; version="5.0.1"; sha256="10h8y4a0v1vq01v8i92yr3dcxfq74xsm44nh0ldh1a4d6j270zyp"; depends=[]; }; mcmc = derive { name="mcmc"; version="0.9-3"; sha256="148l28nb1qv82x2hj46c26yhn0lw8x5jsrp2dav9sbysv1bdj2f8"; depends=[]; }; mcmcplots = derive { name="mcmcplots"; version="0.4.2"; sha256="0ws2la6ln016l98c1rzf137jzhzx82l4c49p19yihrmrpfrhr26l"; depends=[coda sfsmisc colorspace denstrip]; }; mcmcse = derive { name="mcmcse"; version="1.0-1"; sha256="1jn5hl6aw83qmwccyfmcsvcymx9cp4d3qnfzzqvlw22x26rx88r6"; depends=[]; }; @@ -4361,9 +4428,9 @@ mco = derive { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2b mcprofile = derive { name="mcprofile"; version="0.2-1"; sha256="0q1d236mcmgp5p5gl474myp1zz8cbxffd0kvsd8338jijalj05p0"; depends=[ggplot2 quadprog mvtnorm]; }; mcr = derive { name="mcr"; version="1.2.1"; sha256="0237w41xichd418ax9xviq4wxbcc6c0cgr5gvzkca67nnqgc4jaz"; depends=[]; }; mcsm = derive { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[MASS coda]; }; -mda = derive { name="mda"; version="0.4-4"; sha256="18a12fnhcx911ii8wfqkyi8yxrhbiw2pi6mhywgxzsl3a09g8ghh"; depends=[class]; }; +mda = derive { name="mda"; version="0.4-6"; sha256="0v6avsq1j3vd8pmnilxcbx6v42kb5gvsy03q2srwzf3z04807n8i"; depends=[class]; }; mdatools = derive { name="mdatools"; version="0.6.0"; sha256="13pfzr3lvqifln9lzdd0dpnygdibxp9ka7zwfisxjrw21m8mhmm3"; depends=[]; }; -mded = derive { name="mded"; version="0.1-1"; sha256="1r2sjg661abzsbqdyq2mlyacnv5rd60jfg2156cq5qyknxkin01m"; depends=[]; }; +mded = derive { name="mded"; version="0.1-2"; sha256="1j8fcz5yc70p9qd9l010xj1b625scdps8z1pqh75b45p2hiqbhlc"; depends=[]; }; mdscore = derive { name="mdscore"; version="0.1-2"; sha256="1g473rwffkb2x6y6wcm98i6xr5dhz11ypnbrvhb2klbvi81jj511"; depends=[MASS]; }; mdsdt = derive { name="mdsdt"; version="1.0"; sha256="0ngf2p6lm32124qyfh18zlgf0dipj3njn6d0m8f192563kp50q0p"; depends=[ellipse mnormt polycor]; }; measuRing = derive { name="measuRing"; version="0.3"; sha256="16lgvk9lm0vjy50das0qq0h0z683hh94spjcdmkljmxxzwmzfl4b"; depends=[pastecs png tiff]; }; @@ -4384,7 +4451,7 @@ memoise = derive { name="memoise"; version="0.2.1"; sha256="19wm4b3kq6xva43kga3x memuse = derive { name="memuse"; version="1.1"; sha256="1i6l3d885b4v01hlkl50m401bwi7akydhh52gf4kya5khanb8n2b"; depends=[]; }; merror = derive { name="merror"; version="2.0.1"; sha256="09v62f7ycywasid3b7x52dhidplwdbx9fd0855b40jklfy469bkn"; depends=[]; }; metRology = derive { name="metRology"; version="0.9-17"; sha256="1g4gv3mpii71i6imfwqg9d5iwfx03bq4lizzhx7dy39b2mj7jd4q"; depends=[MASS numDeriv]; }; -meta = derive { name="meta"; version="4.1-0"; sha256="0zf2917ljzpbc8izprzx7a78wc37q2k23lzdk8rmm5chml16mb3f"; depends=[]; }; +meta = derive { name="meta"; version="4.2-0"; sha256="1cbrgy3ry70l52da02vx2qflxhnqw7kmy6r10d9wzhmc1gf85snp"; depends=[]; }; metaLik = derive { name="metaLik"; version="0.41.0"; sha256="08wiriq6cm02d0b0q34056y5249daidpjzkwzgjq6dh55v5fp2s4"; depends=[]; }; metaMA = derive { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[SMVar]; }; metaMix = derive { name="metaMix"; version="0.2"; sha256="0xlsdgincxwjzyr4i8qfmfw2wvgf41qbmyhf2rxcbarf7rmwhmqf"; depends=[data_table Matrix gtools Rmpi ggplot2]; }; @@ -4393,7 +4460,7 @@ metabolomics = derive { name="metabolomics"; version="0.1.4"; sha256="0m5d2784mk metacom = derive { name="metacom"; version="1.4.3"; sha256="0djq2ry2vriayn839f0pgkq4j8j1zyd8ribmzn6ngfhz305fszlq"; depends=[devtools vegan lattice]; }; metacor = derive { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[rmeta gsl]; }; metafolio = derive { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[Rcpp plyr colorspace MASS Rcpp RcppArmadillo]; }; -metafor = derive { name="metafor"; version="1.9-5"; sha256="1ayvkm57c7s91m9kcsdax0fk61v0kvsbgaymlzg1sgsxkgnwcgj4"; depends=[Matrix]; }; +metafor = derive { name="metafor"; version="1.9-6"; sha256="1bjhzkim64035xk04kc1ra4ih6gxfsn389gag21mf9zhk0mi6yd0"; depends=[Matrix]; }; metagen = derive { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[MASS lhs plyr BBmisc ParamHelpers BatchJobs BatchExperiments ggplot2 metafor]; }; metamisc = derive { name="metamisc"; version="0.1.1"; sha256="1cvlsix3b857xdw6anqhqsrfwxpnf4rbzg4ybf6aw7vcdc05zgwd"; depends=[mvtnorm ellipse bbmle rjags coda]; }; metap = derive { name="metap"; version="0.6"; sha256="1iy5cmwrlsr70z0qnqn30n15knsfclg383815a2a8yqpg5gs4953"; depends=[]; }; @@ -4412,7 +4479,7 @@ mgraph = derive { name="mgraph"; version="1.03"; sha256="0av2c0jvqsdfb3i0s0498wc mhsmm = derive { name="mhsmm"; version="0.4.14"; sha256="1zrqnzbmlk3kmwbq9rl4bdkc9iawkgn3qr7nzsa782v55i7w2wiz"; depends=[mvtnorm]; }; mht = derive { name="mht"; version="3.1.2"; sha256="01zcaf9k0qayzm8dn5dvnm5n3qgqpj8r96qhqaa5vbjcr6ci2x2r"; depends=[glmnet Matrix]; }; mhurdle = derive { name="mhurdle"; version="1.0-1"; sha256="1x631fgbq3ika05svyavzadyjd7vi9bcmsgb58wfhpf9xq6j5rcr"; depends=[Formula truncreg maxLik pbivnorm]; }; -mi = derive { name="mi"; version="0.10-2"; sha256="01dyrxq37cm3xs4j178zn4b4xsjqnbjkpzn70pgk8ciis9158k43"; depends=[arm abind car foreign lme4 MASS Matrix nnet R2WinBUGS nlme]; }; +mi = derive { name="mi"; version="1.0"; sha256="1h47k5mpbvhid83277dvvj2di493bgzz9iarpyv3r30y219l7x1l"; depends=[Matrix arm]; }; miRada = derive { name="miRada"; version="1.13.8-8"; sha256="1m6rm65pv4r16r0s5ih69nr3v2rnpsvpdpk07pi7k4f7v9wck71v"; depends=[]; }; miRtest = derive { name="miRtest"; version="1.8"; sha256="0i66s1sz7vf8p8ihfrxmag7wbkw8mlkldcp1w2figlzyhs74c85p"; depends=[corpcor MASS RepeatedHighDim]; }; micEcon = derive { name="micEcon"; version="0.6-12"; sha256="1kxhr3qqgswq8glrjfcjz0hyb163lwf303yhwlgrwjciqgp5dq17"; depends=[miscTools]; }; @@ -4428,7 +4495,7 @@ micropan = derive { name="micropan"; version="1.0"; sha256="0qnxm6z2pk1wibchj6rh midasr = derive { name="midasr"; version="0.4"; sha256="190qliv7v80rr3jh9yvchwl3ch7nf5b8p90iywp8qkaav5r8rcdy"; depends=[sandwich optimx MASS numDeriv Matrix forecast]; }; migest = derive { name="migest"; version="1.6"; sha256="1mjjcba74nk10kdbsaphih3zdyaqmf02hrv13s34klwdwkp3nv0m"; depends=[]; }; migration_indices = derive { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; }; -migui = derive { name="migui"; version="0.00-09"; sha256="0mrvsls9q039pay0vf59xwg6bbr7ahwl4x3iwvar6sbfg8606as8"; depends=[tkrplot mi foreign]; }; +migui = derive { name="migui"; version="1.1"; sha256="1qchjsc7ff2b6s9w6ncj9knjv6pyp90jd4jxljn2rr1ix1gc45za"; depends=[gWidgets2 mi arm]; }; mime = derive { name="mime"; version="0.3"; sha256="1i9f9z88cahvb5whdgmp0ipk0b9glk0xn8ik519vzpydnn1slvxk"; depends=[]; }; minPtest = derive { name="minPtest"; version="1.7"; sha256="088kckpbfy2yp0pk3zrixrimywrvkaib5ywa7fkr5phnzlsl80sv"; depends=[scrime Epi]; }; minerva = derive { name="minerva"; version="1.4.1"; sha256="0dg5xnl9srdvid49na8478bnvagv0khiv6hl7z8gw6m745681i89"; depends=[]; }; @@ -4442,7 +4509,7 @@ minque = derive { name="minque"; version="1.1"; sha256="1hx4j38213hs8lssf9kj5s42 minxent = derive { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; }; mipfp = derive { name="mipfp"; version="2.0"; sha256="1sh33lgvq31nk8vkl9p195v4z3whv2c1fc7bnhc8wxgglm6vc126"; depends=[cmm Rsolnp numDeriv]; }; mirt = derive { name="mirt"; version="1.9"; sha256="0bav1ykmbw8d64l61iwd4ma2xz4y3z2wqx8ba63583rmbsynkkvk"; depends=[lattice GPArotation Rcpp sfsmisc numDeriv Rcpp]; }; -mirtCAT = derive { name="mirtCAT"; version="0.4.2"; sha256="133q6kdj8hkgfrby6sb9kdpmlk097zzwapb0nh2lnswyxfpl7s6w"; depends=[mirt shiny lattice Rcpp Rcpp RcppArmadillo]; }; +mirtCAT = derive { name="mirtCAT"; version="0.5"; sha256="0lv4dxpby3izmh3avl70i0iiaj8rz1fpb666cwga5590ks7rq4lr"; depends=[mirt shiny lattice Rcpp markdown Rcpp RcppArmadillo]; }; misc3d = derive { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; }; miscF = derive { name="miscF"; version="0.1-2"; sha256="195rb9acdirfhap0z35yvcci5xn4j84mlbafki4l1vfgqgnh0ajj"; depends=[MCMCpack mvtnorm Rcpp RcppArmadillo Rcpp RcppArmadillo]; }; miscFuncs = derive { name="miscFuncs"; version="1.2-7"; sha256="1cnhd23fi6akr3fsr2b85s5cn36ksy4h3c4iyyjqcpc49wa819d0"; depends=[roxygen2 mvtnorm]; }; @@ -4455,11 +4522,12 @@ mistral = derive { name="mistral"; version="1.1-1"; sha256="19zkc5ddjzw17y70x3l6 mitools = derive { name="mitools"; version="2.3"; sha256="0w76zcl8mfgd7d4njhh0k473hagf9ndcadnnjd35c94ym98jja33"; depends=[]; }; mix = derive { name="mix"; version="1.0-8"; sha256="0wlp6wkn8dwwnjfq3qzk0hjb3xsjh5ld5zxbd6nf12awpkwa1j9y"; depends=[]; }; mixAK = derive { name="mixAK"; version="3.10"; sha256="1mma3515p1r5nhbmdyxzvv73ni5iw4arnzq94nw9gib1dgjpm7c5"; depends=[colorspace lme4 fastGHQuad mnormt coda]; }; -mixOmics = derive { name="mixOmics"; version="5.0-3"; sha256="1b8ms3jz4acvbfm2b1iw30h2d80lpqgabwr5j9k2gy3nvqm72nxq"; depends=[MASS lattice RGCCA igraph rgl pheatmap]; }; +mixOmics = derive { name="mixOmics"; version="5.0-4"; sha256="020cy0x7qf6x7lb1aqfr6qflf08k2phnygcjr7lq4z8q9v502qyh"; depends=[MASS lattice RGCCA igraph rgl pheatmap]; }; mixPHM = derive { name="mixPHM"; version="0.7-1"; sha256="0v75xv06m40jqq0c4y1gvdrmyddxs814djbpyq61fv8cn22fn7wx"; depends=[survival lattice]; }; mixRasch = derive { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; }; mixcat = derive { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb5j0sxgpxzhlic69xrd5mv5iyw0cmxd"; depends=[statmod]; }; mixdist = derive { name="mixdist"; version="0.5-4"; sha256="100i9mb930mzvdha31m1srylmpa64wxyjv6pkw1g5lhm1hsclwm3"; depends=[]; }; +mixedMem = derive { name="mixedMem"; version="1.0.2"; sha256="1nlnlww2xbmlifcp9l293041csnh38hvr686sczyqpb7c5jf39g3"; depends=[Rcpp gtools Rcpp RcppArmadillo BH]; }; mixer = derive { name="mixer"; version="1.8"; sha256="1r831jha7qrxibw5m3nc3l6r887ihzxzsj65yjnbl5cf5b8y19bb"; depends=[]; }; mixexp = derive { name="mixexp"; version="1.2.1"; sha256="0yjsngr2akj2hhl1hav2kkp8w0g4775qvnbzypa3c1fmx8kf1xvw"; depends=[gdata lattice daewr]; }; mixlm = derive { name="mixlm"; version="1.0.8.5"; sha256="1xbkh6aaw4j57vkn6ng7i5wkpz2clhvj3sx0mhfmpwhg13rpdkaj"; depends=[multcomp pls pracma leaps lme4 car]; }; @@ -4468,7 +4536,8 @@ mixor = derive { name="mixor"; version="1.0.2"; sha256="1xkwgk4dvjbpqvvbrb8yb88i mixreg = derive { name="mixreg"; version="0.0-5"; sha256="0wsb1z98ymhshw9nhsvlszsanflxv3alwpdsw8lr3v62bkwka8zr"; depends=[]; }; mixsep = derive { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[tcltk2 MASS RODBC]; }; mixsmsn = derive { name="mixsmsn"; version="1.0-9"; sha256="0pgip1xfgfrdy3g3197d7visn164zi7xnp6wlsgjwxdylvjsxkji"; depends=[mvtnorm]; }; -mixtools = derive { name="mixtools"; version="1.0.2"; sha256="0x809m6lbzprd5kq6wqk528x9apaj5df3sidzk9jiw06qklngwg8"; depends=[boot MASS segmented]; }; +mixtNB = derive { name="mixtNB"; version="1.0"; sha256="0lqbm1yl54zfs0xcmf3f2vcg78rsqyzlgvpydhmhg7x6dkissb22"; depends=[]; }; +mixtools = derive { name="mixtools"; version="1.0.3"; sha256="01ix019cvplqz09q55pz9w7cc281k37khh1i3xf1k6l9f2cj519z"; depends=[boot MASS segmented]; }; mixture = derive { name="mixture"; version="1.4"; sha256="0k9pzcgfjyp0rmcma26kr2n8rcwmijznmdpvqidgl3jay20c87ca"; depends=[]; }; mizer = derive { name="mizer"; version="0.2"; sha256="0cpal9lrjbvc923h499hbv4pqw3yjd4jvvhgayxgkak2lz2jzmcz"; depends=[plyr reshape2 ggplot2]; }; mkde = derive { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[Rcpp raster sp Rcpp]; }; @@ -4489,7 +4558,7 @@ mlogit = derive { name="mlogit"; version="0.2-4"; sha256="15ndly7i56k8blgvpn15ix mlogitBMA = derive { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[BMA abind maxLik]; }; mlr = derive { name="mlr"; version="2.3"; sha256="0cvg2bxxw3c69lj5wy4ds54wn5h299c5mjcsbax1p0k408z5aa6z"; depends=[ParamHelpers BBmisc ggplot2 checkmate parallelMap plyr reshape2 survival]; }; mlxR = derive { name="mlxR"; version="2.1.1"; sha256="13ddm4hhnjx7r058qlvvxn9npqa0vq6y5l1g0zrlhckjp7bpp90a"; depends=[ggplot2 XML Rcpp]; }; -mma = derive { name="mma"; version="1.0-1"; sha256="0xg3010fljc95as2jf777jd2qlrhzmpw1swm5hrjh4a2svkj1yf2"; depends=[gbm]; }; +mma = derive { name="mma"; version="2.0-0"; sha256="0fdb2lbg08l47wnrsjf3rarf2n0qsw0qrx9b9aa08ablwpip4k69"; depends=[gbm]; }; mmand = derive { name="mmand"; version="1.1.0"; sha256="0awi9wxxalz81d6766djbjsk980n65dhz02fcqb69ifc7x80lc33"; depends=[reportr Rcpp Rcpp RcppArmadillo]; }; mmap = derive { name="mmap"; version="0.6-12"; sha256="12ql03wzwj23h8lwd07rln6id44mfrgf9wcxn58y09wn3ky1rm6a"; depends=[]; }; mmcm = derive { name="mmcm"; version="1.2-5"; sha256="193mlvl8fp5y2150m0xw5bhr7nkr4fgmwjbv1dg314a7ara42v4y"; depends=[mvtnorm]; }; @@ -4518,7 +4587,7 @@ momentchi2 = derive { name="momentchi2"; version="0.1.0"; sha256="02k4hzhqmqh7sx moments = derive { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; }; mondate = derive { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; }; mongolite = derive { name="mongolite"; version="0.2"; sha256="0lyq565c8xqxcm5sbg1rp3myppbw4hbqr3fiqzvcqpp72ar6ywvv"; depends=[jsonlite]; }; -monitoR = derive { name="monitoR"; version="1.0.2"; sha256="1nrw8xrp99p62w4bpsbca9ahdra9cid1piidwhjc4f6vqsbkp479"; depends=[tuneR]; }; +monitoR = derive { name="monitoR"; version="1.0.3"; sha256="0g2dhyz3411pa6kcsmmi9x77ygvdrvas3k9ps0w2r69mfab785c6"; depends=[tuneR]; }; monmlp = derive { name="monmlp"; version="1.1.2"; sha256="14x6xz07hg2c5n36rc314z66jqvgmicjxi2vsqyy91vwjxs9akrm"; depends=[]; }; monomvn = derive { name="monomvn"; version="1.9-5"; sha256="1fh0c1234hb5f3rwy85i4rlzc3n1851q5mivckcjs2vdm9rz25mg"; depends=[pls lars MASS]; }; monreg = derive { name="monreg"; version="0.1.3"; sha256="08rcg2xffa61cgqy8g98b0f7jqhd4yp8nx6g4bq3g722aqx4nfg3"; depends=[]; }; @@ -4543,7 +4612,7 @@ mph = derive { name="mph"; version="0.9"; sha256="11wcy23sv8x7aq6ky8wi0cq55yhjkk mpm = derive { name="mpm"; version="1.0-22"; sha256="0wijw8v0wmbfrda5564cmnp788qmlkk21yn5cp5qk8aprm9l1fnk"; depends=[MASS KernSmooth]; }; mpmcorrelogram = derive { name="mpmcorrelogram"; version="0.1-3"; sha256="0qgzsh744002whh3v1hrxs1i0xnk9zgfgkdgx2f0ffj00vvnwr97"; depends=[vegan]; }; mpmi = derive { name="mpmi"; version="0.41"; sha256="1iwdhvdglsamzq18f0r5mh0anrd4ffrddafdlbw16kr8jy0c8fdn"; depends=[KernSmooth]; }; -mpoly = derive { name="mpoly"; version="0.0.5"; sha256="1zhmd3lsa0n56yr3bdhg3r668zrmf35phm8g69c18a3rr5qmcdqg"; depends=[stringr rSymPy rJython rJava rjson partitions plyr]; }; +mpoly = derive { name="mpoly"; version="0.1.0"; sha256="0q0ypaj1r12yc72b6qb22rvgrzc703v4n7ns2yg1n9ff20y5m4z0"; depends=[stringr rSymPy rJython rJava rjson partitions plyr]; }; mppa = derive { name="mppa"; version="1.0"; sha256="06v6vq2nfh4b407x2gyvcp5wbdrcnk3m8y58akapi66lj8xplcx4"; depends=[]; }; mpt = derive { name="mpt"; version="0.5-1"; sha256="1b6n7kivkj4ndcc27jmznx9dh40kvjjk7hfxh21kmnknl5ap4ffb"; depends=[]; }; mra = derive { name="mra"; version="2.16.4"; sha256="134fw4bv34bycgia58z238acj7kb8jkw51pjfa2cwprrgsjdpf5g"; depends=[]; }; @@ -4570,6 +4639,7 @@ mtk = derive { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8 mtsdi = derive { name="mtsdi"; version="0.3.3"; sha256="1hx4m1jnfhkycxizxaklnd9illajqvv1nml8ajfn3kjmrb5z7qlp"; depends=[gam]; }; muStat = derive { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; }; muhaz = derive { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rnj8iz58yq9267n9ffqsl9gwiwa1b7"; depends=[survival]; }; +muir = derive { name="muir"; version="0.1.0"; sha256="0h3qaqf549v40ms7c851sspaxzidmdpcj89ycdmfp94b2q3bmz98"; depends=[DiagrammeR dplyr stringr]; }; multcomp = derive { name="multcomp"; version="1.4-0"; sha256="1n1qbg7amk385ryni97qdbzcinpwpxldl3r477r1kfgv8csynxhj"; depends=[mvtnorm survival TH_data sandwich codetools]; }; multcompView = derive { name="multcompView"; version="0.1-5"; sha256="0vfgvqxqgxyifkqs3r5xxj7rfn8lfmby6wyyiqa5jv01073xchib"; depends=[]; }; multgee = derive { name="multgee"; version="1.5.1"; sha256="1ycbbri26hahbi3q4mrsyhrh9bwj89dyv6gvrpx58ghrlsnakjy1"; depends=[gnm VGAM]; }; @@ -4580,14 +4650,15 @@ multiband = derive { name="multiband"; version="0.1.0"; sha256="1f4gmy0yf9zid7kl multibiplotGUI = derive { name="multibiplotGUI"; version="0.0-1"; sha256="14zgn86zwwdchhr5dzqxxxsf0dy6kny4ixvd77y08454lni0a69r"; depends=[rgl tkrplot RODBC]; }; multic = derive { name="multic"; version="0.3.8.1"; sha256="06lc9kn0z3s7x00hz8vj903q0c6cncnj4v3ygvd2yvkgcbhfvjd0"; depends=[]; }; multicon = derive { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[psych abind foreach mvtnorm sciplot]; }; -multicool = derive { name="multicool"; version="0.1-5"; sha256="01a429hyizqjg3dglnm0b3gl1lclp1az40cr3wr9qcx12jn30fbz"; depends=[Rcpp Rcpp]; }; +multicool = derive { name="multicool"; version="0.1-6"; sha256="0hzwxrcsz7dm4ilv8rpkcwi61ssym94ki8ayssfh2r2ghy9w9xlw"; depends=[Rcpp Rcpp]; }; multigroup = derive { name="multigroup"; version="0.4.4"; sha256="1r79zapziz3jkd654bwsc5g0rphrk9hkp1fpik8jvjsa1cix40mq"; depends=[MASS]; }; multilevel = derive { name="multilevel"; version="2.5"; sha256="0pzv5xc8p6cpzzv9iq3a3ib1dcan445mm12whf3d6qkz2k4778g6"; depends=[nlme MASS]; }; multilevelPSA = derive { name="multilevelPSA"; version="1.2.2"; sha256="0z3qnv14sdkfvyw2wjrfz26r7sr7vv3rlr8n4gf99rwv6k34bdsg"; depends=[ggplot2 xtable PSAgraphics plyr psych reshape proto party]; }; +multimark = derive { name="multimark"; version="1.1.4"; sha256="045lfgzxwz4m1y5gny2y92cmix6wxi1sl486gajal2scfib31rgv"; depends=[statmod Matrix RMark coda Brobdingnag mvtnorm]; }; multinbmod = derive { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; }; multinomRob = derive { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[rgenoud MASS mvtnorm]; }; multipleNCC = derive { name="multipleNCC"; version="1.0"; sha256="13z6yq77h1r6kp8wgza58c6yp9a1gqm0w36x534mxbhcmingdw9f"; depends=[survival gam]; }; -multiplex = derive { name="multiplex"; version="1.2"; sha256="06wrzglgrvahavlcknf80cp0j4k840dhmclw9g6wqv51pq9brj2f"; depends=[]; }; +multiplex = derive { name="multiplex"; version="1.5"; sha256="1sc4jnmh3lfpx92cpqd8phm09dn9xaq4qdq9301dccw3f0m260md"; depends=[]; }; multipol = derive { name="multipol"; version="1.0-6"; sha256="1yjz0p4mcgzs98s61i8315wyhh986jxp8b0lq66375ckpr2ddcss"; depends=[abind]; }; multirich = derive { name="multirich"; version="2.0.2"; sha256="1lqc4np45p9ar9l8l1m5bdh98fsmhvzj8s0b2mcp9cqrvnhp1irc"; depends=[]; }; multisensi = derive { name="multisensi"; version="1.0-8"; sha256="168g6hym5chz69wa3vfprg1m1c935wh7bi3gfz5calxiqf89mncz"; depends=[]; }; @@ -4601,11 +4672,10 @@ multxpert = derive { name="multxpert"; version="0.1"; sha256="03mvf4m0kabm22vy4z muma = derive { name="muma"; version="1.4"; sha256="0midx3wzyvcz8rk9kvsfll3xg41pkz40si4jw2ps54ykkf9rkm99"; depends=[car pdist pls gplots mvtnorm robustbase gtools bitops caTools pcaPP rrcov]; }; munfold = derive { name="munfold"; version="0.3-3"; sha256="1szm3c1xi1s7r1w6h7xb4x538sbczrblb70a3ysxf4q8c1ihmly9"; depends=[memisc MASS]; }; munsell = derive { name="munsell"; version="0.4.2"; sha256="1bi5yi0i80778bbzx2rm4f0glpc34kvh24pwwfhm4v32izsqgrw4"; depends=[colorspace]; }; -muscle = derive { name="muscle"; version="3.8.31-4"; sha256="0pijc8x6pwsb6z4061v1r7iwq5lsnia5qn1bikwpxy8ir19nic72"; depends=[]; }; musicNMR = derive { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; }; mutoss = derive { name="mutoss"; version="0.1-10"; sha256="1pijr3admnciiwdgxbdac4352m7h08jyvpj7vdd27yx07wp2rri3"; depends=[mvtnorm plotrix multcomp]; }; mutossGUI = derive { name="mutossGUI"; version="0.1-9"; sha256="1xdby6n0w1155kx6mhinvgqm0ssgyy4443pkq3k88a5s4bfxw5bw"; depends=[mutoss multcomp plotrix rJava JavaGD CommonJavaJars JGR]; }; -mvMORPH = derive { name="mvMORPH"; version="1.0.4"; sha256="1071wcnbgrys9hmr2xv7aqsnzvaci2s15pf6b984w8mbr5drwix8"; depends=[phytools ape corpcor subplex spam]; }; +mvMORPH = derive { name="mvMORPH"; version="1.0.5"; sha256="184ywvgi2dz77ivl2g7spx065wh1ap2lpmvbrhik9sgysygkijs2"; depends=[phytools ape corpcor subplex spam]; }; mvProbit = derive { name="mvProbit"; version="0.1-0"; sha256="0fnrlralydlsf9iphq385f8hpqigfmi8rafvgp443gygvpq5b6g0"; depends=[mvtnorm maxLik abind bayesm miscTools]; }; mvSLOUCH = derive { name="mvSLOUCH"; version="1.1.5"; sha256="1cq1j4f1k0xhq2ncmji1a4p4m6h7k2afsr39abib4g3md902v0hp"; depends=[ouch ape numDeriv mvtnorm corpcor]; }; mvShapiroTest = derive { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; }; @@ -4643,7 +4713,7 @@ nCDunnett = derive { name="nCDunnett"; version="1.0.0"; sha256="0n5zzsdrhra5xql1 nCal = derive { name="nCal"; version="2015.3-3"; sha256="0vj6l8w29ymj1v18mb4qyw6w1xpmwx5bvil4kjb82gccsb95ir10"; depends=[drc gdata gWidgets kyotil]; }; nFCA = derive { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; }; nFactors = derive { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[MASS psych boot lattice]; }; -nLTT = derive { name="nLTT"; version="1.0"; sha256="0yvsjfrsx48p2gyisdyvisplz61d7kkaw1bkdkj3q11g3xq84hx9"; depends=[ape coda deSolve]; }; +nLTT = derive { name="nLTT"; version="1.1"; sha256="0hrrwil7vcym7zjbnzviw13p60y14w660vndvc2lm5lmhbb8nhcn"; depends=[ape coda deSolve]; }; nabor = derive { name="nabor"; version="0.4.4"; sha256="0465wkyggz4665b2ph1qpyxsmak0arfzpxaci1r0lrf5ddyp0n6y"; depends=[Rcpp Rcpp RcppEigen BH]; }; nadiv = derive { name="nadiv"; version="2.13.2"; sha256="1r63z08k46b6hryxracicsw1hr91x4pgk2x58c9nijdni4my7kkc"; depends=[Matrix]; }; namespace = derive { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; }; @@ -4663,13 +4733,14 @@ ncdf4 = derive { name="ncdf4"; version="1.13"; sha256="07s1lh5cg4fck7sapfka2skky ncdf4_helpers = derive { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[ncdf4 PCICt abind]; }; ncf = derive { name="ncf"; version="1.1-5"; sha256="03nbmg9swxhpwrmfjsanp6fj5l2nw160sys70mj10a0ljlaf904z"; depends=[]; }; ncg = derive { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; }; -ncvreg = derive { name="ncvreg"; version="3.3-0"; sha256="0kwqfk9sp01x1k708qqr99cd8gkhr0jqjkfz1l7g0b6w6wm0yavb"; depends=[]; }; +ncvreg = derive { name="ncvreg"; version="3.4-0"; sha256="12ns62l0wdj9vkmqbdyxcwb15g3hz45dxcm7zl189iljcsl65977"; depends=[]; }; ndl = derive { name="ndl"; version="0.2.16"; sha256="1l56kg3x4579hzr4sig3iwrd81rhm8nmmrqfs54zxqv5yxpk3hp4"; depends=[Rcpp MASS Rcpp]; }; -ndtv = derive { name="ndtv"; version="0.5.1"; sha256="0cvqpr74als10zhdravbc7ykacy3ll7y5fx4n5jik0avwcaclgkc"; depends=[network networkDynamic animation sna MASS statnet_common]; }; +ndtv = derive { name="ndtv"; version="0.6.1"; sha256="0833n3ddhx1ixqi540j6b2bfmzhpdpg8cwd6d5y7shfxslrnpay9"; depends=[network networkDynamic animation sna MASS statnet_common jsonlite base64]; }; neariso = derive { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y84sj5lqw9yzbnxk6aqi80gfxhfml4c"; depends=[]; }; needy = derive { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; }; negenes = derive { name="negenes"; version="1.0-1"; sha256="0g8m3idjm24cf9b1wngw2pv1axgnv9mk5wqs78zgwvn0m67ypsiz"; depends=[]; }; neldermead = derive { name="neldermead"; version="1.0-10"; sha256="1snavf90yb12sydic7br749njbnfr0k7kk20fy677mg648sf73di"; depends=[optimbase optimsimplex]; }; +neotoma = derive { name="neotoma"; version="1.2-0"; sha256="0mb7b4qncn63nppq3hxl3a6hgipb413rygsm9qhira61ysnay51m"; depends=[RJSONIO RCurl plyr reshape2]; }; nephro = derive { name="nephro"; version="1.1"; sha256="06lxkk67n5whgc78vrr7gxvnrz38pxlsj4plj02zv9fwlzbb9h6p"; depends=[]; }; nestedRanksTest = derive { name="nestedRanksTest"; version="0.1"; sha256="12pqxldyzy2i2gc575rx67zdfb8c9j0fv400nw509cwx5w6ya35x"; depends=[]; }; netClass = derive { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[kernlab Matrix ROCR igraph samr]; }; @@ -4760,8 +4831,8 @@ nsga2R = derive { name="nsga2R"; version="1.0"; sha256="04jj0a3isfc348vg46il5x9l nsgp = derive { name="nsgp"; version="1.0.5"; sha256="0piajjz3r71dnjw7lwpjhbaygxcrbbxfvhf8p3n2izyr2pw5fml9"; depends=[MASS]; }; nsprcomp = derive { name="nsprcomp"; version="0.5"; sha256="1rrjiwkpiaqlp27s5xfd6jwmmpzgxm5d7874gp33511wa0vrhnnf"; depends=[]; }; nullabor = derive { name="nullabor"; version="0.3.1"; sha256="0anwla6x9y2i7yd6r0yi1xhy0zfqwfpp5h1f18gji11nmiva9d81"; depends=[ggplot2 MASS plyr dplyr moments fpc]; }; -numDeriv = derive { name="numDeriv"; version="2012.9-1"; sha256="09s00a1wddpq5556mz87vdmx045rhjrx1w8f2a37m8hljghy86k9"; depends=[]; }; -numOSL = derive { name="numOSL"; version="1.7"; sha256="1hgyjjxpirgf2vmn273s861mnpyq2363kaafnkzgbcg0s08xxj1r"; depends=[]; }; +numDeriv = derive { name="numDeriv"; version="2014.2-1"; sha256="114wd0hwn2mwlyh84hh3yd2bvcy63f166ihbpnp6xn6fqp019skd"; depends=[]; }; +numOSL = derive { name="numOSL"; version="1.8"; sha256="0md55gfxjvdmjy4hy58wp11c788xy7kq9wl32m1r76ja6g03wwbl"; depends=[]; }; numbers = derive { name="numbers"; version="0.5-6"; sha256="17v7by1gvqg2mdm5vrmf05kfrbvc2yz8ldb7bd0lrhcyrm5bbbwa"; depends=[gmp]; }; nutshell = derive { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_bbdb nutshell_audioscrobbler]; }; nutshell_audioscrobbler = derive { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; }; @@ -4792,12 +4863,12 @@ onion = derive { name="onion"; version="1.2-4"; sha256="0x3n9mwknxjwhpdg8an0ilix onlinePCA = derive { name="onlinePCA"; version="1.0-1"; sha256="0gca0ijcc30b3z5i390n1yk6c7sc15z8d0zpxpfb3hh99g7vinx4"; depends=[rARPACK Rcpp Rcpp RcppArmadillo]; }; onls = derive { name="onls"; version="0.1-0"; sha256="1kfgikswddly9lar6wa1hhz89rap0pql9h181s7i68wa20xdg05z"; depends=[minpack_lm]; }; opefimor = derive { name="opefimor"; version="1.1"; sha256="0xv57l38wx3w67h312g5xcpi9m7ggd6crqvqjh5gddq0g1g93bjq"; depends=[]; }; -openNLP = derive { name="openNLP"; version="0.2-4"; sha256="11zgqi8ydv6pqjs1sbi9gsh2fxg6jyaba16h5kbi15rc75fcvw47"; depends=[NLP openNLPdata rJava]; }; +openNLP = derive { name="openNLP"; version="0.2-5"; sha256="0jc4ii6zsj0pf6nlx3l0db18p6whp047gzvc7q0dbwpa8q4il2mb"; depends=[NLP openNLPdata rJava]; }; openNLPdata = derive { name="openNLPdata"; version="1.5.3-1"; sha256="1a048irgv56yi2lvhpqh8vh4dl7g7zfg934qypjxg8mcdcqi820y"; depends=[rJava]; }; openair = derive { name="openair"; version="1.5"; sha256="0swhaldfhz6zgs50aws18kypilv15k7w99nqcmb7y0wgvkkwda2h"; depends=[lazyeval dplyr maps plyr reshape2 mgcv lattice latticeExtra cluster RColorBrewer mapproj hexbin mapdata RgoogleMaps Rcpp Rcpp]; }; opencpu = derive { name="opencpu"; version="1.4.6"; sha256="19anprhkwqw2kii417qy3laalrlj207zfvklc05m0vz9sra7sxj0"; depends=[evaluate httpuv knitr jsonlite devtools httr brew openssl]; }; openintro = derive { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795vic9h191nf2j7v7hjybjfkrx6847c1r4iam"; depends=[]; }; -openssl = derive { name="openssl"; version="0.3"; sha256="0h71jc1w99qg4y01q6j3yhmjhwf06r9pv150id2ls5f1z3hr0l6p"; depends=[]; }; +openssl = derive { name="openssl"; version="0.4"; sha256="1gfhzxjjssid2z8xmw3vnnd4gj2f6a3zzazkhpg9b1ymmcp9b288"; depends=[]; }; opentraj = derive { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[plyr maptools openair raster rgdal reshape doParallel foreach sp]; }; openxlsx = derive { name="openxlsx"; version="2.4.0"; sha256="1jzq3lz9qivsprmn8aibwiidcwsanlnfpmsz2ccw3650gdgk3zdk"; depends=[Rcpp Rcpp]; }; operator_tools = derive { name="operator.tools"; version="1.3.0"; sha256="0y5f0ifj4gaq03gm44vdvslcs7lglk1p8kq47mdc0gc1yfa6l00c"; depends=[]; }; @@ -4808,6 +4879,7 @@ optBiomarker = derive { name="optBiomarker"; version="1.0-27"; sha256="1kkj602d4 optR = derive { name="optR"; version="1.1.1"; sha256="1lr5n0g21jayb27b2j8zh16f1k28avzg7k2mwyc7rjhhxv8k9w1j"; depends=[]; }; optextras = derive { name="optextras"; version="2013-10.28"; sha256="1sm025xwrpm5c63l4kiqfndxb7rwq2bcmidy4k2b24g5a8x7cpfv"; depends=[numDeriv]; }; optiRum = derive { name="optiRum"; version="0.35"; sha256="0hfby5791jmzpacd8a4jj45b6sr5fph9g24kv6sr9db35y07ca36"; depends=[data_table ggplot2 AUC knitr plyr scales stringr XML]; }; +optifunset = derive { name="optifunset"; version="1.0"; sha256="18pvdl04ln1i0w30ljdb3k86j27zg2nvrn3ws54c1g6zg9haqhbg"; depends=[]; }; optimbase = derive { name="optimbase"; version="1.0-9"; sha256="0ivz24kf3yacgq5bl3s3az1pcyhsz0cza5f8vdksy5gchwqplm8n"; depends=[Matrix]; }; optimsimplex = derive { name="optimsimplex"; version="1.0-5"; sha256="1aiq0w2zlra3k6x4hf2rglb6bj8w25yc8djnpgm508kkrbv3cc17"; depends=[optimbase]; }; optimx = derive { name="optimx"; version="2013.8.7"; sha256="0pbd7s02isj24npi4m1m1f008xqwzvwp3kn472wz8nmy4zrid30s"; depends=[numDeriv ucminf BB Rcgmin Rvmmin minqa setRNG dfoptim svUnit]; }; @@ -4833,8 +4905,8 @@ orgR = derive { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxh orientlib = derive { name="orientlib"; version="0.10.3"; sha256="1qi46hkz73b8722zc3w6wvsq1ydlk37yxn9rd1dqygqbs1svkmvv"; depends=[]; }; orloca = derive { name="orloca"; version="4.2"; sha256="14accc5kcvvin5qav6g3rx10by00r0b8970nd09w4c09nhwyblcd"; depends=[]; }; orloca_es = derive { name="orloca.es"; version="4.1"; sha256="0nzhg7vzfxlmryw5ijww8z2b1g9cmgcgzi3gsgigsgn4shnc2hni"; depends=[orloca]; }; -oro_dicom = derive { name="oro.dicom"; version="0.4.3"; sha256="1n0rvinq14fbylg11h8a3ijqwyl9xlzs2ygwh38wrpi2z60afl18"; depends=[oro_nifti]; }; -oro_nifti = derive { name="oro.nifti"; version="0.4.3"; sha256="1sr91x0fzl7zc6m5mndhql7abmmsckyjl7s45rj4n3g8qzbqn790"; depends=[bitops]; }; +oro_dicom = derive { name="oro.dicom"; version="0.5.0"; sha256="05dmhfglp76apyilwicf3n2ylyjhp1gq6b9bnzsiiblpjnfpia43"; depends=[oro_nifti]; }; +oro_nifti = derive { name="oro.nifti"; version="0.5.2"; sha256="0zf5lb51b81602lwg118x3j2myrbrm6wjaflbpxxzqigz4q60rkg"; depends=[bitops abind]; }; oro_pet = derive { name="oro.pet"; version="0.2.3"; sha256="06agl6rvd01h6mnilj0vl52dxw6b7b41vl6vmbvaq5qy1wmiaiz7"; depends=[oro_dicom oro_nifti]; }; orsk = derive { name="orsk"; version="1.0-1"; sha256="155wc9sfla3717b6xmhmsmvsnh2qbzzkffhibmj4xc0pd9lwwz2v"; depends=[BB BHH2]; }; orthogonalsplinebasis = derive { name="orthogonalsplinebasis"; version="0.1.6"; sha256="07rbd0fhs2gsk7wj41y2h7wf6pfg324vzv2al753d8kqyx5ns2dj"; depends=[]; }; @@ -4851,7 +4923,7 @@ p3state_msm = derive { name="p3state.msm"; version="1.3"; sha256="0gbrka62ylxx64 pBrackets = derive { name="pBrackets"; version="1.0"; sha256="0cwv609hzp8anfv3cgfbspz8w0g1ljfz05wm4xfhwy15v32fckrj"; depends=[]; }; pGLS = derive { name="pGLS"; version="0.0-1"; sha256="1rlk8q09sikf4vpzsx0c7s6qqh2hxf8dy2bgcm4nnkbv2nfjz438"; depends=[MASS]; }; pRF = derive { name="pRF"; version="1.0"; sha256="17m86l29ys4n6z4ndibwy7yz9shyp7nf9hjnbgbvmc0ycf1may6i"; depends=[dplyr ggplot2 permute randomForest reshape2 magrittr]; }; -pROC = derive { name="pROC"; version="1.7.3"; sha256="1xbz50phi2ygrgvcv36vnbc2icga8abjiha2ap35bwffg5d2zmvi"; depends=[plyr Rcpp Rcpp]; }; +pROC = derive { name="pROC"; version="1.8"; sha256="0rva08hnaah9qv6hapzgfsdy2g06fdvnjmw0l733wm5j2g44ps8m"; depends=[plyr Rcpp Rcpp]; }; pRSR = derive { name="pRSR"; version="3.0.2"; sha256="1s81mi172mwxhp786c1fl579cg87valppr0z958ssvxsvg5hbfxy"; depends=[]; }; pSI = derive { name="pSI"; version="1.1"; sha256="0cvw38dqqlyx7cpl27hq33f5xns2d0019lyr98pwndcnbp09mx0b"; depends=[gdata]; }; pa = derive { name="pa"; version="1.2-1"; sha256="1pfgzxirkb0p8f6smjlrbp1qpsh0vsvqf306cvldaj9zx8cw0q9f"; depends=[ggplot2]; }; @@ -4866,19 +4938,19 @@ pacman = derive { name="pacman"; version="0.3.0"; sha256="10fjkr4zjcx7cyfmnpdnb9 paf = derive { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; }; pairedCI = derive { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; }; pairheatmap = derive { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; }; -pairsD3 = derive { name="pairsD3"; version="0.0.6"; sha256="1fkwz8b9cqzhi7a8hv5bzgna9b0i0dvvpkffvbknsd9d24sjzr6c"; depends=[htmlwidgets shiny]; }; +pairsD3 = derive { name="pairsD3"; version="0.1.0"; sha256="0ql6pqijf24pfyid52hmf5fmh4w1ca3sm47z9vknqpnjbn47v8q2"; depends=[htmlwidgets shiny]; }; pairwise = derive { name="pairwise"; version="0.2.5"; sha256="0r08v95f6f2safi6c0x84v5gib5qnkv46dmi97rdb9l2xzly249b"; depends=[]; }; pairwiseCI = derive { name="pairwiseCI"; version="0.1-22"; sha256="1lgir9gcikx8c9pd2wdsqnik9rwr4qkymcf4ndp8s491vj6cm6sa"; depends=[MCPAN coin boot mratios binMto MASS]; }; palaeoSig = derive { name="palaeoSig"; version="1.1-3"; sha256="1zm8xr7fpnnh6l4421vjavi6bg44iars3mna4r5fw3spmbswyv7b"; depends=[vegan TeachingDemos rioja mgcv MASS]; }; paleoMAS = derive { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[MASS vegan lattice]; }; paleoTS = derive { name="paleoTS"; version="0.4-4"; sha256="19acfq5z42blk6ya7sj3sprddlgvhrzb9zqpvpy4q8siqkxxrjah"; depends=[mvtnorm]; }; paleobioDB = derive { name="paleobioDB"; version="0.3"; sha256="1vcfssi6w0m2wd2smyjxp1zf0y48y95386kkb8qdndqw99g089w8"; depends=[raster maps rjson gtools RCurl plyr scales]; }; -paleofire = derive { name="paleofire"; version="1.1.5"; sha256="18ymcybsq4hqxyrqslaqda8n2pyf4yl45mgs3yzl1gbw77zas1bl"; depends=[GCD locfit raster ggplot2 plyr rgdal lattice]; }; -paleotree = derive { name="paleotree"; version="2.3"; sha256="0zfav7s7x6g7rndbl6jg186fyxsq200b6z0l1zdvcm9528svv9wp"; depends=[ape phangorn]; }; +paleofire = derive { name="paleofire"; version="1.1.6"; sha256="1fzmnc4ywhqb6sr3cclsqy6y9v27j69bxszlrrgbnqb0kyg28rd7"; depends=[GCD locfit raster ggplot2 plyr rgdal lattice]; }; +paleotree = derive { name="paleotree"; version="2.4"; sha256="1rrsxll5qcvr9a96wg5bdljvyy7zy26zd9f0b17xswmp77gxmahb"; depends=[ape phangorn]; }; palinsol = derive { name="palinsol"; version="0.92"; sha256="1jxy3qx8w1r8jwgdavf37gqjjqpizdqk218xcc7b77xi8w52vxpg"; depends=[gsl]; }; pamctdp = derive { name="pamctdp"; version="0.3.1"; sha256="1fnadgfd2ikis49j9zl2ijj8gim8lpbygwxjj6ri9jyrc1qmj9jb"; depends=[ade4 xtable FactoClass]; }; pamm = derive { name="pamm"; version="0.7"; sha256="02py4zcymmwnlpsvha5cgc4ik8fp0gbsg86s5q7z5fl3ma3g669j"; depends=[lme4 mvtnorm gmodels]; }; -pampe = derive { name="pampe"; version="1.0"; sha256="0dfwhcnsxw71sn14m44fx1fxbx924rjpi2vvz292jzr404krcvny"; depends=[leaps]; }; +pampe = derive { name="pampe"; version="1.1.1"; sha256="1ha4jbmi2j35i375ziv4rbs4rijlp6fxwvb0vfr2905d1vl3cbap"; depends=[leaps]; }; pamr = derive { name="pamr"; version="1.55"; sha256="1hy3khb0gikdr3vpjz0s245m5zang1vq8k93g7n9fq3sjfa034gd"; depends=[cluster survival]; }; pan = derive { name="pan"; version="1.3"; sha256="08g0arwwkj9smkzyh6aicfrqvknag3n2xl55f7q7ghj09fhwg1br"; depends=[]; }; pander = derive { name="pander"; version="0.5.1"; sha256="0m95vnrzw9v4cq52kn3a605gbk1qd24ivh7aywhk1lh0imlk7i85"; depends=[digest Rcpp Rcpp]; }; @@ -4889,7 +4961,7 @@ parallelMap = derive { name="parallelMap"; version="1.2"; sha256="1rd4q644xml29n parallelize_dynamic = derive { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; }; paramlink = derive { name="paramlink"; version="0.9-6"; sha256="0pazllkjbqzvl9vmpvr67lkcsd960mipcd1p1nf00y8hknrwh7qp"; depends=[kinship2 maxLik]; }; paran = derive { name="paran"; version="1.5.1"; sha256="0nvgk01z2vypk5bawkd6pp0pnbgb54ljy0p8sc47c8ibk242ljqk"; depends=[MASS]; }; -parboost = derive { name="parboost"; version="0.1.3"; sha256="1ziqbbcxvhc3v0vjpf9y6jhk3rqbgn9cilwcfxlxjbw73jhvvclg"; depends=[mboost party iterators plyr caret glmnet doParallel]; }; +parboost = derive { name="parboost"; version="0.1.4"; sha256="087b4as0w8bckwqpisq9mllvm523vlxmld3irrms13la23z6rjvf"; depends=[mboost party iterators plyr caret glmnet doParallel]; }; parcor = derive { name="parcor"; version="0.2-6"; sha256="10bhw50g8c4ln5gapa7wghhb050a3jmd1sw1d1k8yljibwcbbx36"; depends=[MASS glmnet ppls Epi GeneNet]; }; parfossil = derive { name="parfossil"; version="0.2.0"; sha256="12gsc5n4ycvhzxvq5j0r3jnnrzw1q412dbvmakipyw2yx2l2s7jn"; depends=[fossil foreach]; }; parma = derive { name="parma"; version="1.5-1"; sha256="0qrq3bx0amri9b3s6bym4znnk140jjd2abnvqyihaj4bf2glbl0g"; depends=[nloptr slam Rglpk quadprog FRAPO corpcor]; }; @@ -4910,11 +4982,11 @@ pastecs = derive { name="pastecs"; version="1.3-18"; sha256="0ixlnc1psgqgm71bsf5 pastis = derive { name="pastis"; version="0.1-2"; sha256="0211pzj3xrmqgxjpspij95kmlpa2klpicw49n6pnz2g1fapjy2bd"; depends=[caper ape]; }; patchDVI = derive { name="patchDVI"; version="1.9.1601"; sha256="0vv1rmmd78n2r14dsl9fx25v6ym9mav557ya0aagr548wqcajf0m"; depends=[]; }; patchPlot = derive { name="patchPlot"; version="0.1.5"; sha256="1b4k0dvvj6qwyxbqb36knyrawvy5qq8hl45pz896c9rkqhlg02bx"; depends=[datautils]; }; -patchSynctex = derive { name="patchSynctex"; version="0.1-0"; sha256="1r9lk3shk9gg5xyiv20sbpzak1dby93q6jzaa6vx1abawjdkmz0c"; depends=[stringr]; }; +patchSynctex = derive { name="patchSynctex"; version="0.1-2"; sha256="1ssjs4mcsjad7g0yfi5sxwfyywsziry81rzwb4sly3afw8g538p9"; depends=[stringr]; }; pathClass = derive { name="pathClass"; version="0.9.4"; sha256="1vzmz3bml37wfxsjhkw9fip90sr1iv521ccr7nlf6xd30wavqywk"; depends=[svmpath kernlab ROCR igraph lpSolve]; }; pathdiagram = derive { name="pathdiagram"; version="0.1.9"; sha256="1j2h9mmwfi95nwhk9214kcfpb1qrmw249mjaza7i9gijmlicraxz"; depends=[shape]; }; pathmox = derive { name="pathmox"; version="0.2.0"; sha256="0hcllnpjjays35yngz309f1gcx9qg5z9h302kg9mhxs90470x4w0"; depends=[plspm tester]; }; -pathological = derive { name="pathological"; version="0.0-3"; sha256="1zl5vid1i6ijzjdqpvrm5c9yl6nh08cmmdqk50s65wggwmm0iw4l"; depends=[assertive plyr stringr]; }; +pathological = derive { name="pathological"; version="0.0-6"; sha256="1a6a9q15nk8rcpyz5xpndq0gbdv7y2iq4jgqiv7sgd3j1agh26c6"; depends=[assertive plyr stringr]; }; pauwels2014 = derive { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; }; pavo = derive { name="pavo"; version="0.5-1"; sha256="189kshc5dm02qv0rm1dlcxrhvga4yhlkn3yyj3rjhmrags4rmwcb"; depends=[rgl rcdd mapproj geometry]; }; pawacc = derive { name="pawacc"; version="1.2.1"; sha256="1l2wn69ynr5mza04a5mmzwzigqac8k9xkiaw7sdqv5hn9y7x3sj9"; depends=[SparseM]; }; @@ -4933,11 +5005,11 @@ pbo = derive { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf pbs = derive { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; }; pcIRT = derive { name="pcIRT"; version="0.1"; sha256="0vfbbmnp4jyrbi5d9gz1krh707aazbrqfcgc3rjrwwyjld11wyzn"; depends=[combinat]; }; pca3d = derive { name="pca3d"; version="0.3"; sha256="01nc4p68r7bnly18q8rkhnnj6vq9mwbb5hhdcblan6nhhlzhnld0"; depends=[rgl]; }; -pcaL1 = derive { name="pcaL1"; version="1.2.1"; sha256="00jfsbhnpq5mvnmpv066w1nhz2lhv55imgbl2z7dza9b8gxb88ry"; depends=[]; }; +pcaL1 = derive { name="pcaL1"; version="1.3"; sha256="026cgi812kvbkmaryd3lyqnb1m78i3ql2phlvsd2r691y1j8w532"; depends=[]; }; pcaPP = derive { name="pcaPP"; version="1.9-60"; sha256="1rqq4zgik7cgnnnm8il1rxamp6q9isznac8fhryfsfdcawclfjws"; depends=[mvtnorm]; }; pcalg = derive { name="pcalg"; version="2.0-10"; sha256="1ph5n3hlxni039phvhr9r2nj62c4mw9zmf0857sqzv434hizdfzi"; depends=[abind igraph ggm corpcor robustbase vcd Rcpp bdsmatrix sfsmisc Rcpp RcppArmadillo BH]; }; pcg = derive { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; }; -pcnetmeta = derive { name="pcnetmeta"; version="2.0"; sha256="0ayk9dvll321ndpbzqhvswhd7gbngmdhvzak5mn74w76wz9d4ylv"; depends=[rjags coda]; }; +pcnetmeta = derive { name="pcnetmeta"; version="2.1"; sha256="00vrlkzc6d5xgs4my8qr6f9skyjdi3i529i9sfmdcwwrwp2spr24"; depends=[rjags coda]; }; pcrcoal = derive { name="pcrcoal"; version="1.1"; sha256="17mm13xpmghachiqr7v2691jk39mbfsadpg028gs3iiwmh0pksa0"; depends=[ape ggplot2 phylosim]; }; pcse = derive { name="pcse"; version="1.9"; sha256="04vprsvcmv1ivxqrrvd1f8ifg493byncqvmr84fmc0jw5m9jrk3j"; depends=[]; }; pdR = derive { name="pdR"; version="1.2"; sha256="0dgw6i623a6w18q54b46fnbp38941hqdvjpcnxrbqwvcgk024pr6"; depends=[]; }; @@ -4980,9 +5052,9 @@ perturb = derive { name="perturb"; version="2.05"; sha256="18ydmmp8aq4rf9834dmsr pesticides = derive { name="pesticides"; version="0.1"; sha256="1w180hqqav0mh9sr9djj94sf55fzh4r373a7h08a2nz9nyjpq09w"; depends=[]; }; pez = derive { name="pez"; version="1.0-0"; sha256="0d1npc2w6gzi4ki7gwqa0f4sklz0sml8q0cmgb77hpvgrny47mk3"; depends=[ape caper picante quantreg mvtnorm vegan ade4 apTreeshape FD plotrix Matrix]; }; pgam = derive { name="pgam"; version="0.4.12"; sha256="0vhac2mysd053bswy3xwpiz0q0qh260hziw6bygpf83vkj94qf2v"; depends=[]; }; -pgirmess = derive { name="pgirmess"; version="1.5.9"; sha256="1n58r5ghd2ppnid6787gd1n18f23pf0fk7yr3vagcqpzv4pk0wic"; depends=[boot nlme rgdal sp spdep splancs]; }; +pgirmess = derive { name="pgirmess"; version="1.6.0"; sha256="0b2sxk2q4cylsb5ch9bq1grdifp2sww7bv1bgl9zn0j6h611gif5"; depends=[boot nlme rgdal sp spdep splancs]; }; pglm = derive { name="pglm"; version="0.1-2"; sha256="1arn2gf0bkg0s59a96hyhrm7adw66d33qs2al2s0ghln6fyk8674"; depends=[maxLik plm statmod]; }; -pgmm = derive { name="pgmm"; version="1.1"; sha256="0ajdcnxxy18ifidid4xnq9a03bsrvcbh3dh2vhviggkhq8gji1dn"; depends=[]; }; +pgmm = derive { name="pgmm"; version="1.2"; sha256="0f0wdcirjyxzg2139c055i035qzmhm01yvf97nrhp69h4hpynb2n"; depends=[]; }; pgs = derive { name="pgs"; version="0.4-0"; sha256="1zf5sjn662sds3h06zk5p4g71qnpwp5yhw1dkjzs1rs48pxmagrx"; depends=[gsl R2Cuba]; }; phalen = derive { name="phalen"; version="1.0"; sha256="0awj9a48dy0azkhqkkzf82q75hrsb2yw6dgbsvlsb0a71g4wyhlr"; depends=[sqldf]; }; phangorn = derive { name="phangorn"; version="1.99-13"; sha256="1d6awphvzkznqvp30bxdi6j6chlakfxrvmkk9a4by21fxa29xmp9"; depends=[ape quadprog igraph Matrix nnls]; }; @@ -4994,11 +5066,11 @@ phenex = derive { name="phenex"; version="1.0-7"; sha256="0q563cv9lskikf3ls0idp5 phenmod = derive { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat RColorBrewer lattice pheno]; }; pheno = derive { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme SparseM quantreg]; }; pheno2geno = derive { name="pheno2geno"; version="1.3.1"; sha256="1k1hw5qxrwxy502zkcfcz0nxjqmvdk1fgghjc512vq7x5znblz3v"; depends=[qtl VGAM mixtools]; }; -phenology = derive { name="phenology"; version="4.1"; sha256="0zg77jzmj5di2kid9v95wj6w326adyfcsdf7rxlq7n84439jsbz3"; depends=[fields zoo coda HelpersMG shiny]; }; +phenology = derive { name="phenology"; version="4.2"; sha256="141k2rfjmrx0cfzzcdf3q67chxq1jqp524rxcpdq3m7bnbkv67k3"; depends=[fields zoo coda HelpersMG shiny]; }; phia = derive { name="phia"; version="0.2-0"; sha256="1v2znss1snqrn3bpd0513jmw0x39p9vpwdc60klx725yrr2cfznw"; depends=[car Matrix]; }; phmm = derive { name="phmm"; version="0.7-5"; sha256="0dil0ha199yh85j1skwfdl0v02vxdmb0xcc1jdbayjr5jrn9m1zk"; depends=[survival lattice Matrix]; }; phom = derive { name="phom"; version="1.0.3"; sha256="0x05p6fn4kycilal65k7dy6h3w5i3ca9w93ryp4gqd4lp50l1749"; depends=[Rcpp Rcpp]; }; -phonR = derive { name="phonR"; version="1.0-1"; sha256="11m6qm3ya90n886mig4inxm057afl2gx4iz5fbwqsncibdmqgx92"; depends=[splancs deldir plotrix]; }; +phonR = derive { name="phonR"; version="1.0-3"; sha256="09wzsq92jkxy6cd89czshpj1hsp56v9jbgqr5a06rm6bv3spa31i"; depends=[splancs deldir plotrix]; }; phonTools = derive { name="phonTools"; version="0.2-2.0"; sha256="1wd1a5506p3ny6vi9pq6yg9gbz082fxw4l3cxsplkdpqgkhryrww"; depends=[]; }; phreeqc = derive { name="phreeqc"; version="1.0-9102"; sha256="09vwqd4mf64l76vgg32vm9vkc8ra6cls9nvrp3ckkj9l2fwcnbzf"; depends=[]; }; phtt = derive { name="phtt"; version="3.1.2"; sha256="1fvvx5jilq5dlgh3qlfsjxr8jizy4k34a1g3lknfkmvn713ycp7v"; depends=[pspline]; }; @@ -5014,7 +5086,7 @@ phylosim = derive { name="phylosim"; version="2.1.1"; sha256="0rrz5c7zl2hjalwm6m phylotools = derive { name="phylotools"; version="0.1.2"; sha256="19w7xzk6sk1g9br7vwv338nvszzh0lk5rdzf0khiywka31bbsjyb"; depends=[seqRFLP ape picante spaa fields]; }; phyreg = derive { name="phyreg"; version="0.7"; sha256="0saynhq4yvd4x2xaljcsfmqk7da2jq3jqk26fm9qivg900z4kf35"; depends=[]; }; physiology = derive { name="physiology"; version="0.2.2"; sha256="0z394smbnmlrnp9ms5vjczc3avrcn5nxm8np5y58k86x470w6npz"; depends=[]; }; -phytools = derive { name="phytools"; version="0.4-45"; sha256="0qhndyik687v2hrd32xr0zglpyxikv1zhp2dkz611kpjbxz0gq44"; depends=[ape maps animation clusterGeneration mnormt msm numDeriv phangorn plotrix scatterplot3d]; }; +phytools = derive { name="phytools"; version="0.4-56"; sha256="18cib7yjlbzdpfs5piwx5cw0h7fk26s04wsb2vdfiybr306a9jk2"; depends=[ape maps animation clusterGeneration mnormt msm numDeriv phangorn plotrix scatterplot3d]; }; phytotools = derive { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[insol FME]; }; pi0 = derive { name="pi0"; version="1.3-250"; sha256="1561zvf1hcd05iqy245c0z23mi8ypk6q3lkfldcr55cs67w4lmz6"; depends=[LowRankQP Matrix numDeriv limSolve rgl scatterplot3d Iso quadprog kernlab]; }; picante = derive { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape vegan nlme]; }; @@ -5031,6 +5103,8 @@ plRasch = derive { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wf plan = derive { name="plan"; version="0.4-2"; sha256="0vwiv8gcjdbnsxd8zqf0j1yh6gvbzm0b5kr7m47ha9z64d7wxch6"; depends=[]; }; planar = derive { name="planar"; version="1.5.2"; sha256="1w843qk88x3kzi4q79d5ifzgp975dj4ih93g2g6fa6wh529j4w3h"; depends=[dielectric Rcpp statmod cubature reshape2 plyr Rcpp RcppArmadillo]; }; planor = derive { name="planor"; version="0.2-3"; sha256="1j550zqm3h4kz7jz4fkgp0z92skwpyxz0lnr7pfif4pya1mxd6f9"; depends=[conf_design]; }; +plantecophys = derive { name="plantecophys"; version="0.6"; sha256="1gxc84njpii82p6n04djbp4n9wni49lxfvmljqz48r643hv48a7h"; depends=[]; }; +plaqr = derive { name="plaqr"; version="1.0"; sha256="1vv15zqnmir5hi9ivyifzrc1rkn1sn5qj61by66iczmlmhqh17h8"; depends=[quantreg]; }; playwith = derive { name="playwith"; version="0.9-54"; sha256="1zmm8sskchim3ba3l0zqfvxnrqfmiv94a8l6slcf3if3cf9kkzal"; depends=[lattice cairoDevice gWidgetsRGtk2 RGtk2 gWidgets gridBase]; }; plfm = derive { name="plfm"; version="1.1.2"; sha256="1dl2pv2v7kp39hlbk5kb33kzhg9dzxjxhafdjv9dqpqb9b77akm8"; depends=[sfsmisc abind]; }; plgp = derive { name="plgp"; version="1.1-7"; sha256="02g6saabrsd8pra0szbwcbilf6w5ywg2gxqb5zdvbxds2vw36hn0"; depends=[mvtnorm tgp]; }; @@ -5042,11 +5116,11 @@ plot2groups = derive { name="plot2groups"; version="0.10"; sha256="00mp82vvx6inl plot3D = derive { name="plot3D"; version="1.0-2"; sha256="0qsrd1na4xw2bm1rzwj3asgkh7xqpyja0dxdmz41f3x58ip9wnz1"; depends=[misc3d]; }; plot3Drgl = derive { name="plot3Drgl"; version="1.0"; sha256="109vsivif4hmw2hk3hi4y703d3snzxbr9pzhn1846imdclkl12yg"; depends=[rgl plot3D]; }; plotGoogleMaps = derive { name="plotGoogleMaps"; version="2.2"; sha256="0qv57k46ncg0wrgma0sbr3xf0j9j8cii3ppk3gs65ardghs3bf6b"; depends=[sp spacetime rgdal maptools lattice raster]; }; -plotKML = derive { name="plotKML"; version="0.5-0"; sha256="0sx48z27a34bc8gw7m66w52q36llbm2wm15l6kvd6zzlyzvj8cda"; depends=[XML sp raster rgdal spacetime colorspace plotrix dismo aqp pixmap plyr stringr colorRamps scales gstat zoo RColorBrewer RSAGA classInt]; }; +plotKML = derive { name="plotKML"; version="0.5-2"; sha256="006f6j3k2yb20zcmx2lq9d4yy5awpsaxkcp17r6q42bdrffkc0m9"; depends=[XML sp raster rgdal spacetime colorspace plotrix dismo aqp pixmap plyr stringr colorRamps scales gstat zoo RColorBrewer RSAGA classInt]; }; plotMCMC = derive { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; }; plotROC = derive { name="plotROC"; version="1.3.3"; sha256="090fpj3b5vp0r2zrn38yxiy205mk9kx1fpwp0g8rl4bsa88v4c9y"; depends=[ggplot2 gridSVG shiny]; }; plotSEMM = derive { name="plotSEMM"; version="2.0"; sha256="0n30m1nz9fnilbgxg5jcmx2bsscdvz5mkjkyrgx7yr3alazkaimd"; depends=[plyr shiny MplusAutomation Rcpp plotrix Rcpp]; }; -plotmo = derive { name="plotmo"; version="2.2.1"; sha256="1kgsw7xfqmzsyybhj21a42ynci1y7gm8gas1jqsbgh0vydfbzzh5"; depends=[]; }; +plotmo = derive { name="plotmo"; version="3.1.0"; sha256="1z735ks92d1gfx6hk29mnj18a9hpsmifjy8qgh5lv9z0mwd7igca"; depends=[plotrix TeachingDemos]; }; plotpc = derive { name="plotpc"; version="1.0.3"; sha256="0dw9k702a67c2k77dl4k2747lhsr84x41qrgj5mp9jnyfq6naciq"; depends=[]; }; plotrix = derive { name="plotrix"; version="3.5-11"; sha256="01vb3i7hkc3krvl9v4f8fnpfcv62p4ci2vbm2qs5w593h70bys7c"; depends=[]; }; pls = derive { name="pls"; version="2.4-3"; sha256="114ka4766x8fx0zvvr7cylky1jsy542nj6s7sb2dwv8zjhbclkhn"; depends=[]; }; @@ -5055,13 +5129,13 @@ plsRcox = derive { name="plsRcox"; version="1.7.2"; sha256="1c3ll13m27ndwlc9r79i plsRglm = derive { name="plsRglm"; version="1.1.1"; sha256="1bx1pl1pv47z3yj3ngkd97j10v2h8jqiybcqbm3kvqhgqydm07rp"; depends=[mvtnorm boot bipartite car]; }; plsdepot = derive { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; }; plsdof = derive { name="plsdof"; version="0.2-7"; sha256="1z8z9m0nsnyy1fipzvm1srpxn3q6wjrlivmmki1f8plwkixkyc5y"; depends=[MASS]; }; -plsgenomics = derive { name="plsgenomics"; version="1.2-6"; sha256="1yif4h556xjadlfp31nm6aqhd3md983sppwmbh7mg95dffxnd3im"; depends=[MASS]; }; +plsgenomics = derive { name="plsgenomics"; version="1.3"; sha256="0gzk7sgv6bqkay7j854xsmyr3vwsdb2dbcnffv1ygdxikj64icp4"; depends=[MASS boot]; }; plspm = derive { name="plspm"; version="0.4.2"; sha256="0q7mx5ydw61z1qcs0flpwpnnrcwsfsh3razc8jnd4z1xn96i3x85"; depends=[amap diagram tester turner]; }; plugdensity = derive { name="plugdensity"; version="0.8-3"; sha256="1jdmq4kbs8yzgkf9f5dc7c8c52ia68fgavw7nsnc2hnz5ylw1qy9"; depends=[]; }; plumbr = derive { name="plumbr"; version="0.6.9"; sha256="1avbclblqfy57pd72ximvj3zq92q1w8vszvyf6fw75j5rfwdaibk"; depends=[objectSignals]; }; plus = derive { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; }; plusser = derive { name="plusser"; version="0.4-0"; sha256="1g100dh8cvn9q09j0jbkw4xmwjdp1lm4651369975fm99nrlp1j9"; depends=[RCurl RJSONIO lubridate plyr]; }; -plyr = derive { name="plyr"; version="1.8.1"; sha256="0f2an3pr7flpng9y9mmrmyh08g3nivi6gdkfnw54arn0wxhkqfcm"; depends=[Rcpp Rcpp]; }; +plyr = derive { name="plyr"; version="1.8.2"; sha256="1dizvj3xvp1cg8sm21xpk0kgfpil1n1q60zkanz6yh9cnnp6g306"; depends=[Rcpp Rcpp]; }; pmcgd = derive { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; }; pmclust = derive { name="pmclust"; version="0.1-6"; sha256="05zjx4psvk5zjmr0iwwwig990g6h04ajn5wi0xi8bqv046r47q3h"; depends=[rlecuyer pbdMPI MASS]; }; pmg = derive { name="pmg"; version="0.9-43"; sha256="0i7d50m4w7p8ipyx2d3qmc54aiqvw0ls8igkk8s1xc7k8ympfqi6"; depends=[gWidgets gWidgetsRGtk2 proto lattice foreign MASS]; }; @@ -5074,6 +5148,7 @@ pnmtrem = derive { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0 pnn = derive { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; }; poLCA = derive { name="poLCA"; version="1.4.1"; sha256="0bknnndcxsnlq6z9k1vbhqiib1mlzlx4badz85kc7a3xbrdrfs9f"; depends=[scatterplot3d MASS]; }; pocrm = derive { name="pocrm"; version="0.9"; sha256="0p7a7xm1iyyjgzyi7ik2n34gqc3lsnallrijzdakghb8k5cybm4m"; depends=[dfcrm nnet]; }; +pogit = derive { name="pogit"; version="1.0.0"; sha256="0lgvf4d7b2ycz9wryjrd7qymbx1jmj4mw8jl95ax2jylz4li48zf"; depends=[BayesLogit ggplot2 logistf plyr]; }; poibin = derive { name="poibin"; version="1.2"; sha256="12dm1kdalbqy8k7dfldf89v6zw6nd0f73gcdx32xbmry2l2976sa"; depends=[]; }; poilog = derive { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; }; pointRes = derive { name="pointRes"; version="1.0.2"; sha256="1q9vjvmxs1f5g8f2aj674wk8piqzjqxzdrvxnawgw1pfi66adnms"; depends=[ggplot2 gridExtra plyr TripleR]; }; @@ -5112,11 +5187,11 @@ portes = derive { name="portes"; version="2.1-3"; sha256="0nqh6aync5igmvg7nr5ink portfolio = derive { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; }; portfolioSim = derive { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; }; potts = derive { name="potts"; version="0.5-2"; sha256="1q4kvknxkrd8qbv8l3vmwrppgzq5bsysnqgm029lx7iys73x4fck"; depends=[]; }; -poweRlaw = derive { name="poweRlaw"; version="0.30.1"; sha256="078yrr4fsg0isl45j887y62jzhvdv4krd3drg420wx5a0mqj7np1"; depends=[VGAM]; }; +poweRlaw = derive { name="poweRlaw"; version="0.30.2"; sha256="1b4ngqsh5gywksb3y9cj1yjkhxs4081svwgxwf8gpsa7fnl9c0fl"; depends=[VGAM]; }; powell = derive { name="powell"; version="1.0-0"; sha256="160i4ki3ymvq08szaxshqlz7w063493j5zqvnw6cgjmxs7y0vj8y"; depends=[]; }; powerAnalysis = derive { name="powerAnalysis"; version="0.2"; sha256="15ff3wnn37sjkiyycgh16g7gwl3l321fbw12kv621dad5bki14jl"; depends=[]; }; powerGWASinteraction = derive { name="powerGWASinteraction"; version="1.1.1"; sha256="0xwyqlblhdnnv6pd2jpmz11s95zg7ylh1wa2q03zj8df330jcl70"; depends=[mvtnorm pwr]; }; -powerMediation = derive { name="powerMediation"; version="0.2.3"; sha256="0i4qyjcmw2zvpdgq520kjzf38hddsrjwf0vlg4ylv1kaav7jzgsr"; depends=[]; }; +powerMediation = derive { name="powerMediation"; version="0.2.4"; sha256="1b4hzai52fb0kk04az3rdbfk2vldfkhsa4gx7g98lbsvw4gh9imb"; depends=[]; }; powerSurvEpi = derive { name="powerSurvEpi"; version="0.0.6"; sha256="1jsbrj35m296mkk47zcpb2haain6bf23k0xzphnb4sq8f06cmq1p"; depends=[survival]; }; powerpkg = derive { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; }; ppcor = derive { name="ppcor"; version="1.0"; sha256="18l5adjysack86ws61xh89z5xfr83v932a0pn6ad8i8py3nd85fj"; depends=[]; }; @@ -5140,10 +5215,10 @@ prefmod = derive { name="prefmod"; version="0.8-32"; sha256="0v5r195gzbfi6jbqz8r presens = derive { name="presens"; version="1.0.0"; sha256="0hwciahpfp7h7dchn6k64cwjwxzm6cx28b66kv6flz4yzwvqd3pb"; depends=[birk marelac]; }; preseqR = derive { name="preseqR"; version="1.1.1"; sha256="0hz9a7jji2k55a57l03ajkf0j7yp6dgyapyqr1ip0v18fjpfj98q"; depends=[]; }; prettyGraphs = derive { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; }; -prettyR = derive { name="prettyR"; version="2.1"; sha256="0q6w51758yaxa3l276vqvkvry6v4xz33lx8791b5hyrq837ypx8z"; depends=[]; }; +prettyR = derive { name="prettyR"; version="2.1-1"; sha256="173n0cp0mq00y1ydba9m7l3izz04czg9vvadbflfinpi86wvcgq6"; depends=[]; }; prettyunits = derive { name="prettyunits"; version="1.0.0"; sha256="0lh83pf30hnqcq6ppq8axlyawp0qxpym0lqq8pchh3gq8mgcdz1h"; depends=[magrittr assertthat]; }; prevR = derive { name="prevR"; version="2.9"; sha256="1h0v52pwhrb9ib61wjqdcand5prc1h205nd2rl5qiiqcnq4xn582"; depends=[sp gstat GenKern rgdal fields]; }; -prevalence = derive { name="prevalence"; version="0.3.0"; sha256="0hg4vpw89pyx2i9za3zg666kyi016sn4jpbk2sp0s435fzqp74dp"; depends=[rjags coda]; }; +prevalence = derive { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[rjags coda]; }; prim = derive { name="prim"; version="1.0.15"; sha256="008a8fm4as5b6j70xxwiipywhbg1wmdbgjz9r7qfnivcpfarxv7f"; depends=[rgl misc3d]; }; primer = derive { name="primer"; version="1.0"; sha256="0vkq794a9qmz9klgzz7xz35msnmhdaq3f91lcix762wlchz6v7sg"; depends=[deSolve lattice]; }; primerTree = derive { name="primerTree"; version="1.0.1"; sha256="068j5a2rh8f1h1y7rv2xacnvkn2darzvp1adhi3hqkmwsb3znhjk"; depends=[directlabels gridExtra ggplot2 XML ape httr lubridate plyr scales stringr foreach]; }; @@ -5151,7 +5226,7 @@ princurve = derive { name="princurve"; version="1.1-12"; sha256="19fprwpfhgv6n6a prinsimp = derive { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; }; prob = derive { name="prob"; version="0.9-5"; sha256="05skjqimzhnk99z864466dc8qx58pavrky320il91yqyr8b98j8b"; depends=[combinat fAsianOptions hypergeo VGAM]; }; probFDA = derive { name="probFDA"; version="1.0"; sha256="0aqg3f9n1c30wiqml556xmdcv9yr8rijqvymqk89jdzfc0ri25gh"; depends=[MASS]; }; -probemod = derive { name="probemod"; version="0.1"; sha256="1i7hsnnwi20afhfzwmqyh1p7la71sqk49pb0wma80850psdzycdn"; depends=[]; }; +probemod = derive { name="probemod"; version="0.2.1"; sha256="1cgjr03amssc9rng8ky4w3abhhijj0d2byzm118dfdjzrgmnrf9g"; depends=[]; }; probsvm = derive { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; }; prodlim = derive { name="prodlim"; version="1.5.1"; sha256="0qjyx4i66cahiqjqff63ljwxdig4lvfs2asxnhkgylwn2kb3lygv"; depends=[survival KernSmooth lava]; }; profdpm = derive { name="profdpm"; version="3.3"; sha256="07lhjavrx4fa5950w928mfpddmmnmvdapl5n6mv49m8h3bxs4nmy"; depends=[]; }; @@ -5187,9 +5262,9 @@ pspearman = derive { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9 pspline = derive { name="pspline"; version="1.0-16"; sha256="170apwfv2lbf2rggzzynrf9vi2mr0y15sm4zy8djxxpzv217iaf7"; depends=[]; }; pssm = derive { name="pssm"; version="1.0"; sha256="1af5zvznh04vz5psbmq3xxclm2zh4gl4gxi1ps6aqmiqjpm57dwq"; depends=[MASS abind numDeriv MHadaptive]; }; psy = derive { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; }; -psych = derive { name="psych"; version="1.5.1"; sha256="18nlxv15dh16326jj754bclrp6nnaiw04jsklshm8i2p3m5nzr4k"; depends=[mnormt]; }; +psych = derive { name="psych"; version="1.5.4"; sha256="04n0rfr7i5yhr5ph0fdp9yrmc8m2i4zbf7bh5pvx7s7lfs08z84a"; depends=[mnormt]; }; psychometric = derive { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme multilevel nlme]; }; -psychomix = derive { name="psychomix"; version="1.1-1"; sha256="0p3kidbsmfm09s7c3p8nlj069wcyln1cxmjmj5nj7f618c407zyf"; depends=[flexmix psychotools lattice Formula modeltools]; }; +psychomix = derive { name="psychomix"; version="1.1-2"; sha256="0kah36ps9d0dr594vfk9fy2ag2grknjjgvmkf9vzm0ny52cisc72"; depends=[flexmix psychotools lattice Formula modeltools]; }; psychotools = derive { name="psychotools"; version="0.4-0"; sha256="17qwlxj00i0aqwf39hwr6mmxa6jy0j6dxfrp9p1xskbgi5cnvslk"; depends=[]; }; psychotree = derive { name="psychotree"; version="0.15-0"; sha256="08mq4gssrhydn106zm6xxwb1kk43hdzw6jqclx1ya0g8xfri2rrd"; depends=[partykit psychotools Formula]; }; psyphy = derive { name="psyphy"; version="0.1-9"; sha256="1ndc6sy662wj2qfx7r97crlqjd8fdkfvfy59qmf34bcbzbg33riz"; depends=[]; }; @@ -5218,6 +5293,7 @@ qPCR_CT = derive { name="qPCR.CT"; version="1.1"; sha256="19j41fsd2m7p2nxi2h2mj4 qVarSel = derive { name="qVarSel"; version="1.0"; sha256="13x2hnqjsm0ifzmqkkl9ilhykrh80q04lhlkkp06hkysmh5w9rkx"; depends=[lpSolveAPI Rcpp Rcpp]; }; qat = derive { name="qat"; version="0.73"; sha256="1fff4sv1n3i0gfgj83sy4pygxalifdycm27hsw51r72n86049cdc"; depends=[ncdf XML gdata moments boot fields gplots]; }; qcc = derive { name="qcc"; version="2.6"; sha256="0bsdgpsqvkz2w1qanxwx8kvrpkpzs9jgw8ml2lyqhmhqbxyg125r"; depends=[MASS]; }; +qclust = derive { name="qclust"; version="1.0"; sha256="0cxkk4lybpawyqmy5j6kkpgm0zy0gyn3brc1mf9jv8gmkl941cp3"; depends=[mclust mvtnorm]; }; qcr = derive { name="qcr"; version="0.1-18"; sha256="16dfda3rwivsdhp7j5izzbk2rzwfabfmxgpq4kjc4h7r90n2vly2"; depends=[qcc]; }; qdap = derive { name="qdap"; version="2.2.0"; sha256="0lbc38x4gvh6q2sb6d524ksfhpvxm8knfy85bmwbf6d3q4s0b6q4"; depends=[ggplot2 qdapDictionaries qdapRegex qdapTools RColorBrewer chron dplyr gdata gender gridExtra igraph NLP openNLP plotrix RCurl reports reshape2 scales stringdist tm venneuler wordcloud xlsx XML]; }; qdapDictionaries = derive { name="qdapDictionaries"; version="1.0.5"; sha256="1nk432nyw4srz92zsikv830dpjxflrrgjhq5va6pd3ifpy3nzdrw"; depends=[]; }; @@ -5226,12 +5302,12 @@ qdapTools = derive { name="qdapTools"; version="1.1.0"; sha256="0k3mvcjj2fg2v3z8 qdm = derive { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; }; qgraph = derive { name="qgraph"; version="1.3.1"; sha256="1wmpsgmzl9qg4vjjjlbxqav3ck7p26gidsqv3qryx56jx54164wg"; depends=[psych ellipse lavaan sem plyr Hmisc igraph jpeg png colorspace Matrix sna corpcor reshape2 ggplot2 glasso huge fdrtool d3Network ggm gtools]; }; qgtools = derive { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[Matrix MASS]; }; -qicharts = derive { name="qicharts"; version="0.1.1"; sha256="1aisbm9h7jdzkgnfh679wi5hfzxw1asgr62z7l51zk9yw7p7mjaw"; depends=[lattice latticeExtra]; }; +qicharts = derive { name="qicharts"; version="0.1.3"; sha256="1f9flcz4w5s6rahk2bkddwjwba72q8himgaqdgza8phaksdzm58v"; depends=[lattice latticeExtra]; }; qiimer = derive { name="qiimer"; version="0.9.2"; sha256="08625hz2n7yk9zk1k9sa46n2ggbw5qs0mlqkmzyjjh3qlnb1354a"; depends=[pheatmap]; }; -qlcMatrix = derive { name="qlcMatrix"; version="0.9.2"; sha256="1d8953bj69d0nia3qh3s1djf9m7wkvfdxqd234026gh1d3qchkr2"; depends=[Matrix]; }; +qlcMatrix = derive { name="qlcMatrix"; version="0.9.4"; sha256="1nkk712h9nnaqshw766mvk72w6gq9abyry4q1a0ghn0naq3gyl0s"; depends=[Matrix slam]; }; qlspack = derive { name="qlspack"; version="2.2"; sha256="0b9sqvnvldhd8vymajrbql0vn70rml13jgsq5ihm6skzq5qms7y6"; depends=[geepack]; }; qmap = derive { name="qmap"; version="1.0-3"; sha256="1c7qvmd5whi446nzssqvhz1j2mpx22nlzzdrcql84v18ry0dr18m"; depends=[fitdistrplus]; }; -qmethod = derive { name="qmethod"; version="1.3.0"; sha256="1c3ifay92rff0k3cfpm9nq81mj91s157iqd0wx89b9bx5zr4d58x"; depends=[psych GPArotation digest knitr xtable]; }; +qmethod = derive { name="qmethod"; version="1.3.1"; sha256="01yj8fr6d615lydb7111lb9qhkg1c6xy8gp2225as53mzbsc890i"; depends=[psych GPArotation digest knitr xtable]; }; qmrparser = derive { name="qmrparser"; version="0.1.5"; sha256="0sl9n42j0dx9jqz5vv029ra6dyrg9v7mvdlya8ps3vyd6fjhwh0z"; depends=[]; }; qpcR = derive { name="qpcR"; version="1.4-0"; sha256="029qhncfiicb3picay5yd42g6qi0x981r6mgd67vdx71cac9fp59"; depends=[MASS minpack_lm rgl robustbase Matrix]; }; qqman = derive { name="qqman"; version="0.1.2"; sha256="024ln79hig5ggcyc3466r6y6zx2hwy2698x65cha5zpm51kq1abs"; depends=[]; }; @@ -5239,9 +5315,10 @@ qqtest = derive { name="qqtest"; version="1.0"; sha256="12hw4d2gddb4fgdi986pyqgv qrLMM = derive { name="qrLMM"; version="1.1"; sha256="1yg9ph6jy0sn4d82vn4v7yy3mqczbnzsq8qqp9dw38vh2456rmf2"; depends=[nlme matrixcalc mvtnorm ghyp quantreg psych]; }; qrNLMM = derive { name="qrNLMM"; version="1.0"; sha256="0vlinc3bggapff29dyz14vn122gy6aq3rp38v2bpnxfkbpj10lvy"; depends=[matrixcalc mvtnorm ghyp quantreg psych ald]; }; qrfactor = derive { name="qrfactor"; version="1.4"; sha256="0f02lh8zrc36slwqy11x03yzfdy94p1lk5jar9h5cwa1dvi5k8gm"; depends=[mvoutlier mgraph pvclust cluster maptools]; }; -qrng = derive { name="qrng"; version="0.0-1"; sha256="1pi8cy6sxgqdnsgm1ygrg6s7mx7fxqc9l9s8b94ia91z3xq1yn9m"; depends=[]; }; +qrng = derive { name="qrng"; version="0.0-2"; sha256="0rs4dggvrlc3bi0wgkjw8lhv4b3jpckcfkqzsaz0j46kf6vfgfw1"; depends=[]; }; qrnn = derive { name="qrnn"; version="1.1.2"; sha256="01wsz9qcdiayi7gsyy2y09jyyapanyhlc4pdyman2f7z5nl9yv9i"; depends=[]; }; qtbase = derive { name="qtbase"; version="1.0.4"; sha256="02yilvywkcqn3y9ayix18cgkwhi0gh69fl3fcw28fs2zxf1hqy75"; depends=[]; }; +qte = derive { name="qte"; version="1.0.1"; sha256="15y6n0c9jinfz7hmm107palgy8fl15bc71gw0bcd3bawpydkrq2w"; depends=[]; }; qtl = derive { name="qtl"; version="1.36-6"; sha256="1qn8fv0s2934pbds2962isr8y96s2k0jlh6y27rz21qlpryrbijb"; depends=[]; }; qtlDesign = derive { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; }; qtlbim = derive { name="qtlbim"; version="2.0.7"; sha256="0nm7ky5bkzhmfr41fs1pvl51i2df1fz11j55q74ma2wzki5adfps"; depends=[qtl lattice coda MASS]; }; @@ -5267,10 +5344,11 @@ quantregGrowth = derive { name="quantregGrowth"; version="0.3-0"; sha256="0iyqd4 quantspec = derive { name="quantspec"; version="1.0-3"; sha256="1g4arhhybw021dnz0imdfwwj328gc8yw75cgnnd00skdc402cfhk"; depends=[quantreg abind zoo snowfall Rcpp Rcpp]; }; questionr = derive { name="questionr"; version="0.4.3"; sha256="13mmmjxg9vkn53dp9hng330bkilzdf2zqisgs21ng08b6p9dv7n4"; depends=[shiny highr classInt htmltools]; }; queueing = derive { name="queueing"; version="0.2.4"; sha256="03zz5437bkai2bmk9hcwf09cmyrnbs2cxlafbcf1lp6iahj66il9"; depends=[]; }; +quickpsy = derive { name="quickpsy"; version="0.1.0"; sha256="1p1rhv69bh842r77dxn73l0k2lwa5vj2xc27m470pjygap2zaqv0"; depends=[boot DEoptim dplyr ggplot2 tidyr MPDiR]; }; quint = derive { name="quint"; version="1.0"; sha256="19dxrssy4dw7v3s4hhhy6yilbc7zb6pvcnh3mm1z6vv5a1wfr245"; depends=[partykit Formula rpart]; }; quipu = derive { name="quipu"; version="1.9.0"; sha256="1py1qpbwp2smr5di8b3zmzxxhchfmr5qfhqkdiqig28mcnqcmp5n"; depends=[agricolae stringr pixmap shiny xtable]; }; qvcalc = derive { name="qvcalc"; version="0.8-9"; sha256="1ysbsm65n05vypvvpsbdfbrb60gij50vsmybzi4405g5z2ds1j72"; depends=[]; }; -qwraps2 = derive { name="qwraps2"; version="0.1"; sha256="1wxviwn3kyz9wp1rf937yqbpvdnib4wsfsd5yws6lpl0y3jwxshb"; depends=[dplyr ggplot2]; }; +qwraps2 = derive { name="qwraps2"; version="0.1.1"; sha256="1kikw92i9l06rxwlnp2sa17wkd8xshryx1rbk4qjzf4yfgmgbkbd"; depends=[dplyr ggplot2]; }; r2d2 = derive { name="r2d2"; version="1.0-0"; sha256="1zl0b36kx49ymfks8rm33hh0z460y3cz6189zqaf0kblg3a32nsi"; depends=[KernSmooth MASS sp]; }; r2dRue = derive { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[rgdal sp matrixStats]; }; r2lh = derive { name="r2lh"; version="0.7"; sha256="1kkyjv9x2klrjnaaw4a16sxdfqmpp9s5mlclzlczlqjypbf2aa6d"; depends=[]; }; @@ -5281,7 +5359,7 @@ rAltmetric = derive { name="rAltmetric"; version="0.6"; sha256="0ym8p9rq64ig3vla rAverage = derive { name="rAverage"; version="0.4-13"; sha256="0yfy81p99a3cb31cagxdvby7l2hcc60g3mnfizd9nvgamdmw08sy"; depends=[]; }; rAvis = derive { name="rAvis"; version="0.1.2"; sha256="0m5dl8as0vmmsd3j0z0xwcpq55yfax42fa67qn4lsnaglyqmd4lm"; depends=[stringr XML RCurl scrapeR gdata scales rgdal maptools raster sp]; }; rBeta2009 = derive { name="rBeta2009"; version="1.0"; sha256="0ljzxlndn9ba36lh7s3k4biim2qkh2mw9c0kj22a507qbzw1vgnq"; depends=[]; }; -rCMA = derive { name="rCMA"; version="1.0.0"; sha256="16d3cdxiaq65lwbvq8wjcp89vrfdp9kwrdl2jy9fynsg0v2lasvp"; depends=[rJava]; }; +rCMA = derive { name="rCMA"; version="1.1"; sha256="0dswshg80hbgcib5x9w791sh71q5s4435q8sm9dh170v4ngbax0w"; depends=[]; }; rCUR = derive { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5vl7v2k1024f42f7526g2p2lx"; depends=[MASS Matrix lattice]; }; rCarto = derive { name="rCarto"; version="0.8"; sha256="08813l4xfahjyn0jv48q8f6sy402n78dqsg01192pxl2dfc2i9ry"; depends=[RColorBrewer maptools classInt]; }; rChoiceDialogs = derive { name="rChoiceDialogs"; version="1.0.6"; sha256="0lp8amdalirpsba44aa3r31xnhmi36qb9qf8f8gdxxbarpgprsbi"; depends=[rJava]; }; @@ -5301,6 +5379,7 @@ rJavax = derive { name="rJavax"; version="0.3"; sha256="0sv2fjinp4wmdfvcpgm4hv8v rJython = derive { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; }; rLTP = derive { name="rLTP"; version="0.1"; sha256="0dv8jj8rgcx4cbbs10sqdblcznxgm9ld5md922ghnka4ymar244m"; depends=[RCurl]; }; rLakeAnalyzer = derive { name="rLakeAnalyzer"; version="1.7.3"; sha256="1w9z0m8ddslsk4d9r8dm5npm1s8sqdjv11x0gc08awa77iwak4wh"; depends=[plyr]; }; +rLiDAR = derive { name="rLiDAR"; version="0.1"; sha256="1zm3c3xpxk1ll0cq589k1kf69wgn93qmaqkvpgcjib0ay35q7c7f"; depends=[spatstat sp deldir plyr raster geometry rgl bitops]; }; rLindo = derive { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; }; rNMF = derive { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[nnls knitr]; }; rNOMADS = derive { name="rNOMADS"; version="2.1.3"; sha256="1m2qbkqaninczs4v558vpzkiqh0rngkmpp9sk7y4k5j3g4x1jrpf"; depends=[rvest scrapeR stringr fields GEOmap MBA RCurl XML]; }; @@ -5326,6 +5405,7 @@ raincpc = derive { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rar rainfreq = derive { name="rainfreq"; version="0.3"; sha256="0985ck2bglg22gfj7m0hc7kpk0apljsbssf1ci99mgk47yi8fk9v"; depends=[RCurl SDMTools]; }; ramify = derive { name="ramify"; version="0.2.0"; sha256="1fn2r6mr461yp00z8c7f1wsyhz3ag13q6ckf84sj11rgg6jivzjj"; depends=[]; }; ramps = derive { name="ramps"; version="0.6-13"; sha256="1y7jaajzbf6d9xwr0rg0qr43l8kncgwbpfy5rpka90g3244v8nwz"; depends=[coda maps Matrix nlme fields]; }; +randNames = derive { name="randNames"; version="0.2"; sha256="0mgfwdbadfvxg1dp8aqp2c24lkhz3bi9ssmym4ns6xjq088l3ldh"; depends=[dplyr httr jsonlite]; }; randaes = derive { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; }; random = derive { name="random"; version="0.2.3"; sha256="1ljz54i73bzxh69v7xjklajcl526pdapr0jgdwd6prfilafhf618"; depends=[curl]; }; random_polychor_pa = derive { name="random.polychor.pa"; version="1.1.4-1"; sha256="1051v7krrawdqnhz9q01rsknp2i7iv82d370q7m9i9d9i8wfnpk5"; depends=[psych nFactors boot MASS mvtnorm sfsmisc]; }; @@ -5341,6 +5421,7 @@ randomizr = derive { name="randomizr"; version="0.2.2"; sha256="0g870sr8zjfl1dh3 randtests = derive { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; }; randtoolbox = derive { name="randtoolbox"; version="1.16"; sha256="03z4g2mmdywsgl95xbj80awirkgrghdk2kwhsh58p00aq4bpl5ff"; depends=[rngWELL]; }; rangeMapper = derive { name="rangeMapper"; version="0.2-8"; sha256="0bxb37gy98smypjj27r3dbd0vfyvaqw2p25qv07j3isykcn2pxpn"; depends=[RSQLite rgdal sp rgeos raster maptools lattice RColorBrewer classInt]; }; +rankdist = derive { name="rankdist"; version="0.3.1"; sha256="0812bw2bm9837lp5l6lwbhln61qb584f0nk2k7nc60m1ppsi0dw6"; depends=[Rcpp hash optimx Rcpp]; }; rankhazard = derive { name="rankhazard"; version="1.0"; sha256="1kylg8yjrixbv86i2ffhhn8f5shsj8kvi66k202ari0li92y7dsg"; depends=[survival]; }; rappdirs = derive { name="rappdirs"; version="0.3"; sha256="1yjd91h1knagri5m4djal25p7925162zz5g6005h1fgcvwz3sszd"; depends=[]; }; rapport = derive { name="rapport"; version="0.51"; sha256="1qn45nrcawr8d9pkdnpmm37dg31l28gfbnwjl62fs7y691187cqp"; depends=[lattice plyr pander yaml reshape]; }; @@ -5365,7 +5446,7 @@ rbmn = derive { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293 rbounds = derive { name="rbounds"; version="2.1"; sha256="1h334bc37r1vbwz1b08jazsdrf6qgzpzkil9axnq5q04jf4rixs3"; depends=[Matching]; }; rbugs = derive { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; }; rbundler = derive { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; }; -rcbalance = derive { name="rcbalance"; version="1.4"; sha256="00l2q8rivmsry5ahbbickv1y912bmydp52h371pzq3g08rzpqknb"; depends=[MASS plyr]; }; +rcbalance = derive { name="rcbalance"; version="1.5"; sha256="1lqxx9ghxnskl8sy26x03d8baw8kn78mlxbh1gjjkszx4y5bm4vl"; depends=[MASS plyr]; }; rcdd = derive { name="rcdd"; version="1.1-8"; sha256="09bb92rp44palx9dvc9pb0gdmb1g22289xjk8p9s918lalc6i9aw"; depends=[]; }; rcdk = derive { name="rcdk"; version="3.3.2"; sha256="02rlg3w8dbmag8b4z4wayh7xn61xc9g3647kxg91r0mvfhmrxl2h"; depends=[fingerprint rJava rcdklibs png iterators]; }; rcdklibs = derive { name="rcdklibs"; version="1.5.8.4"; sha256="0mzkr23f4d639vhxfdbg44hzxapmpqkhc084ikcj93gjwvdz903k"; depends=[rJava]; }; @@ -5381,8 +5462,9 @@ rdetools = derive { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdc rdrobust = derive { name="rdrobust"; version="0.80"; sha256="02adafhbjp259hbbbk32yllgn35xxim2mwn6yixv4wh5dgr974v6"; depends=[]; }; rdrop2 = derive { name="rdrop2"; version="0.6"; sha256="1yxg38v7r34f9rid5q6q1g9f30q3zc4dnkziyps3514l5dnbvk3j"; depends=[assertthat data_table dplyr httr jsonlite magrittr]; }; rdryad = derive { name="rdryad"; version="0.1.1"; sha256="0mqpkmwkznyxj0nn1v389p741dlc66dixcvljsn2rvg0q6p75fkj"; depends=[XML RCurl OAIHarvester ape gdata plyr stringr RJSONIO]; }; +reGenotyper = derive { name="reGenotyper"; version="1.2.0"; sha256="13g4fhj25kdk6wbl1hcabcaxcpv0dj0hj2l502wl1aywk1fvmy8m"; depends=[gplots zoo MatrixEQTL]; }; readBrukerFlexData = derive { name="readBrukerFlexData"; version="1.8.2"; sha256="1cagv6l29h3p87h7c2bgba23v2wxrs2kg4zg1dk046m2x11mwx3c"; depends=[]; }; -readGenalex = derive { name="readGenalex"; version="0.4.1"; sha256="02rdx5ya06wpn0r6709aw6f86hk2xivfvjq5mggmm4dmlzgkwg0x"; depends=[]; }; +readGenalex = derive { name="readGenalex"; version="1.0"; sha256="1lhfw8xbwnjhslriaxziw4dskmjfawz5g31h2yl9ds2nwvwhmdwi"; depends=[pegas]; }; readMLData = derive { name="readMLData"; version="0.9-7"; sha256="0l752j1jq37j9pdcsbmcb23b5l8fkfsbisfr3yjy3q4rxsphc7k6"; depends=[XML]; }; readMzXmlData = derive { name="readMzXmlData"; version="2.8"; sha256="0x5h3dh6fkc30m6gx6pzmrxr31s80d1qgpcakspjza53qn6fjb16"; depends=[base64enc digest XML]; }; readODS = derive { name="readODS"; version="1.4"; sha256="00xcas8y0cq3scgi9vlfkrjalphmd7bsynlzpy7izxa5w9b7x79f"; depends=[XML]; }; @@ -5422,7 +5504,7 @@ rehh = derive { name="rehh"; version="1.12"; sha256="0qqmh48vxi1yqf6ykfsi6wighly relSim = derive { name="relSim"; version="0.2-0"; sha256="0cqcp7r263sk874l17wz84mzm4b1dxbfbsk74937rcz1wfc623k5"; depends=[Rcpp Rcpp]; }; rela = derive { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; }; relaimpo = derive { name="relaimpo"; version="2.2-2"; sha256="1rxjg2yw2gyshaij98w83cshxwscnq3ql7bg13n7v4nbjsi1l6zh"; depends=[MASS boot survey mitools corpcor]; }; -relations = derive { name="relations"; version="0.6-4"; sha256="02pzyygz4jnv91v90xkldplcwsbd4z5rbmyldlgjdlbpacs3chna"; depends=[cluster slam sets]; }; +relations = derive { name="relations"; version="0.6-5"; sha256="00apza97y3v9q95if4fm5w5f7fw1i091pz4avqs1v59kysahdj9h"; depends=[cluster slam sets]; }; relax = derive { name="relax"; version="1.3.15"; sha256="0cgvxw3pmy9kx8p81bb5n5nnbn6l9hm07k6hdy7p2j2gl15xxnpq"; depends=[]; }; relaxnet = derive { name="relaxnet"; version="0.3-2"; sha256="1l83rk7r4vkcxbfljmibzm8lzpx0vf406hv4h5cy9x0k3rz2bfh0"; depends=[glmnet]; }; relaxo = derive { name="relaxo"; version="0.1-2"; sha256="1rzmq7q3j271s6qwwrmwidv0vxcjpgjhyiqgr6fkczkai2lbnd8x"; depends=[lars]; }; @@ -5436,6 +5518,7 @@ remix = derive { name="remix"; version="2.1"; sha256="0s1gaf7vj08xd4m7lc9qpwvk0m remote = derive { name="remote"; version="0.3.0"; sha256="1f41j26grkv4830bvi6z16b63yksplrq3yg1amd4l634lwhp6x55"; depends=[Rcpp raster foreach Rcpp]; }; rentrez = derive { name="rentrez"; version="0.4.1"; sha256="1prpzfq5106f0r5z4ffjvs9qkmfaf67icj8k1wngqwmvl2wg88gq"; depends=[XML httr jsonlite]; }; repfdr = derive { name="repfdr"; version="1.1-3"; sha256="15f7x7vqwlpyzvzsybyz825a9dmglbrngjmajrsqlwffypgxjvi8"; depends=[]; }; +replicatedpp2w = derive { name="replicatedpp2w"; version="0.1-1"; sha256="0q6mfrdjpx6nh4xgr5i7ka3xvnx9585xdhni020q4pm05rhimid2"; depends=[spatstat]; }; replicationInterval = derive { name="replicationInterval"; version="0.3"; sha256="1zqs114514xj59dlkhw5kmq73grghmb3i5rnnq05qzgf5wjn581i"; depends=[MBESS]; }; repmis = derive { name="repmis"; version="0.4.2"; sha256="1pjf010h4rkrwarq541wh8x1267894fsdg8na41z8cp3hr5aql21"; depends=[data_table digest httr plyr R_cache]; }; repolr = derive { name="repolr"; version="2.0"; sha256="10wg07sfxcxzswf3zh5sx2cm9dxjx11zymy82a4q9awnacb5gp9b"; depends=[gee]; }; @@ -5446,6 +5529,7 @@ reporttools = derive { name="reporttools"; version="1.1.1"; sha256="0cnxzq679f86 repra = derive { name="repra"; version="0.4.2"; sha256="1djcs83z8ckpmsbyzscnysmy45z28kswzm852176b9pip21mb1w8"; depends=[data_table dplyr Rcpp reshape2 ggplot2 assertthat Rcpp]; }; represent = derive { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; }; reproducer = derive { name="reproducer"; version="0.1.2"; sha256="067yj1dhhikjrnkklsfp6p03gp4lqxwfdwhl6z8djj4rkzi48xm5"; depends=[openxlsx ggplot2 gridExtra]; }; +rerddap = derive { name="rerddap"; version="0.1.0"; sha256="1a58vsm1m9ybafda6pak0fa7kdfscslq9855a5r2x12bzqy98k4f"; depends=[httr dplyr data_table jsonlite xml2 digest ncdf]; }; resample = derive { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; }; resemble = derive { name="resemble"; version="1.1.1"; sha256="0mz5mxm6p1drfx2s9dx35m2bnvirr8lkjjh5b4vdk9p2cdv1qkkv"; depends=[RcppArmadillo foreach iterators pls Rcpp Rcpp RcppArmadillo]; }; reshape = derive { name="reshape"; version="0.8.5"; sha256="08jm9fb02g1fp9vmiqmc0yki6n3rnnp2ph1rk8n9lb5c1s390f4k"; depends=[plyr]; }; @@ -5460,7 +5544,7 @@ reutils = derive { name="reutils"; version="0.1.2"; sha256="0f2c6zxk6x2plq649b1m reval = derive { name="reval"; version="1.0"; sha256="14vzsg3azggfrm1cnrxigbhnpxpjifjf61r71hf73ggpspx2gj5r"; depends=[doParallel foreach]; }; revealedPrefs = derive { name="revealedPrefs"; version="0.2"; sha256="1f871y4wkjznzgwxfbnmrfiafq43cyf0i5hjy68ybxc7bbvfryxc"; depends=[Rcpp Rcpp RcppArmadillo]; }; reweight = derive { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; }; -rex = derive { name="rex"; version="0.2.0"; sha256="1q9dkk94w152naw1lpd2l2v08ikrfgilqx9v5z14dyqaascqbmva"; depends=[magrittr lazyeval]; }; +rex = derive { name="rex"; version="1.0.1"; sha256="1k1s5rx3lpyh6apakaf4mw94y72zkxf14c2kj0d9njhf5j6g1sdj"; depends=[magrittr lazyeval]; }; rexpokit = derive { name="rexpokit"; version="0.24.1"; sha256="143zi6qb0l8vbx87jf58v1zfxqmvv6x4im1knd6q4dpp9gffqs22"; depends=[SparseM Rcpp Rcpp]; }; rfPermute = derive { name="rfPermute"; version="1.6.2"; sha256="069dhv41bwyp2nywkrr2hihyz8zialhxlyzpfpq4r9lyjnamg2k9"; depends=[ggplot2 randomForest gridExtra]; }; rfUtilities = derive { name="rfUtilities"; version="1.0-1"; sha256="0y0jn4c5dpr9drjyjg2vsgsb37s0l284hvh35zm53hs8f881ycx3"; depends=[randomForest]; }; @@ -5468,7 +5552,7 @@ rfigshare = derive { name="rfigshare"; version="0.3.6"; sha256="1n6i5ppn3v93126g rfishbase = derive { name="rfishbase"; version="0.2-2"; sha256="09pa5zpw9rclf5pqj1wjjhdcblca9sm9xcs9ka3xfa7azj7n9ljd"; depends=[XML RCurl]; }; rfisheries = derive { name="rfisheries"; version="0.1"; sha256="1g0h3icj7cikfkh76yff84hil23rfshlnnqmgvnfbhykyr2zmk61"; depends=[httr data_table assertthat ggplot2 rjson]; }; rfoaas = derive { name="rfoaas"; version="0.1.3"; sha256="0wdb645fx2wsy4vwz43d8ynwx3divpjwbkql52zkikyr8zv21gz5"; depends=[httr]; }; -rfordummies = derive { name="rfordummies"; version="0.0-2"; sha256="01wbhn8wpwkwvkafx4m8l5zj2xjbvwjlzbnwkd4i7g2nrvw29wsx"; depends=[]; }; +rfordummies = derive { name="rfordummies"; version="0.1.1"; sha256="0k725wgba9132cfbm0ppgy476iyh9gcn6bdh9gjqab5sj3jb0iva"; depends=[]; }; rforensicbatwing = derive { name="rforensicbatwing"; version="1.3"; sha256="0ff4v7px4wm5rd4f4z8s4arh48hgayqjfpnni2997c92wlsq3d12"; depends=[Rcpp Rcpp]; }; rgabriel = derive { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; }; rgam = derive { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp Rcpp RcppArmadillo]; }; @@ -5480,22 +5564,23 @@ rgenoud = derive { name="rgenoud"; version="5.7-12"; sha256="17gzkn4laylnksy8h2w rgeos = derive { name="rgeos"; version="0.3-8"; sha256="0snbfxzh700fn415li0wia94zgb0x73vwdrbrpimvz9k3y43yvp8"; depends=[sp sp]; }; rgexf = derive { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[XML Rook igraph]; }; rggobi = derive { name="rggobi"; version="2.1.20"; sha256="1a7l68h3m9cq14k7y96ijgh0iz3d6j4j2anxg50pykz20lnykr9g"; depends=[RGtk2]; }; -rgl = derive { name="rgl"; version="0.95.1201"; sha256="0vd2zww17p2lcdipv7ijclbisy6ms6d1a4qnwpj1y1kbkhcplw1j"; depends=[]; }; +rgl = derive { name="rgl"; version="0.95.1247"; sha256="1zmb09lljng1dmwd23w5ld8z9wr0xd0s365vz54il0ndwrqfhsi1"; depends=[]; }; rglobi = derive { name="rglobi"; version="0.2.6"; sha256="042lc71j49bndlmcxmqdjly48qvqjpif7dgzk4cxsmbil5jmyzks"; depends=[rjson RCurl]; }; rgp = derive { name="rgp"; version="0.4-1"; sha256="1p5qa46v0sli7ccyp39iysn04yvq80dy2w1hk4c80pfwrxc6n03g"; depends=[emoa]; }; rgpui = derive { name="rgpui"; version="0.1-2"; sha256="0sh5wj4f2wj6g3r7xaq95q89n0qjavchi5kfi6sj1j34ykybbs3g"; depends=[rgp shiny emoa]; }; -rgr = derive { name="rgr"; version="1.1.10"; sha256="1gmr4px70dwz45zb4w1vqddqpw1idln2rids9cdh2fxppdf9m9x8"; depends=[MASS fastICA]; }; +rgr = derive { name="rgr"; version="1.1.11"; sha256="01hlj3nqzfsffr4k7d3iyp4mfqs1sy94d0scy64wh9kkplrzkh4i"; depends=[MASS fastICA]; }; rgrass7 = derive { name="rgrass7"; version="0.1-0"; sha256="19fwf3gaq25x3imj9kc1112cf9dhafp0d1gjly2xh2gz1kam5wl6"; depends=[sp XML]; }; rhosp = derive { name="rhosp"; version="1.06"; sha256="0kii29w292kffxablqnmgvl127jwsriz0p5y5d1xd6n8yzji79j3"; depends=[]; }; ri = derive { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; }; +riceware = derive { name="riceware"; version="0.2"; sha256="1rd64saags4s7nadpbi38h8m8mw6y44lmdi8vmg58mglkfcbqf32"; depends=[random]; }; rich = derive { name="rich"; version="0.3"; sha256="122xb729xlm8gyb7b3glw4sdvrh98wh89528kcbibpx83bp3frc0"; depends=[boot vegan permute]; }; ridge = derive { name="ridge"; version="2.1-3"; sha256="1i5klabnv328kgy7p11nwdid2x7hzl1j80yqqshbraladszyfpwk"; depends=[]; }; rinat = derive { name="rinat"; version="0.1.4"; sha256="1m5k1wcinm6is3mf86314scgy3xfifz7ly7il5zgqyg9jkkpywbz"; depends=[httr plyr jsonlite ggplot2 maps]; }; rindex = derive { name="rindex"; version="0.12"; sha256="1k9zihvrp955c4lh70zjlsssviy2app8w6mv5ln4nawackbz0six"; depends=[regtest]; }; ringbuffer = derive { name="ringbuffer"; version="1.1"; sha256="1jj6zdvqlkc30bnxapg0sjl5ci5kq76611smqc4jc8adzhzwrh3f"; depends=[]; }; ringscale = derive { name="ringscale"; version="0.1.2"; sha256="1gnnapkvxmkfws8dw41gj9h3svy3h6mi4zv413aykg9vrmy7d3rp"; depends=[FITSio]; }; -rio = derive { name="rio"; version="0.1.2"; sha256="0h80msbj1qcc9m4408qcckw238ydqdzzgr9frlmmc7qi4dyba4i4"; depends=[stringr foreign testthat]; }; -rioja = derive { name="rioja"; version="0.9-3"; sha256="0r164072g4mxq4lznvh72y5r6hnygmd6rwra9whn9s8p31w3g803"; depends=[vegan mgcv lattice gdata]; }; +rio = derive { name="rio"; version="0.2"; sha256="0v64zkxcs2bajdh9hqlhacc6msy7l3h31cvcxpj6in5hb3m1wfv3"; depends=[foreign haven openxlsx readODS jsonlite XML curl data_table readxl]; }; +rioja = derive { name="rioja"; version="0.9-5"; sha256="0bi80d8ffn1kgs0b45ia8rj057id8l3mnph16y5wc5nr8fndxrm4"; depends=[vegan mgcv lattice gdata]; }; ripa = derive { name="ripa"; version="2.0-2"; sha256="0n1gaga0d4bb9qdlm7gksa1nwi4y28kbgwr3icwqgihf1bfb9m81"; depends=[Rcpp Rcpp]; }; riskRegression = derive { name="riskRegression"; version="1.1.1"; sha256="1qjy2wmbfalbxszjfplisqrdca0n0yccr0wvdf1kbzxblba82mx6"; depends=[prodlim rms pec cmprsk survival randomForestSRC]; }; riskSimul = derive { name="riskSimul"; version="0.1"; sha256="0s2a1mn6g11m96gqscb916caj2aykcs3rkacpqcdnlyzryk1gsnb"; depends=[Runuran]; }; @@ -5520,7 +5605,7 @@ rlist = derive { name="rlist"; version="0.4"; sha256="00h00jka64m7skrjp1454805fh rlm = derive { name="rlm"; version="1.1"; sha256="147hn780hjbp8ly3mc5q05g36b080ndq0z0r0vq75c2qfkhybvdc"; depends=[]; }; rlme = derive { name="rlme"; version="0.4"; sha256="02683sklihj3726a90jryybf855rvbz9v3dm9z9yhb32q9bfmy34"; depends=[MASS quantreg nlme mgcv stringr magic robustbase Rcpp Rcpp]; }; rmaf = derive { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; }; -rmarkdown = derive { name="rmarkdown"; version="0.5.1"; sha256="08v16n4a9rdr0fh54hlmfxifbpl40nfr24g3wrjxxacml16smcsd"; depends=[knitr yaml htmltools caTools]; }; +rmarkdown = derive { name="rmarkdown"; version="0.6.1"; sha256="1j6hz7ybyvqzd5zdshb9z1v5y5gfgdlcvzacx06c5kgf8h6i0k3h"; depends=[knitr yaml htmltools caTools]; }; rmatio = derive { name="rmatio"; version="0.11.0"; sha256="0cmlh16nf3r94gpczq0j46g4dgjy9q1c647rqd9i14hvfrpxzcfa"; depends=[Matrix lattice]; }; rmeta = derive { name="rmeta"; version="2.16"; sha256="1s3n185kk0ddv8v6c7mbc7cpj6yg532r7is6pjf9vda7317rxywy"; depends=[]; }; rmetasim = derive { name="rmetasim"; version="2.0.4"; sha256="1a3bhiybzdvgqnnyh3d31d6vdsp4mi33sv8ks9b9xd9r369npk86"; depends=[ape ade4 gtools]; }; @@ -5529,7 +5614,7 @@ rminer = derive { name="rminer"; version="1.4"; sha256="07s971fpl16l4ryrbb24zwy1 rmngb = derive { name="rmngb"; version="0.6-1"; sha256="1wyq8jvzqpy1s6w0j77ngh5x2q7mpj0ib01m8mla20w6yr6xbqjk"; depends=[Hmisc]; }; rmongodb = derive { name="rmongodb"; version="1.8.0"; sha256="035a76ak6wi21hdvgzzbggz0qnb53rrr2wfx97ngc8ijwhw8hjh7"; depends=[jsonlite plyr]; }; rmp = derive { name="rmp"; version="1.0"; sha256="1g0785fwjbwbj82sir3n7sg3idsjzdhrpxc7z88339cv9g4rl7ry"; depends=[]; }; -rms = derive { name="rms"; version="4.3-0"; sha256="135mrl7jv310l8w1nxaa5rsvib7j27sbdxz0bi1xxi5zywb8cmf4"; depends=[Hmisc survival lattice ggplot2 gridExtra SparseM quantreg nlme rpart polspline multcomp]; }; +rms = derive { name="rms"; version="4.3-1"; sha256="07198lzk3yzl9vnqcfxqgp5kpb50s1ydg33m883rcr3a5pd9m094"; depends=[Hmisc survival lattice ggplot2 SparseM quantreg nlme rpart polspline multcomp]; }; rms_gof = derive { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; }; rnaseqWrapper = derive { name="rnaseqWrapper"; version="1.0-1"; sha256="1fa3hmwrpccf09dlpginl31lcxpj5ypxspa0mlraynlfl5jrivch"; depends=[ecodist gplots gtools]; }; rnbn = derive { name="rnbn"; version="1.0.3"; sha256="05amrx12b7p4pca1wbysn1n2rxbg5r54mpmga4i3xlpijx9baj80"; depends=[httr]; }; @@ -5541,7 +5626,7 @@ rngtools = derive { name="rngtools"; version="1.2.4"; sha256="1fcgfqrrb48z37xgy8 rngwell19937 = derive { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; }; rnoaa = derive { name="rnoaa"; version="0.3.3"; sha256="12iwyl0nr6d8xpl5vcqwli4rlh79y8l13sfj34457klqdzmrg126"; depends=[httr lubridate plyr ggplot2 scales sp RCurl rgdal rgeos maptools stringr XML data_table jsonlite digest]; }; rnrfa = derive { name="rnrfa"; version="0.1.5"; sha256="0lpa0gmf9j9adq0p41jgayzcwg6220bihnsfqj55d217mfalbhnd"; depends=[XML2R RCurl zoo rjson rgdal sp stringr]; }; -robCompositions = derive { name="robCompositions"; version="1.9.0"; sha256="0kplw0zlszfarkhsk2hrakf649c3sl1ig8l8xhknj1v2qwkblbx2"; depends=[robustbase rrcov GGally MASS pls]; }; +robCompositions = derive { name="robCompositions"; version="1.9.1"; sha256="1n8mbm62ywp1wnccv85ydm91bzp05i4fjvyriid8751pcb4zndn9"; depends=[robustbase rrcov GGally MASS pls sROC]; }; robcor = derive { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; }; robeth = derive { name="robeth"; version="2.7"; sha256="03pnwd3xjb9yv8jfav0s4l9k5pgpampp15ak7z0yvkjs20rvfq3d"; depends=[]; }; robfilter = derive { name="robfilter"; version="4.1"; sha256="161rsqyy2gq1n6ysz0l4d4gqvxhs72hznc2d5hljxdaz3sbdzzig"; depends=[robustbase MASS lattice]; }; @@ -5567,7 +5652,7 @@ ror = derive { name="ror"; version="1.2"; sha256="0n8mk35rm3rp0c7a3i961kij21a177 rorutadis = derive { name="rorutadis"; version="0.1.3"; sha256="0ik0dpmsyb4g9wl1fb7mm0dry9s26nfvv1v91cslss82phhf16wd"; depends=[Rglpk ggplot2 gridExtra]; }; rotations = derive { name="rotations"; version="1.3"; sha256="01qqiqlp370llk8w9g0nip08cd54rj9dsvf0qxznalyb7vpnvgxf"; depends=[ggplot2 Rcpp rgl sphereplot Rcpp RcppArmadillo]; }; roughrf = derive { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[randomForest mice nnet]; }; -rowr = derive { name="rowr"; version="1.1.1"; sha256="1bpx9vd6i2ljwww3gp4c1fxbv9lsdxh3jdwkmrqqj2s18bkf0a7a"; depends=[]; }; +rowr = derive { name="rowr"; version="1.1.2"; sha256="1hvj17n3fy1jaaz551s1icjv1kgr2s22xvg4fllzs8hpgdsybp1j"; depends=[]; }; roxygen2 = derive { name="roxygen2"; version="4.1.1"; sha256="0qr562p3jb9kqim6mj344956pikmq1137gv1p086b4k90h5c3wyd"; depends=[stringr brew digest Rcpp Rcpp]; }; royston = derive { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[nortest moments]; }; rpanel = derive { name="rpanel"; version="1.1-3"; sha256="1wm0dcbyvxz4ily8skz2yda44n74x2nmc4pg11ja0yvk038gjfns"; depends=[]; }; @@ -5579,8 +5664,8 @@ rpartitions = derive { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16x rpf = derive { name="rpf"; version="0.44"; sha256="1q68lb7cw4p31mrjwxyn2bkpclmgfcnln8z0brs9pkkh70j0vii8"; depends=[mvtnorm RcppEigen]; }; rpg = derive { name="rpg"; version="1.4"; sha256="0sisn5l1qxlqg6jq4lzr7w3axkaw5jlpz8vl9gp2hs0spxsjhcyn"; depends=[Rcpp uuid RApiSerialize Rcpp RApiSerialize]; }; rphast = derive { name="rphast"; version="1.6"; sha256="0ni8969bj3pv0wl8l0v352pqw2d5mlshsdw1rb6wlxk7qzfi5cl2"; depends=[]; }; -rplexos = derive { name="rplexos"; version="0.13"; sha256="149y0y0qb18igg4pc0i27vfpwcvfvg24ixqrqcya5xvdrm1h63aj"; depends=[Rcpp dplyr RSQLite DBI data_table lubridate reshape2 stringi assertthat doParallel foreach Rcpp]; }; -rplos = derive { name="rplos"; version="0.4.6"; sha256="01vfb07fc5z0pm6d5wvcpfwjx5fha9par3fpra9v6snaqm74l3w5"; depends=[ggplot2 httr jsonlite XML dplyr plyr lubridate reshape2 whisker solr]; }; +rplexos = derive { name="rplexos"; version="1.0"; sha256="129izg9ipn2pfm4yq0lg597nn9rcxr8m9yslmra85jmzbisc1vfw"; depends=[Rcpp dplyr RSQLite DBI data_table lubridate reshape2 stringi assertthat doParallel foreach Rcpp]; }; +rplos = derive { name="rplos"; version="0.4.7"; sha256="0d6p6cgjmfv615mpvp6vxm92gxfdi6fn4mp0ixhj2gkm1hmpwwc5"; depends=[ggplot2 httr jsonlite XML dplyr plyr lubridate reshape2 whisker solr]; }; rplotengine = derive { name="rplotengine"; version="1.0-5"; sha256="1wwpfnr5vi8z26alm8y5gply0y4iniagimldzy2z696djzz8p8p8"; depends=[xtable]; }; rportfolios = derive { name="rportfolios"; version="1.0"; sha256="1zcv5ddmk15l0p03nlffimlhhpcc7l1c05xl2d1xlfk58rkvqns6"; depends=[]; }; rprintf = derive { name="rprintf"; version="0.1-2"; sha256="1jsn6i3ikcdbrg8g89hmb1ky3a84fykx5gpnbswplhidh2qhb9jz"; depends=[stringr]; }; @@ -5602,7 +5687,7 @@ rsatscan = derive { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl rscala = derive { name="rscala"; version="1.0.4"; sha256="05pgyzin0d5lfz5rjf0c0j7b2zj7b8r1blgd126kjlvjkj1spy84"; depends=[]; }; rscproxy = derive { name="rscproxy"; version="2.0-5"; sha256="1bjdv7drlnffcnyc0j8r22j7v60k1xj58bw8nk9l8wvnmngrjz86"; depends=[]; }; rsdepth = derive { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; }; -rsdmx = derive { name="rsdmx"; version="0.4-5"; sha256="12rk0bcfsnkd2447jyc40857ksm7gbg4nn3slls9wsd641am6kxi"; depends=[XML RCurl plyr]; }; +rsdmx = derive { name="rsdmx"; version="0.4-6"; sha256="0hsf0jkp31qfvl4pxaqxwz1fvwgmqld3rnbk9g29g5bqwld40syc"; depends=[XML RCurl plyr]; }; rseedcalc = derive { name="rseedcalc"; version="1.2"; sha256="1di9bzwxyxm9gs14ks9z6sixi656hz9xwmq3aaqh53cjjr1ka0rc"; depends=[]; }; rsem = derive { name="rsem"; version="0.4.5"; sha256="02vccj03bxisi2jwl31rwi4gw9i26g70aagdgg5gk8z0bys78v4d"; depends=[MASS lavaan]; }; rsgcc = derive { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene stringr snowfall]; }; @@ -5637,6 +5722,7 @@ rv = derive { name="rv"; version="2.3.1"; sha256="0bjqwk7djl625fws3jlzr1naanwmrf rvHPDT = derive { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; }; rvTDT = derive { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; }; rvalues = derive { name="rvalues"; version="0.3"; sha256="0fkf0gngrx1rfa67blzf3xxjwhlp2m2jplxw3z3j9vgl6ray0nqs"; depends=[]; }; +rversions = derive { name="rversions"; version="1.0.0"; sha256="0k9v77bpxbxxmf5bdansg074zx3cm4hhaw6vl9f6c58xzxl567nf"; depends=[RCurl XML]; }; rvertnet = derive { name="rvertnet"; version="0.2.2"; sha256="14afdf0mflpa2arxdy44y8mak9j3cg2cgk97idd7k4pi8vf6q0jg"; depends=[plyr jsonlite httr data_table ggplot2 maps]; }; rvest = derive { name="rvest"; version="0.2.0"; sha256="1bg9l0wzh9xs7rpacl8s6q33hkjvv85vsl8079qsri0lr856wni7"; depends=[httr XML selectr magrittr]; }; rvgtest = derive { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; }; @@ -5646,7 +5732,7 @@ rwt = derive { name="rwt"; version="1.0.0"; sha256="112wp682z4gkxsd3bqnlkdrh42bf ryouready = derive { name="ryouready"; version="0.3"; sha256="0nms3zfkis2fsxkyj3dr95vz3kk6pkm7l5ga7iz8pxy1ywrawj2i"; depends=[stringr car]; }; rysgran = derive { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[soiltexture lattice]; }; rzmq = derive { name="rzmq"; version="0.7.7"; sha256="0gf8gpwidfn4756jqbpdbqsl8l4ahi3jgavrrvbbdi841rxggfmx"; depends=[]; }; -s20x = derive { name="s20x"; version="3.1-15"; sha256="1l635mgqr95n2is56q34ahd0fpiymsdqbrmqf8vaa15spnfqcrwn"; depends=[]; }; +s20x = derive { name="s20x"; version="3.1-16"; sha256="10z19q28wv3jnrs8lhban4a6hxqxgivcalq633p3hpa4zhw7nsj7"; depends=[]; }; s2dverification = derive { name="s2dverification"; version="2.1.1"; sha256="1m3m5sbq96fhnl4slxgb2j0009kqfdivdn3nbb203pc0knjpflnq"; depends=[GEOmap geomapdata maps mapproj]; }; s4vd = derive { name="s4vd"; version="1.0"; sha256="07pnkhyqf9iymj913813d93dmb3iqbdlcl0gsgacihyyinb4id5s"; depends=[biclust]; }; sBF = derive { name="sBF"; version="1.1.1"; sha256="0dankakl4rwl9apl46hk57ps4mvn2l1crw4gdqds26fc8w6f6rab"; depends=[]; }; @@ -5666,7 +5752,7 @@ safeBinaryRegression = derive { name="safeBinaryRegression"; version="0.1-3"; sh safi = derive { name="safi"; version="1.0"; sha256="1km58w57kdmyfj4a97zhnjcka4q4pxm8r2br01qq2niaihpbzp98"; depends=[]; }; sampSurf = derive { name="sampSurf"; version="0.7-2"; sha256="1bj1m5c8bx8i4jyk6kdgcfmgfj15iirxwg259r0c4fk7whcnfz59"; depends=[sp raster rasterVis boot]; }; sampleSelection = derive { name="sampleSelection"; version="1.0-2"; sha256="1hzvvwvqp6v9d6ldm17kx3g8pbgngw2pxklny0b3man47zh5jshc"; depends=[maxLik miscTools systemfit Formula]; }; -samplesize4surveys = derive { name="samplesize4surveys"; version="2.1.0"; sha256="08vs1b4rwyd4yh3y2l1gkh8wpjhh2w52929p6b0sfj0iywp2dr03"; depends=[TeachingSampling]; }; +samplesize4surveys = derive { name="samplesize4surveys"; version="2.4.0.900"; sha256="199g2gsbv1w1acn7nnlv2wbrhq7lc1mx8vvs1w9a9a8dkxdmml0g"; depends=[TeachingSampling]; }; sampling = derive { name="sampling"; version="2.6"; sha256="11r8p29kwc0ggycbv7sm1zmazmfm4p5207l764ad4znjib0cab6p"; depends=[MASS lpSolve]; }; samplingEstimates = derive { name="samplingEstimates"; version="0.1-3"; sha256="1srdchlpxksfdqhf5qdvl7nz0qsxkxww7hzqj0q71asbzlq3am3p"; depends=[samplingVarEst]; }; samplingVarEst = derive { name="samplingVarEst"; version="0.9-9"; sha256="04wgsq3sh69iy8p07ch210p22n5mds7cxp5s6zggzamqpf0hpnw7"; depends=[]; }; @@ -5677,7 +5763,6 @@ sandwich = derive { name="sandwich"; version="2.3-3"; sha256="1x2x0yxlrhdfyhk6jw sanitizers = derive { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; }; sanon = derive { name="sanon"; version="1.4"; sha256="0zg0paiz3rb0fk2mgi8rlzqy9vq3afy5vx6s15k1xqz8rjgsbd1x"; depends=[]; }; sapa = derive { name="sapa"; version="2.0-1"; sha256="11xgd2ijfz5yn0zyl5gfy97h2cxi1vyxkrijy2s9b78wm7fzpnkv"; depends=[ifultools splus2R]; }; -saps = derive { name="saps"; version="1.0.0"; sha256="02si76ckinkm4ajclq4isy6gi0cf1mwfrq3w17i5gflbfqmf2qvj"; depends=[survival reshape2]; }; sas7bdat = derive { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; }; saturnin = derive { name="saturnin"; version="1.0"; sha256="0686c0y6dcnr8jcx26pd4g08hmlalbid6idg465pngshr57kl79k"; depends=[]; }; saves = derive { name="saves"; version="0.5"; sha256="1b4mfi2851bwcp0frx079h5yl6y1bhc2s8ziigmr8kwy1y1cxw10"; depends=[]; }; @@ -5709,8 +5794,8 @@ scrm = derive { name="scrm"; version="1.5.0-1"; sha256="176k3qmlfs1cj8gm421p3hiv scrypt = derive { name="scrypt"; version="0.1.0"; sha256="1hc1rziigwggdx2pvklldkw88mdzbwa8b8a2a0ip4cm1w6flsl9n"; depends=[Rcpp Rcpp]; }; scuba = derive { name="scuba"; version="1.7-0"; sha256="11mdc8pj552ag36ib4sfbjv8r0psa6wnb13spz0v3rbaslz25hpw"; depends=[]; }; sda = derive { name="sda"; version="1.3.6"; sha256="1igdkgpxlni4d8h5k912aikbd66jqkabzq144xlgd2vp3kcbw4ly"; depends=[entropy corpcor fdrtool]; }; -sdcMicro = derive { name="sdcMicro"; version="4.4.0"; sha256="0ig43sdzn940mpv2d8v1v0k77nb5mwwsy8amkb6vdxs0rql7qvyy"; depends=[brew knitr data_table xtable car robustbase cluster MASS e1071 Rcpp sets Rcpp]; }; -sdcMicroGUI = derive { name="sdcMicroGUI"; version="1.1.1"; sha256="0icxxbfxl65da07bpi7l2jzk85y990ndhl60lwyp077sjq5rd20q"; depends=[sdcMicro gWidgetsRGtk2 cairoDevice vcd foreign Hmisc]; }; +sdcMicro = derive { name="sdcMicro"; version="4.5.0"; sha256="1cz34g6si7f8kgybcvcsr0lkcspqp3vrkvfqsfdjd0mb8lv5pbjj"; depends=[brew knitr data_table xtable car robustbase cluster MASS e1071 Rcpp sets Rcpp]; }; +sdcMicroGUI = derive { name="sdcMicroGUI"; version="1.2.0"; sha256="0bhrpric17y1ljm18a00i6bkxfq1cpljfkib8qbb4jyj5s50f3ps"; depends=[sdcMicro gWidgetsRGtk2 gWidgets cairoDevice vcd foreign Hmisc]; }; sdcTable = derive { name="sdcTable"; version="0.18.0"; sha256="13k96ahz6vzvbnvca18p0r1pv9k6sdmxbq04cf76an7r2g4w6kji"; depends=[stringr Rcpp Rglpk lpSolveAPI data_table Rcpp]; }; sdcTarget = derive { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[magic foreach doParallel tuple]; }; sddpack = derive { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; }; @@ -5718,7 +5803,7 @@ sde = derive { name="sde"; version="2.0.13"; sha256="194dkwrww9win5chhlffjv1xkhp sdef = derive { name="sdef"; version="1.5"; sha256="1xmx3nfjjfh6zw1vq7iip4rnshh40azja83xyvnz04jcv574vhxm"; depends=[]; }; sdmvspecies = derive { name="sdmvspecies"; version="0.3.1"; sha256="1rpbj55598862vb4bwrvcbskm10xibsvx58fpvkn58zbm6ab2534"; depends=[GPArotation ggplot2 psych raster]; }; sdnet = derive { name="sdnet"; version="2.03.3"; sha256="1884pil3brm7llczacxda6gki501ddyc5m8ggqjix64kbvw37slv"; depends=[]; }; -sdprisk = derive { name="sdprisk"; version="1.0-3"; sha256="0v490zz2c1qa0w9nfd0xs5xbbvd9g8vp39fp8x7k7cy598vby4yx"; depends=[numDeriv PolynomF rootSolve]; }; +sdprisk = derive { name="sdprisk"; version="1.1-0"; sha256="03nbvrrgzcnczj1zsnqakjy278bg15vva6yb35clks5zyipl0qdk"; depends=[numDeriv PolynomF rootSolve]; }; sdtoolkit = derive { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; }; sdwd = derive { name="sdwd"; version="1.0.1"; sha256="1df8xx538ba3axi0jbkvyrdl7qnmkvh1x15kh57jmw3qbpf5gh56"; depends=[Matrix]; }; seacarb = derive { name="seacarb"; version="3.0.6"; sha256="0xhyy8nd20f29j9y3x250fq8qp57gdv61gg4ck24v4jbl8qvwhla"; depends=[oce]; }; @@ -5726,12 +5811,12 @@ sealasso = derive { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2 searchable = derive { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; }; seas = derive { name="seas"; version="0.4-3"; sha256="1n0acg6fvaym4nx1ihw0vmb79csds0k4x9427qmcyxbl9hxxmllp"; depends=[]; }; season = derive { name="season"; version="0.3-5"; sha256="08f382kq51r5g9p5hsnjf17dwivhx1vfgmmwp1vzmbqx1drlqkzx"; depends=[ggplot2 MASS mgcv survival coda]; }; -seasonal = derive { name="seasonal"; version="0.80.0"; sha256="06rwbvzgxrhqldni59qq0xzky4qzlkrx088i9qgs99id8ypbvvc5"; depends=[]; }; +seasonal = derive { name="seasonal"; version="0.90.0"; sha256="0r5l69vl0lqi9hdxi90wx22v38p3izwx3cn124awzlak49i2qn0l"; depends=[]; }; seawaveQ = derive { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[survival NADA lubridate]; }; secr = derive { name="secr"; version="2.9.4"; sha256="0g7j68ys9dd8rz1y8wsmy3lwwxpwwkps6wpx67l86lzz99nwh64g"; depends=[abind MASS nlme sp mgcv raster]; }; secrdesign = derive { name="secrdesign"; version="2.3.0"; sha256="1f5swggkky721z0js2jr1gb3mrx9h6qlld70bjd86x9f73s9cm0n"; depends=[secr abind]; }; secrlinear = derive { name="secrlinear"; version="1.0.5"; sha256="084d0spshf3lh1m50kyb0r8x9lz4yrfj6b7snywffxhqyjw147hf"; depends=[secr sp igraph maptools MASS]; }; -seedy = derive { name="seedy"; version="1.0"; sha256="1p9mbnkgdz3rlaj5ygaai81g8kvs68y4zcgf7745gr17vflys8kf"; depends=[]; }; +seedy = derive { name="seedy"; version="1.2"; sha256="1m800b2faaih4xjsl3jwrqd177jjygbvrf9mb1h84hdzy095b5c0"; depends=[]; }; seeg = derive { name="seeg"; version="1.0"; sha256="1d45vl075p4qbd74gpaa8aw1h82p9n633fym10yp9bmcv4gwksg6"; depends=[car spatstat sgeostat]; }; seem = derive { name="seem"; version="1.0"; sha256="0cjdi9c89bqvrx9gzxph958cfqicc1qfnzsair0gvsk3cxsrw6bf"; depends=[]; }; seewave = derive { name="seewave"; version="1.7.6"; sha256="1sh2i9hb8v0awhczvkj803lmdvg5p1fla685xb3s2a3if1q5zc5i"; depends=[fftw tuneR]; }; @@ -5763,7 +5848,7 @@ sensitivitymw = derive { name="sensitivitymw"; version="1.1"; sha256="1bknnfkkqg sensory = derive { name="sensory"; version="1.0"; sha256="0mfjj3lsx5i8bc8ikhqwycmfryzg9vd64m6ahqjf6xva7bj5h1v6"; depends=[Matrix gtools MASS]; }; separationplot = derive { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; }; seqCBS = derive { name="seqCBS"; version="1.2"; sha256="1kywi3kvvl9y6nm7cwf6fj8gz9gzznp5va336g1akzgy77k82d8v"; depends=[clue]; }; -seqDesign = derive { name="seqDesign"; version="1.0.2"; sha256="0v4g4r9y79vqf4i2r96y6wgjf2aww98k06rk3lpr4cz1yp5x3gvx"; depends=[survival xtable]; }; +seqDesign = derive { name="seqDesign"; version="1.1"; sha256="1694swd8ik9fbiflmnw4xpq82kq18rqzkw0dv5pvq30c47xjgamv"; depends=[survival xtable]; }; seqMeta = derive { name="seqMeta"; version="1.5"; sha256="1igag08qkfvkx83w6jjyfmjpxil9wvag1yfnxp3pqbglj9l99pmn"; depends=[survival Matrix coxme CompQuadForm]; }; seqPERM = derive { name="seqPERM"; version="1.0"; sha256="1i8ai4gxybh08wxjh96m6xlqxhh7ch0xihjs879snmy4zqfi0pap"; depends=[]; }; seqRFLP = derive { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; }; @@ -5778,17 +5863,18 @@ servr = derive { name="servr"; version="0.2"; sha256="0gah99snaj8lk5zfzbxi3jwvpn sesem = derive { name="sesem"; version="1.0.1"; sha256="0s4xkv6bc5nxhj09mk9agnj11b9h7swccs9jrn4lg3fy12vqhf5a"; depends=[lavaan mgcv gplots]; }; session = derive { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; }; setRNG = derive { name="setRNG"; version="2013.9-1"; sha256="02198cikj769yc32v8m2qrv5c01l2fxmx61l77m5ysm0hab3j6hs"; depends=[]; }; -sets = derive { name="sets"; version="1.0-13"; sha256="1ys17iy2gjkfnp3914g6sfx3ilgm18pdfak59cqrwalwwnhc3zaz"; depends=[]; }; +sets = derive { name="sets"; version="1.0-14"; sha256="1wfg4yc3p7zqcj2z3lb5knv6l3lw4pf20s3rkpz4yj4nsb41zs4g"; depends=[]; }; settings = derive { name="settings"; version="0.2.1"; sha256="0dxnysa3857d141rk46pyfkbgzk6ms3fhb2bz0y41jy72bdhxmrm"; depends=[]; }; setwidth = derive { name="setwidth"; version="1.0-3"; sha256="1s6m24kmkafscgibgfldm70m57bv4gs0m7fdki18nwdi1rvwpkbf"; depends=[]; }; severity = derive { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; }; sfa = derive { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; }; sfsmisc = derive { name="sfsmisc"; version="1.0-27"; sha256="16hkm0ylwipc1zqsi8fiwyqvl9hpjgl7kyvgamibxlbp1y669qgm"; depends=[]; }; sft = derive { name="sft"; version="2.0-7"; sha256="1fq1b32f08i4k9bv4hh7rhk1jj7kgans6dwh1bmawaqkchyab3jr"; depends=[fda]; }; -sgPLS = derive { name="sgPLS"; version="1.1"; sha256="09nf9qqhlddcgp2y44lxgva9vy3dgbmw1hbl0phw95wb8b9p1m0s"; depends=[mixOmics]; }; +sgPLS = derive { name="sgPLS"; version="1.2"; sha256="1q3pf4sfh8l2qwxm0qd3sg29kvvprpcyis0afbcjhvfr10w91xpw"; depends=[mixOmics]; }; +sgd = derive { name="sgd"; version="0.1"; sha256="16jqzshkg1n1azyfjadyg454ar0hk2dmw9ba1wrn6rh7mxsngik6"; depends=[Rcpp MASS Rcpp RcppArmadillo BH]; }; sgeostat = derive { name="sgeostat"; version="1.0-25"; sha256="04zl932s6zb26r42h2l8qf3d43bmrq67281mrkh4spn4vcddv5da"; depends=[]; }; sglOptim = derive { name="sglOptim"; version="1.0.122.1"; sha256="0ld53rdxai85r9hwz9jrsxr08lxin0ksxa6823r7cr96w18c1ssm"; depends=[Matrix Rcpp RcppProgress RcppArmadillo BH]; }; -sglasso = derive { name="sglasso"; version="1.1-1"; sha256="0qfpnvk5r9a0ri2zxgv75qc46dnaf4193f3m32hvq3lmynx3cyjg"; depends=[Matrix]; }; +sglasso = derive { name="sglasso"; version="1.2"; sha256="1y2ms6p792klzmy3prhsyanlbp7n004di9hscma7ih3jx9703wsr"; depends=[Matrix igraph]; }; sglr = derive { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; }; sgof = derive { name="sgof"; version="2.2"; sha256="087f4nbx9ppzi5za3f4w4msq2gd3r08v16fihppa30nqydg3ssbj"; depends=[poibin]; }; sgr = derive { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; }; @@ -5806,10 +5892,12 @@ shinyFiles = derive { name="shinyFiles"; version="0.6.0"; sha256="08cvpvrsr1bh0y shinyRGL = derive { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; }; shinyTree = derive { name="shinyTree"; version="0.2.2"; sha256="08n2s6pppbxn23ijp6vms609p4qwlmfh9g0k5hdfqsqxjrz1nndi"; depends=[shiny]; }; shinybootstrap2 = derive { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; }; +shinydashboard = derive { name="shinydashboard"; version="0.4.0"; sha256="0my1bz983ncnvljhz6d25q9bqc510q9dgl9wzcg8c0civyjaps39"; depends=[shiny htmltools]; }; +shinyjs = derive { name="shinyjs"; version="0.0.3.3"; sha256="1fgydm8ai0fvfqbwlkj27pa3nl242kb3xiai50lrda0ssqbrnw67"; depends=[shiny]; }; shinythemes = derive { name="shinythemes"; version="1.0.1"; sha256="0wv579cxjlnd7wkfqzy2x3qk7d1abql1nhw10rx1c4c808vsylkw"; depends=[shiny]; }; shopifyr = derive { name="shopifyr"; version="0.28"; sha256="1ypqgiqimdwj9fjy9ykk42rnkipb4cvdxy5m9z9jklvk5a7cgrml"; depends=[RCurl R6 RJSONIO]; }; shotGroups = derive { name="shotGroups"; version="0.6"; sha256="0khcgzli6114yqrglmsvhr8rwkkkwdkd06b50isbc24vpv6xbfx9"; depends=[boot coin CompQuadForm energy KernSmooth mvoutlier robustbase]; }; -showtext = derive { name="showtext"; version="0.3"; sha256="1spbrzjasd0ljipbf45iar7b0vksla93iajypfbq2ndwyid3yzj4"; depends=[sysfonts showtextdb]; }; +showtext = derive { name="showtext"; version="0.4-1"; sha256="1c2wd107g2xg8khlad5vimwj7wdxk7b7i2k1ydkkd7b47c6d9zhh"; depends=[sysfonts showtextdb]; }; showtextdb = derive { name="showtextdb"; version="1.0"; sha256="14iv5nyc9wszy1yhbggk7zs042kv10lwk92pn9751hfws53yq6hf"; depends=[sysfonts]; }; shp2graph = derive { name="shp2graph"; version="0-2"; sha256="09gbb7f9h3q2p56dwb2813mr36115ah70szq47jimpymzkd2x08m"; depends=[maptools igraph]; }; shrink = derive { name="shrink"; version="1.2.0"; sha256="0r207mj57kjn6wfmz4f2l4wmbz7g1pvj96gpl0s76vkdjzbh1l47"; depends=[survival MASS rms]; }; @@ -5826,7 +5914,7 @@ signal = derive { name="signal"; version="0.7-4"; sha256="0sz8im7i46qy5wjpm34a2n signal_hsmm = derive { name="signal.hsmm"; version="1.2.1"; sha256="0nxhksvwkidmp5x27hxmwxbv747lrwa19b4vi6dx72hny8prgvpc"; depends=[biogram seqinr shiny]; }; simFrame = derive { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[Rcpp lattice Rcpp]; }; simMSM = derive { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[survival mvna]; }; -simPH = derive { name="simPH"; version="1.3"; sha256="1hazh1flag3n7mrab9agc6nmiii0amdcxlbgzadiwpgyrdbdhkjn"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv reshape2 stringr survival quadprog]; }; +simPH = derive { name="simPH"; version="1.3.1"; sha256="1i4sqaiiy77a4c3aq52d0ddn3abkkqgjh5sxj2v459gck5fd9rgs"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv reshape2 stringr survival quadprog]; }; simPop = derive { name="simPop"; version="0.2.9"; sha256="1vi2jab57aqf1jyf87vrybz5qbhv7wdjhsm963z3cpyva2bj0i60"; depends=[lattice vcd data_table laeken MASS Rcpp e1071 nnet doParallel foreach colorspace Rcpp]; }; simSummary = derive { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind svUnit gdata]; }; simTool = derive { name="simTool"; version="1.0.3"; sha256="1x018p5mssrhz2ghs3ly9wss12503h93gl7zk0mqh1bcrzximh0k"; depends=[plyr reshape]; }; @@ -5837,6 +5925,7 @@ simecol = derive { name="simecol"; version="0.8-6"; sha256="0h48klfwk0836byncqn9 simex = derive { name="simex"; version="1.5"; sha256="01706vbmfgcg13w1kq8v5rnk5xggbd1n7fv50c6bvhdyc1dly313"; depends=[]; }; simexaft = derive { name="simexaft"; version="1.0.7"; sha256="13w9m35qrrp8kkz4gqp7fg9jv8fs99y19n21bdxsd3f5mlkbvqgl"; depends=[mvtnorm survival]; }; simone = derive { name="simone"; version="1.0-2"; sha256="071krim64s7fjwvwq7bjr0pw33mw9am9wpyypcy4gs7g1hj8wcir"; depends=[mixer]; }; +simpleNeural = derive { name="simpleNeural"; version="0.1.1"; sha256="0rm6kvz1mppvgcvwsgg3nz6ci37l95ins64g0jh4rw6lfmy0grjc"; depends=[]; }; simpleboot = derive { name="simpleboot"; version="1.1-3"; sha256="1qprjisfflhzg8ll12p3q1zcfdiyc45glic2j9cw9nhx5rb065fk"; depends=[boot]; }; simplexreg = derive { name="simplexreg"; version="1.0"; sha256="144kljh968i7n2d21r4204i4h952mfrkfc8b5r6x760msgjphxvh"; depends=[Formula plotrix]; }; simrel = derive { name="simrel"; version="1.0-1"; sha256="0905rjqh8c08vyg090h0i7sx89vdryignslldzfz2r5yrszl4ga8"; depends=[FrF2 sfsmisc]; }; @@ -5845,14 +5934,14 @@ simsem = derive { name="simsem"; version="0.5-8"; sha256="1kir1c0g5xb4gzmpvx13qp siplab = derive { name="siplab"; version="1.1"; sha256="1b5drhla4p7n1y1cp7kqwqzw0b286kgij9j6wsks5vjgy5qfal1x"; depends=[spatstat]; }; sirad = derive { name="sirad"; version="2.0-7"; sha256="009icj1jil757vvsf88sgmdz40swrx1qvrhnx7wwj7p3dlh78pvw"; depends=[zoo ncdf RNetCDF raster]; }; sirt = derive { name="sirt"; version="1.5-0"; sha256="0mj6j336b4kzd2fsy3nha66r88cyfnq70cgfld36p9izlxlq6l7x"; depends=[TAM CDM Rcpp mirt lavaan qgraph semPlot combinat ic_infer sfsmisc sm psych pbivnorm gtools igraph coda mvtnorm MASS Matrix Rcpp RcppArmadillo]; }; -sisVIVE = derive { name="sisVIVE"; version="1.0"; sha256="1y6zq8dp5k9mx83x6fryjh0h5f5wyry1cbi33rj3h7sss8vi3vz0"; depends=[lars]; }; +sisVIVE = derive { name="sisVIVE"; version="1.1"; sha256="1p1l07pgd88ap3bp0zwinnzda07pfg6cn92ync2pkqn5l0gmfxbs"; depends=[lars]; }; sisus = derive { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[MASS RColorBrewer coda gdata gtools moments polyapost rcdd]; }; -sitar = derive { name="sitar"; version="1.0.1"; sha256="1ji8742f518fzg8xz0dy5irwdz7a0nymajh69zd2l53yvcsnlwdp"; depends=[nlme]; }; +sitar = derive { name="sitar"; version="1.0.2"; sha256="0z9r3z512s0gpkcpdbi45qdl40rp4jacpm9k0c5pjilwiga6p07z"; depends=[nlme quantreg]; }; sitools = derive { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; }; sivipm = derive { name="sivipm"; version="1.0-0"; sha256="1r548kfsi90rzisx37nw3w9vwj3gs4ck5zhwlskbdzgigb78spfp"; depends=[seqinr]; }; -sjPlot = derive { name="sjPlot"; version="1.7"; sha256="0kk9isz105y6m83vk6x6c7i55kch51w2a4l8nlc44ffbm8zwqqa1"; depends=[ggplot2 MASS car foreign psych scales dplyr tidyr]; }; +sjPlot = derive { name="sjPlot"; version="1.8"; sha256="10hbm76qrlbcl384vfp9gkhlkxpvic8iq3l0k97pb7pv8k4482mx"; depends=[car dplyr ggplot2 MASS psych scales sjmisc tidyr]; }; sjdbc = derive { name="sjdbc"; version="1.5.0-71"; sha256="0i9wdfadfcabayq78ilcn6x6y5csazbsgd60vssa2hdff0ncgvk1"; depends=[rJava]; }; -sjmisc = derive { name="sjmisc"; version="1.0.0"; sha256="1hzh39az30xhda3jvah8lldd42fm8ipc6kqyzh2pq2dhwkbnhns4"; depends=[MASS]; }; +sjmisc = derive { name="sjmisc"; version="1.0.1"; sha256="1a8i355jzp77d8ngyyyiw12yx2ppc2drh3qxs2n4b361vxcq8p6m"; depends=[MASS]; }; skatMeta = derive { name="skatMeta"; version="1.4.3"; sha256="0bknv066ya4yl4hl4y02d9lglq2wkl9c2j1shzg3d64dg4sjvbak"; depends=[Matrix coxme survival CompQuadForm]; }; skda = derive { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; }; skewt = derive { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; }; @@ -5890,7 +5979,7 @@ smoothmest = derive { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h smoothtail = derive { name="smoothtail"; version="2.0.3"; sha256="0yr3j5mq1h9pd72kyi9z6wzly9cqkscim814yi710y79l03gp0fd"; depends=[logcondens]; }; sms = derive { name="sms"; version="2.3"; sha256="0grxyp590hj2rvw1fw3yidzkl8nqqp5a14bp9xfpdph2nyas61qq"; depends=[doParallel foreach]; }; smss = derive { name="smss"; version="1.0-1"; sha256="17a0x92hxzn212yiz87n7ssyi3bdhnyawxk1kkmk46q1ss22a1pm"; depends=[]; }; -sn = derive { name="sn"; version="1.2-0"; sha256="05n1kns8p1l7v87k3rxzgcz1vphq38cah7w01xq2bgcnklx677n8"; depends=[mnormt numDeriv]; }; +sn = derive { name="sn"; version="1.2-1"; sha256="0sqmabksvv13adf521mbzbi76dgbxc37xppjw4vwzmp4x6d8h0jf"; depends=[mnormt numDeriv]; }; sna = derive { name="sna"; version="2.3-2"; sha256="1dmdv1bi22gg4qdrjkdzdc51qsbb2bg4hn47b50lxnrywdj1b5jy"; depends=[]; }; snapshot = derive { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; }; snht = derive { name="snht"; version="1.0.2"; sha256="1rs9q8fmvz3x21ymbmgmgkqr7hqf3ya3xb33zj31px799jlldpb9"; depends=[ggplot2 gridExtra mgcv zoo plyr reshape]; }; @@ -5907,14 +5996,15 @@ snplist = derive { name="snplist"; version="0.13"; sha256="1v9n3gdvygx4s6hlm0ijy sns = derive { name="sns"; version="1.0.0"; sha256="0qr5gj095xg48mqj7maz1m1zizx1jdjca8qygygqvak1b7nl4ccs"; depends=[mvtnorm coda]; }; soc_ca = derive { name="soc.ca"; version="0.7.1"; sha256="0lg1bpbd0crywa29xc79cn3kr614wq4hr09xpwk17nv7q8qw8cnh"; depends=[ggplot2 gridExtra ellipse scales]; }; softImpute = derive { name="softImpute"; version="1.4"; sha256="07cxbzkl08q58m1455i139952rmryjlic4s2f2hscl5zxxmfdxcq"; depends=[Matrix]; }; -softclassval = derive { name="softclassval"; version="1.0-20130317"; sha256="1ifqm4a3xxi9wd4l1q4l5h4q5f8hp0k28mqpszzj8k1czbph88ql"; depends=[arrayhelpers]; }; +softclassval = derive { name="softclassval"; version="1.0-20150416"; sha256="1zrf0nmyy4pfs4dzardghzznw1ahl21w4nykfh2pp8il4dpi21fs"; depends=[arrayhelpers svUnit]; }; soil_spec = derive { name="soil.spec"; version="2.1.4"; sha256="129iqr6fdvlchq56jmy34s6qc2j5fcfir6pa5as5prw0djyvbdv0"; depends=[pls KernSmooth wavelets hexView sp GSIF]; }; -soilDB = derive { name="soilDB"; version="1.5-2"; sha256="1xiiprshh40qkx23wxd20rd7bsbwgw03pa0hv8m6q64pri7v8xq0"; depends=[aqp plyr Hmisc RCurl XML sp]; }; -soilphysics = derive { name="soilphysics"; version="2.2"; sha256="02x0xn8126g8g86nsqkj3qwabd9lkayra30ac3pbg0yn38kipz4d"; depends=[rpanel MASS]; }; +soilDB = derive { name="soilDB"; version="1.5-4"; sha256="1n8ybryrg88m12qb6bwiqs04dxgbs4nv8ay27d2vi0xrkqhs99k2"; depends=[aqp plyr Hmisc RCurl XML sp]; }; +soilphysics = derive { name="soilphysics"; version="2.3"; sha256="1d64jaw5ra1l0za2kpigqfdf52a5zrxy9j9g2g7f5yffqsp0jwb5"; depends=[rpanel MASS]; }; soilprofile = derive { name="soilprofile"; version="1.0"; sha256="0sdfg6m2m6rb11hj017jx2lzcgk6llb01994x749s0qhzxmvx9mb"; depends=[aqp lattice munsell splancs]; }; soiltexture = derive { name="soiltexture"; version="1.2.19"; sha256="0nw72913qb1hpifjqv0s1z5sxhgavhbalqhjczxg8b66fwqzrs7l"; depends=[sp MASS]; }; soilwater = derive { name="soilwater"; version="1.0.1"; sha256="08rz1i5dsgwfvfd4sl5x9j970v82v3kny0rqg1zbdnr53vp2xc7j"; depends=[]; }; -solaR = derive { name="solaR"; version="0.38"; sha256="0cvza0d4kd47kr6749ysvw664kjja87ppn4jvan4hrklczbpdc9z"; depends=[lattice latticeExtra zoo]; }; +solaR = derive { name="solaR"; version="0.41"; sha256="003f8dka0jqlfshzc3d4z9frq5jb5nq6sw3sm44x7rj79w3ynpyg"; depends=[zoo lattice latticeExtra RColorBrewer]; }; +solarius = derive { name="solarius"; version="0.2.3"; sha256="164va71v77b0lyhccgrb47idhi7dlgyyw1vbs2iqci77ld6x50yl"; depends=[plyr ggplot2 data_table]; }; solr = derive { name="solr"; version="0.1.4"; sha256="0b1f6mf8fi2ql8j06b0mkk7nyy5wj1zsg46lfxi6bp8n4ywbym9n"; depends=[plyr httr XML assertthat rjson]; }; som = derive { name="som"; version="0.3-5"; sha256="01xsysmqj0zhzifqpwcrs0mflh56ndv4q3nm5n5imx7wmzx2lrzp"; depends=[]; }; soma = derive { name="soma"; version="1.1.1"; sha256="1mc1yr9sq9h2z60v40aqmil0xswj5hgxfdh4racq297qw3a97my4"; depends=[reportr]; }; @@ -5928,14 +6018,15 @@ sortinghat = derive { name="sortinghat"; version="0.1"; sha256="1wrxwhdp3gj1ra0r sorvi = derive { name="sorvi"; version="0.7.20"; sha256="1cd0lg74lfdbkp314i40asc3vshs1acb20wz1cxzg62vyz6ia055"; depends=[reshape ggplot2 plyr RColorBrewer XML]; }; sos = derive { name="sos"; version="1.3-8"; sha256="0vcgq8hpgdnlmkxc7qh1jqigr0gvm9x3w4ijbhma7x4i5fx3c2il"; depends=[brew]; }; sos4R = derive { name="sos4R"; version="0.2-11"; sha256="0r4lficx8wr0bsd510z4cp6la32xf928rsiznbywpxghnypsrcgg"; depends=[XML RCurl sp]; }; -sotkanet = derive { name="sotkanet"; version="0.9.03"; sha256="1h8jmwv99hcrl5hkd99ypphvl8hx6k765vb8aphzp8a0vh42pkl1"; depends=[ggplot2 rjson]; }; -soundecology = derive { name="soundecology"; version="1.2"; sha256="0vxnkqn9ibz1il687rn5fygyl9hrqbf646r1kwdiksw3qz6a16r2"; depends=[pracma oce ineq vegan tuneR seewave]; }; +sotkanet = derive { name="sotkanet"; version="0.9.10"; sha256="0nshd6caxxayr7w39d6ildz42aarr3ff8iyfpwjd544yhblkj7jh"; depends=[ggplot2 RCurl rjson]; }; +soundecology = derive { name="soundecology"; version="1.3"; sha256="1kcmsas359xcwqd0lxffr5p996jikqdag6idibq57qb6rnz3hgfz"; depends=[pracma oce ineq vegan tuneR seewave]; }; source_gist = derive { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; }; -sp = derive { name="sp"; version="1.0-17"; sha256="02j0q2b0i7j4p7i5l19n4dq92iv7dspwwg3jx2qkv3481p5dq25q"; depends=[lattice]; }; +sp = derive { name="sp"; version="1.1-0"; sha256="1lnc1vlxw15wk69hh7c26dc7vxydyxwi8rfpwrpn9wj4pm0hp8a5"; depends=[lattice]; }; sp23design = derive { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; }; spBayes = derive { name="spBayes"; version="0.3-9"; sha256="1zdyz5jqbixwj59q9f1x8f3knz0jwdfl0abj0w6cxrllkb38yg10"; depends=[coda magic abind Formula]; }; spBayesSurv = derive { name="spBayesSurv"; version="1.0.2"; sha256="0pxndjksrd22p60pvc4czxwqhrpx5ik0yr23nz7kmg6wnp36hc6w"; depends=[Rcpp survival coda Rcpp RcppArmadillo]; }; spMC = derive { name="spMC"; version="0.3.6"; sha256="0h71m55jmv80kx5ccsrpsakrh4qw5f3kx2qizwi10jlybwggqv0m"; depends=[]; }; +spTest = derive { name="spTest"; version="0.1.0"; sha256="0asfgf0dx72025q41ndzgwm2n471lwha7bcc1dfk3zwib75w3lgl"; depends=[]; }; spThin = derive { name="spThin"; version="0.1.0"; sha256="06qbk0qiaw7ly1ywbr4cnkmqfasymr7gbhvq8jjbljm0l69fgjpp"; depends=[spam fields knitr]; }; spTimer = derive { name="spTimer"; version="2.0-0"; sha256="0ldby68p4y5cz5dj2m33jcbgd3mw9nv0py4llg8aj10bxylarmfv"; depends=[coda sp]; }; spa = derive { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; }; @@ -5944,7 +6035,7 @@ spaa = derive { name="spaa"; version="0.2.1"; sha256="0qlfbfvv97avbnixm5dz9il3dm space = derive { name="space"; version="0.1-1"; sha256="1qigfz62xz47hqi43aii3yr4h7ddvaf11a5nil7rqprgkd0k6mv3"; depends=[]; }; spaceExt = derive { name="spaceExt"; version="1.0"; sha256="0lp8qmb7vcgxqqpsi89zjy7kxpibg3x2mq205pjmsrbbh7saqzr4"; depends=[limSolve glasso]; }; spacejam = derive { name="spacejam"; version="1.1"; sha256="1mdxmfa1aifh3h279cklm4inin0cx3h0z2lm738bai34j6hpvar7"; depends=[igraph Matrix]; }; -spacetime = derive { name="spacetime"; version="1.1-3"; sha256="04myzza2av2sr6g75dlklr3nv36hr3frvafphzn278vbhma777d9"; depends=[sp zoo xts intervals lattice]; }; +spacetime = derive { name="spacetime"; version="1.1-4"; sha256="1amxdjjqxibllwnb70chqmfnn66n95yf0wjmbrkjnzjszhbb25q2"; depends=[sp zoo xts intervals lattice]; }; spacodiR = derive { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[picante colorspace Rcpp Rcpp]; }; spacom = derive { name="spacom"; version="1.0-4"; sha256="1jfsbgy7b0mwl4n2pgrkkghx9p8b0wipvg4c5jar6v8ydby6qg94"; depends=[spdep foreach iterators lme4 nlme Matrix]; }; spam = derive { name="spam"; version="1.0-1"; sha256="033s5ka05kg97fmc3l1li3z6x5225rwhrdxh57wwn4axrjwy1nyy"; depends=[]; }; @@ -5953,7 +6044,7 @@ sparc = derive { name="sparc"; version="0.9.0"; sha256="0jsirrkmvrfxav9sphk8a4n5 sparcl = derive { name="sparcl"; version="1.0.3"; sha256="1348pi8akx1k6b7cf4bhpm4jqr5v8l5k086c7s6rbi5p6qlpsrvz"; depends=[]; }; spareserver = derive { name="spareserver"; version="1.0.0"; sha256="0vaql5v3337xh1ifjziav3v7fkjff4zhrz557mgy75ham554gs7c"; depends=[assertthat pingr httr]; }; spark = derive { name="spark"; version="1.0.0"; sha256="0ryc7kq3hx8nd5m999p1y7lxli6x862y6hqpv8xwpqak0y863p6m"; depends=[magrittr]; }; -sparkTable = derive { name="sparkTable"; version="0.12.0"; sha256="1q0wz090db9ff46k9w6wk1qk20yr527ilg2ply4qcw3zjydk8cc5"; depends=[Cairo gridExtra ggplot2 shiny Rglpk xtable StatMatch boot pixmap RGraphics]; }; +sparkTable = derive { name="sparkTable"; version="1.0.0"; sha256="1d5vv7whayblq5g4pjrngkqf3d1pi4f0gibnskllv7rdad10n4nd"; depends=[Cairo gridExtra ggplot2 shiny Rglpk xtable StatMatch boot pixmap RGraphics]; }; sparktex = derive { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; }; sparr = derive { name="sparr"; version="0.3-6"; sha256="1imgph2bf575rm06l4vsz0nhizkrwa3p5j6b6gdn30l0hlhxjp0j"; depends=[spatstat rgl MASS]; }; sparseBC = derive { name="sparseBC"; version="1.1"; sha256="1w60n2875n809lbrn0hd4kdmsyfd64aikgzxchza8b59x77l0psy"; depends=[glasso fields]; }; @@ -6019,7 +6110,7 @@ splusTimeSeries = derive { name="splusTimeSeries"; version="1.5.0-73"; sha256="1 spnet = derive { name="spnet"; version="0.9.0.6"; sha256="1kbf53ww2wdr2nsml9zhzd80dhi48izw1nwjszv9jqidd6nk7v29"; depends=[sp shape]; }; spocc = derive { name="spocc"; version="0.2.4"; sha256="0hhjdx3vgzfwf368pvmapgb5hll659mwkyzvgagvzz90sm44134a"; depends=[ggplot2 rgbif rinat rbison ecoengine rebird AntWeb ggmap maptools rworldmap sp rgeos lubridate RColorBrewer httr rgdal leafletR whisker gistr]; }; sporm = derive { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; }; -sprex = derive { name="sprex"; version="1.0"; sha256="0m0v0db01a3zd934ini60hqnkc6cfyj8hbsxp2xvw06lblg46dzh"; depends=[]; }; +sprex = derive { name="sprex"; version="1.1"; sha256="1lwkdi8g1dlfdnxxvspgpz6f5h2gml176xhfrcxa9gcy3y9rlcpm"; depends=[]; }; sprint = derive { name="sprint"; version="1.0.7"; sha256="1yzx1qjpxx9yc0hbm1mmha5b7aq13iflq66af597b7yj6abm7zjp"; depends=[rlecuyer ff randomForest boot e1071]; }; sprinter = derive { name="sprinter"; version="1.1.0"; sha256="12v4l4fxijh2d46yzs0w4235a8raip5rfbxskl0dw7701ryh7n8g"; depends=[CoxBoost survival GAMBoost randomForestSRC LogicReg]; }; sprm = derive { name="sprm"; version="1.1"; sha256="0xnbdnzgf54r93bvnyjcdcqlr0q7s7f2cvayw681zi0ig3z633j0"; depends=[ggplot2 cvTools reshape2 pcaPP]; }; @@ -6043,16 +6134,17 @@ sse = derive { name="sse"; version="0.5-4"; sha256="126dc4gk0hynwfz887d3wdcs7xac ssfit = derive { name="ssfit"; version="1.1"; sha256="1fais0msi2ppgfp0vbx3qri7s9zs51i7n90w36xkwwac4f46bq5y"; depends=[survey]; }; ssh_utils = derive { name="ssh.utils"; version="1.0"; sha256="08313zzzgcyvzkrkq0w0yf748ya1a9shx5xnan5891v0lah9v0b1"; depends=[stringr]; }; ssize_fdr = derive { name="ssize.fdr"; version="1.2"; sha256="0y723lwsnmk3rxbhlsrny9hiy07a5p255ygy9qkj6mri64gk1hby"; depends=[]; }; +ssizeRNA = derive { name="ssizeRNA"; version="1.1.1"; sha256="19l7kmkc1cnggf0rcqxphifw5y6iknkxas0ik3kfd1swsgmvw587"; depends=[MASS ssize_fdr]; }; ssmrob = derive { name="ssmrob"; version="0.4"; sha256="1inndspir7571f54kalbj0h599v9k6dxdmp0n1l5r3a62vn45hd3"; depends=[sampleSelection robustbase mvtnorm MASS]; }; sspline = derive { name="sspline"; version="0.1-6"; sha256="0d6ms8szyn39c7v0397d5ar2hrl8v1l2b7m8hlj37hgp70b9s55h"; depends=[]; }; -sspse = derive { name="sspse"; version="0.5"; sha256="1r2pfqpr5y6q0vjcf14020srxcpqd5jjab73i4m03aqqsryr8c6c"; depends=[coda]; }; +sspse = derive { name="sspse"; version="0.5-1"; sha256="0gih9d0g4kp08c4v01p699lavb491khyj16i8vldhcb194bvs8m5"; depends=[coda]; }; sss = derive { name="sss"; version="0.0-11"; sha256="0k7p1ws0w7wg9wyxcg1zpk8q6kr32l3jl6yd9r4qmzq04dwqrdgz"; depends=[plyr XML]; }; ssvd = derive { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; }; ssym = derive { name="ssym"; version="1.5.2"; sha256="0c3c4disiicavr8m2yvvi2k38gnw4akdqp0f1v6647i5zj160zkr"; depends=[GIGrvg numDeriv normalp Formula]; }; st = derive { name="st"; version="1.2.4"; sha256="1lnrzz7kc21mrs8xrqs21fcwd92d5kzhvfiq36j02982n18f6c64"; depends=[sda fdrtool corpcor]; }; staTools = derive { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[Rcpp VGAM magicaxis Rcpp]; }; stab = derive { name="stab"; version="0.1.9"; sha256="1awf8bj3c4wvs818g4wfmw23vdhv06kn229cmhqbr7dsz933vwwf"; depends=[MASS reshape]; }; -stabledist = derive { name="stabledist"; version="0.6-6"; sha256="0s59jp3y5ks4rfj7x76vb9g3slbbn98lvki54lv96yxdfr8i7ry5"; depends=[]; }; +stabledist = derive { name="stabledist"; version="0.7-0"; sha256="06xd3kkyand0gzyj5phxlfjyygn5jlsq7gbwh62pc390by7ld2c7"; depends=[]; }; stabs = derive { name="stabs"; version="0.5-1"; sha256="0mlwbf8wf38mr39si31i4iz00hpsmchbhgagwgsf3x9422zpq92p"; depends=[]; }; stacomirtools = derive { name="stacomirtools"; version="0.3"; sha256="1lbbnvmilf3j3hyhvpkyjd4b4sf3zwygilb8x0kjn2jfhkxnx4c1"; depends=[RODBC xtable]; }; stagePop = derive { name="stagePop"; version="1.0-1"; sha256="0yb1dbgmns6km0p35wny6f4v7xl4225v8lww0wmzrvdw7l2m8m8d"; depends=[deSolve PBSddesolve]; }; @@ -6071,7 +6163,7 @@ stcm = derive { name="stcm"; version="0.1.0"; sha256="0j2yhmg6m69igg3ilrf7rq3l37 steepness = derive { name="steepness"; version="0.2-2"; sha256="0bw7wm7n2xspkmj90qsjfssnig683s3qwg1ndkq2aw3f6clh4ilm"; depends=[]; }; stellaR = derive { name="stellaR"; version="0.3-3"; sha256="098sz6b8pl3fyca3g6myp97nna368xhxf8krmibadnnsr49q5zs9"; depends=[]; }; stepPlr = derive { name="stepPlr"; version="0.92"; sha256="16j32sk7ri4jdgss7vw5zz7s42rxk7rs376iyxzzpy1zcc9b64rv"; depends=[]; }; -stepR = derive { name="stepR"; version="1.0-1"; sha256="1iafxg0g0cy6v98b85h68xrmfndc2hbmr9x7v5nk16zgcknl8k96"; depends=[]; }; +stepR = derive { name="stepR"; version="1.0-2"; sha256="1z2jncjhaxzxw5kqa8s3jlsl9blz3b7hlnzr3phfhwmb1hr6r56k"; depends=[]; }; stepp = derive { name="stepp"; version="3.0-11"; sha256="0jrwfvcgh3sjm3zag93kjyny2qqsyiw988vnx6jw7s31bv9g0d6s"; depends=[car survival]; }; stepwise = derive { name="stepwise"; version="0.3"; sha256="1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2"; depends=[]; }; stheoreme = derive { name="stheoreme"; version="1.2"; sha256="14w3jcbs8y8cz44xlq8yybr2jwgk3w7s2msgjhlp1vazy8959s65"; depends=[]; }; @@ -6101,9 +6193,9 @@ stremo = derive { name="stremo"; version="0.2"; sha256="13b9xnd8ykxrm8gnakh0ixbs stressr = derive { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[xts XML lattice latticeExtra]; }; stringdist = derive { name="stringdist"; version="0.9.0"; sha256="0304a3qyssq2l2c7da5a90fca32n3ph5jixqnqvb3jwzdb8dxm2f"; depends=[]; }; stringi = derive { name="stringi"; version="0.4-1"; sha256="01ig59cmvrk9vfh4l84i2h4vgddfspyrxwh3am33apv8r8vr4bnj"; depends=[]; }; -stringr = derive { name="stringr"; version="0.6.2"; sha256="0dv7dd0xsivlccnf9pr5kb7zirgqn9mc6lgw5hnmkbb0s1qrrz63"; depends=[]; }; +stringr = derive { name="stringr"; version="1.0.0"; sha256="0jnz6r9yqyf7dschr2fnn1slg4wn6b4ik5q00j4zrh43bfw7s9pq"; depends=[stringi magrittr]; }; strucchange = derive { name="strucchange"; version="1.5-0"; sha256="17ikp36ahnsx1q3avqkz5r2n2yagzq7j6m515vdm8rxgv0538is3"; depends=[zoo sandwich]; }; -structSSI = derive { name="structSSI"; version="1.1"; sha256="0rmf3q65adrqh9nrc4apqm4ca7frpwqr6xh80b4mxiz0z4wfcv9q"; depends=[igraph rjson ggplot2 reshape2]; }; +structSSI = derive { name="structSSI"; version="1.1.1"; sha256="06rwmrgqc4qy4x0bhlshjdsjxfmp5fr9d1wjglhlb1gbp72fmkdv"; depends=[igraph rjson ggplot2 reshape2]; }; strum = derive { name="strum"; version="0.6"; sha256="1jd8h8fnjv4a58shl0j9fdlds7xns1j18b9qaqhrfa4hrdrw75s9"; depends=[pedigree Matrix MASS Rcpp Rcpp RcppArmadillo]; }; strvalidator = derive { name="strvalidator"; version="1.4.0"; sha256="1zgfy5w4qwcm3jdqigahxi7xn8328jr568ssbj99ibzdj0m0hmfw"; depends=[gridExtra ggplot2 gWidgets gtable plyr scales gWidgetsRGtk2 RGtk2 data_table]; }; stsm = derive { name="stsm"; version="1.7"; sha256="080xakf7rf53vzv64g338hz87sk4cqfwd6ly4f122sxvn4xypq3n"; depends=[KFKSDS]; }; @@ -6124,14 +6216,16 @@ superMDS = derive { name="superMDS"; version="1.0.2"; sha256="0jxbwm3izk7bc3bd01 superbiclust = derive { name="superbiclust"; version="1.1"; sha256="1gzjbzbl8y1nzdfhyd6dlrwjq8mwj43a26qav84s1bdzwx6dra48"; depends=[biclust Matrix]; }; superdiag = derive { name="superdiag"; version="1.1"; sha256="0pa3mv74riabpm7j4587zww2364fszzlw48ijj1apcgz8y6pyqbw"; depends=[coda boa]; }; superpc = derive { name="superpc"; version="1.09"; sha256="1p3xlg2n7p57n54g2w4frfrng5vjh97kp6ax4mrgvj3pqmd1m69z"; depends=[survival]; }; -support_BWS = derive { name="support.BWS"; version="0.1-2"; sha256="14p5b4b84x66lzn7qz1xy7sbb5i3wqwcsf6r6ap612nj83srjmqa"; depends=[]; }; -support_CEs = derive { name="support.CEs"; version="0.3-2"; sha256="0q8n4w3p682165lv20m30m8p9mhd3wzrzg8aqizf9zc2m5w9ffyd"; depends=[DoE_base MASS simex]; }; +support_BWS = derive { name="support.BWS"; version="0.1-3"; sha256="1qlh2zgmr3b6gz3xmncjawgg08c6kgfg3d2m9x78iw95x7p3p5h8"; depends=[]; }; +support_CEs = derive { name="support.CEs"; version="0.3-3"; sha256="0772j0sssf6fwig9v1ra83fwas8109yf30n0xq8s5cxsnnn41m2y"; depends=[DoE_base MASS simex]; }; surface = derive { name="surface"; version="0.4-1"; sha256="0z7fh09hjmxfmqzi588gjwqqlpj1a475aixrnvy911lkx3zfk146"; depends=[ape ouch MASS geiger]; }; surv2sampleComp = derive { name="surv2sampleComp"; version="1.0-4"; sha256="1ihz71vzrkd5ksy7421myrgkbww0z5k0ywcb2bfalxx2bd2cs2wf"; depends=[survival plotrix flexsurv survC1]; }; survAUC = derive { name="survAUC"; version="1.0-5"; sha256="0bcj982ib1h0sjql09zbvx3h1m96jy9q37krmk6kfzw25ms6bzzr"; depends=[survival]; }; survAccuracyMeasures = derive { name="survAccuracyMeasures"; version="1.2"; sha256="1i41xkvqpxpq9spryh1syp57ymlzw71ygdjqn41rv8jjc9q52x9g"; depends=[survival Rcpp Rcpp RcppArmadillo]; }; survC1 = derive { name="survC1"; version="1.0-2"; sha256="1bidjhq3k5ab7gqj1b2afngip7pp6c9c7q0m6ww7h7i2vg505l7v"; depends=[survival]; }; survIDINRI = derive { name="survIDINRI"; version="1.1-1"; sha256="03lsypx189zm28gv764gdq24a18jj3kpdk91ssa501qxj5jv7v29"; depends=[survival survC1]; }; +survJamda = derive { name="survJamda"; version="1.1.3"; sha256="03cwp1nw8nnkcjiafysbc1w24fwb7j5ksr01rlpf0g0qdi9zlgwi"; depends=[survival survivalROC ecodist survJamda_data]; }; +survJamda_data = derive { name="survJamda.data"; version="1.0.2"; sha256="0a010v2ar48i5m0jiqjvdyqm93ckfgfmcmym9a02h0rclnizd75r"; depends=[]; }; survMisc = derive { name="survMisc"; version="0.4.6"; sha256="1d16kkzg0clwvv5rgv4rlm79dxhxhhzv9bkx6420izmyx0wjcnhn"; depends=[survival KMsurv combinat Hmisc zoo km_ci ggplot2 data_table gridExtra rpart gam]; }; survPresmooth = derive { name="survPresmooth"; version="1.1-8"; sha256="1qva7yx4vv99mgh3wqxdnbasa1gy0ixxyxpqrfbn6827whjzf91m"; depends=[]; }; survRM2 = derive { name="survRM2"; version="1.0-1"; sha256="1qcjdx4a9b9dg8jkzak6rq4d4byf9377h43f1m3icdgf79vghlhr"; depends=[survival]; }; @@ -6178,13 +6272,14 @@ sybilcycleFreeFlux = derive { name="sybilcycleFreeFlux"; version="1.0.1"; sha256 symbolicDA = derive { name="symbolicDA"; version="0.4-2"; sha256="1vn7r7b7yyn2kp8j3ghw50z49yzvwhm0izc6wgc7a99300xrr77s"; depends=[clusterSim XML rgl shapes e1071 ade4 cluster]; }; symbols = derive { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; }; symmoments = derive { name="symmoments"; version="1.2"; sha256="074k0285c0yri39zags420kjls6kjlvlhymg3r7y24h42zdy82d4"; depends=[mvtnorm cubature combinat multipol]; }; +synRNASeqNet = derive { name="synRNASeqNet"; version="1.0"; sha256="05ncwbv8kvvhqqrxa8qq7s0jc6krs5a56ph04z50iwgd91rzyi7x"; depends=[parmigene GenKern igraph KernSmooth]; }; synbreed = derive { name="synbreed"; version="0.10-5"; sha256="0qhcxmcxa0ixn6ql2dr7pq10g7hmv55rcn279wz4cg5mbgqkhvmm"; depends=[doBy BLR regress abind lattice igraph MASS LDheatmap qtl synbreedData]; }; -synbreedData = derive { name="synbreedData"; version="1.4"; sha256="0pfpvg4wvxfwpvxq8f93z1amfss98as66kwpj5mnvvlr33ffmka9"; depends=[]; }; +synbreedData = derive { name="synbreedData"; version="1.5"; sha256="16wv9r7p0n8726qv0jlizmkvnrqwjj1q4xaxvfmj9611rm47vckx"; depends=[]; }; synchronicity = derive { name="synchronicity"; version="1.1.4"; sha256="0hcxwgf1irswwabgl0b6vb9q09nhxc1ljsm195lc8ql49sfj9mfz"; depends=[bigmemory_sri BH]; }; synchrony = derive { name="synchrony"; version="0.2.3"; sha256="0fi9a3j8dfslf1nqx8d53fi635y3aq8isxw0dbjbpgk7rc71nzby"; depends=[]; }; synlik = derive { name="synlik"; version="0.1.1"; sha256="0g4n78amydihsq4jg2i9barjm9g40zczasb31fj10yn6wir1dhv7"; depends=[Rcpp Matrix Rcpp RcppArmadillo]; }; synthpop = derive { name="synthpop"; version="1.1-0"; sha256="1j9d0jpmr8dva2c7gd6z1q0a3qdxkvmm83xlv08dxkbvsfbzvmmr"; depends=[lattice MASS nnet ggplot2 coefplot rpart party foreign plyr proto]; }; -sysfonts = derive { name="sysfonts"; version="0.4"; sha256="0y33ykcxynm90inq8s5phdg3mfkx30szqld75h0b2faykpv6q3r4"; depends=[]; }; +sysfonts = derive { name="sysfonts"; version="0.5"; sha256="1vppj3jnag88351f8xfk9ds8gbbij3m55iq5rxbnrzy89c04zpzp"; depends=[]; }; systemfit = derive { name="systemfit"; version="1.1-14"; sha256="0f33v96awyhxw3i6zr6whdz91hbfi7vwnfs0bz7xsrjcinqhm6h5"; depends=[Matrix car lmtest sandwich]; }; systemicrisk = derive { name="systemicrisk"; version="0.2"; sha256="06061hca2x9hj0caann69j6x2jgy8bq40nxs27iqb3zfqp2cz44f"; depends=[Rcpp lpSolve Rcpp]; }; syuzhet = derive { name="syuzhet"; version="0.2.0"; sha256="1l83wjiv1xsxw4wrcgcj3ryisi7zn4sbdl0sail0rhw0g9y9cz76"; depends=[openNLP NLP]; }; @@ -6209,6 +6304,7 @@ tcR = derive { name="tcR"; version="1.3"; sha256="09jvmnyq9j0l8ng73jr2ldb70fbqry tcltk2 = derive { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; }; tclust = derive { name="tclust"; version="1.2-3"; sha256="0a1b7yp4l9wf6ic5czizyl2cnxrc1virj0icr8i6m1vv23jd8jfp"; depends=[mvtnorm sn mclust cluster]; }; tdm = derive { name="tdm"; version="3.0.3"; sha256="01xy090h9idw05jssfgdarbqp5d1vsiir5x7fr1ylaz0k8ai23d4"; depends=[rjags coda png deSolve]; }; +tdr = derive { name="tdr"; version="0.11"; sha256="1ga1lczqj5pka2yz7igxfm83xmkx7lla8pz6ryij0ybn284agszs"; depends=[lattice ggplot2 RColorBrewer]; }; tdthap = derive { name="tdthap"; version="1.1-7"; sha256="0lqcw4bzjd995pwn2yrmzay82gnkxnmxxsqplpbn5gg8p6sf5qqk"; depends=[]; }; teigen = derive { name="teigen"; version="2.0.8"; sha256="0gh5p2rwv1krrbq92wpgl1ya74vrdxhsagd7r7wvyxvxdv3j94v5"; depends=[]; }; tempdisagg = derive { name="tempdisagg"; version="0.24.0"; sha256="02ld14mppyyqvgz537sypr3mqc758cchfcmpj46b7wswwa2y7fyz"; depends=[]; }; @@ -6223,15 +6319,15 @@ testthat = derive { name="testthat"; version="0.9.1"; sha256="0hbkyfx54fz4lwyz3a testthatsomemore = derive { name="testthatsomemore"; version="0.1"; sha256="0j9sszm4l0mn7nqz47li6fq5ycb3yawc2yrad9ngb75cvp47ikkk"; depends=[testthat]; }; texmex = derive { name="texmex"; version="2.1"; sha256="17x4xw2h4g9a10zk4mvi3jz3gf4rf81b29hg2g3gq6a6nrxsj8sy"; depends=[mvtnorm]; }; texmexseq = derive { name="texmexseq"; version="0.1"; sha256="18lpihiwpjkjkc1n7ka6rzasrwv8npn4939s1gl8g1jb27vnhzb5"; depends=[]; }; -texreg = derive { name="texreg"; version="1.34"; sha256="03w8fk5lkpgag22a63jnhf0cn3l5ryjh4pkfhxgqzrijvrr1v2cb"; depends=[]; }; +texreg = derive { name="texreg"; version="1.35"; sha256="0c1w6kzczzflcmvr544v3gdasvyjxcwqgdm2w2i9wp7kd1va37fr"; depends=[]; }; textcat = derive { name="textcat"; version="1.0-2"; sha256="0sjhahmqva9pwp75zwxxf8g1cw38awid3w6rx9xfx73cpj2blcz3"; depends=[tau slam]; }; textir = derive { name="textir"; version="2.0-3"; sha256="039xl2h0igrp3fzr1qiyb0zr6j4bbajhj36apylqvwsczzaywhwb"; depends=[distrom gamlr Matrix]; }; textometry = derive { name="textometry"; version="0.1.4"; sha256="17k3v9r5d5yqgp25bz69pj6sw2j55dxdchq63wljxqkhcwxyy9lh"; depends=[]; }; textreg = derive { name="textreg"; version="0.1.2"; sha256="0qya0czbi78a29jp9pd3lbqh574d9k0i340hrgc6jmdhwzhimhk7"; depends=[tm NLP Rcpp Rcpp]; }; tfer = derive { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm29mhp9b2wp65mmig5c82cl9ck"; depends=[]; }; -tfplot = derive { name="tfplot"; version="2014.2-2"; sha256="1jrkzccvqmwghp6nhxay0m1qx8r5wa96zb9r8v6qihryi9m3amhs"; depends=[tframe]; }; +tfplot = derive { name="tfplot"; version="2015.4-1"; sha256="1qrw8x7pz7xcmpym3j1d095bhvy2s7znxplml1qyw5minc67n1mh"; depends=[tframe]; }; tframe = derive { name="tframe"; version="2015.1-1"; sha256="10igwmrfslyz3z3cbyldik8fcxq43pwh60yggka6mkl0nzkxagbd"; depends=[]; }; -tframePlus = derive { name="tframePlus"; version="2013.9-1"; sha256="070ad1g7yv1d5by6xrvshgn43jjxpq8waa339xhzc1am2qzb6mqr"; depends=[tframe timeSeries]; }; +tframePlus = derive { name="tframePlus"; version="2015.1-2"; sha256="043ay79x520lbh4jm2nb3331pwd7dvwfw20k1kc9cxbplxiy8pnb"; depends=[tframe timeSeries]; }; tgp = derive { name="tgp"; version="2.4-11"; sha256="0hdi05bz9qn4zmljfnll5hk9j8z9qaqmya77pdcgr6vc31ckixw5"; depends=[maptree]; }; tgram = derive { name="tgram"; version="0.2-2"; sha256="091g6j5ry1gmjff1kprk5vi2lirl8zbynqxkkywaqpifz302p39q"; depends=[zoo]; }; thermocouple = derive { name="thermocouple"; version="1.0.0"; sha256="1pawk7aq27vc708xwz997pmxxhipw8449793zv6fw5aj47wcw1l5"; depends=[]; }; @@ -6241,6 +6337,7 @@ threg = derive { name="threg"; version="1.0.2"; sha256="0wb9waj0j83zrj763d3fdnp3 thsls = derive { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; }; tibbrConnector = derive { name="tibbrConnector"; version="1.5.0-71"; sha256="0d8gy126hzzardcwr9ydagdb0dy9bdw30l8s2wwi7zaxx2lpii6q"; depends=[RCurl rjson]; }; tictoc = derive { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; }; +tidyjson = derive { name="tidyjson"; version="0.2.1"; sha256="178lc4ii4vjzvrkxfdf5cd9ryxva9h2vv4wl6xgxgaixkab9yv9w"; depends=[assertthat jsonlite dplyr]; }; tidyr = derive { name="tidyr"; version="0.2.0"; sha256="169i6xnr4bs5vqkv6dilj5j8v95giz0b7byhi06qk414gdlj2r8n"; depends=[reshape2 dplyr stringi lazyeval]; }; tiff = derive { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; }; tiger = derive { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin qualV klaR som lattice]; }; @@ -6250,6 +6347,7 @@ tikzDevice = derive { name="tikzDevice"; version="0.8.1"; sha256="0262szfzv4yrfa tileHMM = derive { name="tileHMM"; version="1.0-6"; sha256="18vqj7fdh4knnjk9s7yk2bgn3qwqz92fmm5fdny21gi0wl4qgdsd"; depends=[]; }; timeDate = derive { name="timeDate"; version="3012.100"; sha256="0cn4h23y2y2bbg62qgm79xx4cvfla5xbpmi9hbdvkvpmm5yfyqk2"; depends=[]; }; timeROC = derive { name="timeROC"; version="0.3"; sha256="0xl6gpb5ayppzp08wwry4i051rm40lzfx43jw2yn3jy2p3nrcakb"; depends=[pec mvtnorm]; }; +timeSeq = derive { name="timeSeq"; version="1.0.0"; sha256="1b7jcld1h3xsp3nl2nk9nqsgdg1pdi4m54hgsdlvivk9zzv3k6wr"; depends=[gss lattice pheatmap doParallel foreach reshape]; }; timeSeries = derive { name="timeSeries"; version="3012.99"; sha256="06lz9xljzadfs94xwn8578h8mw56wp923k0xfppzq69hcpcrhsvf"; depends=[timeDate]; }; timeit = derive { name="timeit"; version="0.2.1"; sha256="0fsa67jyk4yizyd079265jg6fvjsifkb60y3fkkxsqm7ffqi6568"; depends=[microbenchmark]; }; timeline = derive { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; }; @@ -6258,6 +6356,7 @@ timereg = derive { name="timereg"; version="1.8.7"; sha256="1xarqsdgl1zcc8ilg23g timesboot = derive { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; }; timeseriesdb = derive { name="timeseriesdb"; version="0.2.1"; sha256="0150zs8c8184jzry33aki21prmpnxp3rclp84q6igwxi4grdhlr0"; depends=[RPostgreSQL RJSONIO xts zoo reshape2 shiny DBI]; }; timetools = derive { name="timetools"; version="1.6.5"; sha256="1ni1dqzkdrzmvr0sbnfdh7kcsd5sgfggfl6w7nqviidcff5dbc9g"; depends=[]; }; +timetree = derive { name="timetree"; version="1.0"; sha256="1fpdp6mkwm67svqvkfflvqxn52y2041zl09rxrms28ybbd5f84c0"; depends=[XML phangorn]; }; timma = derive { name="timma"; version="1.2.1"; sha256="1pypk0pwkhyilh1hsn8hasia1hf6hbskj0xw6vas03k19b6fjnli"; depends=[Rcpp QCA reshape2 Rcpp RcppArmadillo]; }; timsac = derive { name="timsac"; version="1.3.3"; sha256="0jg9mjzzfl94z4dqb2kz0aiccpclnbyf9p08x3a3cw1y6wqmzrmy"; depends=[]; }; tipom = derive { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; }; @@ -6269,14 +6368,14 @@ tlemix = derive { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx tlm = derive { name="tlm"; version="0.1.3"; sha256="1jj8yihq4b13wavflkkv91m9ba2l5ar3vcwp1ss6iymyf3hzdgiv"; depends=[boot]; }; tlmec = derive { name="tlmec"; version="0.0-2"; sha256="1gak8vxmfjf05bhaj6lych7bm8hgav1x3h14k2ra7236v82rqbw7"; depends=[mvtnorm]; }; tlnise = derive { name="tlnise"; version="2.0"; sha256="1vh998vqj359249n9zmw04rsivb7nlbdfgzf20pgh2sndm3rh8qz"; depends=[]; }; -tm = derive { name="tm"; version="0.6"; sha256="004hswgswz3gdrpa6j61hl4rls843bxnsp5qac5kyxvfmwalsgr8"; depends=[NLP slam]; }; +tm = derive { name="tm"; version="0.6-1"; sha256="0i32gwic6vi7fkw05vg3rk8lmszzmy6gm9f5hrj0xckx7sf1ilfq"; depends=[NLP slam]; }; tm_plugin_alceste = derive { name="tm.plugin.alceste"; version="1.1"; sha256="0wid51bbbx01mjfhnaiv50vfyxxmjxw8alb73c1hq9wlsh3x3vjf"; depends=[NLP tm]; }; tm_plugin_dc = derive { name="tm.plugin.dc"; version="0.2-7"; sha256="1ikkxp5jdr385yqvhknvkvs97039jw964pcm6dl1k66nbdv1q59i"; depends=[DSL tm NLP slam]; }; tm_plugin_europresse = derive { name="tm.plugin.europresse"; version="1.2"; sha256="1sgm9wnzlphl4qhc69nj5im4y1qs6b0vssmn5j98fbc3xlxiyzjx"; depends=[NLP tm XML]; }; tm_plugin_factiva = derive { name="tm.plugin.factiva"; version="1.5"; sha256="06s75rwx9fzld1dw0nw6q5phc1h0zsdzhy1dcdcvmsf97d4s2qdr"; depends=[NLP tm XML]; }; tm_plugin_lexisnexis = derive { name="tm.plugin.lexisnexis"; version="1.2"; sha256="0cjw705czzzhd8ybfxkrv0f9kvmv9pcswisc7n9hkx8lxi942h19"; depends=[NLP tm XML ISOcodes]; }; tm_plugin_mail = derive { name="tm.plugin.mail"; version="0.1"; sha256="0ca2w2p5zv3qr4zi0cj3lfz36g6xkgkbck8pdxq5k65kqi5ndzyp"; depends=[NLP tm]; }; -tm_plugin_webmining = derive { name="tm.plugin.webmining"; version="1.2.2"; sha256="08nm2iwx897d5v144lh2gj5c3yprnky48s882p278b8blmdwnfn0"; depends=[NLP tm boilerpipeR RCurl XML RJSONIO]; }; +tm_plugin_webmining = derive { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[NLP tm boilerpipeR RCurl XML RJSONIO]; }; tmap = derive { name="tmap"; version="0.7"; sha256="0lnlnnllj2bypw2cf8pgpv40w5zy4876kmjgav07ls8j11lklgwz"; depends=[rgeos gridBase sp rgdal classInt RColorBrewer igraph fields vegan]; }; tmg = derive { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp Rcpp RcppEigen]; }; tmle = derive { name="tmle"; version="1.2.0-4"; sha256="11hjp2vak1zv73326yzzv99wg8a2xyvfgvbyvx3jfxkgk33mybbm"; depends=[SuperLearner]; }; @@ -6299,12 +6398,12 @@ track = derive { name="track"; version="1.1.8"; sha256="0scrww0ba1lrv39fh416wcbz tractor_base = derive { name="tractor.base"; version="2.5.0"; sha256="17s4iyp67w7m8gslm87p3ic5r9iq7x1ifpxqrmnin3y5a3d04f5v"; depends=[reportr]; }; traitr = derive { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest proto gWidgets]; }; traj = derive { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster psych pastecs NbClust GPArotation]; }; -trajectories = derive { name="trajectories"; version="0.1-1"; sha256="0vf1czc97bqq5snqdma9l1knb4bznyn8pcs8f1q6ssk0xfjrl3s3"; depends=[lattice sp spacetime rgdal rgeos]; }; +trajectories = derive { name="trajectories"; version="0.1-2"; sha256="1d27mb5xy29j2mgb0wh5x61q1z41vjmpidzqswqmw8fbq9g64826"; depends=[lattice sp spacetime rgdal rgeos]; }; translate = derive { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[RCurl RJSONIO functional lisp]; }; translateR = derive { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[RJSONIO RCurl textcat httr]; }; transport = derive { name="transport"; version="0.6-3"; sha256="1sldlccsprzan1liyslzp9wzz3d36khyr6zri773npvnss9pa67w"; depends=[]; }; trapezoid = derive { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; }; -treatSens = derive { name="treatSens"; version="1.0"; sha256="0g3v9b1kdndqls9h1ijp5v17ybb1710bdclid745y6lfkia1b71w"; depends=[]; }; +treatSens = derive { name="treatSens"; version="1.1"; sha256="1h49idgv3rsday8xdj3rfqflj42ya9i5sg7cm1026arff1yqxxz8"; depends=[]; }; tree = derive { name="tree"; version="1.0-35"; sha256="1cxn73rlr8s3qbq3icdh1v3jbbz913ns6xk6yzgk30ncifw4iq6g"; depends=[]; }; treeClust = derive { name="treeClust"; version="1.0-0"; sha256="1xn6m031vx12wcyyh04yb68cw416a6v5wd8rcp5f9jqirv1hp4xb"; depends=[rpart cluster]; }; treebase = derive { name="treebase"; version="0.0-7.1"; sha256="0kj1cyk14j4qzm31f47a8g7qh4842rqkzr0fqh9i5c8kzrqxbc0g"; depends=[ape XML RCurl reshape2 data_table]; }; @@ -6312,6 +6411,7 @@ treeclim = derive { name="treeclim"; version="1.0.11"; sha256="09i7zxwdrbfgridxs treecm = derive { name="treecm"; version="1.2.1"; sha256="02al6iz25pay7y1qmbpy04nw8dj9c5r7km6q5k3v3jdkfal6cm6k"; depends=[plyr]; }; treelet = derive { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; }; treemap = derive { name="treemap"; version="2.2"; sha256="0h4wkjw12n9awqsvrs72nmsxq3d5as3zjy8kyhw7715h1cvry769"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; }; +treeperm = derive { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; }; treethresh = derive { name="treethresh"; version="0.1-8"; sha256="1xkbqlr9gkpw6axzl7v5aipackhvy873yrpwn2b9zqr35pj06pr6"; depends=[EbayesThresh wavethresh]; }; trend = derive { name="trend"; version="0.0.1"; sha256="05awwsqp8vm2p00dq2hkb7dglwf45djw2xx2q2mq33blrlhn31sw"; depends=[]; }; triangle = derive { name="triangle"; version="0.8"; sha256="0jdphz1rf4cx4y28syfffaz7fbl41g3rw3mrv9dywycdznhxdnrp"; depends=[]; }; @@ -6331,7 +6431,7 @@ truncnorm = derive { name="truncnorm"; version="1.0-7"; sha256="1qac05z50618y4bw truncreg = derive { name="truncreg"; version="0.2-1"; sha256="0qvdfj93phk1s2p4n0rmpf8x9gj5n1j75h4z424mrg10r24699rd"; depends=[maxLik]; }; trust = derive { name="trust"; version="0.1-6"; sha256="1jghgwnazhqgyn2k0b3x4n8swncyy6dzlkv86chv98zw4s3bnlak"; depends=[]; }; trustOptim = derive { name="trustOptim"; version="0.8.5"; sha256="1y9krw2z5skkwgfdjagl8l04l9sbiqbk1fbxp30wrf4qj3pba5w6"; depends=[Rcpp Matrix Rcpp RcppEigen]; }; -tsDyn = derive { name="tsDyn"; version="0.9-41"; sha256="1ssb0z35xmnwyrsvmk2jsxfd5h0xhnx8kp8qyxc43j4v2nz5l4kq"; depends=[mnormt mgcv nnet tseriesChaos tseries vars urca forecast MASS Matrix foreach]; }; +tsDyn = derive { name="tsDyn"; version="0.9-43"; sha256="0fhqfwhac1ac1vakwll41m54l88b1c5y34hln5i1y2ngvhy277l1"; depends=[mnormt mgcv nnet tseriesChaos tseries vars urca forecast MASS Matrix foreach]; }; tsModel = derive { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; }; tsallisqexp = derive { name="tsallisqexp"; version="0.9-1"; sha256="0z4csd3ircpf5jync6h1snj1k2awkd0s6vj2k4ij6rvs8w3nf8nn"; depends=[]; }; tsbridge = derive { name="tsbridge"; version="1.1"; sha256="0mry3ia54cdfydpzm8asrq1ldj70gnpb5dqzj51w0jiyps2zlw6f"; depends=[mvtnorm tsbugs]; }; @@ -6340,7 +6440,7 @@ tsc = derive { name="tsc"; version="1.0-3"; sha256="1acsdkxizlkix1sskwqv2a80rshw tscount = derive { name="tscount"; version="1.0.0"; sha256="0n01biifzjfvnj3zhrn87qigf4l1kij2zfqf6876qz8rps1jz626"; depends=[ltsa]; }; tseries = derive { name="tseries"; version="0.10-34"; sha256="068mjgjcsvgpynkvga8lv430cg8zhlr9frj5yapsxni2vj534pqj"; depends=[quadprog zoo]; }; tseriesChaos = derive { name="tseriesChaos"; version="0.1-13"; sha256="0f2hycxyvcaj3s1lmva1qy46xr6qi43k8fvnm4md5qj8jp2zkazg"; depends=[deSolve]; }; -tsfa = derive { name="tsfa"; version="2014.2-2"; sha256="07g9qfdrhccl5dlsbpxn1ihavxljd9nq21hzbyn225cfi4bkx42h"; depends=[GPArotation dse EvalEst setRNG tframe tfplot]; }; +tsfa = derive { name="tsfa"; version="2014.10-1"; sha256="0gkgl55v08dr288nf8r769f96qri7qbi5src7y6azrykb37nz6iz"; depends=[GPArotation dse EvalEst setRNG tframe tfplot]; }; tsintermittent = derive { name="tsintermittent"; version="1.5"; sha256="1qziwdpxfc2v010bk2cnhkrajza0z7lrrsjg06m49msyk5bk62z1"; depends=[MAPA]; }; tslars = derive { name="tslars"; version="1.0"; sha256="0ylpn4jxmrck7hna3j420kw2yhsrklrq2664w85z30xij3zrrrci"; depends=[]; }; tsne = derive { name="tsne"; version="0.1-2"; sha256="12q5s79r2949zhm61byd4dbgw6sz3bmxzcwr8b0wlp8g1xg4bhy6"; depends=[]; }; @@ -6374,17 +6474,18 @@ unbalanced = derive { name="unbalanced"; version="1.1"; sha256="0crkykmyxbag4ri2 unbalhaar = derive { name="unbalhaar"; version="2.0"; sha256="0v6bkin1cakwl9lmv49s0jnccl9d6vdslbi1a7kfvmr5dgy760hs"; depends=[]; }; uniCox = derive { name="uniCox"; version="1.0"; sha256="1glgk6k8gwxk3haqaswd2gmr7a2hgwjkwk2i1qc5ya7gg8svyavv"; depends=[survival]; }; uniReg = derive { name="uniReg"; version="1.0"; sha256="1xl19dqnxxibgiiny9ysll2z8j1i70qrszf4xbacq1a6z31vm840"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; }; -uniftest = derive { name="uniftest"; version="1.0"; sha256="12d246f8984p4hc69p5nr5yzxs1v247yjgpxx1f0mbhkyvwp6r67"; depends=[]; }; +uniftest = derive { name="uniftest"; version="1.1"; sha256="0a37m7l3lc6rznx10w9h9krnn5paim2i2wvw47ckwag7bv0d4pm4"; depends=[orthopolynom]; }; +uniqtag = derive { name="uniqtag"; version="1.0"; sha256="025q71mzdv3n1jw1fa37bbw8116msnfzcia01p1864si04ch5358"; depends=[]; }; unittest = derive { name="unittest"; version="1.2-0"; sha256="1g3f36kikxrzsiyhwpl73q2si5k28drcwvvrqzsqmfyhbjb14555"; depends=[]; }; unmarked = derive { name="unmarked"; version="0.10-6"; sha256="07mw9rg4i81fqdkgkpcb7kd7235hn4nyxpbf5b8vxzsly81ffpz7"; depends=[reshape lattice Rcpp plyr Rcpp RcppArmadillo]; }; untb = derive { name="untb"; version="1.7-2"; sha256="1ha0xj94sz1r325qb4sb5hla9hw1gbqr76703vk792x9696skhji"; depends=[Brobdingnag partitions polynom]; }; upclass = derive { name="upclass"; version="2.0"; sha256="0jkxn6jgglw6pzzbcvi1pnq4hwfach3xbi13zwml4i83s3n5b0vg"; depends=[mclust]; }; uplift = derive { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[RItools MASS coin tables penalized]; }; urca = derive { name="urca"; version="1.2-8"; sha256="0gyjb99m6w6h701vmsav16jpfl5276vlyaagizax8k20ns9ddl4b"; depends=[nlme]; }; -urltools = derive { name="urltools"; version="0.6"; sha256="0psi93pj1n3bv0r9h6bl1pi8462mxhilq7npnqqj3kqp1f8z64an"; depends=[Rcpp Rcpp]; }; +urltools = derive { name="urltools"; version="1.1.0"; sha256="0l0fqc1zvn8ps1cxxnpglbyfdwibyxaj3c2ivz8js8vphcr5i9zp"; depends=[Rcpp Rcpp]; }; usdm = derive { name="usdm"; version="1.1-12"; sha256="0padc9ppfisnjg1nzw5csv2zki6dby7487lis8pixf1hhbinsnci"; depends=[raster]; }; useful = derive { name="useful"; version="1.1.8"; sha256="1lzl7rr9qxqa0ga6ml7qi7wi02fd4isgpfskvi3igy10iw1zv3hb"; depends=[ggplot2 plyr scales]; }; -userfriendlyscience = derive { name="userfriendlyscience"; version="0.2-2"; sha256="0wqycrxbpsybhsn2i6jsaycyqmppfcvsdbgabmsky0qpf0hqdkv3"; depends=[ggplot2 plyr psych pwr fBasics ltm MBESS SuppDists GPArotation MASS mosaic foreign car knitr xtable GGally lavaan]; }; +userfriendlyscience = derive { name="userfriendlyscience"; version="0.3-0"; sha256="0gz59n315dbjlyh6fdqihr1x458wplnd43q2gw9s6f9b55359m2c"; depends=[ggplot2 plyr psych pwr fBasics ltm MBESS SuppDists GPArotation MASS mosaic foreign car knitr xtable GGally lavaan]; }; uskewFactors = derive { name="uskewFactors"; version="1.0"; sha256="1ixcxqw8ai77ndn1cfkq53a090fgs95yzvas1qg2siwpfsm4yix6"; depends=[tmvtnorm mvtnorm MCMCpack MASS]; }; usl = derive { name="usl"; version="1.4.1"; sha256="0z3dvxczp2vp4clnwds34w5rgv4la5hpadbcmdkfqcpdy1vjryv5"; depends=[nlmrt]; }; ustyc = derive { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[XML plyr]; }; @@ -6396,7 +6497,7 @@ varSelRF = derive { name="varSelRF"; version="0.7-5"; sha256="1800d9vvkqpxjvmiqd varSelectIP = derive { name="varSelectIP"; version="0.2-1"; sha256="180lzsg48hnlcmhpk0a5yzmy2syw8yr7f5npnyspx3897hjag1vp"; depends=[MASS mvtnorm]; }; varbvs = derive { name="varbvs"; version="1.0"; sha256="0ywgb6ibijffjjzqqb5lvh1lk5qznwwiq7kbsyzkwcxbp8xkabjw"; depends=[]; }; vardiag = derive { name="vardiag"; version="0.2-0"; sha256="0avj900zx4nr67dk08n0n6arxx2cb2ymm0kd5xxnzsmyrmwm40mm"; depends=[]; }; -vardpoor = derive { name="vardpoor"; version="0.2.8"; sha256="02gbj5d7qwj05cybr0rc6zx2308r35rh5dzcxms0b3ijzpl32bcs"; depends=[data_table laeken stringr reshape2 foreach plyr gdata MASS]; }; +vardpoor = derive { name="vardpoor"; version="0.3.0"; sha256="0gdvnz86c96i90zvbp5a6ljq4pcnx2zcqb0rbhcqhylcyqys054w"; depends=[data_table laeken stringr reshape2 foreach plyr gdata MASS]; }; vars = derive { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[MASS strucchange urca lmtest sandwich]; }; vartors = derive { name="vartors"; version="0.2.6"; sha256="04dynqs903clllk9nyynh3dr7msxn5rr5jmw6ql86ppd5w3da0rl"; depends=[]; }; vbdm = derive { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; }; @@ -6404,7 +6505,7 @@ vbsr = derive { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4 vcd = derive { name="vcd"; version="1.3-2"; sha256="1ww69sgg178aqcs90mm599nlr6hnxn54d2wzyhddgx1z3qxhzwjd"; depends=[MASS colorspace]; }; vcdExtra = derive { name="vcdExtra"; version="0.6-8"; sha256="00nxvq5fn5il3lmip8ag22cqc2sxlbl1rqw5zxp309wp4nrm5i2v"; depends=[vcd gnm MASS]; }; vcrpart = derive { name="vcrpart"; version="0.3-3"; sha256="0rnf9cwynfwr956hwj4kxqiqq3cdw4wf5ia73s7adxixh5kpqxqa"; depends=[partykit nlme rpart numDeriv ucminf zoo sandwich strucchange]; }; -vdg = derive { name="vdg"; version="1.0.1"; sha256="1z9kgg9bsa80px94cwkna9hsjfa69kvhssmqlcidzb4h5hg7a3fd"; depends=[ggplot2 quantreg proxy]; }; +vdg = derive { name="vdg"; version="1.1"; sha256="08bl7835m5c62lgaghgnd80zlbic6i80sjfxdr39a715bxpr8g3b"; depends=[ggplot2 quantreg proxy gridExtra]; }; vdmR = derive { name="vdmR"; version="0.1.0"; sha256="0rv9c6bn711dn1fhgmr4ig0lr9s6yjk7r5ccvyiadgn6g5mr2bds"; depends=[ggplot2 plyr maptools gridSVG rjson GGally Rook dplyr]; }; vec2dtransf = derive { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; }; vecsets = derive { name="vecsets"; version="1.1"; sha256="0k27g3frc9y9z2qlm19kfpls6wl0422dilhdlk6096f1fp3mc6ij"; depends=[]; }; @@ -6412,7 +6513,7 @@ vectoptim = derive { name="vectoptim"; version="0.2"; sha256="1n19sipx5r0qy08jmr vegan = derive { name="vegan"; version="2.2-1"; sha256="06rq9qrcf180isjrczscl84m3jvygz5w2gz5nc4rm1pg89rf6lrd"; depends=[permute lattice MASS cluster mgcv]; }; vegan3d = derive { name="vegan3d"; version="0.65-0"; sha256="0c75hybhwqv56f2zpskr99rr9k6hw6rbv29bcxn0fciw5jqk01m3"; depends=[vegan rgl scatterplot3d]; }; vegclust = derive { name="vegclust"; version="1.6.3"; sha256="0l6j4sgzfqvcypx2dszpnsd1sivk33pixlgf9abqifp45skpkwfg"; depends=[vegan sp]; }; -vegdata = derive { name="vegdata"; version="0.6-7"; sha256="0k680sq5dk95alzzwmixvxm856scr5cnf8gfr1k0z8cbz0gzawd2"; depends=[foreign XML]; }; +vegdata = derive { name="vegdata"; version="0.6.9"; sha256="1a8b8wwsxq8090cj8pxw1digllmc2rnby8immjfmbi5rzjbksgi3"; depends=[foreign XML]; }; vegetarian = derive { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; }; venneuler = derive { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; }; verification = derive { name="verification"; version="1.41"; sha256="1c8l0kqk02xijr4yhgpmhlqsflm3wizybkwpzmlnfanh8vzn49g2"; depends=[fields boot CircStats MASS dtw]; }; @@ -6422,7 +6523,7 @@ violinmplot = derive { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988x vioplot = derive { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; }; viopoints = derive { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; }; virtualspecies = derive { name="virtualspecies"; version="1.0"; sha256="1qg5106ja17nsqzjnyswjf438f55195l197pizkybb2ilg4fw0x1"; depends=[raster ade4 dismo rworldmap]; }; -visreg = derive { name="visreg"; version="2.1-1"; sha256="16ghi7p809mcb3jfw1c9ibdd1mhq54m7x0qbcbiwxpnnd7grqy4w"; depends=[lattice]; }; +visreg = derive { name="visreg"; version="2.2-0"; sha256="1hnyrfgyk5fign5l35aql2q7q4mmw3jby5pkv696h8k1mc8qq096"; depends=[lattice]; }; visualFields = derive { name="visualFields"; version="0.4.2"; sha256="14plg94g4znl8n6798na2rivjjamjgayqkk1qwn1nx5df040l4q5"; depends=[gridBase flip matrixStats Hmisc]; }; visualize = derive { name="visualize"; version="4.2"; sha256="1jgk7j0f3p72wbqnmplrgpy7hlh7k2cmvx83gr2zfnbhygdi22mk"; depends=[]; }; vitality = derive { name="vitality"; version="1.1"; sha256="048i6ralh3gbh3hqkdxj3sdkxp1nrjbp3jpwrva4sa8d69vwxla5"; depends=[IMIS]; }; @@ -6456,10 +6557,10 @@ webvis = derive { name="webvis"; version="0.0.2"; sha256="1cdn9jrpg2sbx4dsj0xf7m weightedKmeans = derive { name="weightedKmeans"; version="1.2.0"; sha256="140cvl1jwwqyvcsf7pbsxh9k4bynd7c1q159pp7ia1f1sgimxafb"; depends=[lattice latticeExtra clv]; }; weightedScores = derive { name="weightedScores"; version="0.9.1"; sha256="0wd2ymxy8yh3l4xd3xgifbihi89h53wy6n84x7x26px12c70q8fa"; depends=[mvtnorm rootSolve]; }; weights = derive { name="weights"; version="0.80"; sha256="147fgs99sg1agq081ikj2fhb4b2vzsppdg1h1w036bb92vsjb0g5"; depends=[Hmisc gdata]; }; -weirs = derive { name="weirs"; version="0.23"; sha256="1kp49r5ba7ii1mr1nszbssx3fn0c2hcfpawm3a1kbh4rmhvy3frs"; depends=[]; }; +weirs = derive { name="weirs"; version="0.24"; sha256="15iffimdr01m92wq6srb49vf900c3cbipj99sk7rxbqbdzbb0y6g"; depends=[]; }; wesanderson = derive { name="wesanderson"; version="0.3.2"; sha256="17acf9ydi2sw7q887ni9ly12mdmip66ix6gdkh68rncj8sx3csrd"; depends=[]; }; wfe = derive { name="wfe"; version="1.3"; sha256="16b39i60x10kw6yz44ff19h638s9lsgnz8azc76zl9b8s64jliya"; depends=[arm Matrix MASS]; }; -wgaim = derive { name="wgaim"; version="1.4-6"; sha256="1m3i8v12y9n19gnsnqwmbair684skdpnlvvb3ax6jh6dcbb645my"; depends=[qtl lattice]; }; +wgaim = derive { name="wgaim"; version="1.4-8"; sha256="1x1dgxw1viswdqd1k1gfbpipzhgy13lhncji0wlsgpcgfa40ap1a"; depends=[qtl lattice]; }; wgsea = derive { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[]; }; whisker = derive { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; }; widals = derive { name="widals"; version="0.5.4"; sha256="1bl59s1r4gkvq4nkf94fk7m0zvhbrszkgmig66lfxhyvk9r84fvb"; depends=[snowfall]; }; @@ -6500,6 +6601,7 @@ xhmmScripts = derive { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64 xkcd = derive { name="xkcd"; version="0.0.4"; sha256="1hwr3ylgflzizgp8ffwdv9cgcngpjwmpxvgrvg8ad89a40l1mxcr"; depends=[ggplot2 extrafont Hmisc]; }; xlsx = derive { name="xlsx"; version="0.5.7"; sha256="0qxkdpf1dvi0x7fy65abjx2j60rdx7fv5yi8l2wdm0f2631pnwin"; depends=[rJava xlsxjars]; }; xlsxjars = derive { name="xlsxjars"; version="0.6.1"; sha256="1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p"; depends=[rJava]; }; +xml2 = derive { name="xml2"; version="0.1.0"; sha256="0p00lg8p5naw77k2fk6wbqmqdhj9iv2zn7g00gp7g253lmm8q740"; depends=[Rcpp Rcpp BH]; }; xoi = derive { name="xoi"; version="0.61-1"; sha256="0ypy0rb0f0bns41vjzyln04k3hypgr3wysqbdi0b0r14ip5rb47k"; depends=[qtl]; }; xpose4 = derive { name="xpose4"; version="4.5.3"; sha256="02m3ad4287ljsi4qrzwd84lfj1y6rz9nias2zk4cbqm14gf19pdf"; depends=[lattice gam Hmisc survival]; }; xtable = derive { name="xtable"; version="1.7-4"; sha256="1fvx4p058ygsyj9f4xb9k5h0fdi4zibadqrsn4qbx4am30qrlqj7"; depends=[]; }; @@ -6519,8 +6621,8 @@ zendeskR = derive { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123 zic = derive { name="zic"; version="0.8.1"; sha256="05mn894qdx6k7158dbsjy2b49n0gz5xnmlixr2dhkxc12ydj6zs5"; depends=[Rcpp RcppArmadillo coda Rcpp RcppArmadillo]; }; zipcode = derive { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; }; zipfR = derive { name="zipfR"; version="0.6-6"; sha256="1y3nqfjg5m89mdvcmqwjmwlc8p3hpcqnwv4ji1a7ggg4n63lwl3j"; depends=[]; }; -zoeppritz = derive { name="zoeppritz"; version="1.0-4"; sha256="0mjg55jc5b8h2jj6cy8b34a4q7jhhx73xns0v2dpfkq4kmilsv5p"; depends=[]; }; -zoib = derive { name="zoib"; version="1.2.1"; sha256="1x4x1912zjkfamifym20d2abaax81k6hnvqy5w8w4vnsx81zjrli"; depends=[rjags coda matrixcalc Formula]; }; +zoeppritz = derive { name="zoeppritz"; version="1.0-5"; sha256="0a501411gjs02vvhxdy8z3a5449arkamdidf2q6qswkkiv68qq04"; depends=[]; }; +zoib = derive { name="zoib"; version="1.3.0"; sha256="15i2gczc6sh0vyi51k105qd3bymwkpbpv2xm99jwflpa170yd8jp"; depends=[rjags coda matrixcalc Formula]; }; zoo = derive { name="zoo"; version="1.7-12"; sha256="1n64pdmk2vrmiprwkncaaf936c97nlc1l78bvmzp991rijr9vqg5"; depends=[lattice]; }; zooaRch = derive { name="zooaRch"; version="1.0"; sha256="1krzwrk2cknlsmd3hn8c2lly10pd8k8jj2x12mbjhr2wws0i5fj4"; depends=[ggplot2]; }; zooimage = derive { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[svMisc svDialogs mlearning filehash jpeg png]; }; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index ccdfdccd0361..ecc8abf64608 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -224,7 +224,7 @@ let fftwtools = [ pkgs.fftw ]; Formula = [ pkgs.gmp ]; geoCount = [ pkgs.gsl ]; - git2r = [ pkgs.zlib ]; + git2r = [ pkgs.zlib pkgs.openssl ]; glpkAPI = [ pkgs.gmp pkgs.glpk ]; gmp = [ pkgs.gmp ]; graphscan = [ pkgs.gsl ]; @@ -888,7 +888,6 @@ let "RVideoPoker" # requires Rpanel "rysgran" # requires soiltexture "samr" # requires impute - "saps" # requires piano, and survcomp "SDD" # requires rpanel "seeg" # requires spatstat "selectspm" # depends on broken ecespa From 75ecd2e41549e6aa5492a0ba89c3b3d56caf6d8f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 May 2015 14:56:41 +0200 Subject: [PATCH 064/615] ccache 3.2.1 -> 3.2.2 New features and improvements: - Added support for "CCACHE_COMPILERCHECK=string:". This is a faster alternative to "CCACHE_COMPILERCHECK=" if the command's output can be precalculated by the build system. - Add support for caching code coverage results (compiling for gcov). Bug fixes: - Fixed bug which could result in false cache hits when source code contains '"' followed by " /*" or " //" (with variations). - Made hash of cached result created with and without "CCACHE_CPP2" different. This makes it possible to rebuild with "CCACHE_CPP2" set without having to clear the cache to get new results. - Don't try to reset a non-existing stats file. This avoids "No such file or directory" messages in the ccache log when the cache directory doesn't exist. - Fixed a bug where ccache deleted clang diagnostics after compiler failures. - Avoid performing an unnecessary copy of the object file on a cache miss. - Bail out on too hard compiler option "-fmodules". - Bail out on too hard compiler option "-fplugin=libcc1plugin" (interaction with GDB). - Fixed build error when compiling ccache with recent clang versions. - Removed signal-unsafe code from signal handler. - Corrected logic for when to output cached stderr. - Wipe the whole cached result on failure retrieving a cached file. - Fixed build error when compiling ccache with recent clang versions. --- pkgs/development/tools/misc/ccache/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 7c0cfa51cd79..b0a8e1b3e2c0 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,12 +1,16 @@ {stdenv, fetchurl, runCommand, gcc, zlib}: let + name = "ccache-${version}"; + version = "3.2.2"; + sha256 = "1jm0qb3h5sypllaiyj81zp6m009vm50hzjnx994ril94kxlrj3ag"; + ccache = stdenv.mkDerivation { - name = "ccache-3.2.1"; + inherit name; src = fetchurl { - url = mirror://samba/ccache/ccache-3.2.1.tar.xz; - sha256 = "17dxb0adha2bqzb2r8rcc3kl9mk7y6vrvlh181liivrc3m7g6al7"; + inherit sha256; + url = "mirror://samba/ccache/${name}.tar.xz"; }; buildInputs = [ zlib ]; @@ -37,8 +41,10 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { + inherit version; description = "Compiler cache for fast recompilation of C/C++ code"; homepage = http://ccache.samba.org/; + downloadPage = https://ccache.samba.org/download.html; license = with licenses; gpl3Plus; maintainers = with maintainers; [ nckx ]; }; From 1b6fcfa24ec88e00efa499725174b094e0a116fb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 May 2015 15:06:31 +0200 Subject: [PATCH 065/615] clipgrab 3.4.9 -> 3.4.11 --- pkgs/applications/video/clipgrab/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 675f0a3a2f67..1256572de7ca 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, makeDesktopItem, qt4 }: -let version = "3.4.9"; in +let version = "3.4.11"; in stdenv.mkDerivation rec { name = "clipgrab-${version}"; src = fetchurl { - sha256 = "0valq3cgx7yz11zcscz1vdjmppwbicvg0id61dcar22pyp2zkap1"; + sha256 = "10xxcnib7xkvrx7wma2vbya5fz5s5f6syc9dmr395c83lpcwpxs8"; + # The "Download" button is a .tar.gz, but there's a .tar.bz2 further down: url = "http://download.clipgrab.de/${name}.tar.bz2"; }; From 6396c04d9f2895de1c22f19d4d5780446c99a3ba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 May 2015 15:16:15 +0200 Subject: [PATCH 066/615] ccache: enable tests Let's hope this doesn't break all over the place. Works here. --- pkgs/development/tools/misc/ccache/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index b0a8e1b3e2c0..db02fef9f2a3 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,19 +1,23 @@ -{stdenv, fetchurl, runCommand, gcc, zlib}: +{ stdenv, fetchurl, runCommand, gcc, perl, zlib }: let + # TODO: find out if there's harm in just using 'rec' instead. name = "ccache-${version}"; version = "3.2.2"; sha256 = "1jm0qb3h5sypllaiyj81zp6m009vm50hzjnx994ril94kxlrj3ag"; + doCheck = true; ccache = stdenv.mkDerivation { - inherit name; + inherit name doCheck; src = fetchurl { inherit sha256; url = "mirror://samba/ccache/${name}.tar.xz"; }; - buildInputs = [ zlib ]; + # The test dependency on perl should be gone in the next release: + buildInputs = [ zlib ] + ++ stdenv.lib.optionals doCheck [ perl ]; passthru = { # A derivation that provides gcc and g++ commands, but that From 5144f01d4fee5fc1688049dd67a5117f971d473b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 May 2015 08:45:47 +0200 Subject: [PATCH 067/615] stress-ng 0.04.00 -> 0.04.02 --- pkgs/tools/system/stress-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index a769cb77eca3..f67c556a6699 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, attr }: -let version = "0.04.01"; in +let version = "0.04.02"; in stdenv.mkDerivation rec { name = "stress-ng-${version}"; src = fetchurl { - sha256 = "1n7980lx32jvk9z9gl5621vas83x2jvyvp3l2jzw3afh09vd5axk"; + sha256 = "1k7h58axycwwxbr5bqqpz1ypsqvv4k2knk2fpw402l4xx9643bqv"; url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz"; }; From 1fe0ebc0ecc6d160135f0e2f26f343792702de79 Mon Sep 17 00:00:00 2001 From: desiderius Date: Mon, 11 May 2015 14:48:52 +0200 Subject: [PATCH 068/615] python-packages: new attrdict-2.0.0 package A dict with attribute-style access. --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a475fe3061c..ca05a89012f7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -642,6 +642,23 @@ let }; }); + attrdict = buildPythonPackage (rec { + name = "attrdict-2.0.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/a/attrdict/${name}.tar.gz"; + md5 = "8a7c1a4e737fe9e2b2b8844c0f7746f8"; + }; + + propagatedBuildInputs = with self; [ coverage nose six ]; + + meta = { + description = "A dict with attribute-style access"; + homepage = https://github.com/bcj/AttrDict; + license = stdenv.lib.licenses.mit; + }; + }); + audioread = buildPythonPackage rec { name = "audioread-1.2.1"; From 7d1a4f9e3f5e58e56350ee22595bcb0c34574143 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 12 May 2015 10:38:15 +0200 Subject: [PATCH 069/615] libe-book: Add missing zlib dependency. Since 287ec76, zlib is no longer propagated by libxml, so we need to add it as a direct dependency. Signed-off-by: aszlig --- pkgs/development/libraries/libe-book/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix index 81264b562b4d..fa47c1587c32 100644 --- a/pkgs/development/libraries/libe-book/default.nix +++ b/pkgs/development/libraries/libe-book/default.nix @@ -1,4 +1,7 @@ -{stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu, cppunit}: +{ stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu +, cppunit, zlib +}: + let s = # Generated upstream information rec { @@ -10,7 +13,7 @@ let sha256="1v48pd32r2pfysr3a3igc4ivcf6vvb26jq4pdkcnq75p70alp2bz"; }; buildInputs = [ - gperf pkgconfig librevenge libxml2 boost icu cppunit + gperf pkgconfig librevenge libxml2 boost icu cppunit zlib ]; in stdenv.mkDerivation { From b90227cd763d4e5190d25e7ffd9c38e7ca297b29 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 12 May 2015 13:49:08 +0200 Subject: [PATCH 070/615] add fomp: an LV2 port of the MCP, VCO, FIL, and WAH plugins by Fons Adriaensen --- pkgs/applications/audio/fomp/default.nix | 27 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/audio/fomp/default.nix diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix new file mode 100644 index 000000000000..00b6c3e0c677 --- /dev/null +++ b/pkgs/applications/audio/fomp/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, lv2, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "fomp-${version}"; + version = "1.0.0"; + + src = fetchurl { + url = "http://download.drobilla.net/${name}.tar.bz2"; + sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5"; + }; + + buildInputs = [ lv2 pkgconfig python ]; + + installPhase = '' + python waf configure --prefix=$out + python waf + python waf install + ''; + + meta = with stdenv.lib; { + homepage = http://drobilla.net/software/fomp/; + description = "An LV2 port of the MCP, VCO, FIL, and WAH plugins by Fons Adriaensen"; + license = licenses.gpl2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95eabc5a3c4b..534bf6e7c4b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10949,6 +10949,8 @@ let inherit pkgconfig autoconf automake gettext; }; + fomp = callPackage ../applications/audio/fomp { }; + freecad = callPackage ../applications/graphics/freecad { boost = boost156; opencascade = opencascade_6_5; From 1ba5ef6b6a052dd83d4b1666f424b134810a42e3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 12 May 2015 14:29:16 +0200 Subject: [PATCH 071/615] viber: Mark as broken It doesn't evaluate due to Qt changes. Also improve checking in make-tarball.nix to catch this in the future. --- .../networking/instant-messengers/viber/default.nix | 1 + pkgs/top-level/make-tarball.nix | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index d268cbc55cfb..521f568ff5bb 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ jagajaga ]; + broken = true; }; } diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index c507acf8b1d1..d023470c48fc 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -54,7 +54,10 @@ releaseTools.sourceTarball rec { header "checking pkgs/top-level/all-packages.nix on $platform" NIXPKGS_ALLOW_BROKEN=1 nix-env -f pkgs/top-level/all-packages.nix \ --show-trace --argstr system "$platform" \ - -qa \* --drv-path --system-filter \* --system --meta --xml > /dev/null + -qa --drv-path --system-filter \* --system > /dev/null + NIXPKGS_ALLOW_BROKEN=1 nix-env -f pkgs/top-level/all-packages.nix \ + --show-trace --argstr system "$platform" \ + -qa --drv-path --system-filter \* --system --meta --xml > /dev/null stopNest done From bbefd04c8979dd36647d98abbd0e6111746120b6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 12 May 2015 13:28:39 +0200 Subject: [PATCH 072/615] gcc-5: Remove obsolete mudflap reference --- pkgs/development/compilers/gcc/5/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 7096467854c7..5adecc47b873 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -157,7 +157,6 @@ let version = "5.1.0"; " --disable-libssp --disable-nls" + " --without-headers" + " --disable-threads " + - " --disable-libmudflap " + " --disable-libgomp " + " --disable-libquadmath" + " --disable-shared" + From e75b5351ac6b2f9142c3e7db2fab6c86aa8f8cda Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 12 May 2015 13:46:47 +0200 Subject: [PATCH 073/615] gcc-4.9: Sync with changes made to the 4.8 expression --- pkgs/development/compilers/gcc/4.9/builder.sh | 245 ------------------ .../development/compilers/gcc/4.9/default.nix | 51 ++-- .../compilers/gcc/4.9/no-sys-dirs.patch | 41 --- 3 files changed, 33 insertions(+), 304 deletions(-) delete mode 100644 pkgs/development/compilers/gcc/4.9/builder.sh delete mode 100644 pkgs/development/compilers/gcc/4.9/no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc/4.9/builder.sh b/pkgs/development/compilers/gcc/4.9/builder.sh deleted file mode 100644 index 96bbd025ba63..000000000000 --- a/pkgs/development/compilers/gcc/4.9/builder.sh +++ /dev/null @@ -1,245 +0,0 @@ -source $stdenv/setup - - -export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy -mkdir $NIX_FIXINC_DUMMY - - -if test "$staticCompiler" = "1"; then - EXTRA_LDFLAGS="-static" -else - EXTRA_LDFLAGS="" -fi - -# GCC interprets empty paths as ".", which we don't want. -if test -z "$CPATH"; then unset CPATH; fi -if test -z "$LIBRARY_PATH"; then unset LIBRARY_PATH; fi -echo "\$CPATH is \`$CPATH'" -echo "\$LIBRARY_PATH is \`$LIBRARY_PATH'" - -if test "$noSysDirs" = "1"; then - - if test -e $NIX_CC/nix-support/orig-libc; then - - # Figure out what extra flags to pass to the gcc compilers - # being generated to make sure that they use our glibc. - extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)" - - # Use *real* header files, otherwise a limits.h is generated - # that does not include Glibc's limits.h (notably missing - # SSIZE_MAX, which breaks the build). - export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include - - # The path to the Glibc binaries such as `crti.o'. - glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib" - - else - # Hack: support impure environments. - extraFlags="-isystem /usr/include" - extraLDFlags="-L/usr/lib64 -L/usr/lib" - glibc_libdir="/usr/lib" - export NIX_FIXINC_DUMMY=/usr/include - fi - - extraFlags="-I$NIX_FIXINC_DUMMY $extraFlags" - extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" - - # BOOT_CFLAGS defaults to `-g -O2'; since we override it below, - # make sure to explictly add them so that files compiled with the - # bootstrap compiler are optimized and (optionally) contain - # debugging information (info "(gccinstall) Building"). - if test -n "$dontStrip"; then - extraFlags="-O2 -g $extraFlags" - else - # Don't pass `-g' at all; this saves space while building. - extraFlags="-O2 $extraFlags" - fi - - EXTRA_FLAGS="$extraFlags" - for i in $extraLDFlags; do - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,$i" - done - - if test -n "$targetConfig"; then - # Cross-compiling, we need gcc not to read ./specs in order to build - # the g++ compiler (after the specs for the cross-gcc are created). - # Having LIBRARY_PATH= makes gcc read the specs from ., and the build - # breaks. Having this variable comes from the default.nix code to bring - # gcj in. - unset LIBRARY_PATH - unset CPATH - if test -z "$crossStageStatic"; then - EXTRA_TARGET_CFLAGS="-B${libcCross}/lib -idirafter ${libcCross}/include" - EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib -Wl,-rpath,${libcCross}/lib -Wl,-rpath-link,${libcCross}/lib" - fi - else - if test -z "$NIX_CC_CROSS"; then - EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS" - EXTRA_TARGET_CXXFLAGS="$EXTRA_FLAGS" - EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS" - else - # This the case of cross-building the gcc. - # We need special flags for the target, different than those of the build - # Assertion: - test -e $NIX_CC_CROSS/nix-support/orig-libc - - # Figure out what extra flags to pass to the gcc compilers - # being generated to make sure that they use our glibc. - extraFlags="$(cat $NIX_CC_CROSS/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_CC_CROSS/nix-support/libc-ldflags) $(cat $NIX_CC_CROSS/nix-support/libc-ldflags-before)" - - # Use *real* header files, otherwise a limits.h is generated - # that does not include Glibc's limits.h (notably missing - # SSIZE_MAX, which breaks the build). - NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_CC_CROSS/nix-support/orig-libc)/include - - # The path to the Glibc binaries such as `crti.o'. - glibc_dir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)" - glibc_libdir="$glibc_dir/lib" - configureFlags="$configureFlags --with-native-system-header-dir=$glibc_dir/include" - - extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags" - extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" - - EXTRA_TARGET_CFLAGS="$extraFlags" - for i in $extraLDFlags; do - EXTRA_TARGET_LDFLAGS="$EXTRA_TARGET_LDFLAGS -Wl,$i" - done - fi - fi - - - # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find - # the startfiles. - # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx - # for the startfiles. - makeFlagsArray=( \ - "${makeFlagsArray[@]}" \ - NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ - SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ - CFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ - CXXFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ - CFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ - CXXFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ - FLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ - LDFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ - LDFLAGS_FOR_TARGET="$EXTRA_TARGET_LDFLAGS $EXTRA_TARGET_LDFLAGS" \ - ) - - if test -z "$targetConfig"; then - makeFlagsArray=( \ - "${makeFlagsArray[@]}" \ - BOOT_CFLAGS="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ - BOOT_LDFLAGS="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ - ) - fi - - if test -n "$targetConfig" -a "$crossStageStatic" == 1; then - # We don't want the gcc build to assume there will be a libc providing - # limits.h in this stagae - makeFlagsArray=( \ - "${makeFlagsArray[@]}" \ - LIMITS_H_TEST=false \ - ) - else - makeFlagsArray=( \ - "${makeFlagsArray[@]}" \ - LIMITS_H_TEST=true \ - ) - fi -fi - -if test -n "$targetConfig"; then - # The host strip will destroy some important details of the objects - dontStrip=1 -fi - -providedPreConfigure="$preConfigure"; -preConfigure() { - if test -n "$newlibSrc"; then - tar xvf "$newlibSrc" -C .. - ln -s ../newlib-*/newlib newlib - # Patch to get armvt5el working: - sed -i -e 's/ arm)/ arm*)/' newlib/configure.host - fi - # Bug - they packaged zlib - if test -d "zlib"; then - # This breaks the build without-headers, which should build only - # the target libgcc as target libraries. - # See 'configure:5370' - rm -Rf zlib - fi - - if test -f "$NIX_CC/nix-support/orig-libc"; then - # Patch the configure script so it finds glibc headers. It's - # important for example in order not to get libssp built, - # because its functionality is in glibc already. - glibc_headers="$(cat $NIX_CC/nix-support/orig-libc)/include" - sed -i \ - -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers", \ - gcc/configure - fi - - if test -n "$crossMingw" -a -n "$crossStageStatic"; then - mkdir -p ../mingw - # --with-build-sysroot expects that: - cp -R $libcCross/include ../mingw - configureFlags="$configureFlags --with-build-sysroot=`pwd`/.." - fi - - # Eval the preConfigure script from nix expression. - eval $providedPreConfigure; - env; - # Perform the build in a different directory. - mkdir ../build - cd ../build - configureScript=../$sourceRoot/configure -} - - -postConfigure() { - # Don't store the configure flags in the resulting executables. - sed -e '/TOPLEVEL_CONFIGURE_ARGUMENTS=/d' -i Makefile -} - - -postInstall() { - # Remove precompiled headers for now. They are very big and - # probably not very useful yet. - find $out/include -name "*.gch" -exec rm -rf {} \; -prune - - # Remove `fixincl' to prevent a retained dependency on the - # previous gcc. - rm -rf $out/libexec/gcc/*/*/install-tools - rm -rf $out/lib/gcc/*/*/install-tools - - # More dependencies with the previous gcc or some libs (gccbug stores the build command line) - rm -rf $out/bin/gccbug - # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out - for i in $out/libexec/gcc/*/*/*; do - if PREV_RPATH=`patchelf --print-rpath $i`; then - patchelf --set-rpath `echo $PREV_RPATH | sed 's,:[^:]*bootstrap-tools/lib,,'` $i - fi - done - - # Get rid of some "fixed" header files - rm -rf $out/lib/gcc/*/*/include/root - - # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. - for i in $out/bin/*-gcc*; do - if cmp -s $out/bin/gcc $i; then - ln -sfn gcc $i - fi - done - - for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do - if cmp -s $out/bin/g++ $i; then - ln -sfn g++ $i - fi - done - - eval "$postInstallGhdl" -} - -genericBuild diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 7de8a140c0ab..e0c37c4390fb 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, noSysDirs , langC ? true, langCC ? true, langFortran ? false +, langObjC ? stdenv.isDarwin +, langObjCpp ? stdenv.isDarwin , langJava ? false , langAda ? false , langVhdl ? false @@ -13,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 @@ -62,7 +66,7 @@ let version = "4.9.2"; patches = [ ] ++ optional enableParallelBuilding ./parallel-bconfig.patch ++ optional (cross != null) ./libstdc++-target.patch - # ++ optional noSysDirs ./no-sys-dirs.patch + ++ optional noSysDirs ../4.8/no-sys-dirs.patch # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its # target libraries and tools. ++ optional langAda ./gnat-cflags.patch @@ -80,8 +84,8 @@ let version = "4.9.2"; # Antlr (optional) allows the Java `gjdoc' tool to be built. We want a # binary distribution here to allow the whole chain to be bootstrapped. javaAntlr = fetchurl { - url = http://www.antlr.org/download/antlr-3.1.3.jar; - sha256 = "1f41j0y4kjydl71lqlvr73yagrs2jsg1fjymzjz66mjy7al5lh09"; + url = http://www.antlr.org/download/antlr-4.4-complete.jar; + sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz"; }; xlibs = [ @@ -89,7 +93,7 @@ let version = "4.9.2"; xproto renderproto xextproto inputproto randrproto ]; - javaAwtGtk = langJava && gtk != null; + javaAwtGtk = langJava && x11Support; /* Platform flags */ platformFlags = let @@ -156,6 +160,7 @@ let version = "4.9.2"; " --disable-libgomp " + " --disable-libquadmath" + " --disable-shared" + + " --disable-libatomic " + # libatomic requires libc " --disable-decimal-float" # libdecnumber requires libc else (if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot" @@ -196,12 +201,12 @@ let version = "4.9.2"; 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; - builder = ./builder.sh; + builder = ../4.8/builder.sh; src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; @@ -288,15 +293,21 @@ stdenv.mkDerivation ({ NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-lm -ldl"; - preConfigure = '' - ${stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) - '' - export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` - export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" - export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" - export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET" - ''} - ''; + preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) '' + export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` + export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" + export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" + export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + if SDKROOT=$(/usr/bin/xcrun --show-sdk-path); then + configureFlagsArray+=(--with-native-system-header-dir=$SDKROOT/usr/include) + makeFlagsArray+=( \ + CFLAGS_FOR_BUILD=-F$SDKROOT/System/Library/Frameworks \ + CFLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \ + FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \ + ) + fi + ''; dontDisableStatic = true; @@ -338,6 +349,8 @@ stdenv.mkDerivation ({ ++ optional langAda "ada" ++ optional langVhdl "vhdl" ++ optional langGo "go" + ++ optional langObjC "objc" + ++ optional langObjCpp "obj-c++" ++ optionals crossDarwin [ "objc" "obj-c++" ] ) ) @@ -475,9 +488,11 @@ stdenv.mkDerivation ({ else null; passthru = - { inherit langC langCC langAda langFortran langVhdl langGo enableMultilib version; isGNU = true; }; + { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; }; - inherit enableParallelBuilding; + inherit enableParallelBuilding enableMultilib; + + inherit (stdenv) is64bit; meta = { homepage = http://gcc.gnu.org/; diff --git a/pkgs/development/compilers/gcc/4.9/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.9/no-sys-dirs.patch deleted file mode 100644 index 79901703cb82..000000000000 --- a/pkgs/development/compilers/gcc/4.9/no-sys-dirs.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -ru gcc-4.3.1-orig/gcc/cppdefault.c gcc-4.3.1/gcc/cppdefault.c ---- gcc-4.3.1-orig/gcc/cppdefault.c 2007-07-26 10:37:01.000000000 +0200 -+++ gcc-4.3.1/gcc/cppdefault.c 2008-06-25 17:48:23.000000000 +0200 -@@ -41,6 +41,10 @@ - # undef CROSS_INCLUDE_DIR - #endif - -+#undef LOCAL_INCLUDE_DIR -+#undef SYSTEM_INCLUDE_DIR -+#undef STANDARD_INCLUDE_DIR -+ - const struct default_include cpp_include_defaults[] - #ifdef INCLUDE_DEFAULTS - = INCLUDE_DEFAULTS; -diff -ru gcc-4.3.1-orig/gcc/gcc.c gcc-4.3.1/gcc/gcc.c ---- gcc-4.3.1-orig/gcc/gcc.c 2008-03-02 23:55:19.000000000 +0100 -+++ gcc-4.3.1/gcc/gcc.c 2008-06-25 17:52:53.000000000 +0200 -@@ -1478,10 +1478,10 @@ - /* Default prefixes to attach to command names. */ - - #ifndef STANDARD_STARTFILE_PREFIX_1 --#define STANDARD_STARTFILE_PREFIX_1 "/lib/" -+#define STANDARD_STARTFILE_PREFIX_1 "" - #endif - #ifndef STANDARD_STARTFILE_PREFIX_2 --#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" -+#define STANDARD_STARTFILE_PREFIX_2 "" - #endif - - #ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */ ---- gcc-4.3.1-orig/gcc/Makefile.in 2008-05-11 20:54:15.000000000 +0200 -+++ gcc-4.3.1/gcc/Makefile.in 2008-06-25 17:48:23.000000000 +0200 -@@ -3277,7 +3281,7 @@ - -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ - -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \ - -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ -- -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \ -+ -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \ - -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \ - -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ - -DPREFIX=\"$(prefix)/\" \ From 7745c733ebbc071bd8f477e1afaade81b70fb951 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 12 May 2015 14:54:26 +0200 Subject: [PATCH 074/615] gcc: Remove duplicate files --- .../gcc/4.4/java-jvgenmain-link.patch | 17 -- .../development/compilers/gcc/4.5/default.nix | 4 +- .../gcc/4.5/java-jvgenmain-link.patch | 17 -- .../development/compilers/gcc/4.6/default.nix | 6 +- .../compilers/gcc/4.6/gnat-cflags.patch | 33 --- .../gcc/4.6/java-jvgenmain-link.patch | 17 -- .../compilers/gcc/4.6/libstdc++-target.patch | 32 --- .../development/compilers/gcc/4.8/default.nix | 12 +- .../compilers/gcc/4.8/gfortran-driving.patch | 20 -- .../compilers/gcc/4.8/gnat-cflags.patch | 33 --- .../gcc/4.8/java-jvgenmain-link.patch | 17 -- .../compilers/gcc/4.8/libstdc++-target.patch | 32 --- .../development/compilers/gcc/4.9/default.nix | 12 +- .../compilers/gcc/4.9/gfortran-driving.patch | 20 -- .../compilers/gcc/4.9/gnat-cflags.patch | 33 --- .../gcc/4.9/java-jvgenmain-link.patch | 17 -- .../compilers/gcc/4.9/libstdc++-target.patch | 32 --- .../compilers/gcc/4.9/parallel-bconfig.patch | 32 --- pkgs/development/compilers/gcc/5/builder.sh | 255 ------------------ pkgs/development/compilers/gcc/5/default.nix | 10 +- .../compilers/gcc/5/gfortran-driving.patch | 20 -- .../compilers/gcc/5/gnat-cflags.patch | 33 --- .../compilers/gcc/5/java-jvgenmain-link.patch | 17 -- .../compilers/gcc/5/libstdc++-target.patch | 32 --- .../compilers/gcc/5/no-sys-dirs.patch | 28 -- .../compilers/gcc/{4.8 => }/builder.sh | 0 .../gcc/{4.6 => }/gfortran-driving.patch | 0 .../compilers/gcc/{4.5 => }/gnat-cflags.patch | 0 .../gcc/{4.5 => }/libstdc++-target.patch | 0 .../compilers/gcc/{4.8 => }/no-sys-dirs.patch | 0 .../gcc/{4.8 => }/parallel-bconfig.patch | 0 31 files changed, 22 insertions(+), 759 deletions(-) delete mode 100644 pkgs/development/compilers/gcc/4.4/java-jvgenmain-link.patch delete mode 100644 pkgs/development/compilers/gcc/4.5/java-jvgenmain-link.patch delete mode 100644 pkgs/development/compilers/gcc/4.6/gnat-cflags.patch delete mode 100644 pkgs/development/compilers/gcc/4.6/java-jvgenmain-link.patch delete mode 100644 pkgs/development/compilers/gcc/4.6/libstdc++-target.patch delete mode 100644 pkgs/development/compilers/gcc/4.8/gfortran-driving.patch delete mode 100644 pkgs/development/compilers/gcc/4.8/gnat-cflags.patch delete mode 100644 pkgs/development/compilers/gcc/4.8/java-jvgenmain-link.patch delete mode 100644 pkgs/development/compilers/gcc/4.8/libstdc++-target.patch delete mode 100644 pkgs/development/compilers/gcc/4.9/gfortran-driving.patch delete mode 100644 pkgs/development/compilers/gcc/4.9/gnat-cflags.patch delete mode 100644 pkgs/development/compilers/gcc/4.9/java-jvgenmain-link.patch delete mode 100644 pkgs/development/compilers/gcc/4.9/libstdc++-target.patch delete mode 100644 pkgs/development/compilers/gcc/4.9/parallel-bconfig.patch delete mode 100644 pkgs/development/compilers/gcc/5/builder.sh delete mode 100644 pkgs/development/compilers/gcc/5/gfortran-driving.patch delete mode 100644 pkgs/development/compilers/gcc/5/gnat-cflags.patch delete mode 100644 pkgs/development/compilers/gcc/5/java-jvgenmain-link.patch delete mode 100644 pkgs/development/compilers/gcc/5/libstdc++-target.patch delete mode 100644 pkgs/development/compilers/gcc/5/no-sys-dirs.patch rename pkgs/development/compilers/gcc/{4.8 => }/builder.sh (100%) rename pkgs/development/compilers/gcc/{4.6 => }/gfortran-driving.patch (100%) rename pkgs/development/compilers/gcc/{4.5 => }/gnat-cflags.patch (100%) rename pkgs/development/compilers/gcc/{4.5 => }/libstdc++-target.patch (100%) rename pkgs/development/compilers/gcc/{4.8 => }/no-sys-dirs.patch (100%) rename pkgs/development/compilers/gcc/{4.8 => }/parallel-bconfig.patch (100%) diff --git a/pkgs/development/compilers/gcc/4.4/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.4/java-jvgenmain-link.patch deleted file mode 100644 index 2612e8bfbbbc..000000000000 --- a/pkgs/development/compilers/gcc/4.4/java-jvgenmain-link.patch +++ /dev/null @@ -1,17 +0,0 @@ -The `jvgenmain' executable must be linked against `vec.o', among others, -since it uses its vector API. - ---- gcc-4.3.3/gcc/java/Make-lang.in 2008-12-05 00:00:19.000000000 +0100 -+++ gcc-4.3.3/gcc/java/Make-lang.in 2009-07-03 16:11:41.000000000 +0200 -@@ -109,9 +109,9 @@ jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIB - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \ - $(CPPLIBS) $(ZLIB) $(LDEXP_LIB) $(LIBS) - --jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) -+jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) $(BUILD_RTL) - rm -f $@ -- $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(LIBS) -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(BUILD_RTL) $(LIBS) - - # - # Build hooks: diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index c4be4f266dd1..6cde7aba92a0 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -136,11 +136,11 @@ stdenv.mkDerivation ({ patches = [ ] - ++ optional (cross != null) ./libstdc++-target.patch + ++ optional (cross != null) ../libstdc++-target.patch ++ optional noSysDirs ./no-sys-dirs.patch # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its # target libraries and tools. - ++ optional langAda ./gnat-cflags.patch + ++ optional langAda ../gnat-cflags.patch ++ optional langVhdl ./ghdl-ortho-cflags.patch ; diff --git a/pkgs/development/compilers/gcc/4.5/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.5/java-jvgenmain-link.patch deleted file mode 100644 index 2612e8bfbbbc..000000000000 --- a/pkgs/development/compilers/gcc/4.5/java-jvgenmain-link.patch +++ /dev/null @@ -1,17 +0,0 @@ -The `jvgenmain' executable must be linked against `vec.o', among others, -since it uses its vector API. - ---- gcc-4.3.3/gcc/java/Make-lang.in 2008-12-05 00:00:19.000000000 +0100 -+++ gcc-4.3.3/gcc/java/Make-lang.in 2009-07-03 16:11:41.000000000 +0200 -@@ -109,9 +109,9 @@ jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIB - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \ - $(CPPLIBS) $(ZLIB) $(LDEXP_LIB) $(LIBS) - --jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) -+jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) $(BUILD_RTL) - rm -f $@ -- $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(LIBS) -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(BUILD_RTL) $(LIBS) - - # - # Build hooks: diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 0f65a89bd209..b3caad11b716 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -52,13 +52,13 @@ let version = "4.6.4"; crossGNU = cross != null && cross.config == "i586-pc-gnu"; patches = [ ] - ++ optional (cross != null) ./libstdc++-target.patch + ++ optional (cross != null) ../libstdc++-target.patch ++ optional noSysDirs ./no-sys-dirs.patch # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its # target libraries and tools. - ++ optional langAda ./gnat-cflags.patch + ++ optional langAda ../gnat-cflags.patch ++ optional langVhdl ./ghdl-ortho-cflags.patch - ++ optional langFortran ./gfortran-driving.patch + ++ optional langFortran ../gfortran-driving.patch ++ optional (stdenv.isGNU || crossGNU) ./hurd-sigrtmin.patch; javaEcj = fetchurl { diff --git a/pkgs/development/compilers/gcc/4.6/gnat-cflags.patch b/pkgs/development/compilers/gcc/4.6/gnat-cflags.patch deleted file mode 100644 index bf2acf065e9b..000000000000 --- a/pkgs/development/compilers/gcc/4.6/gnat-cflags.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/libada/Makefile.in b/libada/Makefile.in -index f5057a0..337e0c6 100644 ---- a/libada/Makefile.in -+++ b/libada/Makefile.in -@@ -55,7 +55,7 @@ GCC_WARN_CFLAGS = $(LOOSE_WARN) - WARN_CFLAGS = @warn_cflags@ - - TARGET_LIBGCC2_CFLAGS= --GNATLIBCFLAGS= -g -O2 -+GNATLIBCFLAGS= -g -O2 $(CFLAGS) - GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \ - -DIN_RTS @have_getipinfo@ - ---- a/gcc/ada/gcc-interface/Makefile.in -+++ b/gcc/ada/gcc-interface/Makefile.in -@@ -105,7 +105,7 @@ ADAFLAGS = -W -Wall -gnatpg -gnata - SOME_ADAFLAGS =-gnata - FORCE_DEBUG_ADAFLAGS = -g - GNATLIBFLAGS = -gnatpg -nostdinc --GNATLIBCFLAGS = -g -O2 -+GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET) - # Pretend that _Unwind_GetIPInfo is available for the target by default. This - # should be autodetected during the configuration of libada and passed down to - # here, but we need something for --disable-libada and hope for the best. -@@ -193,7 +193,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR)) - # Link flags used to build gnat tools. By default we prefer to statically - # link with libgcc to avoid a dependency on shared libgcc (which is tricky - # to deal with as it may conflict with the libgcc provided by the system). --GCC_LINK_FLAGS=-static-libgcc -+GCC_LINK_FLAGS=-static-libgcc $(CFLAGS_FOR_TARGET) - - # End of variables for you to override. - diff --git a/pkgs/development/compilers/gcc/4.6/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.6/java-jvgenmain-link.patch deleted file mode 100644 index 2612e8bfbbbc..000000000000 --- a/pkgs/development/compilers/gcc/4.6/java-jvgenmain-link.patch +++ /dev/null @@ -1,17 +0,0 @@ -The `jvgenmain' executable must be linked against `vec.o', among others, -since it uses its vector API. - ---- gcc-4.3.3/gcc/java/Make-lang.in 2008-12-05 00:00:19.000000000 +0100 -+++ gcc-4.3.3/gcc/java/Make-lang.in 2009-07-03 16:11:41.000000000 +0200 -@@ -109,9 +109,9 @@ jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIB - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \ - $(CPPLIBS) $(ZLIB) $(LDEXP_LIB) $(LIBS) - --jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) -+jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) $(BUILD_RTL) - rm -f $@ -- $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(LIBS) -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(BUILD_RTL) $(LIBS) - - # - # Build hooks: diff --git a/pkgs/development/compilers/gcc/4.6/libstdc++-target.patch b/pkgs/development/compilers/gcc/4.6/libstdc++-target.patch deleted file mode 100644 index fb622b395806..000000000000 --- a/pkgs/development/compilers/gcc/4.6/libstdc++-target.patch +++ /dev/null @@ -1,32 +0,0 @@ -Patch to make the target libraries 'configure' scripts find the proper CPP. -I noticed that building the mingw32 cross compiler. -Looking at the build script for mingw in archlinux, I think that only nixos -needs this patch. I don't know why. -diff --git a/Makefile.in b/Makefile.in -index 93f66b6..d691917 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -266,6 +266,7 @@ BASE_TARGET_EXPORTS = \ - AR="$(AR_FOR_TARGET)"; export AR; \ - AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ - CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \ -+ CPP="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CC; \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ - CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ -@@ -291,11 +292,13 @@ BASE_TARGET_EXPORTS = \ - RAW_CXX_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ - CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ -- CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; -+ CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \ -+ CXXCPP="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX; - - NORMAL_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ -- CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; -+ CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \ -+ CXXCPP="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX; - - # Where to find GMP - HOST_GMPLIBS = @gmplibs@ diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 0958ce7b1c97..6d5627c34d68 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -64,13 +64,13 @@ let version = "4.8.4"; enableParallelBuilding = true; patches = [ ] - ++ optional enableParallelBuilding ./parallel-bconfig.patch - ++ optional (cross != null) ./libstdc++-target.patch - ++ optional noSysDirs ./no-sys-dirs.patch + ++ optional enableParallelBuilding ../parallel-bconfig.patch + ++ optional (cross != null) ../libstdc++-target.patch + ++ optional noSysDirs ../no-sys-dirs.patch # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its # target libraries and tools. - ++ optional langAda ./gnat-cflags.patch - ++ optional langFortran ./gfortran-driving.patch; + ++ optional langAda ../gnat-cflags.patch + ++ optional langFortran ../gfortran-driving.patch; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at @@ -207,7 +207,7 @@ assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == [ stdenv.mkDerivation ({ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; - builder = ./builder.sh; + builder = ../builder.sh; src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; diff --git a/pkgs/development/compilers/gcc/4.8/gfortran-driving.patch b/pkgs/development/compilers/gcc/4.8/gfortran-driving.patch deleted file mode 100644 index 70708886b405..000000000000 --- a/pkgs/development/compilers/gcc/4.8/gfortran-driving.patch +++ /dev/null @@ -1,20 +0,0 @@ -This patch fixes interaction with Libtool. -See , for details. - ---- a/gcc/fortran/gfortranspec.c -+++ b/gcc/fortran/gfortranspec.c -@@ -461,8 +461,15 @@ For more information about these matters, see the file named COPYING\n\n")); - { - fprintf (stderr, _("Driving:")); - for (i = 0; i < g77_newargc; i++) -+ { -+ if (g77_new_decoded_options[i].opt_index == OPT_l) -+ /* Make sure no white space is inserted after `-l'. */ -+ fprintf (stderr, " -l%s", -+ g77_new_decoded_options[i].canonical_option[1]); -+ else - fprintf (stderr, " %s", - g77_new_decoded_options[i].orig_option_with_args_text); -+ } - fprintf (stderr, "\n"); - } diff --git a/pkgs/development/compilers/gcc/4.8/gnat-cflags.patch b/pkgs/development/compilers/gcc/4.8/gnat-cflags.patch deleted file mode 100644 index bf2acf065e9b..000000000000 --- a/pkgs/development/compilers/gcc/4.8/gnat-cflags.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/libada/Makefile.in b/libada/Makefile.in -index f5057a0..337e0c6 100644 ---- a/libada/Makefile.in -+++ b/libada/Makefile.in -@@ -55,7 +55,7 @@ GCC_WARN_CFLAGS = $(LOOSE_WARN) - WARN_CFLAGS = @warn_cflags@ - - TARGET_LIBGCC2_CFLAGS= --GNATLIBCFLAGS= -g -O2 -+GNATLIBCFLAGS= -g -O2 $(CFLAGS) - GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \ - -DIN_RTS @have_getipinfo@ - ---- a/gcc/ada/gcc-interface/Makefile.in -+++ b/gcc/ada/gcc-interface/Makefile.in -@@ -105,7 +105,7 @@ ADAFLAGS = -W -Wall -gnatpg -gnata - SOME_ADAFLAGS =-gnata - FORCE_DEBUG_ADAFLAGS = -g - GNATLIBFLAGS = -gnatpg -nostdinc --GNATLIBCFLAGS = -g -O2 -+GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET) - # Pretend that _Unwind_GetIPInfo is available for the target by default. This - # should be autodetected during the configuration of libada and passed down to - # here, but we need something for --disable-libada and hope for the best. -@@ -193,7 +193,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR)) - # Link flags used to build gnat tools. By default we prefer to statically - # link with libgcc to avoid a dependency on shared libgcc (which is tricky - # to deal with as it may conflict with the libgcc provided by the system). --GCC_LINK_FLAGS=-static-libgcc -+GCC_LINK_FLAGS=-static-libgcc $(CFLAGS_FOR_TARGET) - - # End of variables for you to override. - diff --git a/pkgs/development/compilers/gcc/4.8/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.8/java-jvgenmain-link.patch deleted file mode 100644 index 2612e8bfbbbc..000000000000 --- a/pkgs/development/compilers/gcc/4.8/java-jvgenmain-link.patch +++ /dev/null @@ -1,17 +0,0 @@ -The `jvgenmain' executable must be linked against `vec.o', among others, -since it uses its vector API. - ---- gcc-4.3.3/gcc/java/Make-lang.in 2008-12-05 00:00:19.000000000 +0100 -+++ gcc-4.3.3/gcc/java/Make-lang.in 2009-07-03 16:11:41.000000000 +0200 -@@ -109,9 +109,9 @@ jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIB - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \ - $(CPPLIBS) $(ZLIB) $(LDEXP_LIB) $(LIBS) - --jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) -+jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) $(BUILD_RTL) - rm -f $@ -- $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(LIBS) -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(BUILD_RTL) $(LIBS) - - # - # Build hooks: diff --git a/pkgs/development/compilers/gcc/4.8/libstdc++-target.patch b/pkgs/development/compilers/gcc/4.8/libstdc++-target.patch deleted file mode 100644 index fb622b395806..000000000000 --- a/pkgs/development/compilers/gcc/4.8/libstdc++-target.patch +++ /dev/null @@ -1,32 +0,0 @@ -Patch to make the target libraries 'configure' scripts find the proper CPP. -I noticed that building the mingw32 cross compiler. -Looking at the build script for mingw in archlinux, I think that only nixos -needs this patch. I don't know why. -diff --git a/Makefile.in b/Makefile.in -index 93f66b6..d691917 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -266,6 +266,7 @@ BASE_TARGET_EXPORTS = \ - AR="$(AR_FOR_TARGET)"; export AR; \ - AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ - CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \ -+ CPP="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CC; \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ - CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ -@@ -291,11 +292,13 @@ BASE_TARGET_EXPORTS = \ - RAW_CXX_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ - CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ -- CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; -+ CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \ -+ CXXCPP="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX; - - NORMAL_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ -- CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; -+ CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \ -+ CXXCPP="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX; - - # Where to find GMP - HOST_GMPLIBS = @gmplibs@ diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index e0c37c4390fb..16737ffc8963 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -64,13 +64,13 @@ let version = "4.9.2"; enableParallelBuilding = true; patches = [ ] - ++ optional enableParallelBuilding ./parallel-bconfig.patch - ++ optional (cross != null) ./libstdc++-target.patch - ++ optional noSysDirs ../4.8/no-sys-dirs.patch + ++ optional enableParallelBuilding ../parallel-bconfig.patch + ++ optional (cross != null) ../libstdc++-target.patch + ++ optional noSysDirs ../no-sys-dirs.patch # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its # target libraries and tools. - ++ optional langAda ./gnat-cflags.patch - ++ optional langFortran ./gfortran-driving.patch; + ++ optional langAda ../gnat-cflags.patch + ++ optional langFortran ../gfortran-driving.patch; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at @@ -206,7 +206,7 @@ assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == [ stdenv.mkDerivation ({ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; - builder = ../4.8/builder.sh; + builder = ../builder.sh; src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; diff --git a/pkgs/development/compilers/gcc/4.9/gfortran-driving.patch b/pkgs/development/compilers/gcc/4.9/gfortran-driving.patch deleted file mode 100644 index 70708886b405..000000000000 --- a/pkgs/development/compilers/gcc/4.9/gfortran-driving.patch +++ /dev/null @@ -1,20 +0,0 @@ -This patch fixes interaction with Libtool. -See , for details. - ---- a/gcc/fortran/gfortranspec.c -+++ b/gcc/fortran/gfortranspec.c -@@ -461,8 +461,15 @@ For more information about these matters, see the file named COPYING\n\n")); - { - fprintf (stderr, _("Driving:")); - for (i = 0; i < g77_newargc; i++) -+ { -+ if (g77_new_decoded_options[i].opt_index == OPT_l) -+ /* Make sure no white space is inserted after `-l'. */ -+ fprintf (stderr, " -l%s", -+ g77_new_decoded_options[i].canonical_option[1]); -+ else - fprintf (stderr, " %s", - g77_new_decoded_options[i].orig_option_with_args_text); -+ } - fprintf (stderr, "\n"); - } diff --git a/pkgs/development/compilers/gcc/4.9/gnat-cflags.patch b/pkgs/development/compilers/gcc/4.9/gnat-cflags.patch deleted file mode 100644 index bf2acf065e9b..000000000000 --- a/pkgs/development/compilers/gcc/4.9/gnat-cflags.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/libada/Makefile.in b/libada/Makefile.in -index f5057a0..337e0c6 100644 ---- a/libada/Makefile.in -+++ b/libada/Makefile.in -@@ -55,7 +55,7 @@ GCC_WARN_CFLAGS = $(LOOSE_WARN) - WARN_CFLAGS = @warn_cflags@ - - TARGET_LIBGCC2_CFLAGS= --GNATLIBCFLAGS= -g -O2 -+GNATLIBCFLAGS= -g -O2 $(CFLAGS) - GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \ - -DIN_RTS @have_getipinfo@ - ---- a/gcc/ada/gcc-interface/Makefile.in -+++ b/gcc/ada/gcc-interface/Makefile.in -@@ -105,7 +105,7 @@ ADAFLAGS = -W -Wall -gnatpg -gnata - SOME_ADAFLAGS =-gnata - FORCE_DEBUG_ADAFLAGS = -g - GNATLIBFLAGS = -gnatpg -nostdinc --GNATLIBCFLAGS = -g -O2 -+GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET) - # Pretend that _Unwind_GetIPInfo is available for the target by default. This - # should be autodetected during the configuration of libada and passed down to - # here, but we need something for --disable-libada and hope for the best. -@@ -193,7 +193,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR)) - # Link flags used to build gnat tools. By default we prefer to statically - # link with libgcc to avoid a dependency on shared libgcc (which is tricky - # to deal with as it may conflict with the libgcc provided by the system). --GCC_LINK_FLAGS=-static-libgcc -+GCC_LINK_FLAGS=-static-libgcc $(CFLAGS_FOR_TARGET) - - # End of variables for you to override. - diff --git a/pkgs/development/compilers/gcc/4.9/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.9/java-jvgenmain-link.patch deleted file mode 100644 index 2612e8bfbbbc..000000000000 --- a/pkgs/development/compilers/gcc/4.9/java-jvgenmain-link.patch +++ /dev/null @@ -1,17 +0,0 @@ -The `jvgenmain' executable must be linked against `vec.o', among others, -since it uses its vector API. - ---- gcc-4.3.3/gcc/java/Make-lang.in 2008-12-05 00:00:19.000000000 +0100 -+++ gcc-4.3.3/gcc/java/Make-lang.in 2009-07-03 16:11:41.000000000 +0200 -@@ -109,9 +109,9 @@ jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIB - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \ - $(CPPLIBS) $(ZLIB) $(LDEXP_LIB) $(LIBS) - --jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) -+jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) $(BUILD_RTL) - rm -f $@ -- $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(LIBS) -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(BUILD_RTL) $(LIBS) - - # - # Build hooks: diff --git a/pkgs/development/compilers/gcc/4.9/libstdc++-target.patch b/pkgs/development/compilers/gcc/4.9/libstdc++-target.patch deleted file mode 100644 index fb622b395806..000000000000 --- a/pkgs/development/compilers/gcc/4.9/libstdc++-target.patch +++ /dev/null @@ -1,32 +0,0 @@ -Patch to make the target libraries 'configure' scripts find the proper CPP. -I noticed that building the mingw32 cross compiler. -Looking at the build script for mingw in archlinux, I think that only nixos -needs this patch. I don't know why. -diff --git a/Makefile.in b/Makefile.in -index 93f66b6..d691917 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -266,6 +266,7 @@ BASE_TARGET_EXPORTS = \ - AR="$(AR_FOR_TARGET)"; export AR; \ - AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ - CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \ -+ CPP="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CC; \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ - CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ -@@ -291,11 +292,13 @@ BASE_TARGET_EXPORTS = \ - RAW_CXX_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ - CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ -- CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; -+ CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \ -+ CXXCPP="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX; - - NORMAL_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ -- CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; -+ CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \ -+ CXXCPP="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX; - - # Where to find GMP - HOST_GMPLIBS = @gmplibs@ diff --git a/pkgs/development/compilers/gcc/4.9/parallel-bconfig.patch b/pkgs/development/compilers/gcc/4.9/parallel-bconfig.patch deleted file mode 100644 index bc56ac698f5a..000000000000 --- a/pkgs/development/compilers/gcc/4.9/parallel-bconfig.patch +++ /dev/null @@ -1,32 +0,0 @@ -Hacky work-around for highly parallel builds. -http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57125 - -diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index aad927c..182f666 100644 ---- a/gcc/Makefile.in -+++ b/gcc/Makefile.in -@@ -3908,21 +3908,21 @@ build/gengtype-lex.o: $(BCONFIG_H) - - gengtype-parse.o build/gengtype-parse.o : gengtype-parse.c gengtype.h \ - $(SYSTEM_H) --gengtype-parse.o: $(CONFIG_H) -+gengtype-parse.o: $(CONFIG_H) $(BCONFIG_H) - CFLAGS-gengtype-parse.o += -DGENERATOR_FILE - build/gengtype-parse.o: $(BCONFIG_H) - - gengtype-state.o build/gengtype-state.o: gengtype-state.c $(SYSTEM_H) \ - gengtype.h errors.h double-int.h version.h $(HASHTAB_H) $(OBSTACK_H) \ - $(XREGEX_H) --gengtype-state.o: $(CONFIG_H) -+gengtype-state.o: $(CONFIG_H) $(BCONFIG_H) - CFLAGS-gengtype-state.o += -DGENERATOR_FILE - build/gengtype-state.o: $(BCONFIG_H) - - gengtype.o build/gengtype.o : gengtype.c $(SYSTEM_H) gengtype.h \ - rtl.def insn-notes.def errors.h double-int.h version.h $(HASHTAB_H) \ - $(OBSTACK_H) $(XREGEX_H) --gengtype.o: $(CONFIG_H) -+gengtype.o: $(CONFIG_H) $(BCONFIG_H) - CFLAGS-gengtype.o += -DGENERATOR_FILE - build/gengtype.o: $(BCONFIG_H) - diff --git a/pkgs/development/compilers/gcc/5/builder.sh b/pkgs/development/compilers/gcc/5/builder.sh deleted file mode 100644 index dd77c67a023e..000000000000 --- a/pkgs/development/compilers/gcc/5/builder.sh +++ /dev/null @@ -1,255 +0,0 @@ -source $stdenv/setup - - -export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy -mkdir $NIX_FIXINC_DUMMY - - -if test "$staticCompiler" = "1"; then - EXTRA_LDFLAGS="-static" -else - EXTRA_LDFLAGS="" -fi - -# GCC interprets empty paths as ".", which we don't want. -if test -z "$CPATH"; then unset CPATH; fi -if test -z "$LIBRARY_PATH"; then unset LIBRARY_PATH; fi -echo "\$CPATH is \`$CPATH'" -echo "\$LIBRARY_PATH is \`$LIBRARY_PATH'" - -if test "$noSysDirs" = "1"; then - - if test -e $NIX_CC/nix-support/orig-libc; then - - # Figure out what extra flags to pass to the gcc compilers - # being generated to make sure that they use our glibc. - extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)" - - # Use *real* header files, otherwise a limits.h is generated - # that does not include Glibc's limits.h (notably missing - # SSIZE_MAX, which breaks the build). - export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include - - # The path to the Glibc binaries such as `crti.o'. - glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib" - - else - # Hack: support impure environments. - extraFlags="-isystem /usr/include" - extraLDFlags="-L/usr/lib64 -L/usr/lib" - glibc_libdir="/usr/lib" - export NIX_FIXINC_DUMMY=/usr/include - fi - - extraFlags="-I$NIX_FIXINC_DUMMY $extraFlags" - extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" - - # BOOT_CFLAGS defaults to `-g -O2'; since we override it below, - # make sure to explictly add them so that files compiled with the - # bootstrap compiler are optimized and (optionally) contain - # debugging information (info "(gccinstall) Building"). - if test -n "$dontStrip"; then - extraFlags="-O2 -g $extraFlags" - else - # Don't pass `-g' at all; this saves space while building. - extraFlags="-O2 $extraFlags" - fi - - EXTRA_FLAGS="$extraFlags" - for i in $extraLDFlags; do - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,$i" - done - - if test -n "$targetConfig"; then - # Cross-compiling, we need gcc not to read ./specs in order to build - # the g++ compiler (after the specs for the cross-gcc are created). - # Having LIBRARY_PATH= makes gcc read the specs from ., and the build - # breaks. Having this variable comes from the default.nix code to bring - # gcj in. - unset LIBRARY_PATH - unset CPATH - if test -z "$crossStageStatic"; then - EXTRA_TARGET_CFLAGS="-B${libcCross}/lib -idirafter ${libcCross}/include" - EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib -Wl,-rpath,${libcCross}/lib -Wl,-rpath-link,${libcCross}/lib" - fi - else - if test -z "$NIX_CC_CROSS"; then - EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS" - EXTRA_TARGET_CXXFLAGS="$EXTRA_FLAGS" - EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS" - else - # This the case of cross-building the gcc. - # We need special flags for the target, different than those of the build - # Assertion: - test -e $NIX_CC_CROSS/nix-support/orig-libc - - # Figure out what extra flags to pass to the gcc compilers - # being generated to make sure that they use our glibc. - extraFlags="$(cat $NIX_CC_CROSS/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_CC_CROSS/nix-support/libc-ldflags) $(cat $NIX_CC_CROSS/nix-support/libc-ldflags-before)" - - # Use *real* header files, otherwise a limits.h is generated - # that does not include Glibc's limits.h (notably missing - # SSIZE_MAX, which breaks the build). - NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_CC_CROSS/nix-support/orig-libc)/include - - # The path to the Glibc binaries such as `crti.o'. - glibc_dir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)" - glibc_libdir="$glibc_dir/lib" - configureFlags="$configureFlags --with-native-system-header-dir=$glibc_dir/include" - - extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags" - extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" - - EXTRA_TARGET_CFLAGS="$extraFlags" - for i in $extraLDFlags; do - EXTRA_TARGET_LDFLAGS="$EXTRA_TARGET_LDFLAGS -Wl,$i" - done - fi - fi - - # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find - # the startfiles. - # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx - # for the startfiles. - makeFlagsArray+=( \ - NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ - SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ - CFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ - CXXFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ - CFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ - CXXFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ - FLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ - LDFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ - LDFLAGS_FOR_TARGET="$EXTRA_TARGET_LDFLAGS $EXTRA_TARGET_LDFLAGS" \ - ) - - if test -z "$targetConfig"; then - makeFlagsArray+=( \ - BOOT_CFLAGS="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ - BOOT_LDFLAGS="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ - ) - fi - - if test -n "$targetConfig" -a "$crossStageStatic" == 1; then - # We don't want the gcc build to assume there will be a libc providing - # limits.h in this stagae - makeFlagsArray+=( \ - LIMITS_H_TEST=false \ - ) - else - makeFlagsArray+=( \ - LIMITS_H_TEST=true \ - ) - fi -fi - -if test -n "$targetConfig"; then - # The host strip will destroy some important details of the objects - dontStrip=1 -fi - -providedPreConfigure="$preConfigure"; -preConfigure() { - if test -n "$newlibSrc"; then - tar xvf "$newlibSrc" -C .. - ln -s ../newlib-*/newlib newlib - # Patch to get armvt5el working: - sed -i -e 's/ arm)/ arm*)/' newlib/configure.host - fi - - # Bug - they packaged zlib - if test -d "zlib"; then - # This breaks the build without-headers, which should build only - # the target libgcc as target libraries. - # See 'configure:5370' - rm -Rf zlib - fi - - if test -f "$NIX_CC/nix-support/orig-libc"; then - # Patch the configure script so it finds glibc headers. It's - # important for example in order not to get libssp built, - # because its functionality is in glibc already. - glibc_headers="$(cat $NIX_CC/nix-support/orig-libc)/include" - sed -i \ - -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers", \ - gcc/configure - fi - - if test -n "$crossMingw" -a -n "$crossStageStatic"; then - mkdir -p ../mingw - # --with-build-sysroot expects that: - cp -R $libcCross/include ../mingw - configureFlags="$configureFlags --with-build-sysroot=`pwd`/.." - fi - - # Eval the preConfigure script from nix expression. - eval "$providedPreConfigure" - - # Perform the build in a different directory. - mkdir ../build - cd ../build - configureScript=../$sourceRoot/configure -} - - -postConfigure() { - # Don't store the configure flags in the resulting executables. - sed -e '/TOPLEVEL_CONFIGURE_ARGUMENTS=/d' -i Makefile -} - - -preInstall() { - # Make ‘lib64’ a symlink to ‘lib’. - if [ -n "$is64bit" -a -z "$enableMultilib" ]; then - mkdir -p $out/lib - ln -s lib $out/lib64 - fi -} - - -postInstall() { - # Remove precompiled headers for now. They are very big and - # probably not very useful yet. - find $out/include -name "*.gch" -exec rm -rf {} \; -prune - - # Remove `fixincl' to prevent a retained dependency on the - # previous gcc. - rm -rf $out/libexec/gcc/*/*/install-tools - rm -rf $out/lib/gcc/*/*/install-tools - - # More dependencies with the previous gcc or some libs (gccbug stores the build command line) - rm -rf $out/bin/gccbug - # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out - for i in $out/libexec/gcc/*/*/*; do - if PREV_RPATH=`patchelf --print-rpath $i`; then - patchelf --set-rpath `echo $PREV_RPATH | sed 's,:[^:]*bootstrap-tools/lib,,'` $i - fi - done - - # Get rid of some "fixed" header files - rm -rf $out/lib/gcc/*/*/include/root - - # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. - for i in $out/bin/*-gcc*; do - if cmp -s $out/bin/gcc $i; then - ln -sfn gcc $i - fi - done - - for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do - if cmp -s $out/bin/g++ $i; then - ln -sfn g++ $i - fi - done - - # Disable RANDMMAP on grsec, which causes segfaults when using - # precompiled headers. - # See https://bugs.gentoo.org/show_bug.cgi?id=301299#c31 - paxmark r $out/libexec/gcc/*/*/{cc1,cc1plus} - - eval "$postInstallGhdl" -} - -genericBuild diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 5adecc47b873..95125d99893c 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -65,12 +65,12 @@ let version = "5.1.0"; enableParallelBuilding = true; patches = [ ] - ++ optional (cross != null) ./libstdc++-target.patch - ++ optional noSysDirs ./no-sys-dirs.patch + ++ optional (cross != null) ../libstdc++-target.patch + ++ optional noSysDirs ../no-sys-dirs.patch # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its # target libraries and tools. - ++ optional langAda ./gnat-cflags.patch - ++ optional langFortran ./gfortran-driving.patch; + ++ optional langAda ../gnat-cflags.patch + ++ optional langFortran ../gfortran-driving.patch; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at @@ -206,7 +206,7 @@ assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == [ stdenv.mkDerivation ({ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; - builder = ./builder.sh; + builder = ../builder.sh; src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; diff --git a/pkgs/development/compilers/gcc/5/gfortran-driving.patch b/pkgs/development/compilers/gcc/5/gfortran-driving.patch deleted file mode 100644 index 70708886b405..000000000000 --- a/pkgs/development/compilers/gcc/5/gfortran-driving.patch +++ /dev/null @@ -1,20 +0,0 @@ -This patch fixes interaction with Libtool. -See , for details. - ---- a/gcc/fortran/gfortranspec.c -+++ b/gcc/fortran/gfortranspec.c -@@ -461,8 +461,15 @@ For more information about these matters, see the file named COPYING\n\n")); - { - fprintf (stderr, _("Driving:")); - for (i = 0; i < g77_newargc; i++) -+ { -+ if (g77_new_decoded_options[i].opt_index == OPT_l) -+ /* Make sure no white space is inserted after `-l'. */ -+ fprintf (stderr, " -l%s", -+ g77_new_decoded_options[i].canonical_option[1]); -+ else - fprintf (stderr, " %s", - g77_new_decoded_options[i].orig_option_with_args_text); -+ } - fprintf (stderr, "\n"); - } diff --git a/pkgs/development/compilers/gcc/5/gnat-cflags.patch b/pkgs/development/compilers/gcc/5/gnat-cflags.patch deleted file mode 100644 index bf2acf065e9b..000000000000 --- a/pkgs/development/compilers/gcc/5/gnat-cflags.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/libada/Makefile.in b/libada/Makefile.in -index f5057a0..337e0c6 100644 ---- a/libada/Makefile.in -+++ b/libada/Makefile.in -@@ -55,7 +55,7 @@ GCC_WARN_CFLAGS = $(LOOSE_WARN) - WARN_CFLAGS = @warn_cflags@ - - TARGET_LIBGCC2_CFLAGS= --GNATLIBCFLAGS= -g -O2 -+GNATLIBCFLAGS= -g -O2 $(CFLAGS) - GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \ - -DIN_RTS @have_getipinfo@ - ---- a/gcc/ada/gcc-interface/Makefile.in -+++ b/gcc/ada/gcc-interface/Makefile.in -@@ -105,7 +105,7 @@ ADAFLAGS = -W -Wall -gnatpg -gnata - SOME_ADAFLAGS =-gnata - FORCE_DEBUG_ADAFLAGS = -g - GNATLIBFLAGS = -gnatpg -nostdinc --GNATLIBCFLAGS = -g -O2 -+GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET) - # Pretend that _Unwind_GetIPInfo is available for the target by default. This - # should be autodetected during the configuration of libada and passed down to - # here, but we need something for --disable-libada and hope for the best. -@@ -193,7 +193,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR)) - # Link flags used to build gnat tools. By default we prefer to statically - # link with libgcc to avoid a dependency on shared libgcc (which is tricky - # to deal with as it may conflict with the libgcc provided by the system). --GCC_LINK_FLAGS=-static-libgcc -+GCC_LINK_FLAGS=-static-libgcc $(CFLAGS_FOR_TARGET) - - # End of variables for you to override. - diff --git a/pkgs/development/compilers/gcc/5/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/5/java-jvgenmain-link.patch deleted file mode 100644 index 2612e8bfbbbc..000000000000 --- a/pkgs/development/compilers/gcc/5/java-jvgenmain-link.patch +++ /dev/null @@ -1,17 +0,0 @@ -The `jvgenmain' executable must be linked against `vec.o', among others, -since it uses its vector API. - ---- gcc-4.3.3/gcc/java/Make-lang.in 2008-12-05 00:00:19.000000000 +0100 -+++ gcc-4.3.3/gcc/java/Make-lang.in 2009-07-03 16:11:41.000000000 +0200 -@@ -109,9 +109,9 @@ jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIB - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \ - $(CPPLIBS) $(ZLIB) $(LDEXP_LIB) $(LIBS) - --jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) -+jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) $(BUILD_RTL) - rm -f $@ -- $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(LIBS) -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(BUILD_RTL) $(LIBS) - - # - # Build hooks: diff --git a/pkgs/development/compilers/gcc/5/libstdc++-target.patch b/pkgs/development/compilers/gcc/5/libstdc++-target.patch deleted file mode 100644 index fb622b395806..000000000000 --- a/pkgs/development/compilers/gcc/5/libstdc++-target.patch +++ /dev/null @@ -1,32 +0,0 @@ -Patch to make the target libraries 'configure' scripts find the proper CPP. -I noticed that building the mingw32 cross compiler. -Looking at the build script for mingw in archlinux, I think that only nixos -needs this patch. I don't know why. -diff --git a/Makefile.in b/Makefile.in -index 93f66b6..d691917 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -266,6 +266,7 @@ BASE_TARGET_EXPORTS = \ - AR="$(AR_FOR_TARGET)"; export AR; \ - AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ - CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \ -+ CPP="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CC; \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ - CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ -@@ -291,11 +292,13 @@ BASE_TARGET_EXPORTS = \ - RAW_CXX_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ - CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ -- CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; -+ CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \ -+ CXXCPP="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX; - - NORMAL_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ -- CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; -+ CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \ -+ CXXCPP="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX; - - # Where to find GMP - HOST_GMPLIBS = @gmplibs@ diff --git a/pkgs/development/compilers/gcc/5/no-sys-dirs.patch b/pkgs/development/compilers/gcc/5/no-sys-dirs.patch deleted file mode 100644 index 36df51904acf..000000000000 --- a/pkgs/development/compilers/gcc/5/no-sys-dirs.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ru -x '*~' gcc-4.8.3-orig/gcc/cppdefault.c gcc-4.8.3/gcc/cppdefault.c ---- gcc-4.8.3-orig/gcc/cppdefault.c 2013-01-10 21:38:27.000000000 +0100 -+++ gcc-4.8.3/gcc/cppdefault.c 2014-08-18 16:20:32.893944536 +0200 -@@ -35,6 +35,8 @@ - # undef CROSS_INCLUDE_DIR - #endif - -+#undef LOCAL_INCLUDE_DIR -+ - const struct default_include cpp_include_defaults[] - #ifdef INCLUDE_DEFAULTS - = INCLUDE_DEFAULTS; -diff -ru -x '*~' gcc-4.8.3-orig/gcc/gcc.c gcc-4.8.3/gcc/gcc.c ---- gcc-4.8.3-orig/gcc/gcc.c 2014-03-23 12:30:57.000000000 +0100 -+++ gcc-4.8.3/gcc/gcc.c 2014-08-18 13:19:32.689201690 +0200 -@@ -1162,10 +1162,10 @@ - /* Default prefixes to attach to command names. */ - - #ifndef STANDARD_STARTFILE_PREFIX_1 --#define STANDARD_STARTFILE_PREFIX_1 "/lib/" -+#define STANDARD_STARTFILE_PREFIX_1 "" - #endif - #ifndef STANDARD_STARTFILE_PREFIX_2 --#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" -+#define STANDARD_STARTFILE_PREFIX_2 "" - #endif - - #ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */ diff --git a/pkgs/development/compilers/gcc/4.8/builder.sh b/pkgs/development/compilers/gcc/builder.sh similarity index 100% rename from pkgs/development/compilers/gcc/4.8/builder.sh rename to pkgs/development/compilers/gcc/builder.sh diff --git a/pkgs/development/compilers/gcc/4.6/gfortran-driving.patch b/pkgs/development/compilers/gcc/gfortran-driving.patch similarity index 100% rename from pkgs/development/compilers/gcc/4.6/gfortran-driving.patch rename to pkgs/development/compilers/gcc/gfortran-driving.patch diff --git a/pkgs/development/compilers/gcc/4.5/gnat-cflags.patch b/pkgs/development/compilers/gcc/gnat-cflags.patch similarity index 100% rename from pkgs/development/compilers/gcc/4.5/gnat-cflags.patch rename to pkgs/development/compilers/gcc/gnat-cflags.patch diff --git a/pkgs/development/compilers/gcc/4.5/libstdc++-target.patch b/pkgs/development/compilers/gcc/libstdc++-target.patch similarity index 100% rename from pkgs/development/compilers/gcc/4.5/libstdc++-target.patch rename to pkgs/development/compilers/gcc/libstdc++-target.patch diff --git a/pkgs/development/compilers/gcc/4.8/no-sys-dirs.patch b/pkgs/development/compilers/gcc/no-sys-dirs.patch similarity index 100% rename from pkgs/development/compilers/gcc/4.8/no-sys-dirs.patch rename to pkgs/development/compilers/gcc/no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc/4.8/parallel-bconfig.patch b/pkgs/development/compilers/gcc/parallel-bconfig.patch similarity index 100% rename from pkgs/development/compilers/gcc/4.8/parallel-bconfig.patch rename to pkgs/development/compilers/gcc/parallel-bconfig.patch From 4a22a4429c2712a2cf7debe86da24efa35995eed Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 12 May 2015 15:00:28 +0200 Subject: [PATCH 075/615] gcc-3.4: Remove No longer in use. --- pkgs/development/compilers/gcc/3.4/builder.sh | 63 ------- .../development/compilers/gcc/3.4/default.nix | 47 ----- .../compilers/gcc/3.4/no-sys-dirs.patch | 170 ------------------ pkgs/top-level/all-packages.nix | 4 - pkgs/top-level/release-small.nix | 3 - 5 files changed, 287 deletions(-) delete mode 100644 pkgs/development/compilers/gcc/3.4/builder.sh delete mode 100644 pkgs/development/compilers/gcc/3.4/default.nix delete mode 100644 pkgs/development/compilers/gcc/3.4/no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc/3.4/builder.sh b/pkgs/development/compilers/gcc/3.4/builder.sh deleted file mode 100644 index 3909b605c208..000000000000 --- a/pkgs/development/compilers/gcc/3.4/builder.sh +++ /dev/null @@ -1,63 +0,0 @@ -source $stdenv/setup - - -export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy -mkdir $NIX_FIXINC_DUMMY - - -if test "$noSysDirs" = "1"; then - - if test -e $NIX_CC/nix-support/orig-libc; then - - # Figure out what extra flags to pass to the gcc compilers - # being generated to make sure that they use our glibc. - extraCFlags="$(cat $NIX_CC/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)" - - # Use *real* header files, otherwise a limits.h is generated - # that does not include Glibc's limits.h (notably missing - # SSIZE_MAX, which breaks the build). - export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include - - else - # Hack: support impure environments. - extraCFlags="-isystem /usr/include" - extraLDFlags="-L/usr/lib64 -L/usr/lib" - export NIX_FIXINC_DUMMY=/usr/include - fi - - export NIX_EXTRA_CFLAGS=$extraCFlags - for i in $extraLDFlags; do - export NIX_EXTRA_LDFLAGS="$NIX_EXTRA_LDFLAGS -Wl,$i" - done - export CFLAGS=$extraCFlags - export CXXFLAGS=$extraCFlags -fi - - -preConfigure() { - # Perform the build in a different directory. - mkdir ../build - cd ../build - configureScript=../$sourceRoot/configure -} - - -postInstall() { - # Remove precompiled headers for now. They are very big and - # probably not very useful yet. - find $out/include -name "*.gch" -exec rm -rf {} \; -prune - - # Remove `fixincl' to prevent a retained dependency on the - # previous gcc. - rm -rf $out/libexec/gcc/*/*/install-tools -} - - -if test -z "$profiledCompiler"; then - buildFlags="bootstrap $buildFlags" -else - buildFlags="profiledbootstrap $buildFlags" -fi - -genericBuild diff --git a/pkgs/development/compilers/gcc/3.4/default.nix b/pkgs/development/compilers/gcc/3.4/default.nix deleted file mode 100644 index 1be771ac7054..000000000000 --- a/pkgs/development/compilers/gcc/3.4/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, noSysDirs -, langC ? true, langCC ? true, langF77 ? false -, profiledCompiler ? false -}: - -assert langC; - -with stdenv.lib; - -stdenv.mkDerivation { - name = "gcc-3.4.6"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2; - md5 = "4a21ac777d4b5617283ce488b808da7b"; - }; - - patches = stdenv.lib.optional noSysDirs ./no-sys-dirs.patch; - - # inspiration: https://aur.archlinux.org/packages/g77/ - postPatch = '' - substituteInPlace gcc/config/i386/linux.h --replace 'struct siginfo' siginfo_t - ''; - - inherit noSysDirs profiledCompiler; - - configureFlags = " - --disable-multilib - --with-system-zlib - --enable-languages=${ - concatStrings (intersperse "," - ( optional langC "c" - ++ optional langCC "c++" - ++ optional langF77 "f77" - ) - ) - } - "; - - passthru = { inherit langC langCC langF77; isGNU = true; }; - - meta = { - homepage = "http://gcc.gnu.org/"; - license = "GPL/LGPL"; - description = "GNU Compiler Collection, 3.4.x"; - }; -} diff --git a/pkgs/development/compilers/gcc/3.4/no-sys-dirs.patch b/pkgs/development/compilers/gcc/3.4/no-sys-dirs.patch deleted file mode 100644 index 2159893cde2b..000000000000 --- a/pkgs/development/compilers/gcc/3.4/no-sys-dirs.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff -rc gcc-orig/gcc/cppdefault.c gcc-patched/gcc/cppdefault.c -*** gcc-orig/gcc/cppdefault.c 2003-03-01 15:31:12.000000000 +0100 ---- gcc-patched/gcc/cppdefault.c 2004-06-29 10:08:45.000000000 +0200 -*************** -*** 41,46 **** ---- 41,50 ---- - # undef CROSS_INCLUDE_DIR - #endif - -+ #undef LOCAL_INCLUDE_DIR -+ #undef SYSTEM_INCLUDE_DIR -+ #undef STANDARD_INCLUDE_DIR -+ - const struct default_include cpp_include_defaults[] - #ifdef INCLUDE_DEFAULTS - = INCLUDE_DEFAULTS; -diff -rc gcc-orig/gcc/Makefile.in gcc-patched/gcc/Makefile.in -*** gcc-orig/gcc/Makefile.in 2004-04-01 18:47:54.000000000 +0200 ---- gcc-patched/gcc/Makefile.in 2004-06-29 13:50:45.000000000 +0200 -*************** -*** 199,205 **** - CPPFLAGS = @CPPFLAGS@ - - # These exists to be overridden by the x-* and t-* files, respectively. -! X_CFLAGS = - T_CFLAGS = - - X_CPPFLAGS = ---- 199,205 ---- - CPPFLAGS = @CPPFLAGS@ - - # These exists to be overridden by the x-* and t-* files, respectively. -! X_CFLAGS = $(NIX_EXTRA_CFLAGS) $(NIX_EXTRA_LDFLAGS) - T_CFLAGS = - - X_CPPFLAGS = -*************** -*** 345,351 **** - PARTITION_H = $(srcdir)/../include/partition.h - - # Default native SYSTEM_HEADER_DIR, to be overridden by targets. -! NATIVE_SYSTEM_HEADER_DIR = /usr/include - # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. - CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ - ---- 345,355 ---- - PARTITION_H = $(srcdir)/../include/partition.h - - # Default native SYSTEM_HEADER_DIR, to be overridden by targets. -! # Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent -! # `fixinc' from fixing header files in /usr/include. However, -! # NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set -! # it to some dummy directory. -! NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY) - # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. - CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ - -diff -rc gcc-orig/libstdc++-v3/include/Makefile.in gcc-patched/libstdc++-v3/include/Makefile.in -*** gcc-orig/libstdc++-v3/include/Makefile.in 2004-03-18 18:36:43.000000000 +0100 ---- gcc-patched/libstdc++-v3/include/Makefile.in 2004-06-29 19:01:33.000000000 +0200 -*************** -*** 896,903 **** - if [ ! -d "${pch_output_builddir}" ]; then \ - mkdir -p ${pch_output_builddir}; \ - fi; \ -! $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g; \ -! $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g; - - # For robustness sake (in light of junk files or in-source - # configuration), copy from the build or source tree to the install ---- 896,903 ---- - if [ ! -d "${pch_output_builddir}" ]; then \ - mkdir -p ${pch_output_builddir}; \ - fi; \ -! $(CXX) $(CFLAGS) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g; \ -! $(CXX) $(CFLAGS) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g; - - # For robustness sake (in light of junk files or in-source - # configuration), copy from the build or source tree to the install -diff -rc gcc-orig/ltcf-cxx.sh gcc-patched/ltcf-cxx.sh -*** gcc-orig/ltcf-cxx.sh 2003-11-19 06:29:32.000000000 +0100 ---- gcc-patched/ltcf-cxx.sh 2004-06-29 15:26:01.000000000 +0200 -*************** -*** 985,991 **** - # the conftest object file. - pre_test_object_deps_done=no - -! for p in `eval $output_verbose_link_cmd`; do - - case $p in - ---- 985,991 ---- - # the conftest object file. - pre_test_object_deps_done=no - -! for p in `true`; do - - case $p in - -diff -rc gcc-orig/Makefile.in gcc-patched/Makefile.in -*** gcc-orig/Makefile.in 2004-01-14 21:09:37.000000000 +0100 ---- gcc-patched/Makefile.in 2004-06-29 16:21:36.000000000 +0200 -*************** -*** 228,234 **** - NM = @NM@ - - LD = @LD@ -! LDFLAGS = - - RANLIB = @RANLIB@ - ---- 228,234 ---- - NM = @NM@ - - LD = @LD@ -! LDFLAGS = $(NIX_EXTRA_LDFLAGS) - - RANLIB = @RANLIB@ - -*************** -*** 277,283 **** - # CFLAGS will be just -g. We want to ensure that TARGET libraries - # (which we know are built with gcc) are built with optimizations so - # prepend -O2 when setting CFLAGS_FOR_TARGET. -! CFLAGS_FOR_TARGET = -O2 $(CFLAGS) - # If GCC_FOR_TARGET is not overriden on the command line, then this - # variable is passed down to the gcc Makefile, where it is used to - # build libgcc2.a. We define it here so that it can itself be ---- 277,283 ---- - # CFLAGS will be just -g. We want to ensure that TARGET libraries - # (which we know are built with gcc) are built with optimizations so - # prepend -O2 when setting CFLAGS_FOR_TARGET. -! CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(NIX_EXTRA_CFLAGS) - # If GCC_FOR_TARGET is not overriden on the command line, then this - # variable is passed down to the gcc Makefile, where it is used to - # build libgcc2.a. We define it here so that it can itself be -*************** -*** 290,296 **** - RAW_CXX_FOR_TARGET = @RAW_CXX_FOR_TARGET@ - CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@ - RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@ -! CXXFLAGS_FOR_TARGET = $(CXXFLAGS) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates - - DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@ ---- 290,296 ---- - RAW_CXX_FOR_TARGET = @RAW_CXX_FOR_TARGET@ - CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@ - RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@ -! CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(NIX_EXTRA_CFLAGS) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates - - DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@ -*************** -*** 321,327 **** - fi; \ - fi` - -! LDFLAGS_FOR_TARGET = - - NM_FOR_TARGET=@NM_FOR_TARGET@ - USUAL_NM_FOR_TARGET = ` \ ---- 321,327 ---- - fi; \ - fi` - -! LDFLAGS_FOR_TARGET = $(NIX_EXTRA_LDFLAGS) - - NM_FOR_TARGET=@NM_FOR_TARGET@ - USUAL_NM_FOR_TARGET = ` \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 534bf6e7c4b7..71307a32ecff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3474,10 +3474,6 @@ let gccApple = throw "gccApple is no longer supported"; - gcc34 = wrapCC (import ../development/compilers/gcc/3.4 { - inherit fetchurl stdenv noSysDirs; - }); - gcc48_realCross = lib.addMetaAttrs { hydraPlatforms = []; } (callPackage ../development/compilers/gcc/4.8 { inherit noSysDirs; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index e8956b5a0dae..a4ae1932fcfe 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -46,10 +46,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; findutils = all; flex = all; gcc = all; - gcc34 = linux; - gcc44 = linux; gcj = linux; - ghdl = linux; glibc = linux; glibcLocales = linux; gnat = linux; From 82ba13111c72937b792edd40bcbebbda1d395c7c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 12 May 2015 06:26:31 -0700 Subject: [PATCH 076/615] ncurses: Fix shouldUsePkg on darwin --- pkgs/development/libraries/ncurses/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 051d29924dfc..fd545e53625f 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -16,7 +16,11 @@ let mkWith = mkFlag "with-" "without-"; mkOther = mkFlag "" "" true; - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg_: let + pkg = (builtins.tryEval pkg_).value; + in if stdenv.lib.any (x: x == stdenv.system) (pkg.meta.platforms or []) + then pkg + else null; buildShared = !stdenv.isDarwin; From def321e81155c7055aa05806ac6802dda042de25 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 12 May 2015 08:51:55 -0500 Subject: [PATCH 077/615] add grantlee-5.0.0 --- pkgs/development/libraries/grantlee/5.x.nix | 32 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/grantlee/5.x.nix diff --git a/pkgs/development/libraries/grantlee/5.x.nix b/pkgs/development/libraries/grantlee/5.x.nix new file mode 100644 index 000000000000..4127280fb9a2 --- /dev/null +++ b/pkgs/development/libraries/grantlee/5.x.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, qt5, cmake }: + +stdenv.mkDerivation rec { + name = "grantlee-5.0.0"; + +# Upstream download server has country code firewall, so I made a mirror. + src = fetchurl { + urls = [ + "http://downloads.grantlee.org/${name}.tar.gz" + "http://www.loegria.net/grantlee/${name}.tar.gz" + ]; + sha256 = "0qdifp1sg87j3869xva5ai2d6d5ph7z4b85wv1fypf2k5sljpwpa"; + }; + + buildInputs = [ cmake qt5.base qt5.script ]; + + meta = { + description = "Qt5 port of Django template system"; + longDescription = '' + Grantlee is a plugin based String Template system written using the Qt + framework. The goals of the project are to make it easier for application + developers to separate the structure of documents from the data they + contain, opening the door for theming. + + The syntax is intended to follow the syntax of the Django template system, + and the design of Django is reused in Grantlee.''; + + homepage = http://gitorious.org/grantlee; + maintainers = [ stdenv.lib.maintainers.urkud ]; + inherit (qt5.base.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 534bf6e7c4b7..d9dd2cdce967 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6103,6 +6103,8 @@ let grantlee = callPackage ../development/libraries/grantlee { }; + grantlee5 = callPackage ../development/libraries/grantlee/5.x.nix { }; + gsasl = callPackage ../development/libraries/gsasl { }; gsl = callPackage ../development/libraries/gsl { }; From 332df249e6ece8c31bc7724a06c06c5bdeed5bb1 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 12 May 2015 15:45:00 +0300 Subject: [PATCH 078/615] haskell-misfortune: fix patch --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index fe3207ada243..a58fffda0952 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -167,9 +167,8 @@ self: super: { prePatch = "sed -i 's|4\.8|4.9|' diagrams-core.cabal"; }); - # https://github.com/mokus0/misfortune/pull/1 misfortune = appendPatch super.misfortune (pkgs.fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/mokus0/misfortune/pull/1.patch"; + url = "https://github.com/mokus0/misfortune/commit/9e0a38cf8d59a0de9ae1156034653f32099610e4.patch"; sha256 = "15frwdallm3i6k7mil26bbjd4wl6k9h20ixf3cmyris3q3jhlcfh"; }); From b575dc53ad2e320113a8669ac39f7a36ac483877 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 12 May 2015 15:45:05 +0300 Subject: [PATCH 079/615] yEd: update --- pkgs/applications/graphics/yed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 6e9a1fdeb095..e22c7804914b 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, unzip, jre }: stdenv.mkDerivation rec { - name = "yEd-3.14.1"; + name = "yEd-3.14.2"; src = fetchurl { url = "http://www.yworks.com/products/yed/demo/${name}.zip"; - sha256 = "09zik3pjs5x0vc0jvndm762blk85y44lxac3vdfqqbinwd9gfnm2"; + sha256 = "1i2fncp7q0xin42sf55zc79jzrkzbp25yw8rcjkgsy6hgnhl73nh"; }; nativeBuildInputs = [ unzip makeWrapper ]; From 367c7779e0be9be9622a655b98a11e9f0931a427 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 12 May 2015 15:49:03 +0300 Subject: [PATCH 080/615] haskell-dependent-sum-template: updated on Hackage --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index a58fffda0952..b1ff2efb8c30 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -124,10 +124,6 @@ self: super: { unix-time = dontCheck super.unix-time; # Until the changes have been pushed to Hackage - dependent-sum-template = appendPatch super.dependent-sum-template (pkgs.fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/mokus0/dependent-sum-template/pull/4.patch"; - sha256 = "1yb1ny4ckl4d3sf4xnvpbsa9rw2dficzgipijs5s3729dnsc3rb0"; - }); mueval = appendPatch super.mueval (pkgs.fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/gwern/mueval/pull/10.patch"; sha256 = "1gs8p89d1qsrd1qycbhf6kv4qw0sbb8m6dy106dqkmdzcjzcyq74"; From f83011736fbb27e5ac46896dc26240d77990c626 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 12 May 2015 16:09:33 +0300 Subject: [PATCH 081/615] haskell-mueval: update patch --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b1ff2efb8c30..73e31a03c29e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -125,7 +125,7 @@ self: super: { # Until the changes have been pushed to Hackage mueval = appendPatch super.mueval (pkgs.fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/gwern/mueval/pull/10.patch"; + url = "https://github.com/gwern/mueval/commit/c41aa40ed63b74c069d1e4e3caa8c8d890cde960.patch"; sha256 = "1gs8p89d1qsrd1qycbhf6kv4qw0sbb8m6dy106dqkmdzcjzcyq74"; }); present = appendPatch super.present (pkgs.fetchpatch { From cb9764f847e1a67c69de80d7bb32ac10f1649344 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 12 May 2015 16:50:14 +0300 Subject: [PATCH 082/615] haskell-lambdabot: remove ghc 7.8 patch --- .../configuration-ghc-7.10.x.nix | 3 --- .../configuration-ghc-7.8.x.nix | 3 --- .../haskell-modules/lambdabot-fix-ghc78.patch | 22 ------------------- 3 files changed, 28 deletions(-) delete mode 100644 pkgs/development/haskell-modules/lambdabot-fix-ghc78.patch 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 73e31a03c29e..529627df1171 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -182,9 +182,6 @@ self: super: { in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3 self.webkitgtk3-javascriptcore ]; - # Fix evaluation in GHC >=7.8: https://github.com/lambdabot/lambdabot/issues/116 - lambdabot = appendPatch super.lambdabot ./lambdabot-fix-ghc78.patch; - # https://github.com/haskell-infra/hackage-trustees/issues/24 brainfuck = appendPatch super.brainfuck ./brainfuck-fix-ghc710.patch; unlambda = appendPatch super.unlambda ./unlambda-fix-ghc710.patch; 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 21fdc86d89a6..361d404412ea 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -123,9 +123,6 @@ self: super: { in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3 self.webkitgtk3-javascriptcore ]; - # Fix evaluation in GHC >=7.8: https://github.com/lambdabot/lambdabot/issues/116 - lambdabot = appendPatch super.lambdabot ./lambdabot-fix-ghc78.patch; - # Needs hashable on pre 7.10.x compilers. nats = addBuildDepend super.nats self.hashable; diff --git a/pkgs/development/haskell-modules/lambdabot-fix-ghc78.patch b/pkgs/development/haskell-modules/lambdabot-fix-ghc78.patch deleted file mode 100644 index 0a0ed65803a0..000000000000 --- a/pkgs/development/haskell-modules/lambdabot-fix-ghc78.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ru3 lambdabot-5.0.1.old/State/L.hs lambdabot-5.0.1/State/L.hs ---- lambdabot-5.0.1.old/State/L.hs 2015-04-15 03:26:04.818947594 +0300 -+++ lambdabot-5.0.1/State/L.hs 2015-04-15 03:26:20.386099365 +0300 -@@ -34,7 +34,6 @@ - import Control.Monad - import Control.Monad.Cont - import Control.Monad.Identity --import Control.Monad.Instances - import Control.Monad.Reader - import Control.Monad.ST.Safe - import Control.Monad.State -diff -ru3 lambdabot-5.0.1.old/State/Pristine.hs lambdabot-5.0.1/State/Pristine.hs ---- lambdabot-5.0.1.old/State/Pristine.hs 2015-04-15 03:26:04.818947594 +0300 -+++ lambdabot-5.0.1/State/Pristine.hs 2015-04-15 03:26:20.386099365 +0300 -@@ -34,7 +34,6 @@ - import Control.Monad - import Control.Monad.Cont - import Control.Monad.Identity --import Control.Monad.Instances - import Control.Monad.Reader - import Control.Monad.ST.Safe - import Control.Monad.State From 73e10360290be7fbde87dd2c42ec9a234befdc04 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 12 May 2015 16:28:32 +0200 Subject: [PATCH 083/615] add plugin-torture: a tool to test LADSPA and LV2 plugins --- .../audio/plugin-torture/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/audio/plugin-torture/default.nix diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix new file mode 100644 index 000000000000..91b3954de0df --- /dev/null +++ b/pkgs/applications/audio/plugin-torture/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }: + +stdenv.mkDerivation rec { + name = "plugin-torture-git-${version}"; + version = "2013-10-03"; + + src = fetchgit { + url = "https://github.com/cth103/plugin-torture"; + rev = "9ee06016982bdfbaa215cd0468cc6ada6367462a"; + sha256 = "bfe9213fd2c1451d7acc1381d63301c4e6ff69ce86d31a886ece5159ba850706"; + }; + + buildInputs = [ boost ladspaH lilv lv2 pkgconfig serd sord sratom ]; + + installPhase = '' + mkdir -p $out/bin + cp plugin-torture $out/bin/ + cp README $out/bin/ + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/cth103/plugin-torture; + description = "A tool to test LADSPA and LV2 plugins"; + license = licenses.gpl2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71307a32ecff..d310b97850e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11848,6 +11848,8 @@ let gtksharp = gtk-sharp; }; + plugin-torture = callPackage ../applications/audio/plugin-torture { }; + pommed = callPackage ../os-specific/linux/pommed { inherit (xorg) libXpm; }; From 3e17a5c1d0bfe5a72ec38dfe5df20e55306c2e58 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 12 May 2015 17:33:46 +0300 Subject: [PATCH 084/615] haskell-unlambda/brainfuck: Put a note --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 529627df1171..409b7500ae50 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -182,7 +182,7 @@ self: super: { in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3 self.webkitgtk3-javascriptcore ]; - # https://github.com/haskell-infra/hackage-trustees/issues/24 + # FIXME: remove with the next Hackage update brainfuck = appendPatch super.brainfuck ./brainfuck-fix-ghc710.patch; unlambda = appendPatch super.unlambda ./unlambda-fix-ghc710.patch; From 50c0b00592183e73ab586a83be988d8fac561140 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 12 May 2015 09:47:54 -0500 Subject: [PATCH 085/615] kdeApps_15_04.rocs: add missing dependencies rocs depends on grantlee5 and kdelibs4support, although the latter is undeclared. --- pkgs/applications/kde-apps-15.04/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 798d6d977b0d..9de2f7a9fe15 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -90,6 +90,7 @@ let Gpgme = gpgme; Gphoto2 = libgphoto2; Grantlee = grantlee; + Grantlee5 = grantlee5; GSL = gsl; HUNSPELL = hunspell; HUpnp = herqq; @@ -350,6 +351,10 @@ let ''; }; + rocs = super.rocs // { + buildInputs = super.rocs.buildInputs ++ (with kf5; [ kdelibs4support ]); + }; + signon-kwallet-extension = let signon = pkgs.signon.override { inherit qt5; }; in super.signon-kwallet-extension // { From e504a9301dbd6be9478d7dcb3b0c7564af06ac01 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 12 May 2015 17:24:17 +0200 Subject: [PATCH 086/615] bgs: update from 0.7 to 0.7.1 --- pkgs/tools/X11/bgs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix index 984fc9158cca..c305583a3f9f 100644 --- a/pkgs/tools/X11/bgs/default.nix +++ b/pkgs/tools/X11/bgs/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "bgs-${version}"; - version = "0.7"; + version = "0.7.1"; src = fetchurl { url = "https://github.com/Gottox/bgs/archive/v${version}.tar.gz"; - sha256 = "1w1zz9nzj0a0r9rlnq5psjj7n2ff1zfghcs6j268i5c7nkyaw28a"; + sha256 = "1kgm139daz4xrymx11whbmwzsnps9yn4g34a17s34ihi0raf70w8"; }; buildInputs = [ libX11 libXinerama imlib2 ]; From 4c77830a93a5cc3b909f8675d4d35a2f5f232839 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 15 Apr 2015 13:22:39 +0000 Subject: [PATCH 087/615] rustcMaster: Update from 2015-04-15 -> 2015-05-09 --- pkgs/development/compilers/rustc/head.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index 00e87f30e2cd..383632b2ce08 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -2,15 +2,15 @@ callPackage ./makeRustcDerivation.nix { shortVersion = "1.0.0-dev"; isRelease = false; - # src rev for master on 2015-04-15 - srcRev = "a691f1eefea586f154700be6ee1b991158f82b7f"; - srcSha = "1afypvxahhwhva9rssagm2q08wgidv6xcjrx85lqwzy6abyl1hsz"; - snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec"; - snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349"; - snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234"; - snapshotHashDarwin64 = "5f35d9c920b8083a7420ef8cf5b00d5ef3085dfa"; - snapshotDate = "2015-03-27"; - snapshotRev = "5520801"; + # src rev for master on 2015-05-09 + srcRev = "95400c51c31877ea4699adc051477edccb5cfbca"; + srcSha = "1ldgc5nd42pcbr650rpyvpnc8h6bky6gmb116fwy1g6x2ql66djw"; + snapshotHashLinux686 = "0bc8cffdce611fb71fd7d3d8e7cdbfaf748a4f16"; + snapshotHashLinux64 = "94089740e48167c5975c92c139ae9c286764012f"; + snapshotHashDarwin686 = "54cc35e76497e6e94fddf38d6e40e9d168491ddb"; + snapshotHashDarwin64 = "43a1c1fba0d1dfee4c2ca310d506f8f5f51b3f6f"; + snapshotDate = "2015-04-27"; + snapshotRev = "857ef6e"; patches = [ ./patches/head.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; From 548e8db2499f38fe1b06a78fad7c1ddb53e0029d Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 12 May 2015 14:27:47 +0200 Subject: [PATCH 088/615] rustRegistry: 2015-04-23 -> 2015-05-12 --- pkgs/top-level/rust-packages.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 8cbc4a73d28f..5e3977ab6d68 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,24 +7,21 @@ { runCommand, fetchgit, git }: let - version = "2015-04-23"; + version = "2015-05-12"; src = fetchgit { url = git://github.com/rust-lang/crates.io-index.git; - rev = "965b634156cc5c6f10c7a458392bfd6f27436e7e"; - sha256 = "1hbl3g1d6yz6x2fm76dxmcn8rdrmri4l9n6flvv0pkn4hsid7zw1"; - - # cargo needs the 'master' branch to exist - leaveDotGit = true; - branchName = "master"; + rev = "9bf9e7f2b242552ccec879b47b2225a76c7c79b0"; + sha256 = "14rrpm6and52qasn7fv5fkflhnkyr86xy0k9pjgw407k7xms0cmw"; }; in runCommand "rustRegistry-${version}-${builtins.substring 0 7 src.rev}" {} '' # For some reason, cargo doesn't like fetchgit's git repositories, not even - # if we clone them (tested with registry rev + # if we set leaveDotGit to true, set the fetchgit branch to 'master' and clone + # the repository (tested with registry rev # 965b634156cc5c6f10c7a458392bfd6f27436e7e), failing with the message: # # "Target OID for the reference doesn't exist on the repository" From cbdedca255e50dfce0e2e345181e718bbd90b46d Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 12 May 2015 14:18:58 +0200 Subject: [PATCH 089/615] cargo: 2015-04-14 -> 2015-05-11 --- .../tools/build-managers/cargo/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix index 05e07b4afa2b..8e7d8cf8ee83 100644 --- a/pkgs/development/tools/build-managers/cargo/default.nix +++ b/pkgs/development/tools/build-managers/cargo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl , cmake, zlib }: -with ((import ./common.nix) { inherit stdenv; version = "2015-04-14"; }); +with ((import ./common.nix) { inherit stdenv; version = "2015-05-11"; }); with rustPlatform; @@ -10,20 +10,12 @@ buildRustPackage rec { src = fetchgit { url = "https://github.com/rust-lang/cargo.git"; - rev = "d49b44358ed800351647571144257d35ac0886cf"; - sha256 = "1kaims28237mvp1qpw2cfgb3684jr54ivkdag0lw8iv9xap4i35y"; + rev = "a078e01ffab70738eafb7401704d1eaf90b94de2"; + sha256 = "0vw62kxlmkajyix6n4cdz7w9l26dspjiw2fk4xkj33gzzc8rq9g8"; leaveDotGit = true; }; - cargoUpdateHook = '' - # Updating because version 2.1.4 has an invalid Cargo.toml - cargo update -p libressl-pnacl-sys --precise 2.1.5 - - # Updating because version 0.1.3 has a build failure with recent rustc - cargo update -p threadpool --precise 0.1.4 - ''; - - depsSha256 = "1gj3mnjj17h5p0r1jcm3m3pm3p3l1rbfdz3l7v1cykng78dsabnq"; + depsSha256 = "1sk79w2wxvpgfkxr0nbrqqxdih4abiqvawdd88r2p9cqzrkdg8by"; buildInputs = [ file curl pkgconfig python openssl cmake zlib ]; From e40a43cd1f4ea69f9ec95fbcbbb89621db31ccae Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 12 May 2015 16:24:52 +0200 Subject: [PATCH 090/615] rustRacer: 2015-04-12 -> 2015-05-04 --- pkgs/development/tools/rust/racer/default.nix | 10 ++++--- .../development/tools/rust/racer/pr-232.patch | 26 +++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/tools/rust/racer/pr-232.patch diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 4887736a8591..2b1f84c6b909 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -4,14 +4,16 @@ with rustPlatform; buildRustPackage rec { #TODO add emacs support - name = "racer-git-2015-04-12"; + name = "racer-git-2015-05-04"; src = fetchgit { url = https://github.com/phildawes/racer; - rev = "5437e2074d87dfaab75a0f1bd2597bed61c0bbf1"; - sha256 = "0a768gvjry86l0xa5q0122iyq7zn2h9adfniglsgrbs4fan49xyn"; + rev = "bf2373ec08b0be03598283bd610c5b61bdb8738c"; + sha256 = "0ldf05d19ghxk3fslxrc87j18zg8bam2y0ygdy456h37y2p1d1ck"; }; - depsSha256 = "13rnxr5inrfnmg5mg2vap17fd2jp32g2a70pfi1sshi6vjr8kpap"; + patches = [ ./pr-232.patch ]; + + depsSha256 = "0rinyh365znx39aygxyyxmi496pw0alblf2dl7l8fbmz63nkhfv2"; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/racer/pr-232.patch b/pkgs/development/tools/rust/racer/pr-232.patch new file mode 100644 index 000000000000..354307d71e4f --- /dev/null +++ b/pkgs/development/tools/rust/racer/pr-232.patch @@ -0,0 +1,26 @@ +From 3f354d69881424c7c902408d22f9138412a872b4 Mon Sep 17 00:00:00 2001 +From: Ricardo Martins +Date: Sat, 9 May 2015 17:12:55 +0100 +Subject: [PATCH] Use `Vec::extend` instead of binary operation `+`. + +--- + src/racer/nameres.rs | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/racer/nameres.rs b/src/racer/nameres.rs +index 60636c6..ad1e01c 100644 +--- a/src/racer/nameres.rs ++++ b/src/racer/nameres.rs +@@ -620,9 +620,9 @@ pub fn search_scope(start: usize, point: usize, src: &str, + } + + // There's a good chance of a match. Run the matchers +- out = out + &*run_matchers_on_blob(src, start+blobstart, start+blobend, +- searchstr, +- filepath, search_type, local, namespace); ++ out.extend(run_matchers_on_blob(src, start+blobstart, start+blobend, ++ searchstr, ++ filepath, search_type, local, namespace)); + if let ExactMatch = search_type { + if !out.is_empty() { + return out.into_iter(); From 7640b92c304862dcfc71a8c0e7a767190e9a0059 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Tue, 12 May 2015 16:51:38 +0100 Subject: [PATCH 091/615] tibia: update to 10.78 --- pkgs/games/tibia/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index 21e6a28cf857..1e4d1ad7f3fa 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; assert stdenv.isi686; stdenv.mkDerivation { - name = "tibia-10.77"; + name = "tibia-10.78"; src = fetchurl { - url = http://static.tibia.com/download/tibia1077.tgz; - sha256 = "1qz2a25irzhdwh4swwcfz4g37f1j3cxhm9c43yl763bvc718ikly"; + url = http://static.tibia.com/download/tibia1078.tgz; + sha256 = "087yi8jzi8bn1fp3b8lpp913bzdwf5nszv5p5gr6hx9xyhjj97ax"; }; shell = stdenv.shell; From 55e66db0fa3d7543d93397f60efd06ffc370232f Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 12 May 2015 17:15:34 +0200 Subject: [PATCH 092/615] python2: Don't fail silently on module build. A build output of such a failure can be found here: http://hydra.nixos.org/build/21994789/nixlog/1/raw The build_ext command doesn't return non-zero if it fails but instead produces a file with a "_failed.so" suffix, which we're now checking after the build_ext command. Signed-off-by: aszlig --- pkgs/development/interpreters/python/2.6/default.nix | 1 + pkgs/development/interpreters/python/2.7/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index ffc4c5d2e1fa..10c52e958d8f 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -144,6 +144,7 @@ let 'self.extensions = [ext for ext in self.extensions if ext.name in ["${internalName}"]]' python ./setup.py build_ext + [ -z "$(find build -name '*_failed.so' -print)" ] ''; installPhase = diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index b8b25c576c59..e9d9dc6824d0 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -161,6 +161,7 @@ let 'self.extensions = [ext for ext in self.extensions if ext.name in ["${internalName}"]]' python ./setup.py build_ext + [ -z "$(find build -name '*_failed.so' -print)" ] ''; installPhase = From a7028d3d07dade2305b7a94d39bec208d605617c Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 12 May 2015 17:34:43 +0200 Subject: [PATCH 093/615] python2: Pass configureFlags to modules as well. Fixes regression from 086e801d5132bcf9a4e4cac56c361651b7b22ac0. The switch tu UCS-4 only happened for the main Python interpreter and libraries, but the extension modules were using the same source but without any configureFlags, so the extensions still referred to UCS-2 symbols. Tested module builds of Python 2.7 and all modules except crypto fail. Also tested against sqlite3 module of Python 2.6, although for other modules there still seems to be an unrelated build failure with Tcl/Tk libraries, so we might need to fix that later. Signed-off-by: aszlig --- pkgs/development/interpreters/python/2.6/default.nix | 9 +++++---- pkgs/development/interpreters/python/2.7/default.nix | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 10c52e958d8f..4e322faf66f0 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -46,6 +46,8 @@ let touch $out/include/python${majorVersion}/pyconfig.h ''; + configureFlags = "--enable-shared --with-threads --enable-unicode=ucs4"; + buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline x11 tcl tk sqlite ] @@ -58,13 +60,12 @@ let name = "python${if includeModules then "" else "-minimal"}-${version}"; pythonVersion = majorVersion; - inherit majorVersion version src patches buildInputs preConfigure; + inherit majorVersion version src patches buildInputs preConfigure + configureFlags; C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - configureFlags = "--enable-shared --with-threads --enable-unicode=ucs4"; - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; setupHook = ./setup-hook.sh; @@ -131,7 +132,7 @@ let if includeModules then null else stdenv.mkDerivation rec { name = "python-${moduleName}-${python.version}"; - inherit src patches preConfigure; + inherit src patches preConfigure configureFlags; buildInputs = [ python ] ++ deps; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index e9d9dc6824d0..ac9b9d637096 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -58,6 +58,8 @@ let touch $out/include/python${majorVersion}/pyconfig.h ''; + configureFlags = "--enable-shared --with-threads --enable-unicode=ucs4"; + buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ [ bzip2 openssl ] @@ -73,14 +75,13 @@ let name = "python-${version}"; pythonVersion = majorVersion; - inherit majorVersion version src patches buildInputs preConfigure; + inherit majorVersion version src patches buildInputs preConfigure + configureFlags; LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - configureFlags = "--enable-shared --with-threads --enable-unicode=ucs4"; - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; DETERMINISTIC_BUILD = 1; @@ -149,7 +150,7 @@ let if includeModules then null else stdenv.mkDerivation rec { name = "python-${moduleName}-${python.version}"; - inherit src patches preConfigure; + inherit src patches preConfigure configureFlags; buildInputs = [ python ] ++ deps; From 8549e0cc9922d9da5623439737ebcb8b0e91b4d8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 May 2015 17:19:32 +0200 Subject: [PATCH 094/615] Revert "python-packages: SQLAlchemy: build" This reverts commit 6e8d1f84f229bc481b2c0aafdeac986f4f3deb8c. pysqlite is not available for Python 3. Adding it to buildInputs makes all packages dependent upon sqlalchemy equally unavailable for no good reason. --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09a17d36bc30..4f00973c87f4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11909,7 +11909,7 @@ let md5 = "470ca4da4a0081efc830f0d90dd91682"; }; - buildInputs = with self; [ nose mock pysqlite ]; + buildInputs = with self; [ nose mock ]; propagatedBuildInputs = with self; [ modules.sqlite3 ]; From f0764dd6320a0f373df4ddafba042da1e483e759 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 May 2015 17:22:04 +0200 Subject: [PATCH 095/615] python-packages: SQLAlchemy: skip tests on Py3k They would fail anyway, blocking all dependents for the sake of a mere test dependency. --- pkgs/top-level/python-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4f00973c87f4..1803625f6f4a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11909,10 +11909,14 @@ let md5 = "470ca4da4a0081efc830f0d90dd91682"; }; - buildInputs = with self; [ nose mock ]; - + buildInputs = with self; [ nose mock ] + ++ stdenv.lib.optional doCheck pysqlite; propagatedBuildInputs = with self; [ modules.sqlite3 ]; + # Test-only dependency pysqlite doesn't build on Python 3. This isn't an + # acceptable reason to make all dependents unavailable on Python 3 as well + doCheck = !isPy3k; + checkPhase = '' ${python.executable} sqla_nose.py ''; From a989b629d977cb053874dac127f267569d5c5f9f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 May 2015 17:56:48 +0200 Subject: [PATCH 096/615] lz4 128 -> 129 - New: LZ4_compress_fast() - Changed: New lz4 and lz4hc compression API. Previous function prototypes still supported. - Changed: Sparse file support enabled by default - New: LZ4 CLI improved performance compressing/decompressing multiple files - Added: LZ4_compress_destSize() - Fixed: GCC 4.9+ vector optimization - Changed: Enums converted to LZ4F_ namespace convention - Added: AppVeyor CI environment, for Visual tests - Modified:Obsolete functions generate warnings - Fixed : Bug #75 (unfinished stream) - Updated: Documentation converted to MarkDown format --- pkgs/tools/compression/lz4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index d27ada615c71..46b3b2fd7d78 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, valgrind }: -let version = "128"; in +let version = "129"; in stdenv.mkDerivation rec { name = "lz4-${version}"; src = fetchFromGitHub { - sha256 = "00jrnic2jddj81av8jjipf4rdkx6x6cdf8zpsz3mp5kbmqzd0h9a"; + sha256 = "0liq5gvnikchgvalpi52hq0npwlh84w94bj79dcbrcw19may5dwi"; rev = "r${version}"; repo = "lz4"; owner = "Cyan4973"; From f168973bfd65f64580a06376e4ef7b3731d4cb75 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 12 May 2015 12:49:36 -0400 Subject: [PATCH 097/615] Revert "curl: Improve .pc and .la patching" This breaks on darwin with: > sed: -e: No such file or directory This reverts commit 26c37ded73ce084275d748be26887cf4023c91d6. --- pkgs/tools/networking/curl/default.nix | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 689dc3d7d5ef..f8b3ad9355ad 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -103,30 +103,24 @@ stdenv.mkDerivation rec { ]; # Fix all broken refernces to dependencies in .la and .pc files - postInstall = '' - sed -i \ - '' + optionalString (optZlib != null) '' - -e 's,\(-lz\),-L${optZlib}/lib \1,' \ + postInstall = optionalString (optZlib != null) '' + sed -i 's,\(-lz\),-L${optZlib}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} '' + optionalString (optOpenssl != null) '' - -e 's,\(-lssl\|-lcrypto\),-L${optOpenssl}/lib \1,' \ + sed -i 's,\(-lssl\|-lcrypto\),-L${optOpenssl}/lib \1,' $out/lib/pkgconfig/libcurl.pc '' + optionalString (optLibssh2 != null) '' - -e 's,\(-lssh2\),-L${optLibssh2}/lib \1,' \ + sed -i 's,\(-lssh2\),-L${optLibssh2}/lib \1,' $out/lib/pkgconfig/libcurl.pc '' + optionalString (optLibnghttp2 != null) '' - -e 's,\(-lnghttp2\),-L${optLibnghttp2}/lib \1,' \ + sed -i 's,\(-lnghttp2\),-L${optLibnghttp2}/lib \1,' $out/lib/pkgconfig/libcurl.pc '' + optionalString (optC-ares != null) '' - -e 's,\(-lcares\),-L${optC-ares}/lib \1,' \ + sed -i 's,\(-lcares\),-L${optC-ares}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} '' + optionalString (optGss != null) '' - -e 's,\(-lgss\),-L${optGss}/lib \1,' \ + sed -i 's,\(-lgss\),-L${optGss}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} '' + optionalString (optRtmpdump != null) '' - -e 's,\(-lrtmp\),-L${optRtmpdump}/lib \1,' \ + sed -i 's,\(-lrtmp\),-L${optRtmpdump}/lib \1,' $out/lib/pkgconfig/libcurl.pc '' + optionalString (optOpenldap != null) '' - -e 's,\(-lgss\),-L${optOpenldap}/lib \1,' \ + sed -i 's,\(-lgss\),-L${optOpenldap}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} '' + optionalString (optLibidn != null) '' - -e 's,\(-lidn\),-L${optLibidn}/lib \1,' \ - '' + optionalString (!stdenv.isDarwin) '' - $out/lib/libcurl.la \ - '' + '' - $out/lib/pkgconfig/libcurl.pc + sed -i 's,\(-lidn\),-L${optLibidn}/lib \1,' $out/lib/pkgconfig/libcurl.pc ''; meta = { From 206d63edaccfccaeedbc5d7fb8828fe8fb6d8305 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 12 May 2015 13:07:58 -0400 Subject: [PATCH 098/615] curl: propagate inputs instead of patching pkgconfig --- pkgs/tools/networking/curl/default.nix | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index f8b3ad9355ad..ad2c9ec68970 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # Use pkgconfig only when necessary nativeBuildInputs = optional (!isLight) pkgconfig; - buildInputs = [ + propagatedBuildInputs = [ optZlib optOpenssl optLibssh2 optLibnghttp2 optC-ares optGss optRtmpdump optOpenldap optLibidn ]; @@ -102,27 +102,6 @@ stdenv.mkDerivation rec { (mkEnable (optC-ares != null) "ares" null) ]; - # Fix all broken refernces to dependencies in .la and .pc files - postInstall = optionalString (optZlib != null) '' - sed -i 's,\(-lz\),-L${optZlib}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} - '' + optionalString (optOpenssl != null) '' - sed -i 's,\(-lssl\|-lcrypto\),-L${optOpenssl}/lib \1,' $out/lib/pkgconfig/libcurl.pc - '' + optionalString (optLibssh2 != null) '' - sed -i 's,\(-lssh2\),-L${optLibssh2}/lib \1,' $out/lib/pkgconfig/libcurl.pc - '' + optionalString (optLibnghttp2 != null) '' - sed -i 's,\(-lnghttp2\),-L${optLibnghttp2}/lib \1,' $out/lib/pkgconfig/libcurl.pc - '' + optionalString (optC-ares != null) '' - sed -i 's,\(-lcares\),-L${optC-ares}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} - '' + optionalString (optGss != null) '' - sed -i 's,\(-lgss\),-L${optGss}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} - '' + optionalString (optRtmpdump != null) '' - sed -i 's,\(-lrtmp\),-L${optRtmpdump}/lib \1,' $out/lib/pkgconfig/libcurl.pc - '' + optionalString (optOpenldap != null) '' - sed -i 's,\(-lgss\),-L${optOpenldap}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} - '' + optionalString (optLibidn != null) '' - sed -i 's,\(-lidn\),-L${optLibidn}/lib \1,' $out/lib/pkgconfig/libcurl.pc - ''; - meta = { description = "A command line tool for transferring files with URL syntax"; homepage = http://curl.haxx.se/; From 7e1286bf01b82c2a0b7d7b07327ebb593d0a2cd0 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 12 May 2015 16:28:07 -0400 Subject: [PATCH 099/615] jsoncpp: don't rely on coreutils cp --- pkgs/development/libraries/jsoncpp/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 7eb7f393ba43..07563364e340 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "0p92i0hx2k3g8mwrcy339b56bfq8qgpb65id8xllkgd2ns4wi9zi"; }; + /* During darwin bootstrap, we have a cp that doesn't understand the + * --reflink=auto flag, which is used in the default unpackPhase for dirs + */ + unpackPhase = '' + cp -a ${src} ${src.name} + chmod -R +w ${src.name} + export sourceRoot=${src.name} + ''; + nativeBuildInputs = [ # cmake can be built with the system jsoncpp, or its own bundled version. # Obviously we cannot build it against the system jsoncpp that doesn't yet exist, so From 24d5eb262dddff16e53663b49e5a12a824b92b8f Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 12 May 2015 23:38:28 +0200 Subject: [PATCH 100/615] Pass: Add pwgen to wrapper. --- pkgs/tools/security/pass/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index c03029232ac0..0480962fb966 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { getopt git gnupg + pwgen tree which ] ++ ifEnable x11Support [ dmenu xclip xdotool ]); From d90aeb762997c98e324e6dface0233df58051ba3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 12 May 2015 17:07:34 -0500 Subject: [PATCH 101/615] kdeApps_15_04.libkgeomap: fix missing marble dependency --- pkgs/applications/kde-apps-15.04/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 9de2f7a9fe15..213c70bfa235 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -36,6 +36,7 @@ let "Kipi" = "libkipi"; "LibKMahjongg" = "libkmahjongg"; "LibKonq" = "kde-baseapps"; + "Marble" = "marble"; }; mkDerivation = drv: kf5.mkDerivation (drv // { @@ -336,6 +337,14 @@ let buildInputs = super.libkface.buildInputs ++ [scope.KDE4 opencv]; }; + libkgeomap = super.libkgeomap // { + cmakeFlags = + (super.libkgeomap.cmakeFlags or []) + ++ [ + "-DCMAKE_MODULE_PATH=${kdeApps.marble}/share/apps/cmake/modules" + ]; + }; + libkipi = with pkgs; super.libkipi // { buildInputs = super.libkipi.buildInputs ++ [scope.KDE4]; }; @@ -344,13 +353,6 @@ let buildInputs = super.libksane.buildInputs ++ [scope.KDE4 saneBackends]; }; - marble = super.marble // { - preConfigure = '' - ${super.preConfigure or ""} - cmakeFlags="$cmakeFlags -DCMAKE_MODULES_INSTALL_PATH=$out/lib/cmake" - ''; - }; - rocs = super.rocs // { buildInputs = super.rocs.buildInputs ++ (with kf5; [ kdelibs4support ]); }; From ac4515958ddfd3812b2ef61b1404d45d0b9117d2 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Tue, 12 May 2015 20:04:12 -0400 Subject: [PATCH 102/615] ghcjs: bump ghcjs-boot This updates the git reference of the aeson submodule; the old one vanished. --- pkgs/development/compilers/ghcjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 24a361724aed..0547f80106be 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -41,8 +41,8 @@ let version = "0.1.0"; ghcjsBoot = fetchgit { url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "ab8765edcb507b8b810e3c324fd5bd5af2b69d8f"; # 7.10 branch - sha256 = "63b69a1d131cf3c7088e0f28d14750c81361dcc276fa113ad80dcccf73df5343"; + rev = "19620b69257115a69306eec505a97ac843055e92"; # 7.10 branch + sha256 = "027md1glfakniccqq0z1pyrz5w4fy0myxmbl0h789rbcxz9ybv6n"; fetchSubmodules = true; }; shims = fetchgit { From 1057771b7d4c2e2b55654291236a9644beb97082 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 13 May 2015 03:40:35 +0200 Subject: [PATCH 103/615] racerRust: Use stable rust platform --- pkgs/top-level/all-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0171f35911ca..6f40ba11b46a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5360,10 +5360,7 @@ let premake = premake4; - racerRust = callPackage ../development/tools/rust/racer { - # racerRust still uses unstable features from the standard library - rustPlatform = rustUnstable; - }; + racerRust = callPackage ../development/tools/rust/racer { }; radare = callPackage ../development/tools/analysis/radare { inherit (gnome) vte; From 4b0cfe67b44402c087ca7e9e0f484c3b1404431c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 10 May 2015 19:50:56 +0200 Subject: [PATCH 104/615] add gzdoom to nixpkgs --- pkgs/games/gzdoom/default.nix | 33 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/games/gzdoom/default.nix diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix new file mode 100644 index 000000000000..66d01905aaf3 --- /dev/null +++ b/pkgs/games/gzdoom/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchFromGitHub, cmake, fmod, mesa, SDL2}: + +stdenv.mkDerivation { + name = "gzdoom-2015-05-07"; + src = fetchFromGitHub{ + owner = "coelckers"; + repo = "gzdoom"; + rev = "a59824cd8897dea5dd452c31be1328415478f990"; + sha256 = "1lg9dk5prn2bjmyznq941a862alljvfgbb42whbpg0vw9vhpikak"; + }; + + buildInputs = [ cmake fmod mesa SDL2 ]; + + cmakeFlags = [ "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" ]; + + preConfigure='' + sed s@gzdoom.pk3@$out/share/gzdoom.pk3@ -i src/version.h + ''; + + installPhase = '' + mkdir -p $out/bin + cp gzdoom $out/bin + mkdir -p $out/share + cp gzdoom.pk3 $out/share + ''; + + meta = { + homepage = https://github.com/coelckers/gzdoom; + description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features"; + maintainer = [ stdenv.lib.maintainers.lassulus ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9936330936c2..d9c3c3da5642 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12932,6 +12932,8 @@ let gtypist = callPackage ../games/gtypist { }; + gzdoom = callPackage ../games/gzdoom { }; + hedgewars = callPackage ../games/hedgewars { inherit (haskellPackages) ghc network vector utf8String bytestringShow random hslogger dataenc; From aaa9f837a94ebac7347cd911f5476fc9b1343c3b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 May 2015 11:21:09 +0200 Subject: [PATCH 105/615] r-modules: fix Hydra evaluation errors --- pkgs/development/r-modules/default.nix | 45 ++++++++++++++------------ 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index ecc8abf64608..e0b19f465c98 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -665,9 +665,9 @@ let "babel" # requires edgeR "BACA" # requires RDAVIDWebService "BcDiag" # requires fabia - "beadarrayMSV" # requires Biobase, geneplotter, andlimma "bdvis" # requres taxize "beadarrayFilter" # requires beadarray + "beadarrayMSV" # requires Biobase, geneplotter, andlimma "bigGP" # requires MPI running. HELP WANTED! "bigpca" # requires NCmisc "Biograph" # requires mvna @@ -681,13 +681,13 @@ let "CARrampsOcl" # depends on OpenCL "CHAT" # requires DNAcopy "ChemoSpec" # depends on broken speaq - "Crossover" # fails self-test "classGraph" # requires graph, and Rgraphviz "clpAPI" # requires clp "compendiumdb" # requires Biobase "CORM" # requires limma "cplexAPI" # requires CPLEX "crmn" # requires pcaMethods, and Biobase + "Crossover" # fails self-test "CrypticIBDcheck" # requires rJPSGCS "cudaBayesreg" # requres Rmath "curvHDR" # requires flowCore @@ -702,6 +702,7 @@ let "demi" # requires affy, affxparser, and oligo "DepthProc" # requires samr "DiagrammeR" # requires V8 to build + "DiffCorr" # misses undeclared dependencies 'pcaMethods', 'multtest' "Digiroo2" # requires spatstat "dixon" # requires spatstat "dnet" # requires supraHex, graph, Rgraphviz, and Biobase @@ -729,13 +730,14 @@ let "FunctionalNetworks" # requires breastCancerVDX, and Biobase "gamlss_demo" # requires rpanel "GeneticTools" # requires snpStats + "geojsonio" # requires V8 to build "GExMap" # requires Biobase and multtest "gitter" # requires EBImage "glmgraph" # test suite says: "undefined symbol: dgemv_" "gmatrix" # depends on proprietary cudatoolkit + "gMCP" # fails self-test "GOGANPA" # requires WGCNA "gputools" # depends on proprietary cudatoolkit - "gMCP" # fails self-test "gRain" # requires gRbase "gRapHD" # requires graph "gRbase" # requires RBGL, and graph @@ -752,6 +754,7 @@ let "HierO" # requires rneos "HiPLARM" # requires MAGMA or PLASMA "hpoPlot" # requires Rgraphviz + "hsdar" # fails to build "HTSCluster" # requires edgeR "iFes" # depends on proprietary cudatoolkit "imputeLCMD" # requires pcaMethods, and impute @@ -768,6 +771,7 @@ let "latticeDensity" # requires spatstat "leapp" # requires sva "lefse" # SDMTools.so: undefined symbol: X + "lfe" # fails to compile "lgcp" # requires rpanel "LinRegInteractive" # requires Rpanel "LogisticDx" # requires gRbase @@ -785,13 +789,16 @@ let "MigClim" # SDMTools.So: Undefined Symbol: X "minimist" # requires broken V8 "miRtest" # requires globaltest, GlobalAncova, and limma + "MixGHD" # requires mixture to build "mixture" # mixture.so: undefined symbol: dtrmm_ "moduleColor" # requires impute + "mongolite" # doesn't find OpenSSL "msarc" # requires AnnotationDbi "MSeasy" # requires mzR, and xcms "MSeasyTkGUI" # requires MSeasyTkGUI "MSIseq" # requires IRanges "msSurv" # requires graph + "muir" # requires DiagrammeR to build "multiDimBio" # requires pcaMethods "mutossGUI" # requires mutoss "mutoss" # requires multtest @@ -800,17 +807,14 @@ let "NCmisc" # requires BiocInstaller "netClass" # requires samr "nettools" # requires WGCNA - "NORRRM" # can't load SDMTools properly "netweavers" # requires BiocGenerics, Biobase, and limma "NLPutils" # requires qdap + "NORRRM" # can't load SDMTools properly "NSA" # requires aroma_core "OpenCL" # FIXME: requires CL/opencl.h "optBiomarker" # requires rpanel "ora" # requires ROracle "orQA" # requires genefilter - "pRF" # requires multtest - "PBSmapping" # fails its test suite for unclear reasons - "PBSddesolve" # fails its test suite for unclear reasons "PairViz" # requires graph "PANDA" # requires GO.db "ParDNAcopy" # requires DNAcopy @@ -820,6 +824,8 @@ let "pbdDEMO" # requires pbdMPI "pbdDMAT" # requires pbdMPI "pbdSLAP" # requires pbdMPI + "PBSddesolve" # fails its test suite for unclear reasons + "PBSmapping" # fails its test suite for unclear reasons "pcaL1" # requires clp "pcalg" # requires graph, and RBGL "PCGSE" # requires safe @@ -836,6 +842,7 @@ let "pmclust" # requires MPI running. HELP WANTED! "polyCub" # requires spatstat "ppiPre" # requires AnnotationDbi, GOSemSim, GO.db + "pRF" # requires multtest "propOverlap" # requires Biobase "protiq" # requires graph, and RBGL "PSCBS" # requires DNAcopy @@ -845,17 +852,18 @@ let "qtlnet" # requires pcalg "qtpaint" # can't find QtCore libraries "QuACN" # requires graph, RBGL + "quanteda" # fails to build "QuasiSeq" # requires edgeR "RADami" # requires Biostrings "raincpc" # SDMTools.so: undefined symbol: X "rainfreq" # SDMTools.so: undefined symbol: X "RAM" # requires Heatplus - "RAPIDR" # requires Biostrings, Rsamtools, and GenomicRanges "RapidPolygonLookup" # depends on broken PBSmapping + "RAPIDR" # requires Biostrings, Rsamtools, and GenomicRanges "RbioRXN" # requires fmcsR, and KEGGREST - "RcppAPT" # configure script depends on /bin/sh "RcmdrPlugin_seeg" # requires seeg "Rcplex" # requires cplexAPI + "RcppAPT" # configure script depends on /bin/sh "RcppRedis" # requires Hiredis "rDEA" # no such file or directory "RDieHarder" # requires libdieharder @@ -863,6 +871,8 @@ let "REBayes" # requires Rmosek "RefFreeEWAS" # requires isva "retistruct" # depends on broken RImageJROI + "rgp" # fails self-test + "rgpui" # depends on broken rgp "RImageJROI" # requires spatstat "rjade" # requires V8 to build "rJPSGCS" # requires chopsticks @@ -879,8 +889,6 @@ let "rpanel" # I could not make Tcl to recognize BWidget. HELP WANTED! "RQuantLib" # requires QuantLib "RSAP" # requires SAPNWRFCSDK - "rgp" # fails self-test - "rgpui" # depends on broken rgp "RSeed" # requires RBGL, and graph "rsig" # requires survcomp "RSNPset" # requires qvalue @@ -893,6 +901,7 @@ let "selectspm" # depends on broken ecespa "semiArtificial" # requires RSNNS "SeqFeatR" # requires Biostrings, qvalue, and widgetTools + "SeqGrapheR" # depends on Biostrings "sequenza" # requires copynumber "SGCS" # requires spatstat "siar" # requires spatstat @@ -913,9 +922,9 @@ let "speaq" # requires MassSpecWavelet "spocc" # requires leafletR "SQDA" # requires limma - "Statomica" # requires Biobase, multtest "stagePop" # depends on broken PBSddesolve - "SeqGrapheR" # depends on Biostrings + "statar" # depends on broken lfe + "Statomica" # requires Biobase, multtest "stpp" # requires spatstat "structSSI" # requires multtest "strum" # requires Rgraphviz @@ -928,22 +937,16 @@ let "topologyGSA" # requires gRbase "TR8" # requres taxize "trip" # requires spatstat + "TROM" # misses undeclared dependencies topGO', 'AnnotationDbi', 'GO.db' "ttScreening" # requires sva, and limma "V8" # compilation error - "vows" # requires rpanel "vmsbase" # depends on broken PBSmapping + "vows" # requires rpanel "WGCNA" # requires impute "wgsea" # requires snpStats "WideLM" # depends on proprietary cudatoolkit "x_ent" # requires opencpu "zoib" # tarball is invalid on server - "DiffCorr" # misses undeclared dependencies 'pcaMethods', 'multtest' - "TROM" # misses undeclared dependencies topGO', 'AnnotationDbi', 'GO.db' - "lfe" # fails to compile - "mongolite" # doesn't find OpenSSL - "quanteda" # fails to build - "statar" # depends on broken lfe - "hsdar" # fails to build ]; otherOverrides = old: new: { From e15ed5abf5de8e88924135eb41f7d379ca5aef31 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 13 May 2015 12:37:14 +0300 Subject: [PATCH 106/615] Squid: remove --march=native The Squid build default behaivour is to request optimisation for the current CPU which is not a good idea in distro builds. --- pkgs/servers/squid/squids.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix index 587c17a3ceea..b7c428351794 100644 --- a/pkgs/servers/squid/squids.nix +++ b/pkgs/servers/squid/squids.nix @@ -11,7 +11,7 @@ rec { sha256 = "3e54ae3ad09870203862f0856c7d0cca16a85f62d5012085009003ee3d5467b4"; }; - configureFlags = ["--enable-ipv6" "--disable-strict-error-checking"]; + configureFlags = ["--enable-ipv6" "--disable-strict-error-checking" "--disable-arch-native"]; meta = { description = "http-proxy"; From 8c1e98563ced2ce2156378d74dc995891b8deb20 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 13 May 2015 10:45:52 +0200 Subject: [PATCH 107/615] Remove aterm28 from release-small, it's broken --- pkgs/top-level/release-small.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index a4ae1932fcfe..7c3f516c4944 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -20,7 +20,6 @@ with import ./release-lib.nix { inherit supportedSystems; }; at = linux; atlas = linux; aterm25 = all; - aterm28 = all; autoconf = all; automake = all; avahi = allBut cygwin; # Cygwin builds fail From 645b1cea6eeb9d4daa88904af4c3496d0e04692d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 May 2015 12:17:01 +0200 Subject: [PATCH 108/615] wxmaxima: update to 15.04.0 --- pkgs/applications/science/math/wxmaxima/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index a73e3dbcec04..8af49621dd98 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -2,14 +2,14 @@ let name = "wxmaxima"; - version = "14.12.1"; + version = "15.04.0"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/wxMaxima/${version}/wxmaxima-${version}.tar.gz"; - sha256 = "0sjxvh0y5w5p2xdq3qzz3yhlsigrg3ynib9dkymhynpfnb51x82z"; + sha256 = "1fm47ah4aw5qdjqhkz67w5fwhy8yfffa5z896crp0d3hk2bh4180"; }; buildInputs = [wxGTK maxima makeWrapper]; From c1e62e9e8b9c615fd6a8cfea247423cc46a0390c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 May 2015 12:17:16 +0200 Subject: [PATCH 109/615] maxima: update to version 5.36.1 --- pkgs/applications/science/math/maxima/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index ffc16a330542..e42bd0f83ee0 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -2,7 +2,7 @@ let name = "maxima"; - version = "5.35.1"; + version = "5.36.1"; searchPath = stdenv.lib.makeSearchPath "bin" @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "1wwqvay9z6gal7bsyyyhhcwh0fy5ak4h2a446ali0x6zmybaklcy"; + sha256 = "0x1rk659sn3cq0n5c90848ilzr1gb1wf0072fl6jhkdq00qgh2s0"; }; buildInputs = [sbcl texinfo perl makeWrapper]; From 3e89fab1f717c0dafcc86a57bea6d83077a8d305 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 May 2015 13:08:15 +0200 Subject: [PATCH 110/615] haskell-rtorrent-rpc: update ticket link --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 36ae1a181d79..3c0ab9ea5d21 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -669,7 +669,7 @@ self: super: { # HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence) unlambda = dontHyperlinkSource super.unlambda; - # https://github.com/megantti/rtorrent-rpc/issues/1 + # https://github.com/megantti/rtorrent-rpc/issues/2 rtorrent-rpc = markBroken super.rtorrent-rpc; # https://github.com/PaulJohnson/geodetics/issues/1 From cf013700efbf73eb077fbd43f9bd8fcb20dd36ee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 May 2015 13:18:24 +0200 Subject: [PATCH 111/615] haskell-esqueleto: remove obsolete jailbreak for ghc-7.10.x --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 - 1 file changed, 1 deletion(-) 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 409b7500ae50..1a7f16a81317 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -77,7 +77,6 @@ self: super: { utf8-string = overrideCabal super.utf8-string (drv: { patchPhase = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal"; }); - esqueleto = doJailbreak super.esqueleto; pointfree = doJailbreak super.pointfree; # acid-state/safecopy#25 acid-state/safecopy#26 From bd3e6628ae0c7c8b22fbe9a33d620da1b9608e35 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 May 2015 13:20:11 +0200 Subject: [PATCH 112/615] haskell-esqueleto: test suite has been fixed upstream --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3c0ab9ea5d21..c444b38d7a49 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -715,9 +715,6 @@ self: super: { HipmunkPlayground = dontDistribute super.HipmunkPlayground; click-clack = dontDistribute super.click-clack; - # https://github.com/prowdsponsor/esqueleto/issues/93 - esqueleto = dontCheck super.esqueleto; - # https://github.com/fumieval/audiovisual/issues/1 audiovisual = markBroken super.audiovisual; call = dontDistribute super.call; From e46a796f5d99c405111898bc5aa63783021a12de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 May 2015 13:36:51 +0200 Subject: [PATCH 113/615] haskell-bitcoin-api has been fixed upstream --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 1a7f16a81317..b5c0f42fc780 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -317,10 +317,6 @@ self: super: { # https://github.com/purefn/hipbot/issues/1 hipbot = dontDistribute super.hipbot; - # https://github.com/solatis/haskell-bitcoin-api/issues/1 - bitcoin-api = markBroken super.bitcoin-api; - bitcoin-api-extra = dontDistribute super.bitcoin-api-extra; - # https://github.com/HugoDaniel/RFC3339/issues/14 timerep = dontCheck super.timerep; From 92317259efd591a6107c01123a606c3c96b9066b Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Wed, 13 May 2015 14:22:06 +0200 Subject: [PATCH 114/615] cups: First attempt to fix our printing tests; wait until cups is fully initialized --- nixos/tests/printing.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 708ff5391570..e8c41140045c 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -34,6 +34,7 @@ import ./make-test.nix ({pkgs, ... }: { # Make sure that cups is up on both sides. $server->waitForUnit("cups.service"); $client->waitForUnit("cups.service"); + $client->sleep(10); # wait until cups is fully initialized $client->succeed("lpstat -r") =~ /scheduler is running/ or die; $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die; $client->succeed("curl --fail http://localhost:631/"); From e9679ce32a43488b15cccfb77d362561dc6fa9ce Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 13 May 2015 15:03:01 +0300 Subject: [PATCH 115/615] postgresql-backup: use system postgresql package --- nixos/modules/services/backup/postgresql-backup.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix index 1f7b123eca37..c4127543f10d 100644 --- a/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixos/modules/services/backup/postgresql-backup.nix @@ -9,7 +9,7 @@ let postgresqlBackupCron = db: '' - ${config.services.postgresqlBackup.period} root ${postgresql}/bin/pg_dump ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz + ${config.services.postgresqlBackup.period} root ${config.services.postgresql.package}/bin/pg_dump ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz ''; in From 5f7f793d4e1a03a5c6acec00973785be3659e123 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 13 May 2015 12:20:34 +0200 Subject: [PATCH 116/615] hplip: coalesce `find -exec sed` invocations No need to scan the (biggish) source tree six times, forking a separate process for every file each time. This was slowing down testing. --- pkgs/misc/drivers/hplip/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index b40aab73a4d1..41ed3e710427 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -33,12 +33,14 @@ stdenv.mkDerivation { prePatch = '' # HPLIP hardcodes absolute paths everywhere. Nuke from orbit. - find . -type f -exec sed -i s,/etc/hp,$out/etc/hp, {} \; - find . -type f -exec sed -i s,/etc/sane.d,$out/etc/sane.d, {} \; - find . -type f -exec sed -i s,/usr/include/libusb-1.0,${libusb1}/include/libusb-1.0, {} \; - find . -type f -exec sed -i s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor, {} \; - find . -type f -exec sed -i s,/usr/lib/systemd/system,$out/lib/systemd/system, {} \; - find . -type f -exec sed -i s,/var/lib/hp,$out/var/lib/hp, {} \; + find . -type f -exec sed -i \ + -e s,/etc/hp,$out/etc/hp, \ + -e s,/etc/sane.d,$out/etc/sane.d, \ + -e s,/usr/include/libusb-1.0,${libusb1}/include/libusb-1.0, \ + -e s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor, \ + -e s,/usr/lib/systemd/system,$out/lib/systemd/system, \ + -e s,/var/lib/hp,$out/var/lib/hp, \ + {} + ''; preConfigure = '' From 97e5461f46b6e27cf3b3e18b63529d5a1483586e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 May 2015 15:15:04 +0200 Subject: [PATCH 117/615] wxmaxima: build with GTX 3.x. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f40ba11b46a..d6fcb1c0f95f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13910,7 +13910,7 @@ let maxima = callPackage ../applications/science/math/maxima { }; - wxmaxima = callPackage ../applications/science/math/wxmaxima { }; + wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; }; pari = callPackage ../applications/science/math/pari {}; From c22b03db0cc472878bdeff801ad280c4a457bb29 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 13 May 2015 22:19:50 +0900 Subject: [PATCH 118/615] firefox-bin: update to version 38.0 --- .../browsers/firefox-bin/sources.nix | 358 +++++++++--------- 1 file changed, 179 insertions(+), 179 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index 4d002119a898..2e5545d6a959 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 = "37.0.2"; + version = "38.0"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha1 = "77e30ca3d592424f80cf7c6cf31e90edddbebb3d"; } - { locale = "ach"; arch = "linux-x86_64"; sha1 = "c101098915d8955da06751d5bdf2afe029054e3f"; } - { locale = "af"; arch = "linux-i686"; sha1 = "4287ba79e3aaaa601ae36643ad281c64554b847f"; } - { locale = "af"; arch = "linux-x86_64"; sha1 = "a787ec352ad94375600185902766ddfd91ac2d5d"; } - { locale = "an"; arch = "linux-i686"; sha1 = "4910dab93896ca7198b0154f0518ea5613b9a3b0"; } - { locale = "an"; arch = "linux-x86_64"; sha1 = "60d2c5122a67bae8d7c27fd01caa8d8eef0a143f"; } - { locale = "ar"; arch = "linux-i686"; sha1 = "f2b70fc8a72d3d43a28cc51776eaacff22f288ad"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "409d2981a9aff39e23bd00231761899e65e80862"; } - { locale = "as"; arch = "linux-i686"; sha1 = "d27e921e475608cc52e6f07a22687497eb575b01"; } - { locale = "as"; arch = "linux-x86_64"; sha1 = "3bfa7ccaff6b04f9f1d0a479c10412a1308caf4f"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "d1c94f4c5fe83d52fa8e0ee586f78747616e1aaf"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "df3d38e59a5f233caa97134713e29cfa0dce6e27"; } - { locale = "az"; arch = "linux-i686"; sha1 = "5d01ef1267ddcc28e89009b86f2bb0a1e70fc386"; } - { locale = "az"; arch = "linux-x86_64"; sha1 = "440a5cd423147412335636326618e6b6b4c02416"; } - { locale = "be"; arch = "linux-i686"; sha1 = "1b9a9758c17ae74876ee6d09373dd99e89da05a3"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "940d2a07808aedc1f9c927b62f03b75270bbecd7"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "ee3f4b60ebb6fd3639ba7e2a3acd81ffcd13ba3f"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "f97ef4f7d3264b1aaf7699fe656f7dccf2cd4238"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "1a0e2da3014a811a766164953d003c136e28c174"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "703116b7d2583d21fda09933e5d8b9244c15c6ee"; } - { locale = "bn-IN"; arch = "linux-i686"; sha1 = "f501f69cf65bf340d5d5ce6744394f1a83c2daf3"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "eb74b7a12a2fddf8c47e9c0b0ab9359b7da10703"; } - { locale = "br"; arch = "linux-i686"; sha1 = "9ecc2ca3344559a63fefee144fde9faa391f1c29"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "5121ac58aa90f6a2e3b3f87bcf7dbd8670b7c9bf"; } - { locale = "bs"; arch = "linux-i686"; sha1 = "42b9ace3d28e103fb195599c7c88ae78f16c3e4c"; } - { locale = "bs"; arch = "linux-x86_64"; sha1 = "06b81108ec1509e36de108837f3c7ed1d96ebc0e"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "5fb5aee535cbede12169d1208d59fb1510207a66"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "e8e6ebb6d70a809cfe8e9102ede99b7ce6239b8e"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "13d157533dfca54b2a81625dbf3642b915f18e47"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "f7fc30f448e981a47c63c21756dcd6feff08783c"; } - { locale = "cy"; arch = "linux-i686"; sha1 = "c9cdc5eefca689aabb7861e1ad9f44f42b36acb0"; } - { locale = "cy"; arch = "linux-x86_64"; sha1 = "a76182a74992ce7031fa2254f056694910c963d1"; } - { locale = "da"; arch = "linux-i686"; sha1 = "afb09acee0d8456e2bab32d7579da39244754038"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "26bca2ea48a814b7b3ffb91fc461867bf775c6dc"; } - { locale = "de"; arch = "linux-i686"; sha1 = "36a8bf02f324d929c52a6f4f38bb8cd413bbec3e"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "2d39187c71ad006e1fbd7ab488c7560d1c88f9cb"; } - { locale = "dsb"; arch = "linux-i686"; sha1 = "8c9843547aec04af07a09c2f9902583b2daab3f0"; } - { locale = "dsb"; arch = "linux-x86_64"; sha1 = "7778c1588580bf735e5dd4da89ab16528163a2c3"; } - { locale = "el"; arch = "linux-i686"; sha1 = "8aef1a9b8c6d1297d53002f1852bf52d6728c0fa"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "b7c2ad5da9c446939bf5e7071f84a6c3f8cd7b22"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "f85f36fcd900f642f53a74d6b843e2c67b3ab950"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "9dcc21ec189c588931e9bf38310522bb994d98c2"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "df80ad28979145a116d13db19c1c4e4b516c362d"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "b4e2da05fcd224ee01e2742d86d6b68bbdc108cd"; } - { locale = "en-ZA"; arch = "linux-i686"; sha1 = "73a83b23f2f1edcc4114df0b728e791c0626292a"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "fd451735b82a9b609b7f5f09aa0461191b490e5a"; } - { locale = "eo"; arch = "linux-i686"; sha1 = "471873938d52ccebe8958407be1989937181ca9a"; } - { locale = "eo"; arch = "linux-x86_64"; sha1 = "fc8c668d3d66a4e42be9aa0fd46ca84cf061dade"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "599823d54919efb62ffd4f65fd8b873720d64b08"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "cc2e509b55de680d4c9a95ac84765c5fb5fa8b44"; } - { locale = "es-CL"; arch = "linux-i686"; sha1 = "754b32bbc0108f0e9c3c2e78f4c3e023e0486bff"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "7ab4206b66783a72fbe66c59fda120dc1afd0e3c"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "b52814a56ee620693aa4d658ada67e816a3daf59"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "b4cbbc984c7cc9f566ddce0e180410ccb79adc13"; } - { locale = "es-MX"; arch = "linux-i686"; sha1 = "874cb197fe4498a83822fa386ac0824bffc9646d"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "056746dae1ba7e88a3f2403fb11b17ee831b199b"; } - { locale = "et"; arch = "linux-i686"; sha1 = "70bb834ac4d70fb1f20625027c73a6ece8f24cc8"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "57202dd5e34ed24e31f30bab79b0fcbb220e81b7"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "1e7287dfcd55f79e2157f3e49875a85f8a500c75"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "a6389d117c02ad2d9a997dcac64ba54c0310d715"; } - { locale = "fa"; arch = "linux-i686"; sha1 = "5f82328712e7a16ae6dab5928623b0c652b646bc"; } - { locale = "fa"; arch = "linux-x86_64"; sha1 = "5625f288967b3afc86a5d0136d64a1ba9581a6c1"; } - { locale = "ff"; arch = "linux-i686"; sha1 = "73afc152eca2aeb346b1ea46a35b24132061c6af"; } - { locale = "ff"; arch = "linux-x86_64"; sha1 = "ea1eab3e656f1bc68fc76425cd10be01945e7d66"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "24d0bc254438b96307c650700ca58d4e1b2d5fe8"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "d5b8f8f2052985c5f6dcbcdd5b122094347ed26b"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "118d981ae14f0425e27726afb516519b8de11390"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "af883c88b1a1e31a31a5a20d603b6109209c6f6b"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "44d6d4be0a1d1ddd75f476a94b3e2f6117ffca72"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "1629ea289914570257e611323618b477b2cf6576"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "c3ac3c11a490f37a6c209d753d6db5cd0c696dff"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "ea778a04a997632a38e70d3b96c5cc86545056d3"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "2e71d653007e589cd93a90e3239beb0074d33e9d"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "d878a2c149a96e2181d110e5ae265f35c0d44b62"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "2669d169a07cfbba062e147d12cd2a708579c76e"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "515622615f08c49a257ba6766ff0af1984c134a1"; } - { locale = "gu-IN"; arch = "linux-i686"; sha1 = "98bc0711616e665dc386e2c24b6a96ca5e3bfe25"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "a87c089251356074bc039c88e040138db3485539"; } - { locale = "he"; arch = "linux-i686"; sha1 = "b8fb6b91641f89159485ea65efb98c0f3aa23d84"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "2a2a6cc3dcf6b988138549649ede6b030c26818c"; } - { locale = "hi-IN"; arch = "linux-i686"; sha1 = "611ed2ff88f2872acfd1302f2ee3defe59142dbd"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "04922ffab952b7493059304d70064956cbaf5dce"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "13a43d380043f008e26f6fb77b16e6087c622a64"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "c7d45cdd831bafba438c81efa6cf5dd3f4a5657e"; } - { locale = "hsb"; arch = "linux-i686"; sha1 = "319a922186b3a8a9bea749014498e7f492043b4b"; } - { locale = "hsb"; arch = "linux-x86_64"; sha1 = "fdd0485af2b0684436bd6207701c287a2f3d05c6"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "33e82dea7e4a6e421ee23a94ba3a5ca5171fef34"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "fde72e1c7f93e4bcbebc9803e78d3e1cbce2d64b"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "ad702a8c047a5044ffb39039eaa74e7a86bd80ae"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "b83ff7323e9e66907a02f798cbb13a114fdc652c"; } - { locale = "id"; arch = "linux-i686"; sha1 = "c435f7c84ee188d09b5352163334a6458ec125ba"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "dc8858ac8ae9ef92013fa73f986daf6eade1ae26"; } - { locale = "is"; arch = "linux-i686"; sha1 = "c1d853deba529e750b8b705581aedb218f0c57d9"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "ba819e0bd9e630a6299fd8ef1dd99d1203abbd2d"; } - { locale = "it"; arch = "linux-i686"; sha1 = "1ffccd73282e28a52d99b8e98e3bf8ccefcf405b"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "9d68d2cb24ecf349ff504638e04272d56a636f90"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "e7cae2f72552fdcd1ccb57c760ddd4b694218513"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "57befb5643689b0ab2b456651735c75fc47a312a"; } - { locale = "kk"; arch = "linux-i686"; sha1 = "345e0cf27301357d46ead1ef04fcc415c9db4f99"; } - { locale = "kk"; arch = "linux-x86_64"; sha1 = "ac55fbb3ca6e8ad69c7aceebad99d18ed1353cbc"; } - { locale = "km"; arch = "linux-i686"; sha1 = "9c8d7c1a6b79dc2ff7a28e309e24fdb2d07385ba"; } - { locale = "km"; arch = "linux-x86_64"; sha1 = "e122a13e5485d9a8bf12e91487cf0247fb652eea"; } - { locale = "kn"; arch = "linux-i686"; sha1 = "4da07bc2cdb714f8083032f99e702333ece64dfa"; } - { locale = "kn"; arch = "linux-x86_64"; sha1 = "48b5f227919b06ee995b68ee0b6117df8f428942"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "ce22701571474e14ad690ccb5ee700c790667fe8"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "d901ffdec4217b389b96268f9094fc1d01cd2263"; } - { locale = "lij"; arch = "linux-i686"; sha1 = "2191718817cbf9eefef3f7d994849a737e9adb88"; } - { locale = "lij"; arch = "linux-x86_64"; sha1 = "f21245f7b00187d8b6fb3d30f6ec83510acf7546"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "47ebc8005959e431cca843a0514c2499449ed9b2"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "18220fab22a9737d1577455ec218f5b2f9226e53"; } - { locale = "lv"; arch = "linux-i686"; sha1 = "e4e3d2de5a899c422b85ab1518c454d81ee54bd8"; } - { locale = "lv"; arch = "linux-x86_64"; sha1 = "45a2551248ee43e189492b1416ed096799857382"; } - { locale = "mai"; arch = "linux-i686"; sha1 = "aa1374d602fff2d393be86563d3cab72b35f7384"; } - { locale = "mai"; arch = "linux-x86_64"; sha1 = "acfb03ba9f3d232ff68af24d61f80c6c0a94aeca"; } - { locale = "mk"; arch = "linux-i686"; sha1 = "a9295e006982059b01f7bd7e2c6f8959de2a2e23"; } - { locale = "mk"; arch = "linux-x86_64"; sha1 = "e37dcfc6bd29e8a5034624df71726091c6c768f0"; } - { locale = "ml"; arch = "linux-i686"; sha1 = "b81b278d31aff4d4912da328f2c3ecdbb1ec830a"; } - { locale = "ml"; arch = "linux-x86_64"; sha1 = "b5c21e4d32f9f78043eee8605d131e63d9568ef1"; } - { locale = "mr"; arch = "linux-i686"; sha1 = "56d7cc6bf3a125c9e9f5b4799a2d34a5d941dc43"; } - { locale = "mr"; arch = "linux-x86_64"; sha1 = "528db467e4f64f9149f88ecd36c19c8a23835c17"; } - { locale = "ms"; arch = "linux-i686"; sha1 = "71482b740ea057ae9cdd15cfba89467639dbda63"; } - { locale = "ms"; arch = "linux-x86_64"; sha1 = "bdaff803efa7cb1e2bd31e7f7a29b4c174fb60e3"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "1f4642a4dd61ad57d833ae961ce0f0f1c6c7471a"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "3e89f59c82ae0ee52af586364bad8b6e69fdec28"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "3292597b5f499193c8a1bd1f71b9df81925e4c87"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "ddb145bb406c096be680d246b9a727d6e926f9cb"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "9cedfe3a1f98db1a999f64bcfdc77e8df72cbbc5"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "a58a8593b49cbf1d6f6b35feb61df95a51717127"; } - { locale = "or"; arch = "linux-i686"; sha1 = "b80d8770ce0358674d1b2f39c7bb5b8a042a5d32"; } - { locale = "or"; arch = "linux-x86_64"; sha1 = "66540a388aa07190fa98aff515f09a01d1c173ee"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "d9e85c6de7487b13e91f400ce8a06c0104b08ddc"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "01da681d516c6b1febd0096c6dcd8ccbc9b6fdef"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "faa22ad8c24d6465976412d1bd252c74936f937c"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "5410dcf34d4207e005f207fc430892f23f160461"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "0735e4827702f896332e1461dcdb3e7088e60d90"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "8b083ad5aad313afd9fa9c4e91ebbd03f205b67f"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "2fc593cebbfe2bdae3689255f46cd9c41314f00c"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "5bfa929956b1ce9a0ef2afb08ae3510326e962c6"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "81e5a280e47fbbac82d1c0e0604828ab9937e1e6"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "fbc333306bb32eaf2b2d815efa32a5915cd15ede"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "df75129e5c618cdfe180ddf71598704f8c652e5c"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "6b0556075110eac4263e1b2ba9bef29a3504d302"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "3309c2e1bcc6d623a28c01cf3e61ed9d9a2d676b"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "f729504273d11b18f3b9c1f4918a18a2a63483da"; } - { locale = "si"; arch = "linux-i686"; sha1 = "9d54da726bd01800a7fa41de9bc0b9aaba9202b9"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "1550492673a913ecd0ff14ccdea0289bbfc680f6"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "d8b97959e6d77ac9d1e0c512414824c9c037d2f0"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "1056467b1726dc0469745d5eb80407e3715c6aee"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "9c51bd6b10adfb2dc3cf07d38981636c3a13557a"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "9f58166807385e0e95682b361e0654125311b4d6"; } - { locale = "son"; arch = "linux-i686"; sha1 = "cf5b8b7266e6c6c5054aeab213c37e61df68057f"; } - { locale = "son"; arch = "linux-x86_64"; sha1 = "36a609e8e1a2002653520b7a872562ecd34d6afc"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "6c723410982cf03559199122ce358757670f0d61"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "7e0dae98aa342781a5e89c7f531545704d48b9b6"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "eb000da14a0e48ffac929e51db640c721e8c9e11"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "5696ee19d90930527370021a9eb51f0579080293"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "ed9c5d17963779cebd526a65abd10d82b9b7aadc"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "7086405ab9008c91c9acbe7685590ee4497b0576"; } - { locale = "ta"; arch = "linux-i686"; sha1 = "0f0aea80ca1dbf604a3c0ac28a255431c1952f88"; } - { locale = "ta"; arch = "linux-x86_64"; sha1 = "e794ceab525cbc0314d10398a807c436ef66d17d"; } - { locale = "te"; arch = "linux-i686"; sha1 = "09c3427c855d7c82e44997accc80a52317d0d22d"; } - { locale = "te"; arch = "linux-x86_64"; sha1 = "af19d02ed9dbb366d0c7b34b538ae83bf2f6212c"; } - { locale = "th"; arch = "linux-i686"; sha1 = "3064e5bcea910f32fbef60acd41a9917145c48a1"; } - { locale = "th"; arch = "linux-x86_64"; sha1 = "a7ad2f98a7a534667370ef3f22ae00f90002a1a7"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "76726e6bbbd89eb6469df960ec889ce781cfc68b"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "031b5eb83b6e96dcd9bdf2eabdfab7a370b0becb"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "5d31c283914d67dcfc0af09525ab3814d0e05db4"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "a9e577f4e9aba0af6b019b566f98121586112552"; } - { locale = "uz"; arch = "linux-i686"; sha1 = "f84745683934f221dc5de1b970dae5c919979a71"; } - { locale = "uz"; arch = "linux-x86_64"; sha1 = "95aef2a68a86030078ac64346445f5f92a85fb63"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "53e9197a3de8d63950b5d324a4da0d3533dd492c"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "be24b818a6ba1209d383c9c43af0bb0ddd82070b"; } - { locale = "xh"; arch = "linux-i686"; sha1 = "be808769e77a47ace01b1b2455607c56a402e795"; } - { locale = "xh"; arch = "linux-x86_64"; sha1 = "9feca0a4ba5ab71b05bad4ff0324c648ccae7f38"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "057c9ead60a3819eecae1f31ed512ea3e5e2aab4"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "2503f8354c07929c1b943c64ea233bb6453c2740"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "75c439a7002183aa5ad8795c1986c109714c2f00"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "add241bb07ff446df18f98f6eec18ebec3bb4e31"; } + { locale = "ach"; arch = "linux-i686"; sha1 = "703e63e142bba42a1735acf9da88cd52e722ab02"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "93da442b9262e2191145cbf95813fae1358cd981"; } + { locale = "af"; arch = "linux-i686"; sha1 = "b489f1a3fbae4762e7dac947d26effa3ff0c3f60"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "fe6b38ceb279e042d238064154f6d4d8e2c6fb61"; } + { locale = "an"; arch = "linux-i686"; sha1 = "28bdaafca6b99f115dcdae34a0f6ce4eaeaf5507"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "726e734772bf68ff5e4b88ed789b10122fe302bc"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "ed0ab975dbf5a26c3704fdd24b47b7f358edeb3a"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "909af01cbe8eb2e2c3557a474bb0d77b03b40a6d"; } + { locale = "as"; arch = "linux-i686"; sha1 = "c869d42a757798d17d0b0398c6a75652e795ce4c"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "c4183741ea8383caa350c115288f32057306bc95"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "9f20f4dae0ede083f193c61935d2781c7cd29b76"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "0198b69cbf5864a1d4981e0a3e0373e7bad1b8a8"; } + { locale = "az"; arch = "linux-i686"; sha1 = "f2ab43ab4bd81c4dfc17657943e962a1b2ec01ab"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "f903da974577d99354ba7e2d753c8796af3cc037"; } + { locale = "be"; arch = "linux-i686"; sha1 = "ff88567de38d5a9195e3d31bdb3897c6db960315"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "7a4bc7296bad8fa1afad53ec9c56b933bf2f34d4"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "452515451a1a1e1640f46233d287d62213948dd1"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "715cffedcd576b8b124b67effaf72e9091bbd072"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "e8418ff4e04dd2058dd50fb2a926df4c975fd5a4"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "e3e4037b8f19355b036af6c19ce9ba11a13411f1"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "edae503e6d7529ba3af7facda18cc25a9634c7d6"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "b22a1784efb4ba741843360a8cb2da95e8eefa77"; } + { locale = "br"; arch = "linux-i686"; sha1 = "776b7edd9fdb3a02cbcd2c74f7fe237760483e37"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "19718f8e6e45ac480ea8ede27408063e3e966044"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "e74b5e40c76429cbfe84c282a8d7f3d7e39ed3b6"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "6cf56a28635a84e87a6d2735d812b5bd286f66b3"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "c062cbb2847c78990849ed34171b356ba2514a4a"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "443875f512bc1ff697d3a2848710afa0cf27149f"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "4c7ea9e5cf6c9cc790f8e738658155160062d82b"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "34ed2e0cdba5c9347c886d0f5f1dc595339001b3"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "161aa92acbd5175e0e05094a98ae4620f3e61e15"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "07fed553ab3d8942af865ef54ca45d3cb084671a"; } + { locale = "da"; arch = "linux-i686"; sha1 = "1d287b810ab6eb2c69861aa97279d95e5de9e00b"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "a11872f1243fb7f2afac871497f77e559c571198"; } + { locale = "de"; arch = "linux-i686"; sha1 = "d44d41473f9c89129316247e3b3782ac5e734a03"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "bf82fadea1008287e6b7b6c5cc3ce45297102493"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "f6f533c7c96e5b0551df12007511fb03b252d568"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "5d2c8f0729bf9dd7a33f3469e5eceb10d3b68e4c"; } + { locale = "el"; arch = "linux-i686"; sha1 = "f3bcdb0616e7dbb9d0c014819568c426643b01d6"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "65d0ecad9093142bc122479f71d4a8f865dab9ce"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "b8681a21ee8c59067abb8971d5dfc0c183ce9f3a"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "8b94b6866f865926142fadaa1c4a995d8a4939ab"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "a37a42035062385ed664521e6fcc64b6acc3e100"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "f72bd458cf0f42894a1023b09e25ba491c666c8d"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "84eb150df148cc792398f020a06c368b0f3a5384"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "84bb82b946c227931383620f2bda7a4511c86772"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "878ac1426303882701ca99a0e54ce025d5275e84"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "a4187e25529dde37e4b6f5201035efef69810e7d"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "adb3ecd1082e944f6cfb6c224fb99868d6b204e7"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "1ebba7dde7424c0855f738fb37c71be6739ddd54"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "7247e16910263ab971fdf7957e6e075a41ce0072"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "40113a4ddf11d43ae9b382456810193c3e50204a"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "328ec405ff20ee4ac3dcdb242978f552fd471bb4"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "aeb6d54290b1c2e882e871520232f20e05c9ee49"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "b5b0d078d36ac681df735336406e3a5d5ef7347c"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "cb02ced1e1e132247cba8505e1a3240bb71ac186"; } + { locale = "et"; arch = "linux-i686"; sha1 = "27eccc34804a058bd163f369715863486a9a578d"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "2429fbb2e011cee22024b4f2d34b6e28821ba874"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "3496749c75804f7d710edb8e3c67e7291608ca39"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "9401f038ff97bf8ed55e21e8871f33aa342268da"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "6068057c34ef0c53a70f01d29bdbccc708c57501"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "c18b0c916f7716012b7e7262351741c6c798c951"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "c32c8be17b6254bd48166062569e41bd8cf3a1ca"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "717da6c53be118f6373e8c68c2e82ef720503646"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "0e15abde00eb8e7807985deb74a2abb7c1f48ffa"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "b0f556019f0696a14b538925551b64e0d8e4f9cc"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "f07ed45bef78333cddbbe8490683867c81e4d497"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "e43a5d8034e641ffa8380cbbfec04e5e04ffe025"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "0e7d1d7228eca1e24bbcd3f247f2cb0bcbeb7843"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "fceeca14bbad0baa0ab76c51f826701df4a35c54"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "2fdb907fc1a6d889a177eee661d246d485c0b2d7"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "11a516d9104ece3130f01c1d6a4a218409ac191b"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "290b25548e4a0f123598953e08b6ffc0ffa7f5a8"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "ea371c234e4eb6e3a4a1b92add169d7539df16a0"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "3fcaa32d2f4825b59ed7f08dee92c7ef9a5301e4"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "1118347a7bcb197bdfcdadfd96a33c315f716cd5"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "368318d6cc8393d0867fe9e0abc0109420a0ad7f"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "72c8eae63bb9298d3b54c9f93ff442a1ffa21b47"; } + { locale = "he"; arch = "linux-i686"; sha1 = "27255ec09da56566297af99f22d13de1f5807d0a"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "f557dc50e027f2f1b327977df9bf1b86640b035d"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "942f2c4eff380ea660deb2a3a26f0b0716d10e84"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "7e4085fc80eb4b10010f10ad7ea3b40278c60c26"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "870d720f3a56068f4c0ec3ed0393efeca5106c52"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "3fbafa4f4f18bf4fbfe42366a1bdcd06952d1886"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "010b18faf1f999f88a5a618ca03e05a2d1a55cee"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "0ff5b1500514c82a4199a3af511be1c66a6b17b7"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "ce4d095eda872b05045766e6cdd686a21501b78e"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "397c66d7d95eabf5ba8bf47b9700c5d52657f586"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "605cae22b8edb09bcee585c7a0ddf91bb7b8771c"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "f9bf891cfb82baaa27ecf4f6192f50d264a362ba"; } + { locale = "id"; arch = "linux-i686"; sha1 = "0901de7f7b50b652a640e069c811ebffb990af1a"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "7d054dfe69b4c6a2359f89ebd9936d887d432637"; } + { locale = "is"; arch = "linux-i686"; sha1 = "9e50b342cc1754f66f274002a04ca35e933bbe35"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "6396bfe04f896321e1bdb2a1b742ee2461e3840b"; } + { locale = "it"; arch = "linux-i686"; sha1 = "e0818ad23234a31355cd366fb5cecf7a157e437f"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "ca8dd6aa223dccfd65b0ef3f8d85775a38ae5f9f"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "b67d6167b13ba68731b32944a9ba4e2010e54c8c"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "c2421cd629de2cc317965e1d8e047a247dc3135d"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "8dac75acdfcd95bce9bbee2a90785aaf50d1e331"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "01318b4a164d73801d53a86b9147cc3c68090e44"; } + { locale = "km"; arch = "linux-i686"; sha1 = "702f772a54290f2cf73842caa1780cd054630113"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "7bf0508c975f5e14964b25d40570dd7488364169"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "d8241f3ed0d78643ae38986b2f0898f895a47ed9"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "2b499f42e831c8a949d1ac2955cb52bbe01fa516"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "b3a41ba02af12471183a07af0de203e8d1c8e679"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "d31af209483706603dfe2ac39490e8258fe1f376"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "7b97e5c6e5868e1400616bf59317e2aee54b4f9d"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "ff77fe8e75dc98d07f6fa943c2b87572e2fe821d"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "2a126616d400e1781b0d25da0b92f374f5c58764"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "f5a77f3da6dbce8f3069377c8107b6c21dc8ad33"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "213b239888c9bc9667db5b90d5327edb16533346"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "2ebe88b6e9457105abe21db5e501174c4ed6b9a3"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "dd64b8f13021007506cda02b620463a37a40cb44"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "765f498cd0a27a50148022cef1b0db0b7e272393"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "3be4f9cfab1885a891360e7e3d024c130d55b098"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "15c95ded6f5057cdaa8716c1f9a63867f7f698e9"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "2ccc54e8c8fe8fd130427d56b65f191224483d3d"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "90f8826a73042bb5019f4ef75be49beb40e47c1d"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "6d06a583ffd0520a4f8606e7dfed798363f96133"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "c91c4de37182f3c01738856e11f4ddfd867343b4"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "46c9b3f5c7c3b288e759894a4041b0854e35811b"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "0b11edafce5fca8af93f06e7d3461508456faa3c"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "43c0a898e13b5cdec73c20a8e47d7ed73340a4be"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "1a1ee21a5f935ec38b540a573e3261eb72d18737"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "9f024aa7cd88b43f1d41ca35b9602c4ce3ce0d66"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "51fb9526bc2f6ffbcca33a9db565041ec7541c17"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "4620b4ee8ac0d9f20dae06ab5039559c947e189e"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "bcb56f263c9f8cf87dbfb667bcd6261b6cab3da9"; } + { locale = "or"; arch = "linux-i686"; sha1 = "b9e499a16b8dea07e05ab68e92b07aac09611a0e"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "69d8afea4beeea7b6f8e85d2c57834e36ec0a5da"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "15c35746a9ca5f9bba4048764ef01f38eed1d7b3"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "d068f8fc28ae96dc62a0131a5ef42f35028d8dc9"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "4127ddf36a954066deb09e967224163f4dc9e632"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "8e2f853eece4d7793db9757f32466f85d1f98029"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "85f0440039b77cbf6547fe5b7be0acaba613aee4"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "0d0d661c3b6197516d3e3f990a49e327170fb8b0"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "3f42e38f0a9436c6eea9cd6b84688f1c5046d9c3"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "56a9c8600f17106ee360994f2816e814f6dde054"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "e8de5922f28f494c3a6a8b1e53c270dd4f34cada"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "1fe39b3dd62180cf6b2b7a6771ac0f61b1538619"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "57739540e02371abe21f6022b3b8fa6103543279"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "56c5815007727024c6e479d81122a59836f848d8"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "f5dcf9023ca5aeeb60d04158f7efc1b6ccbd5313"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "142d95e936063a90b28d2c33e79ac4cb8052ed8b"; } + { locale = "si"; arch = "linux-i686"; sha1 = "489ef1bb93ca27673067d370a62f20cb227d2f55"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "50d819cbde16c384c9adb1d4d176400cbf3544ea"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "0f1f4fee615ce2ee49f5458b9953af176e13280c"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "fddac5b20e6231c9626bb966475d8a16d03efde9"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "832d040787c6cb599f956cb4124ed11c4730be74"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "a73ebbfab7e630de54b13165d428e4b2843f68a2"; } + { locale = "son"; arch = "linux-i686"; sha1 = "49ff3285d4b4a9efae2f434709d80fe87aa94375"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "1f77f4d495c94b6c94ecbd4bb40c56e985cae5c6"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "5c9075d55d62177e24b7a91ff25ee0d8173ca1a8"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "eac042c5080f6bbc43770e7d2b0910537a44bc1e"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "c261b8d480c1c23aaea1754857ab7e069a5ef812"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "3d83d21430a7f90ccbbe8ab4a16d0faa44efc22b"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "c6a5b825196404024f4a11ea3c4f1d74b0cbe80b"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "90ff4a639dcd65ce821b9dd6545875ed5230513a"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "99f4418e230a987c12671b9fc3242b3ccc97e5ab"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "bda55fcf5719f3d43f422dd4a1e7935db598d8a0"; } + { locale = "te"; arch = "linux-i686"; sha1 = "dd1d269619f0377993178e9f7083301c39339513"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "c73e447f83ecb44acdd5637702b977b3d37a0593"; } + { locale = "th"; arch = "linux-i686"; sha1 = "c63c3509af06f4c9a19f6ac04149d2eacb201459"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "dfad91490135d6536af450b70ef96afb04413d76"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "43f60e6dd8e412aebcfab2a2c6ca1813933152f8"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "2d121c22f3a9aefb611a8ba8dee568c2c8e6e66a"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "f5841ceb3482d91dd2d805258fd9e326cba2e131"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "d16acad424a61e098b37b68aea98a2ac69efdd21"; } + { locale = "uz"; arch = "linux-i686"; sha1 = "4c94cdc7a19fbe9adfb0aa091299efc973b37d60"; } + { locale = "uz"; arch = "linux-x86_64"; sha1 = "91b5af1bd30c3821924968b03961e5295f15b0e6"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "96561c7bbb7cfbc3af8f1bbb75b054cc95649357"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "d7ea3b927eff3b229d2013d064fef8661cb088e0"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "53edf9df438d7e6b344a8e321ebfe769cd456bb6"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "9c132b7b651e3dd9c2c78ad4beada01784b2ef41"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "3cacf5dfaf58467e27e4804da74a9f6da6f12de4"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "f649c726757ed1bca13d2a05dd57b7d3f56b5dc6"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "1e77b856a434ad6dd12594cef9362313e910b14d"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "545d3bdd564232788850cb04b1314a3191b14175"; } ]; } From fc8011ad8d23411bcb950b03c80bd5ceb56c068c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 13 May 2015 16:22:53 +0200 Subject: [PATCH 119/615] Ensure that nscd, sshd are created as system users c0f70b4694bb2be1c25ef0e23e3f11f9d718d162 removed the fixed uid assignment, but then it becomes necessary to set isSystemUser. http://hydra.nixos.org/build/22182588 --- nixos/modules/services/networking/ssh/sshd.nix | 4 ++-- nixos/modules/services/system/nscd.nix | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index c25532511a07..6cc86b4e4b5a 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -282,8 +282,8 @@ in config = mkIf cfg.enable { users.extraUsers.sshd = - { description = "SSH privilege separation user"; - home = "/var/empty"; + { isSystemUser = true; + description = "SSH privilege separation user"; }; environment.etc = authKeysFiles ++ [ diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index caedc2e42173..3c0d2043ed5d 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -42,7 +42,10 @@ in config = mkIf cfg.enable { - users.extraUsers.nscd.description = "Name service cache daemon user"; + users.extraUsers.nscd = + { isSystemUser = true; + description = "Name service cache daemon user"; + }; systemd.services.nscd = { description = "Name Service Cache Daemon"; From 15ffb9ad88e557cbc3310b81dbd99c00722e350e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 13 May 2015 16:23:57 +0200 Subject: [PATCH 120/615] Remove fixed uid in tests --- nixos/tests/common/user-account.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/tests/common/user-account.nix b/nixos/tests/common/user-account.nix index aa3a0b82bcde..ded8275000af 100644 --- a/nixos/tests/common/user-account.nix +++ b/nixos/tests/common/user-account.nix @@ -1,10 +1,9 @@ -{ pkgs, ... }: +{ lib, ... }: -{ users.extraUsers = pkgs.lib.singleton +{ users.extraUsers = lib.singleton { isNormalUser = true; name = "alice"; description = "Alice Foobar"; password = "foobar"; - uid = 1000; }; } From 020e06e410e0675a2cfa32c8f7bb75368de835d1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 13 May 2015 09:24:41 -0500 Subject: [PATCH 121/615] Add missing KDE Telepathy dependencies --- pkgs/applications/kde-apps-15.04/default.nix | 25 +++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 213c70bfa235..5e41712a14fb 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -64,6 +64,7 @@ let (with pkgs; { ACL = acl; + AccountsQt5 = accounts-qt.override { inherit qt5; }; Akonadi = kde4.akonadi; Alsa = alsaLib; Automoc4 = automoc4; @@ -95,6 +96,7 @@ let GSL = gsl; HUNSPELL = hunspell; HUpnp = herqq; + Intltool = intltool; Jasper = jasper; KActivities = kde4.kactivities; LCMS2 = lcms2; @@ -122,6 +124,7 @@ let Samba = samba; Sasl2 = cyrus_sasl; SharedDesktopOntologies = shared_desktop_ontologies; + SignOnQt5 = signon.override { inherit qt5; }; SndFile = libsndfile; Speechd = speechd; TIFF = libtiff; @@ -193,17 +196,9 @@ let nativeBuildInputs = super.ffmpegthumbs.nativeBuildInputs ++ [pkgconfig]; }; - kaccounts-integration = - let accounts-qt = pkgs.accounts-qt.override { inherit qt5; }; - signon = pkgs.signon.override { inherit qt5; }; - in super.kaccounts-integration // { - buildInputs = super.kaccounts-integration.buildInputs - ++ [ accounts-qt signon ]; - }; - kaccounts-providers = super.kaccounts-providers // { buildInputs = super.kaccounts-providers.buildInputs - ++ (with pkgs; [ intltool libaccounts-glib ]); + ++ (with pkgs; [ libaccounts-glib ]); preConfigure = '' ${super.kaccounts-providers.preConfigure or ""} substituteInPlace webkit-options/CMakeLists.txt \ @@ -324,6 +319,18 @@ let ++ [pkgs.xlibs.libXtst kde4.telepathy.common_internals]; }; + ktp-accounts-kcm = super.ktp-accounts-kcm // { + buildInputs = + super.ktp-accounts-kcm.buildInputs + ++ [ pkgs.libaccounts-glib ]; + }; + + ktp-common-internals = super.ktp-common-internals // { + buildInputs = + super.ktp-common-internals.buildInputs + ++ (with kf5; [ kdelibs4support kparts ]); + }; + libkdcraw = with pkgs; super.libkdcraw // { buildInputs = super.libkdcraw.buildInputs ++ [scope.KDE4 libraw]; nativeBuildInputs = super.libkdcraw.nativeBuildInputs ++ [pkgconfig]; From 3df7a9866d413cc2701096b9ff8296289e3b9fb0 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 13 May 2015 15:15:24 +0200 Subject: [PATCH 122/615] rustcMaster: 2015-05-09 -> 2015-05-13 --- pkgs/development/compilers/rustc/head.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index 383632b2ce08..c73a12c6f6e8 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -2,9 +2,9 @@ callPackage ./makeRustcDerivation.nix { shortVersion = "1.0.0-dev"; isRelease = false; - # src rev for master on 2015-05-09 - srcRev = "95400c51c31877ea4699adc051477edccb5cfbca"; - srcSha = "1ldgc5nd42pcbr650rpyvpnc8h6bky6gmb116fwy1g6x2ql66djw"; + # src rev for master on 2015-05-13 + srcRev = "67433c1a309d3c9457e49f15e80a2d927d165996"; + srcSha = "0idc3nh0sfjlv7m9710azx7n6awzwj6mhw3aybsb9bbagzy2sdsg"; snapshotHashLinux686 = "0bc8cffdce611fb71fd7d3d8e7cdbfaf748a4f16"; snapshotHashLinux64 = "94089740e48167c5975c92c139ae9c286764012f"; snapshotHashDarwin686 = "54cc35e76497e6e94fddf38d6e40e9d168491ddb"; From 586444c91d348cd927b968978d553bdd3c3d81b3 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 13 May 2015 16:29:18 +0200 Subject: [PATCH 123/615] rustRegistry: Convert fetchgit to fetchFromGitHub and update --- pkgs/top-level/rust-packages.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 5e3977ab6d68..a408ae9e36ca 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -4,21 +4,23 @@ # version that we define here. If you're having problems downloading / finding # a Rust library, try updating this to a newer commit. -{ runCommand, fetchgit, git }: +{ runCommand, fetchFromGitHub, git }: let - version = "2015-05-12"; + version = "2015-05-13"; + rev = "8d879d4e998db3c1fad106503638d318e10fdba6"; - src = fetchgit { - url = git://github.com/rust-lang/crates.io-index.git; + src = fetchFromGitHub { + inherit rev; - rev = "9bf9e7f2b242552ccec879b47b2225a76c7c79b0"; - sha256 = "14rrpm6and52qasn7fv5fkflhnkyr86xy0k9pjgw407k7xms0cmw"; + owner = "rust-lang"; + repo = "crates.io-index"; + sha256 = "1100vcgxy3ddl1ih3ljd3nig4a2k44ajhawsql1lmcj9783aykav"; }; in -runCommand "rustRegistry-${version}-${builtins.substring 0 7 src.rev}" {} '' +runCommand "rustRegistry-${version}-${builtins.substring 0 7 rev}" {} '' # For some reason, cargo doesn't like fetchgit's git repositories, not even # if we set leaveDotGit to true, set the fetchgit branch to 'master' and clone # the repository (tested with registry rev From 981ea747b5049938cf2c90c8eb6b13071ff00db5 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 13 May 2015 15:17:00 +0200 Subject: [PATCH 124/615] cargo: 2015-05-11 -> 2015-05-13 --- pkgs/development/tools/build-managers/cargo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix index 8e7d8cf8ee83..f7dd77a12a71 100644 --- a/pkgs/development/tools/build-managers/cargo/default.nix +++ b/pkgs/development/tools/build-managers/cargo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl , cmake, zlib }: -with ((import ./common.nix) { inherit stdenv; version = "2015-05-11"; }); +with ((import ./common.nix) { inherit stdenv; version = "2015-05-13"; }); with rustPlatform; @@ -10,12 +10,12 @@ buildRustPackage rec { src = fetchgit { url = "https://github.com/rust-lang/cargo.git"; - rev = "a078e01ffab70738eafb7401704d1eaf90b94de2"; - sha256 = "0vw62kxlmkajyix6n4cdz7w9l26dspjiw2fk4xkj33gzzc8rq9g8"; + rev = "d814fcbf8efda3027d54c09e11aa7eaf0006a83c"; + sha256 = "1hvsxjv9s30qylcq2vb2nqqn8fix4sk0ah718f8c0flrcqbwa58z"; leaveDotGit = true; }; - depsSha256 = "1sk79w2wxvpgfkxr0nbrqqxdih4abiqvawdd88r2p9cqzrkdg8by"; + depsSha256 = "0s9f00kg7q9dxd8g98k3z4qv404p9ra73l1bzxs6qzk54qhg44dp"; buildInputs = [ file curl pkgconfig python openssl cmake zlib ]; From b97362989f59ed08683f66023d1ad6a3e760b781 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 8 May 2015 13:00:54 +0200 Subject: [PATCH 125/615] Provide /run in VMs --- pkgs/build-support/vm/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 838548f94bfe..c9a9aac79734 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -120,8 +120,10 @@ rec { mkdir -p /fs/nix/store mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=loose - mkdir -p /fs/tmp + mkdir -p /fs/tmp /fs/run /fs/var mount -t tmpfs -o "mode=1777" none /fs/tmp + mount -t tmpfs -o "mode=755" none /fs/run + ln -sfn /run /fs/var/run echo "mounting host's temporary directory..." mkdir -p /fs/tmp/xchg From fef86de6188731c621cbbaa89e5cbe557f6f9546 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 8 May 2015 13:01:10 +0200 Subject: [PATCH 126/615] Make module loading work in VMs Also, execute stage 2 as PID 1. --- pkgs/build-support/vm/default.nix | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index c9a9aac79734..5aa1a9c092d2 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -140,15 +140,7 @@ rec { echo "127.0.0.1 localhost" > /fs/etc/hosts echo "starting stage 2 ($command)" - test -n "$command" - - set +e - chroot /fs $command $out - echo $? > /fs/tmp/xchg/in-vm-exit - - mount -o remount,ro dummy /fs - - poweroff -f + exec switch_root /fs $command $out ''; @@ -181,12 +173,27 @@ rec { ${coreutils}/bin/ln -s ${bash}/bin/sh /bin/sh fi + # Set up automatic kernel module loading. + export MODULE_DIR=${linux}/lib/modules/ + ${coreutils}/bin/cat < /run/modprobe + #! /bin/sh + export MODULE_DIR=$MODULE_DIR + exec ${kmod}/bin/modprobe "\$@" + EOF + ${coreutils}/bin/chmod 755 /run/modprobe + echo /run/modprobe > /proc/sys/kernel/modprobe + # For debugging: if this is the second time this image is run, # then don't start the build again, but instead drop the user into # an interactive shell. if test -n "$origBuilder" -a ! -e /.debug; then ${coreutils}/bin/touch /.debug - exec $origBuilder $origArgs + $origBuilder $origArgs + echo $? > /tmp/xchg/in-vm-exit + + ${busybox}/bin/mount -o remount,ro dummy / + + ${busybox}/bin/poweroff -f else export PATH=/bin:/usr/bin:${coreutils}/bin echo "Starting interactive shell..." From d769b523072f7d5ca00f65d3a50776d6d79ddfaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 13 May 2015 18:39:50 +0200 Subject: [PATCH 127/615] python: pass stdenv.glibc to crypt module to expose crypt.so --- pkgs/development/interpreters/python/2.6/default.nix | 2 +- pkgs/development/interpreters/python/2.7/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 4e322faf66f0..2d28a8e6f5b6 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -169,7 +169,7 @@ let crypt = buildInternalPythonModule { moduleName = "crypt"; internalName = "crypt"; - deps = [ ]; + deps = [ stdenv.glibc ]; }; curses = buildInternalPythonModule { diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index ac9b9d637096..d0880d1b7023 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -196,7 +196,7 @@ let crypt = buildInternalPythonModule { moduleName = "crypt"; internalName = "crypt"; - deps = [ ]; + deps = [ stdenv.glibc ]; }; gdbm = buildInternalPythonModule { From fc276c7aabed52b68e88057a7ef0ec5a62dc85eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 13 May 2015 18:46:59 +0200 Subject: [PATCH 128/615] wordnet: mark as broken --- pkgs/applications/misc/wordnet/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 6ead69db2209..d46790e4d72b 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation { maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice + broken = true; # we'd need older tk/tcl }; } From 38d9663367b687c94a3ca8b266c84ddc2b5ec23e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 13 May 2015 19:19:08 +0200 Subject: [PATCH 129/615] gtkvnc: add libgpgerror as dependency --- pkgs/development/compilers/go/1.2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix index a00fe7346701..c79ab632d028 100644 --- a/pkgs/development/compilers/go/1.2.nix +++ b/pkgs/development/compilers/go/1.2.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha1 = "3ce0ac4db434fc1546fec074841ff40dc48c1167"; }; - buildInputs = [ bison glibc bash makeWrapper ]; + buildInputs = [ bison glibc bash makeWrapper libgpgerror ]; NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; From 88f7b04b5e4984db3c061d5efc40a84c8cadeb3f Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 13 May 2015 12:38:28 -0500 Subject: [PATCH 130/615] go 1.2: Add a missing argument --- pkgs/development/compilers/go/1.2.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix index c79ab632d028..113e2118efb6 100644 --- a/pkgs/development/compilers/go/1.2.nix +++ b/pkgs/development/compilers/go/1.2.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }: +{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc +, libgpgerror }: let loader386 = "${glibc}/lib/ld-linux.so.2"; From 7094ae27da65c8b41843e61a8b7ba5e1fe274ab1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 13 May 2015 12:49:00 -0500 Subject: [PATCH 131/615] qt53: fix qtwebkit build with new glib --- .../qt-5/5.3/0013-qtwebkit-glib-2.44.patch | 232 ++++++++++++++++++ .../libraries/qt-5/5.3/default.nix | 1 + 2 files changed, 233 insertions(+) create mode 100644 pkgs/development/libraries/qt-5/5.3/0013-qtwebkit-glib-2.44.patch diff --git a/pkgs/development/libraries/qt-5/5.3/0013-qtwebkit-glib-2.44.patch b/pkgs/development/libraries/qt-5/5.3/0013-qtwebkit-glib-2.44.patch new file mode 100644 index 000000000000..29045df456ff --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.3/0013-qtwebkit-glib-2.44.patch @@ -0,0 +1,232 @@ +From f8485382e319da57abea99797387ee9f6f94d32e Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 13 May 2015 12:42:07 -0500 +Subject: [PATCH] glib mutexlocker + +--- + .../gstreamer/WebKitWebSourceGStreamer.cpp | 48 +++++++++++----------- + 1 file changed, 24 insertions(+), 24 deletions(-) + +diff --git a/qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp +index 5625873..a6d961f 100644 +--- a/qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp ++++ b/qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp +@@ -354,7 +354,7 @@ static void webKitWebSrcSetProperty(GObject* object, guint propID, const GValue* + + switch (propID) { + case PROP_IRADIO_MODE: { +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + priv->iradioMode = g_value_get_boolean(value); + break; + } +@@ -376,7 +376,7 @@ static void webKitWebSrcGetProperty(GObject* object, guint propID, GValue* value + WebKitWebSrc* src = WEBKIT_WEB_SRC(object); + WebKitWebSrcPrivate* priv = src->priv; + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + switch (propID) { + case PROP_IRADIO_MODE: + g_value_set_boolean(value, priv->iradioMode); +@@ -429,7 +429,7 @@ static gboolean webKitWebSrcStop(WebKitWebSrc* src) + + ASSERT(isMainThread()); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + + bool seeking = priv->seekID; + +@@ -493,7 +493,7 @@ static gboolean webKitWebSrcStart(WebKitWebSrc* src) + + ASSERT(isMainThread()); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + + priv->startID = 0; + +@@ -584,7 +584,7 @@ static GstStateChangeReturn webKitWebSrcChangeState(GstElement* element, GstStat + return ret; + } + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + switch (transition) { + case GST_STATE_CHANGE_READY_TO_PAUSED: + GST_DEBUG_OBJECT(src, "READY->PAUSED"); +@@ -615,7 +615,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad, GstObject* parent, GstQ + gst_query_parse_duration(query, &format, NULL); + + GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format)); +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + if (format == GST_FORMAT_BYTES && src->priv->size > 0) { + gst_query_set_duration(query, format, src->priv->size); + result = TRUE; +@@ -623,7 +623,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad, GstObject* parent, GstQ + break; + } + case GST_QUERY_URI: { +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + gst_query_set_uri(query, src->priv->uri); + result = TRUE; + break; +@@ -668,7 +668,7 @@ static gchar* webKitWebSrcGetUri(GstURIHandler* handler) + WebKitWebSrc* src = WEBKIT_WEB_SRC(handler); + gchar* ret; + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + ret = g_strdup(src->priv->uri); + return ret; + } +@@ -683,7 +683,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler* handler, const gchar* uri, GEr + return FALSE; + } + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + + g_free(priv->uri); + priv->uri = 0; +@@ -719,7 +719,7 @@ static const gchar* webKitWebSrcGetUri(GstURIHandler* handler) + WebKitWebSrc* src = WEBKIT_WEB_SRC(handler); + gchar* ret; + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + ret = g_strdup(src->priv->uri); + return ret; + } +@@ -734,7 +734,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler* handler, const gchar* uri) + return FALSE; + } + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + + g_free(priv->uri); + priv->uri = 0; +@@ -772,7 +772,7 @@ static gboolean webKitWebSrcNeedDataMainCb(WebKitWebSrc* src) + + ASSERT(isMainThread()); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + // already stopped + if (!priv->needDataID) + return FALSE; +@@ -793,7 +793,7 @@ static void webKitWebSrcNeedDataCb(GstAppSrc*, guint length, gpointer userData) + + GST_DEBUG_OBJECT(src, "Need more data: %u", length); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + if (priv->needDataID || !priv->paused) { + return; + } +@@ -807,7 +807,7 @@ static gboolean webKitWebSrcEnoughDataMainCb(WebKitWebSrc* src) + + ASSERT(isMainThread()); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + // already stopped + if (!priv->enoughDataID) + return FALSE; +@@ -828,7 +828,7 @@ static void webKitWebSrcEnoughDataCb(GstAppSrc*, gpointer userData) + + GST_DEBUG_OBJECT(src, "Have enough data"); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + if (priv->enoughDataID || priv->paused) { + return; + } +@@ -842,7 +842,7 @@ static gboolean webKitWebSrcSeekMainCb(WebKitWebSrc* src) + + ASSERT(isMainThread()); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + // already stopped + if (!priv->seekID) + return FALSE; +@@ -860,7 +860,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, guint64 offset, gpointer user + WebKitWebSrcPrivate* priv = src->priv; + + GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset); +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + if (offset == priv->offset && priv->requestedOffset == priv->offset) + return TRUE; + +@@ -879,7 +879,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, guint64 offset, gpointer user + void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player) + { + ASSERT(player); +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + src->priv->player = player; + s_cachedResourceLoader = player->cachedResourceLoader(); + } +@@ -906,7 +906,7 @@ char* StreamingClient::createReadBuffer(size_t requestedSize, size_t& actualSize + mapGstBuffer(buffer); + #endif + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + priv->buffer = adoptGRef(buffer); + locker.unlock(); + +@@ -921,7 +921,7 @@ void StreamingClient::handleResponseReceived(const ResourceResponse& response) + + GST_DEBUG_OBJECT(src, "Received response: %d", response.httpStatusCode()); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + + // If we seeked we need 206 == PARTIAL_CONTENT + if (priv->requestedOffset && response.httpStatusCode() != 206) { +@@ -1020,7 +1020,7 @@ void StreamingClient::handleDataReceived(const char* data, int length) + WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get()); + WebKitWebSrcPrivate* priv = src->priv; + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + + GST_LOG_OBJECT(src, "Have %d bytes of data", priv->buffer ? getGstBufferSize(priv->buffer.get()) : length); + +@@ -1074,7 +1074,7 @@ void StreamingClient::handleNotifyFinished() + + GST_DEBUG_OBJECT(src, "Have EOS"); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + if (!priv->seekID) { + locker.unlock(); + gst_app_src_end_of_stream(priv->appsrc); +@@ -1210,7 +1210,7 @@ void ResourceHandleStreamingClient::wasBlocked(ResourceHandle*) + + GST_ERROR_OBJECT(src, "Request was blocked"); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + uri.set(g_strdup(src->priv->uri)); + locker.unlock(); + +@@ -1224,7 +1224,7 @@ void ResourceHandleStreamingClient::cannotShowURL(ResourceHandle*) + + GST_ERROR_OBJECT(src, "Cannot show URL"); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + uri.set(g_strdup(src->priv->uri)); + locker.unlock(); + +-- +2.3.6 + diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix index d7ae685af6d7..55de4265d3ee 100644 --- a/pkgs/development/libraries/qt-5/5.3/default.nix +++ b/pkgs/development/libraries/qt-5/5.3/default.nix @@ -78,6 +78,7 @@ stdenv.mkDerivation rec { (substituteAll { src = ./0010-dlopen-libXcursor.patch; inherit libXcursor; }) (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; }) (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; }) + ./0013-qtwebkit-glib-2.44.patch ]; preConfigure = '' From 6516cc48c7082700905d23ab32b28a872fdbfa58 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 13 May 2015 11:32:46 -0700 Subject: [PATCH 132/615] nghttp2: 0.7.13 -> 0.7.14 --- pkgs/development/libraries/nghttp2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index b72abb57e8f2..e442cc96d2f7 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -34,12 +34,12 @@ let in stdenv.mkDerivation rec { name = "${prefix}nghttp2-${version}"; - version = "0.7.13"; + version = "0.7.14"; # Don't use fetchFromGitHub since this needs a bootstrap curl src = fetchurl { - url = "http://pub.wak.io/nixos/tarballs/nghttp2-0.7.13.tar.xz"; - sha256 = "1nz14hmfhsxljmf7f3763q9kpn9prfdivrvdr7c74x72s75bzwli"; + url = "http://pub.wak.io/nixos/tarballs/nghttp2-${version}.tar.bz2"; + sha256 = "000d50yzyysbr9ldhvnbpzn35vplqm08dnmh55wc5zk273gy383f"; }; nativeBuildInputs = [ pkgconfig ]; From 413c17e43099f5f1c0959168b9a827d66e2d4e14 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 13 May 2015 16:33:17 +0200 Subject: [PATCH 133/615] add ladspa-sdk, move ladspaH --- .../applications/audio/ladspa-sdk/default.nix | 28 +++++++++++++++++++ .../ladspah.nix | 0 pkgs/top-level/all-packages.nix | 4 ++- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/audio/ladspa-sdk/default.nix rename pkgs/applications/audio/{ladspa-plugins => ladspa-sdk}/ladspah.nix (100%) diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix new file mode 100644 index 000000000000..c333492fd13e --- /dev/null +++ b/pkgs/applications/audio/ladspa-sdk/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + name = "ladspa-sdk-${version}"; + version = "1.13"; + src = fetchurl { + url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; + sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm"; + }; + + patchPhase = '' + cd src + sed -i 's@/usr/@$(out)/@g' makefile + sed -i 's@-mkdirhier@mkdir -p@g' makefile + ''; + + meta = { + description = "The SDK for the LADSPA audio plugin standard"; + longDescription = '' + The LADSPA SDK, including the ladspa.h API header file, + ten example LADSPA plugins and + three example programs (applyplugin, analyseplugin and listplugins). + ''; + homepage = http://www.ladspa.org/ladspa_sdk/overview.html; + license = stdenv.lib.licenses.lgpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/ladspa-plugins/ladspah.nix b/pkgs/applications/audio/ladspa-sdk/ladspah.nix similarity index 100% rename from pkgs/applications/audio/ladspa-plugins/ladspah.nix rename to pkgs/applications/audio/ladspa-sdk/ladspah.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6fcb1c0f95f..d8eb552f17f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11384,12 +11384,14 @@ let lash = callPackage ../applications/audio/lash { }; - ladspaH = callPackage ../applications/audio/ladspa-plugins/ladspah.nix { }; + ladspaH = callPackage ../applications/audio/ladspa-sdk/ladspah.nix { }; ladspaPlugins = callPackage ../applications/audio/ladspa-plugins { fftw = fftwSinglePrec; }; + ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; + caps = callPackage ../applications/audio/caps { }; lastwatch = callPackage ../applications/audio/lastwatch { }; From 53b6a4f063bf14bec3d75d4052f347d0c7710d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 13 May 2015 21:24:48 +0000 Subject: [PATCH 134/615] Hack for btrfsProgs in ARM, due to a gcc bug. It fails to build otherwise: /tmp/nix-build-btrfs-progs-4.0.drv-4/ccUNrySY.s:4014: Error: invalid operands (.text and *UND* sections) for `-' --- pkgs/tools/filesystems/btrfsprogs/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index 9286d58482fd..e2ed76494a15 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -3,7 +3,7 @@ let version = "4.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "btrfs-progs-${version}"; src = fetchurl { @@ -28,4 +28,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin wkennington ]; platforms = platforms.linux; }; -} +} // (if stdenv.isArm then { + # gcc bug with -O1 on ARM + patchPhase = "sed -i s/-O1/-O2/ configure"; +} else {})) From 8ffc461f91c176c72a98d6e04326723e9640277b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 13 May 2015 14:50:38 -0700 Subject: [PATCH 135/615] firefox: 37.0.2 -> 38.0 --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index bd8fb4d2cd7b..42786790c2b9 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.2"; in +let version = "38.0"; 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 = "6e306d56e4e00ffdc2ddbdfbbabe4cb9fc527071"; + sha1 = "3812a31287d3a8d9ebb1326e131a944fd27f0f2d"; }; buildInputs = From c37888a730ee5152da1d977e8e2e1513c0ab9d9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Thu, 14 May 2015 01:49:43 +0200 Subject: [PATCH 136/615] idea-{community,ultimate}: 14.1.2 -> 14.1.3 --- pkgs/applications/editors/idea/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 8d150ded4ab7..d502bf42e91e 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -237,25 +237,25 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "14.1.2"; - build = "IC-141.713.2"; + version = "14.1.3"; + build = "IC-141.1010.3"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1skxbax7gsxxf7519qasxwp9q0v9ff755ibqr1w47dv2al47kjzq"; + sha256 = "104ba057p49l41g9gdcgbywdxyqzkm4rfm7yivkcsddh5drsk4jv"; }; }; idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "14.1.2"; - build = "IU-141.713.2"; + version = "14.1.3"; + build = "IU-141.1010.3"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; - sha256 = "1ddy0f83rs3yx3w8v49cmlhkc8qxapdh702g26gzlapbpvfw58ay"; + sha256 = "1flg3rpb86xfcxlys5rxywa0z9c6j9h3qd8mkadx5pnay1f97pwi"; }; }; From 6b777ba4524c1b78b1e81a2954ca6204ee56b2b6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 13 May 2015 20:23:30 -0500 Subject: [PATCH 137/615] kdeApps_15_04.kstars: add missing dependencies --- pkgs/applications/kde-apps-15.04/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 5e41712a14fb..4bb239afc9fc 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -72,9 +72,10 @@ let BISON = bison; Baloo = kde4.baloo; Boost = boost156; + CFitsio = cfitsio; + CUPS = cups; Canberra = libcanberra; Cdparanoia = cdparanoia; - CUPS = cups; DBusMenuQt = libdbusmenu_qt; DjVuLibre = djvulibre; ENCHANT = enchant; @@ -96,6 +97,7 @@ let GSL = gsl; HUNSPELL = hunspell; HUpnp = herqq; + INDI = indilib; Intltool = intltool; Jasper = jasper; KActivities = kde4.kactivities; @@ -134,6 +136,7 @@ let TunePimp = libtunepimp; UDev = udev; USB = libusb; + Xplanet = xplanet; Xscreensaver = xscreensaver; Xsltproc = libxslt; } @@ -319,6 +322,12 @@ let ++ [pkgs.xlibs.libXtst kde4.telepathy.common_internals]; }; + kstars = super.kstars // { + buildInputs = + super.kstars.buildInputs + ++ (with kf5; [ kparts ]); + }; + ktp-accounts-kcm = super.ktp-accounts-kcm // { buildInputs = super.ktp-accounts-kcm.buildInputs From 38bf485e72615ffe7828fe4cbd147332209b375a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 13 May 2015 20:52:26 -0500 Subject: [PATCH 138/615] Add missing KDE Games dependencies --- pkgs/applications/kde-apps-15.04/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 4bb239afc9fc..bf31a935e7bc 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -101,6 +101,7 @@ let Intltool = intltool; Jasper = jasper; KActivities = kde4.kactivities; + KDEGames = kde4.libkdegames; LCMS2 = lcms2; Ldap = openldap; LibAttica = attica; From 1c19f91dd7d6215871fa03621759061897f2afcb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 14 May 2015 09:32:32 +0200 Subject: [PATCH 139/615] opam: update from 1.2.1 to 1.2.2 --- pkgs/development/tools/ocaml/opam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index b6dce1328688..283bd581a130 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -37,13 +37,13 @@ let sha256 = "3fd4dca045d82332da847e65e981d8b504883571d299a3f7e71447d46bc65f73"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/1.2.1.zip"; - sha256 = "1mvsy89l5g9nvwmmls5jf46anh6gk8dk8a1dn42rmnihnb0zjcs4"; + url = "https://github.com/ocaml/opam/archive/1.2.2.zip"; + sha256 = "1fxd5axlh9f3jb47y9paa9ld78qwcyp7pv3m60k401ym1dps32jk"; }; }; in stdenv.mkDerivation rec { name = "opam-${version}"; - version = "1.2.1"; + version = "1.2.2"; buildInputs = [ unzip curl ncurses ocaml ]; From fd8cb1ff2d53cad7fee74e2db73d1f01056a964d Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 13 May 2015 20:54:25 +0300 Subject: [PATCH 140/615] nix-serve: Add nixos module This allows sharing the Nix store of the machine as a binary cache simply by setting 'services.nix-serve.enable = true'. --- nixos/modules/module-list.nix | 1 + .../modules/services/networking/nix-serve.nix | 56 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 nixos/modules/services/networking/nix-serve.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e869b350e716..0b41e394b1ac 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -289,6 +289,7 @@ ./services/networking/nat.nix ./services/networking/networkmanager.nix ./services/networking/ngircd.nix + ./services/networking/nix-serve.nix ./services/networking/notbit.nix ./services/networking/nsd.nix ./services/networking/ntopng.nix diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix new file mode 100644 index 000000000000..c2c579c3177e --- /dev/null +++ b/nixos/modules/services/networking/nix-serve.nix @@ -0,0 +1,56 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.nix-serve; +in +{ + options = { + services.nix-serve = { + enable = mkEnableOption "nix-serve, the standalone Nix binary cache server"; + + port = mkOption { + type = types.int; + default = 5000; + description = '' + Port number where nix-serve will listen on. + ''; + }; + + bindAddress = mkOption { + type = types.string; + default = "0.0.0.0"; + description = '' + IP address where nix-serve will bind its listening socket. + ''; + }; + + extraParams = mkOption { + type = types.string; + default = ""; + description = '' + Extra command line parameters for nix-serve. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.nix-serve = { + description = "nix-serve binary cache server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + path = [ config.nix.package pkgs.bzip2 ]; + environment.NIX_REMOTE = "daemon"; + + serviceConfig = { + ExecStart = "${pkgs.nix-serve}/bin/nix-serve " + + "--port ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}"; + User = "nobody"; + Group = "nogroup"; + }; + }; + }; +} From aef701babc933a2d8a4059029f81743ab4a555b5 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 14 May 2015 11:50:22 +0100 Subject: [PATCH 141/615] opentsdb: Update 2.1.0 (official release) --- pkgs/tools/misc/opentsdb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 6f9695ba363c..2a91f02ca099 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -1,11 +1,11 @@ { stdenv, autoconf, automake, curl, fetchurl, jdk, jre, makeWrapper, nettools, python }: with stdenv.lib; stdenv.mkDerivation rec { - name = "opentsdb-2.1.0-rc1"; + name = "opentsdb-2.1.0"; src = fetchurl { - url = https://github.com/OpenTSDB/opentsdb/releases/download/v2.1.0RC1/opentsdb-2.1.0RC1.tar.gz; - sha256 = "1vvhzdl2wgbzy2lvlyx40pks47ma6szs9ka4dwjf123xyixv0rmz"; + url = https://github.com/OpenTSDB/opentsdb/releases/download/v2.1.0/opentsdb-2.1.0.tar.gz; + sha256 = "0msijwzdwisqmdd8ikmrzbcqvrnb6ywz6zyd1vg0s5s4syi3cvmp"; }; buildInputs = [ autoconf automake curl jdk makeWrapper nettools python ]; From e995f971ae13fa7bd2dab979faadcec601256a41 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 14 May 2015 12:11:35 +0100 Subject: [PATCH 142/615] bosun/scollector: Update to 20150506172827 --- pkgs/servers/monitoring/bosun/default.nix | 4 ++-- pkgs/servers/monitoring/bosun/scollector.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index 4ab9148118cd..807ee7022672 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -3,14 +3,14 @@ with goPackages; buildGoPackage rec { - rev = "20150409220449"; + rev = "20150506172827"; name = "bosun-${rev}"; goPackagePath = "bosun.org"; src = fetchFromGitHub { inherit rev; owner = "bosun-monitor"; repo = "bosun"; - sha256 = "02bvq9hx2h4pgjclv09nm0al8ybvq0syhyhn5cvw0wgnn9bwn5mb"; + sha256 = "0rnfiv9b835b8j8r9qh9j2mz9mm9q45vfg9cqa4nngrgfd0cqvl8"; }; subPackages = [ "cmd/bosun" ]; diff --git a/pkgs/servers/monitoring/bosun/scollector.nix b/pkgs/servers/monitoring/bosun/scollector.nix index 9f432f7f8c1c..bd4a5cb10478 100644 --- a/pkgs/servers/monitoring/bosun/scollector.nix +++ b/pkgs/servers/monitoring/bosun/scollector.nix @@ -3,14 +3,14 @@ with goPackages; buildGoPackage rec { - rev = "20150409220449"; - name = "bosun-${rev}"; + rev = "20150506172827"; + name = "scollector-${rev}"; goPackagePath = "bosun.org"; src = fetchFromGitHub { inherit rev; owner = "bosun-monitor"; repo = "bosun"; - sha256 = "02bvq9hx2h4pgjclv09nm0al8ybvq0syhyhn5cvw0wgnn9bwn5mb"; + sha256 = "0rnfiv9b835b8j8r9qh9j2mz9mm9q45vfg9cqa4nngrgfd0cqvl8"; }; subPackages = [ "cmd/scollector" ]; From 7a61a97dad5353dab49cd057584c0e50fcbaad33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Thu, 14 May 2015 16:01:16 +0200 Subject: [PATCH 143/615] idea updates idea.clion: 1.0 -> 1.0.1 idea.ruby-mine: 7.0.4 -> 7.1.2 --- pkgs/applications/editors/idea/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index d502bf42e91e..4a22b6e990a3 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -225,13 +225,13 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "1.0"; - build = "141.353"; + version = "1.0.1"; + build = "141.870"; description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/${name}.tar.gz"; - sha256 = "0xjdx13ljp1vy51a7rsj25wg3bsvry4kxq5cdng8zrc1g2y1fqw5"; + sha256 = "17hdna6w7y9n3vqncqifw7jvys3rydgg0mz97nzax817fl4kjf1r"; }; }; @@ -261,13 +261,13 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "7.0.4"; - build = "139.1231"; + version = "7.1.2"; + build = "141.1119"; description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "08b0iwccb5w9b1yk0kbs99r5mxkcyxqs9mkr57wb5j71an80yx38"; + sha256 = "1gz14lv5jhnrnshp7lkx3wgrdf0y60abs4q78yhv2x9dc6ld1gmj"; }; }; From 9c9c5865347e010560ad29b52e9c1caf91f84afe Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 14 May 2015 17:18:17 +0200 Subject: [PATCH 144/615] Fixed several "package has no version" warnings --- pkgs/applications/misc/sqliteman/default.nix | 14 ++++++++------ .../networking/cluster/marathon/default.nix | 2 +- .../science/electronics/fritzing/default.nix | 2 +- .../version-management/vcprompt/default.nix | 7 ++++--- pkgs/development/arduino/arduino-core/default.nix | 2 +- pkgs/development/tools/misc/uncrustify/default.nix | 5 +++-- .../tools/selenium/chromedriver/default.nix | 6 ++++-- pkgs/games/xsnow/default.nix | 4 ++-- pkgs/tools/networking/atftp/default.nix | 2 +- pkgs/tools/networking/connmanui/default.nix | 8 +++++--- pkgs/tools/video/atomicparsley/default.nix | 5 +++-- 11 files changed, 33 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/misc/sqliteman/default.nix b/pkgs/applications/misc/sqliteman/default.nix index f655a0f8c260..a1d5ef153bbd 100644 --- a/pkgs/applications/misc/sqliteman/default.nix +++ b/pkgs/applications/misc/sqliteman/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, cmake, qt4, qscintilla }: +{ stdenv, fetchFromGitHub, cmake, qt4, qscintilla }: stdenv.mkDerivation rec { - name = "sqliteman"; - version = "1.2.0-c41b89e1"; + name = "sqliteman-${version}"; + version = "1.2.0"; - src = fetchurl { - url = https://github.com/pvanek/sqliteman/archive/1.2.0.tar.gz; - sha256 = "1x4ppwf01jdnz3a4ycia6vv5qf3w2smbqx690z1pnkwbvk337akm"; + src = fetchFromGitHub { + repo = "sqliteman"; + owner = "pvanek"; + rev = version; + sha256 = "1blzyh1646955d580f71slgdvz0nqx0qacryx0jc9w02yrag17cs"; }; buildInputs = [ cmake qt4 qscintilla ]; diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix index 3eebc6de3cf3..1cc75a71bfa4 100644 --- a/pkgs/applications/networking/cluster/marathon/default.nix +++ b/pkgs/applications/networking/cluster/marathon/default.nix @@ -1,7 +1,7 @@ { stdenv, makeWrapper, jdk, mesos, fetchurl }: stdenv.mkDerivation rec { - name = "marathon-v${version}"; + name = "marathon-${version}"; version = "0.8.1"; src = fetchurl { diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index f5a835423bdd..1fa0a0d97b50 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.9.0b"; - name = "fritzing"; + name = "fritzing-${version}"; src = fetchurl { url = "http://fritzing.org/download/${version}/source-tarball/fritzing-${version}.source.tar_1.bz2"; diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix index 476abd4e19bd..4afb1b20e32c 100644 --- a/pkgs/applications/version-management/vcprompt/default.nix +++ b/pkgs/applications/version-management/vcprompt/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchhg, autoconf, sqlite }: -stdenv.mkDerivation { - name = "vcprompt"; +stdenv.mkDerivation rec { + name = "vcprompt-${version}"; + version = "1.2.1"; src = fetchhg { url = "http://hg.gerg.ca/vcprompt/"; - rev = "1.2.1"; + rev = version; sha256 = "03xqvp6bfl98bpacrw4n82qv9cw6a4fxci802s3vrygas989v1kj"; }; diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index a751076537a4..7a960dc931b9 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -7,7 +7,7 @@ assert withGui -> gtk2 != null; stdenv.mkDerivation rec { version = "1.0.6"; - name = "arduino${stdenv.lib.optionalString (withGui == false) "-core"}"; + name = "arduino${stdenv.lib.optionalString (withGui == false) "-core"}-${version}"; src = fetchFromGitHub { owner = "arduino"; diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index f4add9a4b9ea..70aedbb48d23 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "uncrustify"; + name = "${product}-${version}"; + product = "uncrustify"; version = "0.61"; src = fetchurl { - url = "mirror://sourceforge/uncrustify/${name}-${version}.tar.gz"; + url = "mirror://sourceforge/uncrustify/${product}-${version}.tar.gz"; sha256 = "1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9"; }; diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index f2d39938a483..8d9db34446d6 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -7,10 +7,12 @@ assert stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { - name = "chromedriver_linux64"; + product = "chromedriver_linux64"; + name = "${product}-2.14"; + version = "2.14"; src = fetchurl { - url = "http://chromedriver.storage.googleapis.com/2.14/${name}.zip"; + url = "http://chromedriver.storage.googleapis.com/${version}/${product}.zip"; sha256 = "18kpky1v5pc3fv6kv9i2mf4wr4qicmfhf27h9zqy18gh16rlwrin"; }; diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix index 68b77dd091b6..503deb695f7f 100644 --- a/pkgs/games/xsnow/default.nix +++ b/pkgs/games/xsnow/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "1.42"; - name = "xsnow"; + name = "xsnow-${version}"; src = fetchurl { - url = "http://dropmix.xs4all.nl/rick/Xsnow/xsnow-${version}.tar.gz"; + url = "http://dropmix.xs4all.nl/rick/Xsnow/${name}.tar.gz"; sha256 = "06jnbp88wc9i9dbmy7kggplw4hzlx2bhghxijmlhkjlizgqwimyh"; }; diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index 930d9f4968b6..ad2d77f8cfef 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -9,7 +9,7 @@ debianPatch = fetchurl { }; in stdenv.mkDerivation { - name = "atftp"; + name = "atftp-${version}"; inherit version; src = fetchurl { url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg.orig.tar.gz"; diff --git a/pkgs/tools/networking/connmanui/default.nix b/pkgs/tools/networking/connmanui/default.nix index 62be5bf14e57..280d3d9f9fc6 100644 --- a/pkgs/tools/networking/connmanui/default.nix +++ b/pkgs/tools/networking/connmanui/default.nix @@ -1,10 +1,12 @@ { stdenv, fetchgit, autoconf, automake, libtool, glib, gtk3, dbus, pkgconfig, file, intltool, connman }: -stdenv.mkDerivation { - name = "connmanui-b838e640eddb83d296fb6d146ce756066d37c43b"; +stdenv.mkDerivation rec { + name = "connmanui-${version}"; + version = "e4a8ddcca0870eb2ece5a7e3ea0296de9c86e5b2"; + src = fetchgit { url = "git://github.com/tbursztyka/connman-ui.git"; - rev = "e4a8ddcca0870eb2ece5a7e3ea0296de9c86e5b2"; + rev = version; sha256 = "0rml52v81s7hr0g6qbj5bamli08kn66hay84qicx8sy8679wg443"; }; diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index d4b662c88f17..02381badcc86 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -1,11 +1,12 @@ { stdenv, pkgs, fetchurl }: stdenv.mkDerivation rec { - name = "AtomicParsley"; + name = "${product}-${version}"; + product = "AtomicParsley"; version = "0.9.0"; src = fetchurl { - url = "mirror://sourceforge/atomicparsley/${name}-source-${version}.zip"; + url = "mirror://sourceforge/atomicparsley/${product}-source-${version}.zip"; sha256 = "de83f219f95e6fe59099b277e3ced86f0430ad9468e845783092821dff15a72e"; }; From 779b65f0193ca0d18b3d815a99cccd5886ef2126 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Thu, 14 May 2015 17:45:59 +0200 Subject: [PATCH 145/615] cups: Second attempt to fix our printing tests; add more sleep statements --- nixos/tests/printing.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index e8c41140045c..1e3a0057c657 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -68,6 +68,7 @@ import ./make-test.nix ({pkgs, ... }: { # Print the file on the client. $client->succeed("lp $file"); + $client->sleep(10); $client->succeed("lpq") =~ /active.*root.*$fn/ or die; # Ensure that a raw PCL file appeared in the server's queue @@ -75,11 +76,13 @@ import ./make-test.nix ({pkgs, ... }: { # course, since there is no actual USB printer attached, the # file will stay in the queue forever. $server->waitForFile("/var/spool/cups/d00001-001"); + $server->sleep(10); $server->succeed("lpq -a") =~ /$fn/ or die; # Delete the job on the client. It should disappear on the # server as well. $client->succeed("lprm"); + $client->sleep(10); $client->succeed("lpq -a") =~ /no entries/; Machine::retry sub { return 1 if $server->succeed("lpq -a") =~ /no entries/; From cd17e50bd95bbbcb4cf8e1904eaf334066a1ac42 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 14 May 2015 18:50:16 +0300 Subject: [PATCH 146/615] Update CLSQL source and switch to a mirror --- pkgs/development/lisp-modules/lisp-packages.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 7d4c88e5c9e0..5b24c7043623 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -190,15 +190,18 @@ let lispPackages = rec { clsql = buildLispPackage rec { baseName = "clsql"; - version = "git-20141112"; + version = "git-20150514"; description = "Common Lisp SQL Interface library"; deps = [uffi]; buildInputs = [pkgs.mysql.lib pkgs.zlib]; # Source type: git src = pkgs.fetchgit { - url = ''http://git.b9.com/clsql.git''; - sha256 = "dacd56bc9a0348e8101184bf154b971407a98f3a753d7cce34c7a44b4b19f8fd"; - rev = ''180b52cb686a87487e12e87b13bafe131e6c3bef''; + url = + #''http://git.b9.com/clsql.git'' + "http://repo.or.cz/r/clsql.git" + ; + sha256 = "1wzc7qsnq8hk0j0h9jmj4xczmh7h6njafwab2zylh8wxmfzwp2nw"; + rev = ''a646f558b54191eda1d64f2926eee7b4fa763f89''; }; overrides = x:{ preConfigure = '' From 7b028de543d7529f86233c4082ccc04f0accd8ef Mon Sep 17 00:00:00 2001 From: rushmorem Date: Thu, 14 May 2015 17:12:09 +0200 Subject: [PATCH 147/615] Fix mesos-0.22 build and update to 0.22.1 --- pkgs/applications/networking/cluster/mesos/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 9458ffc39256..c330b8acfbf3 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf -, automake, libtool, unzip, gnutar, jdk, maven, python, wrapPython +, automake114x, libtool, unzip, gnutar, jdk, maven, python, wrapPython , setuptools, distutils-cfg, boto, pythonProtobuf, apr, subversion , leveldb, glog, perf, utillinux, libnl, iproute }: @@ -9,18 +9,18 @@ let soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so"; in stdenv.mkDerivation rec { - version = "0.22.0"; + version = "0.22.1"; name = "mesos-${version}"; dontDisableStatic = true; src = fetchurl { url = "http://www.apache.org/dist/mesos/${version}/mesos-${version}.tar.gz"; - sha256 = "0z8c1vr7b06l3nqgbxq8ydcz79ayw75y2szipfqkw17c7gv6d7v8"; + sha256 = "0ry0ppzgpab68fz5bzd7ry5rjbg8xjz73x1x4c5id42cpsqnn7x5"; }; buildInputs = [ - makeWrapper autoconf automake libtool curl sasl jdk maven + makeWrapper autoconf automake114x libtool curl sasl jdk maven python wrapPython boto distutils-cfg setuptools leveldb subversion apr glog ] ++ lib.optionals stdenv.isLinux [ @@ -129,7 +129,7 @@ in stdenv.mkDerivation rec { homepage = "http://mesos.apache.org"; license = licenses.asl20; description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks"; - maintainers = with maintainers; [ cstrahan offline ]; + maintainers = with maintainers; [ cstrahan offline rushmorem ]; platforms = with platforms; linux; }; } From 221c45d51f3140a9c70bf465528d001da1fe1aa3 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Thu, 14 May 2015 09:52:40 -0700 Subject: [PATCH 148/615] emacs-packages: update projectile --- pkgs/top-level/emacs-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 2e8d68414a43..40bfb245f39d 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -902,12 +902,12 @@ let self = _self // overrides; projectile = melpaBuild rec { pname = "projectile"; - version = "20141020"; + version = "0.12.0"; src = fetchFromGitHub { owner = "bbatsov"; repo = pname; - rev = "13580d83374e0c17c55b3a680b816dfae407657e"; - sha256 = "10c28h2g53sg68lwamhak0shdhh26h5xaipipz3n4281sr1fwg58"; + rev = "v${version}"; + sha256 = "1bl5wpkyv9xlf5v5hzkj8si1z4hjn3yywrjs1mx0g4irmq3mk29m"; }; packageRequires = [ dash helm s pkg-info epl ]; meta = { license = gpl3Plus; }; From bb9e9cc3f84abc4363d4b15b5860d82301d5b41e Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 14 May 2015 19:09:10 +0200 Subject: [PATCH 149/615] Turned some meta.maintainers into lists --- pkgs/applications/audio/pianobar/default.nix | 8 ++++---- .../misc/rxvt_unicode-plugins/urxvt-perls/default.nix | 2 +- .../misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix | 4 ++-- .../pidgin-plugins/pidgin-latex/default.nix | 2 +- pkgs/development/compilers/smlnj/default.nix | 6 +++--- pkgs/development/libraries/boost-process/default.nix | 2 +- pkgs/development/libraries/cppzmq/default.nix | 2 +- pkgs/development/libraries/double-conversion/default.nix | 2 +- pkgs/development/libraries/folly/default.nix | 2 +- pkgs/development/libraries/libiberty/default.nix | 2 +- .../libraries/libnetfilter_conntrack/default.nix | 8 ++++---- pkgs/development/libraries/libxls/default.nix | 2 +- pkgs/development/libraries/qpdf/default.nix | 2 +- pkgs/development/libraries/xlslib/default.nix | 2 +- pkgs/games/hedgewars/default.nix | 2 +- pkgs/games/onscripter-en/default.nix | 2 +- pkgs/misc/sails/default.nix | 2 +- pkgs/tools/X11/primus/default.nix | 2 +- pkgs/tools/archivers/rpmextract/default.nix | 2 +- pkgs/tools/compression/lbzip2/default.nix | 2 +- pkgs/tools/networking/openvpn/update-resolv-conf.nix | 2 +- 21 files changed, 30 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 3e7bcb9d912e..b76e1183c0ee 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { configurePhase = "export CC=${CC}"; - meta = { + meta = with stdenv.lib; { description = "A console front-end for Pandora.com"; homepage = "http://6xq.net/projects/pianobar/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; # expat version - maintainers = stdenv.lib.maintainers.eduarrrd; + platforms = platforms.linux; + license = licenses.mit; # expat version + maintainers = with maintainers; [ eduarrrd ]; }; } diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix index c0cc702c9862..3c5caeda789e 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { description = "Perl extensions for the rxvt-unicode terminal emulator"; homepage = "https://github.com/muennich/urxvt-perls"; license = licenses.gpl2; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix index a636c3bcfe56..db388cea5fbb 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tabbed plugin for rxvt-unicode with many enhancements (mina86's fork)"; homepage = "https://github.com/mina86/urxvt-tabbedex"; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index 586ce26e8c95..4a5522039c84 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { description = "LaTeX rendering plugin for Pidgin IM"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index aa8ea9012c11..a2b8d4f63b98 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -60,11 +60,11 @@ in stdenv.mkDerivation { done ''; - meta = { + meta = with stdenv.lib; { description = "Standard ML of New Jersey, a compiler"; homepage = http://smlnj.org; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; platforms = [ "i686-linux" ]; - maintainers = stdenv.lib.maintainers.thoughtpolice; + maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix index 59d25a767329..974654216e01 100644 --- a/pkgs/development/libraries/boost-process/default.nix +++ b/pkgs/development/libraries/boost-process/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { description = "Library to manage system processes"; license = "boost-license"; platforms = platforms.unix; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index fc2d04e649b9..510af3df8240 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/zeromq/cppzmq; license = licenses.bsd2; description = "C++ binding for 0MQ"; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 07f11d9fa393..6eedf6fc23be 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/floitsch/double-conversion; license = licenses.bsd3; platforms = platforms.unix; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 180de724d958..0110511c3356 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { license = licenses.mit; # 32bit is not supported: https://github.com/facebook/folly/issues/103 platforms = [ "x86_64-linux" ]; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index 70d6b24cbfc5..eddc4eed55c0 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://gcc.gnu.org/; license = licenses.lgpl2; description = "Collection of subroutines used by various GNU programs"; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index f6908cd514cc..a1a343de0e22 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libmnl ]; propagatedBuildInputs = [ libnfnetlink ]; - meta = { + meta = with stdenv.lib; { description = "Userspace library providing an API to the in-kernel connection tracking state table"; longDescription = '' libnetfilter_conntrack is a userspace library providing a programming interface (API) to the @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { by conntrack-tools among many other applications ''; homepage = http://netfilter.org/projects/libnetfilter_conntrack/; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = stdenv.lib.maintainers.nckx; + platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix index 87b4d82efc63..0d7115144449 100644 --- a/pkgs/development/libraries/libxls/default.nix +++ b/pkgs/development/libraries/libxls/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = http://sourceforge.net/projects/libxls/; license = licenses.bsd2; platforms = platforms.unix; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index e9d506f58fe9..939351750920 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = http://qpdf.sourceforge.net/; description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files"; license = licenses.artistic2; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix index 82f1514cd3d3..2492063be270 100644 --- a/pkgs/development/libraries/xlslib/default.nix +++ b/pkgs/development/libraries/xlslib/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = http://sourceforge.net/projects/xlslib/files/; license = licenses.bsd2; platforms = platforms.unix; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 042d4f9fd4aa..bb776a7a10d0 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { contact with explosions, to zero (the damage dealt to the attacked hedgehog or hedgehogs after a player's or CPU turn is shown only when all movement on the battlefield has ceased).''; - maintainers = maintainers.kragniz; + maintainers = with maintainers; [ kragniz ]; platforms = ghc.meta.platforms; }; } diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/games/onscripter-en/default.nix index 1d0bf636e2e9..8e9f5a988bf9 100644 --- a/pkgs/games/onscripter-en/default.nix +++ b/pkgs/games/onscripter-en/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "http://dev.haeleth.net/onscripter.shtml"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/misc/sails/default.nix b/pkgs/misc/sails/default.nix index ab68dc69015d..f6ccbf9ec76d 100644 --- a/pkgs/misc/sails/default.nix +++ b/pkgs/misc/sails/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { Sails is a simulator designed to test the AI of autonomous sailing robots. It emulates the basic physics of sailing a small single sail boat''; - maintainers = maintainers.kragniz; + maintainers = with maintainers; [ kragniz ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index c5c0e3ce7809..1aa7909a43d6 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/amonakov/primus; description = "Faster OpenGL offloading for Bumblebee"; - maintainers = maintainers.coconnor; + maintainers = with maintainers; [ coconnor ]; }; } diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix index c5f982c955cc..c9ce6ac4d10b 100644 --- a/pkgs/tools/archivers/rpmextract/default.nix +++ b/pkgs/tools/archivers/rpmextract/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { description = "Script to extract RPM archives"; platforms = platforms.all; license = licenses.gpl2; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix index e1adefd2167d..44f6a0bb7a45 100644 --- a/pkgs/tools/compression/lbzip2/default.nix +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { homepage = http://lbzip2.org/; description = "parallel bzip2 compression utility"; license = licenses.gpl3; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix index 3afa17b0a82c..d6f67d065d99 100644 --- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Script to update your /etc/resolv.conf with DNS settings that come from the received push dhcp-options"; homepage = https://github.com/masterkorp/openvpn-update-resolv-conf/; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2; platforms = platforms.unix; }; From 21c73b63b8f11c372b5bf9d3a9b2ff3acc766581 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 14 May 2015 19:15:22 +0200 Subject: [PATCH 150/615] Turned two more meta.maintainers into lists --- .../libraries/gstreamer/legacy/gstreamermm/default.nix | 8 ++++---- pkgs/servers/kippo/default.nix | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix index ea1c31ccab8e..ce6ae9318363 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = with stdenv.lib; { description = "C++ bindings for the GStreamer streaming multimedia library"; homepage = http://www.gtkmm.org/; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = "Philip Lykke Carlsen "; - platforms = stdenv.lib.platforms.unix; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ plcplc ]; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix index cadf6e716917..30d3fc3ab180 100644 --- a/pkgs/servers/kippo/default.nix +++ b/pkgs/servers/kippo/default.nix @@ -51,15 +51,15 @@ stdenv.mkDerivation rec { mv $out/src/utils/* $out/bin ''; - meta = { + meta = with stdenv.lib; { homepage = https://code.google.com/p/kippo; description = "SSH Honeypot"; longDescription = '' Default port is 2222. Recommend using something like this for port redirection to default SSH port: networking.firewall.extraCommands = ''' iptables -t nat -A PREROUTING -i IN_IFACE -p tcp --dport 22 -j REDIRECT --to-port 2222''' ''; - license = stdenv.lib.licenses.bsd3; - platforms = pkgs.stdenv.lib.platforms.linux; - maintainers = pkgs.stdenv.lib.maintainers.tomberek; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ tomberek ]; }; } From 9ac11fb2efc2337869c6278b1349cad80b314664 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 14 May 2015 19:36:09 +0200 Subject: [PATCH 151/615] inadyn: fix & update from 1.99.10 to 1.99.13 --- pkgs/tools/networking/inadyn/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 7e4d5fbe5f05..f95bc49580d2 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchurl, gnutls }: +{ stdenv, fetchFromGitHub, gnutls33 }: let - ver = "1.99.10"; + version = "1.99.13"; in stdenv.mkDerivation { - name = "inadyn-${ver}"; + name = "inadny-${version}"; - src = fetchurl { - url = "https://github.com/troglobit/inadyn/archive/${ver}.tar.gz"; - sha256 = "0m3qnnq99siwf1ybcvbzdawk68lxf61vd13fw1f2ssl2m07hfxg3"; + src = fetchFromGitHub { + repo = "inadyn"; + owner = "troglobit"; + rev = version; + sha256 = "19z8si66b2kwb7y29qpd8y45rhg5wrycwkdgjqqp98sg5yq8p7v0"; }; preConfigure = '' export makeFlags=prefix=$out ''; - buildInputs = [ gnutls ]; + buildInputs = [ gnutls33 ]; NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; From 3dc204f42ed2c9deb862a9eebb07b0edc620dc3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 14 May 2015 20:21:56 +0200 Subject: [PATCH 152/615] fix eval --- pkgs/development/interpreters/python/2.6/default.nix | 2 +- pkgs/development/interpreters/python/2.7/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 2d28a8e6f5b6..29e3ecd20b1f 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -169,7 +169,7 @@ let crypt = buildInternalPythonModule { moduleName = "crypt"; internalName = "crypt"; - deps = [ stdenv.glibc ]; + deps = optional (stdenv ? glibc) stdenv.glibc; }; curses = buildInternalPythonModule { diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index d0880d1b7023..cfc52dabc5b6 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -196,7 +196,7 @@ let crypt = buildInternalPythonModule { moduleName = "crypt"; internalName = "crypt"; - deps = [ stdenv.glibc ]; + deps = optional (stdenv ? glibc) stdenv.glibc; }; gdbm = buildInternalPythonModule { From 1194ebc7eff3797c25e1b0c0eed9bc0b1d627365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 14 May 2015 20:30:18 +0200 Subject: [PATCH 153/615] 15.05 release is now 15.06 --- .version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.version b/.version index 7bc03e791d42..7c3643d5fb20 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -15.05 \ No newline at end of file +15.06 \ No newline at end of file From 7f2262e9a8f65ae7975242860c7ced51677ecb9c Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Mon, 11 May 2015 21:24:49 +0200 Subject: [PATCH 154/615] fcppt: initial import into nixpkgs --- lib/maintainers.nix | 1 + pkgs/development/libraries/fcppt/default.nix | 27 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/fcppt/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 641610e6d4fe..bcb07b25c0b6 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -162,6 +162,7 @@ pkmx = "Chih-Mao Chen "; plcplc = "Philip Lykke Carlsen "; pmahoney = "Patrick Mahoney "; + pmiddend = "Philipp Middendorf "; prikhi = "Pavan Rikhi "; pSub = "Pascal Wittmann "; puffnfresh = "Brian McKenna "; diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix new file mode 100644 index 000000000000..5f7d61f36018 --- /dev/null +++ b/pkgs/development/libraries/fcppt/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchgit, cmake, boost }: + +stdenv.mkDerivation rec { + name = "fcppt-1.3.0"; + + src = fetchgit { + url = https://github.com/freundlich/fcppt.git; + rev = "7787733afc7a6278c0de8c0435b3d312e0c0c851"; + sha256 = "1vy6nhk6nymbp4yihvw75qn67q9fgmfc518f8dn3h2pq2gfjqrpy"; + }; + + buildInputs = [ cmake boost ]; + + cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_TEST=false" ]; + + enableParallelBuilding = true; + + meta = { + description = "Freundlich's C++ toolkit"; + longDescription = '' + Freundlich's C++ Toolkit (fcppt) is a collection of libraries focusing on improving general C++ code by providing better types, a strong focus on C++11 (non-conforming compilers are mostly not supported) and functional programming (which is both efficient and syntactically affordable in C++11). + ''; + homepage = http://fcppt.org; + license = stdenv.lib.licenses.boost; + maintainers = with stdenv.lib.maintainers; [ pmiddend ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95eabc5a3c4b..e0ad918fad74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1349,6 +1349,8 @@ let plugins = [ ]; }; + fcppt = callPackage ../development/libraries/fcppt/default.nix { }; + fcron = callPackage ../tools/system/fcron { }; fdm = callPackage ../tools/networking/fdm {}; From 1e517dbd45bbb0968a2917dd97a4cf4a93574ba5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 15 May 2015 01:37:04 +0200 Subject: [PATCH 155/615] virtualbox+guest: Update to new version 4.3.28. Contains quite a lot of fixes, so for information and details about them, please have a look at https://www.virtualbox.org/wiki/Changelog. We also needed to drop the hunk about NATNetworkServiceRunner.cpp in the hardened.patch, because the file was unused and thus has been removed from upstream in r54821: https://www.virtualbox.org/changeset?reponame=vbox&new=54821 Tested successfully against nixos/tests/virtualbox.nix. Signed-off-by: aszlig --- .../virtualization/virtualbox/default.nix | 8 ++++---- .../virtualbox/guest-additions/default.nix | 2 +- .../virtualization/virtualbox/hardened.patch | 13 ------------- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 842985dce5bb..158d99f64880 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.26"; # changes ./guest-additions as well + version = "4.3.28"; # 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 = "98988"; + extpackRevision = "100309"; 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 = "4e39a6d0da23799a31c3f6a4022b144ef3ddfe30c523e51b21bf7d9ebade62ce"; + sha256 = "72e101d9dc5eabeb76d1ab5bd6d2f817a11c89adfe8bb72cc5d614a2eef532d1"; 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 = "e2949c250a1de30997e658de9e3d8545e71318a9844d80536137d76db4f08961"; + sha256 = "e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31"; }; buildInputs = diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index e63f69ca2306..0d8560635220 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 = "c5e46533a6ff8df177ed5c9098624f6cec46ca392bab16de2017195580088670"; + sha256 = "9f52e186d6c9407b2676d4b2ed1cdf96940ec129cc2bd92e54b24526271a9733"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; diff --git a/pkgs/applications/virtualization/virtualbox/hardened.patch b/pkgs/applications/virtualization/virtualbox/hardened.patch index 3df41228ae59..37d2ad3a515b 100644 --- a/pkgs/applications/virtualization/virtualbox/hardened.patch +++ b/pkgs/applications/virtualization/virtualbox/hardened.patch @@ -100,19 +100,6 @@ index 95dc9a7..39170bc 100644 size_t cchBufLeft = strlen(szPath); szPath[cchBufLeft++] = RTPATH_DELIMITER; szPath[cchBufLeft] = 0; -diff --git a/src/VBox/Main/src-server/NATNetworkServiceRunner.cpp b/src/VBox/Main/src-server/NATNetworkServiceRunner.cpp -index 090018e..7dcfc7a 100644 ---- a/src/VBox/Main/src-server/NATNetworkServiceRunner.cpp -+++ b/src/VBox/Main/src-server/NATNetworkServiceRunner.cpp -@@ -75,7 +75,7 @@ int NATNetworkServiceRunner::start() - - /* get the path to the executable */ - char exePathBuf[RTPATH_MAX]; -- const char *exePath = RTProcGetExecutablePath(exePathBuf, RTPATH_MAX); -+ const char *exePath = RTProcGetSuidPath(exePathBuf, RTPATH_MAX); - char *substrSl = strrchr(exePathBuf, '/'); - char *substrBs = strrchr(exePathBuf, '\\'); - char *suffix = substrSl ? substrSl : substrBs; diff --git a/src/VBox/Main/src-server/NetworkServiceRunner.cpp b/src/VBox/Main/src-server/NetworkServiceRunner.cpp index e9e1ba62..4d1c1e1 100644 --- a/src/VBox/Main/src-server/NetworkServiceRunner.cpp From 3a5e10e37f297e3df0da656d08ea211aa9e1187a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 14 May 2015 17:30:55 -0700 Subject: [PATCH 156/615] buildGoPackage: Support adding extra sources --- .../go-modules/generic/default.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 76828784a9d5..fce307e063c5 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -5,7 +5,14 @@ # Go import path of the package , goPackagePath -, meta ? {}, ... } @ args: +# Extra sources to include in the gopath +, extraSrcs ? [ ] + +, meta ? {}, ... } @ args': + +let + args = lib.filterAttrs (name: _: name != "extraSrcs") args'; +in go.stdenv.mkDerivation ( args // { name = "go${go.meta.branch}-${name}"; @@ -14,10 +21,20 @@ go.stdenv.mkDerivation ( args // { configurePhase = args.configurePhase or '' runHook preConfigure + # Extract the source cd "$NIX_BUILD_TOP" mkdir -p "go/src/$(dirname "$goPackagePath")" mv "$sourceRoot" "go/src/$goPackagePath" + '' + lib.flip lib.concatMapStrings extraSrcs ({ src, goPackagePath }: '' + mkdir extraSrc + (cd extraSrc; unpackFile "${src}") + mkdir -p "go/src/$(dirname "${goPackagePath}")" + chmod -R u+w extraSrc/* + mv extraSrc/* "go/src/${goPackagePath}" + rmdir extraSrc + + '') + '' GOPATH=$NIX_BUILD_TOP/go:$GOPATH runHook postConfigure From fecf412767af5b027985871a5a3f14f12ce79f06 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 14 May 2015 17:34:50 -0700 Subject: [PATCH 157/615] buildGoPackage: Fix spacing --- .../go-modules/generic/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index fce307e063c5..69efdfd54d3e 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -51,16 +51,16 @@ go.stdenv.mkDerivation ( args // { runHook renameImports if [ -n "$subPackages" ] ; then - for p in $subPackages ; do + for p in $subPackages ; do go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p - done + done else - find . -type d | while read d; do + find . -type d | while read d; do for i in $d/*.go; do go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d break - done - done + done + done fi runHook postBuild @@ -70,16 +70,16 @@ go.stdenv.mkDerivation ( args // { runHook preCheck if [ -n "$subPackages" ] ; then - for p in $subPackages ; do + for p in $subPackages ; do go test -p $NIX_BUILD_CORES -v $goPackagePath/$p - done + done else - find . -type d | while read d; do + find . -type d | while read d; do for i in $d/*_test.go; do go test -p $NIX_BUILD_CORES -v $d break - done - done + done + done fi runHook postCheck From 1a045673f67e1da33db9ab7c38f4ee84fc1cb664 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 14 May 2015 17:42:11 -0700 Subject: [PATCH 158/615] go-modules: Cleanup submodule detection Also, only build the sources that matter for distribution --- .../go-modules/generic/default.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 69efdfd54d3e..62082842fcee 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -55,12 +55,10 @@ go.stdenv.mkDerivation ( args // { go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p done else - find . -type d | while read d; do - for i in $d/*.go; do - go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d - break - done - done + (cd go/src + find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq | while read d; do + go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d + done) fi runHook postBuild @@ -74,12 +72,10 @@ go.stdenv.mkDerivation ( args // { go test -p $NIX_BUILD_CORES -v $goPackagePath/$p done else - find . -type d | while read d; do - for i in $d/*_test.go; do - go test -p $NIX_BUILD_CORES -v $d - break - done - done + (cd go/src + find $goPackagePath -type f -name \*_test.go -exec dirname {} \; | sort | uniq | while read d; do + go test -p $NIX_BUILD_CORES -v $d + done) fi runHook postCheck From 0ff12d88eaa773b2514625c6eda2ca22e686a1a6 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 14 May 2015 17:51:04 -0700 Subject: [PATCH 159/615] buildGoPackage: Skip directories which don't have buildable go packages --- pkgs/development/go-modules/generic/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 62082842fcee..6d52d0cc92f8 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -57,7 +57,13 @@ go.stdenv.mkDerivation ( args // { else (cd go/src find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq | while read d; do - go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d + local OUT; + if ! OUT="$(go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d 2>&1)"; then + if ! echo "$OUT" | grep -q 'no buildable Go source files'; then + echo "$OUT" >&2 + exit 1 + fi + fi done) fi From dcd5ab9cfe5b4af74fdcc9fcb4e44cfa75a8a66f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 14 May 2015 17:58:10 -0700 Subject: [PATCH 160/615] goPackages: Update and add some packages --- pkgs/top-level/go-packages.nix | 188 ++++++++++++++++++++++++++++++--- 1 file changed, 175 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 8c2f090e0c10..79371696d20f 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -10,14 +10,15 @@ let self = _self // overrides; _self = with self; { ## OFFICIAL GO PACKAGES crypto = buildGoPackage rec { - rev = "1351f936d976c60a0a48d728281922cf63eafb8d"; + rev = "4d48e5fa3d62b5e6e71260571bf76c767198ca02"; name = "go-crypto-${rev}"; goPackagePath = "golang.org/x/crypto"; + src = fetchFromGitHub { inherit rev; owner = "golang"; repo = "crypto"; - sha256 = "1vf4z97y7xnhzjizik0lghr7ip77hhdj9kbb35rr4c9sn108f20j"; + sha256 = "0plvjv56afb02p7l3c2zfwffnhscmc3f0ckj1gls9ay6vj85y7l8"; }; }; @@ -57,15 +58,17 @@ let self = _self // overrides; _self = with self; { }; protobuf = buildGoPackage rec { - rev = "5677a0e3d5e89854c9974e1256839ee23f8233ca"; + rev = "efd7476481382c195beb33acd8ec2f1527167fb4"; name = "goprotobuf-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/golang/protobuf"; + src = fetchFromGitHub { inherit rev; owner = "golang"; repo = "protobuf"; - sha256 = "18dzxmy0gfjnwa9x8k3hv9calvmydv0dnz1iibykkzd20gw4l85v"; + sha256 = "1wc3m4jpsdmmqdcf2isc9913mmwfyv791c0rd26kpjjwynh5dhdm"; }; + subPackages = [ "proto" "protoc-gen-go" ]; }; @@ -347,15 +350,17 @@ let self = _self // overrides; _self = with self; { }; golang_protobuf_extensions = buildGoPackage rec { - rev = "ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; name = "golang-protobuf-extensions-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + src = fetchFromGitHub { inherit rev; owner = "matttproud"; repo = "golang_protobuf_extensions"; - sha256 = "1vz6zj94v90x8mv9h6qfp1211kmzn60ri5qh7p9fzpjkhga5k936"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; }; + buildInputs = [ protobuf ]; }; @@ -384,6 +389,25 @@ let self = _self // overrides; _self = with self; { }; }; + google-api-go-client = buildGoPackage rec { + rev = "34c5554e6406f7f715ede3616b39034247545ce0"; + name = "google-api-go-client-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "google.golang.org/api"; + + preBuild = '' + rm -rf go/src/${goPackagePath}/examples + ''; + + src = fetchFromGitHub { + inherit rev; + owner = "google"; + repo = "google-api-go-client"; + sha256 = "1496h0xc7vjklr4m4j7vy1764k1qk2grpcwz5zssgplpfs9s9wfz"; + }; + + buildInputs = [ x.net ]; + }; + gosnappy = buildGoPackage rec { rev = "ce8acff4829e0c2458a67ead32390ac0a381c862"; name = "gosnappy-${stdenv.lib.strings.substring 0 7 rev}"; @@ -493,6 +517,21 @@ let self = _self // overrides; _self = with self; { subPackages = [ "fuse" "fuse/nodefs" "fuse/pathfs" ]; }; + go-github = buildGoPackage rec { + rev = "9eb187bac4eba6fff5a54f80550b2df73b651523"; + name = "go-github-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/google/go-github"; + + src = fetchFromGitHub { + inherit rev; + owner = "google"; + repo = "go-github"; + sha256 = "123ck9nf5ggdrndg2gs1bhr4ysh4z0izph9sp7ciisxpgjkaycxq"; + }; + + buildInputs = [ go-querystring x.oauth2 ]; + }; + go-homedir = buildGoPackage rec { rev = "7d2d8c8a4e078ce3c58736ab521a40b37a504c52"; name = "go-homedir-${stdenv.lib.strings.substring 0 7 rev}"; @@ -557,15 +596,18 @@ let self = _self // overrides; _self = with self; { }; armon.go-metrics = buildGoPackage rec { - rev = "02567bbc4f518a43853d262b651a3c8257c3f141"; + rev = "a54701ebec11868993bc198c3f315353e9de2ed6"; name = "armon.go-metrics-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/armon/go-metrics"; + src = fetchFromGitHub { inherit rev; owner = "armon"; repo = "go-metrics"; - sha256 = "08fk3zmw0ywmdfp2qhrpv0vrk1y97hzqczrgr3y2yip3x8sr37ar"; + sha256 = "0ia9i96nac7vnmf5qb98rs74npf3vg55kdsvmql8cwgfpmqqcfdh"; }; + + buildInputs = [ prometheus.client_golang ]; }; go-msgpack = buildGoPackage rec { @@ -605,6 +647,32 @@ let self = _self // overrides; _self = with self; { }; }; + go-querystring = buildGoPackage rec { + rev = "547ef5ac979778feb2f760cdb5f4eae1a2207b86"; + name = "go-querystring-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/google/go-querystring"; + + src = fetchFromGitHub { + inherit rev; + owner = "google"; + repo = "go-querystring"; + sha256 = "00ani7fhydcmlsm3n93nmj1hcqp2wmzvihnb1gdzynif1hw0530y"; + }; + }; + + go-radix = buildGoPackage rec { + rev = "0bab926c3433cfd6490c6d3c504a7b471362390c"; + name = "go-radix-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/armon/go-radix"; + + src = fetchFromGitHub { + inherit rev; + owner = "armon"; + repo = "go-radix"; + sha256 = "0llq96lxh7p9426hjii8k42kq0cp1hflawh1kjwhbmi5g0jrq04d"; + }; + }; + go-runit = buildGoPackage rec { rev = "a9148323a615e2e1c93b7a9893914a360b4945c8"; name = "go-runit-${stdenv.lib.strings.substring 0 7 rev}"; @@ -709,6 +777,21 @@ let self = _self // overrides; _self = with self; { subPackages = [ "./" ]; }; + grpc = buildGoPackage rec { + rev = "f5ebd86be717593ab029545492c93ddf8914832b"; + name = "grpc-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "google.golang.org/grpc"; + + src = fetchFromGitHub { + inherit rev; + owner = "grpc"; + repo = "grpc-go"; + sha256 = "07dfpwwk68rrhxmqj69gq2ncsf3kfmn0zhlwscda0gc5gb57n5x1"; + }; + + propagatedBuildInputs = [ http2 glog x.net protobuf x.oauth2 ]; + }; + hologram = buildGoPackage rec { rev = "2bf08f0edee49297358bd06a0c9bf44ba9051e9c"; name = "hologram-${stdenv.lib.strings.substring 0 7 rev}"; @@ -722,6 +805,21 @@ let self = _self // overrides; _self = with self; { buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir ldap g2s gox ]; }; + http2 = buildGoPackage rec { + rev = "f8202bc903bda493ebba4aa54922d78430c2c42f"; + name = "http2-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/bradfitz/http2"; + + src = fetchFromGitHub { + inherit rev; + owner = "bradfitz"; + repo = "http2"; + sha256 = "0cza2126jbji5vijwk4dxs05hifnff04xcr0vhxvafs6hz3sacvr"; + }; + + buildInputs = [ crypto ]; + }; + httprouter = buildGoPackage rec { rev = "bde5c16eb82ff15a1734a3818d9b9547065f65b1"; name = "httprouter-${stdenv.lib.strings.substring 0 7 rev}"; @@ -898,6 +996,34 @@ let self = _self // overrides; _self = with self; { }; }; + mysql = buildGoPackage rec { + rev = "0cc29e9fe8e25c2c58cf47bcab566e029bbaa88b"; + name = "mysql-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/go-sql-driver/mysql"; + + src = fetchFromGitHub { + inherit rev; + owner = "go-sql-driver"; + repo = "mysql"; + sha256 = "0ydvd0mk53793sj3hgycsx926zvzxipxvppld1i175g3pn4d41xp"; + }; + }; + + x.net = buildGoPackage rec { + rev = "e0403b4e005737430c05a57aac078479844f919c"; + name = "net-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "golang.org/x/net"; + + src = fetchFromGitHub { + inherit rev; + owner = "golang"; + repo = "net"; + sha256 = "1g7cjzw4g4301a3yqpbk8n1d4s97sfby2aysl275x04g0zh8jxqp"; + }; + + buildInputs = [ x.text ]; + }; + ntp = buildGoPackage rec { rev = "0a5264e2563429030eb922f258229ae3fee5b5dc"; name = "ntp-${stdenv.lib.strings.substring 0 7 rev}"; @@ -910,6 +1036,25 @@ let self = _self // overrides; _self = with self; { }; }; + x.oauth2 = buildGoPackage rec { + rev = "f98d0160877ab4712b906626425ed8b0b320907c"; + name = "oauth2-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "golang.org/x/oauth2"; + + src = fetchFromGitHub { + inherit rev; + owner = "golang"; + repo = "oauth2"; + sha256 = "0hi54mm63ha7a75avydj6xm0a4dd2njdzllr9y2si1i1wnijqw2i"; + }; + + extraSrcs = [ + { inherit (gcloud-golang) src goPackagePath; } + ]; + + buildInputs = [ x.net ]; + }; + oglematchers = buildGoPackage rec { rev = "4fc24f97b5b74022c2a3f4ca7eed57ca29083d3e"; name = "oglematchers-${stdenv.lib.strings.substring 0 7 rev}"; @@ -977,6 +1122,7 @@ let self = _self // overrides; _self = with self; { rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; name = "beorn7.perks-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/beorn7/perks"; + src = fetchFromGitHub { inherit rev; owner = "beorn7"; @@ -1013,21 +1159,23 @@ let self = _self // overrides; _self = with self; { prometheus.client_golang = buildGoPackage rec { name = "prometheus-client-${version}"; - version = "0.3.2"; + version = "0.5.0"; goPackagePath = "github.com/prometheus/client_golang"; + src = fetchFromGitHub { owner = "prometheus"; repo = "client_golang"; rev = "${version}"; - sha256 = "1fn56zp420hxpm0prr76yyhh62zq3sqj3ppl2r4qxjc78f8ckbj4"; + sha256 = "0aaf20iv797dj2vr5lnqk006aw7n0cclmxlpk8xy6c6nrn6fm3nv"; }; + propagatedBuildInputs = [ + goautoneg protobuf golang_protobuf_extensions prometheus.client_model prometheus.procfs beorn7.perks - goautoneg ]; }; @@ -1045,14 +1193,15 @@ let self = _self // overrides; _self = with self; { }; prometheus.procfs = buildGoPackage rec { - rev = "92faa308558161acab0ada1db048e9996ecec160"; + rev = "351fbfac67c8ae8bcacd468f678f5e8d5a585d3d"; name = "prometheus-procfs-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/prometheus/procfs"; + src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "procfs"; - sha256 = "0kaw81z2yi45f6ll6n2clr2zz60bdgdxzqnxvd74flynz4sr0p1v"; + sha256 = "0hxssp6h1cs7l2cvnxj1hyacy3328hhpi1pd123f2a57aikha9ff"; }; }; @@ -1180,6 +1329,19 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ pty ]; }; + x.text = buildGoPackage rec { + rev = "c93e7c9fff19fb9139b5ab04ce041833add0134e"; + name = "text-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "golang.org/x/text"; + + src = fetchFromGitHub { + inherit rev; + owner = "golang"; + repo = "text"; + sha256 = "1yvmllriqjm0k97vnxycz9q0likvh18a68xbyg1k6ddkvn9sy03y"; + }; + }; + toml = buildGoPackage rec { rev = "f87ce853111478914f0bcffa34d43a93643e6eda"; name = "toml-${stdenv.lib.strings.substring 0 7 rev}"; From 5219d3e3d14d761c3fea8f6d83a1dd3667d5c294 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 14 May 2015 18:28:16 -0700 Subject: [PATCH 161/615] goPackages: Update and add some packages --- pkgs/top-level/go-packages.nix | 179 ++++++++++++++++++++++----------- 1 file changed, 122 insertions(+), 57 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 79371696d20f..3373ebdef2f8 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -46,17 +46,40 @@ let self = _self // overrides; _self = with self; { }; net = buildGoPackage rec { - rev = "3338d5f109e9"; - name = "go.net-${rev}"; - goPackagePath = "code.google.com/p/go.net"; - src = fetchhg { + rev = "e0403b4e005737430c05a57aac078479844f919c"; + name = "net-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "golang.org/x/net"; + + src = fetchFromGitHub { inherit rev; - url = "https://${goPackagePath}"; - sha256 = "0yz807y3ac07x3nf0qlaw1w1i6asynrpyssjl8jyv3pplww0qj7i"; + owner = "golang"; + repo = "net"; + sha256 = "1g7cjzw4g4301a3yqpbk8n1d4s97sfby2aysl275x04g0zh8jxqp"; }; + propagatedBuildInputs = [ text ]; }; + oauth2 = buildGoPackage rec { + rev = "f98d0160877ab4712b906626425ed8b0b320907c"; + name = "oauth2-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "golang.org/x/oauth2"; + + src = fetchFromGitHub { + inherit rev; + owner = "golang"; + repo = "oauth2"; + sha256 = "0hi54mm63ha7a75avydj6xm0a4dd2njdzllr9y2si1i1wnijqw2i"; + }; + + extraSrcs = [ + { inherit (gcloud-golang) src goPackagePath; } + ]; + + buildInputs = [ net ]; + }; + + protobuf = buildGoPackage rec { rev = "efd7476481382c195beb33acd8ec2f1527167fb4"; name = "goprotobuf-${stdenv.lib.strings.substring 0 7 rev}"; @@ -73,17 +96,19 @@ let self = _self // overrides; _self = with self; { }; text = buildGoPackage rec { - rev = "024681b033be"; - name = "go.text-${rev}"; - goPackagePath = "code.google.com/p/go.text"; - src = fetchhg { + rev = "c93e7c9fff19fb9139b5ab04ce041833add0134e"; + name = "text-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "golang.org/x/text"; + + src = fetchFromGitHub { inherit rev; - url = "https://${goPackagePath}"; - sha256 = "19px5pw5mvwjb7ymivfkkkr6cyl2npv834jxlr6y0x5ca1djhsci"; + owner = "golang"; + repo = "text"; + sha256 = "1yvmllriqjm0k97vnxycz9q0likvh18a68xbyg1k6ddkvn9sy03y"; }; - doCheck = false; }; + tools = buildGoPackage rec { rev = "140fcaadc5860b1a014ec69fdeec807fe3b787e8"; name = "go.tools-${stdenv.lib.strings.substring 0 7 rev}"; @@ -98,6 +123,19 @@ let self = _self // overrides; _self = with self; { ## THIRD PARTY + ansicolor = buildGoPackage rec { + rev = "8368d3b31cf6f2c2464c7a91675342c9a0ac6658"; + name = "ansicolor-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/shiena/ansicolor"; + + src = fetchFromGitHub { + inherit rev; + owner = "shiena"; + repo = "ansicolor"; + sha256 = "1fyn06vxm44s0ph8pr7r9gkab1f4x851zlyy3p6jbbwsa6an8g9w"; + }; + }; + asn1-ber = buildGoPackage rec { rev = "ec51d5ed21377b4023ca7b1e70ae4cb296ee6047"; name = "asn1-ber-${stdenv.lib.strings.substring 0 7 rev}"; @@ -110,6 +148,21 @@ let self = _self // overrides; _self = with self; { }; }; + aws-sdk-go = buildGoPackage rec { + rev = "5e038f730cbb99b144eeb1dbf92cd06c2d00b503"; + name = "aws-sdk-go-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/awslabs/aws-sdk-go"; + + src = fetchFromGitHub { + inherit rev; + owner = "awslabs"; + repo = "aws-sdk-go"; + sha256 = "1725y3aic53l8ms0583gdn0s915y1b783hs339qll0mmx7v09in5"; + }; + + buildInputs = [ go-ini gucumber testify ]; + }; + binarydist = buildGoPackage rec { rev = "9955b0ab8708602d411341e55fffd7e0700f86bd"; name = "binarydist-${stdenv.lib.strings.substring 0 7 rev}"; @@ -272,6 +325,21 @@ let self = _self // overrides; _self = with self; { }; }; + gcloud-golang = buildGoPackage rec { + rev = "de1c38e5af44da22abe7c3b14a1edcf6264dae55"; + name = "gcloud-golang-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "google.golang.org/cloud"; + + src = fetchFromGitHub { + inherit rev; + owner = "GoogleCloudPlatform"; + repo = "gcloud-golang"; + sha256 = "0n6sh1zblixwyc9ykbsknmadsx2dmn3b5rsyrs30id1f96pgh4l0"; + }; + + buildInputs = [ net oauth2 protobuf google-api-go-client grpc ]; + }; + ginkgo = buildGoPackage rec { rev = "5ed93e443a4b7dfe9f5e95ca87e6082e503021d2"; name = "ginkgo-${stdenv.lib.strings.substring 0 7 rev}"; @@ -405,7 +473,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1496h0xc7vjklr4m4j7vy1764k1qk2grpcwz5zssgplpfs9s9wfz"; }; - buildInputs = [ x.net ]; + buildInputs = [ net ]; }; gosnappy = buildGoPackage rec { @@ -529,7 +597,7 @@ let self = _self // overrides; _self = with self; { sha256 = "123ck9nf5ggdrndg2gs1bhr4ysh4z0izph9sp7ciisxpgjkaycxq"; }; - buildInputs = [ go-querystring x.oauth2 ]; + buildInputs = [ go-querystring oauth2 ]; }; go-homedir = buildGoPackage rec { @@ -581,6 +649,22 @@ let self = _self // overrides; _self = with self; { buildInputs = [ go-systemd osext ]; }; + gucumber = buildGoPackage rec { + rev = "fba94dc5a9077fa81eb85199fa9dfdaa8af82ab5"; + name = "gucumber-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/lsegal/gucumber"; + + src = fetchFromGitHub { + inherit rev; + owner = "lsegal"; + repo = "gucumber"; + sha256 = "028wczwpicwmggk3221pz8ffzh30l47x8217gvdzcqq6h9iiaczr"; + }; + + buildInputs = [ testify ]; + propagatedBuildInputs = [ ansicolor ]; + }; + rcrowley.go-metrics = buildGoPackage rec { rev = "f770e6f5e91a8770cecee02d5d3f7c00b023b4df"; name = "rcrowley.go-metrics-${stdenv.lib.strings.substring 0 7 rev}"; @@ -789,7 +873,7 @@ let self = _self // overrides; _self = with self; { sha256 = "07dfpwwk68rrhxmqj69gq2ncsf3kfmn0zhlwscda0gc5gb57n5x1"; }; - propagatedBuildInputs = [ http2 glog x.net protobuf x.oauth2 ]; + propagatedBuildInputs = [ http2 glog net protobuf oauth2 ]; }; hologram = buildGoPackage rec { @@ -1009,21 +1093,6 @@ let self = _self // overrides; _self = with self; { }; }; - x.net = buildGoPackage rec { - rev = "e0403b4e005737430c05a57aac078479844f919c"; - name = "net-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "golang.org/x/net"; - - src = fetchFromGitHub { - inherit rev; - owner = "golang"; - repo = "net"; - sha256 = "1g7cjzw4g4301a3yqpbk8n1d4s97sfby2aysl275x04g0zh8jxqp"; - }; - - buildInputs = [ x.text ]; - }; - ntp = buildGoPackage rec { rev = "0a5264e2563429030eb922f258229ae3fee5b5dc"; name = "ntp-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1036,23 +1105,17 @@ let self = _self // overrides; _self = with self; { }; }; - x.oauth2 = buildGoPackage rec { - rev = "f98d0160877ab4712b906626425ed8b0b320907c"; - name = "oauth2-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "golang.org/x/oauth2"; + objx = buildGoPackage rec { + rev = "cbeaeb16a013161a98496fad62933b1d21786672"; + name = "objx-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/stretchr/objx"; src = fetchFromGitHub { inherit rev; - owner = "golang"; - repo = "oauth2"; - sha256 = "0hi54mm63ha7a75avydj6xm0a4dd2njdzllr9y2si1i1wnijqw2i"; + owner = "stretchr"; + repo = "objx"; + sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1"; }; - - extraSrcs = [ - { inherit (gcloud-golang) src goPackagePath; } - ]; - - buildInputs = [ x.net ]; }; oglematchers = buildGoPackage rec { @@ -1316,6 +1379,21 @@ let self = _self // overrides; _self = with self; { subPackages = [ "./" ]; # prevent building _demos }; + testify = buildGoPackage rec { + rev = "dab07ac62d4905d3e48d17dc549c684ac3b7c15a"; + name = "testify-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/stretchr/testify"; + + src = fetchFromGitHub { + inherit rev; + owner = "stretchr"; + repo = "testify"; + sha256 = "0r24v9ly3g68ywqyri14fn8smvkw8zvrzbivxw3ndd6jxcvi84b7"; + }; + + buildInputs = [ objx ]; + }; + kr.text = buildGoPackage rec { rev = "6807e777504f54ad073ecef66747de158294b639"; name = "kr.text-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1329,19 +1407,6 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ pty ]; }; - x.text = buildGoPackage rec { - rev = "c93e7c9fff19fb9139b5ab04ce041833add0134e"; - name = "text-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "golang.org/x/text"; - - src = fetchFromGitHub { - inherit rev; - owner = "golang"; - repo = "text"; - sha256 = "1yvmllriqjm0k97vnxycz9q0likvh18a68xbyg1k6ddkvn9sy03y"; - }; - }; - toml = buildGoPackage rec { rev = "f87ce853111478914f0bcffa34d43a93643e6eda"; name = "toml-${stdenv.lib.strings.substring 0 7 rev}"; From 01d7d24dbb2df5e70c460dc7e5c59f30979cd82a Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 14 May 2015 23:26:16 -0400 Subject: [PATCH 162/615] libdvdnav: 4.2.1 -> 5.0.3 Keeping the old version around for now in order to support mplayer. --- pkgs/applications/video/vlc/default.nix | 1 + .../development/libraries/libdvdnav/4.2.1.nix | 31 +++++++++++++++++++ .../libraries/libdvdnav/default.nix | 20 ++++-------- .../libraries/libdvdread/4.9.9.nix | 25 +++++++++++++++ .../libraries/libdvdread/default.nix | 11 ++++--- pkgs/top-level/all-packages.nix | 5 +++ 6 files changed, 74 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/libraries/libdvdnav/4.2.1.nix create mode 100644 pkgs/development/libraries/libdvdread/4.9.9.nix diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 6a1e9552d3c6..a404ba0d1a8a 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { "--enable-dc1394" "--enable-ncurses" "--enable-vdpau" + "--enable-dvdnav" ] ++ optional onlyLibVLC "--disable-vlc"; diff --git a/pkgs/development/libraries/libdvdnav/4.2.1.nix b/pkgs/development/libraries/libdvdnav/4.2.1.nix new file mode 100644 index 000000000000..9b4e912772b5 --- /dev/null +++ b/pkgs/development/libraries/libdvdnav/4.2.1.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, pkgconfig, libdvdread}: + +stdenv.mkDerivation { + name = "libdvdnav-4.2.1"; + + src = fetchurl { + url = http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.1.tar.xz; + sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [libdvdread]; + + configureScript = "./configure2"; # wtf? + + preConfigure = '' + mkdir -p $out + ''; + + # From Handbrake + patches = [ ./A08-dvdnav-dup.patch ./P00-mingw-no-examples.patch ]; + + meta = { + homepage = http://dvdnav.mplayerhq.hu/; + description = "A library that implements DVD navigation features such as DVD menus"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.wmertens ]; + }; + + passthru = { inherit libdvdread; }; +} diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index 9b4e912772b5..fe625aa69e12 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -1,25 +1,17 @@ {stdenv, fetchurl, pkgconfig, libdvdread}: -stdenv.mkDerivation { - name = "libdvdnav-4.2.1"; - +stdenv.mkDerivation rec { + name = "libdvdnav-${version}"; + version = "5.0.3"; + src = fetchurl { - url = http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.1.tar.xz; - sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372"; + url = "http://download.videolan.org/pub/videolan/libdvdnav/${version}/libdvdnav-${version}.tar.bz2"; + sha256 = "5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [libdvdread]; - configureScript = "./configure2"; # wtf? - - preConfigure = '' - mkdir -p $out - ''; - - # From Handbrake - patches = [ ./A08-dvdnav-dup.patch ./P00-mingw-no-examples.patch ]; - meta = { homepage = http://dvdnav.mplayerhq.hu/; description = "A library that implements DVD navigation features such as DVD menus"; diff --git a/pkgs/development/libraries/libdvdread/4.9.9.nix b/pkgs/development/libraries/libdvdread/4.9.9.nix new file mode 100644 index 000000000000..eb5a48a99f12 --- /dev/null +++ b/pkgs/development/libraries/libdvdread/4.9.9.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl, libdvdcss}: + +stdenv.mkDerivation { + name = "libdvdread-4.9.9"; + + src = fetchurl { + url = http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz; + sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a"; + }; + + buildInputs = [libdvdcss]; + + NIX_LDFLAGS = "-ldvdcss"; + + postInstall = '' + ln -s dvdread $out/include/libdvdread + ''; + + meta = { + homepage = http://dvdnav.mplayerhq.hu/; + description = "A library for reading DVDs"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.wmertens ]; + }; +} diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index eb5a48a99f12..311bc6dc4058 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl, libdvdcss}: -stdenv.mkDerivation { - name = "libdvdread-4.9.9"; - +stdenv.mkDerivation rec { + name = "libdvdread-${version}"; + version = "5.0.2"; + src = fetchurl { - url = http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz; - sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a"; + url = "http://download.videolan.org/pub/videolan/libdvdread/${version}/libdvdread-${version}.tar.bz2"; + sha256 = "82cbe693f2a3971671e7428790b5498392db32185b8dc8622f7b9cd307d3cfbf"; }; buildInputs = [libdvdcss]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9704b4ce9458..713c725f5488 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6535,8 +6535,12 @@ let libdvdcss = callPackage ../development/libraries/libdvdcss { }; libdvdnav = callPackage ../development/libraries/libdvdnav { }; + libdvdnav_4_2_1 = callPackage ../development/libraries/libdvdnav/4.2.1.nix { + libdvdread = libdvdread_4_9_9; + }; libdvdread = callPackage ../development/libraries/libdvdread { }; + libdvdread_4_9_9 = callPackage ../development/libraries/libdvdread/4.9.9.nix { }; libdwarf = callPackage ../development/libraries/libdwarf { }; @@ -11623,6 +11627,7 @@ let mplayer = callPackage ../applications/video/mplayer ({ pulseSupport = config.pulseaudio or false; + libdvdnav = libdvdnav_4_2_1; } // (config.mplayer or {})); MPlayerPlugin = browser: From be03eefc9c55b723310d7b2970b8f62ca70344a1 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Thu, 14 May 2015 21:51:07 -0700 Subject: [PATCH 163/615] gnutls: only demand trousers on linux --- pkgs/development/libraries/gnutls/generic.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 930713f59873..6f2361f1658a 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -23,7 +23,9 @@ stdenv.mkDerivation rec { # for the actual fix. enableParallelBuilding = !guileBindings; - buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp trousers unbound ] + buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp ] + ++ stdenv.lib.optional stdenv.isLinux trousers + ++ [ unbound ] ++ stdenv.lib.optional guileBindings guile; nativeBuildInputs = [ perl pkgconfig autoreconfHook ]; @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); # Fixup broken libtool and pkgconfig files - preFixup = '' + preFixup = stdenv.lib.optionalString (!stdenv.isDarwin) '' sed -e 's,-ltspi,-L${trousers}/lib -ltspi,' \ -e 's,-lz,-L${zlib}/lib -lz,' \ -e 's,-lgmp,-L${gmp}/lib -lgmp,' \ From 229c442e2cf004c239ef84936d37134f60ef4ea0 Mon Sep 17 00:00:00 2001 From: Henry Till Date: Fri, 15 May 2015 01:40:10 -0400 Subject: [PATCH 164/615] libpsl: add darwin to meta.platforms --- pkgs/development/libraries/libpsl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index f1c54d5cf5fd..d642309ed746 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = http://rockdaboot.github.io/libpsl/; license = with licenses; mit; - platforms = with platforms; linux; + platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ nckx ]; }; From 9579fecd28c795cd31b5c998a0d994a2e316a538 Mon Sep 17 00:00:00 2001 From: Michael Phillips Date: Wed, 13 May 2015 21:09:52 -0500 Subject: [PATCH 165/615] pyblosxom: new package --- pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1803625f6f4a..36feab0056e6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9073,6 +9073,28 @@ let }; }; + pyblosxom = buildPythonPackage rec { + name = "pyblosxom-${version}"; + disabled = isPy3k; + version = "1.5.3"; + # FAIL:test_generate_entry and test_time + # both tests fail due to time issue that doesn't seem to matter in practice + doCheck = false; + src = pkgs.fetchurl { + url = "https://github.com/pyblosxom/pyblosxom/archive/v${version}.tar.gz"; + sha256 = "0de9a7418f4e6d1c45acecf1e77f61c8f96f036ce034493ac67124626fd0d885"; + }; + + propagatedBuildInputs = with self; [ pygments markdown ]; + + meta = with stdenv.lib; { + homepage = "http://pyblosxom.github.io"; + description = "File-based blogging engine"; + license = licenses.mit; + }; + }; + + pycapnp = buildPythonPackage rec { name = "pycapnp-0.5.1"; disabled = isPyPy || isPy3k; From 871b472c66174fdc653b087804a11ddb224eae32 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 15 May 2015 10:04:08 +0200 Subject: [PATCH 166/615] update zdoom to v2.7.1 --- pkgs/games/zdoom/default.nix | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix index 59a88191d2e4..0bc63855299e 100644 --- a/pkgs/games/zdoom/default.nix +++ b/pkgs/games/zdoom/default.nix @@ -1,24 +1,25 @@ -{stdenv, fetchurl, cmake, SDL, nasm, p7zip, zlib, flac, fmod, libjpeg}: +{ stdenv, fetchFromGitHub, cmake, fmod, mesa, SDL }: stdenv.mkDerivation { - name = "zdoom-2.6.1"; - src = fetchurl { - url = http://zdoom.org/files/zdoom/2.6/zdoom-2.6.1-src.7z; - sha256 = "1ha7hygwf243vkgw0dfh4dxphf5vffb3kkci1p1p75a7r1g1bir8"; + name = "zdoom-2.7.1"; + src = fetchFromGitHub { + #url = "https://github.com/rheit/zdoom"; + owner = "rheit"; + repo = "zdoom"; + rev = "2.7.1"; + sha256 = "00bx4sgl9j1dyih7yysfq4ah6msxw8580g53p99jfym34ky5ppkh"; }; - # XXX: shouldn't inclusion of p7zip handle this? - unpackPhase = '' - mkdir zdoom - cd zdoom - 7z x $src - ''; + buildInputs = [ cmake fmod mesa SDL ]; - buildInputs = [cmake nasm SDL p7zip zlib flac fmod libjpeg]; + cmakeFlags = [ + "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" + "-DSDL_INCLUDE_DIR=${SDL}/include" + ]; - cmakeFlags = [ "-DSDL_INCLUDE_DIR=${SDL}/include/SDL" ]; + NIX_CFLAGS_COMPILE = [ "-I ${SDL}/include/SDL" ]; - preConfigure='' + preConfigure = '' sed s@zdoom.pk3@$out/share/zdoom.pk3@ -i src/version.h ''; @@ -32,6 +33,7 @@ stdenv.mkDerivation { meta = { homepage = http://zdoom.org/; description = "Enhanced port of the official DOOM source code"; + maintainer = [ stdenv.lib.maintainers.lassulus ]; }; } From 72c7c683d10650b1ef9d805a84c6fd33bba35427 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 15 May 2015 10:09:47 +0200 Subject: [PATCH 167/615] calibre: update from 2.27.0 to 2.28.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0f9dbf8d4223..3d0bac560c08 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-2.27.0"; + name = "calibre-2.28.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "13id1r2q6alw4wzb4z0njkyr6lsmzs2fjp3cflqavx3qk25darv5"; + sha256 = "15sb74v0nlj45fhlnw1afll35l90cxw78s15fb2nx3fih7ahv3cf"; }; inherit python; From ede16069331576981903900caabc2e1b0c0113f5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2015 10:59:46 +0200 Subject: [PATCH 168/615] gwenhywfar: build with gnutls33 to avoid linker errors ./.libs/libgwenhywfar.so: undefined reference to `gnutls_protocol_set_priority' --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9704b4ce9458..069e230dd144 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6214,7 +6214,7 @@ let gvfs = callPackage ../development/libraries/gvfs { gconf = gnome.GConf; }; - gwenhywfar = callPackage ../development/libraries/gwenhywfar { }; + gwenhywfar = callPackage ../development/libraries/gwenhywfar { gnutls = gnutls33; }; hamlib = callPackage ../development/libraries/hamlib { }; From 1b8a35b7fa827ccf488c5e52026ca9b9824b9535 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2015 11:01:21 +0200 Subject: [PATCH 169/615] gwenhywfar: update to version 4.11.1 --- pkgs/development/libraries/gwenhywfar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gwenhywfar/default.nix b/pkgs/development/libraries/gwenhywfar/default.nix index b8ad34427291..b6cd2e54768f 100644 --- a/pkgs/development/libraries/gwenhywfar/default.nix +++ b/pkgs/development/libraries/gwenhywfar/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, gnutls, gtk, libgcrypt, pkgconfig, qt4 }: stdenv.mkDerivation rec { - name = "gwenhywfar-4.10.0beta"; + name = "gwenhywfar-4.11.1"; src = fetchurl { - url = "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=73&file=01&dummy=gwenhywfar-4.10.0beta.tar.gz"; + url = "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=78&file=01&dummy=${name}.tar.gz"; name = "${name}.tar.gz"; - sha256 = "1ihg2s263g540hl42y6g9wqcc4am70kv01yivsqfrpa9fnhbxm7f"; + sha256 = "0ay79vc03jsw762nax204g112yg5sak340g31bm4hm93q69aiv2b"; }; propagatedBuildInputs = [ gnutls libgcrypt ]; From f66cd5dbe99b4343df58d26e0a48b87c6f471c22 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2015 11:01:42 +0200 Subject: [PATCH 170/615] aqbanking: update to version 5.5.1 --- pkgs/development/libraries/aqbanking/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index 226f792c45a4..9d4761c3da86 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - name = "aqbanking-5.4.0beta"; + name = "aqbanking-5.5.1"; src = fetchurl { - url = "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=112&file=01&dummy=aqbanking-5.4.0beta.tar.gz"; + url = "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=118&file=01&dummy=${name}.tar.gz"; name = "${name}.tar.gz"; - sha256 = "0yd588sw9grc2c0bfyx8h39mr30pa1zxrcbv31p6pz6szilk2agh"; + sha256 = "1pxd5xv2xls1hyizr1vbknzgb66babhlp72777rcxq46gp91g3r3"; }; buildInputs = [ gmp gwenhywfar libtool libxml2 libxslt xmlsec zlib ]; From 58b865cfc65e7756c148f38d25cb3d6b6f077a4d Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 15 May 2015 11:02:01 +0200 Subject: [PATCH 171/615] go: remove renameImports and use goPackageAliases --- doc/language-support.xml | 31 +++++++++---------- pkgs/applications/networking/pond/default.nix | 5 --- .../go-modules/generic/default.nix | 23 ++++++++++---- pkgs/top-level/go-packages.nix | 4 +++ 4 files changed, 36 insertions(+), 27 deletions(-) diff --git a/doc/language-support.xml b/doc/language-support.xml index 87f500a491ba..5942fe01e2ed 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -662,18 +662,16 @@ standard Go packages. net = buildGoPackage rec { name = "go.net-${rev}"; - goPackagePath = "code.google.com/p/go.net"; + goPackagePath = "golang.org/x/net"; subPackages = [ "ipv4" "ipv6" ]; - rev = "28ff664507e4"; - src = fetchhg { + rev = "e0403b4e005"; + src = fetchFromGitHub { inherit rev; - url = "https://${goPackagePath}"; - sha256 = "1lkz4c9pyz3yz2yz18hiycvlfhgy3jxp68bs7mv7bcfpaj729qav"; + owner = "golang"; + repo = "net"; + sha256 = "1g7cjzw4g4301a3yqpbk8n1d4s97sfby2aysl275x04g0zh8jxqp"; }; - renameImports = [ - "code.google.com/p/go.crypto golang.org/x/crypto" - "code.google.com/p/goprotobuf github.com/golang/protobuf" - ]; + goPackageAliases = [ "code.google.com/p/go.net" ]; propagatedBuildInputs = [ goPackages.text ]; buildFlags = "--tags release"; }; @@ -703,17 +701,18 @@ the following arguments are of special significance to the function: - + - renameImports is a list of import paths to be renamed before - building the package. The path to be renamed can be a regular expression. + goPackageAliases is a list of alternative import paths + that are valid for this library. + Packages that depend on this library will automatically rename + import paths that match any of the aliases to goPackagePath. In this example imports will be renamed from - code.google.com/p/go.crypto to - golang.org/x/crypto and from - code.google.com/p/goprotobuf to - github.com/golang/protobuf. + code.google.com/p/go.net to + golang.org/x/net in every package that depend on the + go.net library. diff --git a/pkgs/applications/networking/pond/default.nix b/pkgs/applications/networking/pond/default.nix index 4ac3a0448dea..21d99013a1a0 100644 --- a/pkgs/applications/networking/pond/default.nix +++ b/pkgs/applications/networking/pond/default.nix @@ -14,11 +14,6 @@ buildGoPackage rec { subPackages = [ "client" ]; - renameImports = [ - "code.google.com/p/go.crypto golang.org/x/crypto" - "code.google.com/p/goprotobuf github.com/golang/protobuf" - ]; - buildInputs = [ trousers net crypto protobuf ed25519 govers ]; buildFlags = "--tags nogui"; diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 6d52d0cc92f8..271e0ed66336 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -5,18 +5,25 @@ # Go import path of the package , goPackagePath +# Go package aliases +, goPackageAliases ? [ ] + # Extra sources to include in the gopath , extraSrcs ? [ ] +, dontRenameImports ? false + , meta ? {}, ... } @ args': let args = lib.filterAttrs (name: _: name != "extraSrcs") args'; in -go.stdenv.mkDerivation ( args // { +go.stdenv.mkDerivation ( + (builtins.removeAttrs args [ "goPackageAliases" ]) // { + name = "go${go.meta.branch}-${name}"; - buildInputs = [ go ] ++ buildInputs ++ (lib.optional (args ? renameImports) govers) ; + buildInputs = [ go ] ++ buildInputs ++ (lib.optional (!dontRenameImports) govers) ; configurePhase = args.configurePhase or '' runHook preConfigure @@ -40,10 +47,12 @@ go.stdenv.mkDerivation ( args // { runHook postConfigure ''; - renameImports = lib.optionalString (args ? renameImports) - (lib.concatMapStringsSep "\n" - (cmdargs: "govers -m ${cmdargs}") - args.renameImports); + renameImports = args.renameImports or ( + let + inputsWithAliases = lib.filter (x: x ? goPackageAliases) buildInputs; + rename = to: from: "echo Renaming '${from}' to '${to}'; govers -m ${from} ${to}"; + renames = p: lib.concatMapStringsSep "\n" (rename p.goPackagePath) p.goPackageAliases; + in lib.concatMapStringsSep "\n" renames inputsWithAliases); buildPhase = args.buildPhase or '' runHook preBuild @@ -107,6 +116,8 @@ go.stdenv.mkDerivation ( args // { runHook postInstall ''; + passthru = lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; }; + meta = meta // { # add an extra maintainer to every package maintainers = (meta.maintainers or []) ++ diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 3373ebdef2f8..035c152b6b18 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -13,6 +13,7 @@ let self = _self // overrides; _self = with self; { rev = "4d48e5fa3d62b5e6e71260571bf76c767198ca02"; name = "go-crypto-${rev}"; goPackagePath = "golang.org/x/crypto"; + goPackageAliases = [ "code.google.com/p/go.crypto" ]; src = fetchFromGitHub { inherit rev; @@ -49,6 +50,7 @@ let self = _self // overrides; _self = with self; { rev = "e0403b4e005737430c05a57aac078479844f919c"; name = "net-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "golang.org/x/net"; + goPackageAliases = [ "code.google.com/p/go.net" ]; src = fetchFromGitHub { inherit rev; @@ -84,6 +86,7 @@ let self = _self // overrides; _self = with self; { rev = "efd7476481382c195beb33acd8ec2f1527167fb4"; name = "goprotobuf-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/golang/protobuf"; + goPackageAliases = [ "code.google.com/p/goprotobuf" ]; src = fetchFromGitHub { inherit rev; @@ -409,6 +412,7 @@ let self = _self // overrides; _self = with self; { rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9"; name = "govers-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/rogpeppe/govers"; + dontRenameImports = true; src = fetchFromGitHub { inherit rev; owner = "rogpeppe"; From 07535a01aa9e61d857edc2569d59d9db96d387ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 May 2015 20:44:53 +0200 Subject: [PATCH 172/615] haskell-gnutls: revert to GNUTLS 3.3 --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c444b38d7a49..aba1a3bf161a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -801,4 +801,7 @@ self: super: { # https://github.com/bos/aeson/issues/253 aeson = dontCheck super.aeson; + # GNUTLS 3.4 causes linker errors: http://hydra.cryp.to/build/839563/nixlog/2/raw + gnutls = super.gnutls.override { gnutls = pkgs.gnutls33; }; + } From 274d17defabddc66cf9f1b35a9c6f86197218044 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 May 2015 20:23:37 +0200 Subject: [PATCH 173/615] darcs: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index aba1a3bf161a..7adeb92ab156 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -155,7 +155,7 @@ self: super: { # jailbreak doesn't get the job done because the Cabal file uses conditionals a lot. darcs = overrideCabal super.darcs (drv: { doCheck = false; # The test suite won't even start. - patchPhase = "sed -i -e 's|random.*==.*|random|' -e 's|text.*>=.*,|text,|' -e s'|terminfo == .*|terminfo|' darcs.cabal"; + patchPhase = "sed -i -e 's|attoparsec.*,|attoparsec,|' darcs.cabal"; }); # Needs the latest version of QuickCheck to compile. From 6a0d21eb86105ac8e631621e9425eabbab3c0a1d Mon Sep 17 00:00:00 2001 From: Jussi Maki Date: Wed, 13 May 2015 08:31:32 +0000 Subject: [PATCH 174/615] VMWare guest support and open-vm-tools package --- nixos/modules/module-list.nix | 1 + nixos/modules/virtualisation/vmware-guest.nix | 47 +++++++++++++++++++ .../virtualization/open-vm-tools/default.nix | 43 +++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 4 files changed, 96 insertions(+) create mode 100644 nixos/modules/virtualisation/vmware-guest.nix create mode 100644 pkgs/applications/virtualization/open-vm-tools/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bf70715cea4c..c1677ff05731 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -460,5 +460,6 @@ ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix ./virtualisation/virtualbox-guest.nix + ./virtualisation/vmware-guest.nix ./virtualisation/xen-dom0.nix ] diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix new file mode 100644 index 000000000000..3f19f6a28b2b --- /dev/null +++ b/nixos/modules/virtualisation/vmware-guest.nix @@ -0,0 +1,47 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.vmwareGuest; + open-vm-tools = pkgs.open-vm-tools; +in +{ + options = { + services.vmwareGuest.enable = mkEnableOption "Enable VMWare Guest Support"; + }; + + config = mkIf cfg.enable { + assertions = [ { + assertion = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64; + message = "VMWare guest is not currently supported on ${pkgs.stdenv.system}"; + } ]; + + environment.systemPackages = [ open-vm-tools ]; + + systemd.services.vmware = + { description = "VMWare Guest Service"; + wantedBy = [ "multi-user.target" ]; + serviceConfig.ExecStart = "${open-vm-tools}/bin/vmtoolsd"; + }; + + services.xserver = { + videoDrivers = mkOverride 50 [ "vmware" ]; + + config = '' + Section "InputDevice" + Identifier "VMMouse" + Driver "vmmouse" + EndSection + ''; + + serverLayoutSection = '' + InputDevice "VMMouse" + ''; + + displayManager.sessionCommands = '' + ${open-vm-tools}/bin/vmware-user-suid-wrapper + ''; + }; + }; +} diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix new file mode 100644 index 000000000000..4f32ec55a0e1 --- /dev/null +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -0,0 +1,43 @@ +{ stdenv, lib, fetchurl, makeWrapper, autoconf, automake, + libmspack, openssl, pam, xercesc, icu, libdnet, procps, + x11, libXinerama, libXi, libXrender, libXrandr, libXtst, + pkgconfig, glib, gtk, gtkmm }: + +let + majorVersion = "9.10"; + minorVersion = "0"; + patchSet = "2476743"; + version = "${majorVersion}.${minorVersion}-${patchSet}"; + +in stdenv.mkDerivation { + name = "open-vm-tools-${version}"; + src = fetchurl { + url = "mirror://sourceforge/project/open-vm-tools/open-vm-tools/stable-${majorVersion}.x/open-vm-tools-${version}.tar.gz"; + sha256 = "15lwayrz9bpx4z12fj616hsn25m997y72licwwz7kms4sx9ssip1"; + }; + + buildInputs = + [ autoconf automake makeWrapper libmspack openssl pam xercesc icu libdnet procps + pkgconfig glib gtk gtkmm x11 libXinerama libXi libXrender libXrandr libXtst ]; + + patchPhase = '' + sed -i s,-Werror,,g configure.ac + sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am + sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am + ''; + + preConfigure = "autoreconf"; + configureFlags = "--without-kernel-modules --without-xmlsecurity"; + + meta = with stdenv.lib; { + homepage = "https://github.com/vmware/open-vm-tools"; + description = "Set of tools for VMWare guests to improve host-guest interaction"; + longDescription = '' + A set of services and modules that enable several features in VMware products for + better management of, and seamless user interactions with, guests. + ''; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ joamaki ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00737083a7b3..2c5433784d1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9547,6 +9547,11 @@ let numactl = callPackage ../os-specific/linux/numactl { }; + open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { + inherit (xlibs) libXinerama libXi libXrender libXrandr libXtst; + inherit (gnome) gtk gtkmm; + }; + gocode = callPackage ../development/tools/gocode { }; gotags = callPackage ../development/tools/gotags { }; From c80638905d03e53a4f51db30510b7c1a9b7773e2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 13 May 2015 12:32:33 -0500 Subject: [PATCH 175/615] Upgrade to kde-frameworks-5.10 --- .../default.nix | 0 .../dependencies.nix | 10 +- .../dependencies.sh | 0 .../0001-extra-cmake-modules-paths.patch | 0 .../kauth/kauth-policy-install.patch | 0 ...utils-pluginselector-follow-symlinks.patch | 0 ...igwidgets-helpclient-follow-symlinks.patch | 0 .../kdoctools-no-find-docbook-xml.patch | 0 .../kinit/kinit-libpath.patch | 0 .../kpackage/0001-allow-external-paths.patch | 0 ...service-kbuildsycoca-follow-symlinks.patch | 0 ...ce-kbuildsycoca-no-canonicalize-path.patch | 0 .../0001-no-qcoreapplication.patch | 0 .../kde-frameworks-5.10/manifest.nix | 1174 +++++++++++++++++ .../manifest.sh | 7 +- .../plasma-framework-external-paths.patch | 0 .../renames.nix | 0 .../setup-hook.sh | 0 .../libraries/kde-frameworks-5.9/manifest.nix | 589 --------- pkgs/top-level/all-packages.nix | 10 +- 20 files changed, 1189 insertions(+), 601 deletions(-) rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/default.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/dependencies.nix (97%) rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/dependencies.sh (100%) rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/extra-cmake-modules/0001-extra-cmake-modules-paths.patch (100%) rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/kauth/kauth-policy-install.patch (100%) rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/kcmutils/kcmutils-pluginselector-follow-symlinks.patch (100%) rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch (100%) rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/kdoctools/kdoctools-no-find-docbook-xml.patch (100%) rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/kinit/kinit-libpath.patch (100%) rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/kpackage/0001-allow-external-paths.patch (100%) rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/kservice/kservice-kbuildsycoca-follow-symlinks.patch (100%) rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch (100%) rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/ktexteditor/0001-no-qcoreapplication.patch (100%) create mode 100644 pkgs/development/libraries/kde-frameworks-5.10/manifest.nix rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/manifest.sh (57%) rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/plasma-framework/plasma-framework-external-paths.patch (100%) rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/renames.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.9 => kde-frameworks-5.10}/setup-hook.sh (100%) delete mode 100644 pkgs/development/libraries/kde-frameworks-5.9/manifest.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.9/default.nix b/pkgs/development/libraries/kde-frameworks-5.10/default.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/default.nix rename to pkgs/development/libraries/kde-frameworks-5.10/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.9/dependencies.nix b/pkgs/development/libraries/kde-frameworks-5.10/dependencies.nix similarity index 97% rename from pkgs/development/libraries/kde-frameworks-5.9/dependencies.nix rename to pkgs/development/libraries/kde-frameworks-5.10/dependencies.nix index 71dbc50a806b..8e0b434d5bd6 100644 --- a/pkgs/development/libraries/kde-frameworks-5.9/dependencies.nix +++ b/pkgs/development/libraries/kde-frameworks-5.10/dependencies.nix @@ -18,7 +18,7 @@ }; frameworkintegration = { - buildInputs = [ "ECM" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "OxygenFont" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ]; + buildInputs = [ "ECM" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "OxygenFont" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Qml" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" ]; propagatedNativeBuildInputs = [ ]; @@ -322,9 +322,9 @@ }; knewstuff = { - buildInputs = [ "ECM" "KF5Archive" "KF5Attica" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5Xml" ]; + buildInputs = [ "ECM" "KF5Archive" "KF5Attica" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5Xml" ]; nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Attica" "KF5XmlGui" "Qt5Widgets" ]; + propagatedBuildInputs = [ "KF5Attica" "KF5Service" "KF5XmlGui" "Qt5Widgets" ]; propagatedNativeBuildInputs = [ ]; propagatedUserEnvPkgs = [ ]; }; @@ -338,7 +338,7 @@ }; knotifyconfig = { - buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5OPTIONAL_COMPONENTS" "Qt5QUIET" "Qt5Test" "Qt5TextToSpeech" "Qt5Widgets" ]; + buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5OPTIONAL_COMPONENTS" "Qt5QUIET" "Qt5Test" "Qt5TextToSpeech" "Qt5Widgets" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ "Qt5Widgets" ]; propagatedNativeBuildInputs = [ ]; @@ -482,7 +482,7 @@ }; networkmanager-qt = { - buildInputs = [ "ECM" "KF5NetworkManagerQt" "NetworkManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" ]; + buildInputs = [ "ECM" "NetworkManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ "Qt5Core" ]; propagatedNativeBuildInputs = [ ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.9/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/dependencies.sh rename to pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.9/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.10/extra-cmake-modules/0001-extra-cmake-modules-paths.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/extra-cmake-modules/0001-extra-cmake-modules-paths.patch rename to pkgs/development/libraries/kde-frameworks-5.10/extra-cmake-modules/0001-extra-cmake-modules-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.10/kauth/kauth-policy-install.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/kauth/kauth-policy-install.patch rename to pkgs/development/libraries/kde-frameworks-5.10/kauth/kauth-policy-install.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.10/kcmutils/kcmutils-pluginselector-follow-symlinks.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/kcmutils/kcmutils-pluginselector-follow-symlinks.patch rename to pkgs/development/libraries/kde-frameworks-5.10/kcmutils/kcmutils-pluginselector-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.10/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch rename to pkgs/development/libraries/kde-frameworks-5.10/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.10/kdoctools/kdoctools-no-find-docbook-xml.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/kdoctools/kdoctools-no-find-docbook-xml.patch rename to pkgs/development/libraries/kde-frameworks-5.10/kdoctools/kdoctools-no-find-docbook-xml.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.10/kinit/kinit-libpath.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/kinit/kinit-libpath.patch rename to pkgs/development/libraries/kde-frameworks-5.10/kinit/kinit-libpath.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.10/kpackage/0001-allow-external-paths.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/kpackage/0001-allow-external-paths.patch rename to pkgs/development/libraries/kde-frameworks-5.10/kpackage/0001-allow-external-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-follow-symlinks.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/kservice/kservice-kbuildsycoca-follow-symlinks.patch rename to pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.9/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch rename to pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.9/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.10/ktexteditor/0001-no-qcoreapplication.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/ktexteditor/0001-no-qcoreapplication.patch rename to pkgs/development/libraries/kde-frameworks-5.10/ktexteditor/0001-no-qcoreapplication.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.10/manifest.nix b/pkgs/development/libraries/kde-frameworks-5.10/manifest.nix new file mode 100644 index 000000000000..83d10f9def6d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.10/manifest.nix @@ -0,0 +1,1174 @@ +# This file is generated automatically. DO NOT EDIT! +{ stdenv, fetchurl, mirror }: +[ + { + name = stdenv.lib.nameFromURL "kemoticons-5.9.0.tar.xz" ".tar"; + store = "/nix/store/cl9lk2n5vyfm0rdpxh3qz90mp5g9im5p-kemoticons-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kemoticons-5.9.0.tar.xz"; + sha256 = "1zr8izm75q18saylqm6p8c4lfickpwpa5s1qz1avz66dprp822jh"; + name = "kemoticons-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kpeople-5.9.0.tar.xz" ".tar"; + store = "/nix/store/vadyk6vf9rpzb77ighjzqd6gh1sjlllk-kpeople-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kpeople-5.9.0.tar.xz"; + sha256 = "1qfr5k80kymfr2d955vq3nrbqg4mw22d5k6pgnq06mszvp2fg6k4"; + name = "kpeople-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kconfigwidgets-5.9.0.tar.xz" ".tar"; + store = "/nix/store/j2b1174ycr31ij9knwqhv429yh1hm7ck-kconfigwidgets-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kconfigwidgets-5.9.0.tar.xz"; + sha256 = "081wq0blpl3gpzvljf3pfa8rlbwmrnpihckn6vbpzaaiy5mcwjkr"; + name = "kconfigwidgets-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ki18n-5.9.0.tar.xz" ".tar"; + store = "/nix/store/iqwywmpdn4kmxkvkiq0jcmhmss1z13ih-ki18n-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/ki18n-5.9.0.tar.xz"; + sha256 = "0ply8mb2yg3wx6qqvg8zyj3icgpwk3qw6v56qxjq6zzscf9gl7jc"; + name = "ki18n-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kplotting-5.9.0.tar.xz" ".tar"; + store = "/nix/store/y200vzw2amcq3xhb8yd76aysh6d2f0fk-kplotting-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kplotting-5.9.0.tar.xz"; + sha256 = "1hvjy9bm1jk8msz6fzb32phrvl91fh838mswkfib0b770jqfrvvy"; + name = "kplotting-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kservice-5.9.0.tar.xz" ".tar"; + store = "/nix/store/jcbm2l3hqv69hplj3vglc8837ax09fx7-kservice-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kservice-5.9.0.tar.xz"; + sha256 = "1s854v2dlq8wz2ka068ycwaw1a1lhhb7jy576c4gw96ak1bcplj9"; + name = "kservice-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbookmarks-5.9.0.tar.xz" ".tar"; + store = "/nix/store/9wkwlci1l6xcf9zgwnxnpsz2fqwx3lw0-kbookmarks-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kbookmarks-5.9.0.tar.xz"; + sha256 = "0arh7bzq2nanjy6bdd9zi8jcsnf6anhpam167i16plyq7jdpxd06"; + name = "kbookmarks-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kded-5.9.0.tar.xz" ".tar"; + store = "/nix/store/88mbi3xwlccpbgg879df0w5kiwb6cx68-kded-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kded-5.9.0.tar.xz"; + sha256 = "1kq75p9dbmckgazzxd499qsqyyzr88n0jxy41c10ay2paqfjrrrp"; + name = "kded-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knewstuff-5.9.0.tar.xz" ".tar"; + store = "/nix/store/qxlar4y9n5m6c3n6pqh6hjar8kv4h6vp-knewstuff-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/knewstuff-5.9.0.tar.xz"; + sha256 = "1f9qgj87wd5w8gg2cglgzvxw5imcmw2pxv08p8c8as8xnh1b8iq0"; + name = "knewstuff-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knotifyconfig-5.9.0.tar.xz" ".tar"; + store = "/nix/store/x5v2g50d4x92rsnyfywc6600y1bzr4lp-knotifyconfig-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/knotifyconfig-5.9.0.tar.xz"; + sha256 = "0hdxwcqhi56yaafbl0mc34vc6nbxj3ddm4jl15ykgs1d83pcprp7"; + name = "knotifyconfig-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "threadweaver-5.9.0.tar.xz" ".tar"; + store = "/nix/store/cpbmzpqihxbb2a60asc5spc0fc2xri7d-threadweaver-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/threadweaver-5.9.0.tar.xz"; + sha256 = "1wsnb4ghnibpmypr49nrhpbq9l0cxrr5ak19vhj223ifh09kiqfq"; + name = "threadweaver-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcmutils-5.9.0.tar.xz" ".tar"; + store = "/nix/store/icr4xva0xdqidpdb42ijxr7ra8xcx2ag-kcmutils-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kcmutils-5.9.0.tar.xz"; + sha256 = "0mzj1fddcvcnxqyz2z6acbi724dz43x957nfs2ifn82ahjcpp05m"; + name = "kcmutils-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwindowsystem-5.9.0.tar.xz" ".tar"; + store = "/nix/store/q5ny2mnrcz46jdr7vsjmgf24xrscly6d-kwindowsystem-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kwindowsystem-5.9.0.tar.xz"; + sha256 = "09c752jv1z1x2g3japivmj0ycpsx7fjkwswjibnm3av3j2k7if7z"; + name = "kwindowsystem-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "extra-cmake-modules-5.9.0.tar.xz" ".tar"; + store = "/nix/store/jd48z703zmnfhc8a0bz33i9p4ssl6gix-extra-cmake-modules-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/extra-cmake-modules-5.9.0.tar.xz"; + sha256 = "1iqbcj4zf4pwad5pc2pwnyjs6zswwwp1lsp5a8g9999adgqz54f9"; + name = "extra-cmake-modules-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwallet-5.9.0.tar.xz" ".tar"; + store = "/nix/store/h53bsfzw71z8d6qx2g0j9v3g5q6zrn51-kwallet-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kwallet-5.9.0.tar.xz"; + sha256 = "1sbp512dg2mz10jrv2p8pglancaxbxi2bbmp05rfwfbz0bxyahld"; + name = "kwallet-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kguiaddons-5.9.0.tar.xz" ".tar"; + store = "/nix/store/4wb3a0ig4a4bpivyrjq8q7c79dqzzjkx-kguiaddons-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kguiaddons-5.9.0.tar.xz"; + sha256 = "0rk9bnln6g7xdw8vlldyqsfim75npi0adq627dqi3xfx03ccnp10"; + name = "kguiaddons-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "plasma-framework-5.9.0.tar.xz" ".tar"; + store = "/nix/store/kzqjb4w2py8ip75j19nfhqsldwg8d4x7-plasma-framework-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/plasma-framework-5.9.0.tar.xz"; + sha256 = "061b883vj27by3g8j087f2i6z0v76h6jljm5q2zs2dvr92jyqw8x"; + name = "plasma-framework-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcodecs-5.9.0.tar.xz" ".tar"; + store = "/nix/store/ahzrjx81z3dmp8f2gs7qb8r0mz3c9ml6-kcodecs-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kcodecs-5.9.0.tar.xz"; + sha256 = "1y1s7rzh5g2cj4f8xq6sfw06rnabg1z0y49rafhvx03w9fck9pib"; + name = "kcodecs-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kxmlgui-5.9.0.tar.xz" ".tar"; + store = "/nix/store/sm45sg21cyp099s4apn6p0pypcm33ijx-kxmlgui-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kxmlgui-5.9.0.tar.xz"; + sha256 = "0hwbzvyb2psys2bbxw05r2jyiigay4dwwad636yhqqgcqv8zk2wv"; + name = "kxmlgui-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktextwidgets-5.9.0.tar.xz" ".tar"; + store = "/nix/store/acizf5h2fcmjsriwnkszrk8yv9zhxzgh-ktextwidgets-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/ktextwidgets-5.9.0.tar.xz"; + sha256 = "0ld3z2l96710yali3l83410yblgw2fjdm1hyqhjp94vvhabzvzgr"; + name = "ktextwidgets-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kinit-5.9.0.tar.xz" ".tar"; + store = "/nix/store/7zd0kxdpf33p7cc158sakl0h76l9bgik-kinit-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kinit-5.9.0.tar.xz"; + sha256 = "110s0yparwim7lnj7rcaqc00z0vx36cwyx74hx9vm4kfqvi11yav"; + name = "kinit-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdbusaddons-5.9.0.tar.xz" ".tar"; + store = "/nix/store/c382r0g1wh1jgplfidaf57in3j7c3mnk-kdbusaddons-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kdbusaddons-5.9.0.tar.xz"; + sha256 = "1s92y1rha9kqys808zpl6cbzrzbxp4asrlwyl1djbyjv4gccs1zh"; + name = "kdbusaddons-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "frameworkintegration-5.9.0.tar.xz" ".tar"; + store = "/nix/store/78mqjc0zpiwzi7vwymz8jl1sr82pfhd2-frameworkintegration-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/frameworkintegration-5.9.0.tar.xz"; + sha256 = "0fnjx6vsfx71iq7nyxfp2msg6mdgp1kwy16ayrxmm4sfs1g7bdx9"; + name = "frameworkintegration-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjobwidgets-5.9.0.tar.xz" ".tar"; + store = "/nix/store/f4zqsfim0xj45pciv87xf237mr3bi6qm-kjobwidgets-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kjobwidgets-5.9.0.tar.xz"; + sha256 = "11ib74i7w05p31m0wfkrwxwaa47gsfmnfggdnxc8aziswqww0x9n"; + name = "kjobwidgets-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "networkmanager-qt-5.9.0.tar.xz" ".tar"; + store = "/nix/store/9a8yy0x7gb64wnjzb3q09kww47iv74zp-networkmanager-qt-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/networkmanager-qt-5.9.0.tar.xz"; + sha256 = "0z7bbx9hzifsfr7pycj4lbhr0nbzvvy3zwirgkx401dxqyz063g4"; + name = "networkmanager-qt-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kpty-5.9.0.tar.xz" ".tar"; + store = "/nix/store/dxw9x2xnwlp0iz6x3q7dfjkdqyh23lkg-kpty-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kpty-5.9.0.tar.xz"; + sha256 = "1s3hj5s9ph0v7ndhmajn3avjbrrir52fk1hzxp0b1smv95hf1gli"; + name = "kpty-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcompletion-5.9.0.tar.xz" ".tar"; + store = "/nix/store/jkz4hm0bbzk1z4rdw7mk11dmp73mdpn7-kcompletion-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kcompletion-5.9.0.tar.xz"; + sha256 = "0grmgzqfbi87agil0vygpf8x0kfzhl4h8kn2ljhmm8nqp5g9ah0k"; + name = "kcompletion-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kio-5.9.0.tar.xz" ".tar"; + store = "/nix/store/pamd5nf7v353zl3wqnmxaabwb3as2vrm-kio-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kio-5.9.0.tar.xz"; + sha256 = "0n8kf728zlyivz0vhp9lnygj2cwazll5llv227fvimh5mcsw68y4"; + name = "kio-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kparts-5.9.0.tar.xz" ".tar"; + store = "/nix/store/lrdpdzaqiqbqvdvmxwdgaawrafd5z8kd-kparts-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kparts-5.9.0.tar.xz"; + sha256 = "0kqa5s0j8smy31ql2y4niabp95c4c237spqcgllcpjz1kq2vbg2l"; + name = "kparts-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kiconthemes-5.9.0.tar.xz" ".tar"; + store = "/nix/store/ig6smkn1wq8yzcpmdlziqaqwsk0jbm84-kiconthemes-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kiconthemes-5.9.0.tar.xz"; + sha256 = "1nzfsn6asr91skxzd7i4d9qkn5rl6dylha37mxrlc9m6dhanf5zm"; + name = "kiconthemes-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kglobalaccel-5.9.0.tar.xz" ".tar"; + store = "/nix/store/n7x2xk0wnclxh8s2mlnw997376363i55-kglobalaccel-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kglobalaccel-5.9.0.tar.xz"; + sha256 = "07652pxqql2dj7280vryk5agank0rd3wmj93isbfak61q20y4snx"; + name = "kglobalaccel-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kapidox-5.9.0.tar.xz" ".tar"; + store = "/nix/store/525lhwwpxc9h9pbiyzr0qspk8sp0ml60-kapidox-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kapidox-5.9.0.tar.xz"; + sha256 = "1pva41v0x67nmpp4kiwmm61laxym3lj2jhc37d5b6qhsbvyq48jm"; + name = "kapidox-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kauth-5.9.0.tar.xz" ".tar"; + store = "/nix/store/xmziq9qlxfxmvl4bdxaf16z497fb38fi-kauth-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kauth-5.9.0.tar.xz"; + sha256 = "00kvdhxspkwy21fd1kvfh253cl3i5qkf6hlf3y75yjpsl2bh6vqz"; + name = "kauth-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kpackage-5.9.0.tar.xz" ".tar"; + store = "/nix/store/ib2x9bcdi7lm0gppw1q39p1mmwbid6f4-kpackage-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kpackage-5.9.0.tar.xz"; + sha256 = "04z6qqbb16y38g3bdbd209wh9k2bg9mw7zkzbkknz3xkd8b17fbf"; + name = "kpackage-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knotifications-5.9.0.tar.xz" ".tar"; + store = "/nix/store/jic7izn9i0mblgxm8qfyvdrlgby8p7l7-knotifications-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/knotifications-5.9.0.tar.xz"; + sha256 = "1s1zqxcm1dwz5sjardddgyz2zdcdzpnyzlr9f9wy89jbkvji63wa"; + name = "knotifications-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesu-5.9.0.tar.xz" ".tar"; + store = "/nix/store/njrnjrpi0qsvvnpzx673gygyifp22xn4-kdesu-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kdesu-5.9.0.tar.xz"; + sha256 = "0j1f64pp6sisw1nrg0510nn5n0z734lkyn4nin4pv1qzsxjxs39r"; + name = "kdesu-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcrash-5.9.0.tar.xz" ".tar"; + store = "/nix/store/gfz9mm191zrdwlv5l622gvgskg5aipy6-kcrash-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kcrash-5.9.0.tar.xz"; + sha256 = "0y4s68f580v2qyjygi33avn8a5aww5j4n25ci2qw1nhqz4jvvji7"; + name = "kcrash-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdnssd-5.9.0.tar.xz" ".tar"; + store = "/nix/store/h4xfhg3m2qbhiqncz687abvcibanq84j-kdnssd-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kdnssd-5.9.0.tar.xz"; + sha256 = "086182qfm0jbap1wk1br9c0gzwbnxrsrm5nsh7d9h2k0fbd74cf2"; + name = "kdnssd-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kunitconversion-5.9.0.tar.xz" ".tar"; + store = "/nix/store/b5lgglmahl4cyrnnl3a8dr17j5bym6yj-kunitconversion-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kunitconversion-5.9.0.tar.xz"; + sha256 = "0ngbfma7nf5pjqra6378slqyqy8b9fqlyp3cb27n6qwcqn9pjfif"; + name = "kunitconversion-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kidletime-5.9.0.tar.xz" ".tar"; + store = "/nix/store/3ksyripr9w13540dmgpxf3pr4djn47wr-kidletime-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kidletime-5.9.0.tar.xz"; + sha256 = "135y54hkxyd19szb6zkin5l6n0mmfakl3asqnd0pxyh8a9nbdjz5"; + name = "kidletime-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjsembed-5.9.0.tar.xz" ".tar"; + store = "/nix/store/9s6zm801gizhls4rpmrij23jzqnkcbjy-kjsembed-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/portingAids/kjsembed-5.9.0.tar.xz"; + sha256 = "1rvr9nkw7c5a433sqsjdaz1wrja4kny3kc74550qpimwjlcwirix"; + name = "kjsembed-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdelibs4support-5.9.0.tar.xz" ".tar"; + store = "/nix/store/zx5l2jjfrfhb7i8x0m7abdw3qzcp8lhz-kdelibs4support-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/portingAids/kdelibs4support-5.9.0.tar.xz"; + sha256 = "1fvwwd2gj1wdfgd9jczvgm6fi2i08y9mdmvfc7cjh7rnwps5hy7d"; + name = "kdelibs4support-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "krunner-5.9.0.tar.xz" ".tar"; + store = "/nix/store/ng08bafm24q6nl1gfdschnljm3zly8rm-krunner-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/portingAids/krunner-5.9.0.tar.xz"; + sha256 = "1m95gm32rmvm9p4422if89vid4k29q0i7qdyakdn3z5zks23scdl"; + name = "krunner-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kross-5.9.0.tar.xz" ".tar"; + store = "/nix/store/ddrjg3drx3hj3bwf120y8pq1wq7q5m0s-kross-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/portingAids/kross-5.9.0.tar.xz"; + sha256 = "0brzycpqjyqryj86scv52m3p9mvhlq1swrmh22gpwwnvmh6ngdvj"; + name = "kross-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "khtml-5.9.0.tar.xz" ".tar"; + store = "/nix/store/qx36l5jwllflpamxwrn9v3ff2fhv33iz-khtml-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/portingAids/khtml-5.9.0.tar.xz"; + sha256 = "19m01gg5gz02i4z85jnlspb441v906cakd53mgwl1028r8h498pv"; + name = "khtml-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjs-5.9.0.tar.xz" ".tar"; + store = "/nix/store/z4898f54az0nb4j4ydjsakiqpn6rz3zr-kjs-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/portingAids/kjs-5.9.0.tar.xz"; + sha256 = "1v6sk4kjf70ypgl7wxqfsjg6q5ms3qac1zjw54nw94qq55b9psvl"; + name = "kjs-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmediaplayer-5.9.0.tar.xz" ".tar"; + store = "/nix/store/bzy6c2shbkv003dsh08ccn208lqdd17a-kmediaplayer-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/portingAids/kmediaplayer-5.9.0.tar.xz"; + sha256 = "13zswmpdidlpxa1h4dg1s74m584syqrrsgxll6b5yl1p7j4x0g5z"; + name = "kmediaplayer-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kitemmodels-5.9.0.tar.xz" ".tar"; + store = "/nix/store/4s94ln9czamd4p6gkllvp5b8plw35xmk-kitemmodels-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kitemmodels-5.9.0.tar.xz"; + sha256 = "0m5ag09narwglg799f4ahpjgxlxvnxjrshv1cbszp7v2naxh1365"; + name = "kitemmodels-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "modemmanager-qt-5.9.0.tar.xz" ".tar"; + store = "/nix/store/fdhdk8m0jy1g72k8mm11ljnmyw6ldp71-modemmanager-qt-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/modemmanager-qt-5.9.0.tar.xz"; + sha256 = "0ap1gr2xjnzmgl7cpi66xdgw14g4m0ax3q74vr86vdcsrmcql0b3"; + name = "modemmanager-qt-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdoctools-5.9.0.tar.xz" ".tar"; + store = "/nix/store/b5fd64g9rrd46qakpzkrydnj6chpcx5c-kdoctools-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kdoctools-5.9.0.tar.xz"; + sha256 = "1iqp7d09j572splxr92gkadhmbd3rs4661ky45pajrk79g53brmk"; + name = "kdoctools-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcoreaddons-5.9.0.tar.xz" ".tar"; + store = "/nix/store/zr152vxn36ph75ilmwyf5xc9vikczcap-kcoreaddons-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kcoreaddons-5.9.0.tar.xz"; + sha256 = "0cb5j65y7yv27d3dm3jzrparn5h6knk635sxnpdxvcjdgbpr93hi"; + name = "kcoreaddons-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdewebkit-5.9.0.tar.xz" ".tar"; + store = "/nix/store/0x0j7zm9p1hrxq2793cf4dv9sjyn6k23-kdewebkit-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kdewebkit-5.9.0.tar.xz"; + sha256 = "08f1jfnxi3znyk20gszr79wwlx55dp0qavpy0ifm7s22vl3bswdy"; + name = "kdewebkit-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kimageformats-5.9.0.tar.xz" ".tar"; + store = "/nix/store/n7k5dazmp4rppbagy5b0frf1q72l5kcw-kimageformats-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kimageformats-5.9.0.tar.xz"; + sha256 = "114rrk1hpyfr4dq7kriddgd9nh0x2r1ylk4sa2sx8avhfqh01bmg"; + name = "kimageformats-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "karchive-5.9.0.tar.xz" ".tar"; + store = "/nix/store/yzy2r8ajkdw8g3qwbdjkf689b9qrsanl-karchive-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/karchive-5.9.0.tar.xz"; + sha256 = "1cmh06grw77fkj7fg4w6mpv3y0zyq25pwzl7vh00pyd9wqsgv89z"; + name = "karchive-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeclarative-5.9.0.tar.xz" ".tar"; + store = "/nix/store/x6j9vl25c8ixw1bv3zan69likxv2x5yr-kdeclarative-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kdeclarative-5.9.0.tar.xz"; + sha256 = "1x515r5w107g5zy6hhqmhh14ww2ar81zdlbhzm0ki5id16vmzcc4"; + name = "kdeclarative-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kitemviews-5.9.0.tar.xz" ".tar"; + store = "/nix/store/r0yi07vv52dbvfx1pgxidxqcdx7bbqii-kitemviews-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kitemviews-5.9.0.tar.xz"; + sha256 = "0xymycick40mxc6prvxyrqvg6ig9c9q2k3kp4i40468id88m8p8s"; + name = "kitemviews-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "sonnet-5.9.0.tar.xz" ".tar"; + store = "/nix/store/y4sh847b3hgkk6ikdr0rl3lljylzrz1k-sonnet-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/sonnet-5.9.0.tar.xz"; + sha256 = "06c78qdn9azadghz0jyzky4mk1qk51v6zyb7m2yrnisn2miyhv28"; + name = "sonnet-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesignerplugin-5.9.0.tar.xz" ".tar"; + store = "/nix/store/v5ad3dhkisy4rag5zqk3zx9lmc5hx4hm-kdesignerplugin-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kdesignerplugin-5.9.0.tar.xz"; + sha256 = "03x2vg2va2s323ynyqpin1srhwlak1yrl6hkzcxmyirqd36rq2ik"; + name = "kdesignerplugin-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kconfig-5.9.0.tar.xz" ".tar"; + store = "/nix/store/h4856ysd2x370375vdm1hfcbhxm3g49c-kconfig-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kconfig-5.9.0.tar.xz"; + sha256 = "1mhqlrsxnfqpafpjf3y4v4q5d1wqv404wkzfll07pihkivq52jd1"; + name = "kconfig-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kactivities-5.9.0.tar.xz" ".tar"; + store = "/nix/store/n2i4dy75ms4kjvv8m7rwxywwv8zvxhmk-kactivities-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kactivities-5.9.0.tar.xz"; + sha256 = "0lphz9jybmphdbbcdm74dzrlb01m8q7saxz04c30pl37kaxrplam"; + name = "kactivities-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "solid-5.9.0.tar.xz" ".tar"; + store = "/nix/store/h68n4cp0lkdclnww7mc7xfh4f7nyzjdi-solid-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/solid-5.9.0.tar.xz"; + sha256 = "1z8qxjpl7gbfhii2lz0g62vpip6iw998aq6xaxswgfy3l558xqwn"; + name = "solid-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kxmlrpcclient-5.9.0.tar.xz" ".tar"; + store = "/nix/store/2klkxcvdwqmfq5xwq7dsgk675vdxssz2-kxmlrpcclient-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kxmlrpcclient-5.9.0.tar.xz"; + sha256 = "1igjrq1z0cfgfkgifdjfyfcbvgabgn3gg85g7hxvqz262lscilwg"; + name = "kxmlrpcclient-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktexteditor-5.9.0.tar.xz" ".tar"; + store = "/nix/store/04kkss23ry8qhsd97w80q37958b25wa9-ktexteditor-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/ktexteditor-5.9.0.tar.xz"; + sha256 = "12ci3qhbq8hxvsv2q4rkr4q2sbs11zxn8afn7wwh4za1b80vgi4b"; + name = "ktexteditor-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "attica-5.9.0.tar.xz" ".tar"; + store = "/nix/store/75ipp7rrjrx3csia7blhwh9nf7jchprk-attica-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/attica-5.9.0.tar.xz"; + sha256 = "0wymjj5sch638hrn6z9xrmw8n9avrci16qxvig5sapr0wn2r51vj"; + name = "attica-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwidgetsaddons-5.9.0.tar.xz" ".tar"; + store = "/nix/store/s1gh5sqrpjicv1vxzb8affi51js2zk4j-kwidgetsaddons-5.9.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.9/kwidgetsaddons-5.9.0.tar.xz"; + sha256 = "1s8lbj779rkxd878v15awcbxpmvrm95cahiq9a54mv75mhlix1j1"; + name = "kwidgetsaddons-5.9.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kunitconversion-5.10.0.tar.xz" ".tar"; + store = "/nix/store/zfya6451kbd13sqbvn37as2pbvwzblb2-kunitconversion-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kunitconversion-5.10.0.tar.xz"; + sha256 = "0dxawvihm2bnc9l9vx90bq50sbcgrnkfvlsixkwhirw2cvvz0v5p"; + name = "kunitconversion-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kauth-5.10.0.tar.xz" ".tar"; + store = "/nix/store/4895lldwv2v8vmravprlvy18qrbj83ha-kauth-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kauth-5.10.0.tar.xz"; + sha256 = "074xr0qzknh9d0f6lisbyf612p4drlqscs7lqkasmd8f0r14ixlq"; + name = "kauth-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kio-5.10.0.tar.xz" ".tar"; + store = "/nix/store/360wiiib4wjpc6anq8yk3xsl52bmfi5p-kio-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kio-5.10.0.tar.xz"; + sha256 = "1lbbxn5s6p8fsgyr4nwwyawgcw4ywldwy7mbvn8pk5xrzai3c04r"; + name = "kio-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "threadweaver-5.10.0.tar.xz" ".tar"; + store = "/nix/store/ha4rcc73g899c7qsngjyjqww5wn8d24y-threadweaver-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/threadweaver-5.10.0.tar.xz"; + sha256 = "1lfdxin8rjvjpqky3g416magsg9ivf5kjmh9r37rz4v0mxsv5knd"; + name = "threadweaver-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcrash-5.10.0.tar.xz" ".tar"; + store = "/nix/store/jakl1nm1lvnyscpx35d21l4whc8p6h8n-kcrash-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kcrash-5.10.0.tar.xz"; + sha256 = "1imgn8a8ns15f2alp5xljy6llmqy0dv7yiqqjb1n8klvyp5mynlx"; + name = "kcrash-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "karchive-5.10.0.tar.xz" ".tar"; + store = "/nix/store/9lh3nmzwia4akk6zi426admgq1sd1ybx-karchive-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/karchive-5.10.0.tar.xz"; + sha256 = "19lzv1fi7vw95l9mx0qx10nfn5q7wzkqahsg2jswp31vgf977wfw"; + name = "karchive-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "networkmanager-qt-5.10.0.tar.xz" ".tar"; + store = "/nix/store/mx64rg2lj5vmx2ggijrwv8iqp5lrm2ac-networkmanager-qt-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/networkmanager-qt-5.10.0.tar.xz"; + sha256 = "0a9yg40rmvl7mxscyx6ndq4fwqxfy6rfy6a6cb8b6wm2im29njc4"; + name = "networkmanager-qt-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kguiaddons-5.10.0.tar.xz" ".tar"; + store = "/nix/store/wd7s3v68xjshl9jjy974pidv0bar6j9f-kguiaddons-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kguiaddons-5.10.0.tar.xz"; + sha256 = "033z4difclwbmy4bi0c819i08x8pb5znr0kd27c3l9xaf2z3kaxr"; + name = "kguiaddons-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kparts-5.10.0.tar.xz" ".tar"; + store = "/nix/store/q4xmlj9k2lc0ansqm982xcczna33d0y4-kparts-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kparts-5.10.0.tar.xz"; + sha256 = "0k1zkr2qvl65cgk0j3ybvmxs8wwjl0641yrgl36ngbk23lyi35rv"; + name = "kparts-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kemoticons-5.10.0.tar.xz" ".tar"; + store = "/nix/store/8vyxpyy2ym3zza3rgh97ny034prss6f0-kemoticons-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kemoticons-5.10.0.tar.xz"; + sha256 = "0i3hj04k0dh2rx77sig9qdpjh2rik0n2snpr61ckiw9ixh8fggkr"; + name = "kemoticons-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwindowsystem-5.10.0.tar.xz" ".tar"; + store = "/nix/store/ay11avkmb2sslf4r4ibi00sj7sndfvw0-kwindowsystem-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kwindowsystem-5.10.0.tar.xz"; + sha256 = "0grxbydcc9k88nnlav7vcn3lajzswcsim5cpjcsysx9irx8rbiqf"; + name = "kwindowsystem-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kconfigwidgets-5.10.0.tar.xz" ".tar"; + store = "/nix/store/2lpy9ar6qh2i3bn3vn3n9kckj5inryc4-kconfigwidgets-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kconfigwidgets-5.10.0.tar.xz"; + sha256 = "19p073fzpvm6hn85qk959s6dlnizywwcipw4rfm92b3y3jqg77i0"; + name = "kconfigwidgets-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjobwidgets-5.10.0.tar.xz" ".tar"; + store = "/nix/store/vh5k90s0ni97ffz23fgfngqxay542xb4-kjobwidgets-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kjobwidgets-5.10.0.tar.xz"; + sha256 = "0b2n0wn2l4k8xsjgycv7123xvlbq06g0pmbn5q6akywr0lrnyd16"; + name = "kjobwidgets-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwidgetsaddons-5.10.0.tar.xz" ".tar"; + store = "/nix/store/2i00n76b27gj6cpzqsqyahjdpiqncvxa-kwidgetsaddons-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kwidgetsaddons-5.10.0.tar.xz"; + sha256 = "0c9gzwsacm4zjjqc25akzf88fgrp9nraqid3c4na6asyn1pxzkmh"; + name = "kwidgetsaddons-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwallet-5.10.0.tar.xz" ".tar"; + store = "/nix/store/xdgfmrz0zga3ffrmhh6svc0xwk9j8hz4-kwallet-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kwallet-5.10.0.tar.xz"; + sha256 = "0nrb67shmdfaw2naa87gp29f2y3nnscj6ipw854j7shxz4fl2nr4"; + name = "kwallet-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kded-5.10.0.tar.xz" ".tar"; + store = "/nix/store/aw04kz9cvgl089fi7dria4bjj6lsx0gy-kded-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kded-5.10.0.tar.xz"; + sha256 = "0n2nd96j09igbxwq4697gyl45sfij22hs5mkys1gnaw5j8byaj4a"; + name = "kded-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcompletion-5.10.0.tar.xz" ".tar"; + store = "/nix/store/9x8g7xf6da032y48bjwb0qgn256nxjid-kcompletion-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kcompletion-5.10.0.tar.xz"; + sha256 = "1cb8b7qij67bghg35xcbs2lpkh5jzl7illln7h6h9jyygzv6vq7m"; + name = "kcompletion-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "attica-5.10.0.tar.xz" ".tar"; + store = "/nix/store/78shcdc7hazqjpb9zw9fi48i783dcnx9-attica-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/attica-5.10.0.tar.xz"; + sha256 = "1immb10bvpkscdawyv1n0y52jjnfy0y3hnjxxzfwci9fj24da625"; + name = "attica-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kitemviews-5.10.0.tar.xz" ".tar"; + store = "/nix/store/3z0i50s73z4ah1wxw0gv9r5ayllm2ws3-kitemviews-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kitemviews-5.10.0.tar.xz"; + sha256 = "0dihi79j7iqy2x3qivjalsj9qa2b17g7jl7j705fjjfnw64xj8bi"; + name = "kitemviews-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdbusaddons-5.10.0.tar.xz" ".tar"; + store = "/nix/store/fnjbqxb8pb2z48c7a3i7ngma7lalmvsq-kdbusaddons-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kdbusaddons-5.10.0.tar.xz"; + sha256 = "0lk7h424lc015asqpnldck18zcjki4672fkswy3qdvmkkpzdgx3m"; + name = "kdbusaddons-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcoreaddons-5.10.0.tar.xz" ".tar"; + store = "/nix/store/71ql005nih2qjlybsal2rdg4h1fgj3rf-kcoreaddons-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kcoreaddons-5.10.0.tar.xz"; + sha256 = "0y1j50axd6i0givknp9xfk81jdcdzz5p7m761qvbbjflqrnznvc1"; + name = "kcoreaddons-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knotifications-5.10.0.tar.xz" ".tar"; + store = "/nix/store/8raimajcs7nc091fa75wbli2d1rz74my-knotifications-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/knotifications-5.10.0.tar.xz"; + sha256 = "16qh492wwcyxanwmaqp1979wh3mrzmjkhvgnig5fxfvqzh9hxp0p"; + name = "knotifications-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kglobalaccel-5.10.0.tar.xz" ".tar"; + store = "/nix/store/s9fnk5qs8qjsnf1yqdh09xf3ad7p4k6s-kglobalaccel-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kglobalaccel-5.10.0.tar.xz"; + sha256 = "02nr4f991zi03spq4m9rlj11m5kvhmqghkfl2ijqnwv8m4dq2afy"; + name = "kglobalaccel-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdewebkit-5.10.0.tar.xz" ".tar"; + store = "/nix/store/36lvpr42574d8cia2ldszawfbm88jiha-kdewebkit-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kdewebkit-5.10.0.tar.xz"; + sha256 = "08bw2ximj3z6rs06przf6kah1mczlv2nri99cgiihin99jx8f98h"; + name = "kdewebkit-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kconfig-5.10.0.tar.xz" ".tar"; + store = "/nix/store/7hk4bl92kfr9a3qs4wz52a8w7ij8336a-kconfig-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kconfig-5.10.0.tar.xz"; + sha256 = "1r7r4yihlnld09l9qmq2q8h9xk7clmgbry8vnggzih1bamid79dq"; + name = "kconfig-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ki18n-5.10.0.tar.xz" ".tar"; + store = "/nix/store/cnhv0jch823qnim7z0zdvbyjd5vrcg3y-ki18n-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/ki18n-5.10.0.tar.xz"; + sha256 = "0xa27c42bnvhks6mdz593hxwl3idagyz6mbmp8p5dj6xsfdabrcs"; + name = "ki18n-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kimageformats-5.10.0.tar.xz" ".tar"; + store = "/nix/store/0hc6flqibi46fbrc3cdfynyvhpq458z0-kimageformats-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kimageformats-5.10.0.tar.xz"; + sha256 = "140s1lydikb87rpaxqmv6ccp139ch9vsi62r6fmyvwx6l0ffh2ay"; + name = "kimageformats-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbookmarks-5.10.0.tar.xz" ".tar"; + store = "/nix/store/4w5fasxqv1s6rx9ri3jg1dppikm2hpci-kbookmarks-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kbookmarks-5.10.0.tar.xz"; + sha256 = "040n5xv8n357smmhsq24hgv43dcsbpc0wfyjhfznz41azcibbydw"; + name = "kbookmarks-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kactivities-5.10.0.tar.xz" ".tar"; + store = "/nix/store/5aq6q69jylvagidgawig2laf1lqlks8l-kactivities-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kactivities-5.10.0.tar.xz"; + sha256 = "0d2cyjv9hb4zd99sp598miwq4k1nzv4ssbgak7jmifqcimjpjjsk"; + name = "kactivities-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktextwidgets-5.10.0.tar.xz" ".tar"; + store = "/nix/store/8w02lcpf5pr1y6nhr7jx33xf266napd4-ktextwidgets-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/ktextwidgets-5.10.0.tar.xz"; + sha256 = "0mpsikpy1i3j1dx352a5c77xx5m6iv4lfnff58yi5z0m31002mv6"; + name = "ktextwidgets-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "extra-cmake-modules-5.10.0.tar.xz" ".tar"; + store = "/nix/store/m4lgg75y8c1fcw2gsskyk14x011ydbvk-extra-cmake-modules-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/extra-cmake-modules-5.10.0.tar.xz"; + sha256 = "00h62mmxl8jwslssczv14dmydgmg3rr12dd8b5471xbmx8kvqb86"; + name = "extra-cmake-modules-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "plasma-framework-5.10.0.tar.xz" ".tar"; + store = "/nix/store/yy7r7d0m4l75v0l7dr9krjcgbkpq2nrw-plasma-framework-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/plasma-framework-5.10.0.tar.xz"; + sha256 = "0a2lkxbpry8p8sar7ai2fcnjciiik4ir9y9snkmxci26vgql8j8a"; + name = "plasma-framework-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kidletime-5.10.0.tar.xz" ".tar"; + store = "/nix/store/0n2i32wrhvwpq63xvqxf2ibgil9fmljy-kidletime-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kidletime-5.10.0.tar.xz"; + sha256 = "0rvw4b22x9jgkqx64wisc0qnl6kx2b97sz2hxcpqh2lkj1cql4r0"; + name = "kidletime-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kservice-5.10.0.tar.xz" ".tar"; + store = "/nix/store/gzc1wc32ggqrmvvzg36p6n7g5zlvxl48-kservice-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kservice-5.10.0.tar.xz"; + sha256 = "15dmfd8ddjaac5mdb041ddhpkr3bh6gcgy0wfg404xiy1sx12dr6"; + name = "kservice-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdnssd-5.10.0.tar.xz" ".tar"; + store = "/nix/store/q2pbpwp8al275xk7sd4smwzyi9yahfsh-kdnssd-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kdnssd-5.10.0.tar.xz"; + sha256 = "0frar6j0n6m43l7hdc14n0vbvs63fjg2gv5q59zwsx856rrqfszi"; + name = "kdnssd-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcmutils-5.10.0.tar.xz" ".tar"; + store = "/nix/store/nx5s67hxxldmws5292cqgwr8xjxr2dli-kcmutils-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kcmutils-5.10.0.tar.xz"; + sha256 = "1995jbnnkwmkyiq8jav4r3x3mi3w5kv0am10c0d6g1pxjsig1xrx"; + name = "kcmutils-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kapidox-5.10.0.tar.xz" ".tar"; + store = "/nix/store/ymkxbdnjg74454a4k4s5i1y29cfxf6zc-kapidox-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kapidox-5.10.0.tar.xz"; + sha256 = "1zjjj951vfnwc8833lh6schdcva0dhiws56kmhclg7m9mpnvbav4"; + name = "kapidox-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeclarative-5.10.0.tar.xz" ".tar"; + store = "/nix/store/k58nmr9k6qib3kbp6yxwkbw90fxxydhv-kdeclarative-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kdeclarative-5.10.0.tar.xz"; + sha256 = "1kfsqg43inn2is991nzcgcicd7aa7yg6bzsxac3c3136p32ii9yg"; + name = "kdeclarative-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdoctools-5.10.0.tar.xz" ".tar"; + store = "/nix/store/jzw1pnsjcl6xv8gfqdi02gcnr5x1301s-kdoctools-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kdoctools-5.10.0.tar.xz"; + sha256 = "0v00pjm0jsqkxq52ndpds7qn5vbsxkgzvvy379id1ag692s55jkp"; + name = "kdoctools-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "krunner-5.10.0.tar.xz" ".tar"; + store = "/nix/store/dac20ijml2z02bbslxpzxlmpzsbfp4r1-krunner-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/portingAids/krunner-5.10.0.tar.xz"; + sha256 = "15adxzsh27s6h37mfa8pwwdf47gp8whfsshj5chl7h3zdj5aa04i"; + name = "krunner-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjs-5.10.0.tar.xz" ".tar"; + store = "/nix/store/qm70n66sxh6zgxc02sh2k0ii1xw2g8yk-kjs-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/portingAids/kjs-5.10.0.tar.xz"; + sha256 = "0l3pn9g7mv5wklihgd7v3c83563ly9swwayivqlyz4rj35m7lvq1"; + name = "kjs-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmediaplayer-5.10.0.tar.xz" ".tar"; + store = "/nix/store/h0k2i2vx7r57by15bx23paay9q4fah3x-kmediaplayer-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/portingAids/kmediaplayer-5.10.0.tar.xz"; + sha256 = "0q17lgajv3844d2nccnfyzg6g55wx79fxij2iw42m25wyxg7b4df"; + name = "kmediaplayer-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjsembed-5.10.0.tar.xz" ".tar"; + store = "/nix/store/3z1phizh6lphvihqgg63ajlfqj3hbn54-kjsembed-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/portingAids/kjsembed-5.10.0.tar.xz"; + sha256 = "1922bvs3p2ffax5h8kmg4llw65h00m22qfs8n3qhcc952zgv1wxl"; + name = "kjsembed-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kross-5.10.0.tar.xz" ".tar"; + store = "/nix/store/ifg2nrl5zk707f510nkv8cnzjwdrrc2h-kross-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/portingAids/kross-5.10.0.tar.xz"; + sha256 = "02mz7w920vka5wwgbnf0m774s56r4qkwplakdyal92ip3zc3m6jq"; + name = "kross-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "khtml-5.10.0.tar.xz" ".tar"; + store = "/nix/store/h9zaw11asgbhgxwqbsnvcdg0h97rcqfd-khtml-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/portingAids/khtml-5.10.0.tar.xz"; + sha256 = "0wzzcysgvjkibs8j277z75b0s5dvjwby7c6lnyyzmnm5vmsw2dj2"; + name = "khtml-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdelibs4support-5.10.0.tar.xz" ".tar"; + store = "/nix/store/ii9a8qxf2xh1ijx4m5zfssjrvgfsf1wf-kdelibs4support-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/portingAids/kdelibs4support-5.10.0.tar.xz"; + sha256 = "0j7ah078ckz8zcdb417j7dmzpcbs9vvbr42r6c49fk7rp7vy4ly2"; + name = "kdelibs4support-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "frameworkintegration-5.10.0.tar.xz" ".tar"; + store = "/nix/store/7rbwib0mgkm5pl8ai6q6fjdq87zyk99d-frameworkintegration-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/frameworkintegration-5.10.0.tar.xz"; + sha256 = "00plajvkp19njdyq37qmf0q5xvwvl3vgx0vmls4hf2mk179yqm63"; + name = "frameworkintegration-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knewstuff-5.10.0.tar.xz" ".tar"; + store = "/nix/store/k4zm5y96427bwdjfjinnj8p2knkgn12h-knewstuff-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/knewstuff-5.10.0.tar.xz"; + sha256 = "1z24h7rk7vyavw3949gj06y924x1sbyy8jh3krr1ngpddlrsk5l7"; + name = "knewstuff-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kpackage-5.10.0.tar.xz" ".tar"; + store = "/nix/store/j9p1kdz7wknxjk33b92aicqx2f021i10-kpackage-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kpackage-5.10.0.tar.xz"; + sha256 = "0c5xnks7k85lj6pkbylnlcmlhxns95zs6km9hfvdi7zh0i26y8qb"; + name = "kpackage-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "modemmanager-qt-5.10.0.tar.xz" ".tar"; + store = "/nix/store/lqd4bh2da4v002ckm5cz5clzmddkvyil-modemmanager-qt-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/modemmanager-qt-5.10.0.tar.xz"; + sha256 = "1whhc8clibiwzda4zbk8asry65c7nlnlgq10sbmh7gq008l0z9l1"; + name = "modemmanager-qt-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktexteditor-5.10.0.tar.xz" ".tar"; + store = "/nix/store/x83fw1z7h9s2h03m4slydvpafzxvi1lq-ktexteditor-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/ktexteditor-5.10.0.tar.xz"; + sha256 = "1axs21vklg392hxcm8j6y01qk3wphsfldh0caqnv6ifhamvcvkhh"; + name = "ktexteditor-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knotifyconfig-5.10.0.tar.xz" ".tar"; + store = "/nix/store/chvplwyglb6zwhjhxyrb91f0rg4k2g1a-knotifyconfig-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/knotifyconfig-5.10.0.tar.xz"; + sha256 = "1zhddbynsk4b27sldmbd8q8mk8kbjyfv5k27vrqahlbq7ysrhflm"; + name = "knotifyconfig-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcodecs-5.10.0.tar.xz" ".tar"; + store = "/nix/store/184rzn1mjkmv6dvqs8rmjhwxzsbp04yb-kcodecs-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kcodecs-5.10.0.tar.xz"; + sha256 = "1izw6rpvpxhwnl6aqrfqh2m3v3ia5gynpsxd8syi1cxnzmajgwic"; + name = "kcodecs-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kpeople-5.10.0.tar.xz" ".tar"; + store = "/nix/store/1vqn907gx0b0h238zwys8v3ryxf8yqlh-kpeople-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kpeople-5.10.0.tar.xz"; + sha256 = "0b56c3pha1rgz9h8ia0vd4k5nvmxh64wgk5vgfnxa0znij47wcka"; + name = "kpeople-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kinit-5.10.0.tar.xz" ".tar"; + store = "/nix/store/rmrvk7308bi4kzximn9pzzgij9mihnll-kinit-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kinit-5.10.0.tar.xz"; + sha256 = "02da17n19xx9cqiyzh7qlbqyy0mpy4gr3pdja1xlqaapc52k99sz"; + name = "kinit-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kxmlrpcclient-5.10.0.tar.xz" ".tar"; + store = "/nix/store/bijjk36yvjjcmnckvm3ccw9zs40ckjcx-kxmlrpcclient-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kxmlrpcclient-5.10.0.tar.xz"; + sha256 = "1cjwqxpwwx9gxxb43dncyfcn3rjfx28af6dbh4zx7l0yqw4z4cxi"; + name = "kxmlrpcclient-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kxmlgui-5.10.0.tar.xz" ".tar"; + store = "/nix/store/fafv3gxzbrvrjvxvng6is8k9a3869g1s-kxmlgui-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kxmlgui-5.10.0.tar.xz"; + sha256 = "1m22ld9pd2z287j8nj9alk1pychq04r0w1g1vqhgr0shlxzx91pf"; + name = "kxmlgui-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "solid-5.10.0.tar.xz" ".tar"; + store = "/nix/store/6shp9pnj9p4lpb2kzzdfqz2pf6ivy2gc-solid-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/solid-5.10.0.tar.xz"; + sha256 = "1qy3bic39jffc2pl1wh36qm8sizjld6gd2qx6y4j9xzkv723r864"; + name = "solid-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kiconthemes-5.10.0.tar.xz" ".tar"; + store = "/nix/store/h5i2pk6zy3k4h23q1jfdbarc8fm1614b-kiconthemes-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kiconthemes-5.10.0.tar.xz"; + sha256 = "19vvg63ld4388jd47245zqzbj5bs8qj69524bvwqbv77201qg7j1"; + name = "kiconthemes-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesignerplugin-5.10.0.tar.xz" ".tar"; + store = "/nix/store/jdyk0kl1ccbnnb83mzda670bg93z3w0w-kdesignerplugin-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kdesignerplugin-5.10.0.tar.xz"; + sha256 = "1z82kxn5hpbmhsrh4ic7mcmsz115p39gph7ysjz9fh6ylfdgcrpm"; + name = "kdesignerplugin-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kplotting-5.10.0.tar.xz" ".tar"; + store = "/nix/store/b5h0i3mcfb9g7krd7pc5c0f1c2q0jma5-kplotting-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kplotting-5.10.0.tar.xz"; + sha256 = "0g7riml9nbs762s1pld9d3y743z52kxdaiaklg3ai5cljp5v5skh"; + name = "kplotting-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "sonnet-5.10.0.tar.xz" ".tar"; + store = "/nix/store/ivjvsiqv1gjb0cq5lkxa7a3kb9pjcvrw-sonnet-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/sonnet-5.10.0.tar.xz"; + sha256 = "1ad205mldwk234vwjkbalx6pnib02mz68drajg07ii5ycsczgk93"; + name = "sonnet-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesu-5.10.0.tar.xz" ".tar"; + store = "/nix/store/h3vphpz0fdw7v339bcf0krqm2rgwqzsl-kdesu-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kdesu-5.10.0.tar.xz"; + sha256 = "002ryv2svl1hmapflg0cvl7xd7qa4sh2msxnma9ijsad1ypv9nrw"; + name = "kdesu-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kpty-5.10.0.tar.xz" ".tar"; + store = "/nix/store/1k73m5m6vkl6p9gcn8ik4cvh0k5chlxa-kpty-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kpty-5.10.0.tar.xz"; + sha256 = "1ys8wv1hirv6jk6jdzjnvkhw2lx3rxj8xp4sgvxfbfs833vdnqx6"; + name = "kpty-5.10.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kitemmodels-5.10.0.tar.xz" ".tar"; + store = "/nix/store/v1lmfs7h4q0d6wmp7xz21ad5sm50bxx2-kitemmodels-5.10.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.10/kitemmodels-5.10.0.tar.xz"; + sha256 = "1c63wsy9iy842ljv2vmnjcn6p3ahnv6pm73p1kayjdqq6wy0lmq6"; + name = "kitemmodels-5.10.0.tar.xz"; + }; + } +] diff --git a/pkgs/development/libraries/kde-frameworks-5.9/manifest.sh b/pkgs/development/libraries/kde-frameworks-5.10/manifest.sh similarity index 57% rename from pkgs/development/libraries/kde-frameworks-5.9/manifest.sh rename to pkgs/development/libraries/kde-frameworks-5.10/manifest.sh index 0075819664a7..28870e48964d 100755 --- a/pkgs/development/libraries/kde-frameworks-5.9/manifest.sh +++ b/pkgs/development/libraries/kde-frameworks-5.10/manifest.sh @@ -1,12 +1,15 @@ #!/bin/sh +# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS +KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}" + if [ $# -eq 0 ]; then # The extra slash at the end of the URL is necessary to stop wget # from recursing over the whole server! (No, it's not a bug.) $(nix-build ../../../.. -A autonix.manifest) \ - http://download.kde.org/stable/frameworks/5.9/ \ - -A '*.tar.xz' + "${KDE_MIRROR}/stable/frameworks/5.10/" \ + $MANIFEST_EXTRA_ARGS -A '*.tar.xz' else diff --git a/pkgs/development/libraries/kde-frameworks-5.9/plasma-framework/plasma-framework-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.10/plasma-framework/plasma-framework-external-paths.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/plasma-framework/plasma-framework-external-paths.patch rename to pkgs/development/libraries/kde-frameworks-5.10/plasma-framework/plasma-framework-external-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.9/renames.nix b/pkgs/development/libraries/kde-frameworks-5.10/renames.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/renames.nix rename to pkgs/development/libraries/kde-frameworks-5.10/renames.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.9/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.10/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.9/setup-hook.sh rename to pkgs/development/libraries/kde-frameworks-5.10/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.9/manifest.nix b/pkgs/development/libraries/kde-frameworks-5.9/manifest.nix deleted file mode 100644 index c61618b6e455..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.9/manifest.nix +++ /dev/null @@ -1,589 +0,0 @@ -# This file is generated automatically. DO NOT EDIT! -{ stdenv, fetchurl, mirror }: -[ - { - name = stdenv.lib.nameFromURL "kemoticons-5.9.0.tar.xz" ".tar"; - store = "/nix/store/cl9lk2n5vyfm0rdpxh3qz90mp5g9im5p-kemoticons-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kemoticons-5.9.0.tar.xz"; - sha256 = "1zr8izm75q18saylqm6p8c4lfickpwpa5s1qz1avz66dprp822jh"; - name = "kemoticons-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kpeople-5.9.0.tar.xz" ".tar"; - store = "/nix/store/vadyk6vf9rpzb77ighjzqd6gh1sjlllk-kpeople-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kpeople-5.9.0.tar.xz"; - sha256 = "1qfr5k80kymfr2d955vq3nrbqg4mw22d5k6pgnq06mszvp2fg6k4"; - name = "kpeople-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kconfigwidgets-5.9.0.tar.xz" ".tar"; - store = "/nix/store/j2b1174ycr31ij9knwqhv429yh1hm7ck-kconfigwidgets-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kconfigwidgets-5.9.0.tar.xz"; - sha256 = "081wq0blpl3gpzvljf3pfa8rlbwmrnpihckn6vbpzaaiy5mcwjkr"; - name = "kconfigwidgets-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "ki18n-5.9.0.tar.xz" ".tar"; - store = "/nix/store/iqwywmpdn4kmxkvkiq0jcmhmss1z13ih-ki18n-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/ki18n-5.9.0.tar.xz"; - sha256 = "0ply8mb2yg3wx6qqvg8zyj3icgpwk3qw6v56qxjq6zzscf9gl7jc"; - name = "ki18n-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kplotting-5.9.0.tar.xz" ".tar"; - store = "/nix/store/y200vzw2amcq3xhb8yd76aysh6d2f0fk-kplotting-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kplotting-5.9.0.tar.xz"; - sha256 = "1hvjy9bm1jk8msz6fzb32phrvl91fh838mswkfib0b770jqfrvvy"; - name = "kplotting-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kservice-5.9.0.tar.xz" ".tar"; - store = "/nix/store/jcbm2l3hqv69hplj3vglc8837ax09fx7-kservice-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kservice-5.9.0.tar.xz"; - sha256 = "1s854v2dlq8wz2ka068ycwaw1a1lhhb7jy576c4gw96ak1bcplj9"; - name = "kservice-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kbookmarks-5.9.0.tar.xz" ".tar"; - store = "/nix/store/9wkwlci1l6xcf9zgwnxnpsz2fqwx3lw0-kbookmarks-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kbookmarks-5.9.0.tar.xz"; - sha256 = "0arh7bzq2nanjy6bdd9zi8jcsnf6anhpam167i16plyq7jdpxd06"; - name = "kbookmarks-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kded-5.9.0.tar.xz" ".tar"; - store = "/nix/store/88mbi3xwlccpbgg879df0w5kiwb6cx68-kded-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kded-5.9.0.tar.xz"; - sha256 = "1kq75p9dbmckgazzxd499qsqyyzr88n0jxy41c10ay2paqfjrrrp"; - name = "kded-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "knewstuff-5.9.0.tar.xz" ".tar"; - store = "/nix/store/qxlar4y9n5m6c3n6pqh6hjar8kv4h6vp-knewstuff-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/knewstuff-5.9.0.tar.xz"; - sha256 = "1f9qgj87wd5w8gg2cglgzvxw5imcmw2pxv08p8c8as8xnh1b8iq0"; - name = "knewstuff-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "knotifyconfig-5.9.0.tar.xz" ".tar"; - store = "/nix/store/x5v2g50d4x92rsnyfywc6600y1bzr4lp-knotifyconfig-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/knotifyconfig-5.9.0.tar.xz"; - sha256 = "0hdxwcqhi56yaafbl0mc34vc6nbxj3ddm4jl15ykgs1d83pcprp7"; - name = "knotifyconfig-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "threadweaver-5.9.0.tar.xz" ".tar"; - store = "/nix/store/cpbmzpqihxbb2a60asc5spc0fc2xri7d-threadweaver-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/threadweaver-5.9.0.tar.xz"; - sha256 = "1wsnb4ghnibpmypr49nrhpbq9l0cxrr5ak19vhj223ifh09kiqfq"; - name = "threadweaver-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kcmutils-5.9.0.tar.xz" ".tar"; - store = "/nix/store/icr4xva0xdqidpdb42ijxr7ra8xcx2ag-kcmutils-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kcmutils-5.9.0.tar.xz"; - sha256 = "0mzj1fddcvcnxqyz2z6acbi724dz43x957nfs2ifn82ahjcpp05m"; - name = "kcmutils-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kwindowsystem-5.9.0.tar.xz" ".tar"; - store = "/nix/store/q5ny2mnrcz46jdr7vsjmgf24xrscly6d-kwindowsystem-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kwindowsystem-5.9.0.tar.xz"; - sha256 = "09c752jv1z1x2g3japivmj0ycpsx7fjkwswjibnm3av3j2k7if7z"; - name = "kwindowsystem-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "extra-cmake-modules-5.9.0.tar.xz" ".tar"; - store = "/nix/store/jd48z703zmnfhc8a0bz33i9p4ssl6gix-extra-cmake-modules-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/extra-cmake-modules-5.9.0.tar.xz"; - sha256 = "1iqbcj4zf4pwad5pc2pwnyjs6zswwwp1lsp5a8g9999adgqz54f9"; - name = "extra-cmake-modules-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kwallet-5.9.0.tar.xz" ".tar"; - store = "/nix/store/h53bsfzw71z8d6qx2g0j9v3g5q6zrn51-kwallet-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kwallet-5.9.0.tar.xz"; - sha256 = "1sbp512dg2mz10jrv2p8pglancaxbxi2bbmp05rfwfbz0bxyahld"; - name = "kwallet-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kguiaddons-5.9.0.tar.xz" ".tar"; - store = "/nix/store/4wb3a0ig4a4bpivyrjq8q7c79dqzzjkx-kguiaddons-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kguiaddons-5.9.0.tar.xz"; - sha256 = "0rk9bnln6g7xdw8vlldyqsfim75npi0adq627dqi3xfx03ccnp10"; - name = "kguiaddons-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "plasma-framework-5.9.0.tar.xz" ".tar"; - store = "/nix/store/kzqjb4w2py8ip75j19nfhqsldwg8d4x7-plasma-framework-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/plasma-framework-5.9.0.tar.xz"; - sha256 = "061b883vj27by3g8j087f2i6z0v76h6jljm5q2zs2dvr92jyqw8x"; - name = "plasma-framework-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kcodecs-5.9.0.tar.xz" ".tar"; - store = "/nix/store/ahzrjx81z3dmp8f2gs7qb8r0mz3c9ml6-kcodecs-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kcodecs-5.9.0.tar.xz"; - sha256 = "1y1s7rzh5g2cj4f8xq6sfw06rnabg1z0y49rafhvx03w9fck9pib"; - name = "kcodecs-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kxmlgui-5.9.0.tar.xz" ".tar"; - store = "/nix/store/sm45sg21cyp099s4apn6p0pypcm33ijx-kxmlgui-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kxmlgui-5.9.0.tar.xz"; - sha256 = "0hwbzvyb2psys2bbxw05r2jyiigay4dwwad636yhqqgcqv8zk2wv"; - name = "kxmlgui-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "ktextwidgets-5.9.0.tar.xz" ".tar"; - store = "/nix/store/acizf5h2fcmjsriwnkszrk8yv9zhxzgh-ktextwidgets-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/ktextwidgets-5.9.0.tar.xz"; - sha256 = "0ld3z2l96710yali3l83410yblgw2fjdm1hyqhjp94vvhabzvzgr"; - name = "ktextwidgets-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kinit-5.9.0.tar.xz" ".tar"; - store = "/nix/store/7zd0kxdpf33p7cc158sakl0h76l9bgik-kinit-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kinit-5.9.0.tar.xz"; - sha256 = "110s0yparwim7lnj7rcaqc00z0vx36cwyx74hx9vm4kfqvi11yav"; - name = "kinit-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kdbusaddons-5.9.0.tar.xz" ".tar"; - store = "/nix/store/c382r0g1wh1jgplfidaf57in3j7c3mnk-kdbusaddons-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kdbusaddons-5.9.0.tar.xz"; - sha256 = "1s92y1rha9kqys808zpl6cbzrzbxp4asrlwyl1djbyjv4gccs1zh"; - name = "kdbusaddons-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "frameworkintegration-5.9.0.tar.xz" ".tar"; - store = "/nix/store/78mqjc0zpiwzi7vwymz8jl1sr82pfhd2-frameworkintegration-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/frameworkintegration-5.9.0.tar.xz"; - sha256 = "0fnjx6vsfx71iq7nyxfp2msg6mdgp1kwy16ayrxmm4sfs1g7bdx9"; - name = "frameworkintegration-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kjobwidgets-5.9.0.tar.xz" ".tar"; - store = "/nix/store/f4zqsfim0xj45pciv87xf237mr3bi6qm-kjobwidgets-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kjobwidgets-5.9.0.tar.xz"; - sha256 = "11ib74i7w05p31m0wfkrwxwaa47gsfmnfggdnxc8aziswqww0x9n"; - name = "kjobwidgets-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "networkmanager-qt-5.9.0.tar.xz" ".tar"; - store = "/nix/store/9a8yy0x7gb64wnjzb3q09kww47iv74zp-networkmanager-qt-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/networkmanager-qt-5.9.0.tar.xz"; - sha256 = "0z7bbx9hzifsfr7pycj4lbhr0nbzvvy3zwirgkx401dxqyz063g4"; - name = "networkmanager-qt-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kpty-5.9.0.tar.xz" ".tar"; - store = "/nix/store/dxw9x2xnwlp0iz6x3q7dfjkdqyh23lkg-kpty-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kpty-5.9.0.tar.xz"; - sha256 = "1s3hj5s9ph0v7ndhmajn3avjbrrir52fk1hzxp0b1smv95hf1gli"; - name = "kpty-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kcompletion-5.9.0.tar.xz" ".tar"; - store = "/nix/store/jkz4hm0bbzk1z4rdw7mk11dmp73mdpn7-kcompletion-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kcompletion-5.9.0.tar.xz"; - sha256 = "0grmgzqfbi87agil0vygpf8x0kfzhl4h8kn2ljhmm8nqp5g9ah0k"; - name = "kcompletion-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kio-5.9.0.tar.xz" ".tar"; - store = "/nix/store/pamd5nf7v353zl3wqnmxaabwb3as2vrm-kio-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kio-5.9.0.tar.xz"; - sha256 = "0n8kf728zlyivz0vhp9lnygj2cwazll5llv227fvimh5mcsw68y4"; - name = "kio-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kparts-5.9.0.tar.xz" ".tar"; - store = "/nix/store/lrdpdzaqiqbqvdvmxwdgaawrafd5z8kd-kparts-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kparts-5.9.0.tar.xz"; - sha256 = "0kqa5s0j8smy31ql2y4niabp95c4c237spqcgllcpjz1kq2vbg2l"; - name = "kparts-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kiconthemes-5.9.0.tar.xz" ".tar"; - store = "/nix/store/ig6smkn1wq8yzcpmdlziqaqwsk0jbm84-kiconthemes-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kiconthemes-5.9.0.tar.xz"; - sha256 = "1nzfsn6asr91skxzd7i4d9qkn5rl6dylha37mxrlc9m6dhanf5zm"; - name = "kiconthemes-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kglobalaccel-5.9.0.tar.xz" ".tar"; - store = "/nix/store/n7x2xk0wnclxh8s2mlnw997376363i55-kglobalaccel-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kglobalaccel-5.9.0.tar.xz"; - sha256 = "07652pxqql2dj7280vryk5agank0rd3wmj93isbfak61q20y4snx"; - name = "kglobalaccel-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kapidox-5.9.0.tar.xz" ".tar"; - store = "/nix/store/525lhwwpxc9h9pbiyzr0qspk8sp0ml60-kapidox-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kapidox-5.9.0.tar.xz"; - sha256 = "1pva41v0x67nmpp4kiwmm61laxym3lj2jhc37d5b6qhsbvyq48jm"; - name = "kapidox-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kauth-5.9.0.tar.xz" ".tar"; - store = "/nix/store/xmziq9qlxfxmvl4bdxaf16z497fb38fi-kauth-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kauth-5.9.0.tar.xz"; - sha256 = "00kvdhxspkwy21fd1kvfh253cl3i5qkf6hlf3y75yjpsl2bh6vqz"; - name = "kauth-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kpackage-5.9.0.tar.xz" ".tar"; - store = "/nix/store/ib2x9bcdi7lm0gppw1q39p1mmwbid6f4-kpackage-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kpackage-5.9.0.tar.xz"; - sha256 = "04z6qqbb16y38g3bdbd209wh9k2bg9mw7zkzbkknz3xkd8b17fbf"; - name = "kpackage-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "knotifications-5.9.0.tar.xz" ".tar"; - store = "/nix/store/jic7izn9i0mblgxm8qfyvdrlgby8p7l7-knotifications-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/knotifications-5.9.0.tar.xz"; - sha256 = "1s1zqxcm1dwz5sjardddgyz2zdcdzpnyzlr9f9wy89jbkvji63wa"; - name = "knotifications-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kdesu-5.9.0.tar.xz" ".tar"; - store = "/nix/store/njrnjrpi0qsvvnpzx673gygyifp22xn4-kdesu-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kdesu-5.9.0.tar.xz"; - sha256 = "0j1f64pp6sisw1nrg0510nn5n0z734lkyn4nin4pv1qzsxjxs39r"; - name = "kdesu-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kcrash-5.9.0.tar.xz" ".tar"; - store = "/nix/store/gfz9mm191zrdwlv5l622gvgskg5aipy6-kcrash-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kcrash-5.9.0.tar.xz"; - sha256 = "0y4s68f580v2qyjygi33avn8a5aww5j4n25ci2qw1nhqz4jvvji7"; - name = "kcrash-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kdnssd-5.9.0.tar.xz" ".tar"; - store = "/nix/store/h4xfhg3m2qbhiqncz687abvcibanq84j-kdnssd-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kdnssd-5.9.0.tar.xz"; - sha256 = "086182qfm0jbap1wk1br9c0gzwbnxrsrm5nsh7d9h2k0fbd74cf2"; - name = "kdnssd-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kunitconversion-5.9.0.tar.xz" ".tar"; - store = "/nix/store/b5lgglmahl4cyrnnl3a8dr17j5bym6yj-kunitconversion-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kunitconversion-5.9.0.tar.xz"; - sha256 = "0ngbfma7nf5pjqra6378slqyqy8b9fqlyp3cb27n6qwcqn9pjfif"; - name = "kunitconversion-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kidletime-5.9.0.tar.xz" ".tar"; - store = "/nix/store/3ksyripr9w13540dmgpxf3pr4djn47wr-kidletime-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kidletime-5.9.0.tar.xz"; - sha256 = "135y54hkxyd19szb6zkin5l6n0mmfakl3asqnd0pxyh8a9nbdjz5"; - name = "kidletime-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kjsembed-5.9.0.tar.xz" ".tar"; - store = "/nix/store/9s6zm801gizhls4rpmrij23jzqnkcbjy-kjsembed-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/portingAids/kjsembed-5.9.0.tar.xz"; - sha256 = "1rvr9nkw7c5a433sqsjdaz1wrja4kny3kc74550qpimwjlcwirix"; - name = "kjsembed-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kdelibs4support-5.9.0.tar.xz" ".tar"; - store = "/nix/store/zx5l2jjfrfhb7i8x0m7abdw3qzcp8lhz-kdelibs4support-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/portingAids/kdelibs4support-5.9.0.tar.xz"; - sha256 = "1fvwwd2gj1wdfgd9jczvgm6fi2i08y9mdmvfc7cjh7rnwps5hy7d"; - name = "kdelibs4support-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "krunner-5.9.0.tar.xz" ".tar"; - store = "/nix/store/ng08bafm24q6nl1gfdschnljm3zly8rm-krunner-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/portingAids/krunner-5.9.0.tar.xz"; - sha256 = "1m95gm32rmvm9p4422if89vid4k29q0i7qdyakdn3z5zks23scdl"; - name = "krunner-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kross-5.9.0.tar.xz" ".tar"; - store = "/nix/store/ddrjg3drx3hj3bwf120y8pq1wq7q5m0s-kross-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/portingAids/kross-5.9.0.tar.xz"; - sha256 = "0brzycpqjyqryj86scv52m3p9mvhlq1swrmh22gpwwnvmh6ngdvj"; - name = "kross-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "khtml-5.9.0.tar.xz" ".tar"; - store = "/nix/store/qx36l5jwllflpamxwrn9v3ff2fhv33iz-khtml-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/portingAids/khtml-5.9.0.tar.xz"; - sha256 = "19m01gg5gz02i4z85jnlspb441v906cakd53mgwl1028r8h498pv"; - name = "khtml-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kjs-5.9.0.tar.xz" ".tar"; - store = "/nix/store/z4898f54az0nb4j4ydjsakiqpn6rz3zr-kjs-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/portingAids/kjs-5.9.0.tar.xz"; - sha256 = "1v6sk4kjf70ypgl7wxqfsjg6q5ms3qac1zjw54nw94qq55b9psvl"; - name = "kjs-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kmediaplayer-5.9.0.tar.xz" ".tar"; - store = "/nix/store/bzy6c2shbkv003dsh08ccn208lqdd17a-kmediaplayer-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/portingAids/kmediaplayer-5.9.0.tar.xz"; - sha256 = "13zswmpdidlpxa1h4dg1s74m584syqrrsgxll6b5yl1p7j4x0g5z"; - name = "kmediaplayer-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kitemmodels-5.9.0.tar.xz" ".tar"; - store = "/nix/store/4s94ln9czamd4p6gkllvp5b8plw35xmk-kitemmodels-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kitemmodels-5.9.0.tar.xz"; - sha256 = "0m5ag09narwglg799f4ahpjgxlxvnxjrshv1cbszp7v2naxh1365"; - name = "kitemmodels-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "modemmanager-qt-5.9.0.tar.xz" ".tar"; - store = "/nix/store/fdhdk8m0jy1g72k8mm11ljnmyw6ldp71-modemmanager-qt-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/modemmanager-qt-5.9.0.tar.xz"; - sha256 = "0ap1gr2xjnzmgl7cpi66xdgw14g4m0ax3q74vr86vdcsrmcql0b3"; - name = "modemmanager-qt-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kdoctools-5.9.0.tar.xz" ".tar"; - store = "/nix/store/b5fd64g9rrd46qakpzkrydnj6chpcx5c-kdoctools-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kdoctools-5.9.0.tar.xz"; - sha256 = "1iqp7d09j572splxr92gkadhmbd3rs4661ky45pajrk79g53brmk"; - name = "kdoctools-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kcoreaddons-5.9.0.tar.xz" ".tar"; - store = "/nix/store/zr152vxn36ph75ilmwyf5xc9vikczcap-kcoreaddons-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kcoreaddons-5.9.0.tar.xz"; - sha256 = "0cb5j65y7yv27d3dm3jzrparn5h6knk635sxnpdxvcjdgbpr93hi"; - name = "kcoreaddons-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kdewebkit-5.9.0.tar.xz" ".tar"; - store = "/nix/store/0x0j7zm9p1hrxq2793cf4dv9sjyn6k23-kdewebkit-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kdewebkit-5.9.0.tar.xz"; - sha256 = "08f1jfnxi3znyk20gszr79wwlx55dp0qavpy0ifm7s22vl3bswdy"; - name = "kdewebkit-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kimageformats-5.9.0.tar.xz" ".tar"; - store = "/nix/store/n7k5dazmp4rppbagy5b0frf1q72l5kcw-kimageformats-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kimageformats-5.9.0.tar.xz"; - sha256 = "114rrk1hpyfr4dq7kriddgd9nh0x2r1ylk4sa2sx8avhfqh01bmg"; - name = "kimageformats-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "karchive-5.9.0.tar.xz" ".tar"; - store = "/nix/store/yzy2r8ajkdw8g3qwbdjkf689b9qrsanl-karchive-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/karchive-5.9.0.tar.xz"; - sha256 = "1cmh06grw77fkj7fg4w6mpv3y0zyq25pwzl7vh00pyd9wqsgv89z"; - name = "karchive-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kdeclarative-5.9.0.tar.xz" ".tar"; - store = "/nix/store/x6j9vl25c8ixw1bv3zan69likxv2x5yr-kdeclarative-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kdeclarative-5.9.0.tar.xz"; - sha256 = "1x515r5w107g5zy6hhqmhh14ww2ar81zdlbhzm0ki5id16vmzcc4"; - name = "kdeclarative-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kitemviews-5.9.0.tar.xz" ".tar"; - store = "/nix/store/r0yi07vv52dbvfx1pgxidxqcdx7bbqii-kitemviews-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kitemviews-5.9.0.tar.xz"; - sha256 = "0xymycick40mxc6prvxyrqvg6ig9c9q2k3kp4i40468id88m8p8s"; - name = "kitemviews-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "sonnet-5.9.0.tar.xz" ".tar"; - store = "/nix/store/y4sh847b3hgkk6ikdr0rl3lljylzrz1k-sonnet-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/sonnet-5.9.0.tar.xz"; - sha256 = "06c78qdn9azadghz0jyzky4mk1qk51v6zyb7m2yrnisn2miyhv28"; - name = "sonnet-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kdesignerplugin-5.9.0.tar.xz" ".tar"; - store = "/nix/store/v5ad3dhkisy4rag5zqk3zx9lmc5hx4hm-kdesignerplugin-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kdesignerplugin-5.9.0.tar.xz"; - sha256 = "03x2vg2va2s323ynyqpin1srhwlak1yrl6hkzcxmyirqd36rq2ik"; - name = "kdesignerplugin-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kconfig-5.9.0.tar.xz" ".tar"; - store = "/nix/store/h4856ysd2x370375vdm1hfcbhxm3g49c-kconfig-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kconfig-5.9.0.tar.xz"; - sha256 = "1mhqlrsxnfqpafpjf3y4v4q5d1wqv404wkzfll07pihkivq52jd1"; - name = "kconfig-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kactivities-5.9.0.tar.xz" ".tar"; - store = "/nix/store/n2i4dy75ms4kjvv8m7rwxywwv8zvxhmk-kactivities-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kactivities-5.9.0.tar.xz"; - sha256 = "0lphz9jybmphdbbcdm74dzrlb01m8q7saxz04c30pl37kaxrplam"; - name = "kactivities-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "solid-5.9.0.tar.xz" ".tar"; - store = "/nix/store/h68n4cp0lkdclnww7mc7xfh4f7nyzjdi-solid-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/solid-5.9.0.tar.xz"; - sha256 = "1z8qxjpl7gbfhii2lz0g62vpip6iw998aq6xaxswgfy3l558xqwn"; - name = "solid-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kxmlrpcclient-5.9.0.tar.xz" ".tar"; - store = "/nix/store/2klkxcvdwqmfq5xwq7dsgk675vdxssz2-kxmlrpcclient-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kxmlrpcclient-5.9.0.tar.xz"; - sha256 = "1igjrq1z0cfgfkgifdjfyfcbvgabgn3gg85g7hxvqz262lscilwg"; - name = "kxmlrpcclient-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "ktexteditor-5.9.0.tar.xz" ".tar"; - store = "/nix/store/04kkss23ry8qhsd97w80q37958b25wa9-ktexteditor-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/ktexteditor-5.9.0.tar.xz"; - sha256 = "12ci3qhbq8hxvsv2q4rkr4q2sbs11zxn8afn7wwh4za1b80vgi4b"; - name = "ktexteditor-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "attica-5.9.0.tar.xz" ".tar"; - store = "/nix/store/75ipp7rrjrx3csia7blhwh9nf7jchprk-attica-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/attica-5.9.0.tar.xz"; - sha256 = "0wymjj5sch638hrn6z9xrmw8n9avrci16qxvig5sapr0wn2r51vj"; - name = "attica-5.9.0.tar.xz"; - }; - } - { - name = stdenv.lib.nameFromURL "kwidgetsaddons-5.9.0.tar.xz" ".tar"; - store = "/nix/store/s1gh5sqrpjicv1vxzb8affi51js2zk4j-kwidgetsaddons-5.9.0.tar.xz"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.9/kwidgetsaddons-5.9.0.tar.xz"; - sha256 = "1s8lbj779rkxd878v15awcbxpmvrm95cahiq9a54mv75mhlix1j1"; - name = "kwidgetsaddons-5.9.0.tar.xz"; - }; - } -] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 069e230dd144..d3d6ff843d29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6346,9 +6346,9 @@ let automake = automake111x; }; - kf59 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.9 { }); - kf5_latest = kf59; - kf5_stable = kf59; + kf510 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.10 { }); + kf5_latest = kf510; + kf5_stable = kf510; kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; @@ -11355,7 +11355,7 @@ let }; kdeApps_15_04 = recurseIntoAttrs (callPackage ../applications/kde-apps-15.04 { - kf5 = kf59; + kf5 = kf510; }); kdeApps_stable = kdeApps_15_04; kdeApps_latest = kdeApps_15_04; @@ -13585,7 +13585,7 @@ let numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { }; plasma53 = recurseIntoAttrs (callPackage ../desktops/plasma-5.3 { - kf5 = kf59; + kf5 = kf510; }); plasma5_latest = plasma53; plasma5_stable = plasma53; From b75d164018ac36e2c2d2d41784f146f60ebe7965 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 14 May 2015 08:24:28 -0500 Subject: [PATCH 176/615] Upgrade to kde-applications-15.04.1 --- pkgs/applications/kde-apps-15.04/manifest.nix | 2043 +++++++++++++++++ pkgs/applications/kde-apps-15.04/manifest.sh | 1 + 2 files changed, 2044 insertions(+) diff --git a/pkgs/applications/kde-apps-15.04/manifest.nix b/pkgs/applications/kde-apps-15.04/manifest.nix index 09d89ef70458..bdf5b3cfc560 100644 --- a/pkgs/applications/kde-apps-15.04/manifest.nix +++ b/pkgs/applications/kde-apps-15.04/manifest.nix @@ -2035,6 +2035,2040 @@ name = "kjumpingcube-15.04.0.tar.xz"; }; } + { + name = stdenv.lib.nameFromURL "okular-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0j337gxam8fflqmaq9ggjgdjqmz53ank-okular-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/okular-15.04.1.tar.xz"; + sha256 = "0yg9ivscx8nrdb9gq6xq6fm3y8lksnkcjdi0908axmqr8gxnh5c5"; + name = "okular-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktux-15.04.1.tar.xz" ".tar"; + store = "/nix/store/909abb7a2m5zlw96wycw77ry7na2y6fc-ktux-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktux-15.04.1.tar.xz"; + sha256 = "07v559yw4dpryfi7x4c7305dac9i5pkaj0m5dxbgsvsyc5qmmv18"; + name = "ktux-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcalc-15.04.1.tar.xz" ".tar"; + store = "/nix/store/gy0khp88rwah803y4r9q6jfghkjf857h-kcalc-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kcalc-15.04.1.tar.xz"; + sha256 = "1w279713fipi82skai7f31q5yzn6yjm3bhd236igd9a24blzr2xa"; + name = "kcalc-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kollision-15.04.1.tar.xz" ".tar"; + store = "/nix/store/sr1wh5xb0kj4yw5qy5qqf5mfrbwva980-kollision-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kollision-15.04.1.tar.xz"; + sha256 = "0pq8pvqjynfmkafaxx9hl4dd8i0blq8vkzpnkhn3zkd450bwjdpc"; + name = "kollision-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgamma-15.04.1.tar.xz" ".tar"; + store = "/nix/store/3nifa51gknij2kxwlhsi70qz5xmc36dg-kgamma-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kgamma-15.04.1.tar.xz"; + sha256 = "1w0sb9yk3wj38jqhbr1g72jagy99v2ihrm81r4wp274i602h9s2s"; + name = "kgamma-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kapptemplate-15.04.1.tar.xz" ".tar"; + store = "/nix/store/illwb8qn9c9s67m5y4f5cx0d5f3l860k-kapptemplate-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kapptemplate-15.04.1.tar.xz"; + sha256 = "09s0bk8kp338iy2bpq3gaa3sa52qk42zw4wxccgvxj9hjhh894nk"; + name = "kapptemplate-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kalgebra-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0dz4823nkpmlvxby7ki3vb0ppfshwz45-kalgebra-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kalgebra-15.04.1.tar.xz"; + sha256 = "17qxij5kdk0vymqfq1csmp071sscjc19pw9y39g59njk4bbdih3m"; + name = "kalgebra-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "oxygen-icons-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ck0pb49q3kv6jzkmwliw1sdp8qbpzplr-oxygen-icons-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/oxygen-icons-15.04.1.tar.xz"; + sha256 = "0asr2k1i0bm8pm9kj12c9s5bkwvz25pgsv167hb2cvfgm8ahyvlj"; + name = "oxygen-icons-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-kioslaves-15.04.1.tar.xz" ".tar"; + store = "/nix/store/6w7jbq7m0kfjc37rnd6yf0ww3xdmb27x-kdesdk-kioslaves-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdesdk-kioslaves-15.04.1.tar.xz"; + sha256 = "1pb258bhqikc9nmzs10y98gzd6na0sqyhgfzm1rq1hkmg4dkslwa"; + name = "kdesdk-kioslaves-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "pairs-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ky762jidy4zxzwbllfxz46h7bq76v2df-pairs-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/pairs-15.04.1.tar.xz"; + sha256 = "078j19w99v50zck64mrir0pr1r45k136lprdndxrpdmxq3zx36px"; + name = "pairs-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "svgpart-15.04.1.tar.xz" ".tar"; + store = "/nix/store/qgdyrm00y38n3xidjc5hqyi1aid7hn0y-svgpart-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/svgpart-15.04.1.tar.xz"; + sha256 = "0mwbbx490i1z038jxkl8pyjaisks2k18nn5ccs1d65k5p67pcf3b"; + name = "svgpart-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "amor-15.04.1.tar.xz" ".tar"; + store = "/nix/store/qjyg81gbsdbdwc4vzxhfwvbc2r5jqbxc-amor-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/amor-15.04.1.tar.xz"; + sha256 = "071wnfp1p9xd6asir4ssvb19jcfbwqg472znl5bw7n09qp5i7w9m"; + name = "amor-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-bs-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zi9amimbp5ag5frcx0myg5ksc25whknc-kde-l10n-bs-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-bs-15.04.1.tar.xz"; + sha256 = "1il3l1fmavigjndy8pwb0m9jvz0wzm39p0pm10b12vv394623i5f"; + name = "kde-l10n-bs-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-he-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zs5dds7lhag23vwc2f83bd9wchi6k0zh-kde-l10n-he-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-he-15.04.1.tar.xz"; + sha256 = "1jn8b5m4i9gxyfi2acjxjqcq0rzp9b70miji17vjc8q1a7241pmg"; + name = "kde-l10n-he-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ug-15.04.1.tar.xz" ".tar"; + store = "/nix/store/8nlrz9m17ljb459zm6zq5nx8nnpwly16-kde-l10n-ug-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ug-15.04.1.tar.xz"; + sha256 = "184xqway79p33fi8mc1xx6h0lply1r8xsj4qjjqnd30sg5hzn0lp"; + name = "kde-l10n-ug-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nb-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zgij63xalg6c9i3nm1bc6ap6zvspm8p2-kde-l10n-nb-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-nb-15.04.1.tar.xz"; + sha256 = "1zlarins81lj11ljr1k1ma27wy6jyl7q33p2xisjwqi4qw6jmhza"; + name = "kde-l10n-nb-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-de-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xy0x7in8bkpn6z6ac2v6cx3rvzij2jma-kde-l10n-de-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-de-15.04.1.tar.xz"; + sha256 = "0gki5x7nlpvhxqwg6gqajh5swql6vvi9c37lys7ng2hpqc5xy7pf"; + name = "kde-l10n-de-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-it-15.04.1.tar.xz" ".tar"; + store = "/nix/store/pr9ckm8k6y78gqb5y33ny8zm6hgbm6iy-kde-l10n-it-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-it-15.04.1.tar.xz"; + sha256 = "1grfxlcc896zgq74q6cqy6l878bkyhchr4n8jcjiqzl7xn3p2q5c"; + name = "kde-l10n-it-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sv-15.04.1.tar.xz" ".tar"; + store = "/nix/store/rqbgin8gv0jy20hgl2j0pp56k93k4hp6-kde-l10n-sv-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-sv-15.04.1.tar.xz"; + sha256 = "1wzpisiqdcsw698j1bf22gzjqawwmmcpslx6yhmrn8462k5iq0d7"; + name = "kde-l10n-sv-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ja-15.04.1.tar.xz" ".tar"; + store = "/nix/store/5vbrfwv9s2klrxw3k6vz4833qvldarp0-kde-l10n-ja-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ja-15.04.1.tar.xz"; + sha256 = "0jsnx9sjs1wz2f8i9bbl2v59f56azggqbl610idj0xdjn7zhk311"; + name = "kde-l10n-ja-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-lv-15.04.1.tar.xz" ".tar"; + store = "/nix/store/j9mbwhpxw612xc9bilzhdgsayi9bqwjl-kde-l10n-lv-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-lv-15.04.1.tar.xz"; + sha256 = "1c6g0rkd209j2q9m2q5rcf8j24gnc1g11kq87cjyj88jvidc0jpl"; + name = "kde-l10n-lv-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-mr-15.04.1.tar.xz" ".tar"; + store = "/nix/store/wziwfgk9xh3k79xz9pvpfjvjavjalc37-kde-l10n-mr-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-mr-15.04.1.tar.xz"; + sha256 = "02hd8p6fzralbhz622nzxyn13p1lqxzyi229vc8ni7qz9mqia02k"; + name = "kde-l10n-mr-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nds-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vg6xw3206sf0nys7179l6a04ymiwqy3w-kde-l10n-nds-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-nds-15.04.1.tar.xz"; + sha256 = "10hija63jh38pqm9j9lln2n705sfm13zn2h3rv4jl0q7m75hdl0m"; + name = "kde-l10n-nds-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-15.04.1.tar.xz" ".tar"; + store = "/nix/store/2fk00654fxijdpmzqpf5qwbbxdlfxs25-kde-l10n-zh_CN-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-zh_CN-15.04.1.tar.xz"; + sha256 = "16rsjrwfafvrgl48dnpbd2lnzja186zq7sq83dafg9hs636md6ff"; + name = "kde-l10n-zh_CN-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ca-15.04.1.tar.xz" ".tar"; + store = "/nix/store/i30703ryicxz0zf6fk08mzpcr7wvyps8-kde-l10n-ca-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ca-15.04.1.tar.xz"; + sha256 = "1008mb8ygak03dg0xxwsb54px0qashh1nnrpj0wwfqvgfbqa19fm"; + name = "kde-l10n-ca-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nl-15.04.1.tar.xz" ".tar"; + store = "/nix/store/mdcybgna88hx6jlmyj2m6ss32yw4i7z3-kde-l10n-nl-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-nl-15.04.1.tar.xz"; + sha256 = "1s6zrnbhnpqwpb1mgrnayqvzggb1wrmc4w166y8j9bvjc0jahlfp"; + name = "kde-l10n-nl-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sr-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k179rl7a4avlv20w4spxzl19mk567jv3-kde-l10n-sr-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-sr-15.04.1.tar.xz"; + sha256 = "1k6q4l7xllrs26xvrhfp8lbq0rgp49aq3r9y85crdmf5xy1zk4bc"; + name = "kde-l10n-sr-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ro-15.04.1.tar.xz" ".tar"; + store = "/nix/store/8i9bjzsxfxh4n5w385k0figmm9cwfy65-kde-l10n-ro-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ro-15.04.1.tar.xz"; + sha256 = "1svqhp23y5xmnmrba8vzamac6zf4lz02gfck9xi8kq5zhs1zky7w"; + name = "kde-l10n-ro-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hr-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vd6ihrlxp8m0hf7x3b05sglmn9xggjy1-kde-l10n-hr-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-hr-15.04.1.tar.xz"; + sha256 = "00rn1947pw57cl4lwyx3hm7ic4w45lsh82m3sr3l8wa26qm6qz17"; + name = "kde-l10n-hr-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pl-15.04.1.tar.xz" ".tar"; + store = "/nix/store/8rp1dba5nc9b2b2m4dvl51rd74xrnkdn-kde-l10n-pl-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-pl-15.04.1.tar.xz"; + sha256 = "09rs6abbm4bj0wy2s0y7b44lacraq1ypxvmil5cxj95apk6qy4sa"; + name = "kde-l10n-pl-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-cs-15.04.1.tar.xz" ".tar"; + store = "/nix/store/bnwiza33rhdlnc61bvfx521cy02d8scc-kde-l10n-cs-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-cs-15.04.1.tar.xz"; + sha256 = "1xl397n7vdfcpzg5qfcdbmw92p6ail90s15vvbxq2c4didysgrcz"; + name = "kde-l10n-cs-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-is-15.04.1.tar.xz" ".tar"; + store = "/nix/store/7mxx0v3fd90vi123hw0k9hinmzxh4z1z-kde-l10n-is-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-is-15.04.1.tar.xz"; + sha256 = "0c03jsb4lbp5wn0inzv3z86as0din40ypjh5jwj6zparjgg7v017"; + name = "kde-l10n-is-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hi-15.04.1.tar.xz" ".tar"; + store = "/nix/store/lwqhr1l80ki47ysz51ckiz05z9wxfphv-kde-l10n-hi-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-hi-15.04.1.tar.xz"; + sha256 = "0gwin6w51iskb9wss97mg3pvwbfca67jqisz3v6qljy770p8d16j"; + name = "kde-l10n-hi-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-es-15.04.1.tar.xz" ".tar"; + store = "/nix/store/iqfv8rf2qlaif5k6km6i68qpdha2p8ib-kde-l10n-es-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-es-15.04.1.tar.xz"; + sha256 = "00j195zzqmirq3d64sq86n11fhp4gzd8wq7bvr4byg76crv1wsqv"; + name = "kde-l10n-es-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-eo-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zkjp2bbs8d6j6k3wgwij5q1zaiaxvzhi-kde-l10n-eo-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-eo-15.04.1.tar.xz"; + sha256 = "1kpd83bf72hjp8dir6cv75rb9wjnljdwxk4ff1mp2ph7rzhm8hxf"; + name = "kde-l10n-eo-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-15.04.1.tar.xz" ".tar"; + store = "/nix/store/09hg9zfgwdgvdaxx985kk1xf9hky3r7h-kde-l10n-zh_TW-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-zh_TW-15.04.1.tar.xz"; + sha256 = "1k4f9031572mxkg5rk2i98angr9rqcbqkp3zrg7blfpndbqbhzzl"; + name = "kde-l10n-zh_TW-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sk-15.04.1.tar.xz" ".tar"; + store = "/nix/store/5lzgd16vdwbziizylnx114dpaycm0xmy-kde-l10n-sk-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-sk-15.04.1.tar.xz"; + sha256 = "1j96parls7psj0nr0305wdpdjxdrh8bqgbs89mrbk8wgzj9agsh8"; + name = "kde-l10n-sk-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ru-15.04.1.tar.xz" ".tar"; + store = "/nix/store/hf6x95pyziykm6j2kxlaavr4585l19x5-kde-l10n-ru-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ru-15.04.1.tar.xz"; + sha256 = "1lqc7fvw4spca4va4id24ni19s4gzxzf5qrzfqgav4xf6hwndi3c"; + name = "kde-l10n-ru-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ga-15.04.1.tar.xz" ".tar"; + store = "/nix/store/x29ma96kp1mf389k6kjpl65fwqbkkjzk-kde-l10n-ga-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ga-15.04.1.tar.xz"; + sha256 = "1m1dihyak0z5h6932rmb09q3hhbyzkck0gwnp3gdqa84m1b8kmid"; + name = "kde-l10n-ga-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-kk-15.04.1.tar.xz" ".tar"; + store = "/nix/store/iacgwmkzrc75y7xf281zcfz7fha9c740-kde-l10n-kk-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-kk-15.04.1.tar.xz"; + sha256 = "1lcan2x6f7v159zmix2h730pj21rlqmqxvizcd0jrwmnqxf9ww1k"; + name = "kde-l10n-kk-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pt-15.04.1.tar.xz" ".tar"; + store = "/nix/store/lk6ncn5aa4p373igs7j8g6mwa4a2iqma-kde-l10n-pt-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-pt-15.04.1.tar.xz"; + sha256 = "07pqq7yggq2cjsn60wygbzz37dprp30dhabqj6il6gahl9y5y1fj"; + name = "kde-l10n-pt-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-15.04.1.tar.xz" ".tar"; + store = "/nix/store/adcsrsz6kj7605a7whakszmsjrb3r0nc-kde-l10n-pt_BR-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-pt_BR-15.04.1.tar.xz"; + sha256 = "0c5z73pr7m4pq52pjk7q097755g2kswjzjcq5pwc94za0yj055l2"; + name = "kde-l10n-pt_BR-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ko-15.04.1.tar.xz" ".tar"; + store = "/nix/store/i9kc413jrn1l9rywv7vsbhgsvz7lffis-kde-l10n-ko-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ko-15.04.1.tar.xz"; + sha256 = "1i34awq71si561p6ggahk6phav9p7rlyc34lg38w7mlqb0d6bjqq"; + name = "kde-l10n-ko-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-da-15.04.1.tar.xz" ".tar"; + store = "/nix/store/s9rqm9a1rvwx7zikmm5fwydsaggsgk25-kde-l10n-da-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-da-15.04.1.tar.xz"; + sha256 = "0h5784ba12yh5szyilbw6l4alac4kvgq9bmzpmga032jpc0g9k0l"; + name = "kde-l10n-da-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-et-15.04.1.tar.xz" ".tar"; + store = "/nix/store/4pxnpsmz3siicy40i3m1x4ji852ps53s-kde-l10n-et-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-et-15.04.1.tar.xz"; + sha256 = "0x208lv7qrhflgz5qmpp64wqx4avb3mbjr625nqpk8c5w9swqify"; + name = "kde-l10n-et-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fa-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0bdylm7gbn4ddfw95mz3zwvpizjfflgz-kde-l10n-fa-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-fa-15.04.1.tar.xz"; + sha256 = "11lsciiys8dk6mzvd5fp4kypk2355ppdd20fkqd99vp2z3rknv9r"; + name = "kde-l10n-fa-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nn-15.04.1.tar.xz" ".tar"; + store = "/nix/store/1pxdddwrqh1lwq69ybfc3bq4wqyp4wsp-kde-l10n-nn-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-nn-15.04.1.tar.xz"; + sha256 = "1vn9bcjba6wcym0cvfwhzyn7n4aa9jc3w7apahc72sqzq1irjapl"; + name = "kde-l10n-nn-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-en_GB-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k8jamljw1l6zrpqwl4ai6103rcxlkxr6-kde-l10n-en_GB-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-en_GB-15.04.1.tar.xz"; + sha256 = "10gypxkclg037crrv5ifyrj5yahjmfr8x7h41b2zrxy2mvibfpw8"; + name = "kde-l10n-en_GB-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-gl-15.04.1.tar.xz" ".tar"; + store = "/nix/store/cr32nv49a2k622v9g0x8c3wbq0ydv9g4-kde-l10n-gl-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-gl-15.04.1.tar.xz"; + sha256 = "1wjw21vifqzr35rpmffavxljbw6h9ci7awllj447sgqyw2c59pls"; + name = "kde-l10n-gl-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ar-15.04.1.tar.xz" ".tar"; + store = "/nix/store/kxabywd2fc6249jy9pwqkjmbigi11hca-kde-l10n-ar-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ar-15.04.1.tar.xz"; + sha256 = "0ngff802m80bi28khp9m60j5j2fh8f3nghp81l8a27kmlzl0np9j"; + name = "kde-l10n-ar-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-eu-15.04.1.tar.xz" ".tar"; + store = "/nix/store/7xgibrqzv5gsvswx0k5y52pawd5fd14k-kde-l10n-eu-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-eu-15.04.1.tar.xz"; + sha256 = "0fpfahmlniyhsxlx7p1ln9ldy3zjxak8cqi24p2rv8xcm3238dlf"; + name = "kde-l10n-eu-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-tr-15.04.1.tar.xz" ".tar"; + store = "/nix/store/fk5q2f8nwj9cw94k036yf1fgn5kg4g1c-kde-l10n-tr-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-tr-15.04.1.tar.xz"; + sha256 = "1r40gg4cz5s7g5c54a8c6mmx6v27lqx1sbygm5cb9xsqqp0il1yi"; + name = "kde-l10n-tr-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.1.tar.xz" ".tar"; + store = "/nix/store/j3xp083a1ggngx4rkbg7jzvci8nmpwkh-kde-l10n-ca_valencia-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ca@valencia-15.04.1.tar.xz"; + sha256 = "0gm5aljn22jf5vpanvmhxviyqr3wbi5rn3m6dkx552j2rw2qkazd"; + name = "kde-l10n-ca_valencia-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-km-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zqkgqclj5c9ssqnzycg6449740s6n1rm-kde-l10n-km-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-km-15.04.1.tar.xz"; + sha256 = "0prmwyjjmw5mimbi5dkzcmgynazi5lvrjkinfl9z49l2dcqmwkks"; + name = "kde-l10n-km-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pa-15.04.1.tar.xz" ".tar"; + store = "/nix/store/hicn3pxa99ihaj704v6f1l1kfmxdfm98-kde-l10n-pa-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-pa-15.04.1.tar.xz"; + sha256 = "1civainv5170xvn20vx8rmghkfdlc6554nncq22l55q2f78pgg29"; + name = "kde-l10n-pa-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fi-15.04.1.tar.xz" ".tar"; + store = "/nix/store/m08cm6y7gnpyhdszbza3id8j08v1qvsn-kde-l10n-fi-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-fi-15.04.1.tar.xz"; + sha256 = "1q3b25h983y2jin4llml0s4wm5ja0rplsczr5zci99vyi1jv2i3w"; + name = "kde-l10n-fi-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-id-15.04.1.tar.xz" ".tar"; + store = "/nix/store/c5ssvbyi0gdr7da99a3mg0snwwmqzi1c-kde-l10n-id-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-id-15.04.1.tar.xz"; + sha256 = "0gs7l2i71hzwyn12gjrdqr5lm996vglrbqbvn0jmzyp6zjzha6ah"; + name = "kde-l10n-id-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-lt-15.04.1.tar.xz" ".tar"; + store = "/nix/store/hslbisaanz2z17mvspp4jbsx95pgwsgh-kde-l10n-lt-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-lt-15.04.1.tar.xz"; + sha256 = "02qmdg0gkcmcgj9gffawij8c64fjs7s70yysnlnp3wmb7vy4ppqh"; + name = "kde-l10n-lt-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-wa-15.04.1.tar.xz" ".tar"; + store = "/nix/store/3lzxjwp4rrgp3rn6f3x42ylfk1qf4g12-kde-l10n-wa-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-wa-15.04.1.tar.xz"; + sha256 = "139v2k0jvm7xndwhgrs0x15l1plb49qpzbdny928gjymxq5x66ar"; + name = "kde-l10n-wa-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fr-15.04.1.tar.xz" ".tar"; + store = "/nix/store/yzfn0nlwhlm1q6x04ydz4p4rdinwazpn-kde-l10n-fr-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-fr-15.04.1.tar.xz"; + sha256 = "1x36334bi1q4sii7j24xr39jxw6k22p4m1c2mz43s0ix0gzyx6n0"; + name = "kde-l10n-fr-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-bg-15.04.1.tar.xz" ".tar"; + store = "/nix/store/v3qlbc9qq7m6pa8m1iz6qw3wam7c8qh4-kde-l10n-bg-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-bg-15.04.1.tar.xz"; + sha256 = "1frd276wzvhwczdws589xy4bpg58yill263lfg8bjvg1v00pr6j8"; + name = "kde-l10n-bg-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-uk-15.04.1.tar.xz" ".tar"; + store = "/nix/store/sjnpw624x3hm8spj91lfy2aqilfn9vv4-kde-l10n-uk-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-uk-15.04.1.tar.xz"; + sha256 = "041zhdfmdbca74cgc69dzspn670i9cv32mhb8319q85xp1jr3wbs"; + name = "kde-l10n-uk-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sl-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k5f977w8bgbi72wcf00p1wng4wr58y2q-kde-l10n-sl-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-sl-15.04.1.tar.xz"; + sha256 = "078r48vgbi72wrx5hnjbgkakp108v79lyb6jpllcn7a8sd71cm6s"; + name = "kde-l10n-sl-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hu-15.04.1.tar.xz" ".tar"; + store = "/nix/store/rck5qqcnw6id22p4ak703wbpygwxl3gx-kde-l10n-hu-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-hu-15.04.1.tar.xz"; + sha256 = "1vbbv0lmim0368kc328x430s69fybsg3mh5wnadfrkmlzliigh3l"; + name = "kde-l10n-hu-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-el-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ydwfc2skbipdis45li6vj1qahaxdqxxj-kde-l10n-el-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-el-15.04.1.tar.xz"; + sha256 = "131064jjxqqi50ywljic71fdismqpqg9h1yjyv8wxs9rl1mb8s90"; + name = "kde-l10n-el-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ia-15.04.1.tar.xz" ".tar"; + store = "/nix/store/l89gan31lfivzmmjq1wvqgk6jaqvi6bw-kde-l10n-ia-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ia-15.04.1.tar.xz"; + sha256 = "092s5b2abb8amiqcvg95p84b91jncxcmbad3yhkxw2lkzllrl83y"; + name = "kde-l10n-ia-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksystemlog-15.04.1.tar.xz" ".tar"; + store = "/nix/store/42gd0z1f41kc9jfk2sdqyx7lr5dzyh6l-ksystemlog-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ksystemlog-15.04.1.tar.xz"; + sha256 = "0zf7vzlxvby6kf8ccydy4dxwwkmr3lhhpklgiywz6m26i4iapjdg"; + name = "ksystemlog-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdeedu-15.04.1.tar.xz" ".tar"; + store = "/nix/store/8pcp0gamz0v2vfjgvjr2avgchwzrs128-libkdeedu-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkdeedu-15.04.1.tar.xz"; + sha256 = "1y3zmhbbwl98cm8whkpafsrk4n9pn7ass6pyn9pnwz8g1lc853ig"; + name = "libkdeedu-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcharselect-15.04.1.tar.xz" ".tar"; + store = "/nix/store/gwccqzp4a5glln0zpp179j932l9cdwbd-kcharselect-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kcharselect-15.04.1.tar.xz"; + sha256 = "1v4j2jn05vynnzpk11r2vg79v8ih945vkv37xw4isvfcicd5bjjh"; + name = "kcharselect-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "krfb-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k67yxmxak82q0bigh94har3zd57g8ijb-krfb-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/krfb-15.04.1.tar.xz"; + sha256 = "0mscrcvbhmhm7a330rwxywxpk09h4255j0ah3f5lq08zwhrpzd9r"; + name = "krfb-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "palapeli-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zyqcyz9b4g57ww1cwz6hmhga1nwhmcjd-palapeli-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/palapeli-15.04.1.tar.xz"; + sha256 = "17xxsmrksxvf4km7a1dbcx2fsbiiwkhszdr17gywlz6b1k2rpybj"; + name = "palapeli-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwalletmanager-15.04.1.tar.xz" ".tar"; + store = "/nix/store/c7m3wis5dcxivjswlzcw8pp216pq813a-kwalletmanager-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kwalletmanager-15.04.1.tar.xz"; + sha256 = "0j197d8cmmgv8mz1scgp9qdq87sx318nkb7jymc28cc6d49mrwgx"; + name = "kwalletmanager-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgeography-15.04.1.tar.xz" ".tar"; + store = "/nix/store/bzaka1rvr5lr71h054w8zw10xlqpgd70-kgeography-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kgeography-15.04.1.tar.xz"; + sha256 = "0g4wxd3qzsp99m4h5aga5cwky1xffwpys3lm29083agl8gvyrs0p"; + name = "kgeography-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "blinken-15.04.1.tar.xz" ".tar"; + store = "/nix/store/wdnknychhn65zahmpka1x60n082mqjfg-blinken-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/blinken-15.04.1.tar.xz"; + sha256 = "0vavcjbsc4lx0a715pwqshc5l03h3nlpk8lpbbswik47rs10k156"; + name = "blinken-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "rocs-15.04.1.tar.xz" ".tar"; + store = "/nix/store/im5b97nl4p7f5f1pkzrhjbqbhx6p5ap7-rocs-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/rocs-15.04.1.tar.xz"; + sha256 = "1cplxlv8a7vsa18j7m629h06v4a0z123mhmg8blzqwh0wwsj71r8"; + name = "rocs-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepimlibs-4.14.8.tar.xz" ".tar"; + store = "/nix/store/mxcxsdllc81x1w8y4p40b1s5gkkbzsqm-kdepimlibs-4.14.8.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdepimlibs-4.14.8.tar.xz"; + sha256 = "0522aby3gm99n18g7p59vi0rzz0ysj9rzljlci5j873mv7yff242"; + name = "kdepimlibs-4.14.8.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knetwalk-15.04.1.tar.xz" ".tar"; + store = "/nix/store/kmp1kna6sixbxjdzcnn1agarx8xq9ps4-knetwalk-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/knetwalk-15.04.1.tar.xz"; + sha256 = "1hq7cldh4n9kbfhc1bj3mra9dgafk6hkn5pazp2rfipmfmxj3w3b"; + name = "knetwalk-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "marble-15.04.1.tar.xz" ".tar"; + store = "/nix/store/klfb6qwspc6raf7kw49s3y5xgdxn9l77-marble-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/marble-15.04.1.tar.xz"; + sha256 = "0aqgh7s07ryhyz0a62pzj3a73ip26df1cw9g103x5iapia5lyp3p"; + name = "marble-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kolf-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xd8id5gbv47bg5jrk8qammqviv861s60-kolf-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kolf-15.04.1.tar.xz"; + sha256 = "1r8zqlmwz2dr3pgh921z3j8pvcry7366qyr6kybkjhyjqr1rmhdh"; + name = "kolf-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbounce-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vhp18ifxb0v5nnfna3z8qnkpdksc51bd-kbounce-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kbounce-15.04.1.tar.xz"; + sha256 = "0qxmvkwcanm50w8jd2fcf0q557ywz198ifgsx8piyxmjg8j0hal6"; + name = "kbounce-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "audiocd-kio-15.04.1.tar.xz" ".tar"; + store = "/nix/store/3ma0rszdvi8hsz0r5f27yafarzmbr1l0-audiocd-kio-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/audiocd-kio-15.04.1.tar.xz"; + sha256 = "1gxr9ny09sqb80bhkd21wfl902j8kl5qlgvs9amasabgq7450rbq"; + name = "audiocd-kio-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwordquiz-15.04.1.tar.xz" ".tar"; + store = "/nix/store/l1yn11z138jfwx11qz2hdvklsvray4ml-kwordquiz-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kwordquiz-15.04.1.tar.xz"; + sha256 = "0xjk9ihlvs8v79mwqry91lzr5kqnj80wfg84gab8djz7gsixgp0y"; + name = "kwordquiz-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmousetool-15.04.1.tar.xz" ".tar"; + store = "/nix/store/wwv9f44nhm3rqhw2x67yb9fvxsc31shf-kmousetool-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kmousetool-15.04.1.tar.xz"; + sha256 = "1833yjmgky80w8l06k31j5fd607kada5pi85rcc1730i3g18mqys"; + name = "kmousetool-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zsx5r10khmay1jfph7202zd9k0kqk68f-kdesdk-strigi-analyzers-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdesdk-strigi-analyzers-15.04.1.tar.xz"; + sha256 = "1yhaixb6dqpw02v1y0zqj6yl2i4lr1m69ns20bb2qaz44kbril7k"; + name = "kdesdk-strigi-analyzers-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksaneplugin-15.04.1.tar.xz" ".tar"; + store = "/nix/store/6jdycwm8ads0midd532mh8g4rc3zis63-ksaneplugin-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ksaneplugin-15.04.1.tar.xz"; + sha256 = "0wlirj6dqigdnz2xy5yab0cf6npzvx91zbyg9plfqig4h0m5vjrw"; + name = "ksaneplugin-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kaccessible-15.04.1.tar.xz" ".tar"; + store = "/nix/store/f7ik0yppcn93na9m9dm7qxkfykm7n0im-kaccessible-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kaccessible-15.04.1.tar.xz"; + sha256 = "01jnaz0n81vyy8wghy21h5ignx4sllv56g3dpck86cj16dh2ymiz"; + name = "kaccessible-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kqtquickcharts-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ypf8qvq4gmys2llq8v7nzayi7nw782lj-kqtquickcharts-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kqtquickcharts-15.04.1.tar.xz"; + sha256 = "0spg0hfhsngipbdbm8c6yxfw538jk5rdfs83rp2hk7zhhkqvphmj"; + name = "kqtquickcharts-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbreakout-15.04.1.tar.xz" ".tar"; + store = "/nix/store/i08nk9biny2fqal1kkzs9lwpxxp2rwf5-kbreakout-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kbreakout-15.04.1.tar.xz"; + sha256 = "0fg6z8b2p43c0p11ijbha2f6dycc4f0z487sg6y8jr6vqszqwm6q"; + name = "kbreakout-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksnakeduel-15.04.1.tar.xz" ".tar"; + store = "/nix/store/r12i36mznnvlgwxm6x3vazwnvargpc60-ksnakeduel-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ksnakeduel-15.04.1.tar.xz"; + sha256 = "00b0ssad8cvjbp30n5lif41ni1515r892xxfvmyl50ajn0s484g1"; + name = "ksnakeduel-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kreversi-15.04.1.tar.xz" ".tar"; + store = "/nix/store/qqw2j0bsr3s5rn9s0a32ia15ciqa0ggj-kreversi-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kreversi-15.04.1.tar.xz"; + sha256 = "0czkvks9i7i4nl64afml9g029ahp9xxqyfv2jqphhyrz7al36l81"; + name = "kreversi-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdcraw-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xca9i6zvlnrnn6cqvab1dj91id7ns8bz-libkdcraw-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkdcraw-15.04.1.tar.xz"; + sha256 = "115b8m4f588mxmq8f4chg10nbb3wry3zvxgmji7pac49aszvdgj0"; + name = "libkdcraw-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "artikulate-15.04.1.tar.xz" ".tar"; + store = "/nix/store/b5ybam6zgslfklbmr1nvj8xxb2n0ay27-artikulate-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/artikulate-15.04.1.tar.xz"; + sha256 = "1498gndm0w96s7v109f8fc9y4bkb6bl9c0jaw24i1wn97hiiwigf"; + name = "artikulate-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkipi-15.04.1.tar.xz" ".tar"; + store = "/nix/store/czagm2ybdwy6z3672z5ck07pqjjkdh7z-libkipi-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkipi-15.04.1.tar.xz"; + sha256 = "12rmhva1kcjvcb21rhb5r6kx5bhs3zp66zg05zp0r4r5kbcf7rir"; + name = "libkipi-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kiriki-15.04.1.tar.xz" ".tar"; + store = "/nix/store/4dv1qqm1cvl2lym8yppwgiqj3bxbas7k-kiriki-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kiriki-15.04.1.tar.xz"; + sha256 = "0fqx790jz7pfajqjhpza2fz3vr7q8mxixx6nvv8shfsqxaqi1xf8"; + name = "kiriki-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kremotecontrol-15.04.1.tar.xz" ".tar"; + store = "/nix/store/4wd2nryy9gg0x5p1vm5fv3hxl48bxcw2-kremotecontrol-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kremotecontrol-15.04.1.tar.xz"; + sha256 = "1nrnq46qa2m5rh4lj9sxrqb130jljfwafw6asz8gm32202xg4fqi"; + name = "kremotecontrol-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kigo-15.04.1.tar.xz" ".tar"; + store = "/nix/store/s7my7ndzl4cf3nkxhp23krf8cc0rxpb6-kigo-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kigo-15.04.1.tar.xz"; + sha256 = "0a2a39x1249vjgwc7sxvf1kxmkjd6nq97rhh7cp7j3ssa2gggspn"; + name = "kigo-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "jovie-15.04.1.tar.xz" ".tar"; + store = "/nix/store/9dhsv2hxy8pwh8i6sp9dmirz3d7hlk77-jovie-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/jovie-15.04.1.tar.xz"; + sha256 = "051ycpgifz9si8301167rr7h50qcnkhffk0wyr59iqxyyf69aqbf"; + name = "jovie-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdf-15.04.1.tar.xz" ".tar"; + store = "/nix/store/m088jnlvz3b3fabza6hcy3dh57mbs3f5-kdf-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdf-15.04.1.tar.xz"; + sha256 = "0by7dn3r22cx9slibc2jplbi6k498xiizidymaxkf6wa9f6m76yn"; + name = "kdf-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kapman-15.04.1.tar.xz" ".tar"; + store = "/nix/store/4lnw56hhsqbrgp60fwwcf62wdxb3k2aq-kapman-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kapman-15.04.1.tar.xz"; + sha256 = "1pwbxc9pbhr2cbr4n48hsnja7fghr2af02aifvrsj6jgcxzryfgd"; + name = "kapman-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kanagram-15.04.1.tar.xz" ".tar"; + store = "/nix/store/kgjhkp3h6gaz1pi62mmyg8z0xyb1h4lz-kanagram-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kanagram-15.04.1.tar.xz"; + sha256 = "1i9z5hyqj326iim43mlrvvpl47b4244s1spk3xf8a3a929bwlf9l"; + name = "kanagram-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-send-file-15.04.1.tar.xz" ".tar"; + store = "/nix/store/5bs3g1zqj5b13h4flvy9v4m620lcw7lf-ktp-send-file-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-send-file-15.04.1.tar.xz"; + sha256 = "0dzyvsnnxi6n3hy3rwyng4pszx4ghcgry3cvw6d3jrzlg4y3afmz"; + name = "ktp-send-file-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmines-15.04.1.tar.xz" ".tar"; + store = "/nix/store/rqnvyiybcn99da45q2bvl8dwpa4y764z-kmines-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kmines-15.04.1.tar.xz"; + sha256 = "1g02fbyqz8nb0qlz49dqn5jay4kdafpdmjx127n0p8wmkw4lh261"; + name = "kmines-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "bovo-15.04.1.tar.xz" ".tar"; + store = "/nix/store/yrgnwbhl85qivg7hglzgaqqv0hwm91rv-bovo-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/bovo-15.04.1.tar.xz"; + sha256 = "10y1px3vk9iv19m6m4jlh6bxky10vhyd1r0q7s50rhr44i3ibwml"; + name = "bovo-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kruler-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vhls9fra4la0ymwa2s387mw5n119hf47-kruler-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kruler-15.04.1.tar.xz"; + sha256 = "0vhwg4qqiv4gflvqspjibm7zh2zgaxql5xmaylpr90hyc1k3vykl"; + name = "kruler-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-desktop-applets-15.04.1.tar.xz" ".tar"; + store = "/nix/store/a7lgl9rd9bpmh8yqdibk0zym25mfc3gm-ktp-desktop-applets-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-desktop-applets-15.04.1.tar.xz"; + sha256 = "19rzq0k2dklzrlpn1qkad1x0v72dk6szya8fsfgxcv1047cczrma"; + name = "ktp-desktop-applets-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kpat-15.04.1.tar.xz" ".tar"; + store = "/nix/store/r4n7jrlw47j1mvipzyfw9mx6cksk3rpy-kpat-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kpat-15.04.1.tar.xz"; + sha256 = "1aa6m64slfg12zg02an8sbv51k5jnq9bs95y666bc1697yij8sag"; + name = "kpat-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkcompactdisc-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vnpm0h4amj9pxqbrgn8m7xjl04x2ybb7-libkcompactdisc-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkcompactdisc-15.04.1.tar.xz"; + sha256 = "0lis8llzl684z12yzvrc74zckxxbi06fn1krqkiawhpafl0kc8qs"; + name = "libkcompactdisc-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgpg-15.04.1.tar.xz" ".tar"; + store = "/nix/store/6ampb59zxfj4qm8a7fxs0kqchwcxv5kl-kgpg-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kgpg-15.04.1.tar.xz"; + sha256 = "013z6ryq1khk1hwird678n4rfikgyl173j5chkqpgw7nrz93770c"; + name = "kgpg-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdenetwork-filesharing-15.04.1.tar.xz" ".tar"; + store = "/nix/store/7ajx21aws82z92wiqc041jmbysna95cn-kdenetwork-filesharing-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdenetwork-filesharing-15.04.1.tar.xz"; + sha256 = "1f26z4zm0bzkbsanj9rw704s25iq0ahw3mi51sgj4ak8gb9r6ibb"; + name = "kdenetwork-filesharing-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kubrick-15.04.1.tar.xz" ".tar"; + store = "/nix/store/clxa7535xdqii03b5rp3p8vs2xpc6263-kubrick-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kubrick-15.04.1.tar.xz"; + sha256 = "0anysvrnyj5pafy7svgszqaj68ryvgbmc8s9xcaw7xpqxxjv2bvd"; + name = "kubrick-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kfourinline-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xk72vmcz1gl5w05wsv0f5qw182hy72vf-kfourinline-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kfourinline-15.04.1.tar.xz"; + sha256 = "1qg8cg4w207f9ir9saraxyvrhz7y0hr8di9yjv3i32hhmi36v35a"; + name = "kfourinline-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkeduvocdocument-15.04.1.tar.xz" ".tar"; + store = "/nix/store/b0381wzz8yr0g7a5f89cxq0ay0vvskq7-libkeduvocdocument-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkeduvocdocument-15.04.1.tar.xz"; + sha256 = "0lky05kb4yqggfzwips4jagfsmi7lc5fwp1zv4mlgh0w68rbzq0f"; + name = "libkeduvocdocument-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "mplayerthumbs-15.04.1.tar.xz" ".tar"; + store = "/nix/store/7wjw21kqy746kxq8ciprhc2jn9sda1qw-mplayerthumbs-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/mplayerthumbs-15.04.1.tar.xz"; + sha256 = "0a5w3cz6pdsj6vn1zzsjx61x52lqmfnblad0gjv29h7rzxx4p8vr"; + name = "mplayerthumbs-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-15.04.1.tar.xz" ".tar"; + store = "/nix/store/9i6281xfgc9xs8r16kvj96r3f5sq4sx2-kdegraphics-thumbnailers-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdegraphics-thumbnailers-15.04.1.tar.xz"; + sha256 = "1lpr7k7mhlrl4f8psixkp64j5igv0kbmfyml618pydbdbkyzy7wb"; + name = "kdegraphics-thumbnailers-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-dev-scripts-15.04.1.tar.xz" ".tar"; + store = "/nix/store/gplbfp23pqx6kklb57j6p4pw2hnfy98h-kde-dev-scripts-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-dev-scripts-15.04.1.tar.xz"; + sha256 = "0yg2xw7ni25i1dvnfd18p0vdpli66xx9dn351av22k313wa7dyw2"; + name = "kde-dev-scripts-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kblocks-15.04.1.tar.xz" ".tar"; + store = "/nix/store/9rkp8602jhay2myxc1wm1s3511ivf1ix-kblocks-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kblocks-15.04.1.tar.xz"; + sha256 = "19dhccamka291p75brd03a3r5zll7yfzk9hd9dr52xr45lpbhqd9"; + name = "kblocks-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klines-15.04.1.tar.xz" ".tar"; + store = "/nix/store/1hb2447kzfdymip921a3k08rdvls1b10-klines-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/klines-15.04.1.tar.xz"; + sha256 = "1yb4qya06b3ld0xmnvqxzn6lgvxr8nyfwihgi4ldysxap6v629ra"; + name = "klines-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-15.04.1.tar.xz" ".tar"; + store = "/nix/store/z1pwkj78q3vrjh6yvs5p8wdikl67skgm-kdenetwork-strigi-analyzers-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdenetwork-strigi-analyzers-15.04.1.tar.xz"; + sha256 = "03dc3h6r06dzl6z7nagmsahrzivylyiqlnwin9qjm1jw7wvcfdvk"; + name = "kdenetwork-strigi-analyzers-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeartwork-15.04.1.tar.xz" ".tar"; + store = "/nix/store/3aj5jpa1s6hzqiwlws6vg00qkn7m49jd-kdeartwork-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdeartwork-15.04.1.tar.xz"; + sha256 = "023d74d1k6lriy7hg1xigp2dv053dc6cnf74kxj4sgglg8qqnph3"; + name = "kdeartwork-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-common-internals-15.04.1.tar.xz" ".tar"; + store = "/nix/store/83s2nk00gahqlc1akhv6gv72w165ab4j-ktp-common-internals-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-common-internals-15.04.1.tar.xz"; + sha256 = "1g7ms93b756iksjimf0vmrrv1cva0956yjyrxa6zx86z2gsqai0m"; + name = "ktp-common-internals-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "granatier-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vs49yw5vjlplwgsskrwv1i6dva0x12x6-granatier-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/granatier-15.04.1.tar.xz"; + sha256 = "09dazsxch26kh7pvakqzdcmb1vwx5dakq693v692payxgsrbd9zv"; + name = "granatier-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kspaceduel-15.04.1.tar.xz" ".tar"; + store = "/nix/store/flf9jk3v67l044291iscpc7yxqynr8s0-kspaceduel-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kspaceduel-15.04.1.tar.xz"; + sha256 = "1ypiyj7vz4g8dpzd2lygnlrv4gmzfjwbqflzkqq6gsx2a5v671v8"; + name = "kspaceduel-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "lskat-15.04.1.tar.xz" ".tar"; + store = "/nix/store/2rrzkyrqqmxphhcszdii2qrfag7y91bg-lskat-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/lskat-15.04.1.tar.xz"; + sha256 = "1nyjhispwf7brg4a1a50br3k583jh734vqj8v8gwjq68q7sig1an"; + name = "lskat-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkcddb-15.04.1.tar.xz" ".tar"; + store = "/nix/store/s34in46wqxw0pyf0fgzmagbi9r18r1i5-libkcddb-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkcddb-15.04.1.tar.xz"; + sha256 = "1fp8zq00nijwygap3571lpcyy3qn318djv0gj6vjyzfxlkijl745"; + name = "libkcddb-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-15.04.1.tar.xz" ".tar"; + store = "/nix/store/yrpx93448287fy645dnvwkc21c5fw41y-kdegraphics-mobipocket-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdegraphics-mobipocket-15.04.1.tar.xz"; + sha256 = "1y4ci3l837l3pi308jzh1mvw9rxhyjdx8hgz29vca2gpwyp0v6zi"; + name = "kdegraphics-mobipocket-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkface-15.04.1.tar.xz" ".tar"; + store = "/nix/store/7pmab8n861ng48b8483d2l71qy7prm75-libkface-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkface-15.04.1.tar.xz"; + sha256 = "1iannhmn3gh7j3q8x9dm4jvkilrnpkvzhqz4rs4cksr1q49hh8ah"; + name = "libkface-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbruch-15.04.1.tar.xz" ".tar"; + store = "/nix/store/n7n2q3a4r9par2kc13nixqidwl5z1qwg-kbruch-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kbruch-15.04.1.tar.xz"; + sha256 = "0d747mv9mwp0kk6q2bx0h3bn1km99wcxljhsz62kd9g3myzga6sj"; + name = "kbruch-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "cantor-15.04.1.tar.xz" ".tar"; + store = "/nix/store/5dbbmdm1w5r7hsy2z999aj8b7amy5mz8-cantor-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/cantor-15.04.1.tar.xz"; + sha256 = "0rlldfww4rzhxvsq3yl2a5ybcd4h4xihcy4924dbjzp15zgxjzyb"; + name = "cantor-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksnapshot-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xya1fmdi09yiq9xvvpqp5bks628n6yqz-ksnapshot-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ksnapshot-15.04.1.tar.xz"; + sha256 = "0bmq7qvi5522qcj1ksjy9m7pf3yr6n8hf809isvbamvqk285vln6"; + name = "ksnapshot-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kopete-15.04.1.tar.xz" ".tar"; + store = "/nix/store/qq5dm0qrnb40nk2lhdyhhwxwnm2w73ry-kopete-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kopete-15.04.1.tar.xz"; + sha256 = "195vdbnk9azfhk7i3vq5zbw1c8f7wz3xdjm2n5g2sv3gnmgm598q"; + name = "kopete-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kteatime-15.04.1.tar.xz" ".tar"; + store = "/nix/store/cgc2v9iffy7a48sn95rr9x05xwi6h1cy-kteatime-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kteatime-15.04.1.tar.xz"; + sha256 = "0sxdnk9v1p5mcwp8wka60saiqdm4r9bfpyh40qksd89jkjzw7aj9"; + name = "kteatime-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdelibs-4.14.8.tar.xz" ".tar"; + store = "/nix/store/jwibw4jpjfxxhkv6kps17yqmaljsymi0-kdelibs-4.14.8.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdelibs-4.14.8.tar.xz"; + sha256 = "1fwvqgxxwy9ka6wq4ysn5x6blqw8wqrfnh6hk6m65jdknflshpvh"; + name = "kdelibs-4.14.8.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kajongg-15.04.1.tar.xz" ".tar"; + store = "/nix/store/r34lymfzw7s9j1j30llnkj9b0nn0pxr3-kajongg-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kajongg-15.04.1.tar.xz"; + sha256 = "15yn5ixkwmwg1hvkdr6sl26zch5rdmjq0iqmc1kyrdipdhdp5mzm"; + name = "kajongg-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "print-manager-15.04.1.tar.xz" ".tar"; + store = "/nix/store/7a9mkd04lsih0rq5dld1mnsx3cxrkr1z-print-manager-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/print-manager-15.04.1.tar.xz"; + sha256 = "05dpx0cwlpy17x2knq98kf6s1bh72lfn8i5l5xzf4bxil9s2fir9"; + name = "print-manager-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-baseapps-15.04.1.tar.xz" ".tar"; + store = "/nix/store/lz0chc1pimbj5ddi5bkp2nlrlbvgi5l1-kde-baseapps-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-baseapps-15.04.1.tar.xz"; + sha256 = "0970mw5ywjimrmhcfskwiwc048w1rvjffs3d2a9v74yvv64irkgv"; + name = "kde-baseapps-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kiten-15.04.1.tar.xz" ".tar"; + store = "/nix/store/f02ixhrvj27hwwsswk7p8n9hdwfrlyms-kiten-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kiten-15.04.1.tar.xz"; + sha256 = "0l85ccy71ag6nn8fn7b3yr8pjikzivrq6dxka2342nfqidhfpzfh"; + name = "kiten-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "krdc-15.04.1.tar.xz" ".tar"; + store = "/nix/store/kcp6bc4c7vwnrvpjgvlwx0q3ss74f3ay-krdc-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/krdc-15.04.1.tar.xz"; + sha256 = "1d1cjy9b5sx533j1aayw503b65gg7pc5wk3n9hy3x9f1a2yywv1i"; + name = "krdc-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "superkaramba-15.04.1.tar.xz" ".tar"; + store = "/nix/store/akzfq1iqi1p5zyy4ha003jxq93hx41bk-superkaramba-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/superkaramba-15.04.1.tar.xz"; + sha256 = "1ncvmmvsfs4jp67ij1vs87sjg59x960pqqxblq49m0l6vmp0l6j8"; + name = "superkaramba-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "katomic-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xqifvkcnpvncp34cz72axncvfm4ar17r-katomic-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/katomic-15.04.1.tar.xz"; + sha256 = "1lpsvi2hnf4f5ngdkcg56j73qwjzm8zahl2pm5l0r53i95kxlqyd"; + name = "katomic-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "killbots-15.04.1.tar.xz" ".tar"; + store = "/nix/store/rzm4an2qh22q4d8gxn7hf2lc1h8apblj-killbots-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/killbots-15.04.1.tar.xz"; + sha256 = "1wrdwjcpr75lwbrb6ijbwi8ghkgdlp3sv5sbbmws9p77xa13scyk"; + name = "killbots-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkgeomap-15.04.1.tar.xz" ".tar"; + store = "/nix/store/2sprrk9f1bp0i1pyprzkbfx93p44qr3h-libkgeomap-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkgeomap-15.04.1.tar.xz"; + sha256 = "1zj7wimigjlrg2sq3288wc1h5by155ngascwbbn1x9zy86akb5dj"; + name = "libkgeomap-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "konsole-15.04.1.tar.xz" ".tar"; + store = "/nix/store/6p788sim5alh13lbgfc4095nas0rav9m-konsole-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/konsole-15.04.1.tar.xz"; + sha256 = "0fddv6ag23m5ks1cj8rrfbd2xcifxwijkypx6dhxk4pbgkhy0m8m"; + name = "konsole-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kuser-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0z7jv74ig27pxaf6fw9sq33r4xvanm4k-kuser-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kuser-15.04.1.tar.xz"; + sha256 = "1gvpqazrij2ipdfhyfbsw1vgv4173j4r4qnbp2sd8kjibryqcm76"; + name = "kuser-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-kded-module-15.04.1.tar.xz" ".tar"; + store = "/nix/store/8krkra77y0vck4pki2r25zivig521cqk-ktp-kded-module-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-kded-module-15.04.1.tar.xz"; + sha256 = "0hyyz9f8qjzcqj6g92a4g4a3xp7fgyfgznir65mx2kka6fq7532s"; + name = "ktp-kded-module-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-accounts-kcm-15.04.1.tar.xz" ".tar"; + store = "/nix/store/lbvr1zi1lipmmdx5pkga2k06isy0kk5y-ktp-accounts-kcm-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-accounts-kcm-15.04.1.tar.xz"; + sha256 = "0s2nny6l744fvf45yczzbcrx1win47b0xvxgf16s29q3y2l51y3s"; + name = "ktp-accounts-kcm-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klettres-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xdqivsid3wvc73mxnwzn7ayva3002l3a-klettres-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/klettres-15.04.1.tar.xz"; + sha256 = "1shlhdmzmis0szafk6kvjy0w25xr7p261zj1fi4gz5hr7262lirz"; + name = "klettres-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "signon-kwallet-extension-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ayi379ldyhmq5cn53nf89lmvwwfyp9gm-signon-kwallet-extension-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/signon-kwallet-extension-15.04.1.tar.xz"; + sha256 = "0nk1gjz2bw6kssv09kwksj8p5qpzz90plpnd4nd19qnhgz0a0v7r"; + name = "signon-kwallet-extension-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-runtime-15.04.1.tar.xz" ".tar"; + store = "/nix/store/wg7pzsw9s8lm35cxihc08fs9jd21jm13-kde-runtime-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-runtime-15.04.1.tar.xz"; + sha256 = "178n0zfjzzfpr1shqxyixlb2swmkz2n17xhnmf04hql2l4yj3khp"; + name = "kde-runtime-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kaccounts-providers-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k0ph8jkjq43ym4851swr12csj53vdh6m-kaccounts-providers-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kaccounts-providers-15.04.1.tar.xz"; + sha256 = "1bd9v89r6y90r8bkm9m46p8yzpbv1zyf4bg0c3scbaqkviqihi09"; + name = "kaccounts-providers-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "bomber-15.04.1.tar.xz" ".tar"; + store = "/nix/store/sczdf7d6q8qr4kjlyk1q4s573mr7g0fd-bomber-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/bomber-15.04.1.tar.xz"; + sha256 = "0mzik0cfz6v0jd31z5q9hkfxsynrhiwm704ns4pgb8qsww41yzrf"; + name = "bomber-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkexiv2-15.04.1.tar.xz" ".tar"; + store = "/nix/store/qc76hz1v7rawy1xb3d7dlf4yxw9d6clz-libkexiv2-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkexiv2-15.04.1.tar.xz"; + sha256 = "0f3ljs8n2gc9frn3j0cjy60hp8wq0f66ry2qpmdaypdswr7vx04n"; + name = "libkexiv2-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-auth-handler-15.04.1.tar.xz" ".tar"; + store = "/nix/store/lmzsbajhy53ay7swff47gsq3il629wfj-ktp-auth-handler-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-auth-handler-15.04.1.tar.xz"; + sha256 = "1ixxvf5lvy0isv0gqc6sw2pfjqz139kcd0pncq4i89kwqnca8jkp"; + name = "ktp-auth-handler-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.8.tar.xz" ".tar"; + store = "/nix/store/xxnnkp49p5s0hc4sgsb0id14mnfsd6f5-kdepim-runtime-4.14.8.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdepim-runtime-4.14.8.tar.xz"; + sha256 = "1c9lmacadkxdl8kaxn823a7r07w67hrzdypijvvz3ms7k5i84k0z"; + name = "kdepim-runtime-4.14.8.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klickety-15.04.1.tar.xz" ".tar"; + store = "/nix/store/wffyflkf9im135fdalll1x68cm523rgm-klickety-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/klickety-15.04.1.tar.xz"; + sha256 = "0igw7rm7ii30x3971gg5zjpzljlr1ajxbk5bjylizxbl960dx0kw"; + name = "klickety-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkomparediff2-15.04.1.tar.xz" ".tar"; + store = "/nix/store/rmzhngxxfnvbr76mm85zgp4zlqbjid9z-libkomparediff2-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkomparediff2-15.04.1.tar.xz"; + sha256 = "16fkixmpvxn7459v41418rs49n6knnf1lpfz1mjidaz6q7ii5y8p"; + name = "libkomparediff2-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-contact-list-15.04.1.tar.xz" ".tar"; + store = "/nix/store/c6yg7sc1xnla574r1bc122gp63y8wvyp-ktp-contact-list-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-contact-list-15.04.1.tar.xz"; + sha256 = "1vmcs0ww4hv7ckb9nddkpci57ha7j6wqrwiikq4rxcvq9a4z1g7x"; + name = "ktp-contact-list-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-contact-runner-15.04.1.tar.xz" ".tar"; + store = "/nix/store/v7wjiq2vwpv0r1c6rqfxhjsdcvcr9ffd-ktp-contact-runner-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-contact-runner-15.04.1.tar.xz"; + sha256 = "19hin3qmcznxlp1lypka7h1nqj4n40hys6sxf6m74fx0myk6jia9"; + name = "ktp-contact-runner-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcolorchooser-15.04.1.tar.xz" ".tar"; + store = "/nix/store/al6rmbszcmx8m2fk4i2ihxxp4wk2n06p-kcolorchooser-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kcolorchooser-15.04.1.tar.xz"; + sha256 = "1q1ipvvd02kgrvz322m7gn6rwxdnpkkj4575yrn6vpxx616q1pf7"; + name = "kcolorchooser-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kfloppy-15.04.1.tar.xz" ".tar"; + store = "/nix/store/4zgqikwm771c85nkd20xw9lplpyqhycf-kfloppy-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kfloppy-15.04.1.tar.xz"; + sha256 = "1rqccsiyfazsbfjs8mpjsqbbw9pd6fakdb076q0mj2syrlm7xr36"; + name = "kfloppy-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-wallpapers-15.04.1.tar.xz" ".tar"; + store = "/nix/store/277d4282d2h3cqrjrrlh6w6z0f9sp12l-kde-wallpapers-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-wallpapers-15.04.1.tar.xz"; + sha256 = "0nbv456714vr5mp125bdza3czgxzhbv2wglsmxj0sqc1k6fiadfi"; + name = "kde-wallpapers-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksirk-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vzxblpcsa0jrzcwcp5a9pnax60dkjwav-ksirk-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ksirk-15.04.1.tar.xz"; + sha256 = "1v56n78cxd9201r5pz3vn4mkpry2rihy138ar7kpqvcp7radipr6"; + name = "ksirk-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmag-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ir7qgza1smfbnwdxf1aj60p1xqmgb44p-kmag-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kmag-15.04.1.tar.xz"; + sha256 = "0xh66mpddlriivcqg931nd5bbqvrylq1gpccqbajahhr0jbp6lzf"; + name = "kmag-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-text-ui-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xli6mjyym1qql8id8fwjvx9yils6kihx-ktp-text-ui-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-text-ui-15.04.1.tar.xz"; + sha256 = "00nbzyh2m9gg401krcnm5p38xj6xyp8n6v4lh779hdx63d755myw"; + name = "ktp-text-ui-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "okteta-15.04.1.tar.xz" ".tar"; + store = "/nix/store/gxnx1dmd8964wj7cz37c50i382sg2gbp-okteta-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/okteta-15.04.1.tar.xz"; + sha256 = "17jvf6ca27xj1vv7yss2886imdaws2xpkibz13aicjvw23xhxhvj"; + name = "okteta-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmix-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0wvrlr0afl9j7mwn6qp59qb5662bnjv4-kmix-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kmix-15.04.1.tar.xz"; + sha256 = "0gf1a63ycz8hmlzz7xm361hszzr4l7dibwam9pwg4wipankdipxh"; + name = "kmix-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kget-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0yx4x1f5rxhk7wg1fj9ck54z5b9wim8q-kget-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kget-15.04.1.tar.xz"; + sha256 = "0qckya9r4gic6axq4fi5r5qv4wj31jahbyv1jlyi468wv16cxmnq"; + name = "kget-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kate-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0ky72glm45d5p7knpg00xzjp08shjc1b-kate-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kate-15.04.1.tar.xz"; + sha256 = "0ykppas7fnnslj71y77y2p2qv4jnnv8gdmmfaz5plxkcdjk63a87"; + name = "kate-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kamera-15.04.1.tar.xz" ".tar"; + store = "/nix/store/331lhb9vdk6jr5bcd9z9kdg0nsy74sha-kamera-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kamera-15.04.1.tar.xz"; + sha256 = "1g1lq4g1gk9cw6l1pxaaxzqy4qrqr0f4idkg9bkqbhj20xrl51xd"; + name = "kamera-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kstars-15.04.1.tar.xz" ".tar"; + store = "/nix/store/29wwk2c90zcifni2hra686nwqlxjqh4m-kstars-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kstars-15.04.1.tar.xz"; + sha256 = "1r2sf1ifgkmg8f59jj1j41js538h2x9nr2j6bppd16bbp8gzs2na"; + name = "kstars-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmouth-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vwkzr7jkym3x2lhilv4vp92pzsc7zj69-kmouth-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kmouth-15.04.1.tar.xz"; + sha256 = "0qq45lmgxy5wn24wwi8d5p1vc8h25a70xzaw2gdhj1m2vq37sn5p"; + name = "kmouth-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "poxml-15.04.1.tar.xz" ".tar"; + store = "/nix/store/nfm24h17jvwp3sbl9r4wyjqhm1ly853h-poxml-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/poxml-15.04.1.tar.xz"; + sha256 = "0by57c11p2g82cbl4pmv281dnkdky2943bzcy4yb0qnhihpl99nh"; + name = "poxml-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zcadi1mwn8qb0s4j9y33cm46z07wlnlv-kdegraphics-strigi-analyzer-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdegraphics-strigi-analyzer-15.04.1.tar.xz"; + sha256 = "1xp7k0m2blm6nfzv6pf8vqc2wfdw1pp08dfgg9qvvl4ar80wi62v"; + name = "kdegraphics-strigi-analyzer-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksudoku-15.04.1.tar.xz" ".tar"; + store = "/nix/store/iz57bv4hld01cxkdm6dv2i0n72ckv8g9-ksudoku-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ksudoku-15.04.1.tar.xz"; + sha256 = "1x81q0bya702dcksn86pi8qzw13zb8x558nw3wv8q3z4cp7bzwba"; + name = "ksudoku-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-dev-utils-15.04.1.tar.xz" ".tar"; + store = "/nix/store/33kal7ji8dw5a89n6m7wpfpf519kdwbp-kde-dev-utils-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-dev-utils-15.04.1.tar.xz"; + sha256 = "01ivnsjvpbl1i55zgrcz01hzcn02mrvr14a0nz8bi5s5l53r88sy"; + name = "kde-dev-utils-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kompare-15.04.1.tar.xz" ".tar"; + store = "/nix/store/if8mcxgb9bf6i7hmrvlgmwjvjq92p6k1-kompare-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kompare-15.04.1.tar.xz"; + sha256 = "1h9xvd48kixrffr89kj3lr6nwbj4jvrw5nqz05jl7q6a4rd11p47"; + name = "kompare-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kppp-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k2vyy51405ds24y3mm1dz8y8yifwk60x-kppp-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kppp-15.04.1.tar.xz"; + sha256 = "0d4mk303yw1f17sw517ni8g0lqr3wdl9r2whz2l3pznnd3hh447q"; + name = "kppp-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "dragon-15.04.1.tar.xz" ".tar"; + store = "/nix/store/nk9ya7riashh1gaw9jnqwypdalr5sq2l-dragon-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/dragon-15.04.1.tar.xz"; + sha256 = "1kmp3klp86mmkgvdy973cpnqw9ghbvvs7iqbsqkg19gqg5p3qi6n"; + name = "dragon-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdegames-15.04.1.tar.xz" ".tar"; + store = "/nix/store/kl3yj4xk86l67vl3lahdzq4x6gi8w8yv-libkdegames-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkdegames-15.04.1.tar.xz"; + sha256 = "0jwvywzamfnjv9lfyxbvki9j1y8ksk6x54v4p16k7mkz7dx7qmd7"; + name = "libkdegames-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgoldrunner-15.04.1.tar.xz" ".tar"; + store = "/nix/store/bfyd2yxzm5y2bc8mvchpa5scd297lx5h-kgoldrunner-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kgoldrunner-15.04.1.tar.xz"; + sha256 = "19aiabdyyyfsc8vdgvh26sh9i2cg4lcvgfca296ch0wdlbs8xdd3"; + name = "kgoldrunner-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdewebdev-15.04.1.tar.xz" ".tar"; + store = "/nix/store/l3hf3r3q9a0mas8i2br6ajlq1h1wnm9h-kdewebdev-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdewebdev-15.04.1.tar.xz"; + sha256 = "00av449nc04mascih5ii17hbjxxpanr8gbdimjjhdp2z9dvgnb0h"; + name = "kdewebdev-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knavalbattle-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vkm47y3nws18va3cz13isi02g1wrkf6p-knavalbattle-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/knavalbattle-15.04.1.tar.xz"; + sha256 = "0d94bmd2jvd6jzjxzdbc4rgq1k1a22md4azddqm6z1yc1n41qkyc"; + name = "knavalbattle-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmahjongg-15.04.1.tar.xz" ".tar"; + store = "/nix/store/n5dxy147bwqxx9i49h2lia68846f1zwg-kmahjongg-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kmahjongg-15.04.1.tar.xz"; + sha256 = "0zl0z3p07hxyiy5p894cf0rai0ad0i4sihxgj8n23cqs653wglb7"; + name = "kmahjongg-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ark-15.04.1.tar.xz" ".tar"; + store = "/nix/store/shl563g5w7cn13zynzpbm94ri1ccy6lm-ark-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ark-15.04.1.tar.xz"; + sha256 = "077xvn6symzzr9jb5cdfvzf1xbpliq2krnw1ab1c9a251x90zclw"; + name = "ark-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "gwenview-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ccy2m84g722ihs95n2kindl14n93ir6n-gwenview-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/gwenview-15.04.1.tar.xz"; + sha256 = "07vvcamksgvk8xgj872ql8a7ml7drw3pbv4z7zgrprzracniapwr"; + name = "gwenview-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksquares-15.04.1.tar.xz" ".tar"; + store = "/nix/store/n63xlpj38d1ziy7fg5y5fa0smw12whpa-ksquares-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ksquares-15.04.1.tar.xz"; + sha256 = "0i6rf5x6wsij05xgv9rzizax7j029am7xgwrzzjdk7anph1mx6i9"; + name = "ksquares-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "umbrello-15.04.1.tar.xz" ".tar"; + store = "/nix/store/g91s71jw5mbiy8y2gdknkqnxyklm39wj-umbrello-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/umbrello-15.04.1.tar.xz"; + sha256 = "1sp8f2bjgp5gv9834csa42531psx0sq43ldjgsgygrnbggzmv8nw"; + name = "umbrello-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kblackbox-15.04.1.tar.xz" ".tar"; + store = "/nix/store/w1s27mkqknc6q7ni39641vgviyqgnxk0-kblackbox-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kblackbox-15.04.1.tar.xz"; + sha256 = "02b9kfqm64qz0jnyviag02rd0h36ajmfbnswwgin3i7zbvd5xph0"; + name = "kblackbox-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kolourpaint-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xsvwhyp6j478pjbjslilb62s89ljdfrd-kolourpaint-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kolourpaint-15.04.1.tar.xz"; + sha256 = "04vamlgbsmpkfw4g3hrm9mm6imnrk3gk994pqb35ajvz8089prwp"; + name = "kolourpaint-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "step-15.04.1.tar.xz" ".tar"; + store = "/nix/store/gjcms2qdl726gv00644ljmsl6ddyywwl-step-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/step-15.04.1.tar.xz"; + sha256 = "1sy42yxpp1qkpcj151xpi2576j59s0cznig3bj65klm5iamiar48"; + name = "step-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcachegrind-15.04.1.tar.xz" ".tar"; + store = "/nix/store/3x1mlqph515m8nf31pdk8wxhhrcbj444-kcachegrind-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kcachegrind-15.04.1.tar.xz"; + sha256 = "16fvs27gbpsras3q2qva9x9sc4r056rk2q5b0jijqpncha51wnr2"; + name = "kcachegrind-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ffmpegthumbs-15.04.1.tar.xz" ".tar"; + store = "/nix/store/x3hq5g8vcvm5a9npa7amn5w492rh9fhw-ffmpegthumbs-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ffmpegthumbs-15.04.1.tar.xz"; + sha256 = "196hc96ifqq1m5jja8gkl83a23206l304kqh9rngqbqx2xqbis7g"; + name = "ffmpegthumbs-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "parley-15.04.1.tar.xz" ".tar"; + store = "/nix/store/qj4bmbkiah1jrf0arh2r1ygd6ki0vi6q-parley-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/parley-15.04.1.tar.xz"; + sha256 = "1mz2s4l3bzdpz3jd2rkamwvjiqx133sq7agmrg3ssmhl583bgyln"; + name = "parley-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmplot-15.04.1.tar.xz" ".tar"; + store = "/nix/store/4s3kx66a51gj19imxp7y73q59dx3dsb1-kmplot-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kmplot-15.04.1.tar.xz"; + sha256 = "1rz7l1lggpprmanyr6d1hpyjw6c3z1gdpcf475573y5gip1sylvj"; + name = "kmplot-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kturtle-15.04.1.tar.xz" ".tar"; + store = "/nix/store/6irgf5syddcsvyn8jpfmzjmdccy9mp3j-kturtle-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kturtle-15.04.1.tar.xz"; + sha256 = "0qkaspwdb60cqizf3ph9w245nqg7rarb7riwzdpf007kcpx16905"; + name = "kturtle-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kaccounts-integration-15.04.1.tar.xz" ".tar"; + store = "/nix/store/2xabxjp756c62b9l4iaqjb2hn6jm57bn-kaccounts-integration-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kaccounts-integration-15.04.1.tar.xz"; + sha256 = "0rm4i69b63vmcjcdvgc5bj3sygdjxkk5bx12vm70h2wx72zi7bmm"; + name = "kaccounts-integration-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktouch-15.04.1.tar.xz" ".tar"; + store = "/nix/store/889f6956q1d0k0m9n1j9bx36y446zaqd-ktouch-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktouch-15.04.1.tar.xz"; + sha256 = "040xb5bpc848g4m7lpgh2qp7zn3x88pi8lx49rvd7cwy9r0yypxg"; + name = "ktouch-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "analitza-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ci7yardryphabk0561gfqv9w3bg2dld9-analitza-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/analitza-15.04.1.tar.xz"; + sha256 = "0ndz76kdk0x63269324c516d7vyssni8q89im62hkcvsjv0y1wb5"; + name = "analitza-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "cervisia-15.04.1.tar.xz" ".tar"; + store = "/nix/store/6v595hx7jz5v0k6pvmxixva0pz9a86c2-cervisia-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/cervisia-15.04.1.tar.xz"; + sha256 = "01j8ai5s5gqh5wb6c74yrpr6x8652zdmh25dchpafih5sm5y1s8l"; + name = "cervisia-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "filelight-15.04.1.tar.xz" ".tar"; + store = "/nix/store/kxzx5vxg5cl6v99c2q0dx6svzq66lmq3-filelight-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/filelight-15.04.1.tar.xz"; + sha256 = "1pi3j10h23s7ianr5dhf17skdspnxgqfv9hxzfi0pyy3z9yfhs9r"; + name = "filelight-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktimer-15.04.1.tar.xz" ".tar"; + store = "/nix/store/bfgk2rpkifs0kmmg8a9cw2sbcw9x4acj-ktimer-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktimer-15.04.1.tar.xz"; + sha256 = "0avscwyksa6rba9ppp6pcd332phd2zwsvpbprn0sbsias63mx7rb"; + name = "ktimer-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "picmi-15.04.1.tar.xz" ".tar"; + store = "/nix/store/adzmd2pnn5lss9fm35x6hqvb6jfb3dc5-picmi-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/picmi-15.04.1.tar.xz"; + sha256 = "06v2cxdlg8366r122gfs03y2zfhcml2bp0q79a357b4aj14xah76"; + name = "picmi-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "dolphin-plugins-15.04.1.tar.xz" ".tar"; + store = "/nix/store/g7mzrah5zhp760dw67z836yjb9ycscqb-dolphin-plugins-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/dolphin-plugins-15.04.1.tar.xz"; + sha256 = "1zw626gzrc0sxbif1y2mnqm96s2yap3fnh3ij1cv81v43yy12jsk"; + name = "dolphin-plugins-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkmahjongg-15.04.1.tar.xz" ".tar"; + store = "/nix/store/9awn6c5akngz6f7h9xbwvnxfjh7k4k6c-libkmahjongg-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkmahjongg-15.04.1.tar.xz"; + sha256 = "1lw9k7h2cli65738lp06wwn763aggqdaqm52gf4s25ia6sqa1vs2"; + name = "libkmahjongg-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-base-artwork-15.04.1.tar.xz" ".tar"; + store = "/nix/store/wygvvlqqdcah3ilsr18n32jbidb3vjp2-kde-base-artwork-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-base-artwork-15.04.1.tar.xz"; + sha256 = "1jxmg1s11kj1qiwlh5jji2bhcgn2d0sx6lljh65snwxg26liwz6v"; + name = "kde-base-artwork-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kscd-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k6bz5mzppxksahygjg51bfyr2lmb56vq-kscd-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kscd-15.04.1.tar.xz"; + sha256 = "17spvnflbq2wq80awk6y895ls214n8h0ssk87r7qmr03pvzhnyaa"; + name = "kscd-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "sweeper-15.04.1.tar.xz" ".tar"; + store = "/nix/store/s35plhhx4ic5ghzqa9v3ivsvr1rynang-sweeper-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/sweeper-15.04.1.tar.xz"; + sha256 = "0vzqpyhi5kn2p6waj2pn1myaz44v7dw2ll0hz8vp0rfh9qnwq70l"; + name = "sweeper-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-workspace-4.11.19.tar.xz" ".tar"; + store = "/nix/store/lxglid45py66valnl34y41z7ny1zyla3-kde-workspace-4.11.19.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-workspace-4.11.19.tar.xz"; + sha256 = "1hn5q86p1wpv6y4wia0sxfn83iya00d6y70gdq3svmhj1bdjj50w"; + name = "kde-workspace-4.11.19.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "konquest-15.04.1.tar.xz" ".tar"; + store = "/nix/store/wags5sgprgy7cngppjj2n9b29625yp1r-konquest-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/konquest-15.04.1.tar.xz"; + sha256 = "078503rf9r7rb161xi5j22d08imk2b1g4ma5xyaap8j7jr8qykak"; + name = "konquest-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kig-15.04.1.tar.xz" ".tar"; + store = "/nix/store/pii50yzi2wkj384pvswiqcqf3m6w2b22-kig-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kig-15.04.1.tar.xz"; + sha256 = "07dw82q68akjzc3v1igx1ah1j4b53ph4pgpkrxzh3468nrhkrxqc"; + name = "kig-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-approver-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0z3zii1zjnnjk34x0i94nc41i2cdi0gw-ktp-approver-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-approver-15.04.1.tar.xz"; + sha256 = "158c93kmwffnsx78qr84qqjb34p7czynrqbz3iyj29s79kkx4ix0"; + name = "ktp-approver-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kalzium-15.04.1.tar.xz" ".tar"; + store = "/nix/store/f4jk61d6sgcx57k7ppjql6qml9q2pazn-kalzium-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kalzium-15.04.1.tar.xz"; + sha256 = "1islh3c67hlar51hf2hx31c1pg8kkw6h7c6vl3mv442wl468ilvl"; + name = "kalzium-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcron-15.04.1.tar.xz" ".tar"; + store = "/nix/store/q6dydf2sgx486rf4rfm3sfbbbsrcns89-kcron-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kcron-15.04.1.tar.xz"; + sha256 = "0ppdydcasrigqmpldjgvrxmjffizf9gnqbxrjypwirhsay2z5clv"; + name = "kcron-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktuberling-15.04.1.tar.xz" ".tar"; + store = "/nix/store/z7nqzkmyfc7fw4a2c4kwh8flvx9309pb-ktuberling-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktuberling-15.04.1.tar.xz"; + sha256 = "1nm0g089c22nc06xi7446drsgllsxrsfd68r7mm5p38fdh1rmxll"; + name = "ktuberling-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "juk-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k9pq6074j197y1hz9hr3xdcla9pcqhic-juk-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/juk-15.04.1.tar.xz"; + sha256 = "158mxy9c73g27i3plndik4zw8p527zgqq7rj1mrdlj2sic1jd6df"; + name = "juk-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdiamond-15.04.1.tar.xz" ".tar"; + store = "/nix/store/266jwjlfnq0njn09f26xnif9bl3v12h8-kdiamond-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdiamond-15.04.1.tar.xz"; + sha256 = "0kkprlaghidb0skmra1ja9vwncg0zsvawvnjrzb0fgi065iz6bc2"; + name = "kdiamond-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-filetransfer-handler-15.04.1.tar.xz" ".tar"; + store = "/nix/store/cw3cr2nrhmid0miwp6nfh7c3kqwf072k-ktp-filetransfer-handler-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-filetransfer-handler-15.04.1.tar.xz"; + sha256 = "1dzkbgpv9fbkwxlzdch0axc722m5kq6viy33isihv2j0hcxvjjzy"; + name = "ktp-filetransfer-handler-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepim-4.14.8.tar.xz" ".tar"; + store = "/nix/store/2jiwn6rshw66kv3v058w34qv45qgkrna-kdepim-4.14.8.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdepim-4.14.8.tar.xz"; + sha256 = "19z3pfmb8d6gsr9njyfyrjl4llzkk7q6fcl0ng0k0w1q4i4igd2j"; + name = "kdepim-4.14.8.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-15.04.1.tar.xz" ".tar"; + store = "/nix/store/3hz1jgliry4xb27cbn4khkynvz42asfm-kdesdk-thumbnailers-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdesdk-thumbnailers-15.04.1.tar.xz"; + sha256 = "104wyrapk77mi11a72p03liln0qh0mq84hbgklyf3rwxbdsmysz9"; + name = "kdesdk-thumbnailers-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeedu-data-15.04.1.tar.xz" ".tar"; + store = "/nix/store/c4kzdj7sq4557wcmhwf2cg566b04x617-kdeedu-data-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdeedu-data-15.04.1.tar.xz"; + sha256 = "1fvvam4wilijvmlfklqwgvl47ffy7w7lhp61hjgn6chjhrk3wxd1"; + name = "kdeedu-data-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libksane-15.04.1.tar.xz" ".tar"; + store = "/nix/store/l09dwrlxm13fl8qnk7cpgs66537287cb-libksane-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libksane-15.04.1.tar.xz"; + sha256 = "1wlp09c2djprwwsbip0i1jx3d9cj16axbvbyn1hhc1hzaim3wnsc"; + name = "libksane-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kshisen-15.04.1.tar.xz" ".tar"; + store = "/nix/store/2mb9v1738cif1qwwkfqyqgbs3lysg0ij-kshisen-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kshisen-15.04.1.tar.xz"; + sha256 = "0vgh980plqrd0r8s4pp79xy39j7n6z2xjrj62z6bna65wywv8cim"; + name = "kshisen-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjumpingcube-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ap7dpxkmh50bay925x93hhchdvga0zc0-kjumpingcube-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kjumpingcube-15.04.1.tar.xz"; + sha256 = "0lsd14qpb1c6hs9ff9fwpmrbdn7khk6lwdar82l9dwvzd9zk9vpd"; + name = "kjumpingcube-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "zeroconf-ioslave-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ncrdk952fj4sg748lqfdm9xf5wi5rm2d-zeroconf-ioslave-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/zeroconf-ioslave-15.04.1.tar.xz"; + sha256 = "181q88i8ygqp2g4c78qr2flwbrnwphix0ksm2qrinrchbc7v7mxm"; + name = "zeroconf-ioslave-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdenlive-15.04.1.tar.xz" ".tar"; + store = "/nix/store/qcwij9xp4fv8s5zgizij3rmb220r7193-kdenlive-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdenlive-15.04.1.tar.xz"; + sha256 = "0v4qx1r5kkkiqvxzdvr2467dhx0ndylvwl1vd723lbdi9vk9gg4q"; + name = "kdenlive-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "khangman-15.04.1.tar.xz" ".tar"; + store = "/nix/store/g1f0f255pjr3wd2jh10q05xjkgm3340h-khangman-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/khangman-15.04.1.tar.xz"; + sha256 = "1jnc5cjij32sbxcq2bvmzkdsj2f7w194lwkj48gdkkwfplbn4kwc"; + name = "khangman-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "lokalize-15.04.1.tar.xz" ".tar"; + store = "/nix/store/1j2l2qhfkxrgqbwiglg8mn60480sanfy-lokalize-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/lokalize-15.04.1.tar.xz"; + sha256 = "0h46kf14i4gd17k2fad629b7yq66mcy2cp5w0ir0f071z2s9jvg3"; + name = "lokalize-15.04.1.tar.xz"; + }; + } { name = stdenv.lib.nameFromURL "kaccessible-15.04.0.tar.xz" ".tar"; store = "/nix/store/51djz0y5i1mr90pv9fmxi0vwzrrj2ygq-kaccessible-15.04.0.tar.xz"; @@ -2413,6 +4447,15 @@ name = "kde-l10n-ar-15.04.0.tar.xz"; }; } + { + name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.0.tar.xz" ".tar"; + store = "/nix/store/vaih1nkjz81vm6vgfy25iqd8dxrivsqc-kde-l10n-ca_valencia-15.04.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ca_valencia-15.04.0.tar.xz"; + sha256 = "0ij9xp47mv63hgdbri7cmvld3zgg0sfgip0gg7iqinzkj1cifj9f"; + name = "kde-l10n-ca_valencia-15.04.0.tar.xz"; + }; + } { name = stdenv.lib.nameFromURL "kde-l10n-uk-15.04.0.tar.xz" ".tar"; store = "/nix/store/sc5haa7ci8zwglc03s60bc5and8ydqgi-kde-l10n-uk-15.04.0.tar.xz"; diff --git a/pkgs/applications/kde-apps-15.04/manifest.sh b/pkgs/applications/kde-apps-15.04/manifest.sh index 3ef8c11c3a14..2aa3cee8c85b 100755 --- a/pkgs/applications/kde-apps-15.04/manifest.sh +++ b/pkgs/applications/kde-apps-15.04/manifest.sh @@ -9,6 +9,7 @@ if [ $# -eq 0 ]; then # from recursing over the whole server! (No, it's not a bug.) $(nix-build ../../.. -A autonix.manifest) \ "${KDE_MIRROR}/stable/applications/15.04.0/" \ + "${KDE_MIRROR}/stable/applications/15.04.1/" \ $MANIFEST_EXTRA_ARGS -A '*.tar.xz' else From 111fec1ba7ffc4ebf0c750038feda447c5aa0f3c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 14 May 2015 19:06:36 -0500 Subject: [PATCH 177/615] Add qca-qt5 --- .../development/libraries/qca-qt5/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/qca-qt5/default.nix diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix new file mode 100644 index 000000000000..37b0db4ef6ce --- /dev/null +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, cmake, openssl, pkgconfig, qt5 }: + +let + rev = "088ff642fc2990871e3555e73c94c9287e7514a9"; + shortrev = builtins.substring 0 7 rev; +in +stdenv.mkDerivation rec { + name = "qca-qt5-20150422-${shortrev}"; + src = fetchgit { + url = "git://anongit.kde.org/qca.git"; + branchName = "qt5"; + inherit rev; + sha256 = "fe1c7d5d6f38445a4032548ae3ea22c74d4327dfaf2dc88492a95facbca398f8"; + }; + + buildInputs = [ openssl qt5.base ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + meta = with stdenv.lib; { + description = "Qt 5 Cryptographic Architecture"; + homepage = http://delta.affinix.com/qca; + maintainers = with maintainers; [ ttuegel ]; + license = with licenses; [ lgpl21Plus ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3d6ff843d29..42bfd11b8f6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7516,6 +7516,8 @@ let qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; + qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; + qimageblitz = callPackage ../development/libraries/qimageblitz {}; qjson = callPackage ../development/libraries/qjson { }; From 046fc60314ad26f699f1e2a9d158a54a47fa7acf Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 14 May 2015 19:06:43 -0500 Subject: [PATCH 178/615] Build ktp-auth-handler with qca-qt5 --- pkgs/applications/kde-apps-15.04/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index bf31a935e7bc..ef54594a1428 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -121,6 +121,7 @@ let PythonLibrary = python; Qalculate = libqalculate; QCA2 = qca2; + Qca-qt5 = qca-qt5.override { inherit qt5; }; QImageBlitz = qimageblitz; QJSON = qjson; Qt4 = qt4; From 7be207ba68abb671856507f5c6a771af2c9fd2dd Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 14 May 2015 19:12:36 -0500 Subject: [PATCH 179/615] Build krfb with KF5 --- pkgs/applications/kde-apps-15.04/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index ef54594a1428..1b92c5dd21d1 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -321,7 +321,7 @@ let krfb = super.krfb // { buildInputs = super.krfb.buildInputs - ++ [pkgs.xlibs.libXtst kde4.telepathy.common_internals]; + ++ [pkgs.xlibs.libXtst kdeApps.ktp-common-internals]; }; kstars = super.kstars // { From 9e1c84a08049f0f9f974bc7ee6038c0b53c20f55 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 14 May 2015 19:17:42 -0500 Subject: [PATCH 180/615] Build ktp-common-internals with libotr for ktp-text-ui --- pkgs/applications/kde-apps-15.04/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 1b92c5dd21d1..59723c9d8353 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -339,7 +339,8 @@ let ktp-common-internals = super.ktp-common-internals // { buildInputs = super.ktp-common-internals.buildInputs - ++ (with kf5; [ kdelibs4support kparts ]); + ++ (with kf5; [ kdelibs4support kparts ]) + ++ [ pkgs.libotr ]; # needed for ktp-text-ui }; libkdcraw = with pkgs; super.libkdcraw // { From ab1c27d08660953855644e33a479300a39ae2183 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 14 May 2015 20:51:38 -0500 Subject: [PATCH 181/615] Build kstars with cfitsio and kparts --- pkgs/applications/kde-apps-15.04/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 59723c9d8353..8d1e5e322420 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -327,7 +327,8 @@ let kstars = super.kstars // { buildInputs = super.kstars.buildInputs - ++ (with kf5; [ kparts ]); + ++ (with kf5; [ kparts ]) + ++ [ pkgs.cfitsio ]; }; ktp-accounts-kcm = super.ktp-accounts-kcm // { From 87d40251ccaaba4b080b511b1f124555e97569f8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 15 May 2015 05:40:47 -0500 Subject: [PATCH 182/615] Build kmahjongg with KDE 4 libkmahjongg --- pkgs/applications/kde-apps-15.04/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 8d1e5e322420..9cf57a8923aa 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -34,7 +34,6 @@ let "Kexiv2" = "libkexiv2"; "Kdcraw" = "libkdcraw"; "Kipi" = "libkipi"; - "LibKMahjongg" = "libkmahjongg"; "LibKonq" = "kde-baseapps"; "Marble" = "marble"; }; @@ -106,6 +105,7 @@ let Ldap = openldap; LibAttica = attica; LibGcrypt = libgcrypt; + LibKMahjongg = kde4.libkmahjongg; LibSSH = libssh; LibSpectre = libspectre; LibVNCServer = libvncserver; From baed394d926b0fce6f7178c666f5fd5ddce52461 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 15 May 2015 05:40:59 -0500 Subject: [PATCH 183/615] Build khangman with KIO --- pkgs/applications/kde-apps-15.04/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 9cf57a8923aa..af7bf8ae738d 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -303,6 +303,12 @@ let buildInputs = super.kgpg.buildInputs ++ [boost]; }; + khangman = super.khangman // { + buildInputs = + super.khangman.buildInputs + ++ [ kf5.kio ]; + }; + kmix = with pkgs; super.kmix // { nativeBuildInputs = super.kmix.nativeBuildInputs ++ [pkgconfig]; cmakeFlags = [ "-DKMIX_KF5_BUILD=ON" ]; From 5b6e66e1b6e1101cfa1182aac09974e3554e2c7f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 15 May 2015 05:41:11 -0500 Subject: [PATCH 184/615] Build lokalize with KDBusAddons --- pkgs/applications/kde-apps-15.04/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index af7bf8ae738d..5f6d7c0bb6da 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -350,6 +350,12 @@ let ++ [ pkgs.libotr ]; # needed for ktp-text-ui }; + lokalize = super.lokalize // { + buildInputs = + super.lokalize.buildInputs + ++ [ kf5.kdbusaddons ]; + }; + libkdcraw = with pkgs; super.libkdcraw // { buildInputs = super.libkdcraw.buildInputs ++ [scope.KDE4 libraw]; nativeBuildInputs = super.libkdcraw.nativeBuildInputs ++ [pkgconfig]; From 278df52729bebf4e0c8f91b06eb3545019bebe58 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2015 13:47:27 +0200 Subject: [PATCH 185/615] r-xml2: fix build --- pkgs/development/r-modules/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index e0b19f465c98..02ae731bc544 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -950,6 +950,13 @@ let ]; otherOverrides = old: new: { + xml2 = old.xml2.overrideDerivation (attrs: { + preConfigure = '' + export LIBXML_INCDIR=${pkgs.libxml2}/include/libxml2 + export LIBXML_LIBDIR=${pkgs.libxml2}/lib + ''; + }); + curl = old.curl.overrideDerivation (attrs: { preConfigure = "export CURL_INCLUDES=${pkgs.curl}/include/curl"; }); From 949746f9f549e8cad253d1f99867068f4a8ce0e6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2015 13:48:38 +0200 Subject: [PATCH 186/615] r-modules: disable broken builds --- pkgs/development/r-modules/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 02ae731bc544..11d7193edee7 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -947,6 +947,10 @@ let "WideLM" # depends on proprietary cudatoolkit "x_ent" # requires opencpu "zoib" # tarball is invalid on server + "timeSeq" # depends on missing edgeR + "survJamda" # depends on missing survcomp + "ssizeRNA" # depends on missing 'Biobase', 'edgeR', 'limma', 'qvalue' + "h5" # depends on missing h5 system library ]; otherOverrides = old: new: { From 691a65cb41f341ff19f6065c565df09ff1da7e02 Mon Sep 17 00:00:00 2001 From: Simon Jagoe Date: Fri, 15 May 2015 13:04:11 +0100 Subject: [PATCH 187/615] Update SHA256 for hplip plugin --- pkgs/misc/drivers/hplip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 41ed3e710427..7c4e6f45bb4d 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -23,7 +23,7 @@ let plugin = fetchurl { url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "0j8z8m3ygwahka7jv3hpzvfz187lh3kzzjhcy7grgaw2k01v5frm"; + sha256 = "1pzxv9yway1x1m5grz6042p54ldh7jcgv4qrkjhlcb4vr9plwql9"; }; in From 2bf516613d88dc16e9185bc0bb1f0e021fbd9442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Wed, 29 Apr 2015 22:02:13 +0200 Subject: [PATCH 188/615] Add section on fetching sources --- doc/coding-conventions.xml | 53 +++++++++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml index 61d373738f90..e1853d47ce05 100644 --- a/doc/coding-conventions.xml +++ b/doc/coding-conventions.xml @@ -169,8 +169,8 @@ stdenv.mkDerivation { ... args: with args; ... - or - + or + { stdenv, fetchurl, perl, ... }: ... @@ -598,6 +598,51 @@ evaluate correctly. - - +
Fetching Sources + There are multiple ways to fetch a package source in nixpkgs. The + general guidline is that you should package sources with a high degree of + availability. Right now there is only one fetcher which has mirroring + support and that is fetchurl. Note that you should also + prefer protocols which have a corresponding proxy environment variable. + + You can find many source fetch helpers in pkgs/build-support/fetch*. + + In the file pkgs/top-level/all-packages.nix you can + find fetch helpers, these have names on the form + fetchFrom*. The intention of these are to provide + snapshot fetches but using the same api as some of the version controlled + fetchers from pkgs/build-support/. As an example going + from bad to good: + + Uses git:// which won't be proxied. + + src = fetchgit { + url = "git://github.com/NixOS/nix.git"; + rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae"; + sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg"; + } + + + This is ok, but an archive fetch will still be faster. + + src = fetchgit { + url = "https://github.com/NixOS/nix.git"; + rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae"; + sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg"; + } + + + Fetches a snapshot archive and you get the rev you want. + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae"; + sha256 = "04yri911rj9j19qqqn6m82266fl05pz98inasni0vxr1cf1gdgv9"; + } + + + + +
From 46721655828a40c62df292c6b7c1443891bb519a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2015 15:18:43 +0200 Subject: [PATCH 189/615] Remove unused file pkgs/top-level/haskell-ng.nix. --- pkgs/top-level/haskell-ng.nix | 92 ----------------------------------- 1 file changed, 92 deletions(-) delete mode 100644 pkgs/top-level/haskell-ng.nix diff --git a/pkgs/top-level/haskell-ng.nix b/pkgs/top-level/haskell-ng.nix deleted file mode 100644 index 73c0abd4726d..000000000000 --- a/pkgs/top-level/haskell-ng.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ pkgs, callPackage, stdenv }: - -rec { - - lib = import ../development/haskell-modules/lib.nix { inherit pkgs; }; - - compiler = { - - ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; }; - ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix ({ - gmp = pkgs.gmp4; - } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix ({ - gmp = pkgs.gmp4; - } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - - ghc6104 = callPackage ../development/compilers/ghc/6.10.4.nix { ghc = compiler.ghc6102Binary; }; - ghc6123 = callPackage ../development/compilers/ghc/6.12.3.nix { ghc = compiler.ghc6102Binary; }; - ghc704 = callPackage ../development/compilers/ghc/7.0.4.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc722 = callPackage ../development/compilers/ghc/7.2.2.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc742 = callPackage ../development/compilers/ghc/7.4.2.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc763 = callPackage ../development/compilers/ghc/7.6.3.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix ({ ghc = compiler.ghc742Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc7101 = callPackage ../development/compilers/ghc/7.10.1.nix ({ ghc = compiler.ghc784; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc = compiler.ghc784; - - ghcjs = packages.ghc7101.callPackage ../development/compilers/ghcjs { - ghc = compiler.ghc7101; - }; - }; - - packages = { - - ghc6104 = callPackage ../development/haskell-modules { ghc = compiler.ghc6104; }; - ghc6123 = callPackage ../development/haskell-modules { - ghc = compiler.ghc6123; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-6.12.x.nix { }; - }; - ghc704 = callPackage ../development/haskell-modules { - ghc = compiler.ghc704; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.0.x.nix { }; - }; - ghc722 = callPackage ../development/haskell-modules { - ghc = compiler.ghc722; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.2.x.nix { }; - }; - ghc742 = callPackage ../development/haskell-modules { - ghc = compiler.ghc742; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.4.x.nix { }; - }; - ghc763 = callPackage ../development/haskell-modules { - ghc = compiler.ghc763; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.6.x.nix { }; - }; - ghc784 = callPackage ../development/haskell-modules { - ghc = compiler.ghc784; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { }; - }; - ghc7101 = callPackage ../development/haskell-modules { - ghc = compiler.ghc7101; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; - }; - ghcHEAD = callPackage ../development/haskell-modules { - ghc = compiler.ghcHEAD; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; - }; - ghcjs = callPackage ../development/haskell-modules { - ghc = compiler.ghcjs; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; - }; - - }; -} From 1e0ab1d4ceae87f0859264f6c702b5ea52b4ebdf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2015 15:20:24 +0200 Subject: [PATCH 190/615] haskell-packages.nix: remove unused attribute 'haskell.compiler.ghc' All compilers in that attribute set are versioned. --- pkgs/top-level/haskell-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0051c2b3e21f..8e0ff1834c6e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -37,7 +37,6 @@ rec { ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin { libiconv = pkgs.darwin.libiconv; }); - ghc = compiler.ghc784; ghcjs = packages.ghc7101.callPackage ../development/compilers/ghcjs { ghc = compiler.ghc7101; From 4b09501f23f128cf46f3eb57d615aa0c2c106125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 15 May 2015 13:23:49 +0000 Subject: [PATCH 191/615] Making go build for any arm. --- pkgs/development/compilers/go/1.4.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 371496250056..473ff458ff87 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation { GOARCH = if stdenv.isDarwin then "amd64" else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.system == "armv5tel-linux" then "arm" + else if stdenv.isArm then "arm" else throw "Unsupported system"; GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 From 92312e17e81c69dd700680ea156fc59e88c5d3e8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2015 15:25:53 +0200 Subject: [PATCH 192/615] Move definitions of 'uhc' and 'jhc' to 'haskell.compiler' attribute set. --- pkgs/top-level/all-packages.nix | 10 +--------- pkgs/top-level/haskell-packages.nix | 10 ++++++++++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0af285825a7c..2f2d5fb220aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3757,15 +3757,6 @@ let }; }; - jhc = callPackage ../development/compilers/jhc { - inherit (haskell.packages.ghc763) ghcWithPackages; - }; - - uhc = callPackage ../development/compilers/uhc/default.nix ({ - stdenv = clangStdenv; - inherit (haskellPackages) ghcWithPackages; - }); - gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded { version = "4.7-2013q3-20130916"; releaseType = "update"; @@ -14577,6 +14568,7 @@ let rssglx = rss-glx; #added 2015-03-25 haskell-ng = haskell; # 2015-04-19 haskellngPackages = haskellPackages; # 2015-04-19 + inherit (haskell.compiler) jhc uhc; # 2015-05-15 opentsdb = callPackage ../tools/misc/opentsdb {}; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8e0ff1834c6e..6b37718afeae 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -41,6 +41,16 @@ rec { ghcjs = packages.ghc7101.callPackage ../development/compilers/ghcjs { ghc = compiler.ghc7101; }; + + jhc = callPackage ../development/compilers/jhc { + inherit (packages.ghc763) ghcWithPackages; + }; + + uhc = callPackage ../development/compilers/uhc/default.nix ({ + stdenv = pkgs.clangStdenv; + inherit (pkgs.haskellPackages) ghcWithPackages; + }); + }; packages = { From 57c278200a3a322f7ac355f222f16f2ee27521ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2015 15:27:49 +0200 Subject: [PATCH 193/615] all-packages.nix: strip trailing whitespace --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f2d5fb220aa..0c15f9ce0a41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9644,7 +9644,7 @@ let numactl = callPackage ../os-specific/linux/numactl { }; - open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { + open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { inherit (xlibs) libXinerama libXi libXrender libXrandr libXtst; inherit (gnome) gtk gtkmm; }; From 92587ccc1f31af50aa79cdde4ad753eb33ce7e09 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Fri, 15 May 2015 16:40:36 +0200 Subject: [PATCH 194/615] pycharm: update 4.0.6 -> 4.5 --- pkgs/applications/editors/idea/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 4a22b6e990a3..5ca5e7dd093f 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -273,25 +273,25 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "4.0.6"; - build = "139.1659"; - description = "PyCharm 4.0 Community Edition"; + version = "4.5"; + build = "141.1116"; + description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "16lf2slssfgbds6zyp2rs0ssrg8aw5d2w7b755iqimiyfhyyv83s"; + sha256 = "0igx62rijalppsd1nwrri1r4m1597n93ncglyb6b94m3fm32fca6"; }; }; pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "4.0.6"; - build = "139.1659"; - description = "PyCharm 4.0 Professional Edition"; + version = "4.5"; + build = "141.1116"; + description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0wavw41nzqnx75y3k3l5kq09i5d9j8hb4r6a0y3nxzqvmdfza55r"; + sha256 = "0zga8sxwrvjvyw9v1pvq40gasp485r1d627jj6jvwzcv78il50d9"; }; }; From fa2102b4638c49dae077d8572e7c74cb6001d9a6 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 16 May 2015 00:43:44 +0900 Subject: [PATCH 195/615] firefox-bin: update to version 38.0.1 --- .../browsers/firefox-bin/sources.nix | 358 +++++++++--------- 1 file changed, 179 insertions(+), 179 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index 2e5545d6a959..c5d82573a322 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 = "38.0"; + version = "38.0.1"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha1 = "703e63e142bba42a1735acf9da88cd52e722ab02"; } - { locale = "ach"; arch = "linux-x86_64"; sha1 = "93da442b9262e2191145cbf95813fae1358cd981"; } - { locale = "af"; arch = "linux-i686"; sha1 = "b489f1a3fbae4762e7dac947d26effa3ff0c3f60"; } - { locale = "af"; arch = "linux-x86_64"; sha1 = "fe6b38ceb279e042d238064154f6d4d8e2c6fb61"; } - { locale = "an"; arch = "linux-i686"; sha1 = "28bdaafca6b99f115dcdae34a0f6ce4eaeaf5507"; } - { locale = "an"; arch = "linux-x86_64"; sha1 = "726e734772bf68ff5e4b88ed789b10122fe302bc"; } - { locale = "ar"; arch = "linux-i686"; sha1 = "ed0ab975dbf5a26c3704fdd24b47b7f358edeb3a"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "909af01cbe8eb2e2c3557a474bb0d77b03b40a6d"; } - { locale = "as"; arch = "linux-i686"; sha1 = "c869d42a757798d17d0b0398c6a75652e795ce4c"; } - { locale = "as"; arch = "linux-x86_64"; sha1 = "c4183741ea8383caa350c115288f32057306bc95"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "9f20f4dae0ede083f193c61935d2781c7cd29b76"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "0198b69cbf5864a1d4981e0a3e0373e7bad1b8a8"; } - { locale = "az"; arch = "linux-i686"; sha1 = "f2ab43ab4bd81c4dfc17657943e962a1b2ec01ab"; } - { locale = "az"; arch = "linux-x86_64"; sha1 = "f903da974577d99354ba7e2d753c8796af3cc037"; } - { locale = "be"; arch = "linux-i686"; sha1 = "ff88567de38d5a9195e3d31bdb3897c6db960315"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "7a4bc7296bad8fa1afad53ec9c56b933bf2f34d4"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "452515451a1a1e1640f46233d287d62213948dd1"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "715cffedcd576b8b124b67effaf72e9091bbd072"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "e8418ff4e04dd2058dd50fb2a926df4c975fd5a4"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "e3e4037b8f19355b036af6c19ce9ba11a13411f1"; } - { locale = "bn-IN"; arch = "linux-i686"; sha1 = "edae503e6d7529ba3af7facda18cc25a9634c7d6"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "b22a1784efb4ba741843360a8cb2da95e8eefa77"; } - { locale = "br"; arch = "linux-i686"; sha1 = "776b7edd9fdb3a02cbcd2c74f7fe237760483e37"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "19718f8e6e45ac480ea8ede27408063e3e966044"; } - { locale = "bs"; arch = "linux-i686"; sha1 = "e74b5e40c76429cbfe84c282a8d7f3d7e39ed3b6"; } - { locale = "bs"; arch = "linux-x86_64"; sha1 = "6cf56a28635a84e87a6d2735d812b5bd286f66b3"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "c062cbb2847c78990849ed34171b356ba2514a4a"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "443875f512bc1ff697d3a2848710afa0cf27149f"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "4c7ea9e5cf6c9cc790f8e738658155160062d82b"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "34ed2e0cdba5c9347c886d0f5f1dc595339001b3"; } - { locale = "cy"; arch = "linux-i686"; sha1 = "161aa92acbd5175e0e05094a98ae4620f3e61e15"; } - { locale = "cy"; arch = "linux-x86_64"; sha1 = "07fed553ab3d8942af865ef54ca45d3cb084671a"; } - { locale = "da"; arch = "linux-i686"; sha1 = "1d287b810ab6eb2c69861aa97279d95e5de9e00b"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "a11872f1243fb7f2afac871497f77e559c571198"; } - { locale = "de"; arch = "linux-i686"; sha1 = "d44d41473f9c89129316247e3b3782ac5e734a03"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "bf82fadea1008287e6b7b6c5cc3ce45297102493"; } - { locale = "dsb"; arch = "linux-i686"; sha1 = "f6f533c7c96e5b0551df12007511fb03b252d568"; } - { locale = "dsb"; arch = "linux-x86_64"; sha1 = "5d2c8f0729bf9dd7a33f3469e5eceb10d3b68e4c"; } - { locale = "el"; arch = "linux-i686"; sha1 = "f3bcdb0616e7dbb9d0c014819568c426643b01d6"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "65d0ecad9093142bc122479f71d4a8f865dab9ce"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "b8681a21ee8c59067abb8971d5dfc0c183ce9f3a"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "8b94b6866f865926142fadaa1c4a995d8a4939ab"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "a37a42035062385ed664521e6fcc64b6acc3e100"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "f72bd458cf0f42894a1023b09e25ba491c666c8d"; } - { locale = "en-ZA"; arch = "linux-i686"; sha1 = "84eb150df148cc792398f020a06c368b0f3a5384"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "84bb82b946c227931383620f2bda7a4511c86772"; } - { locale = "eo"; arch = "linux-i686"; sha1 = "878ac1426303882701ca99a0e54ce025d5275e84"; } - { locale = "eo"; arch = "linux-x86_64"; sha1 = "a4187e25529dde37e4b6f5201035efef69810e7d"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "adb3ecd1082e944f6cfb6c224fb99868d6b204e7"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "1ebba7dde7424c0855f738fb37c71be6739ddd54"; } - { locale = "es-CL"; arch = "linux-i686"; sha1 = "7247e16910263ab971fdf7957e6e075a41ce0072"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "40113a4ddf11d43ae9b382456810193c3e50204a"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "328ec405ff20ee4ac3dcdb242978f552fd471bb4"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "aeb6d54290b1c2e882e871520232f20e05c9ee49"; } - { locale = "es-MX"; arch = "linux-i686"; sha1 = "b5b0d078d36ac681df735336406e3a5d5ef7347c"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "cb02ced1e1e132247cba8505e1a3240bb71ac186"; } - { locale = "et"; arch = "linux-i686"; sha1 = "27eccc34804a058bd163f369715863486a9a578d"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "2429fbb2e011cee22024b4f2d34b6e28821ba874"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "3496749c75804f7d710edb8e3c67e7291608ca39"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "9401f038ff97bf8ed55e21e8871f33aa342268da"; } - { locale = "fa"; arch = "linux-i686"; sha1 = "6068057c34ef0c53a70f01d29bdbccc708c57501"; } - { locale = "fa"; arch = "linux-x86_64"; sha1 = "c18b0c916f7716012b7e7262351741c6c798c951"; } - { locale = "ff"; arch = "linux-i686"; sha1 = "c32c8be17b6254bd48166062569e41bd8cf3a1ca"; } - { locale = "ff"; arch = "linux-x86_64"; sha1 = "717da6c53be118f6373e8c68c2e82ef720503646"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "0e15abde00eb8e7807985deb74a2abb7c1f48ffa"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "b0f556019f0696a14b538925551b64e0d8e4f9cc"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "f07ed45bef78333cddbbe8490683867c81e4d497"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "e43a5d8034e641ffa8380cbbfec04e5e04ffe025"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "0e7d1d7228eca1e24bbcd3f247f2cb0bcbeb7843"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "fceeca14bbad0baa0ab76c51f826701df4a35c54"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "2fdb907fc1a6d889a177eee661d246d485c0b2d7"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "11a516d9104ece3130f01c1d6a4a218409ac191b"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "290b25548e4a0f123598953e08b6ffc0ffa7f5a8"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "ea371c234e4eb6e3a4a1b92add169d7539df16a0"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "3fcaa32d2f4825b59ed7f08dee92c7ef9a5301e4"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "1118347a7bcb197bdfcdadfd96a33c315f716cd5"; } - { locale = "gu-IN"; arch = "linux-i686"; sha1 = "368318d6cc8393d0867fe9e0abc0109420a0ad7f"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "72c8eae63bb9298d3b54c9f93ff442a1ffa21b47"; } - { locale = "he"; arch = "linux-i686"; sha1 = "27255ec09da56566297af99f22d13de1f5807d0a"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "f557dc50e027f2f1b327977df9bf1b86640b035d"; } - { locale = "hi-IN"; arch = "linux-i686"; sha1 = "942f2c4eff380ea660deb2a3a26f0b0716d10e84"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "7e4085fc80eb4b10010f10ad7ea3b40278c60c26"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "870d720f3a56068f4c0ec3ed0393efeca5106c52"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "3fbafa4f4f18bf4fbfe42366a1bdcd06952d1886"; } - { locale = "hsb"; arch = "linux-i686"; sha1 = "010b18faf1f999f88a5a618ca03e05a2d1a55cee"; } - { locale = "hsb"; arch = "linux-x86_64"; sha1 = "0ff5b1500514c82a4199a3af511be1c66a6b17b7"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "ce4d095eda872b05045766e6cdd686a21501b78e"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "397c66d7d95eabf5ba8bf47b9700c5d52657f586"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "605cae22b8edb09bcee585c7a0ddf91bb7b8771c"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "f9bf891cfb82baaa27ecf4f6192f50d264a362ba"; } - { locale = "id"; arch = "linux-i686"; sha1 = "0901de7f7b50b652a640e069c811ebffb990af1a"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "7d054dfe69b4c6a2359f89ebd9936d887d432637"; } - { locale = "is"; arch = "linux-i686"; sha1 = "9e50b342cc1754f66f274002a04ca35e933bbe35"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "6396bfe04f896321e1bdb2a1b742ee2461e3840b"; } - { locale = "it"; arch = "linux-i686"; sha1 = "e0818ad23234a31355cd366fb5cecf7a157e437f"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "ca8dd6aa223dccfd65b0ef3f8d85775a38ae5f9f"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "b67d6167b13ba68731b32944a9ba4e2010e54c8c"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "c2421cd629de2cc317965e1d8e047a247dc3135d"; } - { locale = "kk"; arch = "linux-i686"; sha1 = "8dac75acdfcd95bce9bbee2a90785aaf50d1e331"; } - { locale = "kk"; arch = "linux-x86_64"; sha1 = "01318b4a164d73801d53a86b9147cc3c68090e44"; } - { locale = "km"; arch = "linux-i686"; sha1 = "702f772a54290f2cf73842caa1780cd054630113"; } - { locale = "km"; arch = "linux-x86_64"; sha1 = "7bf0508c975f5e14964b25d40570dd7488364169"; } - { locale = "kn"; arch = "linux-i686"; sha1 = "d8241f3ed0d78643ae38986b2f0898f895a47ed9"; } - { locale = "kn"; arch = "linux-x86_64"; sha1 = "2b499f42e831c8a949d1ac2955cb52bbe01fa516"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "b3a41ba02af12471183a07af0de203e8d1c8e679"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "d31af209483706603dfe2ac39490e8258fe1f376"; } - { locale = "lij"; arch = "linux-i686"; sha1 = "7b97e5c6e5868e1400616bf59317e2aee54b4f9d"; } - { locale = "lij"; arch = "linux-x86_64"; sha1 = "ff77fe8e75dc98d07f6fa943c2b87572e2fe821d"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "2a126616d400e1781b0d25da0b92f374f5c58764"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "f5a77f3da6dbce8f3069377c8107b6c21dc8ad33"; } - { locale = "lv"; arch = "linux-i686"; sha1 = "213b239888c9bc9667db5b90d5327edb16533346"; } - { locale = "lv"; arch = "linux-x86_64"; sha1 = "2ebe88b6e9457105abe21db5e501174c4ed6b9a3"; } - { locale = "mai"; arch = "linux-i686"; sha1 = "dd64b8f13021007506cda02b620463a37a40cb44"; } - { locale = "mai"; arch = "linux-x86_64"; sha1 = "765f498cd0a27a50148022cef1b0db0b7e272393"; } - { locale = "mk"; arch = "linux-i686"; sha1 = "3be4f9cfab1885a891360e7e3d024c130d55b098"; } - { locale = "mk"; arch = "linux-x86_64"; sha1 = "15c95ded6f5057cdaa8716c1f9a63867f7f698e9"; } - { locale = "ml"; arch = "linux-i686"; sha1 = "2ccc54e8c8fe8fd130427d56b65f191224483d3d"; } - { locale = "ml"; arch = "linux-x86_64"; sha1 = "90f8826a73042bb5019f4ef75be49beb40e47c1d"; } - { locale = "mr"; arch = "linux-i686"; sha1 = "6d06a583ffd0520a4f8606e7dfed798363f96133"; } - { locale = "mr"; arch = "linux-x86_64"; sha1 = "c91c4de37182f3c01738856e11f4ddfd867343b4"; } - { locale = "ms"; arch = "linux-i686"; sha1 = "46c9b3f5c7c3b288e759894a4041b0854e35811b"; } - { locale = "ms"; arch = "linux-x86_64"; sha1 = "0b11edafce5fca8af93f06e7d3461508456faa3c"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "43c0a898e13b5cdec73c20a8e47d7ed73340a4be"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "1a1ee21a5f935ec38b540a573e3261eb72d18737"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "9f024aa7cd88b43f1d41ca35b9602c4ce3ce0d66"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "51fb9526bc2f6ffbcca33a9db565041ec7541c17"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "4620b4ee8ac0d9f20dae06ab5039559c947e189e"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "bcb56f263c9f8cf87dbfb667bcd6261b6cab3da9"; } - { locale = "or"; arch = "linux-i686"; sha1 = "b9e499a16b8dea07e05ab68e92b07aac09611a0e"; } - { locale = "or"; arch = "linux-x86_64"; sha1 = "69d8afea4beeea7b6f8e85d2c57834e36ec0a5da"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "15c35746a9ca5f9bba4048764ef01f38eed1d7b3"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "d068f8fc28ae96dc62a0131a5ef42f35028d8dc9"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "4127ddf36a954066deb09e967224163f4dc9e632"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "8e2f853eece4d7793db9757f32466f85d1f98029"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "85f0440039b77cbf6547fe5b7be0acaba613aee4"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "0d0d661c3b6197516d3e3f990a49e327170fb8b0"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "3f42e38f0a9436c6eea9cd6b84688f1c5046d9c3"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "56a9c8600f17106ee360994f2816e814f6dde054"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "e8de5922f28f494c3a6a8b1e53c270dd4f34cada"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "1fe39b3dd62180cf6b2b7a6771ac0f61b1538619"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "57739540e02371abe21f6022b3b8fa6103543279"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "56c5815007727024c6e479d81122a59836f848d8"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "f5dcf9023ca5aeeb60d04158f7efc1b6ccbd5313"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "142d95e936063a90b28d2c33e79ac4cb8052ed8b"; } - { locale = "si"; arch = "linux-i686"; sha1 = "489ef1bb93ca27673067d370a62f20cb227d2f55"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "50d819cbde16c384c9adb1d4d176400cbf3544ea"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "0f1f4fee615ce2ee49f5458b9953af176e13280c"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "fddac5b20e6231c9626bb966475d8a16d03efde9"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "832d040787c6cb599f956cb4124ed11c4730be74"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "a73ebbfab7e630de54b13165d428e4b2843f68a2"; } - { locale = "son"; arch = "linux-i686"; sha1 = "49ff3285d4b4a9efae2f434709d80fe87aa94375"; } - { locale = "son"; arch = "linux-x86_64"; sha1 = "1f77f4d495c94b6c94ecbd4bb40c56e985cae5c6"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "5c9075d55d62177e24b7a91ff25ee0d8173ca1a8"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "eac042c5080f6bbc43770e7d2b0910537a44bc1e"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "c261b8d480c1c23aaea1754857ab7e069a5ef812"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "3d83d21430a7f90ccbbe8ab4a16d0faa44efc22b"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "c6a5b825196404024f4a11ea3c4f1d74b0cbe80b"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "90ff4a639dcd65ce821b9dd6545875ed5230513a"; } - { locale = "ta"; arch = "linux-i686"; sha1 = "99f4418e230a987c12671b9fc3242b3ccc97e5ab"; } - { locale = "ta"; arch = "linux-x86_64"; sha1 = "bda55fcf5719f3d43f422dd4a1e7935db598d8a0"; } - { locale = "te"; arch = "linux-i686"; sha1 = "dd1d269619f0377993178e9f7083301c39339513"; } - { locale = "te"; arch = "linux-x86_64"; sha1 = "c73e447f83ecb44acdd5637702b977b3d37a0593"; } - { locale = "th"; arch = "linux-i686"; sha1 = "c63c3509af06f4c9a19f6ac04149d2eacb201459"; } - { locale = "th"; arch = "linux-x86_64"; sha1 = "dfad91490135d6536af450b70ef96afb04413d76"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "43f60e6dd8e412aebcfab2a2c6ca1813933152f8"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "2d121c22f3a9aefb611a8ba8dee568c2c8e6e66a"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "f5841ceb3482d91dd2d805258fd9e326cba2e131"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "d16acad424a61e098b37b68aea98a2ac69efdd21"; } - { locale = "uz"; arch = "linux-i686"; sha1 = "4c94cdc7a19fbe9adfb0aa091299efc973b37d60"; } - { locale = "uz"; arch = "linux-x86_64"; sha1 = "91b5af1bd30c3821924968b03961e5295f15b0e6"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "96561c7bbb7cfbc3af8f1bbb75b054cc95649357"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "d7ea3b927eff3b229d2013d064fef8661cb088e0"; } - { locale = "xh"; arch = "linux-i686"; sha1 = "53edf9df438d7e6b344a8e321ebfe769cd456bb6"; } - { locale = "xh"; arch = "linux-x86_64"; sha1 = "9c132b7b651e3dd9c2c78ad4beada01784b2ef41"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "3cacf5dfaf58467e27e4804da74a9f6da6f12de4"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "f649c726757ed1bca13d2a05dd57b7d3f56b5dc6"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "1e77b856a434ad6dd12594cef9362313e910b14d"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "545d3bdd564232788850cb04b1314a3191b14175"; } + { locale = "ach"; arch = "linux-i686"; sha1 = "912fff124863aba8189cdb2f22a2c1cf96c5057a"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "72d9bf343fac24312faf42272553b37e7cb5df5e"; } + { locale = "af"; arch = "linux-i686"; sha1 = "c266d1ce84018e55f239c0cf692feab0b3d2bb58"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "28df7ec17c9008e59af3ba50225e2e6b53f9722a"; } + { locale = "an"; arch = "linux-i686"; sha1 = "2d254b3818afcc0510efba99fe469754076b8841"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "6428c38cd5c00c2a9c02e26b71945831c3c102d2"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "5477725a61b9479a90e76727eb9f69d19e282f83"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "e663608972b44aca2b08abcc2d92a3f8e8c92ed9"; } + { locale = "as"; arch = "linux-i686"; sha1 = "101da7d20a72980cdc5db7c4b2755edc3e0a5d66"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "9e6b94146534ec11d00ecd4f1e06680f0fd918b8"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "b5e195606434b4dd90818877e5aea05fa995f136"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "851276e8a86b27ad7b92e075e6e20a527284dd4e"; } + { locale = "az"; arch = "linux-i686"; sha1 = "48ed44ab60ca16fc39abce13a630d997dd5099c1"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "fb6b4ca689670a3d994e3c524490e46636a8cd59"; } + { locale = "be"; arch = "linux-i686"; sha1 = "6c4d9cdb9fb8aa0fb3ed8042306268600e3c385a"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "0795a804507837821fed591849169c13bf193302"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "3423b59b472eff5bdd0d16994a777c06de734b2b"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "5571d632e5dc7efea9fccae5035ed070542adc52"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "c9724715fa1036e872b09b4bc453c9ff9344831a"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "f99413c5716c4d45eee22cf1f547138b1ba3d044"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "76d5752e8bc131ece1a43a3376b99280545861bc"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "b9ea600f884e50afc31d096697b54366186b1331"; } + { locale = "br"; arch = "linux-i686"; sha1 = "e72e62a49ebda9cadf032e2e90c14adb5a7db1c4"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "7c64d69d3510d06ccdf98fbf85f41d3b7f4b532f"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "c69f54bd537c9d16ce4ccf5169646c6f7dde98a5"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "abe0137bb0cb8536b6bdaf03246bfc97e7cba4bc"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "3c914e3f26a61568a220b8eed2742c70ee879fd5"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "b3aa2e0caa2b145df9b3c099bb5158eb6c21402d"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "bfc8733ee396bfa0dedfdffb5aa11bb4c8816be0"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "6de8e3bb0038676a906b75a9603b9f057251538a"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "125c53350f599e975b177db3e11ce367b2250fd8"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "4535f608f78f91014371b4b49ca5d73ba369e5be"; } + { locale = "da"; arch = "linux-i686"; sha1 = "860baa240c24453b55bb3c3273eee85821ab4a7f"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "2078e23dbeeeaad80ef55a07888a94958a8bce85"; } + { locale = "de"; arch = "linux-i686"; sha1 = "d3d6fbcfc622a303b932c6f9fed134d26fa3a32f"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "1e7e7608ad79337212d73fd72df189bcfbc08be5"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "aadd04915c3dd07b4fa257071382081531e910cb"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "ab57a27336d9b2b379dd9370781cbe38fb34f274"; } + { locale = "el"; arch = "linux-i686"; sha1 = "a96898e37be58096490ce26313760e9595eab0cb"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "fd83ef7ac7b6b44ca61737b85f4b2aa9e297566b"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "923e977c4a53e91ff0299271bfacf675d1c9f047"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "6250c59ec325ce9f2a6520cc326a500fe8a61106"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "11647b846463af53eebc70e5000c1b2072bcb08e"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "c65084273a4684898d1bd265714bcd2a577939a0"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "cbe33f717d3548913cc316adc4163824f63301dd"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "ddaa35f6f054184484856254927bb4b0c7009ec1"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "d8c0d5adbebac214be559354e6f83efc6c01c874"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "e2deaaea97169a50e50c7a3cd7963b7627fd0271"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "cee1c800c773dd784900e8e1d9efc7ae59764907"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "38efb3a002d3ffafd825b24d0aa5c55617f0a198"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "419ca07f1d5bb1d460ce22a7bf8488611b3efee3"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "4ccd1423a7840b9bc696dbe9f1edc1e1629e664e"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "9398c4714f01ce1a2420ad879fc710a84c19f666"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "79e8fff4b9390f3258a7ed78995759d0005e167e"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "c3b4d3496c08ec12f3dc96d2600b327f8d326377"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "d5ee06667437b1d2f56de89b5f5e5f2f007c4eb1"; } + { locale = "et"; arch = "linux-i686"; sha1 = "1c9a8326ca27152a4a8554c62d69784ad4f07ac6"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "f4002b8fa6734353d02e605bf870aa51d67940a8"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "39bf95af55156896df07a2a5f77909987095f567"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "99a70da03d31e8209e2818ef07d8d380c1521164"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "1346de9715783742fcafe60df6d1c37460c6db93"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "d2e0b04bbc4617e35a1d46f22801ecebdb6e873f"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "2ec4e8bd9cdaefe06c390a5e41b5a234a2b1d7e2"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "293dad19f7278909b216107c229e20a79bcfa1fd"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "15c2fe0d7c6a53ee5bc7d8284ff414dd6da6b883"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "09222ca13bc199c8c32fad00a638f335276ff44b"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "10a45fab960d898d65f0dc45a6d0e6368f6bde8e"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "e6ed3e2d6d8e272d6a82bd39a0986afe9f9d5b00"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "0222d1158829d06f3fee3314296ebe9126e0d9ab"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "a0c5529c5439c4a4ac29578dd0df6801310b1279"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "95e9d1636243553b72c8d5a6a653f5cd12539ca0"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "c525824667f8fe9225fafd1c1bbe6d84413d3e30"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "d29e93647a906856033607ef15e88307cf98fab7"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "5473877025c6a4e57c286a7dc8c7550b71d4e156"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "350847f8853219234edb68b9316cbcf486191f2a"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "7e4c444870d24d9b5ce283bbbf0e2ecdd5ed4d85"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "6aa7416aeb84000778df3ff354f4efd2cd805d70"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "262b35a170b39750dc19579caa05df19c98cac94"; } + { locale = "he"; arch = "linux-i686"; sha1 = "e6a798072a9fb01e947e5d40e431d3e71256d3e3"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "6674ba9cad77bbc912f94084f8fd2403f0ce42fb"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "d10a236c1e8bc425cd8077b87816fe0a28405274"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "d67449c5cfe939ab5531cf5a27e1da6e5b9335d7"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "f5e151299b3da7788e40dadf1c1d0fab6e409a00"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "6f6b79f283f11414ba2344e83cfb1f0197011c2e"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "a56600d80d772d4009c8feeca7dc6d63c344c199"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "40a7724e59e002446c0a9cfd35de948fc5311e54"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "d1e68650ec713a0d24e159fe967b73b26198d33c"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "abac7894c98a55bb3f7f2ca02a439575c241ea7c"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "d45c305cb676c7456d8e8f4f803089d82077a8fa"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "473b7beca08bcbf8d443f6efbe3ac8752a6773c8"; } + { locale = "id"; arch = "linux-i686"; sha1 = "084dd83725e94a557e73d11f78633e1bf98e5d69"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "e173e4f47878070a98afde349d2fb93a6ae1c342"; } + { locale = "is"; arch = "linux-i686"; sha1 = "65b89daf623810a94bbaaaad301a2c3e9e6d4d5f"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "f108f862dafe32a047c08c6fe1135611728d3f4f"; } + { locale = "it"; arch = "linux-i686"; sha1 = "ba049d6eb3b455674caf424745607f49675a8ed6"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "006f094f2966358ec685b00033e640a94d809d53"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "95f6d91f882d9d0ab8ff5d4b7654a102d973543f"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "e2a70547561a1fed87e3308ebf857df6cc3a315e"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "c0d239c2220979dc0daa15ab1e9af510d7c09706"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "d23bdcacb5714b10f773381fb9c8e3d628d2e278"; } + { locale = "km"; arch = "linux-i686"; sha1 = "d9119536b4295fea892afd8ee1b46fd5eb881314"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "1c7eb6d62b050769634fb487c0161c5748b8e4a2"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "491269cc3bbd577d24cfe898b862cad008d2da41"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "9043341ce5c84064aa80f95545404f5415bea782"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "13cad5dea192e57b03a26c09254e6fb7cc4022d3"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "8b2f6551415637ff8c9d2de1e1643aa5cd721d48"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "b57d7e89e0cf548ab016867d468d5fa2e3b429aa"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "3246755855f5d869ddf5724cbd2fb6c237d3ad35"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "804ee921241432208c83bdf70986628c5fc1ce1d"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "c2bd411ddf33382afd091cda7f2f6c4cf3dfb5d4"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "89dfa9f319c1d6681deea122a3f23e8ea4bf6248"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "8b209580ff83965ebc27aa3f97eac1180fb82ffd"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "ff727fe52dac2468d430c5d8d734dca133693e9c"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "21844cd80358d5ac24bd9d9ea2a6daadd296e760"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "cbc4cb34957fde341affa780ea743fb30aa13aad"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "4e395325fd1550710197822495c8873a89ff014c"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "19f538b937a9f4a3ef2ee498c64de69b214b87d4"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "ebc164cd9cf4c3993270949a13c9cb1123379093"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "a942c265bedf537e59fcde8bff39c3addb4a2963"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "8967615af2f2efe359f0babe614d282569e44691"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "89f8a2bd49ff4793b2d69efb48aaa93b031dfa69"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "d2be6c9f62cc0615f9041470bae3b139b69ef55c"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "99afd0b77d350df671acbe403b9b19d975bcb91a"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b14f1b45617773a0e010d81ce83b493dd93dc03a"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "9a043691524087b9968aaac1b5d19a212ddffebb"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "f22f09a85bdd943c874a0b321ae1ec017200d0b4"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "1cdbd8319688ccd0af636e71568d7f2244ca0d1a"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "bf660208d072b92f4d961d63f6bfadf5d2848e97"; } + { locale = "or"; arch = "linux-i686"; sha1 = "fe1edc33462f5b31d76b7b39ef7de459b2260658"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "679eb537bd4007ef14b09dd705a0eaf5de6c29ff"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "cfa52529dcb953c5448d589845bf22343fc6339f"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "a603ec800745b17d7ef31ee4008b2ccfc6515a51"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "09e02683fa6fc34ff152533026824205f976b866"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "94ed7980eb737171e6d9a428a99cc1cbcfa98daa"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "2a73ca16724778da05aca6284b50f8ce6b2855c9"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "0c0fc357264ed7ef806729cf5f3a636829740c47"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "02a6ce278285830a1d9a2f092321d73755fc6b71"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "0bcf7133711b812d55e4c4f824f6cd53b83ce3ef"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "e314ce94c7f7f72882e4b2671f8a52488e293adc"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "878d2fa1fb737963bb93296d4e0f2e67cd58cb04"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "e4643626b93bacd2f2dae152228287aa0d84acf3"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "6e99ce189e18f7056720500cfa596c8caf8f5a17"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "cffab960763f296586e4bbbbc671409323844464"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "7455db46a81f99ba21d7a3ed0ae5a97246fae822"; } + { locale = "si"; arch = "linux-i686"; sha1 = "ba2a4ddaf8f8978d01f996b599f26801ce3c3a5b"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "8e5cf5885fe5e12e1cf28e7b77171ed23c4fd1c3"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "423e824526557309cb2ec007c41c57daf69e8b42"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "8205ce31e27a6595f2384a85f35f48610cd8b187"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "8766cf70ffd089e79d1eac1211bcc3255c86146d"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "f49ae94b77df1f038bae64f47f3ded0e4f10f349"; } + { locale = "son"; arch = "linux-i686"; sha1 = "dd07bb545505ce0251760d7960ddcfb235856b79"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "aa660969f12a316dd85f7e69678f583430e084aa"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "ea498b08ae2dceb0a103a7980ca086bc5ce94cb2"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "4e2d7c6098c3cc48cc7a3e5b1557b75e1a9c1958"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "e03a369d834c2a2a0a5bc9e539f2a007fa78641f"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "b8cc41734b718deb50654ccc24c20e5be0b767fd"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "358efd06a28a9ad43703335d190f4bea9b5ef95a"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "e63d4ad88ad45e1e4ed43906c4525a24c1b1cd1b"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "ce0fb4901e621dea2330cf80df632d9424ea46b6"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "5910ddf0f1bee1ae3e2ce5c2882ce93732edf586"; } + { locale = "te"; arch = "linux-i686"; sha1 = "367816038ddfbd11b7ad6cc2bae41fe4d82b132b"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "6e6c46db9e45bbe20861fc8d6f971daaaa63d181"; } + { locale = "th"; arch = "linux-i686"; sha1 = "0d4859a54ae11c114cb449b150373465d92b795b"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "16d95125a4c51df9ebd587df16cb428f560cb8e9"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "6bab2ad51c7cf6e761c147d0a0f748573b1683a2"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "ba660dbe60c4e95ac82f536313989933e1edddb6"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "1e1e5dd54da8e3b94da831909149721dd2766267"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "1f32f890d4a1ba2a672d25a005ef5daa76040e33"; } + { locale = "uz"; arch = "linux-i686"; sha1 = "49b36171729e3e0924d8398b62c22d5a02b36b8c"; } + { locale = "uz"; arch = "linux-x86_64"; sha1 = "2336db0769fa921f2a50774791174565e6828978"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "2b40d9003eca218d235574d1ee7d6da73244d614"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "517d6269f4c2a98f4817be8a926b82c261a8d1f5"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "9d24460c7bcd1e8b36d900a130bb88ecda967678"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "e70d742aa94bb4678446a4b94edd915033a640fb"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "3eb4e076fc42e9cbd97dd82af8eb77d3ea6bb068"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "bdbf6abd8e86f6811d032b302818f15f343e8883"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "b7e4cf9bf9db13f3e2d92bdb91ede3f243232a0a"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "411cfc0033ac8edeb30d9d371738864e9401200c"; } ]; } From 94362af1e8f310a0b118d8c9c3be6263d3a9cf44 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 14 May 2015 15:12:04 -0400 Subject: [PATCH 196/615] libev: Fix compilation with clang --- pkgs/development/libraries/libev/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index 90cab2cc6871..ce7d7b9e2759 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -7,6 +7,11 @@ stdenv.mkDerivation rec { url = "http://dist.schmorp.de/libev/${name}.tar.gz"; sha256 = "1jyw7qbl0spxqa0dccj9x1jsw7cj7szff43cq4acmklnra4mzz48"; }; + + # Version 4.19 is not valid C11 (which Clang default to) + # Check if this is still necessary on upgrade + NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-std=c99" else null; + meta = { description = "A high-performance event loop/event model with lots of features"; maintainers = [ stdenv.lib.maintainers.raskin ]; From a634c110756b7ed97ea16ada8a9c70517cca8a95 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 14 May 2015 15:14:32 -0400 Subject: [PATCH 197/615] ruby_1_8_7: Fix on Darwin --- pkgs/development/interpreters/ruby/ruby-1.8.7.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/interpreters/ruby/ruby-1.8.7.nix b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix index 3c2ea71ecf26..0ae1d1261eed 100644 --- a/pkgs/development/interpreters/ruby/ruby-1.8.7.nix +++ b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix @@ -60,6 +60,9 @@ stdenv.mkDerivation rec { ]; configureFlags = [ "--enable-shared" "--enable-pthread" ] + # Without this fails due to not finding X11/Xlib.h + # Not sure why this isn't required on Linux + ++ ops stdenv.isDarwin [ "--without-tcl" "--without-tk" ] ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"; installFlags = stdenv.lib.optionalString docSupport "install-doc"; From 7745dc5dcf47a67b07b649072e99a73840cd3b8c Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 14 May 2015 16:35:35 -0400 Subject: [PATCH 198/615] nghttp2: fix configure script to correctly find jemalloc --- pkgs/development/libraries/nghttp2/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index e442cc96d2f7..bc8c599a901f 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -42,6 +42,12 @@ stdenv.mkDerivation rec { sha256 = "000d50yzyysbr9ldhvnbpzn35vplqm08dnmh55wc5zk273gy383f"; }; + # Configure script searches for a symbol which does not exist in jemalloc on Darwin + # Reported upstream in https://github.com/tatsuhiro-t/nghttp2/issues/233 + postPatch = if (stdenv.isDarwin && optJemalloc != null) then '' + substituteInPlace configure --replace "malloc_stats_print" "je_malloc_stats_print" + '' else null; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ optJansson optBoost optLibxml2 optJemalloc ] ++ stdenv.lib.optionals hasApp [ optOpenssl optLibev optZlib ]; From 3f6b56812cd5b301769c764ac79173884bdafefc Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 14 May 2015 17:49:02 -0400 Subject: [PATCH 199/615] bwm_ng: clang fix --- pkgs/tools/networking/bwm-ng/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index 62dea1e6cd4f..6fa0c20b0acd 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -7,9 +7,12 @@ stdenv.mkDerivation rec { url = "http://www.gropp.org/bwm-ng/${name}.tar.gz"; sha256 = "1pgzc8y2y73n72qvbd2g0dkbkw5h0f83k5h9id1rsck8w9c464y1"; }; - + buildInputs = [ ncurses ]; + # This code uses inline in the gnu89 sense: see http://clang.llvm.org/compatibility.html#inline + NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-std=gnu89" else null; + meta = with stdenv.lib; { description = "A small and simple console-based live network and disk io bandwidth monitor"; homepage = "http://www.gropp.org/?id=projects&sub=bwm-ng"; From 4c76dda4dd6d9e85504d24bde076c24ed678a2a0 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 14 May 2015 18:03:45 -0400 Subject: [PATCH 200/615] curl 7.15: Disable on Darwin Build is failing and this version of curl is not used for anything useful on Darwin, so it's not worth fixing. --- pkgs/tools/networking/curl/7.15.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/curl/7.15.nix b/pkgs/tools/networking/curl/7.15.nix index 2b13437d95ca..4e533878ec18 100644 --- a/pkgs/tools/networking/curl/7.15.nix +++ b/pkgs/tools/networking/curl/7.15.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://curl.haxx.se/"; description = "A command line tool for transferring files with URL syntax"; - platforms = stdenv.lib.platforms.all; + platforms = with stdenv.lib.platforms; allBut darwin; }; } From e17dfe13e894b774b487b2794c076901b2c81eb2 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 14 May 2015 18:08:43 -0400 Subject: [PATCH 201/615] bandwidth: clang fix --- pkgs/tools/misc/bandwidth/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index 35b13448b59d..ff5e47336d3c 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ nasm ]; - buildFlags = [ arch ]; + buildFlags = [ arch ] + ++ stdenv.lib.optionals stdenv.cc.isClang [ "CC=clang" "LD=clang" ]; installPhase = '' mkdir -p $out/bin From 2f6e9000e88ae8a99c1e8dc30771e0ce10290ec1 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 14 May 2015 18:43:46 -0400 Subject: [PATCH 202/615] ent: clang fix --- pkgs/tools/misc/ent/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix index d6ad7f1d26b0..71b4ec338df3 100644 --- a/pkgs/tools/misc/ent/default.nix +++ b/pkgs/tools/misc/ent/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; + buildFlags = if stdenv.cc.isClang then [ "CC=clang" ] else null; + installPhase = '' mkdir -p $out/bin cp ent $out/bin/ From 7145859662a73632b075177e4322a6c9fe391c0f Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 14 May 2015 18:55:04 -0400 Subject: [PATCH 203/615] botan: clang fix --- pkgs/development/libraries/botan/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index c843a00b8362..5880ae772ceb 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ python bzip2 zlib gmp openssl boost ]; configurePhase = '' - python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags} + python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" } ''; enableParallelBuilding = true; From 5d82c6712910fedc07574bbaa61d69cf52779b38 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 14 May 2015 20:54:06 -0400 Subject: [PATCH 204/615] libdvbpsi: enable on Darwin --- pkgs/development/libraries/libdvbpsi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix index 6af8e7a415e2..f8b9e9ecef90 100644 --- a/pkgs/development/libraries/libdvbpsi/default.nix +++ b/pkgs/development/libraries/libdvbpsi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { description = "A simple library designed for decoding and generation of MPEG TS and DVB PSI tables according to standards ISO/IEC 13818 and ITU-T H.222.0"; homepage = http://www.videolan.org/developers/libdvbpsi.html ; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.lgpl21; }; From 8b580fb9d16798d57a462bbaccba6db06e61bb4f Mon Sep 17 00:00:00 2001 From: Henry Till Date: Fri, 15 May 2015 12:41:33 -0400 Subject: [PATCH 205/615] smartmontools: clean up meta, add darwin to meta.platforms --- pkgs/tools/system/smartmontools/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 87f19640f7ff..72c8f8d028eb 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { sed -i -e 's@which which >/dev/null || exit 1@alias which="type -p"@' update-smart-drivedb.in ''; - meta = { - description = "Tools for monitoring the health of hard drivers"; - homepage = "http://smartmontools.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + meta = with stdenv.lib; { + description = "Tools for monitoring the health of hard drives"; + homepage = http://smartmontools.sourceforge.net/; + license = licenses.gpl2Plus; + platforms = with platforms; linux ++ darwin; + maintainers = [ maintainers.simons ]; }; } From 91ba92096c26d2fbcb50fad83e11ad1044e9094f Mon Sep 17 00:00:00 2001 From: Georges Dubus Date: Fri, 15 May 2015 19:17:25 +0200 Subject: [PATCH 206/615] rustc: update to 1.0.0 --- pkgs/development/compilers/rustc/1.0.0-beta.nix | 16 ---------------- pkgs/development/compilers/rustc/1.0.0.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +-- 3 files changed, 17 insertions(+), 18 deletions(-) delete mode 100644 pkgs/development/compilers/rustc/1.0.0-beta.nix create mode 100644 pkgs/development/compilers/rustc/1.0.0.nix diff --git a/pkgs/development/compilers/rustc/1.0.0-beta.nix b/pkgs/development/compilers/rustc/1.0.0-beta.nix deleted file mode 100644 index 93359fba9f7a..000000000000 --- a/pkgs/development/compilers/rustc/1.0.0-beta.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, callPackage }: -callPackage ./makeRustcDerivation.nix { - shortVersion = "1.0.0-beta.2"; - isRelease = true; - srcSha = "0wcpp6fg7cc75bj5b6dcz5dhgps6xw09n75qiapmd12qxjzj17wn"; - snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec"; - snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349"; - snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234"; - snapshotHashDarwin64 = "5f35d9c920b8083a7420ef8cf5b00d5ef3085dfa"; - snapshotDate = "2015-03-27"; - snapshotRev = "5520801"; - patches = [ - ./patches/beta.patch - ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; - configureFlags = [ "--release-channel=beta" ]; -} diff --git a/pkgs/development/compilers/rustc/1.0.0.nix b/pkgs/development/compilers/rustc/1.0.0.nix new file mode 100644 index 000000000000..639414988af7 --- /dev/null +++ b/pkgs/development/compilers/rustc/1.0.0.nix @@ -0,0 +1,16 @@ +{ stdenv, callPackage }: +callPackage ./makeRustcDerivation.nix { + shortVersion = "1.0.0"; + isRelease = true; + srcSha = "1fjyk5xhg9dx85d1kkjmb1jai7awvdmzcjf2fdmi2pdjyzacn163"; + snapshotHashLinux686 = "0bc8cffdce611fb71fd7d3d8e7cdbfaf748a4f16"; + snapshotHashLinux64 = "94089740e48167c5975c92c139ae9c286764012f"; + snapshotHashDarwin686 = "54cc35e76497e6e94fddf38d6e40e9d168491ddb"; + snapshotHashDarwin64 = "43a1c1fba0d1dfee4c2ca310d506f8f5f51b3f6f"; + snapshotDate = "2015-04-27"; + snapshotRev = "857ef6e"; + patches = [ + ./patches/beta.patch + ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; + configureFlags = [ "--release-channel=beta" ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c15f9ce0a41..41da2c9dbaa2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4389,9 +4389,8 @@ let ocaml = ocaml_3_08_0; }; - rustcBeta = callPackage ../development/compilers/rustc/1.0.0-beta.nix {}; rustcMaster = callPackage ../development/compilers/rustc/head.nix {}; - rustc = rustcBeta; + rustc = callPackage ../development/compilers/rustc/1.0.0.nix {}; rustPlatform = rustStable; From 6771eefd43e12e5398fb4d54646a281045931a79 Mon Sep 17 00:00:00 2001 From: rushmorem Date: Fri, 15 May 2015 19:27:00 +0200 Subject: [PATCH 207/615] Update Mesos Library environment variable --- pkgs/applications/networking/cluster/marathon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix index 1cc75a71bfa4..4311b352ab96 100644 --- a/pkgs/applications/networking/cluster/marathon/default.nix +++ b/pkgs/applications/networking/cluster/marathon/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeWrapper ${jdk.jre}/bin/java $out/bin/marathon \ --add-flags "-Xmx512m -jar $out/libexec/marathon/${name}.jar" \ - --prefix "MESOS_NATIVE_LIBRARY" : "$MESOS_NATIVE_LIBRARY" + --prefix "MESOS_NATIVE_JAVA_LIBRARY" : "$MESOS_NATIVE_JAVA_LIBRARY" ''; meta = with stdenv.lib; { From ef66f1536dcfd9a78757436807de98be31e6cb48 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Fri, 15 May 2015 10:28:06 -0700 Subject: [PATCH 208/615] man-db: dont use libpipeline on darwin, causes build failure --- pkgs/tools/misc/man-db/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 403068b1bf7d..ce5467ee284f 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -8,7 +8,9 @@ stdenv.mkDerivation rec { sha256 = "03ly0hbpgjnag576rgccanaisn7f6422q5qxrj64vyzslc2651y4"; }; - buildInputs = [ pkgconfig libpipeline db groff ]; + buildInputs = [ pkgconfig ] + ++ stdenv.lib.optional (!stdenv.isDarwin) libpipeline + ++ [ db groff ]; configureFlags = [ "--disable-setuid" From 9904d916b6da6d5e1698626b7c82a9cb22a46afe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 15 May 2015 20:57:41 +0200 Subject: [PATCH 209/615] darkcoin: use fetchzip to get stable hash --- pkgs/applications/altcoins/darkcoin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/darkcoin.nix b/pkgs/applications/altcoins/darkcoin.nix index 56d22d0b53b2..89ff12f8f742 100644 --- a/pkgs/applications/altcoins/darkcoin.nix +++ b/pkgs/applications/altcoins/darkcoin.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig +{ fetchzip, stdenv, pkgconfig , openssl, db48, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf , utillinux , withGui }: @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { name = "darkcoin" + (toString (optional (!withGui) "d")) + "-" + version; version = "0.10.99.99"; - src = fetchurl { + src = fetchzip { url = "https://github.com/darkcoin/darkcoin/archive/v${version}.tar.gz"; - sha256 = "1a05a7l878klg4wqk9ykndkhyknrd7jp75v38k99qgk5fi8wa752"; + sha256 = "0sigvimqwc1mvaq43a8c2aq7fjla2ncafrals08qfq3jd6in8b4f"; }; buildInputs = [ pkgconfig glib openssl db48 boost zlib miniupnpc ] From dec924f5a3066851cda5a6dd27d9e0b33db8c8f1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2015 21:22:54 +0200 Subject: [PATCH 210/615] hugs: fix build --- pkgs/development/compilers/hugs/default.nix | 60 ++++++++------------- 1 file changed, 22 insertions(+), 38 deletions(-) diff --git a/pkgs/development/compilers/hugs/default.nix b/pkgs/development/compilers/hugs/default.nix index 14751799795a..f29df2c7c73c 100644 --- a/pkgs/development/compilers/hugs/default.nix +++ b/pkgs/development/compilers/hugs/default.nix @@ -1,9 +1,7 @@ -{ composableDerivation, fetchurl }: +{ stdenv, fetchurl, bison }: + +stdenv.mkDerivation { -let edf = composableDerivation.edf; - wwf = composableDerivation.wwf; in - -composableDerivation.composableDerivation {} { name = "hugs98-200609"; src = fetchurl { @@ -11,43 +9,29 @@ composableDerivation.composableDerivation {} { sha256 = "3cf4d27673564cffe691bd14032369f646233f14daf2bc37c6c6df9f062b46b6"; }; - #encode all character I/O using the byte encoding - #determined by the locale in effect at that time. To - #require that the UTF-8 encoding is always used, give - #the --enable-char-encoding=utf8 option. - #[default=autodetect] - postUnpack = '' - find -type f | xargs sed -i 's@/bin/cp@cp@'; - ''; - - configurePhase = "./configure --prefix=\$out --enable-char-encoding=utf8 $configureFlags"; + buildInputs = [ bison ]; - flags = - edf { name = "pathCanonicalization"; feat="path-canonicalization"; } - // edf { name="timer"; } # enable evaluation timing (for benchmarking Hugs) - // edf { name="profiling"; }# enable heap profiler - // edf { name="stackDumps"; feat="stack-dummps"; } # enable stack dump on stack overflow - // edf { name="largeBanner"; feat="large-banner"; } # disable multiline startup banner - // edf { name="internal-prims"; } # experimental primitives to access Hugs's innards - // edf { name="debug"; } # include C debugging information (for debugging Hugs) - // edf { name="tag"; } # runtime tag checking (for debugging Hugs) - // edf { name="lint"; } # enable "lint" flags (for debugging Hugs) - // edf { name="only98"; } # build Hugs to understand Haskell 98 only - // edf { name="ffi"; } - #--with-nmake produce a Makefile compatible with nmake - #--with-gui build Hugs for Windows GUI (Borland C++ only) - // wwf { name="pthreads"; } # build Hugs using POSIX threads C library - ; + postUnpack = "find -type f -exec sed -i 's@/bin/cp@cp@' {} +"; - cfg = { - largeBannerSupport = true; # seems to be default - char = { cfgOption = "--enable-char-encoding"; blocks = "utf8"; }; - utf8 = { cfgOption = "--enable-char-encoding=utf8"; blocks="char"; }; - }; + configureFlags = [ + "--enable-char-encoding=utf8" # require that the UTF-8 encoding is always used + "--disable-path-canonicalization" + "--disable-timer" # evaluation timing (for benchmarking Hugs) + "--disable-profiling" # heap profiler + "--disable-stack-dumps" # stack dump on stack overflow + "--enable-large-banner" # multiline startup banner + "--disable-internal-prims" # experimental primitives to access Hugs's innards + "--disable-debug" # include C debugging information (for debugging Hugs) + "--disable-tag" # runtime tag checking (for debugging Hugs) + "--disable-lint" # "lint" flags (for debugging Hugs) + "--disable-only98" # build Hugs to understand Haskell 98 only + "--enable-ffi" + "--enable-pthreads" # build Hugs using POSIX threads C library + ]; meta = { - license = "as-is"; # gentoo is calling it this way.. - description = "Haskell interpreter"; homepage = http://www.haskell.org/hugs; + description = "Haskell interpreter"; + license = "as-is"; # gentoo is calling it this way }; } From 1ceebca7af6ce8b4b4ad61658d28ed99d292aa01 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2015 21:23:42 +0200 Subject: [PATCH 211/615] hugs is an interpreter, not a compiler --- pkgs/development/{compilers => interpreters}/hugs/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{compilers => interpreters}/hugs/default.nix (100%) diff --git a/pkgs/development/compilers/hugs/default.nix b/pkgs/development/interpreters/hugs/default.nix similarity index 100% rename from pkgs/development/compilers/hugs/default.nix rename to pkgs/development/interpreters/hugs/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41da2c9dbaa2..f60e8905e58e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3840,7 +3840,7 @@ let ikarus = callPackage ../development/compilers/ikarus { }; - hugs = callPackage ../development/compilers/hugs { }; + hugs = callPackage ../development/interpreters/hugs { }; path64 = callPackage ../development/compilers/path64 { }; From 9bc42f6d00fc65a3b3b1ce93b6884db1a2dcc4e1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2015 21:26:10 +0200 Subject: [PATCH 212/615] hugs: set meta.platforms --- pkgs/development/interpreters/hugs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/hugs/default.nix b/pkgs/development/interpreters/hugs/default.nix index f29df2c7c73c..b1c3df28d1f2 100644 --- a/pkgs/development/interpreters/hugs/default.nix +++ b/pkgs/development/interpreters/hugs/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.haskell.org/hugs; description = "Haskell interpreter"; - license = "as-is"; # gentoo is calling it this way + license = "as-is"; # gentoo labels it this way + platforms = stdenv.lib.platforms.unix; # arbitrary choice }; } From 69a6848b57889b9f51799bebc92aac76b58094db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 15 May 2015 21:38:50 +0200 Subject: [PATCH 213/615] rtmpdump: propagate build inputs according to *.pc This fixes ffmpeg-full build. --- pkgs/tools/video/rtmpdump/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index de26cc41d744..29f2a1c448d9 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ++ optional stdenv.isDarwin "SYS=darwin" ++ optional stdenv.cc.isClang "CC=clang"; - buildInputs = [ zlib ] + propagatedBuildInputs = [ zlib ] ++ optional gnutlsSupport gnutls ++ optional opensslSupport openssl; From bc7a4fc18bba1926413fec5e49760c57514b482e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 15 May 2015 22:36:52 +0200 Subject: [PATCH 214/615] webkitgtk: minor updates (close #7828) Builds fine, NEWS look good. --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 545026108876..e7dc0d4982c4 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -11,7 +11,7 @@ assert enableGeoLocation -> geoclue2 != null; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.8.0"; + version = "2.8.3"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "05b8mkr1mv1w5vi5vyczzirgf5nr6qavrdwbcaiv0dghylwx5yh5"; + sha256 = "05igg61lflgwy83cmxgyzmvf2bkhplmp8710ssrlpmbfcz461pmk"; }; patches = [ ./finding-harfbuzz-icu.patch ]; From 4ec3f8e42f9c765b58dd7e088f6c6943d319ad00 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 15 May 2015 22:44:51 +0200 Subject: [PATCH 215/615] intel-gpu-tools: apply patch to fix a compile error see https://bugs.gentoo.org/show_bug.cgi?id=548318 --- .../misc/intel-gpu-tools/compile-fix.patch | 37 +++++++++++++++++++ .../tools/misc/intel-gpu-tools/default.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch diff --git a/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch b/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch new file mode 100644 index 000000000000..8285867d8eda --- /dev/null +++ b/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch @@ -0,0 +1,37 @@ +From 233808a58db1f62d773b03f9dad599924170aca6 Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Wed, 18 Mar 2015 08:36:37 +0000 +Subject: lib/batch: Trivial compile fix for 32-bit builds + +intel_batchbuffer.c: In function 'fill_object': +intel_batchbuffer.c:589:20: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] + obj->relocs_ptr = (uint64_t)relocs; + ^ +intel_batchbuffer.c: In function 'exec_blit': +intel_batchbuffer.c:598:21: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] + exec.buffers_ptr = (uint64_t)objs; + +Signed-off-by: Chris Wilson + +diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c +index 666c323..c1c27a6 100644 +--- a/lib/intel_batchbuffer.c ++++ b/lib/intel_batchbuffer.c +@@ -548,7 +548,7 @@ fill_object(struct drm_i915_gem_exec_object2 *obj, uint32_t gem_handle, + memset(obj, 0, sizeof(*obj)); + obj->handle = gem_handle; + obj->relocation_count = count; +- obj->relocs_ptr = (uint64_t)relocs; ++ obj->relocs_ptr = (uintptr_t)relocs; + } + + static void exec_blit(int fd, +@@ -557,7 +557,7 @@ static void exec_blit(int fd, + { + struct drm_i915_gem_execbuffer2 exec; + +- exec.buffers_ptr = (uint64_t)objs; ++ exec.buffers_ptr = (uintptr_t)objs; + exec.buffer_count = count; + exec.batch_start_offset = 0; + exec.batch_len = batch_len * 4; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 72a364e682a3..997f1bfc0120 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11 libXext libXv libXrandr glib bison ]; + patches = [ ./compile-fix.patch ]; + meta = with stdenv.lib; { homepage = https://01.org/linuxgraphics/; description = "Tools for development and testing of the Intel DRM driver"; From b7fe141f6bafbb783d2cced8118dd551a6de0e15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 15 May 2015 22:59:26 +0200 Subject: [PATCH 216/615] Revert "remove cmake-2.8" Some packages fail with the only cmake version we've left. This reverts commit 67199bda4effafecb977a44c623c2115032dc347. --- .../tools/build-managers/cmake/2.8.nix | 73 ++++++++++++++ .../build-managers/cmake/search-path.patch | 97 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 + 3 files changed, 175 insertions(+) create mode 100644 pkgs/development/tools/build-managers/cmake/2.8.nix create mode 100644 pkgs/development/tools/build-managers/cmake/search-path.patch diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix new file mode 100644 index 000000000000..60a941a66375 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -0,0 +1,73 @@ +{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive +, useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null +}: + +with stdenv.lib; + +assert wantPS -> (ps != null); + +let + os = stdenv.lib.optionalString; + majorVersion = "2.8"; + minorVersion = "12.2"; + version = "${majorVersion}.${minorVersion}"; +in + +stdenv.mkDerivation rec { + name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}"; + + inherit majorVersion; + + src = fetchurl { + url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; + sha256 = "0phf295a9cby0v7zqdswr238v5aiy3rb2fs6dz39zjxbmzlp8rcc"; + }; + + enableParallelBuilding = true; + + patches = + [(fetchpatch { # see http://www.cmake.org/Bug/view.php?id=13959 + name = "FindFreetype-2.5.patch"; + url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug"; + sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj"; + })] ++ + # Don't search in non-Nix locations such as /usr, but do search in + # Nixpkgs' Glibc. + optional (stdenv ? glibc) ./search-path.patch ++ + optional (stdenv ? cross) (fetchurl { + name = "fix-darwin-cross-compile.patch"; + url = "http://public.kitware.com/Bug/file_download.php?" + + "file_id=4981&type=bug"; + sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; + }); + + buildInputs = [ curl expat zlib bzip2 libarchive ] + ++ optional useNcurses ncurses + ++ optional useQt4 qt4; + + propagatedBuildInputs = optional wantPS ps; + + CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs; + + configureFlags = + "--docdir=/share/doc/${name} --mandir=/share/man --system-libs" + + stdenv.lib.optionalString useQt4 " --qt-gui"; + + setupHook = ./setup-hook.sh; + + dontUseCmakeConfigure = true; + + preConfigure = optionalString (stdenv ? glibc) + '' + source $setupHook + fixCmakeFiles . + substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc} + ''; + + meta = { + homepage = http://www.cmake.org/; + description = "Cross-Platform Makefile Generator"; + platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ urkud mornfall ]; + }; +} diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/pkgs/development/tools/build-managers/cmake/search-path.patch new file mode 100644 index 000000000000..31c85d6f5220 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/search-path.patch @@ -0,0 +1,97 @@ +diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake +index fe8e003..378512c 100644 +--- a/Modules/Platform/Linux.cmake ++++ b/Modules/Platform/Linux.cmake +@@ -36,13 +36,13 @@ else() + # checking the platform every time. This option is advanced enough + # that only package maintainers should need to adjust it. They are + # capable of providing a setting on the command line. +- if(EXISTS "/etc/debian_version") +- set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL +- "Install .so files without execute permission.") +- else() ++ # if(EXISTS "/etc/debian_version") ++ # set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL ++ # "Install .so files without execute permission.") ++ # else() + set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL + "Install .so files without execute permission.") +- endif() ++ # endif() + endif() + + # Match multiarch library directory names. +@@ -52,6 +52,6 @@ include(Platform/UnixPaths) + + # Debian has lib64 paths only for compatibility so they should not be + # searched. +-if(EXISTS "/etc/debian_version") +- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) +-endif() ++# if(EXISTS "/etc/debian_version") ++# set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) ++#endif() +diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake +index ccb2663..39834e6 100644 +--- a/Modules/Platform/UnixPaths.cmake ++++ b/Modules/Platform/UnixPaths.cmake +@@ -33,55 +33,18 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) + # search types. + list(APPEND CMAKE_SYSTEM_PREFIX_PATH + # Standard +- /usr/local /usr / +- +- # CMake install location +- "${_CMAKE_INSTALL_DIR}" +- +- # Project install destination. +- "${CMAKE_INSTALL_PREFIX}" +- ) +- +-# List common include file locations not under the common prefixes. +-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH +- # Windows API on Cygwin +- /usr/include/w32api +- +- # X11 +- /usr/X11R6/include /usr/include/X11 +- +- # Other +- /usr/pkg/include +- /opt/csw/include /opt/include +- /usr/openwin/include +- ) +- +-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH +- # Windows API on Cygwin +- /usr/lib/w32api +- +- # X11 +- /usr/X11R6/lib /usr/lib/X11 +- +- # Other +- /usr/pkg/lib +- /opt/csw/lib /opt/lib +- /usr/openwin/lib +- ) +- +-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH +- /usr/pkg/bin ++ "@glibc@" + ) + + list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES +- /lib /usr/lib /usr/lib32 /usr/lib64 ++ "@glibc@/lib" + ) + + list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES +- /usr/include ++ "@glibc@/include" + ) + list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES +- /usr/include ++ "@glibc@/include" + ) + + # Enable use of lib64 search path variants by default. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f60e8905e58e..2f4725c27495 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5088,6 +5088,11 @@ let ctodo = callPackage ../applications/misc/ctodo { }; + cmake-2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { + wantPS = stdenv.isDarwin; + ps = if stdenv.isDarwin then darwin.ps else null; + }; + cmake = callPackage ../development/tools/build-managers/cmake { wantPS = stdenv.isDarwin; ps = if stdenv.isDarwin then darwin.ps else null; From 120852e542aa60de548b2db49811cc5484f72218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 15 May 2015 23:03:59 +0200 Subject: [PATCH 217/615] freerdpUnstable, cinepaint: fix by using older cmake Close #7841. --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f4725c27495..907b97d8d85e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10484,6 +10484,7 @@ let cinepaint = callPackage ../applications/graphics/cinepaint { fltk = fltk13; libpng = libpng12; + cmake = cmake-2_8; }; codeblocks = callPackage ../applications/editors/codeblocks { }; @@ -11006,7 +11007,9 @@ let ffmpeg = ffmpeg_1; }; - freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { }; + freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { + cmake = cmake-2_8; + }; freicoin = callPackage ../applications/misc/freicoin { }; From d417983216d1fdc54c675cd7a242445b432ce455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 15 May 2015 23:23:51 +0200 Subject: [PATCH 218/615] dmenu2: add version (dashed date) /cc maintainer @cstrahan. --- pkgs/applications/misc/dmenu2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/dmenu2/default.nix b/pkgs/applications/misc/dmenu2/default.nix index 1637586eb477..54aec8606cd4 100644 --- a/pkgs/applications/misc/dmenu2/default.nix +++ b/pkgs/applications/misc/dmenu2/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "dmenu2"; + name = "dmenu2-0.3pre-2014-07-08"; src = fetchhg { url = "https://bitbucket.org/melek/dmenu2"; From 1aef9fc4af566faaf6dcef7544b2b03eaa34cb04 Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Fri, 15 May 2015 14:31:40 -0700 Subject: [PATCH 219/615] cmake: disable building with ncurses if building without ncurses --- pkgs/development/tools/build-managers/cmake/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 72ecb10b0990..45bdeece45e7 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -55,7 +55,9 @@ stdenv.mkDerivation rec { "--system-libs" ] ++ optional (jsoncpp == null) "--no-system-jsoncpp" - ++ optional useQt4 "--qt-gui"; + ++ optional useQt4 "--qt-gui" + ++ ["--"] + ++ optional (!useNcurses) "-DBUILD_CursesDialog=OFF"; setupHook = ./setup-hook.sh; From 740d3b15172e2f88bbab972a82ae2bce6828fa84 Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Fri, 15 May 2015 15:33:35 -0700 Subject: [PATCH 220/615] Remove isLinux assertion from libcap Heimdal evaluates libcap's meta.platforms to determine if it should be pulled in or not, and that fails if the stdenv.isLinux assertion fails. --- pkgs/os-specific/linux/libcap/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 1ffdaa36e965..8157270d67d7 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, attr, perl }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "libcap-${version}"; version = "2.24"; From af0002d884fa95ea0e5d70f37cfe47cd749b5b4e Mon Sep 17 00:00:00 2001 From: Georges Dubus Date: Sat, 16 May 2015 00:54:20 +0200 Subject: [PATCH 221/615] rustc: build the stable channel --- pkgs/development/compilers/rustc/1.0.0.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/rustc/1.0.0.nix b/pkgs/development/compilers/rustc/1.0.0.nix index 639414988af7..008e958f6d44 100644 --- a/pkgs/development/compilers/rustc/1.0.0.nix +++ b/pkgs/development/compilers/rustc/1.0.0.nix @@ -12,5 +12,5 @@ callPackage ./makeRustcDerivation.nix { patches = [ ./patches/beta.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; - configureFlags = [ "--release-channel=beta" ]; + configureFlags = [ "--release-channel=stable" ]; } From e47fe46e031d2df000f2baee598b2553e5ca93f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sat, 16 May 2015 00:56:35 +0200 Subject: [PATCH 222/615] wordnet: enable interp->result, unmark broken --- pkgs/applications/misc/wordnet/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index d46790e4d72b..c70436e68f99 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation { buildInputs = [tcl tk x11 makeWrapper]; + patchPhase = '' + sed "13i#define USE_INTERP_RESULT 1" -i src/stubs.c + ''; + # Needs the path to `tclConfig.sh' and `tkConfig.sh'. configureFlags = "--with-tcl=" + tcl + "/lib " + "--with-tk=" + tk + "/lib"; @@ -37,6 +41,5 @@ stdenv.mkDerivation { maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice - broken = true; # we'd need older tk/tcl }; } From 3913d03890aa56a2c16e3936ae7340aef48f7da1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 8 May 2015 16:40:45 -0700 Subject: [PATCH 223/615] ttylog: Add derivation --- pkgs/tools/misc/ttylog/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/misc/ttylog/default.nix diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix new file mode 100644 index 000000000000..1c90bb842d62 --- /dev/null +++ b/pkgs/tools/misc/ttylog/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, cmake }: + +stdenv.mkDerivation rec { + name = "ttylog-0.25"; + + src = fetchurl { + url = "mirror://sourceforge/ttylog/${name}.tar.gz"; + sha256 = "0546mj5gcxi7idvfw82p8qw27lk7wsk6j4b6zw7nb6z2wi517l40"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + homepage = "http://ttylog.sourceforg.net"; + description = "a serial port logger which can be used to print everything to stdout that comes from a serial device"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 907b97d8d85e..24c28c46f35e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2989,6 +2989,8 @@ let ttysnoop = callPackage ../os-specific/linux/ttysnoop {}; + ttylog = callPackage ../tools/misc/ttylog { }; + twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; txt2man = callPackage ../tools/misc/txt2man { }; From 52587b9f819a2ad7f0621fa6a929a843d0b92048 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 15 May 2015 15:39:18 -0700 Subject: [PATCH 224/615] tinc-pre: 2015-03-14 -> 2015-05-15 --- pkgs/tools/networking/tinc/pre.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 7fc993338f77..2eb003bacb0c 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-03-14"; + name = "tinc-1.1pre-2015-05-15"; src = fetchgit { url = "git://tinc-vpn.org/tinc"; - rev = "6568cffd52d4803effaf52a9bb9c98d69cf7922a"; - sha256 = "1nh0yjv6gf8p5in67kdq68xlai69f34ks0j610i8d8nw2mfm9x4a"; + rev = "613c121cdceec0199dc4d056857be021ed1d21de"; + sha256 = "1l99bvqmb35hwb63fcy9gbjxasxnrgqw3i9f14f26dq3sz2j035l"; }; buildInputs = [ autoreconfHook texinfo ncurses readline zlib lzo openssl ]; From d7af7fb504a7970d9ff6377274a084e7eaae8fc9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 15 May 2015 15:42:20 -0700 Subject: [PATCH 225/615] firmware-linux-nonfree: 2015-03-20 -> 2015-05-13 --- .../linux/firmware/firmware-linux-nonfree/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 6ac468774ad1..fa7af6a8c1b6 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2015-03-20"; + version = "2015-05-13"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - rev = "f404336ba808cbd57547196e13367079a23b822c"; - sha256 = "0avz5vxax2b3s4gafib47vih1lbq78agdmpjcjnnnykw2kschkwa"; + rev = "3161bfa479d5e9ed4f46b57df9bcecbbc4f8eb3c"; + sha256 = "0np6vwcnas3pzp38man3cs8j5ijs0p3skyzla19sfxzpwmjvfpjq"; }; preInstall = '' From 21247699ad1bbd7195a78693c23361a6a7600d77 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 15 May 2015 15:50:46 -0700 Subject: [PATCH 226/615] git: 2.4.0 -> 2.4.1 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 620d3264be88..60bfaa861996 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.4.0"; + version = "2.4.1"; 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 = "095v8n0b0c314sfg5mrnxjx2d9mklbjcmajh92kmi6b5jkfkhd5k"; + sha256 = "195d61f98jj53jq0w3kfphpyk51h7fylpahc558id79ccc4ii1bj"; }; patches = [ From da719f19a6f47e457f67a0681e1a2a0d86b09a01 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 15 May 2015 15:56:29 -0700 Subject: [PATCH 227/615] inetutils: 1.9.2 -> 1.9.3 --- pkgs/tools/networking/inetutils/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index a4bde029ca05..251462ecc27b 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,23 +1,17 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "inetutils-1.9.2"; + name = "inetutils-1.9.3"; src = fetchurl { url = "mirror://gnu/inetutils/${name}.tar.gz"; - sha256 = "04wrm0v7l4890mmbaawd6wjwdv08bkglgqhpz0q4dkb0l50fl8q4"; + sha256 = "06dshajjpyi9sxi7qfki9gnp5r3nxvyvf81r81gx0x2qkqzqcxlj"; }; buildInputs = [ ncurses /* for `talk' */ ]; configureFlags = "--with-ncurses-include-dir=${ncurses}/include"; - preConfigure = '' - # Fix for building on Glibc 2.16. Won't be needed once the - # gnulib in inetutils is updated. - sed -i '/gets is a security hole/d' lib/stdio.in.h - ''; - # Test fails with "UNIX socket name too long", probably because our # $TMPDIR is too long. #doCheck = true; From 0700e844e29e2a583d66a35971462b30b387fcfc Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 15 May 2015 15:56:44 -0700 Subject: [PATCH 228/615] firefox: 38.0 -> 38.0.1 --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 42786790c2b9..0fa1d2068f1e 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 = "38.0"; in +let version = "38.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 = "3812a31287d3a8d9ebb1326e131a944fd27f0f2d"; + sha1 = "20f52c37e099cb2b21f3a76c6e39fe698e1e79e8"; }; buildInputs = From d87d7aa5037ed2f0df2a67b01fc2ed2bd236692e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 15 May 2015 16:11:17 -0700 Subject: [PATCH 229/615] spl_git: 2015-04-08 -> 2015-04-24 --- pkgs/os-specific/linux/spl/git.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix index 7559562965d2..0748da25f16e 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-04-08"; + version = "2015-04-24"; src = fetchgit { url = git://github.com/zfsonlinux/spl.git; - rev = "cd69f020e4b0f9c416dd07a264e48c9488a7633f"; - sha256 = "1fy5zlh8cs65s52vixkp00ihrlrhs2frd6vwxwjqmpzyb7fnh3m8"; + rev = "62e2eb2329d99f7c39bcda47bc9ecb2887608fa5"; + sha256 = "1i59sps2y0mgm9sj4a0h03xl0hlgiym4637j5j6zc5g125zzcnrd"; }; patches = [ ./const.patch ./install_prefix.patch ]; From a5979edc8aa701a11a897ab45eb0e2c9ac813af0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 15 May 2015 16:11:32 -0700 Subject: [PATCH 230/615] zfs_git: 2015-04-08 -> 2015-05-13 --- pkgs/os-specific/linux/zfs/git.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index a7d312c40414..130a02c86e8e 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-04-08"; + version = "2015-05-13"; src = fetchgit { url = git://github.com/zfsonlinux/zfs.git; - rev = "d07a16360c1ee219b8820f80d035e56a18c58b84"; - sha256 = "0yyc0n960bzd4fmrg1mwp0xy1db7yn90g33ds44chh4g74mrfgdz"; + rev = "7fec46b9d8967109ad289d208e8cf36a0c16e40c"; + sha256 = "0gvzw6vn7wyq2g9psv0fdars7ssidqc5l85x4yym5niccy1xl437"; }; patches = [ ./nix-build.patch ]; From 35c0e0583d737b190ad52574817011f53447294a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 15 May 2015 16:12:23 -0700 Subject: [PATCH 231/615] kernel: 3.10.77 -> 3.10.78 --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index a6ceb5b09547..6743d1d95503 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.77"; + version = "3.10.78"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1vx2sg0pab3b3rflwhxrimwx18azqayys8zidzr6sv0x7ir9bc31"; + sha256 = "01cshlm8x8k2bbkh77w2r39kc0a3csrcxiv412j5ik608glzgx36"; }; features.iwlwifi = true; From 28c17395f5dbb61093b7b34394a7f11250310a0e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 15 May 2015 16:12:32 -0700 Subject: [PATCH 232/615] kernel: 3.19.7 -> 3.19.8 --- pkgs/os-specific/linux/kernel/linux-3.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.19.nix b/pkgs/os-specific/linux/kernel/linux-3.19.nix index 03c0db556263..90c5f9e31d3f 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.19.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.19.7"; + version = "3.19.8"; extraMeta.branch = "3.19"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0xd38f7g5yfn0b6b2l4qr022f9hcr82ddbysjs4npbgk5ms7341k"; + sha256 = "0yg2mlq0h9my6k1bg3b255w4qnyx609ngh1nhssx3gbzslwf0jyg"; }; features.iwlwifi = true; From c360d741c9943bb82a7667bf28762b8d76cb6006 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 15 May 2015 16:12:35 -0700 Subject: [PATCH 233/615] kernel: 3.2.68 -> 3.2.69 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 54cf9bc9324a..2fc240f6196d 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.2.68"; + version = "3.2.69"; extraMeta.branch = "3.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0yz3k3qqr13r6fa2f8i83rryiawy4rrd7qk2zx6jxq6byfd31ba2"; + sha256 = "0fs7aj3vn51dlx7yfgkx05qpki2msh6j2irwajd9bw0l26cbycd3"; }; # We don't provide these patches if grsecurity is enabled, because From 90659e27355dc88a6bcb089fe59ae40c2c9647a8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 15 May 2015 16:12:39 -0700 Subject: [PATCH 234/615] kernel: 4.0.2 -> 4.0.3 --- pkgs/os-specific/linux/kernel/linux-4.0.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix index a5dafd4c8066..b095db41bd5a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.0.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.0.2"; + version = "4.0.3"; # Remember to update grsecurity! extraMeta.branch = "4.0"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1jq4583wwqmwqkqlkck57fxw18xszng92b6ma3avf0djd11b2izz"; + sha256 = "1djkbqrzi898qr2n0cd4m8casfj8pvgydc98l4ws3w8l9ikgwxw4"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 4e5facc4483b..0c5a09a0dabb 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -72,10 +72,10 @@ rec { }; grsecurity_unstable = grsecPatch - { kversion = "4.0.2"; - revision = "201505101122"; + { kversion = "4.0.3"; + revision = "201505141746"; branch = "test"; - sha256 = "14fi31xwlgirbwk7f1xh8vanjxk8b473rz7z38savl4nx2wr5r24"; + sha256 = "0w65d5nmfir8kxgsxrq09mijjp09k193hyqmskia6a17n29943p1"; }; grsec_fix_path = From fcf15de248a5a88c25da0f0f18669bed89d5f1d8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 15 May 2015 16:12:28 -0700 Subject: [PATCH 235/615] kernel: 3.14.41 -> 3.14.42 --- pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 75ab538ddf5e..16e46bf65c09 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.41"; + version = "3.14.42"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0qghsf648nvzsh2x44x3w0d8lciml8rj6dvglqvmq1zcg492k8i2"; + sha256 = "02k09ndhragz1p2mrq489fa7cgs2c2f3lwr1x0h1n94zqpsmpyip"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 0c5a09a0dabb..27162d500465 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -65,10 +65,10 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.41"; - revision = "201505101121"; + { kversion = "3.14.42"; + revision = "201505141745"; branch = "stable"; - sha256 = "1jiwc6qvimccmlm62sfp2ch173h7ki1h11facywpnb4wms7izk6g"; + sha256 = "1565ggx42w0j038avz9d4pydf4j29rli2hz5wangf3vnjbhixh39"; }; grsecurity_unstable = grsecPatch From 19d5b1e37a077c692d877f2eb05088f1c1c96c47 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 15 May 2015 16:33:45 -0700 Subject: [PATCH 236/615] kernel-config: nfs changes --- .../linux/kernel/common-config.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 5fdfdb3b6a13..a49a5c10c9cb 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -190,18 +190,26 @@ with stdenv.lib; OCFS2_DEBUG_MASKLOG? n BTRFS_FS_POSIX_ACL y UBIFS_FS_ADVANCED_COMPR? y - ${optionalString (versionAtLeast version "3.6") '' - NFS_SWAP y - ''} - ${optionalString (versionAtLeast version "3.11") '' - NFS_V4_1 y # NFSv4.1 client support - NFS_V4_2 y + ${optionalString (versionAtLeast version "4.0") '' + NFSD_PNFS y ''} NFSD_V2_ACL y NFSD_V3 y NFSD_V3_ACL y NFSD_V4 y + ${optionalString (versionAtLeast version "3.11") '' + NFSD_V4_SECURITY_LABEL y + ''} NFS_FSCACHE y + ${optionalString (versionAtLeast version "3.6") '' + NFS_SWAP y + ''} + NFS_V3_ACL y + ${optionalString (versionAtLeast version "3.11") '' + NFS_V4_1 y # NFSv4.1 client support + NFS_V4_2 y + NFS_V4_SECURITY_LABEL y + ''} CIFS_XATTR y CIFS_POSIX y CIFS_FSCACHE y From 7aae0f3115b57d9dbbdf0cb05d3bbbd13abe0f9f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 15 May 2015 16:36:54 -0700 Subject: [PATCH 237/615] kernel-config: mlx4-en enable vxlan offloading --- pkgs/os-specific/linux/kernel/common-config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index a49a5c10c9cb..1a9b92972614 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -300,6 +300,9 @@ with stdenv.lib; LOGO n # not needed MEDIA_ATTACH y MEGARAID_NEWGEN y + ${optionalString (versionAtLeast version "3.15") '' + MLX4_EN_VXLAN y + ''} MODVERSIONS y MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension MTRR_SANITIZER y From bca69399a88c50a9220c9888f85663a449ebc5c9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 15 May 2015 16:50:20 -0700 Subject: [PATCH 238/615] kernel-config: kvm changes --- .../linux/kernel/common-config.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1a9b92972614..7eb68952f302 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -383,10 +383,27 @@ with stdenv.lib; '' else '' PARAVIRT_GUEST? y ''} - KVM_GUEST? y + KVM_APIC_ARCHITECTURE y + KVM_ASYNC_PF y ${optionalString (versionOlder version "3.7") '' KVM_CLOCK? y ''} + ${optionalString (versionAtLeast version "4.0") '' + KVM_COMPAT y + ''} + ${optionalString (versionAtLeast version "3.10") '' + KVM_DEVICE_ASSIGNMENT y + ''} + ${optionalString (versionAtLeast version "4.0") '' + KVM_GENERIC_DIRTYLOG_READ_PROTECT y + ''} + ${optionalString (!features.grsecurity or true) '' + KVM_GUEST y + ''} + KVM_MMIO y + ${optionalString (versionAtLeast version "3.13") '' + KVM_VFIO y + ''} XEN? y XEN_DOM0? y ${optionalString ((versionAtLeast version "3.18") && (features.xen_dom0 or false)) '' From 13a38440c6993438ec7847eb8f00ad66fb3fd946 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 15 May 2015 17:38:09 -0700 Subject: [PATCH 239/615] kernel-config: Grsecurity fixes --- pkgs/os-specific/linux/kernel/common-config.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 7eb68952f302..42bf534c5002 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -234,7 +234,9 @@ with stdenv.lib; # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default - DEVKMEM? n # Disable /dev/kmem + ${optionalString (!features.grsecurity or true) '' + DEVKMEM n # Disable /dev/kmem + ''} ${if versionOlder version "3.14" then '' CC_STACKPROTECTOR? y # Detect buffer overflows on the stack '' else '' @@ -378,11 +380,13 @@ with stdenv.lib; # Virtualisation. PARAVIRT? y - ${if versionAtLeast version "3.10" then '' - HYPERVISOR_GUEST? y - '' else '' - PARAVIRT_GUEST? y - ''} + ${optionalString (!features.grsecurity or true) + (if versionAtLeast version "3.10" then '' + HYPERVISOR_GUEST y + '' else '' + PARAVIRT_GUEST? y + '') + } KVM_APIC_ARCHITECTURE y KVM_ASYNC_PF y ${optionalString (versionOlder version "3.7") '' From 484a7be8441857a28df37abfa12c8f62c0d3b8a6 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 15 May 2015 17:45:37 -0700 Subject: [PATCH 240/615] grub2: 2015-04-24 -> 2015-05-14 --- pkgs/tools/misc/grub/2.0x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 501c6820df23..e33290e9852a 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -20,7 +20,7 @@ let canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems); inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.02-git-2015-04-24"; + version = "2.02-git-2015-05-14"; unifont_bdf = fetchurl { url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { src = fetchFromSavannah { repo = "grub"; - rev = "70b002de55abbfd6b2d2f2ea4408078d93c9e0de"; - sha256 = "1bhm1yxjmckzn45v70lzmz0qpj5prhb4iyiyqqw8rvyykcixw5qk"; + rev = "5370dcfdae66b60cff3507ad925300a679fe4117"; + sha256 = "1v4a3shcgfxjifwddmn3d0lyg3db1d3k87x5nchy7cyiss55jx1s"; }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; From bbd342dcf4bc8af09067c0785f8efe0ebd4d1fe2 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Sat, 16 May 2015 04:00:54 +0200 Subject: [PATCH 241/615] openal to openalSoft conversion --- .../networking/instant-messengers/qtox/default.nix | 4 ++-- pkgs/games/0ad/default.nix | 4 ++-- pkgs/games/dhewm3/default.nix | 4 ++-- pkgs/games/warzone2100/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 9771f29c770f..874f68f0ec20 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openalSoft, opencv +{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openal, opencv , libsodium, libXScrnSaver }: let @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { buildInputs = [ - libtoxcore openalSoft opencv libsodium filteraudio + libtoxcore openal opencv libsodium filteraudio qt5.base qt5.tools libXScrnSaver ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix index 9698818c5575..bbcc6f11d1dc 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -1,7 +1,7 @@ { stdenv, callPackage, fetchurl, python27 , pkgconfig, spidermonkey_24, boost, icu, libxml2, libpng , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc -, openalSoft, mesa, xproto, libX11, libXcursor, nspr, SDL +, openal, mesa, xproto, libX11, libXcursor, nspr, SDL , gloox, nvidia-texture-tools , withEditor ? true, wxGTK ? null }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ zeroadData python27 pkgconfig spidermonkey_24 boost icu libxml2 libpng libjpeg zlib curl libogg libvorbis enet - miniupnpc openalSoft mesa xproto libX11 libXcursor nspr + miniupnpc openal mesa xproto libX11 libXcursor nspr SDL gloox nvidia-texture-tools ] ++ stdenv.lib.optional withEditor wxGTK; diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index f0d885c1f882..e3efd84f0fba 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, unzip, cmake, SDL, mesa, zlib, libjpeg, libogg, libvorbis -, openalSoft, curl }: +, openal, curl }: stdenv.mkDerivation rec { hash = "92a41322f4aa8bd45395d8088721c9a2bf43c79b"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cd */neo ''; - buildInputs = [ unzip cmake SDL mesa zlib libjpeg libogg libvorbis openalSoft + buildInputs = [ unzip cmake SDL mesa zlib libjpeg libogg libvorbis openal curl ]; enableParallelBuilding = true; diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 248b58a4e1a5..bd94fbecb2ab 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, bison, flex, gettext, pkgconfig, libpng -, libtheora, openalSoft, physfs, mesa, fribidi, fontconfig +, libtheora, openal, physfs, mesa, fribidi, fontconfig , freetype, qt4, glew, libogg, libvorbis, zlib, libX11 , libXrandr, zip, unzip, which , withVideos ? false @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/${pname}/warzone2100/Videos/high-quality-en/sequences.wz"; sha256 = "90ff552ca4a70e2537e027e22c5098ea4ed1bc11bb7fc94138c6c941a73d29fa"; }; - buildInputs = [ bison flex gettext pkgconfig libpng libtheora openalSoft + buildInputs = [ bison flex gettext pkgconfig libpng libtheora openal physfs mesa fribidi fontconfig freetype qt4 glew libogg libvorbis zlib libX11 libXrandr zip unzip diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 907b97d8d85e..8bf45ab821ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7335,9 +7335,9 @@ let oniguruma = callPackage ../development/libraries/oniguruma { }; - openal = callPackage ../development/libraries/openal { }; - - # added because I hope that it has been easier to compile on x86 (for blender) + # openalSoft is 100% ABI compatible to openalLegacy and should be a default + openal = openalSoft; + openalLegacy = callPackage ../development/libraries/openal { }; openalSoft = callPackage ../development/libraries/openal-soft { }; openbabel = callPackage ../development/libraries/openbabel { }; From 82b74ae42547a5ade39f64f102ab2be941cfa9a8 Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Fri, 15 May 2015 21:21:52 -0700 Subject: [PATCH 242/615] Conditionally link libnatspec with darwin.libiconv This fixes zip-archive, which depended on darwin.libiconv via GHC and regular libiconv via libnatspec. --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24c28c46f35e..df9de2bc0ee6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6699,7 +6699,11 @@ let libmsgpack = callPackage ../development/libraries/libmsgpack { }; libmsgpack_0_5 = callPackage ../development/libraries/libmsgpack/0.5.nix { }; - libnatspec = callPackage ../development/libraries/libnatspec { }; + libnatspec = callPackage ../development/libraries/libnatspec ( + stdenv.lib.optionalAttrs stdenv.isDarwin { + inherit (darwin) libiconv; + } + ); libndp = callPackage ../development/libraries/libndp { }; From c94442286358504cdc99c8d9dff299d73b31f82f Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 16 May 2015 12:12:34 +0200 Subject: [PATCH 243/615] lean: fixed build --- pkgs/applications/science/logic/lean/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 4d391379e819..2d93fdd61968 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -14,7 +14,10 @@ stdenv.mkDerivation rec { buildInputs = [ gmp mpfr luajit boost cmake python gperftools ninja ]; enableParallelBuilding = true; - preConfigure = "cd src"; + preConfigure = '' + patchShebangs bin/leantags + cd src + ''; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; From bbc40015b65b53d337cd9d5915ad11c5ddab66f7 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 16 May 2015 12:22:33 +0200 Subject: [PATCH 244/615] gdl 3.16: fix sha --- pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix index 9cad72de8f99..335a8d4d497b 100644 --- a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix +++ b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.gnome.org/sources/gdl/${major}/${name}.tar.xz"; - sha256 = "4b903c28a8894a82b997a1732a443c8b1d6a510304b3c3b511023339ff5d01db"; + sha256 = "107zwvs913jr5hb59a4a8hsk19yinsicr2ma4vm216nzyl2f3jrl"; }; buildInputs = [ pkgconfig libxml2 gtk3 intltool ]; From fc4452513768b46dc88b4a634799fe0c3ee7b6aa Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 16 May 2015 12:23:49 +0200 Subject: [PATCH 245/615] gdl: add myself as maintainer --- pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix index 335a8d4d497b..8e0c35eda308 100644 --- a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix +++ b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix @@ -18,6 +18,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gnome docking library"; homepage = https://developer.gnome.org/gdl/; + maintainers = [ maintainers.lethalman ]; license = [ licenses.gpl2 ]; platforms = platforms.linux; }; From 4f43b41240ed2d1c6ac7851e8201f9f6d7c3dc45 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 16 May 2015 12:50:04 +0200 Subject: [PATCH 246/615] rubberband: fix build rubberband assumes double precision fftw --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 365235ffa50e..b637f3c2dc27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7660,7 +7660,6 @@ let rocksdb = callPackage ../development/libraries/rocksdb { }; rubberband = callPackage ../development/libraries/rubberband { - fftw = fftwSinglePrec; inherit (vamp) vampSDK; }; From 496371321b189fd0af072cacdaf0c7e363435369 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 16 May 2015 14:00:19 +0200 Subject: [PATCH 247/615] atomicparsely: fixed build --- pkgs/tools/video/atomicparsley/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index 02381badcc86..9cabfe31a188 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = with pkgs; [ unzip ]; patches = [ ./casts.patch ]; - setSourceRoot = "sourceRoot=${name}-source-${version}"; + setSourceRoot = "sourceRoot=${product}-source-${version}"; buildPhase = "bash build"; installPhase = "install -D AtomicParsley $out/bin/AtomicParsley"; From 1e7709458df9385a62fbcfab9ea46ccb11360943 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 16 May 2015 15:04:19 +0200 Subject: [PATCH 248/615] freewheeling: fix build --- pkgs/applications/audio/freewheeling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index a3f356e75c45..0e7f8ad9957c 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, pkgconfig, autoconf, automake, gnutls, freetype +{ stdenv, fetchsvn, pkgconfig, autoconf, automake, gnutls33, freetype , SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, jack2, libvorbis , libsndfile, libogg }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; buildInputs = [ - pkgconfig autoconf automake gnutls freetype SDL SDL_gfx SDL_ttf + pkgconfig autoconf automake gnutls33 freetype SDL SDL_gfx SDL_ttf liblo libxml2 jack2 alsaLib libvorbis libsndfile libogg ]; From dd545e0fa486a2a35b987b82826ad29e2f62553a Mon Sep 17 00:00:00 2001 From: Paulus Esterhazy Date: Sat, 16 May 2015 19:26:07 +0200 Subject: [PATCH 249/615] Add Jekyll --- pkgs/applications/misc/jekyll/Gemfile | 4 + pkgs/applications/misc/jekyll/Gemfile.lock | 72 ++++++ pkgs/applications/misc/jekyll/default.nix | 20 ++ pkgs/applications/misc/jekyll/gemset.nix | 282 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 380 insertions(+) create mode 100644 pkgs/applications/misc/jekyll/Gemfile create mode 100644 pkgs/applications/misc/jekyll/Gemfile.lock create mode 100644 pkgs/applications/misc/jekyll/default.nix create mode 100644 pkgs/applications/misc/jekyll/gemset.nix diff --git a/pkgs/applications/misc/jekyll/Gemfile b/pkgs/applications/misc/jekyll/Gemfile new file mode 100644 index 000000000000..0788a359116d --- /dev/null +++ b/pkgs/applications/misc/jekyll/Gemfile @@ -0,0 +1,4 @@ +source "https://rubygems.org" + +gem 'jekyll' +gem 'rdiscount' diff --git a/pkgs/applications/misc/jekyll/Gemfile.lock b/pkgs/applications/misc/jekyll/Gemfile.lock new file mode 100644 index 000000000000..76bddef5869e --- /dev/null +++ b/pkgs/applications/misc/jekyll/Gemfile.lock @@ -0,0 +1,72 @@ +GEM + remote: https://rubygems.org/ + specs: + blankslate (2.1.2.4) + celluloid (0.16.0) + timers (~> 4.0.0) + classifier-reborn (2.0.3) + fast-stemmer (~> 1.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.9.1.1) + colorator (0.1) + execjs (2.5.2) + fast-stemmer (1.0.2) + ffi (1.9.8) + hitimes (1.2.2) + jekyll (2.5.3) + classifier-reborn (~> 2.0) + colorator (~> 0.1) + jekyll-coffeescript (~> 1.0) + jekyll-gist (~> 1.0) + jekyll-paginate (~> 1.0) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 1.1) + kramdown (~> 1.3) + liquid (~> 2.6.1) + mercenary (~> 0.3.3) + pygments.rb (~> 0.6.0) + redcarpet (~> 3.1) + safe_yaml (~> 1.0) + toml (~> 0.1.0) + jekyll-coffeescript (1.0.1) + coffee-script (~> 2.2) + jekyll-gist (1.2.1) + jekyll-paginate (1.1.0) + jekyll-sass-converter (1.3.0) + sass (~> 3.2) + jekyll-watch (1.2.1) + listen (~> 2.7) + kramdown (1.7.0) + liquid (2.6.2) + listen (2.10.0) + celluloid (~> 0.16.0) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + mercenary (0.3.5) + parslet (1.5.0) + blankslate (~> 2.0) + posix-spawn (0.3.11) + pygments.rb (0.6.3) + posix-spawn (~> 0.3.6) + yajl-ruby (~> 1.2.0) + rb-fsevent (0.9.4) + rb-inotify (0.9.5) + ffi (>= 0.5.0) + rdiscount (2.1.8) + redcarpet (3.2.3) + safe_yaml (1.0.4) + sass (3.4.13) + timers (4.0.1) + hitimes + toml (0.1.2) + parslet (~> 1.5.0) + yajl-ruby (1.2.1) + +PLATFORMS + ruby + +DEPENDENCIES + jekyll + rdiscount diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix new file mode 100644 index 000000000000..9c0ef01e7404 --- /dev/null +++ b/pkgs/applications/misc/jekyll/default.nix @@ -0,0 +1,20 @@ +{ stdenv, lib, bundlerEnv, ruby_2_1, curl }: + +bundlerEnv { + name = "jekyll-2.5.3"; + + ruby = ruby_2_1; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + buildInputs = [ curl ]; + + meta = with lib; { + description = "Simple, blog aware, static site generator"; + homepage = http://jekyllrb.com/; + license = with licenses; mit; + # maintainers = with maintainers; [ offline ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/jekyll/gemset.nix b/pkgs/applications/misc/jekyll/gemset.nix new file mode 100644 index 000000000000..0ceb095b4c82 --- /dev/null +++ b/pkgs/applications/misc/jekyll/gemset.nix @@ -0,0 +1,282 @@ +{ + "blankslate" = { + version = "2.1.2.4"; + source = { + type = "gem"; + sha256 = "0jnnq5q5dwy2rbfcl769vd9bk1yn0242f6yjlb9mnqdm9627cdcx"; + }; + }; + "celluloid" = { + version = "0.16.0"; + source = { + type = "gem"; + sha256 = "044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3"; + }; + dependencies = [ + "timers" + ]; + }; + "classifier-reborn" = { + version = "2.0.3"; + source = { + type = "gem"; + sha256 = "0vca8jl7nbgzyb7zlvnq9cqgabwjdl59jqlpfkwzv6znkri7cpby"; + }; + dependencies = [ + "fast-stemmer" + ]; + }; + "coffee-script" = { + version = "2.4.1"; + source = { + type = "gem"; + sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2"; + }; + dependencies = [ + "coffee-script-source" + "execjs" + ]; + }; + "coffee-script-source" = { + version = "1.9.1.1"; + source = { + type = "gem"; + sha256 = "1arfrwyzw4sn7nnaq8jji5sv855rp4c5pvmzkabbdgca0w1cxfq5"; + }; + }; + "colorator" = { + version = "0.1"; + source = { + type = "gem"; + sha256 = "09zp15hyd9wlbgf1kmrf4rnry8cpvh1h9fj7afarlqcy4hrfdpvs"; + }; + }; + "execjs" = { + version = "2.5.2"; + source = { + type = "gem"; + sha256 = "0y2193yhcyz9f97m7g3wanvwzdjb08sllrj1g84sgn848j12vyl0"; + }; + }; + "fast-stemmer" = { + version = "1.0.2"; + source = { + type = "gem"; + sha256 = "0688clyk4xxh3kdb18vi089k90mca8ji5fwaknh3da5wrzcrzanh"; + }; + }; + "ffi" = { + version = "1.9.8"; + source = { + type = "gem"; + sha256 = "0ph098bv92rn5wl6rn2hwb4ng24v4187sz8pa0bpi9jfh50im879"; + }; + }; + "hitimes" = { + version = "1.2.2"; + source = { + type = "gem"; + sha256 = "17y3ggqxl3m6x9gqpgdn39z0pxpmw666d40r39bs7ngdmy680jn4"; + }; + }; + "jekyll" = { + version = "2.5.3"; + source = { + type = "gem"; + sha256 = "1ad3d62yd5rxkvn3xls3xmr2wnk8fiickjy27g098hs842wmw22n"; + }; + dependencies = [ + "classifier-reborn" + "colorator" + "jekyll-coffeescript" + "jekyll-gist" + "jekyll-paginate" + "jekyll-sass-converter" + "jekyll-watch" + "kramdown" + "liquid" + "mercenary" + "pygments.rb" + "redcarpet" + "safe_yaml" + "toml" + ]; + }; + "jekyll-coffeescript" = { + version = "1.0.1"; + source = { + type = "gem"; + sha256 = "19nkqbaxqbzqbfbi7sgshshj2krp9ap88m9fc5pa6mglb2ypk3hg"; + }; + dependencies = [ + "coffee-script" + ]; + }; + "jekyll-gist" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "10hywgdwqafa21nwa5br54wvp4wsr3wnx64v8d81glj5cs17f9bv"; + }; + }; + "jekyll-paginate" = { + version = "1.1.0"; + source = { + type = "gem"; + sha256 = "0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8"; + }; + }; + "jekyll-sass-converter" = { + version = "1.3.0"; + source = { + type = "gem"; + sha256 = "1xqmlr87xmzpalf846gybkbfqkj48y3fva81r7c7175my9p4ykl1"; + }; + dependencies = [ + "sass" + ]; + }; + "jekyll-watch" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "0p9mc8m4bggsqlq567g1g67z5fvzlm7yyv4l8717l46nq0d52gja"; + }; + dependencies = [ + "listen" + ]; + }; + "kramdown" = { + version = "1.7.0"; + source = { + type = "gem"; + sha256 = "070r81kz88zw28c8bs5p0p92ymn1nldci2fm1arkas0bnqrd3rna"; + }; + }; + "liquid" = { + version = "2.6.2"; + source = { + type = "gem"; + sha256 = "1k7lx7szwnz7vv3hqpdb6bgw8p73sa1ss9m1m5h0jaqb9xkqnfzb"; + }; + }; + "listen" = { + version = "2.10.0"; + source = { + type = "gem"; + sha256 = "131pgi5bsqln2kfkp72wpi0dfz5i124758xcl1h3c5gz75j0vg2i"; + }; + dependencies = [ + "celluloid" + "rb-fsevent" + "rb-inotify" + ]; + }; + "mercenary" = { + version = "0.3.5"; + source = { + type = "gem"; + sha256 = "0ls7z086v4xl02g4ia5jhl9s76d22crgmplpmj0c383liwbqi9pb"; + }; + }; + "parslet" = { + version = "1.5.0"; + source = { + type = "gem"; + sha256 = "0qp1m8n3m6k6g22nn1ivcfkvccq5jmbkw53vvcjw5xssq179l9z3"; + }; + dependencies = [ + "blankslate" + ]; + }; + "posix-spawn" = { + version = "0.3.11"; + source = { + type = "gem"; + sha256 = "052lnxbkvlnwfjw4qd7vn2xrlaaqiav6f5x5bcjin97bsrfq6cmr"; + }; + }; + "pygments.rb" = { + version = "0.6.3"; + source = { + type = "gem"; + sha256 = "160i761q2z8kandcikf2r5318glgi3pf6b45wa407wacjvz2966i"; + }; + dependencies = [ + "posix-spawn" + "yajl-ruby" + ]; + }; + "rb-fsevent" = { + version = "0.9.4"; + source = { + type = "gem"; + sha256 = "12if5xsik64kihxf5awsyavlp595y47g9qz77vfp2zvkxgglaka7"; + }; + }; + "rb-inotify" = { + version = "0.9.5"; + source = { + type = "gem"; + sha256 = "0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9"; + }; + dependencies = [ + "ffi" + ]; + }; + "rdiscount" = { + version = "2.1.8"; + source = { + type = "gem"; + sha256 = "0vcyy90r6wfg0b0y5wqp3d25bdyqjbwjhkm1xy9jkz9a7j72n70v"; + }; + }; + "redcarpet" = { + version = "3.2.3"; + source = { + type = "gem"; + sha256 = "0l6zr8wlqb648z202kzi7l9p89b6v4ivdhif5w803l1rrwyzvj0m"; + }; + }; + "safe_yaml" = { + version = "1.0.4"; + source = { + type = "gem"; + sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + }; + }; + "sass" = { + version = "3.4.13"; + source = { + type = "gem"; + sha256 = "0wxkjm41xr77pnfi06cbwv6vq0ypbni03jpbpskd7rj5b0zr27ig"; + }; + }; + "timers" = { + version = "4.0.1"; + source = { + type = "gem"; + sha256 = "03ahv07wn1f2g3c5843q7sf03a81518lq5624s9f49kbrswa2p7l"; + }; + dependencies = [ + "hitimes" + ]; + }; + "toml" = { + version = "0.1.2"; + source = { + type = "gem"; + sha256 = "1wnvi1g8id1sg6776fvzf98lhfbscchgiy1fp5pvd58a8ds2fq9v"; + }; + dependencies = [ + "parslet" + ]; + }; + "yajl-ruby" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf"; + }; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b637f3c2dc27..461625eb7970 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1795,6 +1795,8 @@ let jdiskreport = callPackage ../tools/misc/jdiskreport { }; + jekyll = callPackage ../applications/misc/jekyll { }; + jfsutils = callPackage ../tools/filesystems/jfsutils { }; jhead = callPackage ../tools/graphics/jhead { }; From 3b4152f7e1183f5749b82a9247e76cb5f047e4bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sat, 16 May 2015 19:58:29 +0200 Subject: [PATCH 250/615] gtkvnc: add libgpgerror as dependency --- pkgs/tools/admin/gtk-vnc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index c502cee5415a..9fc6d135625d 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -2,7 +2,7 @@ , python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 , libffi, cyrus_sasl, intltool, perl, perlPackages, pulseaudio , kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala -, pygobject3, libogg, enableGTK3 ? false }: +, pygobject3, libogg, enableGTK3 ? false, libgpgerror }: stdenv.mkDerivation rec { name = "gtk-vnc-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ python gnutls cairo libtool pkgconfig glib libffi libgcrypt intltool cyrus_sasl pulseaudio perl perlPackages.TextCSV - gobjectIntrospection libogg + gobjectIntrospection libogg libgpgerror ] ++ (if enableGTK3 then [ gtk3 vala pygobject3 ] else [ gtk pygtk pygobject ]); NIX_CFLAGS_COMPILE = "-fstack-protector-all"; From 89a58c9e05cea87bb416563d1f6307e3e27818fb Mon Sep 17 00:00:00 2001 From: Paulus Esterhazy Date: Sat, 16 May 2015 20:11:41 +0200 Subject: [PATCH 251/615] Add Jekyll maintainer --- lib/maintainers.nix | 1 + pkgs/applications/misc/jekyll/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d4fda831d594..a7e8b331e988 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -153,6 +153,7 @@ paholg = "Paho Lurie-Gregg "; pakhfn = "Fedor Pakhomov "; pashev = "Igor Pashev "; + pesterhazy = "Paulus Esterhazy "; phausmann = "Philipp Hausmann "; philandstuff = "Philip Potter "; phreedom = "Evgeny Egorochkin "; diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index 9c0ef01e7404..cc1d4e7c6592 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -14,7 +14,7 @@ bundlerEnv { description = "Simple, blog aware, static site generator"; homepage = http://jekyllrb.com/; license = with licenses; mit; - # maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ pesterhazy ]; platforms = platforms.unix; }; } From ea2c17571db0c5a9aaca8f58b041fe6309bef27a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 16 May 2015 20:34:17 +0200 Subject: [PATCH 252/615] miniupnp{c,d}: bump --- pkgs/tools/networking/miniupnpc/default.nix | 6 ++++-- pkgs/tools/networking/miniupnpd/default.nix | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 3cd35073be6e..22f833f9bdb6 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "miniupnpc-1.7"; + name = "miniupnpc-1.9.20150430"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "0dv3mz4yikngmlnrnmh747mlgbbpijryw03wcs8g4jwvprb29p8n"; + sha256 = "0ivnvzla0l2pzmy8s0j8ss0fnpsii7z9scvyl4a13g9k911hgmvn"; + name = "${name}.tar.gz"; }; installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; @@ -19,5 +20,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://miniupnp.free.fr/; description = "A client that implements the UPnP Internet Gateway Device (IGD) specification"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index ef3db0a4a21f..11262460e716 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -3,11 +3,12 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "miniupnpd-1.8.20140401"; + name = "miniupnpd-1.9.20150430"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "1gfdbfqcw6ih830si51yzqbyymgcbwkiv9vk5dwnxs78b7xgyv88"; + sha256 = "0ajqs3lf2cgq5fm1v79fa23sbb623i89sqnx7d9cnqbqq5py1k71"; + name = "miniupnpd-1.9.20150430.tar.gz"; }; buildInputs = [ iptables libnfnetlink ]; @@ -27,5 +28,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://miniupnp.free.fr/; description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification"; + platforms = stdenv.lib.platforms.linux; }; } From 4c67102a59e7476b450be37a366924f43388dfcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 16 May 2015 20:34:33 +0200 Subject: [PATCH 253/615] pythonPackages.greenlet: 0.4.5 -> 0.4.7 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 36feab0056e6..4f641ede7272 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5773,12 +5773,12 @@ let greenlet = buildPythonPackage rec { name = "greenlet-${version}"; - version = "0.4.5"; + version = "0.4.7"; disabled = isPyPy; # builtin for pypy src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/g/greenlet/${name}.zip"; - sha256 = "1gidivqcpn6i6k01bf3hgcn0m68h4b9srhpff9kgnk0c287z145r"; + sha256 = "1zlmsygjw69xlq56vz1z5ivzy9bwc7knjaykn2yy2hv4w2j4yb7k"; }; meta = with stdenv.lib; { From 3efefb5baa6b7645219dede69709ee6a36ea1604 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 16 May 2015 20:56:53 +0200 Subject: [PATCH 254/615] greenlet: delete problematic test --- pkgs/top-level/python-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4f641ede7272..98b012ecd466 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5781,6 +5781,11 @@ let sha256 = "1zlmsygjw69xlq56vz1z5ivzy9bwc7knjaykn2yy2hv4w2j4yb7k"; }; + # see https://github.com/python-greenlet/greenlet/issues/85 + preCheck = '' + rm tests/test_leaks.py + ''; + meta = with stdenv.lib; { homepage = http://pypi.python.org/pypi/greenlet; description = "Module for lightweight in-process concurrent programming"; From c59c20ca0f1163b868efa843a98cfcb55cfbbd56 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 16 May 2015 14:12:11 -0500 Subject: [PATCH 255/615] Update HPLIP to 3.15.4 --- nixos/doc/manual/release-notes/rl-unstable.xml | 9 +++++++++ pkgs/misc/drivers/hplip/default.nix | 16 ++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index c4691aa663f4..9563dcbb343b 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -61,6 +61,15 @@ was accordingly renamed to bomi + + + HPLIP (printer, scanner, and fax drivers for HP devices) has + been updated to version 3.15.4. This release + adds support for the arm6l-linux and + arm7l-linux platforms. + + + diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 7c4e6f45bb4d..bb790be7c268 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -6,11 +6,11 @@ let - name = "hplip-3.15.2"; + name = "hplip-3.15.4"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0z7n62vdbr0p0kls1m2sr3nhvkhx3rawcbzd0zdl0lnq8fkyq0jz"; + sha256 = "0s1yiifp002n8qy0i4cv6j0hq9ikp4jabki5w3xzlaqgd4bjz1x3"; }; hplip_state = @@ -21,9 +21,17 @@ let version = (builtins.parseDrvName name).version; }; + hplip_arch = + { + "i686-linux" = "x86_32"; + "x86_64-linux" = "x86_64"; + "arm6l-linux" = "arm32"; + "arm7l-linux" = "arm32"; + }."${stdenv.system}" or (abort "Unsupported platform ${stdenv.system}"); + plugin = fetchurl { url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "1pzxv9yway1x1m5grz6042p54ldh7jcgv4qrkjhlcb4vr9plwql9"; + sha256 = "00zhaq48m7p6nrxfy16086hzghf2pfr32s53sndbpp2514v2j392"; }; in @@ -135,7 +143,7 @@ stdenv.mkDerivation { license = if withPlugin then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ]; maintainers = with maintainers; [ ttuegel jgeerds ]; }; } From 4e2e36f3885a4dd19b180faeba2f00eb8a65a8e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 May 2015 17:42:22 +0200 Subject: [PATCH 256/615] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/31bc649141e7724eb7528e7ae8bc9057a939ba22 with hackage2nix revision 8e3ad6c8af82151574e87c1e9c9ec6cbb5841b3d --- .../haskell-modules/hackage-packages.nix | 2266 ++++++++++------- 1 file changed, 1322 insertions(+), 944 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2361129113d0..45a053f311c6 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1541,8 +1541,8 @@ self: { }: mkDerivation { pname = "BlogLiterately"; - version = "0.7.1.9"; - sha256 = "1llfbfwxnyvc4k9zlf1fdkb9dr4abmv0x6zc0048h4vx7db50f8h"; + version = "0.7.1.10"; + sha256 = "142m20523jd65s53w2myqc24sj6mi3kff8ziqqja3q0whh79n79w"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -2174,6 +2174,7 @@ self: { HUnit old-time process QuickCheck regex-posix test-framework test-framework-hunit test-framework-quickcheck2 unix ]; + jailbreak = true; preCheck = "unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP"; homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; @@ -2200,6 +2201,7 @@ self: { filepath HUnit old-time process QuickCheck regex-posix test-framework test-framework-hunit test-framework-quickcheck2 unix ]; + jailbreak = true; homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; license = stdenv.lib.licenses.bsd3; @@ -2316,6 +2318,7 @@ self: { array base colour data-default-class lens mtl old-locale operational time vector ]; + jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "A library for generating 2D Charts and Plots"; license = stdenv.lib.licenses.bsd3; @@ -2333,6 +2336,7 @@ self: { array base cairo Chart colour data-default-class lens mtl old-locale operational time ]; + jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Cairo backend for Charts"; license = stdenv.lib.licenses.bsd3; @@ -2689,8 +2693,8 @@ self: { ({ mkDerivation, async, base }: mkDerivation { pname = "Concurrential"; - version = "0.4.0.0"; - sha256 = "0wgiwpkv65czcc5fllzicgswq6rf0jl646w2n937yhvbdmxfcq6i"; + version = "0.5.0.0"; + sha256 = "1fcl1ckinzv9c0iyfvhh3sm649jn7q8yv2r9vz99l139dw25l5vb"; buildDepends = [ async base ]; jailbreak = true; homepage = "http://github.com/avieth/Concurrential"; @@ -3065,6 +3069,7 @@ self: { network network-uri optparse-applicative transformers transformers-base utf8-string xml-conduit xml-hamlet ]; + jailbreak = true; homepage = "http://floss.scru.org/hDAV"; description = "RFC 4918 WebDAV support"; license = stdenv.lib.licenses.gpl3; @@ -6056,8 +6061,8 @@ self: { }: mkDerivation { pname = "HDBC-odbc"; - version = "2.4.0.0"; - sha256 = "0zjq5j095jyh0axmgnr59fwhh1nhipj6flz77z46kygagygrg2qz"; + version = "2.4.0.1"; + sha256 = "1sdf5llz40q9cg0gi0rglnz6agamb7z4n5c6dhwwly902b6fxinv"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring HDBC mtl time utf8-string ]; @@ -7146,27 +7151,6 @@ self: { }) {}; "HStringTemplate" = callPackage - ({ mkDerivation, array, base, blaze-builder, bytestring, containers - , deepseq, directory, filepath, mtl, old-locale, old-time, parsec - , pretty, syb, template-haskell, text, time, utf8-string, void - }: - mkDerivation { - pname = "HStringTemplate"; - version = "0.7.3"; - revision = "2"; - sha256 = "1gw4v16nk0878qplcx6by2bl4280lwyn9a252p6ldaqlbk9vygw8"; - editedCabalFile = "f3b42ea4e5c29507d6d186ccd34c83425d2e16a55ca3af95fd8bb1a71e3f54cb"; - buildDepends = [ - array base blaze-builder bytestring containers deepseq directory - filepath mtl old-locale old-time parsec pretty syb template-haskell - text time utf8-string void - ]; - jailbreak = true; - description = "StringTemplate implementation in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "HStringTemplate_0_8_3" = callPackage ({ mkDerivation, array, base, blaze-builder, bytestring, containers , deepseq, directory, filepath, mtl, old-locale, parsec, pretty , syb, template-haskell, text, time, void @@ -8982,7 +8966,9 @@ self: { mkDerivation { pname = "JuicyPixels"; version = "3.2.4"; + revision = "1"; sha256 = "113w66rd6h04x0zbkqh34x33pf15hmrn3l9yy8kirs55kbg266w0"; + editedCabalFile = "0ea6de6b2defec5f1be0f98fc995b3a9654fbf8d3b34cd3fa77a0f2e3919dc2b"; buildDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -10300,8 +10286,8 @@ self: { }: mkDerivation { pname = "MonadRandom"; - version = "0.3.0.2"; - sha256 = "18gajibgypy8hl0slh3lyjjwqqkayxrk7vwwk26nfdkq9yixxbvi"; + version = "0.4"; + sha256 = "14vgp2sml9jsras9l0488gy2siamcqf78y3vlr1my4lhhdx3ybyk"; buildDepends = [ base mtl random transformers transformers-compat ]; @@ -12251,23 +12237,6 @@ self: { }) {}; "QuickCheck" = callPackage - ({ mkDerivation, base, random, template-haskell, test-framework - , tf-random, transformers - }: - mkDerivation { - pname = "QuickCheck"; - version = "2.7.6"; - sha256 = "09y5l0062l9i5jp9v6811kvkk4zpy0mizwaw44abgz0x1h59gn40"; - buildDepends = [ - base random template-haskell tf-random transformers - ]; - testDepends = [ base template-haskell test-framework ]; - homepage = "https://github.com/nick8325/quickcheck"; - description = "Automatic testing of Haskell programs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "QuickCheck_2_8_1" = callPackage ({ mkDerivation, base, containers, random, template-haskell , test-framework, tf-random, transformers }: @@ -12279,7 +12248,6 @@ self: { base containers random template-haskell tf-random transformers ]; testDepends = [ base containers template-haskell test-framework ]; - jailbreak = true; homepage = "https://github.com/nick8325/quickcheck"; description = "Automatic testing of Haskell programs"; license = stdenv.lib.licenses.bsd3; @@ -13331,6 +13299,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) glib; inherit (pkgs) mono;}; + "Saturnin" = callPackage + ({ mkDerivation, base, bytestring, data-default, directory, either + , exceptions, filepath, formatting, hlint, hspec, ini, mtl, network + , old-locale, process, regex-compat, spawn, stm, temporary, text + , time, unordered-containers, yaml + }: + mkDerivation { + pname = "Saturnin"; + version = "0.1.0"; + sha256 = "14ipl6mi1g874y66i3lvaqdisfl3agy5cj005ghpq81hv5wp770g"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bytestring data-default directory either exceptions filepath + formatting ini mtl network old-locale process spawn stm temporary + text time unordered-containers yaml + ]; + testDepends = [ + base data-default either hlint hspec mtl process regex-compat + ]; + description = "Saturnin CI / Job System"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "SciFlow" = callPackage ({ mkDerivation, base, bytestring, data-default-class, mtl, shelly , template-haskell, text, unordered-containers, yaml @@ -14244,6 +14236,7 @@ self: { base containers deepseq fgl free hmatrix integration list-extras mtl numeric-tools parallel ]; + jailbreak = true; description = "Utilities for condensed matter physics tight binding calculations"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -16027,17 +16020,17 @@ self: { "Zora" = callPackage ({ mkDerivation, base, bytestring, containers, directory, fgl - , graphviz, random, shelly, text + , graphviz, random, shelly, tasty, tasty-hunit, text }: mkDerivation { pname = "Zora"; - version = "1.1.23"; - sha256 = "0nfvqhrlz8wgvfiqnlfzgsbsk4q3yg7a7s4pyh4v4xw0xnj68vgl"; + version = "1.2.0"; + sha256 = "1yni2yq8ynq9jhnzabyx0ahmvmvcyblc0swxy0n7qdzlz5rxzm3i"; buildDepends = [ base bytestring containers directory fgl graphviz random shelly text ]; - testDepends = [ base ]; + testDepends = [ base containers random tasty tasty-hunit ]; homepage = "http://github.com/bgwines/zora"; description = "Graphing library wrapper + assorted useful functions"; license = stdenv.lib.licenses.bsd3; @@ -16733,6 +16726,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "acme-memorandom" = callPackage + ({ mkDerivation, base, MemoTrie, random }: + mkDerivation { + pname = "acme-memorandom"; + version = "0.0.3"; + sha256 = "1l6kxmdb7fi47ldfpcqbl6h4dnzw6zw0ahxmvx6sxwxm3x4hynhi"; + buildDepends = [ base MemoTrie random ]; + homepage = "https://github.com/ion1/acme-memorandom"; + description = "Memoized random number generation"; + license = stdenv.lib.licenses.mit; + }) {}; + "acme-microwave" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -16953,6 +16958,7 @@ self: { testDepends = [ base lens linear QuickCheck semigroupoids semigroups vector ]; + jailbreak = true; description = "Abstractions for animation"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -16991,6 +16997,7 @@ self: { version = "0.3.0.3"; sha256 = "1q433by9ygs7rrjj8z76hg94zyh2cp4qiwsv7q1mywr5scfccn32"; buildDepends = [ base QuickCheck ]; + jailbreak = true; description = "Basic definitions for activehs"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -17160,8 +17167,8 @@ self: { }: mkDerivation { pname = "adjunctions"; - version = "4.2"; - sha256 = "07r56r6kyd6wlcxxnsnnyv59pyc8s1gsy54kzwmk9yknks5rij9i"; + version = "4.2.1"; + sha256 = "0vzlz2q6863ywnhvax3m5xq99x6bz1h47z7z8hmnqdfg5pa4r9k5"; buildDepends = [ array base comonad containers contravariant distributive free mtl profunctors semigroupoids semigroups tagged transformers void @@ -17425,19 +17432,21 @@ self: { }) {}; "aeson-qq" = callPackage - ({ mkDerivation, aeson, base, ghc-prim, haskell-src-meta, hspec - , parsec, template-haskell, text, vector + ({ mkDerivation, aeson, attoparsec, base, ghc-prim + , haskell-src-meta, hspec, parsec, scientific, template-haskell + , text, vector }: mkDerivation { pname = "aeson-qq"; - version = "0.7.4"; - sha256 = "0wnc9pdjvd15gfkdxzf084393vwmxv2xaxdchzgal1qhwa1mak4v"; + version = "0.8.0"; + sha256 = "12vs3mh1a6j2r74xr11bpzb69i0k25dxplhvw15ph72kmhfbri7f"; buildDepends = [ - aeson base haskell-src-meta parsec template-haskell text vector + aeson attoparsec base haskell-src-meta parsec scientific + template-haskell text vector ]; testDepends = [ - aeson base ghc-prim haskell-src-meta hspec parsec template-haskell - text vector + aeson attoparsec base ghc-prim haskell-src-meta hspec parsec + scientific template-haskell text vector ]; homepage = "http://github.com/zalora/aeson-qq"; description = "JSON quasiquoter for Haskell"; @@ -17806,8 +17815,8 @@ self: { ({ mkDerivation, array, base, containers, mtl, random, vector }: mkDerivation { pname = "aivika"; - version = "4.0.1"; - sha256 = "0vhpv55wcljywh8rvv829c69wam0w505p6gf8bs5680spwc4z4y0"; + version = "4.0.3"; + sha256 = "1z5szc15qg7hqgz67b6m9is2dwkfcz50rw393nkpq7q2w6sjlf5m"; buildDepends = [ array base containers mtl random vector ]; homepage = "http://github.com/dsorokin/aivika"; description = "A multi-paradigm simulation library"; @@ -18028,6 +18037,7 @@ self: { adjunctions array base containers distributive mtl nats semigroupoids semigroups tagged transformers void ]; + jailbreak = true; homepage = "http://github.com/ekmett/algebra/"; description = "Constructive abstract algebra"; license = stdenv.lib.licenses.bsd3; @@ -19166,8 +19176,8 @@ self: { }: mkDerivation { pname = "amqp-conduit"; - version = "0.1.0.1"; - sha256 = "167dkak5hg4q5b7i58mw6bl0mh38nyqbzyrhplmil9nins7cvqmv"; + version = "0.2.0.0"; + sha256 = "1mlapyp22bbnkz7ny2rs2da6a6nbs41j8ljsjlxv1x9cfnjzjayb"; buildDepends = [ amqp base conduit exceptions lifted-base monad-control mtl resourcet text transformers transformers-base @@ -19615,6 +19625,7 @@ self: { test-framework-hunit transformers ]; extraLibraries = [ openssl ]; + jailbreak = true; homepage = "https://github.com/trskop/apache-md5"; description = "Apache specific MD5 digest algorighm"; license = stdenv.lib.licenses.bsd3; @@ -19665,6 +19676,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "api-opentheory-unicode" = callPackage + ({ mkDerivation, base, bytestring, directory, opentheory-unicode }: + mkDerivation { + pname = "api-opentheory-unicode"; + version = "1.2"; + sha256 = "1mzbkrbdwcxr83bprk3gjrrg6sarl0vwv729xs8x5d1rfdiqlm88"; + buildDepends = [ base bytestring opentheory-unicode ]; + testDepends = [ base bytestring directory opentheory-unicode ]; + description = "OpenTheory unicode character API"; + license = stdenv.lib.licenses.mit; + }) {}; + "api-tools" = callPackage ({ mkDerivation, aeson, aeson-pretty, alex, array, attoparsec, base , base64-bytestring, bytestring, Cabal, case-insensitive @@ -19787,6 +19810,7 @@ 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; @@ -20117,6 +20141,7 @@ self: { testDepends = [ base mtl QuickCheck test-framework test-framework-quickcheck2 ]; + jailbreak = true; homepage = "https://www.github.com/ktvoelker/AParsec"; description = "An applicative parser combinator library"; license = stdenv.lib.licenses.gpl3; @@ -20705,6 +20730,7 @@ self: { version = "0.1.1"; sha256 = "1fs8jap2ndcj21qgpkzy9nbnabvp4ac0xm0vdwkjjdf7i4j5kaqr"; buildDepends = [ base containers profunctors transformers ]; + jailbreak = true; homepage = "https://github.com/fumieval/artery"; description = "A simple, arrow-based reactive programming"; license = stdenv.lib.licenses.bsd3; @@ -21520,10 +21546,9 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, enumerator, text }: mkDerivation { pname = "attoparsec-enumerator"; - version = "0.3.3"; - sha256 = "0z57bbw97v92dkjp57zj9nfzsdas2n1qfw472k1aa84iqb6hbw9w"; + version = "0.3.4"; + sha256 = "127mj0v6342mzxnc73qki3k197vhwsff8qkf92gm5idyxdisg5dy"; buildDepends = [ attoparsec base bytestring enumerator text ]; - jailbreak = true; homepage = "https://john-millikin.com/software/attoparsec-enumerator/"; description = "Pass input from an enumerator to an Attoparsec parser"; license = stdenv.lib.licenses.mit; @@ -23015,8 +23040,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck, unix }: mkDerivation { pname = "base-compat"; - version = "0.8.1.1"; - sha256 = "0j1k7yxahprbajzvfxvdfzz3frx8s8karq1kv8v02yh0lsw7hjki"; + version = "0.8.2"; + sha256 = "02m93hzgxg4bcnp7xcc2fdh2hrsc2h6fwl8hix5nx9k864kwf41q"; buildDepends = [ base unix ]; testDepends = [ base hspec QuickCheck ]; description = "A compatibility layer for base"; @@ -23229,17 +23254,17 @@ self: { }) {}; "basic-prelude" = callPackage - ({ mkDerivation, base, bytestring, containers, hashable - , lifted-base, ReadArgs, safe, system-filepath, text, transformers + ({ mkDerivation, base, bytestring, containers, filepath, hashable + , lifted-base, ReadArgs, safe, text, transformers , unordered-containers, vector }: mkDerivation { pname = "basic-prelude"; - version = "0.3.13"; - sha256 = "0kfqh5jf9lfxmqhfi74i13cgkwchfkyall4glh2inna3ish4qz5l"; + version = "0.4.0"; + sha256 = "10zr3fb12fis33q74988fipljcjlcr1c94cf9kg0rfby2dc1z6v4"; buildDepends = [ - base bytestring containers hashable lifted-base ReadArgs safe - system-filepath text transformers unordered-containers vector + base bytestring containers filepath hashable lifted-base ReadArgs + safe text transformers unordered-containers vector ]; homepage = "https://github.com/snoyberg/basic-prelude"; description = "An enhanced core prelude; a common foundation for alternate preludes"; @@ -23808,12 +23833,12 @@ self: { }) {}; "bifunctors" = callPackage - ({ mkDerivation, base, semigroupoids, semigroups, tagged }: + ({ mkDerivation, base, semigroups, tagged }: mkDerivation { pname = "bifunctors"; - version = "4.2.1"; - sha256 = "0zy4lz08r60h8lgrf67zqqrcslrnbmdi254ydv5mw69z57nnx3ng"; - buildDepends = [ base semigroupoids semigroups tagged ]; + version = "5"; + sha256 = "13990xdgx0n23qgi18ghhmsywj5zkr0a5bim0g8a4nzi0cx95ps1"; + buildDepends = [ base semigroups tagged ]; homepage = "http://github.com/ekmett/bifunctors/"; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; @@ -25174,8 +25199,8 @@ self: { }: mkDerivation { pname = "biophd"; - version = "0.0.6"; - sha256 = "1206pa9ah473rvpj6yr769fwmjc3axl036ny3yzf52lhy6bcggbb"; + version = "0.0.7"; + sha256 = "1n841kdny2ry8kmm3g87vvkpg6c4ia49hbb3qh1bnwd0nwq0x3mw"; buildDepends = [ base binary biocore bytestring old-locale parsec text time ]; @@ -25344,11 +25369,11 @@ self: { }: mkDerivation { pname = "bitcoin-api-extra"; - version = "0.9.0"; - sha256 = "155fq7wfpij0rfc06ps1bq9mz8gm68nnlxh1170qq5rgqcc49f79"; + version = "0.9.1"; + sha256 = "1z6pppjgq6sy4q78k176pnr6y3lq369brqf0pg90v0qggl0cc8y4"; buildDepends = [ base binary bitcoin-api bitcoin-block bitcoin-tx bytestring conduit - stm stm-chans stm-conduit text transformers + lens stm stm-chans stm-conduit text transformers ]; testDepends = [ base bitcoin-api bitcoin-tx bytestring conduit hspec http-client @@ -25914,24 +25939,13 @@ 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; }) {}; "blaze-builder" = callPackage - ({ mkDerivation, base, bytestring, text }: - mkDerivation { - pname = "blaze-builder"; - version = "0.3.3.4"; - sha256 = "12xgmi8bc3h3cfk31rrfaklmwvyxgdwzwmxzw22yxd0dd8g11hg5"; - buildDepends = [ base bytestring text ]; - homepage = "http://github.com/meiersi/blaze-builder"; - description = "Efficient buffered output"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "blaze-builder_0_4_0_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 , text, utf8-string @@ -25963,8 +25977,8 @@ self: { }) {}; "blaze-builder-enumerator" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, enumerator - , streaming-commons, transformers + ({ mkDerivation, base, blaze-builder, bytestring + , bytestring-builder, enumerator, streaming-commons, transformers }: mkDerivation { pname = "blaze-builder-enumerator"; @@ -25973,8 +25987,8 @@ self: { sha256 = "15mz4dfnngll61b1xv3hfazvzjfd8g9ym0hps1qiks1hl4c2kxah"; editedCabalFile = "28796d33301d22cfca6188f54699d9efd7721802bc5e9c88a394bec14c9c4fae"; buildDepends = [ - base blaze-builder bytestring enumerator streaming-commons - transformers + base blaze-builder bytestring bytestring-builder enumerator + streaming-commons transformers ]; homepage = "https://github.com/meiersi/blaze-builder-enumerator"; description = "Enumeratees for the incremental conversion of builders to bytestrings"; @@ -26010,32 +26024,13 @@ 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; }) {}; "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 @@ -26050,7 +26045,6 @@ 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; @@ -26139,31 +26133,13 @@ self: { base blaze-builder bytestring containers HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; + jailbreak = true; 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 @@ -26690,8 +26666,8 @@ self: { }: mkDerivation { pname = "bound"; - version = "1.0.4"; - sha256 = "17qnrjmqhx07cpzwd1z4lp2d42jx1lfxl6b86d65g4fd79miipky"; + version = "1.0.5"; + sha256 = "1vk2d8c0nvfk28a9l5d6vnxk48lha2xsp64bd7c1p3x8lygxj88f"; buildDepends = [ base bifunctors binary bytes cereal comonad hashable hashable-extras prelude-extras profunctors transformers @@ -26786,14 +26762,11 @@ self: { ({ mkDerivation, array, base, mtl, unix }: mkDerivation { pname = "brainfuck"; - version = "0.1"; - revision = "1"; - sha256 = "0lsw62g4ir8idjjadsdf46p8mqd88mysn0b499bk3x5l5js858z3"; - editedCabalFile = "154e3b46053499fc41f606429c8c4f0500e7ec1e1cbf8c3e89af275e06e9d7fa"; + version = "0.1.0.2"; + sha256 = "18xp0vlmh2n37x6rhczxw115cnips7vm9f560qsr395crqk5dzz9"; isLibrary = true; isExecutable = true; buildDepends = [ array base mtl unix ]; - jailbreak = true; description = "Brainfuck interpreter"; license = "GPL"; }) {}; @@ -26949,6 +26922,7 @@ self: { base binary bytestring cryptohash data-binary-ieee754 mtl network QuickCheck test-framework test-framework-quickcheck2 text time ]; + jailbreak = true; homepage = "http://github.com/mongodb-haskell/bson"; description = "BSON documents are JSON-like objects with a standard binary encoding"; license = "unknown"; @@ -28047,20 +28021,23 @@ self: { }) {}; "cabal-debian" = callPackage - ({ mkDerivation, base, Cabal, containers, data-default, debian - , deepseq, Diff, directory, exceptions, filepath, hsemail, HUnit - , lens, memoize, mtl, network-uri, parsec, pretty, process, pureMD5 - , regex-tdfa, set-extra, syb, text, unix, Unixutils, utf8-string + ({ mkDerivation, ansi-wl-pprint, base, bifunctors, Cabal + , containers, data-default, debian, deepseq, Diff, directory + , exceptions, filepath, hsemail, HUnit, lens, memoize, mtl + , network-uri, newtype-generics, optparse-applicative, parsec + , pretty, process, pureMD5, regex-tdfa, set-extra, syb, text, unix + , Unixutils, utf8-string }: mkDerivation { pname = "cabal-debian"; - version = "4.27.1"; - sha256 = "0h9z6lqcx80zk19y080wr3djamvirjrn8in30h9hyb8j81l7hg5d"; + version = "4.27.2"; + sha256 = "1dmxs06x82pb0x4cyf5lhhgjf5mf0yx2yzl5r6g69awlkq5ylalz"; isLibrary = true; isExecutable = true; buildDepends = [ - base Cabal containers data-default debian deepseq Diff directory - exceptions filepath hsemail HUnit lens memoize mtl network-uri + ansi-wl-pprint base bifunctors Cabal containers data-default debian + deepseq Diff directory exceptions filepath hsemail HUnit lens + memoize mtl network-uri newtype-generics optparse-applicative parsec pretty process pureMD5 regex-tdfa set-extra syb text unix Unixutils utf8-string ]; @@ -28253,6 +28230,7 @@ self: { pretty process QuickCheck regex-posix stm test-framework test-framework-hunit test-framework-quickcheck2 time unix zlib ]; + jailbreak = true; postInstall = '' mkdir $out/etc mv bash-completion $out/etc/bash_completion.d @@ -28524,24 +28502,21 @@ self: { }) {}; "cabal-src" = callPackage - ({ mkDerivation, base, bytestring, Cabal, classy-prelude-conduit - , conduit, conduit-extra, containers, directory, filepath - , http-client, http-client-tls, http-conduit, http-types, network - , process, resourcet, shelly, streaming-commons, system-fileio - , system-filepath, tar, temporary, text, transformers + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , containers, directory, filepath, http-conduit, http-types + , network, process, resourcet, shelly, system-fileio + , system-filepath, tar, text, transformers }: mkDerivation { pname = "cabal-src"; - version = "0.2.5.1"; - sha256 = "0ym5lsgah4aq37mg074ab82kdjxwmcp0qax3jnalk2hvcm531k9z"; + version = "0.3.0"; + sha256 = "1x8fb7hly9cxhfacwrai1zam6737dgfhjs9g85826f2cp4vp0g29"; isLibrary = false; isExecutable = true; buildDepends = [ - base bytestring Cabal classy-prelude-conduit conduit conduit-extra - containers directory filepath http-client http-client-tls + base bytestring conduit conduit-extra containers directory filepath http-conduit http-types network process resourcet shelly - streaming-commons system-fileio system-filepath tar temporary text - transformers + system-fileio system-filepath tar text transformers ]; homepage = "https://github.com/yesodweb/cabal-src"; description = "Alternative install procedure to avoid the diamond dependency issue"; @@ -28597,7 +28572,6 @@ self: { 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; @@ -29084,6 +29058,7 @@ self: { isExecutable = true; buildDepends = [ base containers haskeline parsec ]; testDepends = [ base containers parsec QuickCheck ]; + jailbreak = true; homepage = "https://github.com/sumitsahrawat/calculator"; description = "A calculator repl, with variables, functions & Mathematica like dynamic plots"; license = stdenv.lib.licenses.gpl2; @@ -29571,13 +29546,12 @@ self: { }: mkDerivation { pname = "cases"; - version = "0.1.2"; - sha256 = "02m4dlp0l4jd53j1ziq9hkxsj61m74b886ch7vx74n6caz90qnph"; + version = "0.1.2.1"; + sha256 = "0p2dfnyj887bnp414psbmkin4ybmflvgr1q2npvcih2sxianywkd"; buildDepends = [ attoparsec base-prelude loch-th text ]; testDepends = [ base HTF HUnit loch-th placeholders QuickCheck text ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/cases"; description = "A converter for spinal, snake and camel cases"; license = stdenv.lib.licenses.mit; @@ -29640,8 +29614,8 @@ self: { }: mkDerivation { pname = "cassava"; - version = "0.4.2.3"; - sha256 = "13fhim3ylxhkr7wy5dss3m1k3cqlhrvknzbqsi1yclfkvp4wzc2f"; + version = "0.4.2.4"; + sha256 = "1vf42v4n55i39zk5dimzk9z0l0jzyp9w9vhgrvzmi0f7nhfbv08a"; buildDepends = [ array attoparsec base blaze-builder bytestring containers deepseq text unordered-containers vector @@ -29651,7 +29625,6 @@ self: { test-framework-hunit test-framework-quickcheck2 text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/tibbe/cassava"; description = "A CSV parsing and encoding library"; license = stdenv.lib.licenses.bsd3; @@ -29670,6 +29643,7 @@ self: { containers mtl ]; testDepends = [ base QuickCheck ]; + jailbreak = true; homepage = "https://github.com/domdere/cassava-conduit"; description = "Conduit interface for cassava package"; license = stdenv.lib.licenses.bsd3; @@ -30605,6 +30579,7 @@ 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; @@ -30870,16 +30845,15 @@ self: { "chunked-data" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers - , mono-traversable, semigroups, system-filepath, text, transformers - , vector + , mono-traversable, semigroups, text, transformers, vector }: mkDerivation { pname = "chunked-data"; - version = "0.1.0.1"; - sha256 = "0kdq79mxi9nhy3dqw283f5ffx4rxwfrdq9cfw46ql5wmqrg2qw7r"; + version = "0.2.0"; + sha256 = "0wmjpb0vq0nqvy317gmzxqh8yqq1bx0h2r90vqfpq3cv3z4g784s"; buildDepends = [ base blaze-builder bytestring containers mono-traversable - semigroups system-filepath text transformers vector + semigroups text transformers vector ]; homepage = "https://github.com/fpco/chunked-data"; description = "Typeclasses for dealing with various chunked data representations"; @@ -31511,20 +31485,20 @@ self: { ({ mkDerivation, base, basic-prelude, bifunctors, bytestring , chunked-data, containers, dlist, enclosed-exceptions, exceptions , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl - , mutable-containers, primitive, QuickCheck, semigroups, stm - , system-filepath, text, time, time-locale-compat, transformers - , unordered-containers, vector, vector-instances + , mutable-containers, primitive, QuickCheck, semigroups, stm, text + , time, time-locale-compat, transformers, unordered-containers + , vector, vector-instances }: mkDerivation { pname = "classy-prelude"; - version = "0.11.1.1"; - sha256 = "1aincib2rpxbc7nyk8sbxhcdy0l4wr1005kn0h4bb4m3aa008f7a"; + version = "0.12.0"; + sha256 = "0g72084wnfqam0djpck76bb7dmphpjs1h32w361cqyvgxkyy1prw"; buildDepends = [ base basic-prelude bifunctors bytestring chunked-data containers dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base mono-traversable mtl mutable-containers primitive semigroups stm - system-filepath text time time-locale-compat transformers - unordered-containers vector vector-instances + text time time-locale-compat transformers unordered-containers + vector vector-instances ]; testDepends = [ base containers hspec QuickCheck transformers unordered-containers @@ -31537,15 +31511,15 @@ self: { "classy-prelude-conduit" = callPackage ({ mkDerivation, base, bytestring, classy-prelude, conduit , conduit-combinators, hspec, monad-control, QuickCheck, resourcet - , system-fileio, transformers, void + , transformers, void }: mkDerivation { pname = "classy-prelude-conduit"; - version = "0.11.1"; - sha256 = "0rjm8kzx34m1x3yndm9i2ybvw9lfddgaab1n51n8psml3yxckqic"; + version = "0.12.0"; + sha256 = "0sby5lbk16f7q3dd3qisv67m1bsgx9v99iwb95crbql3ghi99za1"; buildDepends = [ base bytestring classy-prelude conduit conduit-combinators - monad-control resourcet system-fileio transformers void + monad-control resourcet transformers void ]; testDepends = [ base bytestring conduit hspec QuickCheck transformers @@ -31562,8 +31536,8 @@ self: { }: mkDerivation { pname = "classy-prelude-yesod"; - version = "0.11.1"; - sha256 = "1481cs7l0bf4jy9q2rg35aw0pfzdhnj7kc22ll2n7jb2wg1xvcv3"; + version = "0.12.0"; + sha256 = "00w932g8pcv76qd16fjr93vaipnr02p3m5j8zhyqy1w9frc6pnqx"; buildDepends = [ aeson base classy-prelude classy-prelude-conduit data-default http-conduit http-types persistent yesod yesod-newsfeed @@ -31594,37 +31568,40 @@ self: { }) {}; "clckwrks" = callPackage - ({ mkDerivation, acid-state, aeson, attoparsec, base, blaze-html - , bytestring, cereal, containers, cryptopp, directory, filepath - , happstack-authenticate, happstack-hsp, happstack-server - , happstack-server-tls, hsp, hsx-jmacro, hsx2hs, ixset, jmacro, mtl - , network, network-uri, old-locale, openssl, process, random - , reform, reform-happstack, reform-hsp, safecopy, stm, tagsoup - , text, time, unordered-containers, utf8-string, uuid, vector - , web-plugins, web-routes, web-routes-happstack, web-routes-hsp - , web-routes-th, xss-sanitize + ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base + , blaze-html, bytestring, cereal, containers, directory, filepath + , happstack-authenticate, happstack-hsp, happstack-jmacro + , happstack-server, happstack-server-tls, hsp, hsx-jmacro, hsx2hs + , ixset, jmacro, lens, mtl, network, network-uri, old-locale + , openssl, process, random, reform, reform-happstack, reform-hsp + , safecopy, stm, tagsoup, text, time, time-locale-compat + , unordered-containers, utf8-string, uuid, vector, web-plugins + , web-routes, web-routes-happstack, web-routes-hsp, web-routes-th + , xss-sanitize }: mkDerivation { pname = "clckwrks"; - version = "0.22.4"; - sha256 = "1srgvnsmd3lhhp797kwwq6a0sr31i0kdlgzmrqi0qs1wg54nwyw6"; + version = "0.23.7"; + sha256 = "0bs7gcbb3xsq4b444jybilfvpxqm9xdwn135fdn1wchbiykqnwba"; buildDepends = [ - acid-state aeson attoparsec base blaze-html bytestring cereal - containers directory filepath happstack-authenticate happstack-hsp - happstack-server happstack-server-tls hsp hsx-jmacro ixset jmacro - mtl network network-uri old-locale process random reform + acid-state aeson aeson-qq attoparsec base blaze-html bytestring + cereal containers directory filepath happstack-authenticate + happstack-hsp happstack-jmacro happstack-server + happstack-server-tls hsp hsx-jmacro hsx2hs ixset jmacro lens mtl + network network-uri old-locale process random reform reform-happstack reform-hsp safecopy stm tagsoup text time - unordered-containers utf8-string uuid vector web-plugins web-routes - web-routes-happstack web-routes-hsp web-routes-th xss-sanitize + time-locale-compat unordered-containers utf8-string uuid vector + web-plugins web-routes web-routes-happstack web-routes-hsp + web-routes-th xss-sanitize ]; buildTools = [ hsx2hs ]; - extraLibraries = [ cryptopp openssl ]; + extraLibraries = [ openssl ]; jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "A secure, reliable content management system (CMS) and blogging platform"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) cryptopp; inherit (pkgs) openssl;}; + }) { inherit (pkgs) openssl;}; "clckwrks-cli" = callPackage ({ mkDerivation, acid-state, base, clckwrks, haskeline, mtl @@ -31632,8 +31609,8 @@ self: { }: mkDerivation { pname = "clckwrks-cli"; - version = "0.2.13"; - sha256 = "09ygkr4wqcwc07pf0alf9dncsv4dl40v97qnilis3wsdc05gflip"; + version = "0.2.14"; + sha256 = "1dwvrxz2sjk61bbima9m70qv6gf4h4jx9yysmwnwpinmmqixwdi3"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -31646,24 +31623,22 @@ self: { }) {}; "clckwrks-dot-com" = callPackage - ({ mkDerivation, base, clckwrks, clckwrks-plugin-bugs - , clckwrks-plugin-media, clckwrks-plugin-page - , clckwrks-theme-clckwrks, containers, happstack-server, hsp - , hsx2hs, mtl, network, text, web-plugins + ({ mkDerivation, base, clckwrks, clckwrks-plugin-media + , clckwrks-plugin-page, clckwrks-theme-clckwrks, containers + , happstack-server, hsp, hsx2hs, mtl, network, text, web-plugins }: mkDerivation { pname = "clckwrks-dot-com"; - version = "0.3.9"; - sha256 = "0q1y6lh9215p0c45195k05m774bmxyzm6jsvyncw2qngl77gambh"; + version = "0.3.11"; + sha256 = "0f39ws919qy00090l002k3g8dkcldq7rwayf0wyxg8mfycrnb700"; isLibrary = false; isExecutable = true; buildDepends = [ - base clckwrks clckwrks-plugin-bugs clckwrks-plugin-media - clckwrks-plugin-page clckwrks-theme-clckwrks containers - happstack-server hsp mtl network text web-plugins + base clckwrks clckwrks-plugin-media clckwrks-plugin-page + clckwrks-theme-clckwrks containers happstack-server hsp mtl network + text web-plugins ]; buildTools = [ hsx2hs ]; - jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "clckwrks.com"; license = stdenv.lib.licenses.bsd3; @@ -31731,8 +31706,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-media"; - version = "0.6.9"; - sha256 = "0c72c7k1zpl6sqvb8fl5dr1in6nbr5ni3hj5mvfs54phw0b6qlqs"; + version = "0.6.13"; + sha256 = "0j6ijdq3n011h4d0gxxpjs35kwppp2kyjkg0bjcdw752ppk4y14w"; buildDepends = [ acid-state attoparsec base blaze-html cereal clckwrks containers directory filepath gd happstack-server hsp ixset magic mtl reform @@ -31740,7 +31715,6 @@ self: { web-routes-th ]; buildTools = [ hsx2hs ]; - jailbreak = true; homepage = "http://clckwrks.com/"; description = "media plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -31752,22 +31726,21 @@ self: { , containers, directory, filepath, happstack-hsp, happstack-server , hsp, hsx2hs, ixset, mtl, old-locale, random, reform , reform-happstack, reform-hsp, safecopy, tagsoup, template-haskell - , text, time, utf8-string, uuid, web-plugins, web-routes + , text, time, time-locale-compat, uuid, web-plugins, web-routes , web-routes-happstack, web-routes-th }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.3.6"; - sha256 = "1izz2mgznvwjy3689zw76rzyapq32kq0dvbs7147x6fx5rvsydz7"; + version = "0.3.10"; + sha256 = "0871fz0h3vqwsjrk7pz69nm8gi5ycxnfv1pip8nnf11wfqfcqlgb"; buildDepends = [ acid-state aeson attoparsec base clckwrks containers directory - filepath happstack-hsp happstack-server hsp ixset mtl old-locale - random reform reform-happstack reform-hsp safecopy tagsoup - template-haskell text time utf8-string uuid web-plugins web-routes - web-routes-happstack web-routes-th + filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl + old-locale random reform reform-happstack reform-hsp safecopy + tagsoup template-haskell text time time-locale-compat uuid + web-plugins web-routes web-routes-happstack web-routes-th ]; buildTools = [ hsx2hs ]; - jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "support for CMS/Blogging in clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -31775,14 +31748,18 @@ self: { }) {}; "clckwrks-theme-bootstrap" = callPackage - ({ mkDerivation, base, clckwrks, hsp, hsx2hs, text }: + ({ mkDerivation, base, clckwrks, happstack-authenticate, hsp + , hsx-jmacro, hsx2hs, jmacro, mtl, text, web-plugins + }: mkDerivation { pname = "clckwrks-theme-bootstrap"; - version = "0.3.2"; - sha256 = "0bj1lxrzlhv4l37xb4jbb8h55l3mb2abyapsmlavcj0cld7ba7i2"; - buildDepends = [ base clckwrks hsp text ]; + version = "0.4.0"; + sha256 = "08sdklr7nikngkdcls9dwy0ij4nqrb1n6dnkm3cw73iaifsl6klz"; + buildDepends = [ + base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro + mtl text web-plugins + ]; buildTools = [ hsx2hs ]; - jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "simple bootstrap based template for clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -31790,14 +31767,17 @@ self: { }) {}; "clckwrks-theme-clckwrks" = callPackage - ({ mkDerivation, base, clckwrks, containers, hsp, hsx2hs, text }: + ({ mkDerivation, base, clckwrks, containers, happstack-authenticate + , hsp, hsx2hs, mtl, text, web-plugins + }: mkDerivation { pname = "clckwrks-theme-clckwrks"; - version = "0.4.3"; - sha256 = "0mxb48sirbhvm4vkwwgqxh7x3bahfk34x8i20zcirvh8y6xxp3pm"; - buildDepends = [ base clckwrks containers hsp text ]; - buildTools = [ hsx2hs ]; - jailbreak = true; + version = "0.5.0"; + sha256 = "06szqp7mcak7ra1pzxzmj8hzhm1lmdr7nwjkxk1h8bba5ipcjwhv"; + buildDepends = [ + base clckwrks containers happstack-authenticate hsp hsx2hs mtl text + web-plugins + ]; homepage = "http://www.clckwrks.com/"; description = "simple bootstrap based template for clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -32633,8 +32613,8 @@ self: { }: mkDerivation { pname = "codex"; - version = "0.2.1.4"; - sha256 = "19w3s8f3yn6535lvcwzqkmydqxcdgx1khawax0n894r8lfz3zyj7"; + version = "0.2.1.8"; + sha256 = "0rswdfbrmmg9px0cwah56yy3dj3a4rfc4fsvzknd2vc9wbgi8ndf"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -32878,6 +32858,7 @@ self: { version = "0.3.0.2"; sha256 = "0gbdqn5wrh9711j5hs5ypbd3w7a3mh37g6aadqiq4m5n7jna6phm"; buildDepends = [ base lens linear profunctors ]; + jailbreak = true; homepage = "https://github.com/fumieval/colors"; description = "A type for colors"; license = stdenv.lib.licenses.bsd3; @@ -33116,8 +33097,8 @@ self: { }: mkDerivation { pname = "comonad"; - version = "4.2.5"; - sha256 = "07ilryqgvnkr4vmifg0dncgzmx87i2fbfbgrgc3jn1yz808s7wqf"; + version = "4.2.6"; + sha256 = "1dspysfyjk74di2wvv7xj8r92acqsynjl5gi3sh8m7hqb122m60i"; buildDepends = [ base containers contravariant distributive semigroups tagged transformers transformers-compat @@ -33291,6 +33272,7 @@ self: { test-framework-hunit test-framework-quickcheck2 unordered-containers vector ]; + jailbreak = true; description = "Compositional Data Types on DAGs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -33430,6 +33412,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "composition-extra" = callPackage + ({ mkDerivation, base, contravariant }: + mkDerivation { + pname = "composition-extra"; + version = "0.0.0.2"; + sha256 = "1vicnzxamxhvw824y5dyxf4b303h2jqxs3djc1y33l5ppik8w6fh"; + buildDepends = [ base contravariant ]; + description = "Combinators for unorthodox structure composition"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "compressed" = callPackage ({ mkDerivation, base, comonad, containers, fingertree, hashable , keys, pointed, reducers, semigroupoids, semigroups @@ -33443,6 +33436,7 @@ self: { base comonad containers fingertree hashable keys pointed reducers semigroupoids semigroups unordered-containers ]; + jailbreak = true; homepage = "http://github.com/ekmett/compressed/"; description = "Compressed containers and reducers"; license = stdenv.lib.licenses.bsd3; @@ -33552,6 +33546,7 @@ self: { buildDepends = [ base bifunctors exceptions mtl semigroupoids transformers void ]; + jailbreak = true; description = "Concurrent actions that may fail"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -34007,25 +34002,25 @@ self: { "conduit-combinators" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, chunked-data, conduit, conduit-extra, containers - , directory, hspec, monad-control, mono-traversable, mtl + , directory, filepath, hspec, monad-control, mono-traversable, mtl , mwc-random, primitive, QuickCheck, resourcet, safe, silently - , system-fileio, system-filepath, text, transformers - , transformers-base, unix, unix-compat, vector, void + , text, transformers, transformers-base, unix, unix-compat, vector + , void }: mkDerivation { pname = "conduit-combinators"; - version = "0.3.1"; - sha256 = "14cvd9vs31gbgggy3v6rsg7wckr08msw1s0fwqbyal73krm79f2r"; + version = "1.0.0"; + sha256 = "1ibbj3ipkys26np9d791ynpfzgrw3miclcj02bb0ipmvqngm90hv"; buildDepends = [ base base16-bytestring base64-bytestring bytestring chunked-data - conduit conduit-extra monad-control mono-traversable mwc-random - primitive resourcet system-fileio system-filepath text transformers - transformers-base unix unix-compat vector void + conduit conduit-extra filepath monad-control mono-traversable + mwc-random primitive resourcet text transformers transformers-base + unix unix-compat vector void ]; testDepends = [ base base16-bytestring base64-bytestring bytestring chunked-data - conduit containers directory hspec mono-traversable mtl mwc-random - QuickCheck safe silently system-filepath text transformers vector + conduit containers directory filepath hspec mono-traversable mtl + mwc-random QuickCheck safe silently text transformers vector ]; homepage = "https://github.com/fpco/conduit-combinators"; description = "Commonly used conduit functions, for both chunked and unchunked data"; @@ -34061,10 +34056,8 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.1.7.3"; - revision = "1"; - sha256 = "1pnk8lbblys8wf4a40acxr9p61lhwg2bhf7809fm1y23gf18ll9l"; - editedCabalFile = "d90996b02f7aeb417e54658bab2ecba414221de6cde817d2b18186d09e605091"; + version = "1.1.8"; + sha256 = "15ndbid0272izjd4mdhg0k5yaabwphav6m1amkndb7jjqls499zl"; buildDepends = [ attoparsec base blaze-builder bytestring conduit directory filepath monad-control network primitive process resourcet stm @@ -34181,14 +34174,14 @@ self: { }: mkDerivation { pname = "configifier"; - version = "0.0.3"; - sha256 = "0l86i7rjbqrppfyfc3ypkal3q0rv8ldxp39hii076dwk7kgvjy1z"; + version = "0.0.4"; + sha256 = "0wd32v9a0jmz9v732z2ph8spb2kh89zj48350kvvappfbqdfh09a"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base bytestring case-insensitive containers either mtl - pretty-show regex-easy safe string-conversions text - unordered-containers vector yaml + base bytestring case-insensitive containers either mtl pretty-show + regex-easy safe string-conversions text unordered-containers vector + yaml ]; testDepends = [ aeson aeson-pretty base case-insensitive hspec hspec-discover mtl @@ -36012,6 +36005,7 @@ self: { QuickCheck temporary test-framework test-framework-hunit test-framework-quickcheck2 ]; + jailbreak = true; homepage = "https://github.com/mhwombat/creatur"; description = "Framework for artificial life experiments"; license = stdenv.lib.licenses.bsd3; @@ -36378,7 +36372,6 @@ self: { modular-arithmetic QuickCheck random random-shuffle text transformers ]; - jailbreak = true; homepage = "https://github.com/fosskers/crypto-classical"; description = "An educational tool for studying classical cryptography schemes"; license = stdenv.lib.licenses.bsd3; @@ -37158,9 +37151,9 @@ self: { mkDerivation { pname = "curlhs"; version = "0.1.5"; - revision = "1"; + revision = "2"; sha256 = "0j0r238v3rlk9w7zby7lvh6drzy8d1hah6yzf4dz17hg27wb22ky"; - editedCabalFile = "54dc0c9c8004df751cde41989c305af8e60e6112def522a07bdaf54fd28f27cd"; + editedCabalFile = "0ed3a9937970ee46955e276b3e2fdeff9eff1c3165f3402ed11da009f8a8cd0f"; buildDepends = [ base bytestring rtld time ]; testDepends = [ base hspec ]; homepage = "https://github.com/kkardzis/curlhs"; @@ -37262,6 +37255,7 @@ self: { base bytestring crypto-api DRBG HUnit QuickCheck tagged test-framework test-framework-hunit test-framework-quickcheck2 ]; + jailbreak = true; homepage = "http://github.com/acw/curve25519"; description = "Fast implementations of the curve25519 elliptic curve primitives"; license = stdenv.lib.licenses.bsd3; @@ -38232,6 +38226,7 @@ self: { buildDepends = [ base bifunctors ghc-prim semigroups split template-haskell ]; + jailbreak = true; homepage = "https://github.com/maxpow4h/data-filepath"; description = "A type safe file path data structure"; license = stdenv.lib.licenses.bsd3; @@ -38315,7 +38310,6 @@ self: { ]; description = "Combinators for building fast hashing functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-interval" = callPackage @@ -38471,6 +38465,19 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "data-map-multikey" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "data-map-multikey"; + version = "0.0.1.2"; + sha256 = "04h4k2zn6w8rahzyr80hwf8mvsmzgbqh7aw2138sva874bsk9mkf"; + buildDepends = [ base containers ]; + jailbreak = true; + homepage = "http://github.com/jhickner/data-map-multikey"; + description = "Data.Map with multiple, unique keys"; + license = stdenv.lib.licenses.mit; + }) {}; + "data-memocombinators" = callPackage ({ mkDerivation, array, base, data-inttrie }: mkDerivation { @@ -38919,6 +38926,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "datadog" = callPackage + ({ mkDerivation, aeson, auto-update, base, buffer-builder + , bytestring, lens, lifted-base, monad-control, network, old-locale + , text, time, transformers-base + }: + mkDerivation { + pname = "datadog"; + version = "0.1.0.0"; + sha256 = "19f1lcd73rj2v23cpxjnhby80p3gzlvb92fizw884km26az8y684"; + buildDepends = [ + aeson auto-update base buffer-builder bytestring lens lifted-base + monad-control network old-locale text time transformers-base + ]; + homepage = "https://github.com/iand675/datadog"; + description = "Datadog client for Haskell. Currently only StatsD supported, other support forthcoming."; + license = stdenv.lib.licenses.mit; + }) {}; + "dataenc" = callPackage ({ mkDerivation, array, base, containers }: mkDerivation { @@ -39636,6 +39661,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "decode-utf8" = callPackage + ({ mkDerivation, api-opentheory-unicode, base, opentheory-unicode + }: + mkDerivation { + pname = "decode-utf8"; + version = "1.2"; + sha256 = "10mj871j5gd4d8v8341lr5lr9avxxfph58sjhmd9kgywc10grqph"; + isLibrary = false; + isExecutable = true; + buildDepends = [ api-opentheory-unicode base opentheory-unicode ]; + description = "Decode a UTF-8 byte stream on standard input"; + license = stdenv.lib.licenses.mit; + }) {}; + "decoder-conduit" = callPackage ({ mkDerivation, base, binary, bytestring, conduit }: mkDerivation { @@ -40567,6 +40606,7 @@ self: { lucid-svg mtl split transformers ]; configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams"; description = "hint-based build service for the diagrams graphics EDSL"; license = stdenv.lib.licenses.bsd3; @@ -40589,6 +40629,7 @@ self: { optparse-applicative pango split statestack transformers unix vector ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams"; description = "Cairo backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -40608,6 +40649,7 @@ self: { diagrams-core diagrams-lib lens mtl NumInstances optparse-applicative statestack text ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -40623,8 +40665,8 @@ self: { }: mkDerivation { pname = "diagrams-contrib"; - version = "1.3.0.1"; - sha256 = "07y0kgss06pl4xjb2klj3397dadrgypync8vh3mkh8ss1zvfr1zf"; + version = "1.3.0.2"; + sha256 = "0zpga8x10xfbvicv26lwdcj5fcnsd5wifap7nsrw4dnvhmsmgsyc"; buildDepends = [ base circle-packing colour containers data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -40635,6 +40677,7 @@ 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; @@ -40653,6 +40696,7 @@ self: { adjunctions base containers distributive dual-tree lens linear monoid-extras mtl semigroups unordered-containers ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams"; description = "Core libraries for diagrams EDSL"; license = stdenv.lib.licenses.bsd3; @@ -40694,6 +40738,7 @@ 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; @@ -40735,6 +40780,7 @@ self: { diagrams-lib lens mtl NumInstances optparse-applicative split statestack static-canvas text ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -40761,6 +40807,7 @@ self: { process semigroups system-filepath tagged text transformers unordered-containers ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; license = stdenv.lib.licenses.bsd3; @@ -40821,6 +40868,7 @@ self: { filepath hashable lens monoid-extras mtl semigroups split statestack ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Postscript backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -40857,6 +40905,7 @@ self: { diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl optparse-applicative Rasterific split unix ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Rasterific backend for diagrams"; license = stdenv.lib.licenses.bsd3; @@ -40903,6 +40952,7 @@ self: { monoid-extras mtl old-time optparse-applicative process split text time ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "SVG backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -41195,6 +41245,7 @@ self: { aeson base bytestring digestive-functors HUnit mtl scientific tasty tasty-hunit text ]; + jailbreak = true; homepage = "http://github.com/ocharles/digestive-functors-aeson"; description = "Run digestive-functors forms against JSON"; license = stdenv.lib.licenses.gpl3; @@ -41305,13 +41356,12 @@ self: { }: mkDerivation { pname = "digestive-functors-snap"; - version = "0.6.1.2"; - sha256 = "1rkapw7vgz0wfzm8g1lm8z9b7rzwzhsxsc4i7ilig23x16jw07hl"; + version = "0.6.1.3"; + sha256 = "11ah4rvi5fj9vjjzjw0m60s72qiizy1i4hnj44v88ajf2095aigh"; buildDepends = [ base bytestring containers digestive-functors directory filepath mtl snap-core text ]; - jailbreak = true; homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Snap backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; @@ -41484,6 +41534,7 @@ self: { buildDepends = [ base bytestring containers mtl network utf8-string ]; + jailbreak = true; homepage = "http://dankna.com/software/"; description = "Native implementation of the FastCGI protocol"; license = stdenv.lib.licenses.bsd3; @@ -41701,6 +41752,7 @@ self: { buildDepends = [ adjunctions base comonad distributive keys semigroupoids ]; + jailbreak = true; homepage = "https://github.com/sjoerdvisscher/discrete-space-map"; description = "A discrete space map"; license = stdenv.lib.licenses.bsd3; @@ -42258,20 +42310,21 @@ self: { }) {}; "diversity" = callPackage - ({ mkDerivation, base, containers, fasta, math-functions - , MonadRandom, optparse-applicative, parsec, pipes, random-shuffle - , scientific, split + ({ mkDerivation, base, containers, data-ordlist, fasta + , math-functions, MonadRandom, optparse-applicative, parsec, pipes + , random-shuffle, scientific, split }: mkDerivation { pname = "diversity"; - version = "0.6.0.2"; - sha256 = "17sx8pkwmdksqk2g7jiid335znx03h1crxnhhk66vainif5my5bg"; + version = "0.6.2.1"; + sha256 = "1x1a02452kwrmm566bvrq2gqi8g2y8nmx9szgdmdj5wki07d188l"; isLibrary = true; isExecutable = true; buildDepends = [ - base containers fasta math-functions MonadRandom + base containers data-ordlist fasta math-functions MonadRandom optparse-applicative parsec pipes random-shuffle scientific split ]; + jailbreak = true; homepage = "https://github.com/GregorySchwartz/diversity"; description = "Return the diversity at each position for all sequences in a fasta file"; license = stdenv.lib.licenses.gpl2; @@ -43384,6 +43437,7 @@ self: { base containers MemoTrie QuickCheck test-framework test-framework-quickcheck2 thyme vector vector-space ]; + jailbreak = true; description = "(Fast) Dynamic Time Warping"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -43812,8 +43866,8 @@ self: { ({ mkDerivation, base, directory, filepath, time, unix }: mkDerivation { pname = "easy-file"; - version = "0.2.0"; - sha256 = "0v8skixq15rvyiyky1dcrfl9jrzkbi75vai8np11xy2kg7a8ym2a"; + version = "0.2.1"; + sha256 = "0v75081bx4qzlqy29hh639nzlr7dncwza3qxbzm9njc4jarf31pz"; buildDepends = [ base directory filepath time unix ]; homepage = "http://github.com/kazu-yamamoto/easy-file"; description = "Cross-platform File handling"; @@ -44166,18 +44220,17 @@ self: { }) { inherit (pkgs) libedit;}; "editor-open" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , directory, process, resourcet, temporary, transformers, unix + ({ mkDerivation, base, bytestring, directory, process, temporary + , unix }: mkDerivation { pname = "editor-open"; - version = "0.3.0.0"; - sha256 = "1yfwwd3z3w6yadqqv96n65795gsg418iid35cwgxyf9l1jgk79f1"; + version = "0.4.0.2"; + sha256 = "14vddpdwgjj5fi1g7ampqjsxpig87kiyddjw24kjjlxwava6nn16"; isLibrary = true; isExecutable = true; buildDepends = [ - base bytestring conduit conduit-extra directory process resourcet - temporary transformers unix + base bytestring directory process temporary unix ]; homepage = "https://github.com/pharpend/editor-open"; description = "Open the user's $EDITOR for text input"; @@ -44420,6 +44473,7 @@ self: { sha256 = "14amg4g7gxsi529hz5ilhv8b8nzs8p2ypmxh21hq5x4sfnsl4n07"; buildDepends = [ base bytestring primitive vector ]; testDepends = [ base primitive vector ]; + jailbreak = true; homepage = "https://github.com/osidorkin/haskell-eigen"; description = "Eigen C++ library (linear algebra: matrices, vectors, numerical solvers)"; license = stdenv.lib.licenses.bsd3; @@ -44433,12 +44487,13 @@ self: { }: mkDerivation { pname = "either"; - version = "4.3.3.2"; - sha256 = "05j4mk1qlp72w70cahfw4nm506sl0wmkgffi2f5xazwjgkggw595"; + version = "4.3.4"; + sha256 = "03gc4kl7cgww7y2qyg4y35zb43mamxnm41y4fi156yjgy1x0n7w8"; buildDepends = [ base bifunctors exceptions free monad-control MonadRandom mtl profunctors semigroupoids semigroups transformers transformers-base ]; + jailbreak = true; homepage = "http://github.com/ekmett/either/"; description = "An either monad transformer"; license = stdenv.lib.licenses.bsd3; @@ -44738,6 +44793,7 @@ self: { test-framework-quickcheck2 text transformers union-find unordered-containers ]; + jailbreak = true; homepage = "http://elm-lang.org"; description = "Values to help with elm-package, elm-make, and elm-lang.org."; license = stdenv.lib.licenses.bsd3; @@ -44784,6 +44840,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "elm-init" = callPackage + ({ mkDerivation, base, bytestring, file-embed, json, system-fileio + , system-filepath + }: + mkDerivation { + pname = "elm-init"; + version = "0.1.0.1"; + sha256 = "0y3705aq1h8ip4zsvdvhn7gf3940h3k77nkxdmn84wq12sfx6fnq"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base bytestring file-embed json system-fileio system-filepath + ]; + description = "Set up basic structure for an elm project"; + license = stdenv.lib.licenses.mit; + }) {}; + "elm-make" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, blaze-html , blaze-markup, bytestring, containers, directory, elm-compiler @@ -44924,6 +44997,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "elocrypt" = callPackage + ({ mkDerivation, base, MonadRandom, QuickCheck, random, tasty + , tasty-quickcheck, tasty-th + }: + mkDerivation { + pname = "elocrypt"; + version = "0.3.1"; + sha256 = "1hh1nf0zfijzrz6pp2gq7zh7rv3fwrybm5cfj59wfb0j0dikz8v4"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base MonadRandom random ]; + testDepends = [ + base MonadRandom QuickCheck random tasty tasty-quickcheck tasty-th + ]; + homepage = "https://www.github.com/sgillespie/elocrypt"; + description = "Generate easy-to-remember, hard-to-guess passwords"; + license = "unknown"; + }) {}; + "email" = callPackage ({ mkDerivation, array, base, bytestring, encoding, HaskellNet , hsemail, old-locale, old-time, parsec, process, time @@ -45569,8 +45661,8 @@ self: { ({ mkDerivation, base, semigroupoids }: mkDerivation { pname = "eq"; - version = "4.0.3"; - sha256 = "1n2f20dh1rghv8c43dgdlpgamq61dy8dzh86v4p62a125pgawfn3"; + version = "4.0.4"; + sha256 = "1rdxmkmlgyinpih5p708k18j7qq0rj1c8gv240naa9gbkqg4qbq4"; buildDepends = [ base semigroupoids ]; homepage = "http://github.com/ekmett/eq/"; description = "Leibnizian equality"; @@ -45939,8 +46031,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "2.2"; - sha256 = "1z49za7yid23ffymhycvbqypw3iabc2yn05p0klh7cd7frkj08j2"; + version = "2.2.1"; + sha256 = "0379lqhsj09p6l2hkn6vl6rwmr2jradn6vnann4czxfxpzkc85ir"; buildDepends = [ base conduit monad-logger persistent resourcet tagged text transformers unordered-containers @@ -46238,8 +46330,8 @@ self: { }: mkDerivation { pname = "eventloop"; - version = "0.3.0.0"; - sha256 = "00ysjv6b4rkpy2zz3q2p9i50m3iil7q2frr3xznl4wpjiifhdpx3"; + version = "0.4.1.0"; + sha256 = "0g4qlkvl313mi4immx5i78bdbzg0ld57ld114l8jf42fwk3qd5zd"; buildDepends = [ aeson base bytestring network suspend text timers websockets ]; @@ -46250,16 +46342,17 @@ self: { }) {}; "eventstore" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, cereal, containers - , network, protobuf, random, sodium, text, time, uuid + ({ mkDerivation, aeson, async, attoparsec, base, bytestring, cereal + , containers, network, protobuf, random, sodium, stm, text, time + , unordered-containers, uuid }: mkDerivation { pname = "eventstore"; - version = "0.7.1.0"; - sha256 = "058r7csqf2lzcqskc9fv9lwr1h1glpirblyc51kn0qb16szigpwv"; + version = "0.7.2.0"; + sha256 = "0nwypn0yny60mjxa76dy1rn1hnsc0wvdsmv3kl1kahzsgcvh47r1"; buildDepends = [ - aeson async base bytestring cereal containers network protobuf - random sodium text time uuid + aeson async attoparsec base bytestring cereal containers network + protobuf random sodium stm text time unordered-containers uuid ]; homepage = "http://github.com/YoEight/eventstore"; description = "EventStore TCP Client"; @@ -46327,12 +46420,12 @@ self: { }) {}; "exact-pi" = callPackage - ({ mkDerivation, base, groups }: + ({ mkDerivation, base }: mkDerivation { pname = "exact-pi"; - version = "0.1.1.0"; - sha256 = "1n62886wjnnmdi1bjvw51ka21v882m1yc0m87kzq7kx7knvh1xxx"; - buildDepends = [ base groups ]; + version = "0.2.0.0"; + sha256 = "0az47bzrkhb5xmws1rpp080kvsq2pcxjgrm0wzjqqbcqiy5pi3f9"; + buildDepends = [ base ]; homepage = "https://github.com/dmcclean/exact-pi"; description = "Exact rational multiples of pi (and integer powers of pi)"; license = stdenv.lib.licenses.mit; @@ -46410,6 +46503,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exceptional" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "exceptional"; + version = "0.1.4.1"; + sha256 = "1i9srv7yv0hzs8hkpfsjm2idzw20y6wc7b8sscn2h5cp0cfpfrsh"; + buildDepends = [ base ]; + homepage = "https://github.com/pharpend/exceptional"; + description = "Essentially the Maybe type with error messages"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "exceptions" = callPackage ({ mkDerivation, base, mtl, QuickCheck, stm, test-framework , test-framework-quickcheck2, transformers, transformers-compat @@ -46423,6 +46528,7 @@ self: { base mtl QuickCheck stm test-framework test-framework-quickcheck2 transformers transformers-compat ]; + jailbreak = true; homepage = "http://github.com/ekmett/exceptions/"; description = "Extensible optionally-pure exceptions"; license = stdenv.lib.licenses.bsd3; @@ -46791,6 +46897,7 @@ self: { base HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 test-framework-th ]; + jailbreak = true; homepage = "https://github.com/msakai/extended-reals/"; description = "Extension of real numbers with positive/negative infinities"; license = stdenv.lib.licenses.bsd3; @@ -46835,8 +46942,8 @@ self: { }: mkDerivation { pname = "extensible-effects"; - version = "1.9.1.0"; - sha256 = "1xkddv9k7kqmz4v0pprkzhni8kc2wxkrfv1cqv1lvkjvp8js1zy6"; + version = "1.9.2.2"; + sha256 = "07mhvwxbqzn8bhhcgyc9b7bzbf1axbxsg3ps8b3zsz35r480irc3"; buildDepends = [ base transformers transformers-base type-aligned void ]; @@ -46844,7 +46951,7 @@ self: { base HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 void ]; - homepage = "https://github.com/RobotGymnast/extensible-effects"; + homepage = "https://github.com/suhailshergill/extensible-effects"; description = "An Alternative to Monad Transformers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -47195,17 +47302,18 @@ self: { }) {}; "fasta" = callPackage - ({ mkDerivation, base, containers, foldl, lens, parsec, pipes - , pipes-group, pipes-text, split, text + ({ mkDerivation, base, bytestring, containers, foldl, lens, parsec + , pipes, pipes-bytestring, pipes-group, pipes-text, split, text }: mkDerivation { pname = "fasta"; - version = "0.6.1.1"; - sha256 = "1jwsf0mrr98wn5m4aavdqclv667kkgfqlgjn3dvrgnw8jrywzzd2"; + version = "0.7.0.0"; + sha256 = "04gbp9idml3ng48sqvwqyc70z91ds3a5lsimsqydwwfgc5mnxlx1"; buildDepends = [ - base containers foldl lens parsec pipes pipes-group pipes-text - split text + base bytestring containers foldl lens parsec pipes pipes-bytestring + pipes-group pipes-text split text ]; + jailbreak = true; homepage = "https://github.com/GregorySchwartz/fasta"; description = "A simple, mindless parser for fasta files"; license = stdenv.lib.licenses.gpl2; @@ -47741,6 +47849,7 @@ self: { tasty tasty-golden tasty-quickcheck ]; extraLibraries = [ gcc_s ]; + jailbreak = true; homepage = "http://feldspar.github.com"; description = "Compiler for the Feldspar language"; license = stdenv.lib.licenses.bsd3; @@ -47786,6 +47895,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fen2s" = callPackage + ({ mkDerivation, api-opentheory-unicode, base, opentheory-unicode + }: + mkDerivation { + pname = "fen2s"; + version = "1.2"; + sha256 = "01111rxpdd9pqpjs54krx4z67k3abjglw9zbvn5j97z9zdj5qr81"; + isLibrary = true; + isExecutable = true; + buildDepends = [ api-opentheory-unicode base opentheory-unicode ]; + testDepends = [ api-opentheory-unicode base opentheory-unicode ]; + description = "Converting a chess position from FEN notation to text"; + license = stdenv.lib.licenses.mit; + }) {}; + "fences" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -48199,6 +48323,7 @@ self: { sha256 = "0a5hhgfxh91clkk6c9iipdd0y3wb9y6lx2hhraaaa73b8y83afx4"; buildDepends = [ base ]; testDepends = [ base QuickCheck ]; + jailbreak = true; homepage = "https://github.com/haskell/filepath#readme"; description = "Library for manipulating FilePaths in a cross platform way"; license = stdenv.lib.licenses.bsd3; @@ -48728,8 +48853,8 @@ self: { ({ mkDerivation, aeson, attoparsec, base, bytestring, text }: mkDerivation { pname = "fixedwidth-hs"; - version = "0.3.0.0"; - sha256 = "0azqjz559vrz4l65ylvnlihlfvblycwnbb9w0rq7kpcfb4rj2iic"; + version = "0.4.0.0"; + sha256 = "1j15yx5shwrc60k64z45lyrdif3zg5hfqyvq4b9msn1g9shxldyz"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec base bytestring text ]; @@ -49364,6 +49489,7 @@ self: { base bytestring deepseq directory doctest filepath mtl semigroups ]; configureFlags = [ "-f-test-hlint" ]; + jailbreak = true; homepage = "http://github.com/ekmett/folds"; description = "Beautiful Folding"; license = stdenv.lib.licenses.bsd3; @@ -49482,6 +49608,7 @@ self: { version = "0.4.0.0"; sha256 = "0rmspkl8j1z2n8r6d3dcd573z73yzn6c9r49f57syfvalq0xrzdk"; buildDepends = [ base containers data-default-class lens linear ]; + jailbreak = true; description = "Simple force-directed layout"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -49951,17 +50078,17 @@ self: { }) {}; "free" = callPackage - ({ mkDerivation, base, bifunctors, comonad, distributive, mtl - , prelude-extras, profunctors, semigroupoids, semigroups - , template-haskell, transformers + ({ mkDerivation, base, bifunctors, comonad, distributive + , exceptions, mtl, prelude-extras, profunctors, semigroupoids + , semigroups, template-haskell, transformers }: mkDerivation { pname = "free"; - version = "4.11"; - sha256 = "0k645n6ywy1as2lmw4gv2bmmr9y67pcnar0jhhf9kpaqvl5s2h5y"; + version = "4.12.1"; + sha256 = "0sr8phvrb4ny8j1wzq55rdn8q4br23q4pw2j276npr844825jr9p"; buildDepends = [ - base bifunctors comonad distributive mtl prelude-extras profunctors - semigroupoids semigroups template-haskell transformers + base bifunctors comonad distributive exceptions mtl prelude-extras + profunctors semigroupoids semigroups template-haskell transformers ]; homepage = "http://github.com/ekmett/free/"; description = "Monads for free"; @@ -50074,6 +50201,7 @@ self: { array base bytestring containers free-theorems haskell-src mtl old-locale old-time parsec pretty syb utf8-string xhtml ]; + jailbreak = true; description = "Taming Selective Strictness"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -50247,6 +50375,7 @@ self: { testDepends = [ base QuickCheck test-framework test-framework-quickcheck2 vector ]; + jailbreak = true; homepage = "https://github.com/RaphaelJ/friday"; description = "A functional image processing library for Haskell"; license = stdenv.lib.licenses.gpl3; @@ -52545,24 +52674,17 @@ self: { }) {}; "ghcjs-websockets" = callPackage - ({ mkDerivation, base, base64-bytestring, binary, bytestring - , ghcjs-base, text + ({ mkDerivation, base, base64-bytestring, binary, bytestring, text }: mkDerivation { pname = "ghcjs-websockets"; - version = "0.3.0.0"; - revision = "1"; - sha256 = "09ll2fyfbbflciq6mxhclgypn800qmm7l8dk9gcclphraf2x9jy3"; - editedCabalFile = "cfc25baa01cf440b2f965ca3ee738467f8138adb74f759b9a225717ed183c66a"; - buildDepends = [ - base base64-bytestring binary bytestring ghcjs-base text - ]; - jailbreak = true; + version = "0.3.0.3"; + sha256 = "0fj2ya2irfhpgqz4n0cszs4s7p359k8aywdbmsw9q18w2z9gicz7"; + buildDepends = [ base base64-bytestring binary bytestring text ]; homepage = "http://github.com/mstksg/ghcjs-websockets"; description = "GHCJS interface for the Javascript Websocket API"; license = stdenv.lib.licenses.mit; - broken = true; - }) { ghcjs-base = null;}; + }) {}; "ghclive" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring @@ -52742,8 +52864,8 @@ self: { , git, gnupg1, gnutls, hamlet, hinotify, hslogger, http-client , http-conduit, http-types, IfElse, json, lsof, MissingH , monad-control, monad-logger, mtl, network, network-info - , network-multicast, network-protocol-xmpp, network-uri, old-locale - , openssh, optparse-applicative, path-pieces, perl, persistent + , network-multicast, network-protocol-xmpp, network-uri, openssh + , optparse-applicative, path-pieces, perl, persistent , persistent-sqlite, persistent-template, process, QuickCheck , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi , securemem, shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck @@ -52754,8 +52876,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "5.20150508"; - sha256 = "07p9ifk1h0i9gmg36vdrn6nkp0m46g4pkv1jkjm7ip5bgc76382c"; + version = "5.20150508.1"; + sha256 = "1l2rll066iwbfm2jhcp55wqsx73qksi2mjjj63wzvfng6iyk60ix"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -52765,7 +52887,7 @@ self: { edit-distance esqueleto exceptions fdo-notify feed filepath gnutls hamlet hinotify hslogger http-client http-conduit http-types IfElse json MissingH monad-control monad-logger mtl network network-info - network-multicast network-protocol-xmpp network-uri old-locale + network-multicast network-protocol-xmpp network-uri optparse-applicative path-pieces persistent persistent-sqlite persistent-template process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi securemem shakespeare stm tasty tasty-hunit @@ -53185,6 +53307,7 @@ 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"; @@ -53408,8 +53531,8 @@ self: { }: mkDerivation { pname = "gl"; - version = "0.7.6"; - sha256 = "1wdhp5q84cv59ssygbgy8pd7gm76wkl2zvcbmi83wml1x9a7xmjd"; + version = "0.7.7"; + sha256 = "0lsz8gq3cmkh6s9hhxnr3m95ibra9y63230jyqhwk9wamid2x2pg"; buildDepends = [ base containers directory filepath fixed half hxt split transformers @@ -54856,6 +54979,7 @@ self: { polyparse process temporary text transformers wl-pprint-text ]; testDepends = [ base containers fgl filepath QuickCheck text ]; + jailbreak = true; homepage = "http://projects.haskell.org/graphviz/"; description = "Bindings to Graphviz for graph visualisation"; license = stdenv.lib.licenses.bsd3; @@ -54900,6 +55024,7 @@ self: { testDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; + jailbreak = true; homepage = "https://github.com/mhwombat/gray-extended"; description = "Gray encoding schemes"; license = stdenv.lib.licenses.bsd3; @@ -54963,6 +55088,7 @@ self: { base containers QuickCheck test-framework test-framework-quickcheck2 ]; + jailbreak = true; homepage = "https://github.com/mhwombat/grid"; description = "Tools for working with regular grids (graphs, lattices)"; license = stdenv.lib.licenses.bsd3; @@ -56214,10 +56340,10 @@ self: { ({ mkDerivation, base, directory, gtk3, process, split, text }: mkDerivation { pname = "hXmixer"; - version = "0.2.5.0"; + version = "0.3.0.0"; revision = "2"; - sha256 = "0nl6ylprxc1mz96713n222gy1b3pifkp3mb42v181w1iwms405y5"; - editedCabalFile = "3d625ce1058f3df1e7384767fe12bc7a364a0c3ee075a6033bf8e91cfc5c8acc"; + sha256 = "1n9wlg6inzvnyqkx61bpbgx744q25zpjhkihwbqv6569lgir1h4x"; + editedCabalFile = "ba9345a3146b34d0101920f9efd6af7f435188dd7ae53b50d76cc0851f13014f"; isLibrary = false; isExecutable = true; buildDepends = [ base directory gtk3 process split text ]; @@ -56237,6 +56363,7 @@ self: { testDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; + jailbreak = true; homepage = "https://github.com/mhwombat/haar"; description = "Haar wavelet transforms"; license = stdenv.lib.licenses.bsd3; @@ -57060,24 +57187,6 @@ self: { }) {}; "haddock-library" = callPackage - ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec - , QuickCheck - }: - mkDerivation { - pname = "haddock-library"; - version = "1.1.1"; - sha256 = "0sjnmbmq1pss9ikcqnhvpf57rv78lzi1r99ywpmmvj1gyva2s31m"; - buildDepends = [ base bytestring deepseq ]; - testDepends = [ - base base-compat bytestring deepseq hspec QuickCheck - ]; - jailbreak = true; - homepage = "http://www.haskell.org/haddock/"; - description = "Library exposing some functionality of Haddock"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haddock-library_1_2_0" = callPackage ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec , QuickCheck, transformers }: @@ -57941,23 +58050,23 @@ self: { "hapistrano" = callPackage ({ mkDerivation, base, base-compat, directory, either, filepath - , hspec, mtl, old-locale, process, temporary, time, transformers + , hspec, mtl, old-locale, process, temporary, time + , time-locale-compat, transformers }: mkDerivation { pname = "hapistrano"; - version = "0.2.0.1"; - sha256 = "0k8715gaay1fjwgdsjk3h7vffj0bx217l1yn8wr6sfh4v7azg1f6"; + version = "0.2.0.2"; + sha256 = "1bw37wb7wwf6qagp5q0i9biy5cma6i0yvn7z051da3gnad89iil1"; isLibrary = true; isExecutable = true; buildDepends = [ base base-compat either filepath mtl old-locale process time - transformers + time-locale-compat transformers ]; testDepends = [ base base-compat directory either filepath hspec mtl old-locale - process temporary time transformers + process temporary time time-locale-compat transformers ]; - jailbreak = true; homepage = "https://github.com/stackbuilders/hapistrano"; description = "A deployment library for Haskell applications"; license = stdenv.lib.licenses.mit; @@ -58103,23 +58212,29 @@ self: { }) {}; "happstack-authenticate" = callPackage - ({ mkDerivation, acid-state, aeson, authenticate, base, blaze-html - , bytestring, containers, fb, happstack-server, http-conduit - , http-types, ixset, mtl, pwstore-purehaskell, QuickCheck, reform - , reform-blaze, reform-happstack, safecopy, text, time - , unordered-containers, web-routes, web-routes-happstack + ({ mkDerivation, acid-state, aeson, authenticate, base + , base64-bytestring, boomerang, bytestring, containers + , data-default, filepath, happstack-hsp, happstack-jmacro + , happstack-server, hsp, hsx-jmacro, hsx2hs, http-conduit + , http-types, ixset-typed, jmacro, jwt, lens, mime-mail, mtl + , pwstore-purehaskell, random, safecopy, shakespeare, text, time + , unordered-containers, web-routes, web-routes-boomerang + , web-routes-happstack, web-routes-hsp, web-routes-th }: mkDerivation { pname = "happstack-authenticate"; - version = "0.10.16"; - sha256 = "15r725mmfln8hhk13ypg497xy4x88cxyd4gqmgfg6dpmrmgvdvgw"; + version = "2.1.3"; + sha256 = "19lil82sf441xji7qxvrzdj7vps56wsksgixazzak88azl9li6rj"; buildDepends = [ - acid-state aeson authenticate base blaze-html bytestring containers - fb happstack-server http-conduit http-types ixset mtl - pwstore-purehaskell QuickCheck reform reform-blaze reform-happstack - safecopy text time unordered-containers web-routes - web-routes-happstack + acid-state aeson authenticate base base64-bytestring boomerang + bytestring containers data-default filepath happstack-hsp + happstack-jmacro happstack-server hsp hsx-jmacro hsx2hs + http-conduit http-types ixset-typed jmacro jwt lens mime-mail mtl + pwstore-purehaskell random safecopy shakespeare text time + unordered-containers web-routes web-routes-boomerang + web-routes-happstack web-routes-hsp web-routes-th ]; + jailbreak = true; homepage = "http://www.happstack.com/"; description = "Happstack Authentication Library"; license = stdenv.lib.licenses.bsd3; @@ -58131,13 +58246,12 @@ self: { }: mkDerivation { pname = "happstack-clientsession"; - version = "7.2.7"; - sha256 = "1zwdcnsdq9nb88wf0mc8vh4wkw5kl5r39mmhq098ny3wpvwnp7lx"; + version = "7.3.0"; + sha256 = "1dh6l52mfd6p9y39lr0qax1gs7rxpamy21iwxca7ylbhlqyxfa2g"; buildDepends = [ base bytestring cereal clientsession happstack-server monad-control mtl safecopy transformers-base ]; - jailbreak = true; homepage = "http://happstack.com"; description = "client-side session data"; license = stdenv.lib.licenses.bsd3; @@ -58369,8 +58483,8 @@ self: { }: mkDerivation { pname = "happstack-hsp"; - version = "7.3.4"; - sha256 = "08msr1l0fan2xs1bmczv9cjbik984m2c7hpzqjkgh3mkwwgf1nqf"; + version = "7.3.5"; + sha256 = "0p8hidcdrqj7n4b9a5gbc0ic279wjmxvjacn6b8nzcnridq3mif6"; buildDepends = [ base bytestring happstack-server harp hsp hsx2hs mtl syb text utf8-string @@ -58426,13 +58540,12 @@ self: { }: mkDerivation { pname = "happstack-jmacro"; - version = "7.0.9"; - sha256 = "005naz3zxl01vpz8w4n66dbd8sj94gazpj16rxf3li7zh0pixpsg"; + version = "7.0.10"; + sha256 = "0kzp3dfy2qrd9bwq3lwnxvh1zibw7kib8w8rfqz36k0ywdwq8768"; buildDepends = [ base base64-bytestring bytestring cereal digest happstack-server jmacro text utf8-string wl-pprint-text ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Support for using JMacro with Happstack"; license = stdenv.lib.licenses.bsd3; @@ -58496,10 +58609,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.4.3"; - revision = "1"; - sha256 = "0ij359i1lmxs1gpzl6spli94s0mpp6mbbhjcf4jrbxkpavdg8g73"; - editedCabalFile = "3da7c2f6d5add9d58bc1013cdb0f64bb07aec1ebc88bac40372c4533ed932cf6"; + version = "7.4.4"; + sha256 = "1whyv6rb4b9x9m381fs8938n74dgq7hd9gpznwnlzh76ah2nanjf"; buildDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -58521,8 +58632,8 @@ self: { }: mkDerivation { pname = "happstack-server-tls"; - version = "7.1.5"; - sha256 = "148xryarw10i2smqd136yfa9snfvlxrx62974zvavcn2jfimmcny"; + version = "7.1.6"; + sha256 = "00fmgws8hc0v1lsmxlj478xdbmlpgaz581m9hqw5nfjljg8mi74w"; buildDepends = [ base bytestring extensible-exceptions happstack-server hslogger HsOpenSSL network sendfile time unix @@ -58992,10 +59103,8 @@ self: { }: mkDerivation { pname = "hashable-extras"; - version = "0.2.0.1"; - revision = "1"; - sha256 = "09y2m0wpim7sl7n9qnkr0miwfsbvb1q8lm6shpcq0jxzxknbag7s"; - editedCabalFile = "0797bee08c6190172fa48ce7f2821160efcd26f9fcf2afce08ea64737c1aef7d"; + version = "0.2.1"; + sha256 = "02hzffyns0id9vhaqzax7ijprh1pfb8llrfi67hmji2wrh3nvmml"; buildDepends = [ base bifunctors bytestring generic-deriving hashable transformers ]; @@ -59971,6 +60080,7 @@ self: { base haskell-src-exts pretty syb template-haskell th-orphans uniplate ]; + jailbreak = true; description = "Parse source to template-haskell abstract syntax"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -61067,8 +61177,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "0.7.3"; - sha256 = "0a8wcncqz2k1lj2cad96rg9xi9116q0x209jfbpkcp8sbi3n3rb8"; + version = "0.7.3.1"; + sha256 = "1brd3k6v2irg6myp08gl859v5fmmdm2cgq3wqn367k388p3b58c4"; buildDepends = [ attoparsec base base-prelude either hasql-backend list-t mmorph monad-control mtl resource-pool template-haskell text transformers @@ -61110,8 +61220,8 @@ self: { }: mkDerivation { pname = "hasql-postgres"; - version = "0.10.3"; - sha256 = "12452z4li3b30zw1ar4x2r14q93vx06165g3rdj9s1wxjzsnsr4w"; + version = "0.10.3.1"; + sha256 = "0vdqmn7z9w530f2p5ajgfccr0prr2zcivzww0j574v3n9lbi7q1c"; buildDepends = [ aeson attoparsec base-prelude bytestring either free hashable hashtables hasql-backend list-t loch-th mmorph placeholders @@ -61211,7 +61321,9 @@ self: { mkDerivation { pname = "haste-compiler"; version = "0.4.4.4"; + revision = "1"; sha256 = "19raiciwll7pgc73h2h704yi9wcifcn7s2gxyjrndp6d7kf1ygyy"; + editedCabalFile = "de636e39473869692b1fa1dd6047fc2987b6f63c1403a511aab6bd1dcaa98f6f"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -62198,7 +62310,6 @@ self: { 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; @@ -62458,16 +62569,15 @@ self: { mkDerivation { pname = "heist"; version = "0.14.1"; - revision = "2"; + revision = "3"; sha256 = "11g6nrg9xn9ypwrz7mj3hqjhg45ia1miihh1ydls7vfdm2fqlagy"; - editedCabalFile = "73ce4cfe9090a973644268118b4d765577c2e8ddeeb1ad245d335772f5369d34"; + editedCabalFile = "eac3bf21f0c39ced491fbd542f7a96928c13e8e3672254eb970414168afbaddf"; buildDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist errors filepath hashable map-syntax MonadCatchIO-transformers mtl process random text time transformers unordered-containers vector xmlhtml ]; - jailbreak = true; homepage = "http://snapframework.com/"; description = "An Haskell template system supporting both HTML5 and XML"; license = stdenv.lib.licenses.bsd3; @@ -64213,6 +64323,7 @@ self: { postgresql-simple safe stm text time transformers unordered-containers utf8-string wai wai-lens webcrank-wai wreq ]; + jailbreak = true; homepage = "https://github.com/purefn/hipbot"; description = "A library for building HipChat Bots"; license = stdenv.lib.licenses.bsd3; @@ -66969,25 +67080,26 @@ self: { }) {}; "hpqtypes" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , exceptions, HUnit, lifted-base, monad-control, mtl, postgresql - , QuickCheck, random, resource-pool, test-framework - , test-framework-hunit, text, time, transformers, transformers-base - , vector + ({ mkDerivation, aeson, base, bytestring, containers + , data-default-class, exceptions, HUnit, lifted-base, monad-control + , mtl, postgresql, QuickCheck, random, resource-pool, scientific + , test-framework, test-framework-hunit, text, time, transformers + , transformers-base, unordered-containers, vector }: mkDerivation { pname = "hpqtypes"; - version = "1.4.0"; - sha256 = "0sq4abqqqq71yw2rgpx5xmm7h8fhcj654vbkhb4wlgi1g5kj9kh1"; + version = "1.4.1"; + sha256 = "00ira3zsw9m5vm6pqdgf4v276b7y0crqiwlw3nw99f74xj5qds19"; isLibrary = true; isExecutable = true; buildDepends = [ - base bytestring containers data-default-class exceptions HUnit - lifted-base monad-control mtl QuickCheck random resource-pool - test-framework test-framework-hunit text time transformers - transformers-base vector + aeson base bytestring containers data-default-class exceptions + HUnit lifted-base monad-control mtl QuickCheck random resource-pool + scientific test-framework test-framework-hunit text time + transformers transformers-base unordered-containers vector ]; extraLibraries = [ postgresql ]; + homepage = "https://github.com/scrive/hpqtypes"; description = "Haskell bindings to libpqtypes"; license = stdenv.lib.licenses.bsd3; }) { inherit (pkgs) postgresql;}; @@ -67444,8 +67556,8 @@ self: { ({ mkDerivation, base, haskell-src, hspec }: mkDerivation { pname = "hs-inspector"; - version = "0.5.1.0"; - sha256 = "189ch2hr39n73cgrrg94kx8rqnm4j0s2bsg5xij85bw96w8d44y5"; + version = "0.5.2.0"; + sha256 = "0w9ijl56v0gnx6arz0vvrg740kkhw0vqgkzdvmgf22z9vn99fny8"; buildDepends = [ base haskell-src ]; testDepends = [ base haskell-src hspec ]; description = "Haskell source code analyzer"; @@ -68199,8 +68311,8 @@ self: { }: mkDerivation { pname = "hsc3-server"; - version = "0.9.2"; - sha256 = "1lq4y57d555jb0yi10n4j69h4whwsm5h2k6j4r7f9avds5ahh6s2"; + version = "0.10.0"; + sha256 = "00lw0mj76i2fqhx81d258mqdwqxy8313574i2i8vrjn0mn4bbg2p"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -68867,8 +68979,8 @@ self: { }: mkDerivation { pname = "hslogger"; - version = "1.2.8"; - sha256 = "0i7cji7d23kv8m0vr32ws8zm4ah5vxzb1ykv833m7i6m2g1p4dfy"; + version = "1.2.9"; + sha256 = "0xml1xgkj4hjjxypnjiia7y330a0nh5fcnkwhmnrwsw7hckwqqmy"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -69283,8 +69395,8 @@ self: { }: mkDerivation { pname = "hspec-contrib"; - version = "0.2.1"; - sha256 = "0m7h0bl34qp8yc5pdlk9hn3a9drd11qy7qkqx3lqh2kzr7wbffj0"; + version = "0.2.2"; + sha256 = "1jdiv41kf73x8rygj7439wrgm345qlfbkshhdy8ikrqs1k43grw6"; buildDepends = [ base hspec-core HUnit logging-facade ]; testDepends = [ base hspec hspec-core HUnit logging-facade QuickCheck @@ -69783,7 +69895,7 @@ self: { homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "Haskell binding for Qt Quick"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) qt5;}; + }) { qt5 = null;}; "hsqml-demo-morris" = callPackage ({ mkDerivation, base, containers, deepseq, directory, hsqml @@ -70295,6 +70407,7 @@ self: { base base64-bytestring bytestring containers filepath hxt split zlib ]; + jailbreak = true; description = "Import from the Tiled map editor"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -70325,17 +70438,16 @@ self: { "html-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra - , containers, hspec, HUnit, resourcet, system-filepath - , tagstream-conduit, text, transformers, xml-conduit, xml-types + , containers, hspec, HUnit, resourcet, tagstream-conduit, text + , transformers, xml-conduit, xml-types }: mkDerivation { pname = "html-conduit"; - version = "1.1.1.2"; - sha256 = "116sg4wig2irqqaha257h99ajgqdq6i3jbksvqn1ywqzq96lcx34"; + version = "1.2.0"; + sha256 = "0jj02s71a9fk9mrk7bqms93y1m2zz96jg4rd7jn486ln1w49c43m"; buildDepends = [ base bytestring conduit conduit-extra containers resourcet - system-filepath tagstream-conduit text transformers xml-conduit - xml-types + tagstream-conduit text transformers xml-conduit xml-types ]; testDepends = [ base bytestring containers hspec HUnit xml-conduit @@ -70915,6 +71027,7 @@ self: { buildDepends = [ base bytestring HTTP iconv mime mtl parsec text utf8-string zlib ]; + jailbreak = true; homepage = "http://github.com/achudnov/http-encodings"; description = "A library for encoding and decoding bodies of HTTP messages"; license = stdenv.lib.licenses.bsd3; @@ -71067,8 +71180,8 @@ self: { }: mkDerivation { pname = "http-reverse-proxy"; - version = "0.4.1.2"; - sha256 = "1gggn5l08g7mxbka0h7h8w687y3awbm19395fi6wvis76isyz8wy"; + version = "0.4.1.3"; + sha256 = "1j51a93j0m7waki875k29d7p8s08nk36xhlx8v4bmgpr4v7w92fh"; buildDepends = [ async base blaze-builder bytestring case-insensitive conduit conduit-extra containers data-default-class http-client http-types @@ -71142,7 +71255,6 @@ self: { snap-core snap-server system-fileio system-filepath text transformers unordered-containers ]; - jailbreak = true; homepage = "http://research.operationaldynamics.com/projects/http-streams/"; description = "An HTTP client using io-streams"; license = stdenv.lib.licenses.bsd3; @@ -72257,7 +72369,6 @@ self: { 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; @@ -72529,6 +72640,7 @@ self: { base directory doctest filepath generic-deriving semigroups simple-reflect ]; + jailbreak = true; homepage = "http://github.com/analytics/hyperloglog"; description = "An approximate streaming (constant space) unique object counter"; license = stdenv.lib.licenses.bsd3; @@ -73812,6 +73924,7 @@ self: { base beamable bytestring containers ghc-prim QuickCheck test-framework test-framework-quickcheck2 ]; + jailbreak = true; description = "type classes for incremental updates to data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -74071,8 +74184,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "0.9.1.1"; - sha256 = "0ijc97xj1fz8ahfg0dha5mmbvd5nsb38dlvyvrwq2gpr0j79138r"; + version = "0.9.1.2"; + sha256 = "1nn1vflzb4c8xvvnnxl3ph947nxy5ibyh8bzrp2ddwjb62xm2l00"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -74084,7 +74197,6 @@ self: { base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck tasty-th text vector ]; - jailbreak = true; homepage = "https://github.com/maoe/influxdb-haskell"; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; @@ -74260,6 +74372,7 @@ self: { testDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; + jailbreak = true; homepage = "https://github.com/hvr/int-cast"; description = "Checked conversions between integral types"; license = stdenv.lib.licenses.bsd3; @@ -75052,10 +75165,8 @@ self: { }: mkDerivation { pname = "irc-core"; - version = "1.0"; - revision = "1"; - sha256 = "02ymy4zar7jl14pkhl6f4l42yzb1jv8apdsf86sv39sw9yygs305"; - editedCabalFile = "1fbb89234408096eb458a63862ebd84dcb5b103b93d587548490e9a5dc2d6b31"; + version = "1.1.0.1"; + sha256 = "01n10wcnq4h2wpmxl1rh9zgqayk3mllbz563fg8qw1k01n7q9257"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -75064,7 +75175,6 @@ self: { free haskell-lexer lens network old-locale split stm text time tls transformers vty x509 x509-store x509-system x509-validation ]; - jailbreak = true; homepage = "https://github.com/glguy/irc-core"; description = "An IRC client library and text client"; license = stdenv.lib.licenses.bsd3; @@ -76403,21 +76513,18 @@ self: { }) {}; "jsaddle" = callPackage - ({ mkDerivation, base, glib, gtk3, hslogger, lens, template-haskell - , text, transformers, webkitgtk3, webkitgtk3-javascriptcore + ({ mkDerivation, base, hslogger, lens, template-haskell, text + , transformers }: mkDerivation { pname = "jsaddle"; version = "0.2.0.4"; sha256 = "154f75lhlqixrmwrvzcdvmvmila7cj8hzgch2020yamlwyi4gnk8"; - buildDepends = [ - base lens template-haskell text transformers webkitgtk3 - webkitgtk3-javascriptcore - ]; + buildDepends = [ base lens template-haskell text transformers ]; testDepends = [ - base glib gtk3 hslogger lens template-haskell text transformers - webkitgtk3 webkitgtk3-javascriptcore + base hslogger lens template-haskell text transformers ]; + jailbreak = true; description = "High level interface for webkit-javascriptcore"; license = stdenv.lib.licenses.mit; }) {}; @@ -76527,6 +76634,7 @@ self: { hashable hflags lens mtl pretty process QuickCheck scientific smallcheck text uniplate unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/mgajda/json-autotype"; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; @@ -77122,10 +77230,8 @@ self: { }: mkDerivation { pname = "kan-extensions"; - version = "4.2.1"; - revision = "1"; - sha256 = "0lymh1njw1zh9is6zk3bmr7jylna28632l4pylh6chlxpjvy4zwl"; - editedCabalFile = "c0b1fdbd894c452f2658615bb14db240921b9ba5115f4f232d173ecbdae83ead"; + version = "4.2.2"; + sha256 = "0dqqlrzrhz8di5hp4kby3205inpj2r30bl75zyy24nq4hgans7g5"; buildDepends = [ adjunctions array base comonad containers contravariant distributive free mtl semigroupoids tagged transformers @@ -77393,15 +77499,15 @@ self: { , conduit-extra, containers, data-default, directory, filepath , fsnotify, hspec, http-client, http-conduit, http-reverse-proxy , http-types, HUnit, lifted-base, mtl, network, process, random - , regex-tdfa, stm, system-fileio, system-filepath, tar - , template-haskell, text, time, transformers, unix, unix-compat - , unordered-containers, vector, wai, wai-app-static, wai-extra - , warp, warp-tls, yaml, zlib + , regex-tdfa, stm, system-filepath, tar, template-haskell, text + , time, transformers, unix, unix-compat, unordered-containers + , vector, wai, wai-app-static, wai-extra, warp, warp-tls, yaml + , zlib }: mkDerivation { pname = "keter"; - version = "1.3.10.1"; - sha256 = "1bqy0g0255xqnlk9qn2ykwlszwdliqhcrdm4bjfac1d2lf27vs7r"; + version = "1.4.0"; + sha256 = "1psa0xs0j8s117ifhd2347kiiq0mvprp7kcb933l8977p10nqi9k"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -77409,10 +77515,9 @@ self: { case-insensitive conduit conduit-extra containers data-default directory filepath fsnotify http-client http-conduit http-reverse-proxy http-types lifted-base mtl network process - random regex-tdfa stm system-fileio system-filepath tar - template-haskell text time transformers unix unix-compat - unordered-containers vector wai wai-app-static wai-extra warp - warp-tls yaml zlib + random regex-tdfa stm system-filepath tar template-haskell text + time transformers unix unix-compat unordered-containers vector wai + wai-app-static wai-extra warp warp-tls yaml zlib ]; testDepends = [ base bytestring conduit hspec HUnit transformers unix @@ -77482,6 +77587,7 @@ self: { array base comonad containers free semigroupoids semigroups transformers ]; + jailbreak = true; homepage = "http://github.com/ekmett/keys/"; description = "Keyed functors and containers"; license = stdenv.lib.licenses.bsd3; @@ -78123,6 +78229,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lambda-options" = callPackage + ({ mkDerivation, base, containers, monad-loops, mtl }: + mkDerivation { + pname = "lambda-options"; + version = "0.3.0.0"; + sha256 = "1yma67b7d55lyq81afpw1wrqyjv84cxqbbrw3rr1qvdkx16b9pwa"; + buildDepends = [ base containers monad-loops mtl ]; + jailbreak = true; + homepage = "https://github.com/thomaseding/lambda-options"; + description = "A modern command-line parser for Haskell"; + license = "unknown"; + }) {}; + "lambda-placeholders" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -78280,6 +78399,7 @@ self: { parsec pretty process QuickCheck regex-tdfa show split syb transformers utf8-string vector-space ]; + jailbreak = true; homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot Haskell plugins"; license = "GPL"; @@ -78361,6 +78481,7 @@ self: { base bytestring containers HTTP lambdabot-core mtl network network-uri oeis process regex-tdfa split tagsoup utf8-string ]; + jailbreak = true; homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot reference plugins"; license = "GPL"; @@ -78931,6 +79052,7 @@ self: { version = "0.2"; sha256 = "12yh49zh9wissms20rbvgzw5i5wlc8m1iqwkxg68f52g7mk6clrf"; buildDepends = [ base bifunctors parsers ]; + jailbreak = true; description = "Something similar to Dijkstra's guarded command language"; license = stdenv.lib.licenses.mit; }) {}; @@ -79188,7 +79310,6 @@ self: { array base containers monads-tf pretty transformers utf8-string ]; buildTools = [ alex happy ]; - jailbreak = true; homepage = "http://github.com/bjpop/language-python"; description = "Parsing and pretty printing of Python code"; license = stdenv.lib.licenses.bsd3; @@ -79942,8 +80063,8 @@ self: { }: mkDerivation { pname = "lens"; - version = "4.9.1"; - sha256 = "1ic8zvwl1cz9qppwqp713r7savvnqij0gclpdgxmnnh67l962170"; + version = "4.10"; + sha256 = "01vmb0kknzayv3ppqgrnhnrybxw192gb4hk1kchwiiam7vr6kngd"; buildDepends = [ array base bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim hashable @@ -79970,8 +80091,8 @@ self: { }: mkDerivation { pname = "lens-action"; - version = "0.1.0.1"; - sha256 = "0ycasfbwkqc3v3frjq8kfm1nzj7g1vr25ywzf0irk05gfhxfpvig"; + version = "0.2"; + sha256 = "1paam0sk1p9cgnrg74qc08szipnb5pmp1vzq4pjaki7jrbh8fr74"; buildDepends = [ base comonad contravariant lens mtl profunctors semigroupoids semigroups transformers @@ -80162,6 +80283,7 @@ self: { tasty tasty-quickcheck temporary transformers ]; extraLibraries = [ leveldb ]; + jailbreak = true; homepage = "http://github.com/kim/leveldb-haskell"; description = "Haskell bindings to LevelDB"; license = stdenv.lib.licenses.bsd3; @@ -80441,18 +80563,18 @@ self: { "libconfig" = callPackage ({ mkDerivation, base, binary, c2hs, cereal, cereal-text, config - , deepseq, doctest, doctest-prop, hashable, lens, profunctors, text - , text-binary, transformers, transformers-compat + , deepseq, doctest, doctest-prop, hashable, text, text-binary + , transformers, transformers-compat }: mkDerivation { pname = "libconfig"; version = "0.3.0.0"; sha256 = "152rvfyc6y9waxic9fw4hfb7w5qfcrr23hdv9jlvksg9yw8mnq12"; buildDepends = [ - base binary cereal cereal-text deepseq hashable profunctors text - text-binary transformers transformers-compat + base binary cereal cereal-text deepseq hashable text text-binary + transformers transformers-compat ]; - testDepends = [ base doctest doctest-prop lens ]; + testDepends = [ base doctest doctest-prop ]; buildTools = [ c2hs ]; extraLibraries = [ config ]; homepage = "https://github.com/peddie/libconfig-haskell"; @@ -80510,10 +80632,10 @@ self: { ({ mkDerivation, base, mtl, process }: mkDerivation { pname = "libgit"; - version = "0.3.0"; - sha256 = "0k2287d84s0p73md1mfcyg1qy1l5ncgrvmkaa7607d8zlk9b8ci6"; + version = "0.3.1"; + sha256 = "08km9y2wqz426c5c6r49ar5snl8ss1w7d55yqivksdkwk3fn0k0x"; buildDepends = [ base mtl process ]; - homepage = "http://github.com/vincenthz/hs-tls"; + homepage = "https://github.com/vincenthz/hs-libgit"; description = "Simple Git Wrapper"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -81123,6 +81245,7 @@ self: { testDepends = [ base containers QuickCheck tasty tasty-quickcheck tasty-th ]; + jailbreak = true; homepage = "https://github.com/amosr/limp"; description = "representation of Integer Linear Programs"; license = stdenv.lib.licenses.mit; @@ -81191,8 +81314,8 @@ self: { }: mkDerivation { pname = "linear"; - version = "1.18.0.1"; - sha256 = "06gbrmr7yv9s6la14g22lwqfjyfr0xrlmkrffizy4n01xknmkbig"; + version = "1.18.1"; + sha256 = "1msj1h4mzlxj255lv085f1im7w741x4kl1v5pav4bx6ga886sp3z"; buildDepends = [ adjunctions base binary bytes cereal containers deepseq distributive ghc-prim hashable lens reflection semigroupoids @@ -81203,6 +81326,7 @@ self: { base binary bytestring directory doctest filepath HUnit lens simple-reflect test-framework test-framework-hunit ]; + jailbreak = true; homepage = "http://github.com/ekmett/linear/"; description = "Linear Algebra"; license = stdenv.lib.licenses.bsd3; @@ -81676,6 +81800,7 @@ self: { version = "0.1.0.2"; sha256 = "07bkxv6cmjf75jy31gbzs4nkjlynhkg8qv2idl71xilgzpnalk3c"; buildDepends = [ base QuickCheck ]; + jailbreak = true; description = "Generators for random sequences of English-like nonsense text"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -81984,10 +82109,9 @@ self: { ({ mkDerivation, base, exceptions }: mkDerivation { pname = "listsafe"; - version = "0.1.0.0"; - sha256 = "0mkyhanay0zr318cc01wgp4qxwpqj1wzydqlq7c12hbfrjb1ah4b"; + version = "0.1.0.1"; + sha256 = "0scd74fv6gzl7yi5ssb1z9kwwfyx9p39yqprnzbpvspvxm3k41qs"; buildDepends = [ base exceptions ]; - jailbreak = true; homepage = "https://github.com/ombocomp/listsafe"; description = "Safe wrappers for partial list functions, supporting MonadThrow"; license = stdenv.lib.licenses.asl20; @@ -82621,6 +82745,7 @@ self: { base directory doctest filepath generic-deriving semigroups simple-reflect ]; + jailbreak = true; homepage = "http://github.com/analytics/log-domain/"; description = "Log-domain arithmetic"; license = stdenv.lib.licenses.bsd3; @@ -83282,7 +83407,9 @@ self: { mkDerivation { pname = "lucid"; version = "2.9.2"; + revision = "1"; sha256 = "0r3bzh9pmcqsac5id064jcscn9x2pyfhpazdzvz0666smf4b9jah"; + editedCabalFile = "62ded561d5846fbcbe77e7f491c5fed2f4beddbf5cda336685f3d980df525218"; buildDepends = [ base blaze-builder bytestring containers hashable mtl text transformers unordered-containers @@ -83617,10 +83744,8 @@ self: { }: mkDerivation { pname = "machines"; - version = "0.4.1"; - revision = "1"; - sha256 = "1wripnvpzfdnf7i2aygjyh33cp7srkb5638snwyn700bjbi2j7gb"; - editedCabalFile = "6c00ca655eed187aefe091a7dbfb49c08fc0bf89f7c75f11c0a0dfcae9296df8"; + version = "0.5.1"; + sha256 = "1dyvyy0yv9qha1ff2nfrl304vmmbi4hd881jyj3xpqhgc3zz8ab2"; buildDepends = [ base comonad containers free mtl pointed profunctors semigroups transformers void @@ -83638,13 +83763,13 @@ self: { }: mkDerivation { pname = "machines-directory"; - version = "0.2.0.0"; - sha256 = "1b1jv23ijhm51nggxrncjhz24k4pl4nvj6s9h3jabr0gsnsb8y2v"; + version = "0.2.0.2"; + sha256 = "1z17lj5hyldxf4n9dndnc2jzn0l6c2pk1sd7xyw7fikrf4ykg6ns"; buildDepends = [ base directory filepath machines machines-io transformers ]; jailbreak = true; - homepage = "http://github.com/aloiscochard/machines-io"; + homepage = "http://github.com/aloiscochard/machines-directory"; description = "Directory (system) utilities for the machines library"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -83656,11 +83781,12 @@ self: { }: mkDerivation { pname = "machines-io"; - version = "0.2.0.0"; - sha256 = "0qjbfwyhscjmjbfj709kb9xr5p3yz4v21aq2g4dv1abqwgf85x03"; + version = "0.2.0.2"; + sha256 = "0v7jigl04nb3avqyyjs74fvcj7ialf4d8iw7ym4mzqam0sl74157"; buildDepends = [ base bytestring chunked-data machines transformers ]; + jailbreak = true; homepage = "http://github.com/aloiscochard/machines-io"; description = "IO utilities for the machines library"; license = stdenv.lib.licenses.asl20; @@ -83672,10 +83798,11 @@ self: { }: mkDerivation { pname = "machines-process"; - version = "0.2.0.0"; - sha256 = "028l6hijabrgnn5klm1bv35h2z2qmm1r49bj1bvvaffhn5fdpz7y"; + version = "0.2.0.2"; + sha256 = "1s3hdxk76jv9762lp42wgfq02dz5dn6a73yp986ghpn9hshkhqz2"; buildDepends = [ base chunked-data machines machines-io process ]; - homepage = "http://github.com/aloiscochard/machines-io"; + jailbreak = true; + homepage = "http://github.com/aloiscochard/machines-process"; description = "Process (system) utilities for the machines library"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -83784,6 +83911,7 @@ self: { version = "0.3.0.0"; sha256 = "0bk4a9kw2jxvvz81ppj6qh3kk8cbknnqmg6vvkd0kpn70rcx0hnv"; buildDepends = [ base deepseq profunctors semigroups ]; + jailbreak = true; homepage = "https://github.com/cutsea110/magma"; description = "magma is an algebraic structure consisting a set together with an binary operation"; license = stdenv.lib.licenses.bsd3; @@ -83904,7 +84032,9 @@ self: { mkDerivation { pname = "mainland-pretty"; version = "0.2.7.2"; + revision = "1"; sha256 = "0spn95apa05bx2akcl13kmg0vlyyakca3jx1960ja4z9dm9lwadd"; + editedCabalFile = "e766e6766217250919472995c93de5f98496d1b03d73d498668400408f845ee6"; buildDepends = [ base containers srcloc text ]; homepage = "http://www.cs.drexel.edu/~mainland/"; description = "Pretty printing designed for printing source code"; @@ -84443,8 +84573,8 @@ self: { }: mkDerivation { pname = "mangopay"; - version = "1.11"; - sha256 = "1ipw08z1p4kl9b682jl061g87df8kljxn4cdbfz6fx7g82ab58g3"; + version = "1.11.1"; + sha256 = "0yiy432i4pbq4wd2p52f060qb9wbqqfrw4fv6li0w3ls668pc6pc"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -84463,7 +84593,6 @@ self: { template-haskell text time tls transformers transformers-base unordered-containers utf8-string vector wai warp x509-system ]; - jailbreak = true; homepage = "https://github.com/prowdsponsor/mangopay"; description = "Bindings to the MangoPay API"; license = stdenv.lib.licenses.bsd3; @@ -84529,20 +84658,20 @@ self: { "markdown" = callPackage ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup - , conduit, conduit-extra, containers, data-default, hspec - , system-fileio, system-filepath, text, transformers, xss-sanitize + , conduit, conduit-extra, containers, data-default, directory + , filepath, hspec, text, transformers, xss-sanitize }: mkDerivation { pname = "markdown"; - version = "0.1.13.1"; - sha256 = "0b10cvz5yryzrzfg2j0pikhfxcly7x4hfmjwnwycs4hy97h2rdnq"; + version = "0.1.13.2"; + sha256 = "15aiwjs006g8aajw88rgfvrpcwaxml9hnpz7jrhmdm2pqxfrkb8z"; buildDepends = [ attoparsec base blaze-html blaze-markup conduit conduit-extra containers data-default text transformers xss-sanitize ]; testDepends = [ - base blaze-html conduit conduit-extra containers hspec - system-fileio system-filepath text transformers + base blaze-html conduit conduit-extra containers directory filepath + hspec text transformers ]; homepage = "https://github.com/snoyberg/markdown"; description = "Convert Markdown to HTML, with XSS protection"; @@ -84674,15 +84803,16 @@ self: { }) {}; "markup" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, hspec, lucid, mtl - , text, transformers, urlpath + ({ mkDerivation, base, blaze-html, blaze-markup, comonad, hspec + , lucid, mtl, text, transformers, urlpath }: mkDerivation { pname = "markup"; - version = "0.0.7"; - sha256 = "0rzq7gpwaq7x7q9qcjfyybviydcp0map3ikxbci3379g1hikfan4"; + version = "1.1.0"; + sha256 = "0p037nq20vdbrvn29n3xlaval98fs0lml3y5h0j9fy04x6zcdkz8"; buildDepends = [ - base blaze-html blaze-markup lucid mtl text transformers urlpath + base blaze-html blaze-markup comonad lucid mtl text transformers + urlpath ]; testDepends = [ base hspec ]; description = "Abstraction for markup languages"; @@ -85160,6 +85290,7 @@ self: { buildDepends = [ base containers hakaru hmatrix mwc-random primitive statistics ]; + jailbreak = true; description = "Combinators for MCMC sampling"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -85304,6 +85435,7 @@ self: { base bifunctors doctest hspec hspec-expectations-lens lens QuickCheck semigroups ]; + jailbreak = true; description = "A silly container"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -86605,13 +86737,14 @@ self: { }) {}; "mockery" = callPackage - ({ mkDerivation, base, directory, hspec, temporary }: + ({ mkDerivation, base, directory, hspec, logging-facade, temporary + }: mkDerivation { pname = "mockery"; - version = "0.1.0"; - sha256 = "0jl2561jknvp86anccw6pwy8w95jnxm635jpsal47y90mdjf1qbl"; - buildDepends = [ base directory temporary ]; - testDepends = [ base directory hspec temporary ]; + version = "0.2.0"; + sha256 = "18a9zz964crhjb1xdzv38pwg458lxajhvjpqd08klb1w7kh57hlj"; + buildDepends = [ base directory logging-facade temporary ]; + testDepends = [ base directory hspec logging-facade temporary ]; description = "Support functions for automated testing"; license = stdenv.lib.licenses.mit; }) {}; @@ -87317,6 +87450,7 @@ self: { version = "4.0.0.1"; sha256 = "017cxiavxfw0f08sr0d6m3avla1lplmdj51rxpf1103ripq20r53"; buildDepends = [ base semigroupoids ]; + jailbreak = true; homepage = "http://github.com/ekmett/monad-products"; description = "Monad products"; license = stdenv.lib.licenses.bsd3; @@ -87901,6 +88035,7 @@ self: { version = "0.4.0.0"; sha256 = "0j8lc03zamxplyw5k8kv8qa78j5xkmf581rz4iw2v9qhbx66cfpx"; buildDepends = [ base groups semigroupoids semigroups ]; + jailbreak = true; description = "Various extra monoid-related definitions and utilities"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -87981,6 +88116,7 @@ self: { 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; @@ -88178,18 +88314,21 @@ self: { }) { morfeusz = null;}; "morte" = callPackage - ({ mkDerivation, alex, array, base, binary, deepseq, happy - , lens-family-core, optparse-applicative, pipes, text, transformers + ({ mkDerivation, alex, array, base, binary, containers, deepseq + , happy, http-client, http-client-tls, lens-family-core, managed + , optparse-applicative, pipes, system-fileio, system-filepath, text + , text-format, transformers }: mkDerivation { pname = "morte"; - version = "1.1.2"; - sha256 = "1rz15nmzagwngjd15kd25vnrpz3br23kmjzf558qp61bxlhflybc"; + version = "1.2.0"; + sha256 = "0mr2aaf4r15ysmymqixd592z5w56973qv8ww1d7vkyvj851gfm01"; isLibrary = true; isExecutable = true; buildDepends = [ - array base binary deepseq lens-family-core optparse-applicative - pipes text transformers + array base binary containers deepseq http-client http-client-tls + lens-family-core managed optparse-applicative pipes system-fileio + system-filepath text text-format transformers ]; buildTools = [ alex happy ]; jailbreak = true; @@ -88204,8 +88343,8 @@ self: { }: mkDerivation { pname = "mosaico-lib"; - version = "0.1.0.0"; - sha256 = "0jk1x7jwcx8ackapz91v6apwvwjlhjx36j2pr9ayriyl3s00q0vq"; + version = "0.1.1.0"; + sha256 = "1qcr3l1a422fh5226443dc8p6hvrr9wbhri6mk2pcw7zyfd5xr0b"; buildDepends = [ base base-unicode-symbols colour diagrams-cairo diagrams-core diagrams-gtk diagrams-lib glib gtk JuicyPixels mtl split stm @@ -88411,7 +88550,6 @@ self: { testDepends = [ base bytestring QuickCheck tasty tasty-quickcheck ]; - jailbreak = true; homepage = "http://msgpack.org/"; description = "A Haskell implementation of MessagePack"; license = stdenv.lib.licenses.bsd3; @@ -90104,6 +90242,7 @@ self: { array base bytestring cereal HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text zlib ]; + jailbreak = true; homepage = "https://github.com/acfoltzer/nbt"; description = "A parser/serializer for Minecraft's Named Binary Tag (NBT) data format"; license = stdenv.lib.licenses.bsd3; @@ -90166,11 +90305,10 @@ self: { }: mkDerivation { pname = "neat-interpolation"; - version = "0.2.2"; - sha256 = "0hjv33gpikfiwfhzna35bxiqh62d54776d3ahfb98dxfrjijl20c"; + version = "0.2.2.1"; + sha256 = "00xkhc25s675pcg5s3fiq3l57zsslc0vps44gmwwas4gnz27wdfy"; buildDepends = [ base base-prelude parsec template-haskell ]; testDepends = [ base-prelude HTF ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/neat-interpolation"; description = "A quasiquoter for neat and simple multiline text interpolation"; license = stdenv.lib.licenses.mit; @@ -90354,22 +90492,27 @@ self: { "nested-routes" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring - , clay, composition, constraints, containers, hspec, http-media - , http-types, lucid, mtl, poly-arity, pred-trie, QuickCheck - , quickcheck-instances, regex-compat, semigroups, shakespeare, text - , transformers, wai, wai-extra, wai-util, witherable + , clay, composition, constraints, containers, hspec, hspec-wai + , http-media, http-types, lucid, mtl, poly-arity, pred-trie + , regex-compat, semigroups, shakespeare, text, transformers, wai + , wai-extra, wai-util, warp, witherable }: mkDerivation { pname = "nested-routes"; - version = "1.0.0.1"; - sha256 = "04j11mamfpmc0isnxpss6b8qf21mlfs3ndpb8xbdcbcs9hp0xrrq"; + version = "2.2.0"; + sha256 = "01daa0hhwgpp33sq1nlgnbkmn15ca8861qf6d7j5ypb9f48c6jr1"; buildDepends = [ aeson attoparsec base blaze-html bytestring clay composition constraints containers http-media http-types lucid mtl poly-arity pred-trie regex-compat semigroups shakespeare text transformers wai wai-extra wai-util witherable ]; - testDepends = [ base hspec QuickCheck quickcheck-instances ]; + testDepends = [ + aeson attoparsec base blaze-html bytestring composition constraints + containers hspec hspec-wai http-media http-types lucid mtl + poly-arity pred-trie regex-compat semigroups shakespeare text + transformers wai wai-util warp witherable + ]; description = "Declarative, compositional Wai responses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -90660,6 +90803,7 @@ self: { base containers deepseq parallel profunctors random semigroups time transformers ]; + jailbreak = true; homepage = "http://hub.darcs.net/ertes/netwire"; description = "Functional reactive programming library"; license = stdenv.lib.licenses.bsd3; @@ -90879,17 +91023,16 @@ self: { "network-conduit-tls" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra , connection, cprng-aes, data-default, HUnit, monad-control, mtl - , network, streaming-commons, system-fileio, system-filepath, tls - , transformers + , network, streaming-commons, tls, transformers }: mkDerivation { pname = "network-conduit-tls"; - version = "1.1.2"; - sha256 = "0y3cqvakc676xdzc1hg9afv6aqzvj2pp4pci6cgs4bmm3kc3chfs"; + version = "1.2.0"; + sha256 = "16x334ly9lgrdp9prc9aqjraigqzlgsi9607alaj2pf2qbqa0ipg"; buildDepends = [ base bytestring conduit conduit-extra connection cprng-aes - data-default monad-control network streaming-commons system-fileio - system-filepath tls transformers + data-default monad-control network streaming-commons tls + transformers ]; testDepends = [ base bytestring conduit conduit-extra connection HUnit mtl @@ -91496,8 +91639,8 @@ self: { }: mkDerivation { pname = "newsynth"; - version = "0.2.0.1"; - sha256 = "0xijyxfy62pv7ydfckhai7sdd7rdxlh0vw5wr7ic3z68vc0h6cai"; + version = "0.3.0.1"; + sha256 = "1c65s4nwxzlmix0549chhvm5wj4rvxq92y5kfzd9h11jc4hxl7xs"; isLibrary = true; isExecutable = true; buildDepends = [ base containers fixedprec random superdoc time ]; @@ -91563,11 +91706,10 @@ self: { ({ mkDerivation, base, hspec, HUnit }: mkDerivation { pname = "newtype-generics"; - version = "0.4.0.1"; - sha256 = "1xghpqmpwnjyk944m9nsfzk2jlyqwdvcr5zrmr66d4n650cf1m2b"; + version = "0.4.1"; + sha256 = "1qjzcmx5yj85cvdgglyg9f9ff7k9gvnyrb85n6bjzyh10q9n7vd5"; buildDepends = [ base ]; testDepends = [ base hspec HUnit ]; - jailbreak = true; description = "A typeclass and set of functions for working with newtypes, with generics support"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -91879,6 +92021,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nofib-analyze" = callPackage + ({ mkDerivation, array, base, containers, regex-compat }: + mkDerivation { + pname = "nofib-analyze"; + version = "7.10.1"; + sha256 = "04n056gsxv61igdvdysqkxbsz1a5bvkzfnsbrz03ixjgaqg2whfl"; + isLibrary = false; + isExecutable = true; + buildDepends = [ array base containers regex-compat ]; + homepage = "https://ghc.haskell.org/trac/ghc/wiki/Building/RunningNoFib"; + description = "Parse and compare nofib runs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "noise" = callPackage ({ mkDerivation, base, blaze-markup, blaze-svg, bytestring , containers, cryptohash, HTF, HUnit, network, parsec, QuickCheck @@ -91974,6 +92130,7 @@ self: { version = "0.3.7"; sha256 = "147dbq19n18ixfz6bhx9yi9ppr9j3wnc5dfz8kx5gwihy64b8l1b"; buildDepends = [ base primitive vector ]; + jailbreak = true; description = "Various iterative algorithms for optimization of nonlinear functions"; license = "GPL"; }) {}; @@ -92198,6 +92355,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nth-prime" = callPackage + ({ mkDerivation, base, opentheory-prime, opentheory-primitive }: + mkDerivation { + pname = "nth-prime"; + version = "1.2"; + sha256 = "0iq1658jfywni2yhk3aa1d4bnjjp8c9288bqfqxd8ayv87bvpirh"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base opentheory-prime opentheory-primitive ]; + testDepends = [ base opentheory-prime opentheory-primitive ]; + description = "Computing the nth prime"; + license = stdenv.lib.licenses.mit; + }) {}; + "nthable" = callPackage ({ mkDerivation, base, type-level }: mkDerivation { @@ -93021,7 +93192,9 @@ self: { mkDerivation { pname = "opaleye"; version = "0.3.1.2"; + revision = "2"; sha256 = "01ldghza5l1qgcpvsphajfkq7g09fw0dm4vnya9wbs0hla307av9"; + editedCabalFile = "e428ce92e9fc225610dc60c4248dabb125cdb3dd3bf2cda228672cb01d9c6075"; buildDepends = [ attoparsec base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -93031,7 +93204,6 @@ self: { testDepends = [ base postgresql-simple product-profunctors profunctors time ]; - jailbreak = true; homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; @@ -93160,6 +93332,7 @@ self: { packer vector ]; extraLibraries = [ EGL GLESv2 ]; + jailbreak = true; description = "OpenGL ES 2.0 and 3.0 with EGL 1.4"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -93344,19 +93517,50 @@ self: { }) {}; "opentheory" = callPackage - ({ mkDerivation, base, opentheory-primitive, QuickCheck, random }: + ({ mkDerivation, base, opentheory-primitive, QuickCheck }: mkDerivation { pname = "opentheory"; - version = "1.76"; - sha256 = "011xz72b0sn50pa62h3x9spr1y1prxyyyn3sc8nm1jg0r0rda99c"; - isLibrary = true; - isExecutable = true; - buildDepends = [ base opentheory-primitive QuickCheck random ]; - description = "The Haskell base"; + version = "1.197"; + sha256 = "0z21swy53yd7lwdwkqr5ypp9sz3whq04fl7rdyqln914c554hxw5"; + buildDepends = [ base opentheory-primitive QuickCheck ]; + testDepends = [ base opentheory-primitive QuickCheck ]; + description = "The standard theory library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "opentheory-bits" = callPackage + ({ mkDerivation, base, opentheory, opentheory-primitive + , opentheory-probability, QuickCheck + }: + mkDerivation { + pname = "opentheory-bits"; + version = "1.65"; + sha256 = "0qinq1i4pip8dqq2h5x9xs6bgrv29yngg0xywl03bsymccqvsd8d"; + buildDepends = [ + base opentheory opentheory-primitive opentheory-probability + QuickCheck + ]; + description = "Natural number to bit-list conversions"; + license = stdenv.lib.licenses.mit; + }) {}; + + "opentheory-byte" = callPackage + ({ mkDerivation, base, opentheory, opentheory-bits + , opentheory-primitive, opentheory-probability, QuickCheck + }: + mkDerivation { + pname = "opentheory-byte"; + version = "1.125"; + sha256 = "1lbfd231cznz7sxg1bgkzcp389bg1lyzlnqyw9q1s1c5yxd6a026"; + buildDepends = [ + base opentheory opentheory-bits opentheory-primitive + opentheory-probability QuickCheck + ]; + description = "Bytes"; + license = stdenv.lib.licenses.mit; + }) {}; + "opentheory-char" = callPackage ({ mkDerivation, base, opentheory, opentheory-parser , opentheory-primitive, QuickCheck, random @@ -93371,43 +93575,56 @@ self: { base opentheory opentheory-parser opentheory-primitive QuickCheck random ]; + jailbreak = true; description = "Unicode characters"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "opentheory-divides" = callPackage + ({ mkDerivation, base, opentheory, opentheory-primitive, QuickCheck + }: + mkDerivation { + pname = "opentheory-divides"; + version = "1.57"; + sha256 = "0g9p7y7s6ggs6sslv3bcjb4b7l0hnkx2z2xm23pp19piangpi1m8"; + buildDepends = [ base opentheory opentheory-primitive QuickCheck ]; + testDepends = [ base opentheory opentheory-primitive QuickCheck ]; + description = "The divides relation on natural numbers"; + license = stdenv.lib.licenses.mit; + }) {}; + "opentheory-parser" = callPackage ({ mkDerivation, base, opentheory, opentheory-primitive, QuickCheck - , random }: mkDerivation { pname = "opentheory-parser"; - version = "1.117"; - sha256 = "0wrqah4vq0shh9541lqjdciz6v79qrr5s7711zmpcap51gs9d9bl"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - base opentheory opentheory-primitive QuickCheck random - ]; + version = "1.157"; + sha256 = "1ng772jinni54if2070rqqgvg67bijzvrpyb9y85nqs2r76mhhq2"; + buildDepends = [ base opentheory opentheory-primitive QuickCheck ]; + testDepends = [ base opentheory opentheory-primitive QuickCheck ]; description = "Stream parsers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opentheory-prime" = callPackage - ({ mkDerivation, base, opentheory, opentheory-primitive, QuickCheck - , random + ({ mkDerivation, base, opentheory, opentheory-divides + , opentheory-primitive, opentheory-stream, QuickCheck }: mkDerivation { pname = "opentheory-prime"; - version = "1.23"; - sha256 = "1mg0bhjcml8camgy7hqci4lpd5raw5yii1rsln160hwsalkaxj1c"; - isLibrary = true; - isExecutable = true; + version = "1.81"; + sha256 = "14br1cn9kifm1hm2ak1ydn8pvnr1pwhzgvy25xk41ysan613ix4g"; buildDepends = [ - base opentheory opentheory-primitive QuickCheck random + base opentheory opentheory-divides opentheory-primitive + opentheory-stream QuickCheck ]; - description = "Prime numbers"; + testDepends = [ + base opentheory opentheory-divides opentheory-primitive + opentheory-stream QuickCheck + ]; + description = "Prime natural numbers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -93416,16 +93633,60 @@ self: { ({ mkDerivation, base, QuickCheck, random }: mkDerivation { pname = "opentheory-primitive"; - version = "1.2"; - sha256 = "028z444528v1a35g5iac4fzqgwlxr23ii71sjb264h3v4i4i81d8"; - isLibrary = true; - isExecutable = true; + version = "1.5"; + sha256 = "065xbgdw7c7bfvsns722ri6dxirxlnhxid0vj4628syn64frdgsw"; buildDepends = [ base QuickCheck random ]; + testDepends = [ base QuickCheck random ]; description = "Haskell primitives used by OpenTheory packages"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "opentheory-probability" = callPackage + ({ mkDerivation, base, opentheory, opentheory-primitive, QuickCheck + }: + mkDerivation { + pname = "opentheory-probability"; + version = "1.48"; + sha256 = "05hzdm5f96a4zr16hi5gg6nj9qiglsx66p9f2jss5j5rnw6n4i88"; + buildDepends = [ base opentheory opentheory-primitive QuickCheck ]; + description = "Probability"; + license = stdenv.lib.licenses.mit; + }) {}; + + "opentheory-stream" = callPackage + ({ mkDerivation, base, opentheory, opentheory-primitive, QuickCheck + }: + mkDerivation { + pname = "opentheory-stream"; + version = "1.44"; + sha256 = "0j7vz4y15mv643rcclxmf68a2hlkfrjjk1lwj25fmwsi92l08l3z"; + buildDepends = [ base opentheory opentheory-primitive QuickCheck ]; + description = "Infinite stream types"; + license = stdenv.lib.licenses.mit; + }) {}; + + "opentheory-unicode" = callPackage + ({ mkDerivation, base, opentheory, opentheory-bits, opentheory-byte + , opentheory-parser, opentheory-primitive, opentheory-probability + , QuickCheck + }: + mkDerivation { + pname = "opentheory-unicode"; + version = "1.139"; + sha256 = "0dmd0a1gfw4f1jifgb6vb3n69gsl23m0wsxz68lh5q1pb18byk8d"; + buildDepends = [ + base opentheory opentheory-bits opentheory-byte opentheory-parser + opentheory-primitive opentheory-probability QuickCheck + ]; + testDepends = [ + base opentheory opentheory-bits opentheory-byte opentheory-parser + opentheory-primitive opentheory-probability QuickCheck + ]; + description = "Unicode characters"; + license = stdenv.lib.licenses.mit; + }) {}; + "operational" = callPackage ({ mkDerivation, base, mtl, random }: mkDerivation { @@ -93531,6 +93792,7 @@ self: { ad base distributive linear semigroupoids vector ]; testDepends = [ base directory doctest filepath ]; + jailbreak = true; homepage = "http://github.com/bgamari/optimization"; description = "Numerical optimization"; license = stdenv.lib.licenses.bsd3; @@ -93867,8 +94129,8 @@ self: { }: mkDerivation { pname = "os-release"; - version = "0.2.0"; - sha256 = "1y59n0gsp26xbgdfszc6gnwr75h1bmwc8rvsf9p02gwgvcylxhly"; + version = "0.2.1"; + sha256 = "0ij6i1yp2rmbkr9jhr8i969xajw3kbfx0yb44s51gm3mcjb3g4la"; buildDepends = [ base containers parsec transformers ]; testDepends = [ base containers hlint hspec parsec process regex-compat temporary @@ -93964,6 +94226,7 @@ self: { aeson base binary HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; + jailbreak = true; homepage = "https://github.com/operational-transformation/ot.hs"; description = "Real-time collaborative editing with Operational Transformation"; license = stdenv.lib.licenses.mit; @@ -94099,14 +94362,14 @@ self: { }) {}; "packer" = callPackage - ({ mkDerivation, array, base, bytestring, mtl, tasty, tasty-hunit - , tasty-quickcheck + ({ mkDerivation, base, bytestring, ghc-prim, tasty, tasty-hunit + , tasty-quickcheck, transformers }: mkDerivation { pname = "packer"; - version = "0.1.6"; - sha256 = "02vswdsiinarg405lgzgghlqk4lhw9il8s9v2n1xdhszi510sz1w"; - buildDepends = [ array base bytestring mtl ]; + version = "0.1.8"; + sha256 = "1r7q54a1c6yb0gjd8hvxq1jw2fmgbhf5anfw47nzibs1bywjjgbi"; + buildDepends = [ base bytestring ghc-prim transformers ]; testDepends = [ base bytestring tasty tasty-hunit tasty-quickcheck ]; @@ -94196,8 +94459,8 @@ self: { }: mkDerivation { pname = "pagerduty"; - version = "0.0.3"; - sha256 = "1jqg7k0vr78fv5cv0rn74v8p5jd4wvv6l5nc5xdwh46b7rjwcpj1"; + version = "0.0.3.1"; + sha256 = "1l68a5s4w3x2n1qqmd2g6q7925rpvyqf1b9gisq8nsxs1dknin2r"; buildDepends = [ aeson base bifunctors bytestring bytestring-conversion conduit data-default-class exceptions generics-sop http-client http-types @@ -94277,10 +94540,11 @@ self: { , executable-path, extensible-exceptions, filepath, haddock-library , happy, highlighting-kate, hslua, HTTP, http-client , http-client-tls, http-types, HUnit, JuicyPixels, mtl, network - , network-uri, old-time, pandoc-types, parsec, process, QuickCheck - , random, scientific, SHA, syb, tagsoup, temporary, test-framework - , test-framework-hunit, test-framework-quickcheck2, texmath, text - , time, unordered-containers, vector, xml, yaml, zip-archive, zlib + , network-uri, old-locale, old-time, pandoc-types, parsec, process + , QuickCheck, random, scientific, SHA, syb, tagsoup, temporary + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , texmath, text, time, unordered-containers, vector, xml, yaml + , zip-archive, zlib }: mkDerivation { pname = "pandoc"; @@ -94293,9 +94557,10 @@ self: { blaze-markup bytestring containers data-default deepseq-generics directory extensible-exceptions filepath haddock-library happy highlighting-kate hslua HTTP http-client http-client-tls http-types - JuicyPixels mtl network network-uri old-time pandoc-types parsec - process random scientific SHA syb tagsoup temporary texmath text - time unordered-containers vector xml yaml zip-archive zlib + JuicyPixels mtl network network-uri old-locale old-time + pandoc-types parsec process random scientific SHA syb tagsoup + temporary texmath text time unordered-containers vector xml yaml + zip-archive zlib ]; testDepends = [ ansi-terminal base bytestring containers Diff directory @@ -94304,6 +94569,7 @@ self: { test-framework-quickcheck2 text zip-archive ]; configureFlags = [ "-fhttps" "-fmake-pandoc-man-pages" ]; + jailbreak = true; homepage = "http://johnmacfarlane.net/pandoc"; description = "Conversion between markup formats"; license = "GPL"; @@ -94318,8 +94584,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.7.0.1"; - sha256 = "09ihb3pxw6rk456a0kmgc51fvykz0f499fjd8idns5q1335l18q4"; + version = "0.7.1"; + sha256 = "1kyxr7ld6j60hq1pbrxvv4c7vsvq46fxpky272ywacayhqq1a2qg"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -94360,6 +94626,20 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "pandoc-csv2table" = callPackage + ({ mkDerivation, base, csv, pandoc, pandoc-types, text }: + mkDerivation { + pname = "pandoc-csv2table"; + version = "1.0.0"; + sha256 = "0jr18sa5apvy8jckb5cxvsyr6c2drii6652ipwpd4xkdwrabwp5r"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base csv pandoc pandoc-types text ]; + homepage = "https://github.com/baig/pandoc-csv2table-filter"; + description = "Convert CSV to Pandoc Table Markdown"; + license = stdenv.lib.licenses.mit; + }) {}; + "pandoc-lens" = callPackage ({ mkDerivation, base, containers, lens, pandoc-types }: mkDerivation { @@ -94367,6 +94647,7 @@ self: { 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; @@ -94922,6 +95203,7 @@ self: { template-haskell test-framework test-framework-hunit test-framework-quickcheck2 ]; + jailbreak = true; description = "TH parser generator for splitting bytestring into fixed-width fields"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -95001,7 +95283,9 @@ self: { mkDerivation { pname = "partial-handler"; version = "1.0.0.0"; + revision = "1"; sha256 = "1fmfiw38v77anh20xh5zzqxm2dcryyyismsagn09sc27jdgnnrzl"; + editedCabalFile = "2e1042c8b036ba686e544bfdd1302fd9f66f377010fa05739e7fc000d97fa597"; buildDepends = [ base ]; homepage = "https://github.com/nikita-volkov/partial-handler"; description = "A composable exception handler"; @@ -95167,8 +95451,8 @@ self: { }: mkDerivation { pname = "path"; - version = "0.1.0"; - sha256 = "04yj79cw4l4zkfhmfjc382zjkmimhxm523fgq9ijn4dcj6v5z9yw"; + version = "0.3.0"; + sha256 = "1hxpylnbqn38biggrb18h9kva61hhpwsdsp76jbkn4kcbd3h48r4"; buildDepends = [ base exceptions filepath template-haskell ]; testDepends = [ base hspec HUnit mtl ]; description = "Path"; @@ -96041,8 +96325,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.1.3"; - sha256 = "1rw160icdny4jrbymbck2gah3ca21f49yp6zkkjq8sv5mn83dbxy"; + version = "2.1.5"; + sha256 = "10ln7x3i16a3mxi7j4489rbl50xi3zpjbr49y25hgk0zz7pngnkz"; buildDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers exceptions fast-logger lifted-base @@ -96130,8 +96414,8 @@ self: { }: mkDerivation { pname = "persistent-mongoDB"; - version = "2.1.2.1"; - sha256 = "130jd85h1fl5klfr369kg11w29aavl81d22w1is5dg38s0pzn76a"; + version = "2.1.2.2"; + sha256 = "1ppjywipfp48dsahc4mf8p9vx99937yh552kq7dhalnd1yfcbcik"; buildDepends = [ aeson attoparsec base bson bytestring cereal conduit containers monad-control mongoDB network path-pieces persistent resource-pool @@ -96149,8 +96433,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.1.3"; - sha256 = "1k1sjzxz96z6pgk4012v8p4w6scgm4g2j5fs4sjgsj9azp3b7gwh"; + version = "2.1.3.1"; + sha256 = "1q1h3yrrpw9qzc7myfhwjxn5kxky5bxf918fyllpnprdagf98gd1"; buildDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger mysql mysql-simple persistent resourcet @@ -96191,8 +96475,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.1.5"; - sha256 = "1l12kw2ylxgahy55h302dbbp59mrb3m7xwxvbcvmsnxfi7pcm2si"; + version = "2.1.5.2"; + sha256 = "0csmkyfjyqgi2nl8ihsnj0s4l7kyyddm0q9qpkwwm5gqjrjwk1wc"; buildDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger persistent postgresql-libpq @@ -96279,8 +96563,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.1.4.1"; - sha256 = "0lwm1j7zz1zsfw70p7qwcsjlz0kmiliz2fdb2jgksxglw212nh2h"; + version = "2.1.4.2"; + sha256 = "0g0j8yhbr960lvph49x5knwvx86b7kxlihk8n0xvdqbaq04fgiqa"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -96303,8 +96587,8 @@ self: { }: mkDerivation { pname = "persistent-template"; - version = "2.1.3"; - sha256 = "1b0li6hkir2rnya8ci1wcn77vxmg26i6blmxcvkdgc4jph23ca2p"; + version = "2.1.3.1"; + sha256 = "09qzl0wjf5h8xgs8imq9q25ik8xkn7jgpy9wpmwvsr5wichdfgk5"; buildDepends = [ aeson base bytestring containers ghc-prim monad-control monad-logger path-pieces persistent tagged template-haskell text @@ -96591,6 +96875,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pgstream" = callPackage + ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring + , conduit, conduit-extra, deepseq, mtl, parallel, postgresql-binary + , postgresql-libpq, resource-pool, resourcet, scientific, stm + , stm-chans, stm-conduit, stringsearch, template-haskell, text + , time, transformers, uuid, vector + }: + mkDerivation { + pname = "pgstream"; + version = "0.1.0.3"; + sha256 = "0zbasvi8392pa7ibd0q5072f1i7h0114v46rwhdfczsk1qzlnscg"; + buildDepends = [ + async attoparsec base blaze-builder bytestring conduit + conduit-extra deepseq mtl parallel postgresql-binary + postgresql-libpq resource-pool resourcet scientific stm stm-chans + stm-conduit stringsearch template-haskell text time transformers + uuid vector + ]; + jailbreak = true; + description = "Elsen Accelerated Computing Engine"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "phantom-state" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -96931,7 +97238,9 @@ self: { mkDerivation { pname = "pipes"; version = "4.1.5"; + revision = "1"; sha256 = "1c19am4dr6na9xpx4h7yngvbml0ghc1dbym8988hjhw84gq4lhfx"; + editedCabalFile = "c23c260bff1178965d87e6fc9f7263877b5f2adc4c0e4c1bd59c55971fff9eb4"; buildDepends = [ base mmorph mtl transformers ]; testDepends = [ base mtl QuickCheck test-framework test-framework-quickcheck2 @@ -96947,13 +97256,12 @@ self: { }: mkDerivation { pname = "pipes-aeson"; - version = "0.4.1.2"; - sha256 = "0wacib0wf40bkm6rp2qcsrahc43g89l3icclbrshk8r54dhbazl7"; + version = "0.4.1.3"; + sha256 = "0c95fm4bj4y0dsar4r7n9irvhrcihylcp8k40khm2bqcad14pjjc"; buildDepends = [ aeson attoparsec base bytestring pipes pipes-attoparsec pipes-bytestring pipes-parse transformers ]; - jailbreak = true; homepage = "https://github.com/k0001/pipes-aeson"; description = "Encode and decode JSON streams using Aeson and Pipes"; license = stdenv.lib.licenses.bsd3; @@ -96965,8 +97273,8 @@ self: { }: mkDerivation { pname = "pipes-attoparsec"; - version = "0.5.1.1"; - sha256 = "1ns8s3p6jh4iya71z3j81cqnrfnr4n92kblwgkjlapb23dykl2qz"; + version = "0.5.1.2"; + sha256 = "1qhhy86c89j6ial5y1j2lhgqx225qr33777jk8sxv021gkabsmlv"; buildDepends = [ attoparsec base bytestring pipes pipes-parse text transformers ]; @@ -96974,7 +97282,6 @@ self: { attoparsec base HUnit mmorph pipes pipes-parse tasty tasty-hunit text transformers ]; - jailbreak = true; homepage = "https://github.com/k0001/pipes-attoparsec"; description = "Attoparsec and Pipes integration"; license = stdenv.lib.licenses.bsd3; @@ -97144,6 +97451,7 @@ self: { base bytestring cassava HUnit pipes pipes-bytestring test-framework test-framework-hunit vector ]; + jailbreak = true; description = "Fast, streaming csv parser"; license = stdenv.lib.licenses.mit; }) {}; @@ -97412,12 +97720,11 @@ self: { }: mkDerivation { pname = "pipes-vector"; - version = "0.6"; - sha256 = "0a3q8cj05b6a6iy2gi8mp2qc6xvmwmiqvcd5i3v0kzvi3rv8fh86"; + version = "0.6.1"; + sha256 = "12a50i6fhvri76sr0h3fz9ds5yvnapdyx4n3rcxz2rk543mdvhsp"; buildDepends = [ base monad-primitive pipes primitive transformers vector ]; - jailbreak = true; description = "Various proxies for streaming data into vectors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -97797,12 +98104,19 @@ self: { }) {}; "plugins-multistage" = callPackage - ({ mkDerivation, base, template-haskell, th-desugar }: + ({ mkDerivation, base, directory, ghc, process, QuickCheck, tasty + , tasty-quickcheck, tasty-th, template-haskell, th-desugar + }: mkDerivation { pname = "plugins-multistage"; - version = "0.5.3"; - sha256 = "1k07i4djm5givxwvh1a5h4nlhj8w71n7ajd15av534gnky0njzwc"; - buildDepends = [ base template-haskell th-desugar ]; + version = "0.6"; + sha256 = "02wf1q3c65ki0hgmxsqd7x48p42hh33bx3vyjykkv69jiz1why7y"; + buildDepends = [ + base directory ghc process template-haskell th-desugar + ]; + testDepends = [ + base QuickCheck tasty tasty-quickcheck tasty-th template-haskell + ]; description = "Dynamic linking for embedded DSLs with staged compilation"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -97921,17 +98235,17 @@ self: { "pointed" = callPackage ({ mkDerivation, base, comonad, containers, data-default-class - , kan-extensions, semigroupoids, semigroups, stm, tagged - , transformers, transformers-compat + , hashable, kan-extensions, semigroupoids, semigroups, stm, tagged + , transformers, transformers-compat, unordered-containers }: mkDerivation { pname = "pointed"; - version = "4.2"; - sha256 = "1rwavs2vycb02d04ba8ziywsxbl6k4yqk6pnmzcx5zhnkcfqvmbm"; + version = "4.2.0.1"; + sha256 = "1ysif8x5vlllib3gpdd3i0kdlanlzaw1pm0sjx1qayv19m1ddph7"; buildDepends = [ - base comonad containers data-default-class kan-extensions + base comonad containers data-default-class hashable kan-extensions semigroupoids semigroups stm tagged transformers - transformers-compat + transformers-compat unordered-containers ]; homepage = "http://github.com/ekmett/pointed/"; description = "Pointed and copointed data"; @@ -98712,8 +99026,8 @@ self: { }: mkDerivation { pname = "postgresql-binary"; - version = "0.5.2"; - sha256 = "1fwh3r0f63wcwnw544jdirzsd0brslkqahn8d2iwr2jvpm5f0pqh"; + version = "0.5.2.1"; + sha256 = "02dzsh9d62pgrqsvjmdxyffr4cryk3sd2dg12jmygg94q5dfkm0m"; buildDepends = [ attoparsec base-prelude bytestring loch-th placeholders scientific text time transformers uuid @@ -98722,7 +99036,6 @@ self: { base-prelude bytestring HTF postgresql-libpq QuickCheck quickcheck-instances scientific text time uuid ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/postgresql-binary"; description = "Encoders and decoders for the PostgreSQL's binary format"; license = stdenv.lib.licenses.mit; @@ -98787,6 +99100,7 @@ self: { old-locale postgresql-simple process text time transformers unix unordered-containers vector ]; + jailbreak = true; description = "An ORM (Object Relational Mapping) and migrations DSL for PostgreSQL"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -98900,19 +99214,19 @@ self: { }) {}; "postgresql-typed" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , cryptohash, haskell-src-meta, network, old-locale, parsec - , postgresql-binary, scientific, template-haskell, text, time - , utf8-string, uuid + ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring + , containers, cryptohash, haskell-src-meta, network, old-locale + , parsec, postgresql-binary, scientific, template-haskell, text + , time, utf8-string, uuid }: mkDerivation { pname = "postgresql-typed"; - version = "0.3.2"; - sha256 = "0q1k5sj6q9c4mssf3z9m69fqyn9z8iz15v2b0rcc7c8x1za1kq2i"; + version = "0.3.3"; + sha256 = "1fj02d0v9bpdgmzp2xqmz72flhl6pyw7v03kqmwyjhkp9afd4dsh"; buildDepends = [ - array base binary bytestring containers cryptohash haskell-src-meta - network old-locale parsec postgresql-binary scientific - template-haskell text time utf8-string uuid + aeson array attoparsec base binary bytestring containers cryptohash + haskell-src-meta network old-locale parsec postgresql-binary + scientific template-haskell text time utf8-string uuid ]; testDepends = [ base network time ]; jailbreak = true; @@ -99151,8 +99465,8 @@ self: { }: mkDerivation { pname = "pred-trie"; - version = "0.1"; - sha256 = "1dkmpdqxq919555hc8hx5qf070ginynbzb7lnmir1lnidvqi5b8i"; + version = "0.2.0"; + sha256 = "11d0673jhz8vb271wf0qsl8a480hzrghly07iqcmckybalr17ibs"; buildDepends = [ base semigroups ]; testDepends = [ base hspec QuickCheck quickcheck-instances ]; description = "Predicative tries"; @@ -99415,6 +99729,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "presto-hdbc" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, convertible + , either, either-unwrap, errors, HDBC, HTTP, http-streams + , io-streams, lens, mtl, network-uri, safe, scientific, text + , transformers + }: + mkDerivation { + pname = "presto-hdbc"; + version = "0.1.0.2"; + sha256 = "1la8v44lw9hpfv24mh3pj9x92pkcf0v6j3w52dg765j54zz1v76y"; + buildDepends = [ + aeson aeson-pretty base bytestring convertible either either-unwrap + errors HDBC HTTP http-streams io-streams lens mtl network-uri safe + scientific text transformers + ]; + jailbreak = true; + description = "An HDBC connector for Presto"; + license = stdenv.lib.licenses.asl20; + }) {}; + "prettify" = callPackage ({ mkDerivation, base, containers, semigroups }: mkDerivation { @@ -99589,21 +99923,6 @@ self: { }) {}; "primitive" = callPackage - ({ mkDerivation, base, ghc-prim }: - mkDerivation { - pname = "primitive"; - version = "0.5.4.0"; - revision = "1"; - sha256 = "05gdgj383xdrdkhxh26imlvs8ji0z28ny38ms9snpvv5i8l2lg10"; - editedCabalFile = "df0a129c168c61a06a02123898de081b1d0b254cce6d7ab24b8f43ec37baef9e"; - buildDepends = [ base ghc-prim ]; - testDepends = [ base ghc-prim ]; - homepage = "https://github.com/haskell/primitive"; - description = "Primitive memory-related operations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "primitive_0_6" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "primitive"; @@ -99879,9 +100198,9 @@ self: { mkDerivation { pname = "process-listlike"; version = "1.0"; - revision = "1"; + revision = "3"; sha256 = "0yaz90pfpx9kahwbvbvl2ir62imxxsq7v72i67ac2zv3585c427r"; - editedCabalFile = "72b239b889868394c365985197588cda0ec8aac03d4796a9e212b4044c966f16"; + editedCabalFile = "75f8f07195965b0a2ca36725792b095896801d4e4133c7c67a72600bdbeb63b1"; buildDepends = [ base bytestring deepseq ListLike process text ]; jailbreak = true; homepage = "https://github.com/ddssff/process-listlike"; @@ -99937,8 +100256,8 @@ self: { }: mkDerivation { pname = "process-streaming"; - version = "0.7.2.0"; - sha256 = "1wlrinx5v0k26jdkmbb8k313p3nyjrn2r9nag3hryl1wfdkbr1bl"; + version = "0.7.2.1"; + sha256 = "118ig98xi2jdh966483d37wx5wa5mcm7qyfnrb1xszw2nqcivvvx"; buildDepends = [ base bifunctors bytestring conceit containers contravariant foldl free pipes pipes-bytestring pipes-concurrency pipes-parse @@ -100055,9 +100374,9 @@ self: { mkDerivation { pname = "product-profunctors"; version = "0.6.1"; - revision = "1"; + revision = "2"; sha256 = "0phwjngndgsggw2f74k6q43cnnw5w4nvfrfrmkwyz6hgah2zv562"; - editedCabalFile = "98cd3c6ac3f78d4097bd1b8c7c1782b85bd05497938ce86d70cb0eb27b09359c"; + editedCabalFile = "ac8ac15500d9a5f4c678489d77c6abea03b24a704ceb235eecf9f49ef08da757"; buildDepends = [ base contravariant profunctors template-haskell ]; testDepends = [ base profunctors ]; homepage = "https://github.com/tomjaguarpaw/product-profunctors"; @@ -100132,18 +100451,13 @@ self: { }) {}; "profunctors" = callPackage - ({ mkDerivation, base, comonad, distributive, semigroupoids, tagged - , transformers + ({ mkDerivation, base, comonad, distributive, tagged, transformers }: mkDerivation { pname = "profunctors"; - version = "4.4.1"; - revision = "1"; - sha256 = "1x5q4bc18cyxajv39xxbxzgpq75xzrhx450n8rc3p8gir92hx645"; - editedCabalFile = "72f05aa59d302bcd53277bdff17e920bc0128e5787b2f8edf584c517cd084db7"; - buildDepends = [ - base comonad distributive semigroupoids tagged transformers - ]; + version = "5.0.0.1"; + sha256 = "0p9an9j387rhv6fzbvwaz91m9g5f69lhx2jr23riygprjfn8xs99"; + buildDepends = [ base comonad distributive tagged transformers ]; homepage = "http://github.com/ekmett/profunctors/"; description = "Profunctors"; license = stdenv.lib.licenses.bsd3; @@ -100230,20 +100544,20 @@ self: { "project-template" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, conduit - , conduit-extra, containers, hspec, mtl, QuickCheck, resourcet - , system-fileio, system-filepath, text, transformers + , conduit-extra, containers, directory, filepath, hspec, mtl + , QuickCheck, resourcet, text, transformers }: mkDerivation { pname = "project-template"; - version = "0.1.4.2"; - sha256 = "10n23s6g7fv0l42hsb804z0qqcyxqw32kwzg1f0w3c6gka844akr"; + version = "0.2.0"; + sha256 = "0433a2cmximz2jbg0m97h80pvmb7vafjvw3qzjpsncavg38xgaxf"; buildDepends = [ base base64-bytestring bytestring conduit conduit-extra containers - mtl resourcet system-fileio system-filepath text transformers + directory filepath mtl resourcet text transformers ]; testDepends = [ base base64-bytestring bytestring conduit containers hspec - QuickCheck resourcet system-filepath text transformers + QuickCheck resourcet text transformers ]; homepage = "https://github.com/fpco/haskell-ide"; description = "Specify Haskell project templates and generate files"; @@ -100344,20 +100658,20 @@ self: { "propellor" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers - , directory, filepath, hslogger, IfElse, MissingH - , MonadCatchIO-transformers, mtl, network, process, QuickCheck - , time, unix, unix-compat + , directory, exceptions, filepath, hslogger, IfElse, MissingH, mtl + , network, process, QuickCheck, time, transformers, unix + , unix-compat }: mkDerivation { pname = "propellor"; - version = "2.3.0"; - sha256 = "0k8yi4dh00985gb1k3l8saaf8h9q1jbw2mcr1svn7xdhnd16r1y1"; + version = "2.4.0"; + sha256 = "1l2zhj12jwsavljx0r6qmz44w7k5bwckwg2wcz38qd6km4wy3ppw"; isLibrary = true; isExecutable = true; buildDepends = [ - ansi-terminal async base bytestring containers directory filepath - hslogger IfElse MissingH MonadCatchIO-transformers mtl network - process QuickCheck time unix unix-compat + ansi-terminal async base bytestring containers directory exceptions + filepath hslogger IfElse MissingH mtl network process QuickCheck + time transformers unix unix-compat ]; homepage = "https://propellor.branchable.com/"; description = "property-based host configuration management in haskell"; @@ -100575,8 +100889,8 @@ self: { }: mkDerivation { pname = "proton-haskell"; - version = "0.4"; - sha256 = "1drg50ffp9q5hqdn6h46i45y4crmb1d6j6238qdnmrdmbj1pk4zw"; + version = "0.6"; + sha256 = "0g73lspx5rk8d6axn229im7r8ch5d7afn8fb51haazaqmcw906qg"; buildDepends = [ base containers directory filepath ]; testDepends = [ base containers directory filepath HUnit test-framework @@ -102096,6 +102410,7 @@ self: { sha256 = "1v94dd9y38ayslii6bjg720dbrjg37wwm13v08g9clbazf122901"; buildDepends = [ base bytestring lens process text ]; testDepends = [ base bytestring lens process QuickCheck text ]; + jailbreak = true; homepage = "https://www.github.com/massysett/rainbow"; description = "Print text to terminal with colors and effects"; license = stdenv.lib.licenses.bsd3; @@ -102546,6 +102861,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; }) {}; @@ -102645,7 +102961,6 @@ self: { sha256 = "08f7cvipcdcn6s2rgf0n65g67fhkx36841dihzzsfalglfr9gn6m"; buildDepends = [ base regex-applicative smaoin text-position ]; testDepends = [ base QuickCheck regex-applicative smaoin ]; - jailbreak = true; homepage = "http://rel4tion.org/projects/razom-text-util/"; description = "Common text/parsing tools for Razom language packages"; license = stdenv.lib.licenses.publicDomain; @@ -103018,10 +103333,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "read-bounded"; - version = "0.1.0.0"; - sha256 = "1nvfkxjxn38rpplvg48sgx671fmfxj80dy2a77pjvm3c31q0hhqm"; + version = "0.1.1.0"; + sha256 = "19ynv5vxa5dnphv9kby0nfvq3wn6qpk7n5qv1x22ipkfxnxdw47k"; buildDepends = [ base ]; jailbreak = true; + homepage = "https://github.com/thomaseding/read-bounded"; description = "Class for reading bounded values"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -103384,6 +103700,7 @@ self: { pointed semigroupoids semigroups text transformers unordered-containers ]; + jailbreak = true; homepage = "http://github.com/ekmett/reducers/"; description = "Semigroups, specialized containers and a general map/reduce framework"; license = stdenv.lib.licenses.bsd3; @@ -103476,6 +103793,7 @@ self: { test-framework-hunit test-framework-quickcheck2 test-framework-th unordered-containers ]; + jailbreak = true; homepage = "https://github.com/RobotGymnast/refcount"; description = "Container with element counts"; license = stdenv.lib.licenses.mit; @@ -103548,8 +103866,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "reflection"; - version = "1.5.1.2"; - sha256 = "09fs42gmhdgfag7k4gm19l63sz5b1sxw6s3hgszpcnnsbv1g9ad4"; + version = "1.5.2.1"; + sha256 = "1pynmkhdxq5vxbjs7rxiv3mg8avidxg4cnghanp75846s4s6ggg5"; buildDepends = [ base template-haskell ]; homepage = "http://github.com/ekmett/reflection"; description = "Reifies arbitrary terms into types that can be reflected back into terms"; @@ -103618,6 +103936,7 @@ self: { semigroups text these time transformers webkitgtk3 webkitgtk3-javascriptcore ]; + jailbreak = true; description = "Glitch-free Functional Reactive Web Apps"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -103626,8 +103945,8 @@ self: { ({ mkDerivation, base, containers, mtl, text }: mkDerivation { pname = "reform"; - version = "0.2.6"; - sha256 = "02izf5hhhwc27lza0w93n3n5sdg1f0h6njgz3vw4bv71114wfcj7"; + version = "0.2.7"; + sha256 = "0jjbcc88ffv6nqj0jbgb54bin0k5hh4w1i44xh3vdv00s7aj3abm"; buildDepends = [ base containers mtl text ]; homepage = "http://www.happstack.com/"; description = "reform is an HTML form generation and validation library"; @@ -103638,8 +103957,8 @@ self: { ({ mkDerivation, base, blaze-html, blaze-markup, reform, text }: mkDerivation { pname = "reform-blaze"; - version = "0.2.3"; - sha256 = "1bbmmvrprbig4ic1vq8jjhb4nxxkn0a4dxxaa62i02ms3wb1vsf5"; + version = "0.2.4"; + sha256 = "124hvgjhb2x6769qnwwjw30qmramh54pmggpqmj0dc8m473psfjy"; buildDepends = [ base blaze-html blaze-markup reform text ]; homepage = "http://www.happstack.com/"; description = "Add support for using blaze-html with Reform"; @@ -103653,6 +103972,7 @@ 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; @@ -103664,24 +103984,23 @@ self: { }: mkDerivation { pname = "reform-happstack"; - version = "0.2.4"; - sha256 = "0igyvf8a0dd8376khzsssr6bjp3m224rrynm1ws4slxq9h3dklqn"; + version = "0.2.5"; + sha256 = "12asmp1bklk33rpbhwhpbvmnkssjll92l47qxywibnpdf0zc6xsc"; buildDepends = [ base bytestring happstack-server mtl random reform text utf8-string ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Happstack support for reform"; license = stdenv.lib.licenses.bsd3; }) {}; "reform-hsp" = callPackage - ({ mkDerivation, base, hsp, reform, text }: + ({ mkDerivation, base, hsp, hsx2hs, reform, text }: mkDerivation { pname = "reform-hsp"; - version = "0.2.5"; - sha256 = "0fq4g2v22nsqby72sasr15hs02rl97n8j85v9lgirw1jk2mbsqar"; - buildDepends = [ base hsp reform text ]; + version = "0.2.6"; + sha256 = "0aigsrax7s5ys0w2kd52jqi3453q81f4yp6c1s84a383yqndyq1j"; + buildDepends = [ base hsp hsx2hs reform text ]; homepage = "http://www.happstack.com/"; description = "Add support for using HSP with Reform"; license = stdenv.lib.licenses.bsd3; @@ -104597,7 +104916,6 @@ self: { 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; @@ -104702,7 +105020,6 @@ self: { template-haskell vector ]; extraLibraries = [ llvm ]; - jailbreak = true; homepage = "http://repa.ouroborus.net"; description = "Examples using the Repa array library"; license = stdenv.lib.licenses.bsd3; @@ -104867,6 +105184,7 @@ self: { functor-monadic ListLike listsafe monad-loops mtl numericpeano parsec semigroupoids system-filepath text transformers ]; + jailbreak = true; homepage = "https://github.com/ombocomp/repl-toolkit"; description = "Toolkit for quickly whipping up config files and command-line interfaces"; license = stdenv.lib.licenses.asl20; @@ -105559,6 +105877,7 @@ self: { base data-default-class exceptions hspec HUnit QuickCheck time transformers ]; + jailbreak = true; homepage = "http://github.com/Soostone/retry"; description = "Retry combinators for monadic actions that may fail"; license = stdenv.lib.licenses.bsd3; @@ -105964,6 +106283,7 @@ self: { testDepends = [ base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck ]; + jailbreak = true; description = "Haskell implementation of the RNCryptor file format"; license = stdenv.lib.licenses.mit; }) {}; @@ -105998,8 +106318,8 @@ self: { }: mkDerivation { pname = "robots-txt"; - version = "0.4.1.2"; - sha256 = "0lqws8c8qjw7gakyp5ridp1khjhvv0na44rakbh6nhycykvnnfkv"; + version = "0.4.1.3"; + sha256 = "051ibkbhqlpimajj8gl0m468rs6qhlgs15f5bcrhlngfs20jbfkq"; buildDepends = [ attoparsec base bytestring old-locale time ]; testDepends = [ attoparsec base bytestring directory heredoc hspec QuickCheck @@ -107126,7 +107446,7 @@ self: { "saltine-quickcheck" = callPackage ({ mkDerivation, base, bytestring, bytestring-arbitrary, hex - , QuickCheck, saltine, libsodium, tasty, tasty-quickcheck + , QuickCheck, saltine, sodium, tasty, tasty-quickcheck }: mkDerivation { pname = "saltine-quickcheck"; @@ -107138,12 +107458,12 @@ self: { testDepends = [ base bytestring-arbitrary QuickCheck saltine tasty tasty-quickcheck ]; - extraLibraries = [ libsodium ]; + extraLibraries = [ sodium ]; jailbreak = true; homepage = "https://github.com/tsuraan/saltine-quickcheck"; description = "Quickcheck implementations for some NaCl data"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) libsodium;}; + }) { sodium = null;}; "salvia" = callPackage ({ mkDerivation, base, bytestring, containers, directory, fclabels @@ -107791,6 +108111,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "schedule-planner" = callPackage + ({ mkDerivation, base, containers, happstack-lite, json, mtl + , options, transformers + }: + mkDerivation { + pname = "schedule-planner"; + version = "0.1.0.2"; + sha256 = "0xpn5jgdbzkwysnjlzmvnrvk55wsffx9zbxd6hi1av4nbqz2269r"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base containers happstack-lite json mtl options transformers + ]; + description = "Find the ideal lesson layout"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "schedyield" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -107869,6 +108206,7 @@ self: { aeson base bytestring directory filepath process scholdoc scholdoc-types temporary text yaml ]; + jailbreak = true; homepage = "http://scholdoc.scholarlymarkdown.com"; description = "Scholdoc fork of pandoc-citeproc"; license = stdenv.lib.licenses.bsd3; @@ -108514,7 +108852,6 @@ self: { base primitive QuickCheck storable-complex test-framework test-framework-quickcheck2 vector ]; - jailbreak = true; homepage = "https://github.com/adamwalker/sdr"; description = "A software defined radio library"; license = stdenv.lib.licenses.bsd3; @@ -108569,6 +108906,7 @@ self: { base ghc-prim profunctors semigroupoids tagged transformers ]; testDepends = [ base directory doctest filepath ]; + jailbreak = true; homepage = "http://github.com/ekmett/search/"; description = "Infinite search in finite time with Hilbert's epsilon"; license = stdenv.lib.licenses.bsd3; @@ -108859,34 +109197,32 @@ self: { }) {}; "semigroupoid-extras" = callPackage - ({ mkDerivation, base, semigroupoids }: + ({ mkDerivation, base, profunctors, semigroupoids }: mkDerivation { pname = "semigroupoid-extras"; - version = "4.0"; - sha256 = "07aa7z4nywcrp9msq83b1pcmryl25yxha89sn5vwlgq40cibcm3g"; - buildDepends = [ base semigroupoids ]; + version = "5"; + sha256 = "0ciq1jnc0d9d8jph9103v04vphiz7xqa69a8f4dmmcf3bjsk6bhh"; + buildDepends = [ base profunctors semigroupoids ]; homepage = "http://github.com/ekmett/semigroupoid-extras"; - description = "This package has been absorbed into semigroupoids 4.0"; + description = "Semigroupoids that depend on PolyKinds"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "semigroupoids" = callPackage - ({ mkDerivation, base, comonad, containers, contravariant - , distributive, doctest, Glob, semigroups, transformers - , transformers-compat + ({ mkDerivation, base, base-orphans, bifunctors, comonad + , containers, contravariant, directory, distributive, doctest + , filepath, semigroups, tagged, transformers, transformers-compat }: mkDerivation { pname = "semigroupoids"; - version = "4.3"; - revision = "1"; - sha256 = "1qn0rffc1zskk6f34pxrp96iarxgp36l2404rs6sz9khl1hh58sf"; - editedCabalFile = "564644e3fb93fa01f5c45772256a980baa07275a763f1015859816942ab210b3"; + version = "5.0.0.1"; + sha256 = "0njand5df3ri7pr0jd12z7dfvcfw6xdm7z5ap0b4xcpy47ndcw8l"; buildDepends = [ - base comonad containers contravariant distributive semigroups - transformers transformers-compat + base base-orphans bifunctors comonad containers contravariant + distributive semigroups tagged transformers transformers-compat ]; - testDepends = [ base doctest Glob ]; + testDepends = [ base directory doctest filepath ]; homepage = "http://github.com/ekmett/semigroupoids"; description = "Semigroupoids: Category sans id"; license = stdenv.lib.licenses.bsd3; @@ -109218,8 +109554,8 @@ self: { ({ mkDerivation, base, containers, transformers }: mkDerivation { pname = "sequence"; - version = "0.9.6"; - sha256 = "0qn224369bwmdcq3z1j8rpcw4mcvgyh1sp427dx0yncp9d0srqcs"; + version = "0.9.7"; + sha256 = "1q2v51dxi21jbq7ll7g1x85pxxz7bywgsqrwfrgzf0p96da05ps7"; buildDepends = [ base containers transformers ]; homepage = "https://github.com/atzeus/sequence"; description = "A type class for sequences and various sequence data structures"; @@ -110124,22 +110460,21 @@ self: { "shakespeare" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec - , process, system-fileio, system-filepath, template-haskell, text - , time, transformers + , process, template-haskell, text, time, transformers }: mkDerivation { pname = "shakespeare"; - version = "2.0.4.1"; - sha256 = "0z3aw13kjknrb0r15jffvc4b2aj89r1zl83ighs2cv318dd89qzi"; + version = "2.0.5"; + sha256 = "0jdmmrglzqzpj4cfiyab3kfr0vlz1rfc893nrq94b1rg4vwh1zzh"; buildDepends = [ aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim parsec process system-fileio system-filepath - template-haskell text time transformers + exceptions ghc-prim parsec process template-haskell text time + transformers ]; testDepends = [ aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim hspec HUnit parsec process system-fileio - system-filepath template-haskell text time transformers + exceptions ghc-prim hspec HUnit parsec process template-haskell + text time transformers ]; homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "A toolkit for making compile-time interpolated templates"; @@ -110255,6 +110590,7 @@ self: { base bytestring hsc2hs QuickCheck test-framework test-framework-quickcheck2 unix ]; + jailbreak = true; description = "A circular buffer built on shared memory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -111790,6 +112126,7 @@ self: { testDepends = [ base base-prelude HTF QuickCheck quickcheck-instances SafeSemaphore ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/slave-thread"; description = "A principal solution to ghost threads and silent exceptions"; license = stdenv.lib.licenses.mit; @@ -112220,10 +112557,8 @@ self: { }: mkDerivation { pname = "snap"; - version = "0.14.0.2"; - revision = "2"; - sha256 = "1yv1snkibsqd7cdxyqi7c8gvnv1hzzhw5jlk19kps526n5xvay7r"; - editedCabalFile = "27e804d1f6070f0899ad3770dfded3db1b6ce44309b28c33f11701edcfe6428a"; + version = "0.14.0.3"; + sha256 = "0v493iicmk4pg97bv4rr0kvrxvsvhizc9wylxbrqrn3q979bahas"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -112414,7 +112749,9 @@ self: { mkDerivation { pname = "snap-extras"; version = "0.11"; + revision = "1"; sha256 = "1s6qdl149x22six61kgm7xnqfyys8z7zh0waajmzip1q4ivxqnij"; + editedCabalFile = "b0332fedd9b65e483e28c08dc1e76473dc4ab7cee457c69195069aca91d24c46"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -112428,7 +112765,6 @@ self: { base bytestring containers QuickCheck snap-core tasty tasty-hunit tasty-quickcheck ]; - jailbreak = true; description = "A collection of useful helpers and utilities for Snap web applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -112993,7 +113329,9 @@ self: { mkDerivation { pname = "snaplet-postgresql-simple"; version = "0.6.0.2"; + revision = "1"; sha256 = "0xx69x9mkv6xyd7arnip12zzyq7hdcqbypgypalgsj6vcjb8i4mp"; + editedCabalFile = "35658dea054cbb2db7cb63fbe81a4a7c546f80645a056f357baf29e94096d21b"; buildDepends = [ base bytestring clientsession configurator errors lens MonadCatchIO-transformers mtl postgresql-simple @@ -113670,6 +114008,7 @@ self: { base containers grid MonadRandom QuickCheck random test-framework test-framework-quickcheck2 ]; + jailbreak = true; homepage = "https://github.com/mhwombat/som"; description = "Self-Organising Maps"; license = stdenv.lib.licenses.bsd3; @@ -115111,6 +115450,7 @@ self: { base profunctors tagged template-haskell transformers ]; testDepends = [ base template-haskell ]; + jailbreak = true; homepage = "https://github.com/MedeaMelana/stack-prism"; description = "Stack prisms"; license = stdenv.lib.licenses.bsd3; @@ -115243,8 +115583,8 @@ self: { }: mkDerivation { pname = "stackage-install"; - version = "0.1.0.3"; - sha256 = "1m9y6xvh1gzivvx9n69m1qdawmbshb05xm7dw3d5wpbrrc9axg4m"; + version = "0.1.1.1"; + sha256 = "0xdqd1q1xy0qax4c2dn1qa0qphvq01xy3wzdp7rr2xnd23ikmbs6"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -115257,21 +115597,43 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stackage-metadata" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Cabal + , conduit, containers, cryptohash, directory, filepath, http-client + , http-client-tls, pretty, resourcet, stackage-install + , stackage-update, tar, text, transformers, yaml, zlib + }: + mkDerivation { + pname = "stackage-metadata"; + version = "0.3.0.0"; + sha256 = "08hs6gnya0ci07gsacc01hvjamwh9xnfni9ihg7wf77w4vrncssx"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base base16-bytestring bytestring Cabal conduit containers + cryptohash directory filepath http-client http-client-tls pretty + resourcet stackage-install stackage-update tar text transformers + yaml zlib + ]; + homepage = "https://github.com/commercialhaskell/all-cabal-metadata-tool"; + description = "Grab current metadata for all packages"; + license = stdenv.lib.licenses.mit; + }) {}; + "stackage-sandbox" = callPackage ({ mkDerivation, attoparsec, base, bytestring, conduit-combinators - , conduit-extra, filepath, optparse-applicative, process - , stackage-cli, system-fileio, system-filepath, text + , conduit-extra, directory, filepath, optparse-applicative, process + , stackage-cli, text }: mkDerivation { pname = "stackage-sandbox"; - version = "0.1.1"; - sha256 = "1xdf1izk8a610g5jzmq3fhx5myld1lfmzd9hfjlqyvwjc76w36g5"; + version = "0.1.3"; + sha256 = "0nkar4nax7h7hp5lmwi98inzy5pyg9sr819rhf78c27vjdmimrjr"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec base bytestring conduit-combinators conduit-extra - filepath optparse-applicative process stackage-cli system-fileio - system-filepath text + directory filepath optparse-applicative process stackage-cli text ]; homepage = "https://www.stackage.org/package/stackage-sandbox"; description = "Work with shared stackage sandboxes"; @@ -115280,22 +115642,21 @@ self: { "stackage-setup" = callPackage ({ mkDerivation, aeson, base, bytestring, classy-prelude-conduit - , cryptohash, cryptohash-conduit, filepath, http-client-tls - , http-conduit, http-types, optparse-applicative, process - , stackage-cli, system-fileio, system-filepath, text - , unordered-containers, yaml + , cryptohash, cryptohash-conduit, directory, filepath + , http-client-tls, http-conduit, http-types, optparse-applicative + , process, stackage-cli, text, unordered-containers, yaml }: mkDerivation { pname = "stackage-setup"; - version = "0.0.1"; - sha256 = "1db527g3wk154rr1vsi6fv2lvh4cyfgab02ghvmmshgrjj3iypkw"; + version = "0.0.2"; + sha256 = "1101sb822v42zjjgabn4s80qyvn6nvzkfagaxpzjm6dp5svl3biv"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base bytestring classy-prelude-conduit cryptohash - cryptohash-conduit filepath http-client-tls http-conduit http-types - optparse-applicative process stackage-cli system-fileio - system-filepath text unordered-containers yaml + cryptohash-conduit directory filepath http-client-tls http-conduit + http-types optparse-applicative process stackage-cli text + unordered-containers yaml ]; homepage = "https://www.stackage.org/package/stackage-setup"; description = "An executable for downloading a Haskell setup"; @@ -115304,15 +115665,16 @@ self: { "stackage-types" = callPackage ({ mkDerivation, aeson, base, Cabal, containers, exceptions - , hashable, semigroups, text, time, unordered-containers, vector + , hashable, safe, semigroups, text, time, unordered-containers + , vector }: mkDerivation { pname = "stackage-types"; - version = "1.0.1"; - sha256 = "0dgxkpx97ndmc9m46ql5chsg42f3ibzzqj0brh89xc5dvd5gdhhd"; + version = "1.0.1.1"; + sha256 = "0zffk8rc611nm5zl53fynz8ly4mzrqx9cjyfwrw07j9mdwi21dsz"; buildDepends = [ - aeson base Cabal containers exceptions hashable semigroups text - time unordered-containers vector + aeson base Cabal containers exceptions hashable safe semigroups + text time unordered-containers vector ]; homepage = "https://github.com/fpco/stackage-types"; description = "Shared data types between various Stackage packages"; @@ -115323,8 +115685,8 @@ self: { ({ mkDerivation, base, directory, filepath, process }: mkDerivation { pname = "stackage-update"; - version = "0.1.1.3"; - sha256 = "01f9809scpkix54w0yfw4yjf1aak4y612bq7mjn1j573s10xa2iy"; + version = "0.1.2"; + sha256 = "1lw30fvscnb3n29lavw16am41adrvby1v2vbh7yykbr80pkb3hvj"; isLibrary = true; isExecutable = true; buildDepends = [ base directory filepath process ]; @@ -115447,6 +115809,7 @@ self: { sha256 = "09zc4rymzvpq12mgl59h069m418qr43myhsj8dlf62g477wyx4g1"; buildDepends = [ base mtl ]; testDepends = [ base checkers mtl QuickCheck ]; + jailbreak = true; description = "MonadPlus for StateT"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -115561,6 +115924,7 @@ self: { version = "0.2.0.1"; sha256 = "14zglnvlra4p85zc4vkgwrpfjf7mrz9dw4ppi369vsfwnw2sgwkq"; buildDepends = [ base double-conversion free mtl text ]; + jailbreak = true; homepage = "https://github.com/jeffreyrosenbluth/static-canvas"; description = "DSL to generate HTML5 Canvas javascript"; license = stdenv.lib.licenses.bsd3; @@ -116001,6 +116365,7 @@ self: { 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; @@ -116456,8 +116821,8 @@ self: { }: mkDerivation { pname = "streaming-commons"; - version = "0.1.12"; - sha256 = "1scqajmi3zp1088kc8nfzmzm8831idc4m0d5sck5mhav9xcmx7sy"; + version = "0.1.12.1"; + sha256 = "1msg18bvz1cxfh745m3jgxf65x7jncqwwpfi538x24qsn788vgfm"; buildDepends = [ array base blaze-builder bytestring directory network process random stm text transformers unix zlib @@ -116509,6 +116874,7 @@ self: { buildDepends = [ adjunctions base comonad distributive semigroupoids semigroups ]; + jailbreak = true; homepage = "http://github.com/ekmett/streams/issues"; description = "Various Haskell 2010 stream comonads"; license = stdenv.lib.licenses.bsd3; @@ -116908,7 +117274,6 @@ self: { base geniplate language-haskell-extract mtl pretty QuickCheck safe testing-feat ]; - jailbreak = true; homepage = "http://www.github.com/danr/structural-induction"; description = "Instantiate structural induction schemas for algebraic data types"; license = stdenv.lib.licenses.gpl3; @@ -117375,6 +117740,7 @@ self: { attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml ]; + jailbreak = true; description = "SVG file loader and serializer"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -118224,15 +118590,15 @@ self: { }: mkDerivation { pname = "system-fileio"; - version = "0.3.16.2"; - sha256 = "17mk1crlgrh9c9lfng6a2fdk49m2mbkkdlq5iysl1rzwkn12mmkd"; + version = "0.3.16.3"; + sha256 = "1484hcl27s2qcby8ws5djj11q9bz68bspcifz9h5gii2ndy70x9i"; buildDepends = [ base bytestring system-filepath text time unix ]; testDepends = [ base bytestring chell system-filepath temporary text time transformers unix ]; homepage = "https://github.com/fpco/haskell-filesystem"; - description = "Consistent filesystem interaction across GHC versions"; + description = "Consistent filesystem interaction across GHC versions (deprecated)"; license = stdenv.lib.licenses.mit; }) {}; @@ -118242,14 +118608,14 @@ self: { }: mkDerivation { pname = "system-filepath"; - version = "0.4.13.3"; - sha256 = "1j6fk1d3qrc2dn4kzwar9z3malrhx2mc6jjvlq9wiqyyx5gs3yyj"; + version = "0.4.13.4"; + sha256 = "1yy5zsmmimhg6iaw9fmpwrxvxrgi5s6bfyqfihdsnx4bjvn7sp9l"; buildDepends = [ base bytestring deepseq text ]; testDepends = [ base bytestring chell chell-quickcheck QuickCheck text ]; homepage = "https://github.com/fpco/haskell-filesystem"; - description = "High-level, byte-based file and directory path manipulations"; + description = "High-level, byte-based file and directory path manipulations (deprecated)"; license = stdenv.lib.licenses.mit; }) {}; @@ -118514,6 +118880,7 @@ self: { base containers directory doctest filepath lens transformers unordered-containers ]; + jailbreak = true; homepage = "http://github.com/ekmett/tables/"; description = "In-memory storage with multiple keys using lenses and traversals"; license = stdenv.lib.licenses.bsd3; @@ -118658,16 +119025,12 @@ self: { }) {}; "tagged-binary" = callPackage - ({ mkDerivation, base, binary, bytestring, data-default, pureMD5 - , spoon - }: + ({ mkDerivation, base, binary, bytestring, pureMD5 }: mkDerivation { pname = "tagged-binary"; - version = "0.1.2.0"; - sha256 = "1ci2dgqix1r9x4k77igv367r3z1qphd906cg1mxfw92mq61m7f0w"; - buildDepends = [ - base binary bytestring data-default pureMD5 spoon - ]; + version = "0.2.0.0"; + sha256 = "0ibp4hmzg4c4dn88ws7x1j5wc6cbz3j2hymyaw2qkac3j4phzqrm"; + buildDepends = [ base binary bytestring pureMD5 ]; description = "Provides tools for serializing data tagged with type information"; license = stdenv.lib.licenses.mit; }) {}; @@ -118736,6 +119099,7 @@ self: { base comonad contravariant distributive exceptions mtl reflection semigroupoids tagged ]; + jailbreak = true; homepage = "http://github.com/ekmett/tagged-transformer"; description = "Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments"; license = stdenv.lib.licenses.bsd3; @@ -119318,10 +119682,9 @@ self: { }: mkDerivation { pname = "tasty-program"; - version = "1.0.2"; - sha256 = "0ii7jcmvmbw03r1ghm2bq9bmbs7w0jqgfc7qx34n45ymjy7ipc55"; + version = "1.0.3"; + sha256 = "18q6b8z5hh1jybr9i72ark95hwz8kg6zbh40ghgwsf6n3ijyfn8n"; buildDepends = [ base deepseq directory filepath process tasty ]; - jailbreak = true; homepage = "https://github.com/jstolarek/tasty-program"; description = "Use tasty framework to test whether a program executes correctly"; license = stdenv.lib.licenses.bsd3; @@ -119367,8 +119730,8 @@ self: { }: mkDerivation { pname = "tasty-silver"; - version = "3.1.5"; - sha256 = "09mgk5pklmwxhr6r3lfmcdd09fzwn00x1vbyy93gh7wbpcpfa8dv"; + version = "3.1.7"; + sha256 = "1mplisyhps9n3kw2w3fjanc14cr6vbyr4xdydq76za9dmx07kd3l"; buildDepends = [ ansi-terminal async base bytestring containers deepseq directory filepath mtl optparse-applicative process process-extras regex-tdfa @@ -119379,7 +119742,7 @@ self: { transformers ]; homepage = "https://github.com/phile314/tasty-silver"; - description = "Golden tests support for tasty. Fork of tasty-golden."; + description = "A fancy test runner, including support for golden tests"; license = stdenv.lib.licenses.mit; }) {}; @@ -119584,19 +119947,21 @@ self: { }) {}; "tellbot" = callPackage - ({ mkDerivation, base, bifunctors, containers, errors, http-conduit - , mtl, network, regex-posix, split, time, transformers + ({ mkDerivation, base, bifunctors, bytestring, containers, errors + , http-conduit, mtl, network, regex-posix, split, tagsoup, text + , time, transformers }: mkDerivation { pname = "tellbot"; - version = "0.5.1.2"; - sha256 = "1w5byb09gv61qagqb2l16y93zlwvv1wfjlvc4xm6mi91xviyihkc"; + version = "0.5.1.4"; + sha256 = "0mm7yyyxs3dvqsrs1xd4mq7byfn55rwri26k9xq3l4k9v7sxbgx8"; isLibrary = false; isExecutable = true; buildDepends = [ - base bifunctors containers errors http-conduit mtl network - regex-posix split time transformers + base bifunctors bytestring containers errors http-conduit mtl + network regex-posix split tagsoup text time transformers ]; + jailbreak = true; description = "IRC tellbot"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -120364,6 +120729,7 @@ self: { sha256 = "1p9y15vv23j1qn3shxl2wqb8skh0n53vrb39qv1nvff9bclxldka"; buildDepends = [ base mtl QuickCheck state-plus template-haskell ]; testDepends = [ base executable-path mtl process QuickCheck ]; + jailbreak = true; description = "Simple Perl inspired testing"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -120424,6 +120790,7 @@ self: { version = "2.1.3.0"; sha256 = "1rq5d64d7j3gpgbfxmfr4xmzizjy0ricw5ghrakv8gzvxmi2bn4p"; buildDepends = [ base containers HUnit mtl QuickCheck random ]; + jailbreak = true; homepage = "https://github.com/jgoerzen/testpack"; description = "Test Utililty Pack for HUnit and QuickCheck (unmaintained)"; license = "LGPL"; @@ -120540,8 +120907,8 @@ self: { }: mkDerivation { pname = "text"; - version = "1.2.0.4"; - sha256 = "004p1c74crs8wmjafwsmw3mmycspq1j8fpm1lvfpq6acha7bnpc6"; + version = "1.2.0.6"; + sha256 = "0wvgynm76pb69wzlpys6l8j8ac4j43gas1anqbsg5ldlfvl85zfq"; buildDepends = [ array base bytestring deepseq ghc-prim integer-gmp ]; @@ -120812,21 +121179,24 @@ self: { }) {}; "text-show" = callPackage - ({ mkDerivation, array, base, bytestring, ghc-prim, integer-gmp - , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text + ({ mkDerivation, array, base, base-compat, base-orphans, bytestring + , bytestring-builder, ghc-prim, hspec, integer-gmp, nats + , QuickCheck, quickcheck-instances, semigroups, tagged + , template-haskell, text, transformers, transformers-compat, void }: mkDerivation { pname = "text-show"; - version = "0.7.0.1"; - sha256 = "1qmvnni69dkxdjay387qxnvy1j4cffnw5igdgqbaqvrm0cgkkg4a"; + version = "0.8.1.1"; + sha256 = "130nqg0fgvnzi5zl0c0cwxjm2jppjmxm9z04g0rv498cl783ag45"; buildDepends = [ - array base bytestring ghc-prim integer-gmp semigroups - template-haskell text + array base base-compat bytestring bytestring-builder ghc-prim + integer-gmp nats semigroups tagged template-haskell text + transformers void ]; testDepends = [ - array base bytestring ghc-prim QuickCheck quickcheck-instances - tasty tasty-hunit tasty-quickcheck text + array base base-compat base-orphans bytestring bytestring-builder + ghc-prim hspec nats QuickCheck quickcheck-instances tagged text + transformers transformers-compat void ]; homepage = "https://github.com/RyanGlScott/text-show"; description = "Efficient conversion of values into Text"; @@ -120859,6 +121229,7 @@ self: { text-show time transformers transformers-compat unix unordered-containers utf8-string vector xhtml ]; + jailbreak = true; homepage = "https://github.com/RyanGlScott/text-show-instances"; description = "Additional instances for text-show"; license = stdenv.lib.licenses.bsd3; @@ -121251,6 +121622,7 @@ self: { base bytestring containers directory doctest filepath QuickCheck template-haskell text vector ]; + jailbreak = true; homepage = "http://github.com/bennofs/th-lift-instances/"; description = "Lift instances for template-haskell for common data types"; license = stdenv.lib.licenses.bsd3; @@ -121263,8 +121635,8 @@ self: { }: mkDerivation { pname = "th-orphans"; - version = "0.11.1"; - sha256 = "111ckvvicr953aqnnkn7rn089dprz57h95cg95rs7f1zz318h2xy"; + version = "0.12.0"; + sha256 = "0dgbk8w81k8d5a9y4nq7h2rz6rvz3vhc0bs0vff7c0iiaglgajvp"; buildDepends = [ base mtl nats template-haskell th-lift th-reify-many ]; @@ -121644,25 +122016,22 @@ self: { }) {}; "threepenny-gui" = callPackage - ({ mkDerivation, aeson, async, attoparsec-enumerator, base - , bytestring, containers, data-default, deepseq, filepath, hashable - , MonadCatchIO-transformers, network-uri, safe, snap-core - , snap-server, stm, template-haskell, text, time, transformers - , unordered-containers, utf8-string, vault, vector, websockets - , websockets-snap + ({ mkDerivation, aeson, async, base, bytestring, containers + , data-default, deepseq, filepath, hashable, network-uri, safe + , snap-core, snap-server, stm, template-haskell, text, transformers + , unordered-containers, vault, vector, websockets, websockets-snap }: mkDerivation { pname = "threepenny-gui"; - version = "0.6.0.1"; - sha256 = "1pivjwz9i3phi6ja4b47mwbh3gscql4z14vxw5s6imhy3pzbr99r"; + version = "0.6.0.2"; + sha256 = "0ghcf6p7i39ss63snmk6hn20cw4hyi3agr05rdh7n60fyf9afs4c"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson async attoparsec-enumerator base bytestring containers - data-default deepseq filepath hashable MonadCatchIO-transformers - network-uri safe snap-core snap-server stm template-haskell text - time transformers unordered-containers utf8-string vault vector - websockets websockets-snap + aeson async base bytestring containers data-default deepseq + filepath hashable network-uri safe snap-core snap-server stm + template-haskell text transformers unordered-containers vault + vector websockets websockets-snap ]; homepage = "http://wiki.haskell.org/Threepenny-gui"; description = "GUI framework that uses the web browser as a display"; @@ -121852,8 +122221,8 @@ self: { }: mkDerivation { pname = "tidal"; - version = "0.4.30"; - sha256 = "1awc2xgq4vn8nnfij3cnklcayh9d4khwpldm75jbghqi75921jni"; + version = "0.4.32"; + sha256 = "1vb3ziin58gxf8jpjgv1c04bqa0vhkmib4h3v2s1k66gdkj1sxk2"; buildDepends = [ base binary bytestring colour containers hashable hmt hosc mersenne-random-pure64 mtl parsec process text time transformers @@ -122795,6 +123164,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tokenify" = callPackage + ({ mkDerivation, base, containers, text }: + mkDerivation { + pname = "tokenify"; + version = "0.1.0.0"; + revision = "2"; + sha256 = "0a75bk0ykmgpwh60whawqw6d2p195w5m140l5shq1v949l1d5m7x"; + editedCabalFile = "32816d10d3cc2d7c15a68a3001a7e080682d3d611b3dabb7cc6b07bffed20f2f"; + buildDepends = [ base containers text ]; + jailbreak = true; + homepage = "https://github.com/AKST/tokenify"; + description = "A regex based LR tokenizer"; + license = stdenv.lib.licenses.mit; + }) {}; + "tokenize" = callPackage ({ mkDerivation, base, split, text }: mkDerivation { @@ -123985,8 +124369,8 @@ self: { ({ mkDerivation, base, eventloop }: mkDerivation { pname = "twentefp-eventloop-trees"; - version = "0.1.0.1"; - sha256 = "1zbpxmi5n9ckmpxk8k3xlgjk0p9gw4ffa5yzd50x7ns1l8af8s5m"; + version = "0.1.1.0"; + sha256 = "1zn3bz2119jcyangs7mi2s9wcjkqgk54vwg6rfcbfg37m1v1ixy4"; buildDepends = [ base eventloop ]; description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree"; license = stdenv.lib.licenses.bsd3; @@ -124145,6 +124529,7 @@ self: { aeson base bytestring Cabal http-client http-client-tls network-uri text transformers ]; + jailbreak = true; homepage = "https://github.com/markandrus/twilio-haskell"; description = "Twilio REST API library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -125276,7 +125661,6 @@ self: { homepage = "https://github.com/UU-ComputerScience/uhc"; description = "Part of UHC packaged as cabal/hackage installable library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uhc-util" = callPackage @@ -126190,14 +126574,11 @@ self: { ({ mkDerivation, array, base, mtl, unix }: mkDerivation { pname = "unlambda"; - version = "0.1.3"; - revision = "1"; - sha256 = "0clcpkhg23a7ma72rjjpl2w8jpg2mdn4rgm3vf0vqr7lbyma1h89"; - editedCabalFile = "fa5648fb982ec7670fcd4ace6fa9f01d26b0c81641f4e3d1e31edbd49dd6bbe4"; + version = "0.1.4.1"; + sha256 = "01v0cl540gwc8j3x6q9gc7bvdcm9f843qbbk15llw9ik2dfm5987"; isLibrary = true; isExecutable = true; buildDepends = [ array base mtl unix ]; - jailbreak = true; description = "Unlambda interpreter"; license = "GPL"; }) {}; @@ -126714,16 +127095,17 @@ self: { }) {}; "urlpath" = callPackage - ({ mkDerivation, base, hspec, mtl, QuickCheck, quickcheck-instances - , text, transformers + ({ mkDerivation, base, hspec, monoid-subclasses, mtl, QuickCheck + , quickcheck-instances, text, transformers }: mkDerivation { pname = "urlpath"; - version = "0.2"; - sha256 = "0rbw76m9d1gr0zc7wppzdad5nnwdrg2g5v54lc7hxk5wk53pran1"; - buildDepends = [ base mtl transformers ]; + version = "2.1.0"; + sha256 = "1q8zj228ln9xmr3r0ggv6pi074l8ixchn81mw8664jikf2pjcqq9"; + buildDepends = [ base monoid-subclasses mtl transformers ]; testDepends = [ - base hspec mtl QuickCheck quickcheck-instances text transformers + base hspec monoid-subclasses mtl QuickCheck quickcheck-instances + text transformers ]; description = "Painfully simple URL writing combinators"; license = stdenv.lib.licenses.mit; @@ -126959,25 +127341,12 @@ self: { isLibrary = true; isExecutable = true; buildDepends = [ base utf8-string ]; + jailbreak = true; description = "Variants of Prelude and System.IO with UTF8 text I/O operations"; license = stdenv.lib.licenses.bsd3; }) {}; "utf8-string" = callPackage - ({ mkDerivation, base, bytestring }: - mkDerivation { - pname = "utf8-string"; - version = "0.3.8"; - revision = "2"; - sha256 = "1h29dn0scsfkhmkg14ywq9178lw40ah1r36w249zfzqr02y7qxc0"; - editedCabalFile = "0555d720026fff65342bdc500391ffd300858b6f2c6db441d4dd1eafbcb599ff"; - buildDepends = [ base bytestring ]; - homepage = "http://github.com/glguy/utf8-string/"; - description = "Support for reading and writing UTF8 Strings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "utf8-string_1" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { pname = "utf8-string"; @@ -127069,12 +127438,8 @@ self: { }: mkDerivation { pname = "uu-options"; - version = "0.1.0.2"; - revision = "1"; - sha256 = "0cbf0ckq8z7lqziip7znfwa4vmqfsgmg7phrc3r68z2hpinw73zy"; - editedCabalFile = "25f112bb1de34b05c01588e982a1ce61225ede0e18d569c5dea91518589e0149"; - isLibrary = true; - isExecutable = true; + version = "0.2.0.0"; + sha256 = "11gixk6lxsakcdxir9jla5nk71phmlzd9hxp8wq23n550xw91ij6"; buildDepends = [ base lenses mtl template-haskell transformers uu-interleaved uu-parsinglib @@ -127863,6 +128228,7 @@ self: { base QuickCheck random template-haskell test-framework test-framework-quickcheck2 transformers ]; + jailbreak = true; homepage = "https://github.com/haskell/vector"; description = "Efficient Arrays"; license = stdenv.lib.licenses.bsd3; @@ -128717,6 +129083,7 @@ self: { array base bytestring containers data-default directory filepath mtl QuickCheck random regex-base stm text time unix vector vty ]; + jailbreak = true; homepage = "http://jtdaugherty.github.com/vty-ui/"; description = "An interactive terminal user interface library for Vty"; license = stdenv.lib.licenses.bsd3; @@ -128787,23 +129154,22 @@ self: { , blaze-markup, byteable, bytestring, containers, cryptohash , cryptohash-conduit, directory, file-embed, filepath, hspec , http-date, http-types, mime-types, network, old-locale - , optparse-applicative, system-fileio, system-filepath - , template-haskell, text, time, transformers, unix-compat - , unordered-containers, wai, wai-extra, warp, zlib + , optparse-applicative, template-haskell, text, time, transformers + , unix-compat, unordered-containers, wai, wai-extra, warp, zlib }: mkDerivation { pname = "wai-app-static"; - version = "3.0.1.1"; - sha256 = "1zji4zisclycpyg28shwk96zmhmlvwiwz057dd4wf3w35sdklx7y"; + version = "3.1.0"; + sha256 = "0zajsav11v5r6c5k2ls1cfc6bz1zalasxpl03hvh5fww5f1vn9iq"; isLibrary = true; isExecutable = true; buildDepends = [ base base64-bytestring blaze-builder blaze-html blaze-markup byteable bytestring containers cryptohash cryptohash-conduit directory file-embed filepath http-date http-types mime-types - old-locale optparse-applicative system-fileio system-filepath - template-haskell text time transformers unix-compat - unordered-containers wai wai-extra warp zlib + old-locale optparse-applicative template-haskell text time + transformers unix-compat unordered-containers wai wai-extra warp + zlib ]; testDepends = [ base bytestring hspec http-date http-types mime-types network @@ -129245,23 +129611,22 @@ self: { , blaze-builder, bytestring, case-insensitive, clientsession , containers, cookie, gitrev, http-client, http-client-tls , http-reverse-proxy, http-types, optparse-applicative, resourcet - , template-haskell, text, time, transformers, unix-compat, wai - , wai-app-static, warp + , template-haskell, text, time, transformers, unix-compat, vault + , wai, wai-app-static, warp }: mkDerivation { pname = "wai-middleware-crowd"; - version = "0.1.0.0"; - sha256 = "15wgnbsw47jqncz2zl9clsa6nbaya019sapmgj3d9yl1rqdzkaqy"; + version = "0.1.1.1"; + sha256 = "1lkdjfp7aq61hzh9y13bqk9qgfr6s3m7n13ar73gjv5k2g97fizj"; isLibrary = true; isExecutable = true; buildDepends = [ authenticate base base64-bytestring binary blaze-builder bytestring case-insensitive clientsession containers cookie gitrev http-client http-client-tls http-reverse-proxy http-types optparse-applicative - resourcet template-haskell text time transformers unix-compat wai - wai-app-static warp + resourcet template-haskell text time transformers unix-compat vault + wai wai-app-static warp ]; - jailbreak = true; description = "Middleware and utilities for using Atlassian Crowd authentication"; license = stdenv.lib.licenses.mit; }) {}; @@ -129428,21 +129793,21 @@ self: { }) {}; "wai-middleware-throttle" = callPackage - ({ mkDerivation, base, bytestring, containers, haddock, hlint - , hspec, http-types, HUnit, network, process, regex-compat, stm - , token-bucket, transformers, wai, wai-extra + ({ mkDerivation, base, bytestring, containers, hlint, hspec + , http-types, HUnit, network, stm, token-bucket, transformers, wai + , wai-extra }: mkDerivation { pname = "wai-middleware-throttle"; - version = "0.2.0.0"; - sha256 = "1dnpx3byb1q8g41kj55qgw6vrjm4rv4sa6qbd12pafwabcgx4l74"; + version = "0.2.0.1"; + sha256 = "08qxdcbn1lg9rd2rcp10iri1maamn5cily9mbg1r65h8ivdmrdan"; buildDepends = [ base containers http-types network stm token-bucket transformers wai ]; testDepends = [ - base bytestring haddock hlint hspec http-types HUnit process - regex-compat stm transformers wai wai-extra + base bytestring hlint hspec http-types HUnit stm transformers wai + wai-extra ]; description = "WAI Middleware for Request Throttling"; license = stdenv.lib.licenses.bsd3; @@ -130139,18 +130504,18 @@ self: { }) {}; "web-routes" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, ghc-prim - , http-types, HUnit, mtl, parsec, QuickCheck, split, test-framework - , test-framework-hunit, test-framework-quickcheck2 + ({ mkDerivation, base, blaze-builder, bytestring, exceptions + , ghc-prim, http-types, HUnit, mtl, parsec, QuickCheck, split + , test-framework, test-framework-hunit, test-framework-quickcheck2 , test-framework-th, text, utf8-string }: mkDerivation { pname = "web-routes"; - version = "0.27.8"; - sha256 = "1nz7nny333miap44yrdzn711g4xgr2c9nd0ivm0q02692684craq"; + version = "0.27.9"; + sha256 = "1azccgcnksz4c4pm1nayvjiq3m192zz21cnc0fm89hdixvqck346"; buildDepends = [ - base blaze-builder bytestring ghc-prim http-types mtl parsec split - text utf8-string + base blaze-builder bytestring exceptions ghc-prim http-types mtl + parsec split text utf8-string ]; testDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -130164,8 +130529,8 @@ self: { ({ mkDerivation, base, boomerang, mtl, parsec, text, web-routes }: mkDerivation { pname = "web-routes-boomerang"; - version = "0.28.3"; - sha256 = "0d3ccp4hbzjhqzqy901da8dpz23sylwg54xs5iyjhmqvw0v7ljpn"; + version = "0.28.4"; + sha256 = "0ailw4s0c1f054q58dwylq1g1f043vw4ywk0spg5d3sk9asy8bxh"; buildDepends = [ base boomerang mtl parsec text web-routes ]; description = "Library for maintaining correctness and composability of URLs within an application"; license = stdenv.lib.licenses.bsd3; @@ -130190,8 +130555,8 @@ self: { ({ mkDerivation, base, hsp, text, web-routes }: mkDerivation { pname = "web-routes-hsp"; - version = "0.24.5"; - sha256 = "1vnsdsipm764maqn43774vw5hn64vvaaih8gg9130fkvp6jj39nk"; + version = "0.24.6"; + sha256 = "048dxx5cjdm7v0340p9x3s73a6y7fldykzkwkpb12bb926bir3fl"; buildDepends = [ base hsp text web-routes ]; description = "Adds XMLGenerator instance for RouteT monad"; license = stdenv.lib.licenses.bsd3; @@ -130242,8 +130607,8 @@ self: { }: mkDerivation { pname = "web-routes-th"; - version = "0.22.2"; - sha256 = "1dk768m0bb4y3i1q9sxj2fbn6farlyyy52fxmk0ipbnbdq7if71f"; + version = "0.22.3"; + sha256 = "0ccv1mzisd0fnhbl776i0fhavjazm0l3b4ycnbdzgs1kh4w8gzfp"; buildDepends = [ base parsec split template-haskell text web-routes ]; @@ -130549,7 +130914,9 @@ self: { mkDerivation { pname = "webpage"; version = "0.0.3.1"; + revision = "1"; sha256 = "1s9q44wvkc60g1117c3c4klf9pc92x7rpgvb7pwyhbbkvshmnirj"; + editedCabalFile = "1829b0f7db8745498bee16ed1d70917aa781fd14ab8f8032b51472cfc3cd6787"; buildDepends = [ base blaze-html data-default hastache lucid text ]; @@ -130955,15 +131322,16 @@ self: { }) {}; "witherable" = callPackage - ({ mkDerivation, base, containers, hashable, transformers - , unordered-containers, vector + ({ mkDerivation, base, base-orphans, containers, hashable + , transformers, unordered-containers, vector }: mkDerivation { pname = "witherable"; - version = "0.1.2.3"; - sha256 = "1281npwsmj9vzw3l5bb8pzywgm5dk4y723zsq5dk0b0ri58m3hcz"; + version = "0.1.3"; + sha256 = "0n0l169xh23925blgzy2i90gz8lsa0176dp49bl6cncq362bqcn8"; buildDepends = [ - base containers hashable transformers unordered-containers vector + base base-orphans containers hashable transformers + unordered-containers vector ]; homepage = "https://github.com/fumieval/witherable"; description = "Generalization of filter and catMaybes"; @@ -131018,6 +131386,7 @@ self: { version = "0.2.5"; sha256 = "02r453wx1kv50lw0hx4nvzzv5wjfsy16gyjqphc25aq45rl5hr8g"; buildDepends = [ base lens linear parsec parsec-numbers ]; + jailbreak = true; homepage = "http://github.com/bgamari/wkt"; description = "Parsec parsers and types for geographic data in well-known text (WKT) format"; license = stdenv.lib.licenses.bsd3; @@ -131064,6 +131433,7 @@ self: { base containers nats semigroupoids semigroups text utf8-string ]; testDepends = [ base HUnit test-framework test-framework-hunit ]; + jailbreak = true; homepage = "http://github.com/ekmett/wl-pprint-extras/"; description = "A free monad based on the Wadler/Leijen pretty printer"; license = stdenv.lib.licenses.bsd3; @@ -132342,6 +132712,7 @@ self: { base containers HUnit old-time smallcheck tasty tasty-hunit tasty-smallcheck time ]; + jailbreak = true; homepage = "https://github.com/qrilka/xlsx"; description = "Simple and incomplete Excel file parser/writer"; license = stdenv.lib.licenses.mit; @@ -132419,16 +132790,16 @@ self: { ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, conduit, conduit-extra, containers , data-default, deepseq, hspec, HUnit, monad-control, resourcet - , system-filepath, text, transformers, xml-types + , text, transformers, xml-types }: mkDerivation { pname = "xml-conduit"; - version = "1.2.6"; - sha256 = "1ybl0maakz4arqbblipafwggh0m2n8ljyp91iiihb4674kynrciz"; + version = "1.3.0"; + sha256 = "0kcwfr02gnldal4dq2am9kc36j76cjx0japi5r5wms2c1az95r1l"; buildDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring conduit conduit-extra containers data-default deepseq monad-control - resourcet system-filepath text transformers xml-types + resourcet text transformers xml-types ]; testDepends = [ base blaze-markup bytestring conduit containers hspec HUnit @@ -132520,8 +132891,8 @@ self: { }: mkDerivation { pname = "xml-hamlet"; - version = "0.4.0.10"; - sha256 = "0bvgd3xbc25d2zdmpzq1rxhr7rkglf0zpc8wy75j2yqv6ymylb6v"; + version = "0.4.0.11"; + sha256 = "128ypil2c86zpkivrla031hn4rmhbpisy4zj0xmff473hz9qln9x"; buildDepends = [ base containers parsec shakespeare template-haskell text xml-conduit @@ -132554,15 +132925,16 @@ self: { mkDerivation { pname = "xml-html-conduit-lens"; version = "0.3.2.1"; - revision = "1"; + revision = "2"; sha256 = "0iy58nq5b6ixdky2xr4r8xxk3c8wqp1y3jbpsk3dr1qawzjbzp12"; - editedCabalFile = "b525d68eb964e306dc6fab3f9ba89e2325d91af53469ad32ec1d49e5f9a80647"; + editedCabalFile = "6c3305bb07c0fd40c933640ebe9e6114a798115cfb2f3cb976e40f1ece955132"; buildDepends = [ base bytestring containers html-conduit lens text xml-conduit ]; testDepends = [ base doctest hspec hspec-expectations-lens lens xml-conduit ]; + jailbreak = true; homepage = "https://github.com/supki/xml-html-conduit-lens#readme"; description = "Optics for xml-conduit and html-conduit"; license = stdenv.lib.licenses.bsd3; @@ -132575,7 +132947,9 @@ self: { mkDerivation { pname = "xml-lens"; version = "0.1.6.3"; + revision = "1"; sha256 = "1s5ivi3caz56g5yyg3pharshs3wcygcssjx1sm9aw4mv3ylz3msd"; + editedCabalFile = "1a0768a259fb0aeaaecc092c6a9777c4d498d2695b0385a0e620e47f362773b9"; buildDepends = [ base case-insensitive containers lens text xml-conduit ]; @@ -132911,6 +133285,7 @@ self: { base containers directory extensible-exceptions filepath mtl process unix utf8-string X11 ]; + jailbreak = true; postInstall = '' shopt -s globstar mkdir -p $out/share/man/man1 @@ -133586,6 +133961,7 @@ self: { base bytestring bytestring-lexing containers lens yaml-light ]; testDepends = [ base doctest ]; + jailbreak = true; description = "Lens interface to yaml-light"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -134218,15 +134594,15 @@ self: { , 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 + , resourcet, shakespeare, split, streaming-commons, tar + , template-haskell, text, time, transformers, transformers-compat + , unix-compat, unordered-containers, wai, wai-extra, warp, warp-tls + , yaml, zlib }: mkDerivation { pname = "yesod-bin"; - version = "1.4.7.2"; - sha256 = "15l69vxfzhjql83ikvb6ca980ikj17346bq9b4888cv87yxnizgh"; + version = "1.4.8"; + sha256 = "14q0m62wh35im7j12v8rmd0qwxdyvxk88gbsd19p26q03xf832da"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -134235,10 +134611,9 @@ self: { 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 + shakespeare split streaming-commons tar template-haskell text time + transformers transformers-compat unix-compat unordered-containers + wai wai-extra warp warp-tls yaml zlib ]; homepage = "http://www.yesodweb.com/"; description = "The yesod helper executable"; @@ -134338,6 +134713,7 @@ self: { base classy-prelude containers monad-control persistent random stm uuid yesod-core yesod-form yesod-persistent ]; + jailbreak = true; homepage = "https://github.com/league/yesod-crud"; description = "Generic administrative CRUD operations as a Yesod subsite"; license = stdenv.lib.licenses.bsd3; @@ -134451,19 +134827,18 @@ self: { "yesod-fay" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, directory - , fay, fay-dom, monad-loops, process, pureMD5, shakespeare - , system-fileio, system-filepath, template-haskell, text - , transformers, utf8-string, yesod-core, yesod-form, yesod-static + , fay, fay-dom, filepath, monad-loops, process, pureMD5 + , shakespeare, template-haskell, text, transformers, utf8-string + , yesod-core, yesod-form, yesod-static }: mkDerivation { pname = "yesod-fay"; - version = "0.7.1"; - sha256 = "0g17n7aqr1zhlh21dkl13rhac34nq8f77mj85kll6vgcs8nfidhl"; + version = "0.8.0"; + sha256 = "0inx11w4wdgnbxqghm9738qs19519dcdgyjmm3aah12wzv4i68gf"; buildDepends = [ - aeson base bytestring data-default directory fay fay-dom - monad-loops process pureMD5 shakespeare system-fileio - system-filepath template-haskell text transformers utf8-string - yesod-core yesod-form yesod-static + aeson base bytestring data-default directory fay fay-dom filepath + monad-loops process pureMD5 shakespeare template-haskell text + transformers utf8-string yesod-core yesod-form yesod-static ]; homepage = "https://github.com/fpco/yesod-fay"; description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod"; @@ -134530,16 +134905,15 @@ self: { "yesod-gitrepo" = callPackage ({ mkDerivation, base, directory, enclosed-exceptions, http-types - , lifted-base, process, system-filepath, temporary, text, wai - , yesod-core + , lifted-base, process, temporary, text, wai, yesod-core }: mkDerivation { pname = "yesod-gitrepo"; - version = "0.1.1.0"; - sha256 = "1bf4rhf6i4cciyllkh6zil29i7yi5ph0nkpcqmhbihk4i7xm05zj"; + version = "0.2.1.0"; + sha256 = "1v47d6gvw3d19mqip36y54c4d84f48jgybdwgdl8r20zfwvhyvkf"; buildDepends = [ base directory enclosed-exceptions http-types lifted-base process - system-filepath temporary text wai yesod-core + temporary text wai yesod-core ]; homepage = "https://github.com/snoyberg/yesod-gitrepo"; description = "Host content provided by a Git repo"; @@ -135004,30 +135378,31 @@ self: { , containers, cryptohash, cryptohash-conduit, css-text , data-default, directory, file-embed, filepath, hashable, hjsmin , hspec, http-types, HUnit, mime-types, old-time, process - , resourcet, system-fileio, system-filepath, template-haskell, text - , transformers, unix-compat, unordered-containers, wai - , wai-app-static, wai-extra, yesod-core, yesod-test + , resourcet, template-haskell, text, transformers, unix-compat + , unordered-containers, wai, wai-app-static, wai-extra, yesod-core + , yesod-test }: mkDerivation { pname = "yesod-static"; - version = "1.4.0.4"; - sha256 = "1z01m3rvar6djxqcc2hyi53yfcpqwpi45wffpjnfp8hsr1x0zaqk"; + version = "1.5.0"; + revision = "1"; + sha256 = "1i95c43hlks1wclhwal9yr1pasmz78ddi7wzjhg9k5w21hrkcp92"; + editedCabalFile = "d01c0a6fcb4ae005dea0c4898fd1ad452cde5e1989c90e62309c481cd0ff36c3"; buildDepends = [ async attoparsec base base64-bytestring blaze-builder byteable bytestring conduit conduit-extra containers cryptohash cryptohash-conduit css-text data-default directory file-embed filepath hashable hjsmin http-types mime-types old-time process - resourcet system-fileio system-filepath template-haskell text - transformers unix-compat unordered-containers wai wai-app-static - yesod-core + resourcet template-haskell text transformers unix-compat + unordered-containers wai wai-app-static yesod-core ]; testDepends = [ async base base64-bytestring byteable bytestring conduit conduit-extra containers cryptohash cryptohash-conduit data-default directory file-embed filepath hjsmin hspec http-types HUnit - mime-types old-time process resourcet system-fileio system-filepath - template-haskell text transformers unix-compat unordered-containers - wai wai-app-static wai-extra yesod-core yesod-test + mime-types old-time process resourcet template-haskell text + transformers unix-compat unordered-containers wai wai-app-static + wai-extra yesod-core yesod-test ]; homepage = "http://www.yesodweb.com/"; description = "Static file serving subsite for Yesod Web Framework"; @@ -135057,6 +135432,7 @@ self: { base bytestring hamlet hspec HUnit shakespeare template-haskell text yesod-core yesod-static yesod-test ]; + jailbreak = true; homepage = "https://bitbucket.org/wuzzeb/yesod-static-generators"; description = "Yesod generators for embedding AngularJs code into yesod-static at compile time"; license = stdenv.lib.licenses.mit; @@ -136090,6 +136466,7 @@ self: { sha256 = "1rlf01dc6dcy9sx89npsisdz1yg9v4h2byd6ms602bxnmjllm1ls"; buildDepends = [ base lens profunctors semigroupoids ]; testDepends = [ base directory doctest filepath ]; + jailbreak = true; homepage = "http://github.com/ekmett/zippers/"; description = "Traversal based zippers"; license = stdenv.lib.licenses.bsd3; @@ -136107,7 +136484,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "zlib" = callPackage + "zlib_0_5_4_2" = callPackage ({ mkDerivation, base, bytestring, zlib }: mkDerivation { pname = "zlib"; @@ -136119,7 +136496,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) { inherit (pkgs) zlib;}; - "zlib_0_6_1_0" = callPackage + "zlib" = callPackage ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty , tasty-hunit, tasty-quickcheck, zlib }: @@ -136186,9 +136563,10 @@ self: { ({ mkDerivation, base, bytestring, profunctors, zlib }: mkDerivation { pname = "zlib-lens"; - version = "0.1.1.2"; - sha256 = "13zfh0639881nfxibl501f1b3ci9pjvhvdid2l5sf2na8kmpzr61"; + version = "0.1.2"; + sha256 = "1vm12sm9ypik5qnnizmwx56fmpjghldzb06kn020hwlabz8c4j8n"; buildDepends = [ base bytestring profunctors zlib ]; + jailbreak = true; homepage = "http://lens.github.io/"; description = "Lenses for zlib"; license = stdenv.lib.licenses.bsd3; From 111de3eb62ab4bc248413bb8bd6780612f482a4c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 May 2015 13:37:56 +0200 Subject: [PATCH 257/615] haskell-configuration-ghc-7.10.x: remove obsolete "version bump" hacks --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index b5c0f42fc780..ea362254b2fb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -320,8 +320,4 @@ self: super: { # https://github.com/HugoDaniel/RFC3339/issues/14 timerep = dontCheck super.timerep; - # Ugly hack that triggers a rebuild to fix the broken package on Hydra. - cabal-lenses = appendConfigureFlag super.cabal-lenses "-fignore-me-1"; - text = appendConfigureFlag super.text "-fignore-me-1"; - } From 0fa44a5633ead1849b8dee08a7944787ecc8279a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 May 2015 14:00:01 +0200 Subject: [PATCH 258/615] Haskell packages brainfuck and unlambda have been fixed upstream. --- .../brainfuck-fix-ghc710.patch | 19 ------------- .../configuration-ghc-7.10.x.nix | 4 --- .../haskell-modules/unlambda-fix-ghc710.patch | 28 ------------------- 3 files changed, 51 deletions(-) delete mode 100644 pkgs/development/haskell-modules/brainfuck-fix-ghc710.patch delete mode 100644 pkgs/development/haskell-modules/unlambda-fix-ghc710.patch diff --git a/pkgs/development/haskell-modules/brainfuck-fix-ghc710.patch b/pkgs/development/haskell-modules/brainfuck-fix-ghc710.patch deleted file mode 100644 index ae3397fa573a..000000000000 --- a/pkgs/development/haskell-modules/brainfuck-fix-ghc710.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ru3 brainfuck-0.1-old/Language/Brainfuck.hs brainfuck-0.1/Language/Brainfuck.hs ---- brainfuck-0.1-old/Language/Brainfuck.hs 2015-04-17 21:17:34.568721144 +0300 -+++ brainfuck-0.1/Language/Brainfuck.hs 2015-04-17 21:19:17.065872395 +0300 -@@ -19,6 +19,8 @@ - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -} - -+{-# LANGUAGE FlexibleContexts #-} -+ - module Language.Brainfuck where - - import Data.Array.IO -@@ -287,4 +289,4 @@ - - halt = if debug - then putStrLn "Machine Halted.\n" -- else putStrLn "\n" -\ No newline at end of file -+ else putStrLn "\n" 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 ea362254b2fb..ef663ba2ca84 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -181,10 +181,6 @@ self: super: { in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3 self.webkitgtk3-javascriptcore ]; - # FIXME: remove with the next Hackage update - brainfuck = appendPatch super.brainfuck ./brainfuck-fix-ghc710.patch; - unlambda = appendPatch super.unlambda ./unlambda-fix-ghc710.patch; - # https://github.com/BNFC/bnfc/issues/137 BNFC = markBrokenVersion "2.7.1" super.BNFC; cubical = dontDistribute super.cubical; diff --git a/pkgs/development/haskell-modules/unlambda-fix-ghc710.patch b/pkgs/development/haskell-modules/unlambda-fix-ghc710.patch deleted file mode 100644 index 51c453557aa8..000000000000 --- a/pkgs/development/haskell-modules/unlambda-fix-ghc710.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ru3 unlambda-0.1.3-old/Language/Unlambda.hs unlambda-0.1.3/Language/Unlambda.hs ---- unlambda-0.1.3-old/Language/Unlambda.hs 2015-04-17 21:16:32.415751612 +0300 -+++ unlambda-0.1.3/Language/Unlambda.hs 2015-04-17 21:25:38.210123501 +0300 -@@ -29,6 +29,7 @@ - import Prelude hiding(catch) - #endif - import Control.Exception (catch, IOException) -+import Control.Monad (liftM, ap) - - ------------------------------------------------------------------------ - -- Abstract syntax -@@ -85,6 +86,16 @@ - - type Cont a = (Maybe Char, Int) -> a -> IO Exp - -+instance Functor Eval where -+ -+ fmap = liftM -+ -+instance Applicative Eval where -+ -+ pure = return -+ -+ (<*>) = ap -+ - instance Monad Eval where - - (Eval cp1) >>= f = Eval $ \dat1 cont2 -> From 1191c95e13277507ac8ba89971a1abbb6caadfee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 May 2015 20:37:57 +0200 Subject: [PATCH 259/615] haskell-influxdb: don't jailbreak this build; the Cabal file is too complex --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7adeb92ab156..513cc4de4d80 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -403,7 +403,7 @@ self: super: { http-client-openssl = dontCheck super.http-client-openssl; http-client-tls = dontCheck super.http-client-tls; ihaskell = dontCheck super.ihaskell; - influxdb = dontCheck super.influxdb; + influxdb = dontCheck (dontJailbreak super.influxdb); itanium-abi = dontCheck super.itanium-abi; katt = dontCheck super.katt; language-slice = dontCheck super.language-slice; From b4f6ddb925ff57e05c74bef6a678389c5570b287 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2015 11:06:02 +0200 Subject: [PATCH 260/615] haskell-bitcoin-api: don't run the test suite, because it requires network access --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 513cc4de4d80..5b9a6fe366f4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -296,6 +296,7 @@ self: super: { # These packages try to access the network. amqp = dontCheck super.amqp; amqp-conduit = dontCheck super.amqp-conduit; + bitcoin-api = dontCheck super.bitcoin-api; concurrent-dns-cache = dontCheck super.concurrent-dns-cache; dbus = dontCheck super.dbus; # http://hydra.cryp.to/build/498404/log/raw hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw From eb32c97162992eedf9d6b633c14c895b418df621 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2015 13:31:31 +0200 Subject: [PATCH 261/615] HStringTemplate: remove obsolete overrides --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 3 --- 2 files changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index ef663ba2ca84..f938222afdaf 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -41,8 +41,6 @@ self: super: { # Cabal_1_22_1_1 requires filepath >=1 && <1.4 cabal-install = dontCheck (super.cabal-install.override { Cabal = null; }); - HStringTemplate = self.HStringTemplate_0_8_3; - # We have Cabal 1.22.x. jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; 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 361d404412ea..660fc5d9a4eb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -58,9 +58,6 @@ self: super: { patchPhase = "find . -name '*.hs' -exec sed -i -s 's|-Werror||' {} +"; }); # warning: "Module ‘Control.Monad.Error’ is deprecated" - # Depends on time == 0.1.5, which we don't have. - HStringTemplate_0_8_3 = dontDistribute super.HStringTemplate_0_8_3; - # This is part of bytestring in our compiler. bytestring-builder = dontHaddock super.bytestring-builder; From 932e4dbf1e00e8c2ae82dacb2cfc4873bff2b6a6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2015 13:32:33 +0200 Subject: [PATCH 262/615] haddock-library: remove obsolete overrides --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index f938222afdaf..53512826a5bd 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -103,10 +103,6 @@ self: super: { # Test suite fails in "/tokens_bytestring_unicode.g.bin". alex = dontCheck super.alex; - # https://github.com/haskell/haddock/issues/378 - haddock-library_1_2_0 = dontCheck super.haddock-library_1_2_0; - haddock-library = self.haddock-library_1_2_0; - # Upstream was notified about the over-specified constraint on 'base' # but refused to do anything about it because he "doesn't want to # support a moving target". Go figure. From 2f00cb53084517d78dc74bbb06a62a30b4c47499 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2015 13:57:58 +0200 Subject: [PATCH 263/615] haskell-digest: remove obsolete override --- pkgs/development/haskell-modules/configuration-common.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5b9a6fe366f4..c05dbb5c06f6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -11,7 +11,6 @@ self: super: { cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_3_0; }); # Break infinite recursions. - digest = super.digest.override { inherit (pkgs) zlib; }; Dust-crypto = dontCheck super.Dust-crypto; hasql-postgres = dontCheck super.hasql-postgres; hspec-expectations = dontCheck super.hspec-expectations; From 1d3ef2fef83aa9cd1a64967893611d01c78f2e06 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2015 13:58:16 +0200 Subject: [PATCH 264/615] haskell: simplify overrides for QuickCheck and zlib --- pkgs/development/haskell-modules/configuration-common.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c05dbb5c06f6..0bba17bbe380 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -157,9 +157,6 @@ self: super: { patchPhase = "sed -i -e 's|attoparsec.*,|attoparsec,|' darcs.cabal"; }); - # Needs the latest version of QuickCheck to compile. - cabal-test-quickcheck = super.cabal-test-quickcheck.override { QuickCheck = self.QuickCheck_2_8_1; }; - # https://github.com/massysett/rainbox/issues/1 rainbox = dontCheck super.rainbox; @@ -762,10 +759,7 @@ self: super: { in appendPatch pkg ./mueval-nix.patch; # Test suite won't compile against tasty-hunit 0.9.x. - zlib_0_6_1_0 = dontCheck super.zlib_0_6_1_0; - - # Jailbreaking breaks the build. - QuickCheck_2_8_1 = dontJailbreak super.QuickCheck_2_8_1; + zlib = dontCheck super.zlib; # Override the obsolete version from Hackage with our more up-to-date copy. cabal2nix = pkgs.cabal2nix; From 10e338263d7af587f65fdf4b9f68da4795d20820 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2015 19:39:45 +0200 Subject: [PATCH 265/615] haskell-MissingH: disable test suite to avoid depending on broken testpack --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0bba17bbe380..d0a2301ce96e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -798,4 +798,8 @@ self: super: { # GNUTLS 3.4 causes linker errors: http://hydra.cryp.to/build/839563/nixlog/2/raw gnutls = super.gnutls.override { gnutls = pkgs.gnutls33; }; + # Won't compile with recent versions of QuickCheck. + testpack = markBroken super.testpack; + MissingH = dontCheck super.MissingH; + } From bfb416cfe151ced5f94c8ac79388a3724cb2c97c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2015 22:11:22 +0200 Subject: [PATCH 266/615] haskell-utf8-prelude: mark deprecated package as broken --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d0a2301ce96e..cde94a0867c9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -802,4 +802,7 @@ self: super: { testpack = markBroken super.testpack; MissingH = dontCheck super.MissingH; + # Obsolete for GHC versions after GHC 6.10.x. + utf8-prelude = markBroken super.utf8-prelude; + } From 0a87fd8890e6311b292e73c17805f8c6df8509c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 16 May 2015 00:12:57 +0200 Subject: [PATCH 267/615] cabal-install: override zlib with an older version to fix the build This change resolves https://github.com/peti/nixpkgs/pull/3. --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cde94a0867c9..705da4df4661 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -8,7 +8,7 @@ self: super: { Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6; Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3; Cabal_1_22_3_0 = dontCheck super.Cabal_1_22_3_0; - cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_3_0; }); + cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_3_0; zlib = self.zlib_0_5_4_2; }); # Break infinite recursions. Dust-crypto = dontCheck super.Dust-crypto; From c3add19437d1add9e313819eeb47f4854e7bef93 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 16 May 2015 00:30:07 +0200 Subject: [PATCH 268/615] darcs: pass old zlib version 0.5.x to fix the build --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 705da4df4661..76675ef87554 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -151,11 +151,11 @@ self: super: { wai-test = dontHaddock super.wai-test; zlib-conduit = dontHaddock super.zlib-conduit; - # jailbreak doesn't get the job done because the Cabal file uses conditionals a lot. - darcs = overrideCabal super.darcs (drv: { + # Jailbreak doesn't get the job done because the Cabal file uses conditionals a lot. + darcs = (overrideCabal super.darcs (drv: { doCheck = false; # The test suite won't even start. - patchPhase = "sed -i -e 's|attoparsec.*,|attoparsec,|' darcs.cabal"; - }); + patchPhase = "sed -i -e 's|attoparsec .*,|attoparsec,|' darcs.cabal"; + })).overrideScope (self: super: { zlib = self.zlib_0_5_4_2; }); # https://github.com/massysett/rainbox/issues/1 rainbox = dontCheck super.rainbox; From 1d7f9b28d314ffd82a24dbcf74dd4199a4e5bbc5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 16 May 2015 00:40:56 +0200 Subject: [PATCH 269/615] haskell-cheapskate is broken by latest blaze-html --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 76675ef87554..0788900a7147 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -805,4 +805,8 @@ self: super: { # Obsolete for GHC versions after GHC 6.10.x. utf8-prelude = markBroken super.utf8-prelude; + # https://github.com/jgm/cheapskate/issues/11 + cheapskate = markBrokenVersion "0.1.0.3" super.cheapskate; + lit = dontDistribute super.lit; + } From 8b13b29898d8b678a30f80e25de3502ae3b3bc53 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 16 May 2015 14:34:19 +0200 Subject: [PATCH 270/615] pandoc: jailbreak to fix build with recent versions of zlib and QuickCheck --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0788900a7147..e22e3f31f162 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -678,8 +678,11 @@ 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; + # https://github.com/jgm/pandoc/issues/2156 + pandoc = overrideCabal (dontJailbreak super.pandoc) (drv: { + doCheck = false; # https://github.com/jgm/pandoc/issues/2036 + patchPhase = "sed -i -e 's|zlib .*,|zlib,|' -e 's|QuickCheck .*,|QuickCheck,|' pandoc.cabal"; + }); # Broken by GLUT update. Monadius = markBroken super.Monadius; From 8145d6abb9d82fbc2fe50f5f52ab91d29b6788f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 16 May 2015 14:44:15 +0200 Subject: [PATCH 271/615] haskell-bitcoin-api-extra: test suite requires network access --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e22e3f31f162..a71fa7fe92ee 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -293,6 +293,7 @@ self: super: { amqp = dontCheck super.amqp; amqp-conduit = dontCheck super.amqp-conduit; bitcoin-api = dontCheck super.bitcoin-api; + bitcoin-api-extra = dontCheck super.bitcoin-api-extra; concurrent-dns-cache = dontCheck super.concurrent-dns-cache; dbus = dontCheck super.dbus; # http://hydra.cryp.to/build/498404/log/raw hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw From a35ef4e3df5210acd4ecb74308d4a8185328c357 Mon Sep 17 00:00:00 2001 From: codyopel Date: Sat, 16 May 2015 20:23:25 -0400 Subject: [PATCH 272/615] ffmpeg: update branches ffmpeg_0_10: 0.10.15 -> 0.10.16 ffmpeg_2_2: 2.2.13 -> 2.2.15 ffmpeg_2_6: 2.6.1 -> 2.6.2 ffmpeg-full: 2.6.1 -> 2.6.2 --- pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++-- pkgs/development/libraries/ffmpeg/0.10.nix | 4 ++-- pkgs/development/libraries/ffmpeg/2.2.nix | 4 ++-- pkgs/development/libraries/ffmpeg/2.6.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index e674ef0b97bd..137340663402 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -231,11 +231,11 @@ assert x11grabExtlib -> libX11 != null && libXv != null; stdenv.mkDerivation rec { name = "ffmpeg-${version}"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { url = "https://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1hf77va46r8s05g5a5m7xx8b9vjzmqca0ajxsflsnbgf0s3kixm4"; + sha256 = "1fi93zy98wmls7x3jpr2yvckk2ia6a1yyygwrfaxq95pd6h3m7l8"; }; patchPhase = ''patchShebangs .''; diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix index bad142f6f96a..b008151d6cb7 100644 --- a/pkgs/development/libraries/ffmpeg/0.10.nix +++ b/pkgs/development/libraries/ffmpeg/0.10.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // rec { - version = "${branch}.15"; + version = "${branch}.16"; branch = "0.10"; - sha256 = "0p9x559fpj4zxll7rn3kwdig6y66c3ahv3pddmz23lljq5rvyvcb"; + sha256 = "1l9z5yfp1vq4z2y4mh91707dhcn41c3pd505i0gvdzcdsp5j6y77"; }) diff --git a/pkgs/development/libraries/ffmpeg/2.2.nix b/pkgs/development/libraries/ffmpeg/2.2.nix index e382fe7154de..fbbb75cb8320 100644 --- a/pkgs/development/libraries/ffmpeg/2.2.nix +++ b/pkgs/development/libraries/ffmpeg/2.2.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // rec { - version = "${branch}.13"; + version = "${branch}.15"; branch = "2.2"; - sha256 = "1vva8ffwxi3rg44byy09qlbiqrrd1h4rmsl5b1mbmvzvwl1lq1l0"; + sha256 = "1s2mf1lvvwj6vkbp0wdr21xki864xsfi1rsjaa67q5m9dx4rrnr4"; }) diff --git a/pkgs/development/libraries/ffmpeg/2.6.nix b/pkgs/development/libraries/ffmpeg/2.6.nix index 9e097ddfebb6..0974af75ccd5 100644 --- a/pkgs/development/libraries/ffmpeg/2.6.nix +++ b/pkgs/development/libraries/ffmpeg/2.6.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // rec { - version = "${branch}.1"; + version = "${branch}.2"; branch = "2.6"; - sha256 = "1hf77va46r8s05g5a5m7xx8b9vjzmqca0ajxsflsnbgf0s3kixm4"; + sha256 = "1fi93zy98wmls7x3jpr2yvckk2ia6a1yyygwrfaxq95pd6h3m7l8"; }) From c9d50c01282adb0c9e5d7dc38c8fe91ebb3b5943 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Sat, 16 May 2015 17:27:02 -0700 Subject: [PATCH 273/615] Revert "man-db: dont use libpipeline on darwin, causes build failure" This reverts commit ef66f1536dcfd9a78757436807de98be31e6cb48. --- pkgs/tools/misc/man-db/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index ce5467ee284f..403068b1bf7d 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -8,9 +8,7 @@ stdenv.mkDerivation rec { sha256 = "03ly0hbpgjnag576rgccanaisn7f6422q5qxrj64vyzslc2651y4"; }; - buildInputs = [ pkgconfig ] - ++ stdenv.lib.optional (!stdenv.isDarwin) libpipeline - ++ [ db groff ]; + buildInputs = [ pkgconfig libpipeline db groff ]; configureFlags = [ "--disable-setuid" From d90dd6d17bc5a116ef9875b6900305c2bd367887 Mon Sep 17 00:00:00 2001 From: C0DEHERO Date: Sat, 16 May 2015 22:48:43 -0400 Subject: [PATCH 274/615] irrlicht: update rev 3843 (1.8) -> rev 5104 (1.8); fixed awkward naming; use svn release branch --- .../libraries/irrlicht/default.nix | 22 +++------ .../libraries/irrlicht/irrlicht3843.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 53 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/libraries/irrlicht/irrlicht3843.nix diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index a682b3a6b829..8acd872fcb39 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -2,21 +2,16 @@ stdenv.mkDerivation rec { - # Version 3843 is required for supertuxkart - name = "irrlicht-1.8-svn-3843"; + name = "irrlicht-${version}-svn-${revision}"; + version = "1.8"; + revision = "5104"; # newest revision as of 05-16-15 src = fetchsvn { - url = https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk; - rev = 3843; - sha256 = "0v31l3k0fzy7isdsx2sh0baaixzlml1m7vgz6cd0015d9f5n99vl"; + url = "https://svn.code.sf.net/p/irrlicht/code/branches/releases/${version}"; # get 1.8 release (same regardless of rev) + rev = "${revision}"; + sha256 = "18xvlrjf113mphf29iy24hmrkh7xff6j9cz0chrxjqbr9xk9h1yq"; }; - patches = [ ./irrlicht-1.8.1-mesa-10.x.patch ]; - - postPatch = '' - sed -i /stdcall-alias/d source/Irrlicht/Makefile - ''; - preConfigure = '' cd source/Irrlicht ''; @@ -30,11 +25,6 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - postInstall = '' - ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so.1.8 - ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so - ''; - buildInputs = [ unzip mesa libXrandr libX11 libXxf86vm ]; meta = { diff --git a/pkgs/development/libraries/irrlicht/irrlicht3843.nix b/pkgs/development/libraries/irrlicht/irrlicht3843.nix new file mode 100644 index 000000000000..a682b3a6b829 --- /dev/null +++ b/pkgs/development/libraries/irrlicht/irrlicht3843.nix @@ -0,0 +1,45 @@ +{ fetchsvn, stdenv, mesa, unzip, libXrandr, libX11, libXxf86vm }: + + +stdenv.mkDerivation rec { + # Version 3843 is required for supertuxkart + name = "irrlicht-1.8-svn-3843"; + + src = fetchsvn { + url = https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk; + rev = 3843; + sha256 = "0v31l3k0fzy7isdsx2sh0baaixzlml1m7vgz6cd0015d9f5n99vl"; + }; + + patches = [ ./irrlicht-1.8.1-mesa-10.x.patch ]; + + postPatch = '' + sed -i /stdcall-alias/d source/Irrlicht/Makefile + ''; + + preConfigure = '' + cd source/Irrlicht + ''; + + buildPhase = '' + make sharedlib NDEBUG=1 + ''; + + preInstall = '' + sed -i s,/usr/local/lib,$out/lib, Makefile + mkdir -p $out/lib + ''; + + postInstall = '' + ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so.1.8 + ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so + ''; + + buildInputs = [ unzip mesa libXrandr libX11 libXxf86vm ]; + + meta = { + homepage = http://irrlicht.sourceforge.net/; + license = stdenv.lib.licenses.zlib; + description = "Open source high performance realtime 3D engine written in C++"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00737083a7b3..046398c6de75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6212,7 +6212,8 @@ let intltool = callPackage ../development/tools/misc/intltool { }; - irrlicht3843 = callPackage ../development/libraries/irrlicht { }; + irrlicht = callPackage ../development/libraries/irrlicht { }; + irrlicht3843 = callPackage ../development/libraries/irrlicht/irrlicht3843.nix { }; isocodes = callPackage ../development/libraries/iso-codes { }; From 3b913df2175fd98036f8e58bbee56712951215df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 17 May 2015 10:26:33 +0200 Subject: [PATCH 275/615] gnome3_16.gexiv2: maintenance update and fix hash /cc @lethalman. --- pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix index 7d2c8cf0eb39..1508338f6cae 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix @@ -5,24 +5,24 @@ let in stdenv.mkDerivation rec { name = "gexiv2-${version}"; - version = "${majorVersion}.0"; + version = "${majorVersion}.3"; src = fetchurl { url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz"; - sha256 = "2fd21f0ed5125e51d02226e7f41be751cfa8ae411a8ed1a651e16b06d79047b2"; + sha256 = "390cfb966197fa9f3f32200bc578d7c7f3560358c235e6419657206a362d3988"; }; - + preConfigure = '' patchShebangs . ''; - + buildInputs = [ pkgconfig glib libtool m4 ]; propagatedBuildInputs = [ exiv2 ]; - + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/gexiv2; description = "GObject wrapper around the Exiv2 photo metadata library"; platforms = platforms.linux; maintainers = [ maintainers.lethalman ]; }; -} \ No newline at end of file +} From ec1a281f0a52fc8095b328eb74b57b9aae9c6a9d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 17 May 2015 03:02:44 -0700 Subject: [PATCH 276/615] kernel-config: Fix for i686 --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 42bf534c5002..4f3813f6ed87 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -396,7 +396,7 @@ with stdenv.lib; KVM_COMPAT y ''} ${optionalString (versionAtLeast version "3.10") '' - KVM_DEVICE_ASSIGNMENT y + KVM_DEVICE_ASSIGNMENT? y ''} ${optionalString (versionAtLeast version "4.0") '' KVM_GENERIC_DIRTYLOG_READ_PROTECT y From 699adbf6f9a0b8ca69247ed2873a233b17a38927 Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Sun, 17 May 2015 12:31:57 +0200 Subject: [PATCH 277/615] storebackup 3.4 -> 3.5 --- pkgs/tools/backup/store-backup/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix index c986adeafdcc..ba8df4771487 100644 --- a/pkgs/tools/backup/store-backup/default.nix +++ b/pkgs/tools/backup/store-backup/default.nix @@ -12,17 +12,19 @@ let dummyMount = writeScriptBin "mount" "#!/bin/sh"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { - name = "store-backup-3.4"; + version = "3.5"; + + name = "store-backup-${version}"; enableParallelBuilding = true; buildInputs = [ perl makeWrapper ]; src = fetchurl { - url = http://download.savannah.gnu.org/releases/storebackup/storeBackup-3.4.tar.bz2; - sha256 = "101k3nhyfjj8y8hg0v0xqxsr4vlcfkmlczgbihvlv722fb7n5gi3"; + url = "http://download.savannah.gnu.org/releases/storebackup/storeBackup-${version}.tar.bz2"; + sha256 = "0y4gzssc93x6y93mjsxm5b5cdh68d7ffa43jf6np7s7c99xxxz78"; }; installPhase = '' From 796291568072a339f3dfeca86e76bdaa216a78fa Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 17 May 2015 06:43:26 -0400 Subject: [PATCH 278/615] ats2: bump --- pkgs/development/compilers/ats2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 8345a353f3f9..08cae4d3e420 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ats2-${version}"; - version = "0.1.11"; + version = "0.1.12"; src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "1dy2f7lxfwcmrk753midr75cy8xs6pqnmqmj9xj0ch479q4pkpsv"; + sha256 = "1jiki88mzhki74xh5ffw3pali5zs74pa0nylcb8n4ypfvdpqvlhb"; }; buildInputs = [ gmp ]; From 59cf968fb3547b7071c446a4fc85b7737eaa5f7b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 17 May 2015 13:30:38 +0200 Subject: [PATCH 279/615] haskell-blaze-builder: fix build with GHC 7.6.3 --- pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 3 +++ 1 file changed, 3 insertions(+) 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 8be816b0c9b6..0970108eef7f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -85,4 +85,7 @@ self: super: { patchPhase = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; } ); + # blaze-builder requires an additional build input on older compilers. + blaze-builder = addBuildDepend super.blaze-builder super.bytestring-builder; + } From bb750e2b1bd23d5cedff1accae4c6e05701f1b6e Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Wed, 13 May 2015 19:53:00 +0200 Subject: [PATCH 280/615] enable padsp again --- pkgs/servers/pulseaudio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 1161d73c28f3..8dee9a801e36 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { (mkEnable false "samplerate" null) # Deprecated (mkWith true "database" databaseName) (mkEnable hasOss "oss-output" null) - (mkEnable hasOss "oss-wrapper" null) + (mkEnable true "oss-wrapper" null) # Does not use OSS (mkEnable (optCoreaudio != null) "coreaudio-output" null) (mkEnable (optAlsaLib != null) "alsa" null) (mkEnable (optEsound != null) "esound" null) From f9f55b4147054ab98d5426fac8ea8b36b9d1d923 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 16 May 2015 22:42:29 +0200 Subject: [PATCH 281/615] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/21baf54727572b87f13bbed9cf10c3f07bc2ce55 with hackage2nix revision b0eec6a5853fb52a28ae3ded058c3f7d0c510e2a --- .../haskell-modules/hackage-packages.nix | 265 ++++++++++-------- 1 file changed, 155 insertions(+), 110 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 45a053f311c6..09156dbb459b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -26338,12 +26338,15 @@ self: { mkDerivation { pname = "bloomfilter"; version = "2.0.0.0"; + revision = "1"; sha256 = "07fif8i5rinysli1mpi92k405kvw8va7w9v9w4wd5bylb87zy77f"; + editedCabalFile = "2e5d001d62c85fd1647aef4112ae5830181c099d588e03719a14048511ca702e"; buildDepends = [ array base bytestring deepseq ]; testDepends = [ base bytestring QuickCheck random test-framework test-framework-quickcheck2 ]; + jailbreak = true; homepage = "https://github.com/bos/bloomfilter"; description = "Pure and impure Bloom Filter implementations"; license = stdenv.lib.licenses.bsd3; @@ -30133,8 +30136,8 @@ self: { }: mkDerivation { pname = "cf"; - version = "0.2"; - sha256 = "0lc7q5nm4c1rjsbvw1b794kxspxqfm124351jkpzi7a9l2gvqcka"; + version = "0.3"; + sha256 = "06r289lb3aq9wh2xggpg7pbxf60wkz1fmdy7ibyawa1sxpprrs07"; buildDepends = [ base ]; testDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -44841,17 +44844,18 @@ self: { }) {}; "elm-init" = callPackage - ({ mkDerivation, base, bytestring, file-embed, json, system-fileio - , system-filepath + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , directory, file-embed, filepath, text }: mkDerivation { pname = "elm-init"; - version = "0.1.0.1"; - sha256 = "0y3705aq1h8ip4zsvdvhn7gf3940h3k77nkxdmn84wq12sfx6fnq"; + version = "0.1.1.1"; + sha256 = "1qb61m0jd4c63x8av5v3iaxw1k4isi2yzrqjw0xznkf8m07hz4vb"; isLibrary = false; isExecutable = true; buildDepends = [ - base bytestring file-embed json system-fileio system-filepath + aeson aeson-pretty base bytestring containers directory file-embed + filepath text ]; description = "Set up basic structure for an elm project"; license = stdenv.lib.licenses.mit; @@ -46348,8 +46352,8 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "0.7.2.0"; - sha256 = "0nwypn0yny60mjxa76dy1rn1hnsc0wvdsmv3kl1kahzsgcvh47r1"; + version = "0.7.2.1"; + sha256 = "0zhasybpvmi3f0kb2pipb03jnv4d710gcr6mphszgkj5179wvad2"; buildDepends = [ aeson async attoparsec base bytestring cereal containers network protobuf random sodium stm text time unordered-containers uuid @@ -46507,8 +46511,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "exceptional"; - version = "0.1.4.1"; - sha256 = "1i9srv7yv0hzs8hkpfsjm2idzw20y6wc7b8sscn2h5cp0cfpfrsh"; + version = "0.1.4.2"; + sha256 = "0macyynwj779wy1abzrl87g8zmpwa98x5vc5yqc0wnr06glmma2b"; buildDepends = [ base ]; homepage = "https://github.com/pharpend/exceptional"; description = "Essentially the Maybe type with error messages"; @@ -50678,8 +50682,8 @@ self: { }: mkDerivation { pname = "full-text-search"; - version = "0.2.1.1"; - sha256 = "1rz4gimbk32677158321xs36pkc5ywjhm2sisw8hrwa3zlfjkrfc"; + version = "0.2.1.3"; + sha256 = "0s537hzb21w506bp4i6v7k5sbk905s9950gihh99r0b7id185ppk"; isLibrary = true; isExecutable = true; buildDepends = [ array base containers text vector ]; @@ -58223,8 +58227,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.1.3"; - sha256 = "19lil82sf441xji7qxvrzdj7vps56wsksgixazzak88azl9li6rj"; + version = "2.1.4"; + sha256 = "075bncl5mz7hi674gyhd9mrnf3xb8zn5frcy39dj5m7jrsrdy91z"; buildDepends = [ acid-state aeson authenticate base base64-bytestring boomerang bytestring containers data-default filepath happstack-hsp @@ -59809,27 +59813,27 @@ self: { "haskell-neo4j-client" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , data-default, hashable, HTTP, http-conduit, http-types, HUnit - , lifted-base, mtl, QuickCheck, resourcet, scientific + , lifted-base, mtl, network-uri, QuickCheck, resourcet, scientific , test-framework, test-framework-hunit, test-framework-quickcheck2 , test-framework-th, text, transformers, transformers-base , transformers-compat, unordered-containers, vector }: mkDerivation { pname = "haskell-neo4j-client"; - version = "0.3.0.15"; - sha256 = "1gxnwz7xzf4l0d4hwi8ij95910d38l89i9x3sw051zwn4fzns1cv"; + version = "0.3.1.1"; + sha256 = "1l5dpaa97h6qxlhq0rzk24p3l943zf3c948jvng4ajl3gmhniy1w"; buildDepends = [ aeson base bytestring containers data-default hashable HTTP - http-conduit http-types lifted-base mtl resourcet scientific text - transformers transformers-base transformers-compat + http-conduit http-types lifted-base mtl network-uri resourcet + scientific text transformers transformers-base transformers-compat unordered-containers vector ]; testDepends = [ aeson base bytestring Cabal data-default hashable HTTP http-conduit - http-types HUnit lifted-base mtl QuickCheck resourcet scientific - test-framework test-framework-hunit test-framework-quickcheck2 - test-framework-th text transformers transformers-base - transformers-compat unordered-containers vector + http-types HUnit lifted-base mtl network-uri QuickCheck resourcet + scientific test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th text transformers + transformers-base transformers-compat unordered-containers vector ]; jailbreak = true; homepage = "https://github.com/asilvestre/haskell-neo4j-rest-client"; @@ -60080,7 +60084,6 @@ self: { base haskell-src-exts pretty syb template-haskell th-orphans uniplate ]; - jailbreak = true; description = "Parse source to template-haskell abstract syntax"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -64309,18 +64312,18 @@ self: { "hipbot" = callPackage ({ mkDerivation, aeson, base, bifunctors, blaze-builder, bytestring , either, exceptions, http-client, http-client-tls, http-types, jwt - , lens, mtl, network-uri, postgresql-simple, safe, stm, text, time - , transformers, unordered-containers, utf8-string, wai, wai-lens - , webcrank-wai, wreq + , lens, mtl, network-uri, postgresql-simple, resource-pool, safe + , stm, text, time, transformers, unordered-containers, utf8-string + , wai, wai-lens, webcrank-wai, wreq }: mkDerivation { pname = "hipbot"; - version = "0.2.1"; - sha256 = "12rixjkgxg43nwi93sr04vv8c9cw3v6rsyfpyklcpibcjg0yn6yn"; + version = "0.3.0.2"; + sha256 = "04czq0ix78amd217cf5yj8yvkr4hpsaa38rdmjish40b63crnba3"; buildDepends = [ aeson base bifunctors blaze-builder bytestring either exceptions http-client http-client-tls http-types jwt lens mtl network-uri - postgresql-simple safe stm text time transformers + postgresql-simple resource-pool safe stm text time transformers unordered-containers utf8-string wai wai-lens webcrank-wai wreq ]; jailbreak = true; @@ -69614,8 +69617,8 @@ self: { }: mkDerivation { pname = "hspec-snap"; - version = "0.3.2.6"; - sha256 = "12kmkixr7azd33r5fx3z4siw0xdkda4sfxwi75vlm5w9w07ackpn"; + version = "0.3.2.7"; + sha256 = "0d1mmk4w82bxyi682fdmgxk5zm6ni3yhpvkps4m3i04x6gf2xyaj"; buildDepends = [ base bytestring containers digestive-functors HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text transformers @@ -76620,8 +76623,8 @@ self: { }: mkDerivation { pname = "json-autotype"; - version = "1.0"; - sha256 = "0vny84qr14i2q7hkvmngbryn6r9hxsmk6c5dw6f93s8cn0ymgsk8"; + version = "1.0.1"; + sha256 = "0p06zv61giwbnwcdcg8fq7mmw3islcj807df4xhaxggr8r3dwywv"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -76804,8 +76807,8 @@ self: { }: mkDerivation { pname = "json-rpc-client"; - version = "0.1.2.0"; - sha256 = "1arn4ik9fyicb875ac0y7dp9ahipvip8fq2mr95vvmhym921ca64"; + version = "0.1.3.0"; + sha256 = "10wb9nv9ijqjn4w6mp306k58s2pqzc91529rgw29h72ww6q70ylq"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -77506,8 +77509,8 @@ self: { }: mkDerivation { pname = "keter"; - version = "1.4.0"; - sha256 = "1psa0xs0j8s117ifhd2347kiiq0mvprp7kcb933l8977p10nqi9k"; + version = "1.4.0.1"; + sha256 = "0bzd0f8i88bdwz2aqvx3q2mfidm0947wwrnxrdii778mjr8c1nyb"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -78230,12 +78233,12 @@ self: { }) {}; "lambda-options" = callPackage - ({ mkDerivation, base, containers, monad-loops, mtl }: + ({ mkDerivation, base, containers, mtl }: mkDerivation { pname = "lambda-options"; - version = "0.3.0.0"; - sha256 = "1yma67b7d55lyq81afpw1wrqyjv84cxqbbrw3rr1qvdkx16b9pwa"; - buildDepends = [ base containers monad-loops mtl ]; + version = "0.5.1.0"; + sha256 = "0h4s46z734l8b7ivx8h1kh2nhbqsz6zswxs1dqfhqrbcyf4vi2fl"; + buildDepends = [ base containers mtl ]; jailbreak = true; homepage = "https://github.com/thomaseding/lambda-options"; description = "A modern command-line parser for Haskell"; @@ -87922,8 +87925,8 @@ self: { }: mkDerivation { pname = "mongoDB"; - version = "2.0.4"; - sha256 = "1gcv2vzmg6vllvpl8pzfkwmf4rqwldz4p0l4gl78hixbbilx0pgy"; + version = "2.0.5"; + sha256 = "09ysw5sp7x8pyfsjj1qgfq3wm8l0cpxkv9g9x117iss04bfk0p3h"; buildDepends = [ array base binary bson bytestring containers cryptohash hashtables lifted-base monad-control mtl network parsec random random-shuffle @@ -94449,6 +94452,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pager" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , directory, process, resourcet, safe, terminfo, text, transformers + , unix + }: + mkDerivation { + pname = "pager"; + version = "0.1.1.0"; + sha256 = "1wzfsindjxx61nca36hhldy0y33pgagg506ls9ldvrkvl4n4y7iy"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bytestring conduit conduit-extra directory process resourcet + safe terminfo text transformers unix + ]; + homepage = "https://github.com/pharpend/pager"; + description = "Open up a pager, like 'less' or 'more'"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "pagerduty" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring , bytestring-conversion, conduit, data-default-class, exceptions @@ -94631,7 +94654,9 @@ self: { mkDerivation { pname = "pandoc-csv2table"; version = "1.0.0"; + revision = "1"; sha256 = "0jr18sa5apvy8jckb5cxvsyr6c2drii6652ipwpd4xkdwrabwp5r"; + editedCabalFile = "49799682e063ffa396f94dd2f91e9b252f0224544d2e7a9d1dc5b41a909efd3d"; isLibrary = true; isExecutable = true; buildDepends = [ base csv pandoc pandoc-types text ]; @@ -94914,8 +94939,8 @@ self: { }: mkDerivation { pname = "parconc-examples"; - version = "0.3.4"; - sha256 = "1i8kkjak3byzypaiqi7iavhswmvs98cvcrakdxpd8cm52gj6xk2d"; + version = "0.3.5"; + sha256 = "05id69rb2cdzs1jf7zgv0gxgvbwm6x83s6ihdh9w1wnnpa7ykpap"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -96475,8 +96500,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.1.5.2"; - sha256 = "0csmkyfjyqgi2nl8ihsnj0s4l7kyyddm0q9qpkwwm5gqjrjwk1wc"; + version = "2.1.5.3"; + sha256 = "1ir23x7b2hagpiiva45fmcyfdmi2cw7m0qf2zqdp22lpa41vlyvl"; buildDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger persistent postgresql-libpq @@ -100455,8 +100480,8 @@ self: { }: mkDerivation { pname = "profunctors"; - version = "5.0.0.1"; - sha256 = "0p9an9j387rhv6fzbvwaz91m9g5f69lhx2jr23riygprjfn8xs99"; + version = "5.0.1"; + sha256 = "1n6lk1r10j5ssb88ia13zll1k2gsakvf314m51sz3nzmdcgx03ll"; buildDepends = [ base comonad distributive tagged transformers ]; homepage = "http://github.com/ekmett/profunctors/"; description = "Profunctors"; @@ -109554,8 +109579,8 @@ self: { ({ mkDerivation, base, containers, transformers }: mkDerivation { pname = "sequence"; - version = "0.9.7"; - sha256 = "1q2v51dxi21jbq7ll7g1x85pxxz7bywgsqrwfrgzf0p96da05ps7"; + version = "0.9.8"; + sha256 = "0ayxy0lbkah90kpyjac0llv6lrbwymvfz2d3pdfrz1079si65jsh"; buildDepends = [ base containers transformers ]; homepage = "https://github.com/atzeus/sequence"; description = "A type class for sequences and various sequence data structures"; @@ -115438,6 +115463,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stack" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "stack"; + version = "0.0.0"; + sha256 = "0829d2yb32gfnn22idhwzpyc2gy3d7lyj19kh20fbq73fp7k9kmb"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base ]; + description = "The Haskell Tool Stack"; + license = stdenv.lib.licenses.mit; + }) {}; + "stack-prism" = callPackage ({ mkDerivation, base, profunctors, tagged, template-haskell , transformers @@ -121204,32 +121242,31 @@ self: { }) {}; "text-show-instances" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, directory - , haskeline, hoopl, hpc, old-locale, old-time, pretty - , quickcheck-instances, random, semigroups, tagged, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, terminfo, text - , text-show, time, transformers, transformers-compat, unix - , unordered-containers, utf8-string, vector, xhtml + ({ mkDerivation, base, base-compat, binary, bytestring, containers + , directory, haskeline, hoopl, hpc, hspec, old-locale, old-time + , pretty, QuickCheck, quickcheck-instances, random, semigroups + , tagged, template-haskell, terminfo, text, text-show, time + , transformers, transformers-compat, unix, unordered-containers + , utf8-string, vector, xhtml }: mkDerivation { pname = "text-show-instances"; - version = "0.3.0.1"; - sha256 = "1a6ybgx5jivacy7b0bja5f7an1xq9mjmr2x348knaf84v2wqws9p"; + version = "0.4"; + sha256 = "1zk3q11dsr8n15r6r9dhqwyh6irqv6s2q7mkgzlgzw1narvllil2"; buildDepends = [ - base binary bytestring containers directory haskeline hoopl hpc - old-locale old-time pretty random semigroups tagged + base base-compat binary bytestring containers directory haskeline + hoopl hpc old-locale old-time pretty random semigroups tagged template-haskell terminfo text text-show time transformers transformers-compat unix unordered-containers utf8-string vector xhtml ]; testDepends = [ - base binary bytestring containers directory haskeline hoopl hpc - old-locale old-time pretty quickcheck-instances random semigroups - tagged tasty tasty-hunit tasty-quickcheck template-haskell terminfo - text-show time transformers transformers-compat unix + base base-compat binary bytestring containers directory haskeline + hoopl hpc hspec old-locale old-time pretty QuickCheck + quickcheck-instances random semigroups tagged template-haskell + terminfo text-show time transformers transformers-compat unix unordered-containers utf8-string vector xhtml ]; - jailbreak = true; homepage = "https://github.com/RyanGlScott/text-show-instances"; description = "Additional instances for text-show"; license = stdenv.lib.licenses.bsd3; @@ -121630,6 +121667,22 @@ self: { }) {}; "th-orphans" = callPackage + ({ mkDerivation, base, hspec, mtl, nats, template-haskell, th-lift + , th-reify-many + }: + mkDerivation { + pname = "th-orphans"; + version = "0.11.1"; + sha256 = "111ckvvicr953aqnnkn7rn089dprz57h95cg95rs7f1zz318h2xy"; + buildDepends = [ + base mtl nats template-haskell th-lift th-reify-many + ]; + testDepends = [ base hspec template-haskell ]; + description = "Orphan instances for TH datatypes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "th-orphans_0_12_0" = callPackage ({ mkDerivation, base, hspec, mtl, nats, template-haskell, th-lift , th-reify-many }: @@ -123168,14 +123221,11 @@ self: { ({ mkDerivation, base, containers, text }: mkDerivation { pname = "tokenify"; - version = "0.1.0.0"; - revision = "2"; - sha256 = "0a75bk0ykmgpwh60whawqw6d2p195w5m140l5shq1v949l1d5m7x"; - editedCabalFile = "32816d10d3cc2d7c15a68a3001a7e080682d3d611b3dabb7cc6b07bffed20f2f"; + version = "0.1.2.0"; + sha256 = "1fyf1ym91dbhiw7hybzhllc375v4pizl058qazfdyw6cymqm4rch"; buildDepends = [ base containers text ]; - jailbreak = true; homepage = "https://github.com/AKST/tokenify"; - description = "A regex based LR tokenizer"; + description = "A regex lexer"; license = stdenv.lib.licenses.mit; }) {}; @@ -126760,17 +126810,17 @@ self: { }) {}; "up" = callPackage - ({ mkDerivation, base, directory, filepath, mtl, parsec, split - , transformers + ({ mkDerivation, base, directory, filepath, lambda-options, mtl + , split }: mkDerivation { pname = "up"; - version = "1.0.0.2"; - sha256 = "10dd90walys2q30b80c6z76v4lixp6cjbxq7gc43mqb67p0qnk67"; + version = "1.0.0.3"; + sha256 = "1w37jmnmx2vrdwbdcnhb29bvy4857pzcx4gdavmcp598lsfj34vy"; isLibrary = false; isExecutable = true; buildDepends = [ - base directory filepath mtl parsec split transformers + base directory filepath lambda-options mtl split ]; jailbreak = true; homepage = "https://github.com/thomaseding/up"; @@ -134590,8 +134640,8 @@ self: { "yesod-bin" = callPackage ({ 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 + , containers, data-default-class, deepseq, directory, file-embed + , filepath, fsnotify, ghc, ghc-paths, http-client, http-conduit , http-reverse-proxy, http-types, lifted-base, network , optparse-applicative, parsec, process, project-template , resourcet, shakespeare, split, streaming-commons, tar @@ -134601,15 +134651,15 @@ self: { }: mkDerivation { pname = "yesod-bin"; - version = "1.4.8"; - sha256 = "14q0m62wh35im7j12v8rmd0qwxdyvxk88gbsd19p26q03xf832da"; + version = "1.4.9.1"; + sha256 = "0ja7ayl1vmbjrlxngfvamfbw0cnqappdv0fqm6kdfhd8phpp9x94"; isLibrary = false; isExecutable = true; buildDepends = [ 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 + Cabal conduit conduit-extra containers data-default-class deepseq + directory file-embed filepath fsnotify ghc ghc-paths http-client + http-conduit http-reverse-proxy http-types lifted-base network optparse-applicative parsec process project-template resourcet shakespeare split streaming-commons tar template-haskell text time transformers transformers-compat unix-compat unordered-containers @@ -135670,38 +135720,35 @@ self: { }) {}; "yi" = callPackage - ({ mkDerivation, array, base, binary, bytestring, Cabal - , cautious-file, containers, data-default, directory, dlist - , dynamic-state, dyre, exceptions, filepath, glib, gtk, hashable - , hint, HUnit, lens, mtl, old-locale, oo-prototypes, pango, parsec - , pointedlist, process, QuickCheck, random, regex-base, regex-tdfa - , safe, semigroups, split, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, time, transformers-base, unix - , unix-compat, unordered-containers, utf8-string, vty, word-trie - , xdg-basedir, yi-language, yi-rope + ({ mkDerivation, array, base, binary, bytestring, Cabal, containers + , data-default, directory, dlist, dynamic-state, dyre, exceptions + , filepath, glib, gtk, hashable, HUnit, lens, mtl, old-locale + , oo-prototypes, pango, parsec, pointedlist, process, QuickCheck + , regex-base, regex-tdfa, safe, semigroups, split, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, text, time + , transformers-base, unix, unix-compat, unordered-containers, vty + , word-trie, xdg-basedir, yi-language, yi-rope }: mkDerivation { pname = "yi"; - version = "0.11.2"; - sha256 = "0kqrdbfpihyds8mdai6j4dzzd8wbcchji0gdgpfb4w5kwhhh9dvz"; + version = "0.12.0"; + sha256 = "167x1zmkhrh7s4wjvvpp0pydgif1yl05by8j6wimi79wwvnkiyi7"; isLibrary = true; isExecutable = true; buildDepends = [ - array base binary bytestring Cabal cautious-file containers - data-default directory dlist dynamic-state dyre exceptions filepath - glib gtk hashable hint lens mtl old-locale oo-prototypes pango - parsec pointedlist process QuickCheck random regex-base regex-tdfa - safe semigroups split template-haskell text time transformers-base - unix unix-compat unordered-containers utf8-string vty word-trie - xdg-basedir yi-language yi-rope + array base binary bytestring Cabal containers data-default + directory dlist dynamic-state dyre exceptions filepath glib gtk + hashable lens mtl old-locale oo-prototypes pango parsec pointedlist + process regex-base regex-tdfa safe semigroups split + template-haskell text time transformers-base unix unix-compat + unordered-containers vty word-trie xdg-basedir yi-language yi-rope ]; testDepends = [ base directory filepath HUnit lens QuickCheck semigroups tasty tasty-hunit tasty-quickcheck text yi-language yi-rope ]; configureFlags = [ "-fpango" "-fvty" ]; - jailbreak = true; - homepage = "http://haskell.org/haskellwiki/Yi"; + homepage = "https://yi-editor.github.io"; description = "The Haskell-Scriptable Editor"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -136502,10 +136549,8 @@ self: { }: mkDerivation { pname = "zlib"; - version = "0.6.1.0"; - revision = "1"; - sha256 = "1yc4zfysbj28px064bfwz9n3b3i57c1dsfvkzgfxxmgj1mq65q7n"; - editedCabalFile = "4efd1cd219decf6e6a97795a52344922c36aace77dc4b6834502c218d48b9f13"; + version = "0.6.1.1"; + sha256 = "0dd79dxf56d8f6ad9if3j87s9gg7yd17ckypjxwplrbkahlb9xf5"; buildDepends = [ base bytestring ]; testDepends = [ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck From 1c678fdcf3c84e2410901ecb46127a1d355fd4ff Mon Sep 17 00:00:00 2001 From: Joel Moberg Date: Sun, 17 May 2015 15:12:27 +0200 Subject: [PATCH 282/615] scipy: 0.14.0 -> 0.15.1 Fixes #7870 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 36feab0056e6..848f303915f7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11085,11 +11085,11 @@ let scipy = buildPythonPackage rec { - name = "scipy-0.14.0"; + name = "scipy-0.15.1"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/scipy/${name}.tar.gz"; - md5 = "d7c7f4ccf8b07b08d6fe49d5cd51f85d"; + sha256 = "16i5iksaas3m0hgbxrxpgsyri4a9ncbwbiazlhx5d6lynz1wn4m2"; }; buildInputs = [ pkgs.gfortran ]; From 8c1dfabdce9cf00c1565e784bb3d55daa5c6284e Mon Sep 17 00:00:00 2001 From: Joel Moberg Date: Wed, 22 Apr 2015 19:19:27 +0200 Subject: [PATCH 283/615] rpy2: initial --- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 98b012ecd466..b9d64a176737 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10955,6 +10955,22 @@ let }); + rpy2 = buildPythonPackage rec { + name = "rpy2-2.5.6"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/r/rpy2/${name}.tar.gz"; + md5 = "a36e758b633ce6aec6a5f450bfee980f"; + }; + buildInputs = with pkgs; [ readline R pcre lzma bzip2 zlib icu ]; + propagatedBuildInputs = [ self.singledispatch ]; + meta = { + homepage = http://rpy.sourceforge.net/rpy2; + description = "Python interface to R"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.joelmo ]; + }; + }; + rpyc = buildPythonPackage rec { name = "rpyc-${version}"; version = "3.3.0"; From 3a966376bf610083da36ba312eb8cdae46de6af5 Mon Sep 17 00:00:00 2001 From: C0DEHERO Date: Sat, 16 May 2015 23:36:38 -0400 Subject: [PATCH 284/615] voxelands: added 1504.01 --- pkgs/games/voxelands/default.nix | 31 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/games/voxelands/default.nix diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix new file mode 100644 index 000000000000..09c28f34c3a7 --- /dev/null +++ b/pkgs/games/voxelands/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, cmake, irrlicht, libpng, bzip2, sqlite +, libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, pkgconfig }: + +stdenv.mkDerivation rec { + name = "voxelands-${version}"; + version = "1504.01"; + + src = fetchurl { + url = "http://voxelands.com/downloads/${name}-src.tar.bz2"; + sha256 = "17jv2pz0mbkkf7jw3jcpix8hb46b382hc7vki42n9rrdynydq5zp"; + }; + + cmakeFlags = [ + "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht" + "-DCMAKE_C_FLAGS_RELEASE=-DNDEBUG" + "-DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG" + ]; + + buildInputs = [ + cmake irrlicht libpng bzip2 libjpeg sqlite + libXxf86vm mesa openal libvorbis x11 pkgconfig + ]; + + meta = with stdenv.lib; { + homepage = http://voxelands.com/; + description = "Infinite-world block sandbox game based on Minetest"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ jgeerds ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3efdf8365676..6d700ff5bfe2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13273,6 +13273,10 @@ let vessel = callPackage_i686 ../games/vessel { }; + voxelands = callPackage ../games/voxelands { + libpng = libpng12; + }; + warmux = callPackage ../games/warmux { }; warsow = callPackage ../games/warsow { From e505663051c37e15b1d979465b2a5250cee219e5 Mon Sep 17 00:00:00 2001 From: C0DEHERO Date: Sat, 16 May 2015 22:02:43 -0400 Subject: [PATCH 285/615] supertuxkart: update 0.8.1 -> 0.9 --- lib/maintainers.nix | 1 + pkgs/games/super-tux-kart/default.nix | 38 +++++++++++++++------------ 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 6906abd2c78c..f13e05708c4a 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -43,6 +43,7 @@ bosu = "Boris Sukholitko "; bramd = "Bram Duvigneau "; bstrik = "Berno Strik "; + c0dehero = "CodeHero "; calrama = "Moritz Maxeiner "; campadrenalin = "Philip Horger "; cdepillabout = "Dennis Gosnell "; diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index f3574d137d39..29e923108e18 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -1,30 +1,34 @@ -{ fetchurl, cmake, stdenv, plib, SDL, openal, freealut, mesa +{ fetchgit, fetchsvn, cmake, stdenv, plib, SDL, openal, freealut, mesa , libvorbis, libogg, gettext, libXxf86vm, curl, pkgconfig -, fribidi, autoconf, automake, libtool, bluez }: +, fribidi, autoconf, automake, libtool, bluez, libjpeg }: stdenv.mkDerivation rec { - version = "0.8.1"; name = "supertuxkart-${version}"; - src = fetchurl { - url = "mirror://sourceforge/supertuxkart/${name}-src.tar.bz2"; - sha256 = "1mpqmi62a2kl6n58mw11fj0dr5xiwmjkqnfmd2z7ghdhc6p02lrk"; - }; - + version = "0.9"; + srcs = [ + (fetchgit { + url = "https://github.com/supertuxkart/stk-code"; + rev = "28a525f6d4aba2667c41a549b027149fcceda97e"; + sha256 = "0b5izr7j3clm6pcxanwwaas06f17wi454s6hwmgv1mg48aay2v97"; + name = "stk-code"; + }) + (fetchsvn { + url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; + rev = "16293"; + sha256 = "07jdkli28xr3rcxvixyy5bwi26n5i7dkhd9q0j4wifgs4pymm8r5"; + name = "stk-assets"; + }) + ]; + buildInputs = [ plib SDL openal freealut mesa libvorbis libogg gettext - libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake bluez + libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake bluez libjpeg ]; enableParallelBuilding = true; - preConfigure = '' - echo Building internal Irrlicht - cd lib/irrlicht/source/Irrlicht/ - cp "${mesa}"/include/GL/{gl,glx,wgl}ext.h . - NDEBUG=1 make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} - cd - - ''; + sourceRoot = "stk-code"; meta = { description = "A Free 3D kart racing game"; @@ -35,6 +39,6 @@ stdenv.mkDerivation rec { ''; homepage = http://supertuxkart.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + maintainers = with stdenv.lib.maintainers; [ c0dehero fuuzetsu ]; }; } From b549ce1ddd4516118eb802a25a539fdf99b0e69a Mon Sep 17 00:00:00 2001 From: C0DEHERO Date: Sat, 16 May 2015 22:58:37 -0400 Subject: [PATCH 286/615] minetest: update 0.4.4 -> 0.4.12 --- pkgs/games/minetest/default.nix | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 6c53bc3fdb3c..ac0b72d17e5b 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchgit, cmake, irrlicht3843, libpng, bzip2, - libjpeg, libXxf86vm, mesa, openal, libvorbis, x11 }: +{ stdenv, fetchgit, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp +, libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, sqlite }: let - version = "0.4.4"; + version = "0.4.12"; sources = { src = fetchgit { - url = "https://github.com/celeron55/minetest.git"; - rev = "ab06fca4bed26f3dc97d5e5cff437d075d7acff8"; - sha256 = "033gajwxgs8dqxb8684waaav28s0qd6cd4rlzfldwgdbkwam9cb1"; + url = "https://github.com/minetest/minetest.git"; + rev = "7993a403f2c17a215e4895ba1848aaf69bb61980"; + sha256 = "04v6fd9r9by8g47xbjzkhkgac5zpik01idngbbx2in4fxrg3ac7c"; }; data = fetchgit { - url = "https://github.com/celeron55/minetest_game.git"; - rev = "3928eccf74af0288d12ffb14f8222fae479bc06b"; - sha256 = "1gw2267bnqwfpnm7iq014y1vkb1v3nhpg1dmg9vgm9z5yja2blif"; + url = "https://github.com/minetest/minetest_game.git"; + rev = "03c00a831d5c2fd37096449bee49557879068af1"; + sha256 = "1qqhlfz296rmi3mmlvq1rwv7hq5w964w1scry095xaih7y11ycmk"; }; }; in stdenv.mkDerivation { @@ -21,12 +21,12 @@ in stdenv.mkDerivation { src = sources.src; cmakeFlags = [ - "-DIRRLICHT_INCLUDE_DIR=${irrlicht3843}/include/irrlicht" + "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht" ]; buildInputs = [ - cmake irrlicht3843 libpng bzip2 libjpeg - libXxf86vm mesa openal libvorbis x11 + cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp + libXxf86vm mesa openal libvorbis x11 sqlite ]; postInstall = '' @@ -34,9 +34,11 @@ in stdenv.mkDerivation { cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/ ''; - meta = { - homepage = "http://minetest.net/"; + meta = with stdenv.lib; { + homepage = http://minetest.net/; description = "Infinite-world block sandbox game"; - license = stdenv.lib.licenses.lgpl21Plus; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ jgeerds ]; }; } From 393219d00052dc47494d81a9619e25f1152314e5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2015 19:33:18 +0200 Subject: [PATCH 287/615] hplip: stop installing corrupted tools None of the installed tools like hp-align or hp-toolbox could work, because they tried to import wrapped Python scripts (i.e. shell code) as Python modules. Fix this by: - Substituting `dbus` for the defective `pythonDBus`. - No longer blindly wrapping all python files, but replacing the original symlinks in $out/bin with wrapper scripts. These wrappers then `exec` the unmodified Python scripts in $out/share/hplip directly, instead of the .-wrapped copy that wrapPythonProgramsIn creates. The latter are simply removed. Sure, it's a bit ugly. It's also 2015 and I couldn't use my printer :-/ --- pkgs/misc/drivers/hplip/default.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index bb790be7c268..7e5759235c66 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, automake, pkgconfig , cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus -, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp -, withPlugin ? false, substituteAll +, polkit, qtSupport ? true, qt4, pyqt4, net_snmp +, withPlugin ? false, substituteAll, makeWrapper }: let @@ -74,7 +74,19 @@ stdenv.mkDerivation { postInstall = '' - wrapPythonPrograms + # Wrap the user-facing Python scripts in /bin without turning the ones + # in /share into shell scripts (they need to be importable). + # Complicated by the fact that /bin contains just symlinks to /share. + for bin in $out/bin/*; do + py=`readlink -m $bin` + rm $bin + cp $py $bin + wrapPythonProgramsIn $bin "$out $pythonPath" + sed -i "s@$(dirname $bin)/[^ ]*@$py@g" $bin + done + + # Remove originals. Knows a little too much about wrapPythonProgramsIn. + rm -f $out/bin/.*-wrapped '' + (stdenv.lib.optionalString withPlugin (let hplip_arch = @@ -130,8 +142,8 @@ stdenv.mkDerivation { ] ++ stdenv.lib.optional qtSupport qt4; pythonPath = with pythonPackages; [ + dbus pillow - pythonDBus pygobject recursivePthLoader reportlab @@ -144,6 +156,6 @@ stdenv.mkDerivation { then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ]; - maintainers = with maintainers; [ ttuegel jgeerds ]; + maintainers = with maintainers; [ ttuegel jgeerds nckx ]; }; } From 5583067fd8cef883aa75200fb4160e0909f3c8f8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 17 May 2015 14:15:39 -0500 Subject: [PATCH 288/615] emacsWithPackages: install support files The wrapper needs to link the desktop file, icons, info and man pages into place so they will appear when emacsWithPackages is installed. --- pkgs/build-support/emacs/wrapper.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 678ba4502112..4020a1aca337 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -66,6 +66,12 @@ stdenv.mkDerivation { makeWrapper "$prog" $out/bin/$(basename "$prog") \ --suffix EMACSLOADPATH ":" "$out/share/emacs/site-lisp:" done + + mkdir -p $out/share + # Link icons and desktop files into place + for dir in applications icons info man; do + ln -s $emacs/share/$dir $out/share/$dir + done ''; inherit (emacs) meta; } From 6d176afe5e3664e2a522afcc59c5dc3a5b40c455 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 2 May 2015 05:56:48 +0300 Subject: [PATCH 289/615] generic-extlinux-compatible: Add new bootloader for ARM This module generates a /boot/extlinux/extlinux.conf bootloader configuration file that is supported by e.g. U-Boot: http://git.denx.de/?p=u-boot.git;a=blob;f=doc/README.distro;hb=refs/heads/master With this, all ARM boards supported by U-Boot can be booted in a common way (a single boot file generator, all boards booting via initrd like x86) and with same boot menu functionality as GRUB has. -- sample extlinux.conf file -- # Generated file, all changes will be lost on nixos-rebuild! # Change this to e.g. nixos-42 to temporarily boot to an older configuration. DEFAULT nixos-default TIMEOUT 50 LABEL nixos-default MENU LABEL NixOS - Default LINUX ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-zImage INITRD ../nixos/0ss2zs8sb6d1qn4gblxpwlxkfjsgs5f0-initrd-initrd FDTDIR ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-dtbs APPEND systemConfig=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M init=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M/init loglevel=8 console=ttyS0,115200n8 drm.debug=0xf LABEL nixos-71 MENU LABEL NixOS - Configuration 71 (2015-05-17 21:32 - 15.06.git.0b7a7a6M) LINUX ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-zImage INITRD ../nixos/0ss2zs8sb6d1qn4gblxpwlxkfjsgs5f0-initrd-initrd FDTDIR ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-dtbs APPEND systemConfig=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M init=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M/init loglevel=8 console=ttyS0,115200n8 drm.debug=0xf --- nixos/modules/module-list.nix | 1 + .../generic-extlinux-compatible/default.nix | 44 ++++++ .../extlinux-conf-builder.nix | 8 ++ .../extlinux-conf-builder.sh | 132 ++++++++++++++++++ 4 files changed, 185 insertions(+) create mode 100644 nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix create mode 100644 nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix create mode 100644 nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 043b0470edf2..3d938869e529 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -411,6 +411,7 @@ ./system/boot/loader/efi.nix ./system/boot/loader/loader.nix ./system/boot/loader/generations-dir/generations-dir.nix + ./system/boot/loader/generic-extlinux-compatible ./system/boot/loader/grub/grub.nix ./system/boot/loader/grub/ipxe.nix ./system/boot/loader/grub/memtest.nix diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix new file mode 100644 index 000000000000..af39c7bb6841 --- /dev/null +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix @@ -0,0 +1,44 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + blCfg = config.boot.loader; + cfg = blCfg.generic-extlinux-compatible; + + timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout; + + builder = import ./extlinux-conf-builder.nix { inherit pkgs; }; +in +{ + options = { + boot.loader.generic-extlinux-compatible = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to generate an extlinux-compatible configuration file + under /boot/extlinux.conf. For instance, + U-Boot's generic distro boot support uses this file format. + + See U-boot's documentation + for more information. + ''; + }; + + configurationLimit = mkOption { + default = 20; + example = 10; + type = types.int; + description = '' + Maximum number of configurations in the boot menu. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + system.build.installBootLoader = "${builder} -g ${toString cfg.configurationLimit} -t ${timeoutStr} -c"; + system.boot.loader.id = "generic-extlinux-compatible"; + }; +} diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix new file mode 100644 index 000000000000..261192c6d24e --- /dev/null +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix @@ -0,0 +1,8 @@ +{ pkgs }: + +pkgs.substituteAll { + src = ./extlinux-conf-builder.sh; + isExecutable = true; + inherit (pkgs) bash; + path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; +} diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh new file mode 100644 index 000000000000..8f2a496de8b6 --- /dev/null +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh @@ -0,0 +1,132 @@ +#! @bash@/bin/sh -e + +shopt -s nullglob + +export PATH=/empty +for i in @path@; do PATH=$PATH:$i/bin; done + +usage() { + echo "usage: $0 -t -c [-d ] [-g ]" >&2 + exit 1 +} + +timeout= # Timeout in centiseconds +default= # Default configuration +target=/boot # Target directory +numGenerations=0 # Number of other generations to include in the menu + +while getopts "t:c:d:g:" opt; do + case "$opt" in + t) # U-Boot interprets '0' as infinite and negative as instant boot + if [ "$OPTARG" -lt 0 ]; then + timeout=0 + elif [ "$OPTARG" = 0 ]; then + timeout=-10 + else + timeout=$((OPTARG * 10)) + fi + ;; + c) default="$OPTARG" ;; + d) target="$OPTARG" ;; + g) numGenerations="$OPTARG" ;; + \?) usage ;; + esac +done + +[ "$timeout" = "" -o "$default" = "" ] && usage + +mkdir -p $target/nixos +mkdir -p $target/extlinux + +# Convert a path to a file in the Nix store such as +# /nix/store/-/file to --. +cleanName() { + local path="$1" + echo "$path" | sed 's|^/nix/store/||' | sed 's|/|-|g' +} + +# Copy a file from the Nix store to $target/nixos. +declare -A filesCopied + +copyToKernelsDir() { + local src=$(readlink -f "$1") + local dst="$target/nixos/$(cleanName $src)" + # Don't copy the file if $dst already exists. This means that we + # have to create $dst atomically to prevent partially copied + # kernels or initrd if this script is ever interrupted. + if ! test -e $dst; then + local dstTmp=$dst.tmp.$$ + cp -r $src $dstTmp + mv $dstTmp $dst + fi + filesCopied[$dst]=1 + result=$dst +} + +# Copy its kernel, initrd and dtbs to $target/nixos, and echo out an +# extlinux menu entry +addEntry() { + local path=$(readlink -f "$1") + local tag="$2" # Generation number or 'default' + + if ! test -e $path/kernel -a -e $path/initrd; then + return + fi + + copyToKernelsDir "$path/kernel"; kernel=$result + copyToKernelsDir "$path/initrd"; initrd=$result + # XXX UGLY: maybe the system config should have a top-level "dtbs" entry? + copyToKernelsDir $(readlink -m "$path/kernel/../dtbs"); dtbs=$result + + timestampEpoch=$(stat -L -c '%Z' $path) + + timestamp=$(date "+%Y-%m-%d %H:%M" -d @$timestampEpoch) + nixosVersion="$(cat $path/nixos-version)" + extraParams="$(cat $path/kernel-params)" + + echo + echo "LABEL nixos-$tag" + if [ "$tag" = "default" ]; then + echo " MENU LABEL NixOS - Default" + else + echo " MENU LABEL NixOS - Configuration $tag ($timestamp - $nixosVersion)" + fi + echo " LINUX ../nixos/$(basename $kernel)" + echo " INITRD ../nixos/$(basename $initrd)" + echo " FDTDIR ../nixos/$(basename $dtbs)" + echo " APPEND systemConfig=$path init=$path/init $extraParams" +} + +tmpFile="$target/extlinux/extlinux.conf.tmp.$$" + +cat > $tmpFile <> $tmpFile + +mv -f $tmpFile $target/extlinux/extlinux.conf + +# Remove obsolete files from $target/nixos. +for fn in $target/nixos/*; do + if ! test "${filesCopied[$fn]}" = 1; then + echo "Removing no longer needed boot file: $fn" + chmod +w -- "$fn" + rm -rf -- "$fn" + fi +done From 9529a0dae2e2ebc8120ad74458bfcaf7eadaf3a8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 17 May 2015 15:12:14 -0500 Subject: [PATCH 290/615] Build free part of Clementine on Hydra Clementine consists of a large free part (the main application) and a small part with unfree dependencies (the Spotify blob). Add a top-level attribute for the free Clementine for users who don't want unfree software, and so that the bulk of Clementine will be in the binary cache. --- pkgs/applications/audio/clementine/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index cc13868e9d4e..5ebe1b3b7b8b 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -46,8 +46,8 @@ let usbmuxd ]; - unwrapped = stdenv.mkDerivation { - name = "clementine-unwrapped-${version}"; + free = stdenv.mkDerivation { + name = "clementine-free-${version}"; inherit patches src buildInputs; enableParallelBuilding = true; meta = with stdenv.lib; { @@ -91,7 +91,7 @@ with stdenv.lib; runCommand "clementine-${version}" { - inherit blob unwrapped; + inherit blob free; buildInputs = [ makeWrapper ] ++ gst_plugins; # for the setup-hooks dontPatchELF = true; dontStrip = true; @@ -109,7 +109,7 @@ runCommand "clementine-${version}" } '' mkdir -p $out/bin - makeWrapper "$unwrapped/bin/${exeName}" "$out/bin/${exeName}" \ + makeWrapper "$free/bin/${exeName}" "$out/bin/${exeName}" \ ${optionalString withSpotify "--set CLEMENTINE_SPOTIFYBLOB \"$blob/libexec/clementine\""} \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d700ff5bfe2..cb0322b7b66b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1014,6 +1014,8 @@ let gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst_ffmpeg ]; }; + clementineFree = clementine.free; + ciopfs = callPackage ../tools/filesystems/ciopfs { }; cmst = callPackage ../tools/networking/cmst { }; From e8efbcd3d3c2645e51b0efda71169fe656a600c8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 17 May 2015 15:36:13 -0500 Subject: [PATCH 291/615] clementine: install desktop files and icons --- pkgs/applications/audio/clementine/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 5ebe1b3b7b8b..c9b16b65267d 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -112,4 +112,9 @@ runCommand "clementine-${version}" makeWrapper "$free/bin/${exeName}" "$out/bin/${exeName}" \ ${optionalString withSpotify "--set CLEMENTINE_SPOTIFYBLOB \"$blob/libexec/clementine\""} \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + + mkdir -p $out/share + for dir in applications icons kde4; do + ln -s "$free/share/$dir" "$out/share/$dir" + done '' From f3162d6d4faf8dbc77fc5d58597e5331726c7654 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Sun, 17 May 2015 22:47:36 +0200 Subject: [PATCH 292/615] Add c0dehero as a maintainer of minetest and voxelands --- pkgs/games/minetest/default.nix | 2 +- pkgs/games/voxelands/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index ac0b72d17e5b..79d75011ff0e 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -39,6 +39,6 @@ in stdenv.mkDerivation { description = "Infinite-world block sandbox game"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ jgeerds ]; + maintainers = with maintainers; [ jgeerds c0dehero ]; }; } diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix index 09c28f34c3a7..b6bd54f779df 100644 --- a/pkgs/games/voxelands/default.nix +++ b/pkgs/games/voxelands/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Infinite-world block sandbox game based on Minetest"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ jgeerds ]; + maintainers = with maintainers; [ jgeerds c0dehero ]; }; } From c714842d9f2f16853b685de9f94408de86d559b2 Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Sun, 17 May 2015 14:30:57 -0700 Subject: [PATCH 293/615] patch GHC 7.8.4 on darwin to fix template haskell + hpc --- pkgs/development/compilers/ghc/7.8.4.nix | 7 +++++-- pkgs/development/compilers/ghc/hpc-7.8.4.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/compilers/ghc/hpc-7.8.4.patch diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index 5497b35ec1db..4323341dc4a4 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { version = "7.8.4"; name = "ghc-${version}"; @@ -45,4 +45,7 @@ stdenv.mkDerivation rec { inherit (ghc.meta) license platforms; }; -} +} // stdenv.lib.optionalAttrs stdenv.isDarwin { + # https://ghc.haskell.org/trac/ghc/ticket/9762 + patches = [ ./hpc-7.8.4.patch ]; +}) diff --git a/pkgs/development/compilers/ghc/hpc-7.8.4.patch b/pkgs/development/compilers/ghc/hpc-7.8.4.patch new file mode 100644 index 000000000000..212989200bc5 --- /dev/null +++ b/pkgs/development/compilers/ghc/hpc-7.8.4.patch @@ -0,0 +1,13 @@ +diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs +index 991fc57..0aad221 100644 +--- a/compiler/cmm/CLabel.hs ++++ b/compiler/cmm/CLabel.hs +@@ -877,7 +877,7 @@ labelDynamic dflags this_pkg this_mod lbl = + + PlainModuleInitLabel m -> not (gopt Opt_Static dflags) && this_pkg /= (modulePackageId m) + +- HpcTicksLabel m -> not (gopt Opt_Static dflags) && this_pkg /= (modulePackageId m) ++ HpcTicksLabel m -> not (gopt Opt_Static dflags) && this_mod /= m + + -- Note that DynamicLinkerLabels do NOT require dynamic linking themselves. + _ -> False From 330836a82b92d8e9e7943d5fe8f8587cd6b0f9ed Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Sun, 17 May 2015 14:34:22 -0700 Subject: [PATCH 294/615] fix lua.pc library name --- pkgs/development/interpreters/lua-5/5.2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index 313db1038b85..ac94480b8e1a 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { Description: An Extensible Extension Language Version: ${version} Requires: - Libs: -L$out/lib -llua -lm + Libs: -L$out/lib -llua.${version} -lm Cflags: -I$out/include EOF ''; From ff7dd3e3b1cebea9d89f10ceff491edf1b2dc8a1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2015 23:39:32 +0200 Subject: [PATCH 295/615] hplip: do wrap Python scripts in $out/lib --- pkgs/misc/drivers/hplip/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 7e5759235c66..8558d1f7deee 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -87,6 +87,8 @@ stdenv.mkDerivation { # Remove originals. Knows a little too much about wrapPythonProgramsIn. rm -f $out/bin/.*-wrapped + + wrapPythonPrograms $out/lib "$out $pythonPath" '' + (stdenv.lib.optionalString withPlugin (let hplip_arch = From c7ed090e21542078e3ad14db5d4a4ed8a925c6f7 Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Sun, 17 May 2015 15:03:46 -0700 Subject: [PATCH 296/615] Revert "fix lua.pc library name" This reverts commit 330836a82b92d8e9e7943d5fe8f8587cd6b0f9ed. --- pkgs/development/interpreters/lua-5/5.2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index ac94480b8e1a..313db1038b85 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { Description: An Extensible Extension Language Version: ${version} Requires: - Libs: -L$out/lib -llua.${version} -lm + Libs: -L$out/lib -llua -lm Cflags: -I$out/include EOF ''; From 705c4d7b49a7a824be70b6ead4799dfe328df783 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 9 May 2015 00:50:39 +0000 Subject: [PATCH 297/615] agda: Remove unnecessary env-var export Derivation attributes are automatically exported as environment variables already. --- pkgs/build-support/agda/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index cb6059e00cd2..a137704a30c7 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -70,7 +70,6 @@ in # configurePhase is idempotent configurePhase = '' eval "$preConfigure" - export AGDA_PACKAGE_PATH=${self.AGDA_PACKAGE_PATH}; export PATH="${self.agdaWrapper}/bin:$PATH" eval "$postConfigure" ''; From 45052c02a8b27f76a0a4ad9d43a37f7e23d637eb Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 9 May 2015 00:58:18 +0000 Subject: [PATCH 298/615] agda: Replace `eval` with `runHook` This is what haskell-ng does, so I figure it is the right thing to do. --- pkgs/build-support/agda/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index a137704a30c7..03a417a37847 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -69,22 +69,22 @@ in # configurePhase is idempotent configurePhase = '' - eval "$preConfigure" + runHook preConfigure export PATH="${self.agdaWrapper}/bin:$PATH" - eval "$postConfigure" + runHook postConfigure ''; buildPhase = '' - eval "$preBuild" + runHook preBuild ${Agda}/bin/agda ${self.buildFlags} ${self.everythingFile} - eval "$postBuild" + runHook postBuild ''; installPhase = '' - eval "$preInstall" + runHook preInstall mkdir -p $out/share/agda cp -pR ${unwords self.sourceDirectories} ${mapInside self.topSourceDirectories} $out/share/agda - eval "$postInstall" + runHook postInstall ''; }; in stdenv.mkDerivation From 9474fefe287cbd4abe6b42377670c76a1e6e7f89 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 17 May 2015 17:13:19 -0500 Subject: [PATCH 299/615] firefoxWrapper: unquote shell glob --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 5ebd26078412..91737031be2a 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \ - --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}*")" + --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}"*)" ${ lib.optionalString libtrick '' From 6803ddbf60584d10a184a3bf34d74ab491dcd82c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 17 May 2015 17:13:34 -0500 Subject: [PATCH 300/615] firefoxWrapper: install icon to hicolor theme --- .../networking/browsers/firefox/wrapper.nix | 12 +++++++++--- pkgs/top-level/all-packages.nix | 6 ++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 91737031be2a..a2134afdcf78 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { desktopItem = makeDesktopItem { name = browserName; exec = browserName + " %U"; - icon = browserName; + inherit icon; comment = ""; desktopName = desktopName; genericName = "Web Browser"; @@ -58,8 +58,14 @@ stdenv.mkDerivation { '' } - mkdir -p $out/share/icons - ln -s $out/lib/${browserName}${nameSuffix}/browser/icons/mozicon128.png $out/share/icons/${browserName}.png + if [ -e "${browser}/share/icons" ]; then + mkdir -p "$out/share" + ln "${browser}/share/icons" "$out/share/icons" + else + mkdir -p "$out/share/icons/hicolor/128x128/apps" + ln -s "$out/lib/$libdirbasename/browser/icons/mozicon128.png" \ + "$out/share/icons/hicolor/128x128/apps/${browserName}.png" + fi mkdir -p $out/share/applications cp $desktopItem/share/applications/* $out/share/applications diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb0322b7b66b..5d77bd150245 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11563,9 +11563,7 @@ let }; midoriWrapper = wrapFirefox - { browser = midori; browserName = "midori"; desktopName = "Midori"; - icon = "${midori}/share/icons/hicolor/22x22/apps/midori.png"; - }; + { browser = midori; browserName = "midori"; desktopName = "Midori"; }; mikmod = callPackage ../applications/audio/mikmod { }; @@ -12629,7 +12627,7 @@ let wrapFirefox = { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? "" - , icon ? "${browser}/lib/${browser.name}/browser/icons/mozicon128.png" }: + , icon ? browserName }: let cfg = stdenv.lib.attrByPath [ browserName ] {} config; enableAdobeFlash = cfg.enableAdobeFlash or false; From 95c1c686a371954751003c8108f9b6bd49a5338b Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 18 May 2015 04:02:31 +0000 Subject: [PATCH 301/615] agda: Remove buildTools, it is unused --- pkgs/build-support/agda/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 03a417a37847..d268bc3b122a 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -37,7 +37,7 @@ in everythingFile = "Everything.agda"; - propagatedBuildInputs = self.buildDepends ++ self.buildTools; + propagatedBuildInputs = self.buildDepends; propagatedUserEnvPkgs = self.buildDepends; # Immediate source directories under which modules can be found. @@ -50,8 +50,6 @@ in # would make a direct copy of the whole thing. topSourceDirectories = [ "src" ]; - buildTools = []; - # Extra stuff to pass to the Agda binary. extraBuildFlags = [ "-i ." ]; buildFlags = let r = map (x: "-i " + x + "/share/agda") self.buildDepends; From 734bc9f2e52fe5e38c4df748d45a69fb6ed9fcef Mon Sep 17 00:00:00 2001 From: Mikkel Christiansen Date: Wed, 13 May 2015 14:15:06 +0200 Subject: [PATCH 302/615] Add MongoDB tools and build dependencies. --- lib/maintainers.nix | 1 + pkgs/tools/misc/mongodb-tools/default.nix | 39 ++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/go-packages.nix | 115 +++++++++++++++++++++- 4 files changed, 152 insertions(+), 5 deletions(-) create mode 100644 pkgs/tools/misc/mongodb-tools/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d4fda831d594..f13a00e4898f 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -133,6 +133,7 @@ meditans = "Carlo Nucera "; meisternu = "Matt Miemiec "; michelk = "Michel Kuhlmann "; + mschristiansen = "Mikkel Christiansen "; modulistic = "Pablo Costa "; mornfall = "Petr Ročkai "; MP2E = "Cray Elliott "; diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix new file mode 100644 index 000000000000..81e05a8790e5 --- /dev/null +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -0,0 +1,39 @@ +{ lib, goPackages, fetchurl, callPackage }: + +with goPackages; + +buildGoPackage rec { + version = "r3.1.2"; + name = "mongodb-tools"; + goPackagePath = "github.com/mongodb/mongo-tools"; + + src = fetchurl { + name = "${name}.tar.gz"; + url = "https://github.com/mongodb/mongo-tools/archive/${version}.tar.gz"; + sha256 = "1dag8ar95jlfk6rm99y4p3dymcy2s2qnwd9jwqhw9fxr110mgf5s"; + }; + + buildInputs = [ gopass go-flags crypto mgo openssl spacelog + oglematchers goconvey tomb ]; + + subPackages = [ "bsondump/main" "mongostat/main" "mongofiles/main" + "mongoexport/main" "mongoimport/main" "mongorestore/main" + "mongodump/main" "mongotop/main" "mongooplog/main" ]; + + buildPhase = '' + for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog; do + echo Building $i + go build -o go/bin/$i go/src/${goPackagePath}/$i/main/$i.go + done + ''; + + dontInstallSrc = true; + + meta = with lib; { + description = "Tools for MongoDB"; + homepage = https://github.com/mongodb/mongo-tools; + license = licenses.asl20; + maintainers = with maintainers; [ mschristiansen ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 069e230dd144..f8a64a16d652 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -873,6 +873,8 @@ let mcrypt = callPackage ../tools/misc/mcrypt { }; + mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; + mstflint = callPackage ../tools/misc/mstflint { }; mcelog = callPackage ../os-specific/linux/mcelog { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 035c152b6b18..278360f1ce12 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -151,6 +151,21 @@ let self = _self // overrides; _self = with self; { }; }; + assertions = buildGoPackage rec { + version = "1.5.0"; + name = "assertions-${version}"; + goPackagePath = "github.com/smartystreets/assertions"; + src = fetchurl { + name = "${name}.tar.gz"; + url = "https://github.com/smartystreets/assertions/archive/${version}.tar.gz"; + sha256 = "1s4b0v49yv7jmy4izn7grfqykjrg7zg79dg5hsqr3x40d5n7mk02"; + }; + buildInputs = [ oglematchers ]; + propagatedBuildInputs = [ goconvey ]; + # subPackages = []; + doCheck = false; + }; + aws-sdk-go = buildGoPackage rec { rev = "5e038f730cbb99b144eeb1dbf92cd06c2d00b503"; name = "aws-sdk-go-${stdenv.lib.strings.substring 0 7 rev}"; @@ -356,6 +371,18 @@ let self = _self // overrides; _self = with self; { subPackages = [ "./" ]; # don't try to build test fixtures }; + gls = buildGoPackage rec { + rev = "9a4a02dbe491bef4bab3c24fd9f3087d6c4c6690"; + name = "gls-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/jtolds/gls"; + src = fetchFromGitHub { + inherit rev; + owner = "jtolds"; + repo = "gls"; + sha256 = "1gvgkx7llklz6plapb95fcql7d34i6j7anlvksqhdirpja465jnm"; + }; + }; + goamz = buildGoPackage rec { rev = "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7"; name = "goamz-${rev}"; @@ -480,6 +507,19 @@ let self = _self // overrides; _self = with self; { buildInputs = [ net ]; }; + gopass = buildGoPackage rec { + rev = "2c70fa70727c953c51695f800f25d6b44abb368e"; + name = "gopass-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/howeyc/gopass"; + src = fetchFromGitHub { + inherit rev; + owner = "howeyc"; + repo = "gopass"; + sha256 = "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8"; + }; + buildInputs = [ crypto ]; + }; + gosnappy = buildGoPackage rec { rev = "ce8acff4829e0c2458a67ead32390ac0a381c862"; name = "gosnappy-${stdenv.lib.strings.substring 0 7 rev}"; @@ -576,6 +616,18 @@ let self = _self // overrides; _self = with self; { buildInputs = [ pkgs.etcd ]; }; + go-flags = buildGoPackage rec { + rev = "5e118789801496c93ba210d34ef1f2ce5a9173bd"; + name = "go-flags-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/jessevdk/go-flags"; + src = fetchFromGitHub { + inherit rev; + owner = "jessevdk"; + repo = "go-flags"; + sha256 = "1davr5h936fhc8zy7digp5yqxr216d1mshksr7iiad5xb3r8r9ja"; + }; + }; + go-fuse = buildGoPackage rec { rev = "5d16aa11eef4643de2d91e88a64dcb6138705d58"; name = "go-fuse-${stdenv.lib.strings.substring 0 7 rev}"; @@ -943,6 +995,18 @@ let self = _self // overrides; _self = with self; { }; }; + flagfile = buildGoPackage rec { + rev = "871ce569c29360f95d7596f90aa54d5ecef75738"; + name = "flagfile-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/spacemonkeygo/flagfile"; + src = fetchFromGitHub { + inherit rev; + owner = "spacemonkeygo"; + repo = "flagfile"; + sha256 = "1y6wf1s51c90qc1aki8qikkw1wqapzjzr690xrmnrngsfpdyvkrc"; + }; + }; + iochan = buildGoPackage rec { rev = "b584a329b193e206025682ae6c10cdbe03b0cd77"; name = "iochan-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1050,14 +1114,17 @@ let self = _self // overrides; _self = with self; { }; mgo = buildGoPackage rec { - rev = "2"; + rev = "c6a7dce14133ccac2dcac3793f1d6e2ef048503a"; name = "mgo-${rev}"; - goPackagePath = "launchpad.net/mgo"; - src = fetchbzr { + goPackagePath = "gopkg.in/mgo.v2"; + src = fetchFromGitHub { inherit rev; - url = "https://${goPackagePath}"; - sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x"; + owner = "go-mgo"; + repo = "mgo"; + sha256 ="0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj"; }; + + buildInputs = [ pkgs.cyrus_sasl ]; }; mousetrap = buildGoPackage rec { @@ -1162,6 +1229,19 @@ let self = _self // overrides; _self = with self; { doCheck = false; # check this again }; + openssl = buildGoPackage rec { + rev = "84b5df477423634115e53fb171a66007cece19f5"; + name = "openssl-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/spacemonkeygo/openssl"; + src = fetchFromGitHub { + inherit rev; + owner = "spacemonkeygo"; + repo = "openssl"; + sha256 = "1l0cyazxp8bwmi151djyr6pknj9jv8n53lgfhgj6l0zj32p5kh1v"; + }; + buildInputs = [ spacelog pkgconfig pkgs.openssl ]; + }; + osext = buildGoPackage rec { rev = "10"; name = "osext-${rev}"; @@ -1357,6 +1437,19 @@ let self = _self // overrides; _self = with self; { }; }; + spacelog = buildGoPackage rec { + rev = "ae95ccc1eb0c8ce2496c43177430efd61930f7e4"; + name = "spacelog-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/spacemonkeygo/spacelog"; + src = fetchFromGitHub { + inherit rev; + owner = "spacemonkeygo"; + repo = "spacelog"; + sha256 = "1i1awivsix0ch0vg6rwvx0536ziyw6phcx45b1rmrclp6b6dyacy"; + }; + buildInputs = [ flagfile ]; + }; + stathat = buildGoPackage rec { rev = "01d012b9ee2ecc107cb28b6dd32d9019ed5c1d77"; name = "stathat-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1411,6 +1504,18 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ pty ]; }; + tomb = buildGoPackage rec { + rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8"; + name = "tomb-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "gopkg.in/tomb.v2"; + src = fetchFromGitHub { + inherit rev; + owner = "go-tomb"; + repo = "tomb"; + sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"; + }; + }; + toml = buildGoPackage rec { rev = "f87ce853111478914f0bcffa34d43a93643e6eda"; name = "toml-${stdenv.lib.strings.substring 0 7 rev}"; From b679ccdca52b81c81ae147667493ccabc6faa7b7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 18 May 2015 01:36:24 -0700 Subject: [PATCH 303/615] kernel: 3.10.78 -> 3.10.79 --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 6743d1d95503..b270f0852f64 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.78"; + version = "3.10.79"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "01cshlm8x8k2bbkh77w2r39kc0a3csrcxiv412j5ik608glzgx36"; + sha256 = "0m30c9v4pvim72ha8ya8w6y691a8zkcrhxhj43kh668q1yqpqvkp"; }; features.iwlwifi = true; From 4a7a3cd8a530eeda2f1e8fbcc4f54803d6807fc0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 18 May 2015 01:36:43 -0700 Subject: [PATCH 304/615] kernel: 4.0.3 -> 4.0.4 --- pkgs/os-specific/linux/kernel/linux-4.0.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix index b095db41bd5a..9c7fb2c3bd8d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.0.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.0.3"; + version = "4.0.4"; # Remember to update grsecurity! extraMeta.branch = "4.0"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1djkbqrzi898qr2n0cd4m8casfj8pvgydc98l4ws3w8l9ikgwxw4"; + sha256 = "1j5l87z6gd05cqzg680id0x1nk38kd6sjffd2lifl0fz5k6iqr9h"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 27162d500465..8fd7cd8c4171 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -72,10 +72,10 @@ rec { }; grsecurity_unstable = grsecPatch - { kversion = "4.0.3"; - revision = "201505141746"; + { kversion = "4.0.4"; + revision = "201505171737"; branch = "test"; - sha256 = "0w65d5nmfir8kxgsxrq09mijjp09k193hyqmskia6a17n29943p1"; + sha256 = "140c3qbv64q658vw9d4912rv0mjch217zkyz1qi9xn6bn1z5kvl5"; }; grsec_fix_path = From 9265918feab59e55438d0fe0d7738626e70a935c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 18 May 2015 01:36:34 -0700 Subject: [PATCH 305/615] kernel: 3.14.42 -> 3.14.43 --- pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 16e46bf65c09..52fa5eba109e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.42"; + version = "3.14.43"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "02k09ndhragz1p2mrq489fa7cgs2c2f3lwr1x0h1n94zqpsmpyip"; + sha256 = "1m5gdzff46xm24p5x5ajxka99g0maf1y50nj59mbjccbqx3s7kvf"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 8fd7cd8c4171..8e24763b1690 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -65,10 +65,10 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.42"; - revision = "201505141745"; + { kversion = "3.14.43"; + revision = "201505171736"; branch = "stable"; - sha256 = "1565ggx42w0j038avz9d4pydf4j29rli2hz5wangf3vnjbhixh39"; + sha256 = "1c3wjccinm8aqnqn6dr0rlmff2p4dwc4m383cs8bi9lfj5s1fyzn"; }; grsecurity_unstable = grsecPatch From 8e36da20e7316f48cda169405116ed69ae632f99 Mon Sep 17 00:00:00 2001 From: Christian Theune Date: Mon, 18 May 2015 10:49:25 +0200 Subject: [PATCH 306/615] Update syncthing to 0.11.5 --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 84d0d4ba2391..54e4e64cdcf3 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.11.1"; + version = "0.11.5"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "518add39e2239fc8575cdf5cafc3562f006df7201fbd272077ed3bbbbfd816d4"; + sha256 = "3a68cdecaec8d00b0fbf6348fb9b8adc628910e9572a89d9a413d6e7b79e7a06"; }; subPackages = [ "cmd/syncthing" ]; From 7bc00dbdafe35f3bc4131db9bfdf9a6ccb8967de Mon Sep 17 00:00:00 2001 From: Joel Moberg Date: Mon, 18 May 2015 11:18:48 +0200 Subject: [PATCH 307/615] numpy: 1.8.2 -> 1.9.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 98b012ecd466..429ff01cf336 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7728,11 +7728,11 @@ let }; numpy = buildPythonPackage ( rec { - name = "numpy-1.8.2"; + name = "numpy-1.9.2"; src = pkgs.fetchurl { url = "mirror://sourceforge/numpy/${name}.tar.gz"; - sha256 = "1gcxlk3mf43pzpxvbw8kcfg173g4105j9szsfc1kxwablail6myf"; + sha256 = "0apgmsk9jlaphb2dp1zaxqzdxkf69h1y3iw2d1pcnkj31cmmypij"; }; disabled = isPyPy; # WIP From 0e2472ac86ba17cdb8b8f937d985dc191100f86e Mon Sep 17 00:00:00 2001 From: Joel Moberg Date: Mon, 18 May 2015 11:25:36 +0200 Subject: [PATCH 308/615] matplotlib: 1.4.2 -> 1.4.3 --- pkgs/development/python-modules/matplotlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index d22c8cf32313..15716f204228 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -10,11 +10,11 @@ assert enableGhostscript -> ghostscript != null; assert enableGtk2 -> pygtk != null; buildPythonPackage rec { - name = "matplotlib-1.4.2"; + name = "matplotlib-1.4.3"; src = fetchurl { url = "mirror://sourceforge/matplotlib/${name}.tar.gz"; - sha256 = "0m6v9nwdldlwk22gcd339zg6mny5m301fxgks7z8sb8m9wawg8qp"; + sha256 = "1dn05cvd0g984lzhh72wa0z93psgwshbbg93fkab6slx5m3l95av"; }; XDG_RUNTIME_DIR = "/tmp"; From 25f95555990b2681a269b066c47bf790e3bcbf3f Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 18 May 2015 10:48:05 +0200 Subject: [PATCH 309/615] Drop GNOME 3.12 --- .../services/x11/desktop-managers/gnome3.nix | 5 +- nixos/tests/gnome3_16.nix | 34 -- pkgs/applications/video/byzanz/default.nix | 4 +- .../gnome-3/3.12/apps/bijiben/default.nix | 40 --- .../gnome-3/3.12/apps/evolution/default.nix | 50 --- .../gnome-3/3.12/apps/file-roller/default.nix | 33 -- .../gnome-3/3.12/apps/gedit/default.nix | 39 --- .../gnome-3/3.12/apps/glade/default.nix | 36 --- .../gnome-3/3.12/apps/gnome-boxes/default.nix | 46 --- .../3.12/apps/gnome-clocks/default.nix | 40 --- .../3.12/apps/gnome-documents/default.nix | 56 ---- .../gnome-3/3.12/apps/gnome-music/default.nix | 44 --- .../3.12/apps/gnome-photos/default.nix | 47 --- .../3.12/apps/nautilus-sendto/default.nix | 22 -- .../gnome-3/3.12/apps/polari/default.nix | 35 -- .../gnome-3/3.12/apps/pomodoro/default.nix | 49 --- .../gnome-3/3.12/apps/seahorse/default.nix | 40 --- .../gnome-3/3.12/core/baobab/default.nix | 40 --- .../gnome-3/3.12/core/caribou/default.nix | 27 -- .../gnome-3/3.12/core/dconf/default.nix | 28 -- .../gnome-3/3.12/core/empathy/default.nix | 54 ---- .../gnome-3/3.12/core/eog/default.nix | 29 -- .../gnome-3/3.12/core/epiphany/default.nix | 53 ---- .../core/epiphany/libxml_missing_dep.patch | 10 - .../gnome-3/3.12/core/evince/default.nix | 68 ---- .../core/evolution-data-server/default.nix | 34 -- .../gnome-3/3.12/core/folks/default.nix | 40 --- .../gnome-3/3.12/core/gconf/default.nix | 32 -- .../gnome-3/3.12/core/gcr/default.nix | 28 -- .../gnome-3/3.12/core/gdm/default.nix | 41 --- .../gnome-3/3.12/core/gdm/propagate_env.patch | 13 - .../gnome-3/3.12/core/gdm/sessions_dir.patch | 17 - .../gnome-3/3.12/core/gdm/xserver_path.patch | 15 - .../3.12/core/geocode-glib/default.nix | 20 -- .../gnome-3/3.12/core/gjs/default.nix | 21 -- .../3.12/core/gnome-backgrounds/default.nix | 16 - .../3.12/core/gnome-bluetooth/default.nix | 22 -- .../3.12/core/gnome-calculator/default.nix | 36 --- .../3.12/core/gnome-common/default.nix | 17 - .../gnome-contacts/configure_dbus_glib.patch | 10 - .../3.12/core/gnome-contacts/default.nix | 51 --- .../core/gnome-control-center/default.nix | 60 ---- .../search_providers_dir.patch | 17 - .../vpn_plugins_path.patch | 19 -- .../3.12/core/gnome-desktop/default.nix | 27 -- .../3.12/core/gnome-dictionary/default.nix | 38 --- .../3.12/core/gnome-disk-utility/default.nix | 41 --- .../3.12/core/gnome-font-viewer/default.nix | 37 --- .../gnome-icon-theme-symbolic/default.nix | 28 -- .../3.12/core/gnome-icon-theme/default.nix | 18 -- .../3.12/core/gnome-keyring/default.nix | 38 --- .../gnome-3/3.12/core/gnome-menus/default.nix | 24 -- .../core/gnome-online-accounts/default.nix | 22 -- .../3.12/core/gnome-online-miners/default.nix | 35 -- .../3.12/core/gnome-screenshot/default.nix | 37 --- .../3.12/core/gnome-session/default.nix | 30 -- .../core/gnome-settings-daemon/default.nix | 35 -- .../core/gnome-shell-extensions/default.nix | 26 -- .../gnome-3/3.12/core/gnome-shell/default.nix | 55 ---- .../3.12/core/gnome-system-log/default.nix | 37 --- .../core/gnome-system-monitor/default.nix | 39 --- .../3.12/core/gnome-terminal/default.nix | 34 -- .../core/gnome-themes-standard/default.nix | 15 - .../3.12/core/gnome-user-docs/default.nix | 20 -- .../3.12/core/gnome-user-share/default.nix | 51 --- .../3.12/core/grilo-plugins/default.nix | 27 -- .../gnome-3/3.12/core/grilo/default.nix | 31 -- .../gsettings-desktop-schemas/default.nix | 21 -- .../3.12/core/gtksourceview/default.nix | 28 -- .../core/gtksourceview/nix_share_path.patch | 11 - .../gnome-3/3.12/core/gucharmap/default.nix | 38 --- .../gnome-3/3.12/core/libcroco/default.nix | 18 -- .../gnome-3/3.12/core/libgdata/default.nix | 25 -- .../gnome-3/3.12/core/libgee/default.nix | 25 -- .../core/libgee/fix_introspection_paths.patch | 13 - .../3.12/core/libgnome-keyring/default.nix | 26 -- .../gnome-3/3.12/core/libgnomekbd/default.nix | 24 -- .../gnome-3/3.12/core/libgweather/default.nix | 21 -- .../gnome-3/3.12/core/libgxps/default.nix | 20 -- .../gnome-3/3.12/core/libpeas/default.nix | 29 -- .../gnome-3/3.12/core/libzapojit/default.nix | 16 - .../gnome-3/3.12/core/mutter/default.nix | 33 -- .../gnome-3/3.12/core/nautilus/default.nix | 29 -- .../3.12/core/nautilus/extension_dir.patch | 24 -- .../gnome-3/3.12/core/rest/default.nix | 18 -- .../gnome-3/3.12/core/sushi/default.nix | 38 --- .../3.12/core/totem-pl-parser/default.nix | 20 -- .../gnome-3/3.12/core/totem/default.nix | 47 --- .../gnome-3/3.12/core/tracker/default.nix | 55 ---- .../gnome-3/3.12/core/vino/default.nix | 33 -- .../gnome-3/3.12/core/vte/default.nix | 43 --- .../3.12/core/vte/expose_select_text.patch | 227 ------------- .../gnome-3/3.12/core/yelp-tools/default.nix | 22 -- .../gnome-3/3.12/core/yelp-xsl/default.nix | 23 -- .../gnome-3/3.12/core/yelp/default.nix | 36 --- .../gnome-3/3.12/core/zenity/default.nix | 23 -- pkgs/desktops/gnome-3/3.12/default.nix | 299 ------------------ .../gnome-3/3.12/desktop/rarian/default.nix | 16 - .../gnome-3/3.12/devtools/anjuta/default.nix | 28 -- .../gnome-3/3.12/devtools/gdl/default.nix | 24 -- .../gnome-3/3.12/misc/geary/default.nix | 49 --- .../3.12/misc/geary/disable_valadoc.patch | 24 -- .../gnome-3/3.12/misc/gexiv2/default.nix | 25 -- .../gnome-3/3.12/misc/gfbgraph/default.nix | 23 -- .../gnome-3/3.12/misc/gitg/default.nix | 45 --- .../3.12/misc/gnome-tweak-tool/default.nix | 45 --- .../gnome-tweak-tool/find_gsettings.patch | 22 -- .../gnome-3/3.12/misc/goffice/0.8.nix | 37 --- .../gnome-3/3.12/misc/goffice/default.nix | 36 --- .../gnome-3/3.12/misc/goffice/pcre_info.patch | 13 - .../gnome-3/3.12/misc/gpaste/default.nix | 43 --- .../gnome-3/3.12/misc/gtkhtml/default.nix | 17 - .../gnome-3/3.12/misc/libgda/default.nix | 30 -- .../3.12/misc/libgit2-glib/default.nix | 21 -- .../gnome-3/3.12/misc/libmediaart/default.nix | 19 -- .../core/gnome-control-center/default.nix | 6 +- .../gnome-3/3.16/core/gnome-shell/default.nix | 7 +- pkgs/desktops/gnome-3/3.16/default.nix | 18 +- pkgs/development/libraries/clutter/1.18.nix | 52 --- pkgs/development/libraries/cogl/1.18.nix | 57 ---- pkgs/development/libraries/gtk+/3.16.nix | 69 ---- pkgs/development/libraries/gtk+/3.x.nix | 16 +- pkgs/development/libraries/gtkmm/3.16.nix | 42 --- pkgs/development/libraries/gtkmm/3.x.nix | 4 +- pkgs/top-level/all-packages.nix | 21 +- 125 files changed, 23 insertions(+), 4254 deletions(-) delete mode 100644 nixos/tests/gnome3_16.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/glade/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/polari/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/baobab/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/caribou/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/dconf/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/empathy/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/eog/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/core/evince/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/folks/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gconf/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gcr/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gdm/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gjs/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/grilo/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libgee/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/mutter/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/core/rest/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/sushi/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/totem/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/tracker/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/vino/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/vte/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/yelp/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/zenity/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/geary/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix delete mode 100644 pkgs/development/libraries/clutter/1.18.nix delete mode 100644 pkgs/development/libraries/cogl/1.18.nix delete mode 100644 pkgs/development/libraries/gtk+/3.16.nix delete mode 100644 pkgs/development/libraries/gtkmm/3.16.nix diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index d53f119c9558..cf6d2cab3492 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -45,7 +45,7 @@ in { environment.gnome3.packageSet = mkOption { default = null; - example = literalExample "pkgs.gnome3_12"; + example = literalExample "pkgs.gnome3_16"; description = "Which GNOME 3 package set to use."; apply = p: if p == null then pkgs.gnome3 else p; }; @@ -109,9 +109,6 @@ in { # Override default mimeapps export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share - # Let gnome-control-center find gnome-shell search providers. GNOME 3.12 compatibility. - export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/ - # Let nautilus find extensions export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/ diff --git a/nixos/tests/gnome3_16.nix b/nixos/tests/gnome3_16.nix deleted file mode 100644 index 23a66aba50c5..000000000000 --- a/nixos/tests/gnome3_16.nix +++ /dev/null @@ -1,34 +0,0 @@ -import ./make-test.nix { - name = "gnome3"; - - machine = - { config, pkgs, ... }: - - { imports = [ ./common/user-account.nix ]; - - services.xserver.enable = true; - - services.xserver.displayManager.auto.enable = true; - services.xserver.displayManager.auto.user = "alice"; - services.xserver.desktopManager.gnome3.enable = true; - - environment.gnome3.packageSet = pkgs.gnome3_16; - - virtualisation.memorySize = 512; - }; - - testScript = - '' - $machine->waitForX; - $machine->sleep(15); - - # Check that logging in has given the user ownership of devices. - $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); - - $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'"); - $machine->waitForWindow(qr/Terminal/); - $machine->sleep(20); - $machine->screenshot("screen"); - ''; - -} diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 69b0ffbe1314..79b9ab92ad9a 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, which, gnome3_12, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1 }: +{ stdenv, fetchgit, which, gnome3, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1 }: stdenv.mkDerivation rec { version = "0.2.3.alpha"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ./autogen.sh --prefix=$out ''; - buildInputs = [ which gnome3_12.gnome_common glib intltool pkgconfig libtool cairo gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; + buildInputs = [ which gnome3.gnome_common glib intltool pkgconfig libtool cairo gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; meta = with stdenv.lib; { description = "Tool to record a running X desktop to an animation suitable for presentation in a web browser"; diff --git a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix deleted file mode 100644 index c4f6741c070a..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, glib -, hicolor_icon_theme, makeWrapper, itstool, desktop_file_utils -, clutter_gtk, libuuid, webkitgtk, zeitgeist -, gnome3, librsvg, gdk_pixbuf, libxml2 }: - -stdenv.mkDerivation rec { - name = "bijiben-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/bijiben/3.12/${name}.tar.xz"; - sha256 = "f319ef2a5b69ff9368e7488a28453da0f10eaa39a0f8e5d74623d0c07c824708"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig glib intltool itstool libxml2 - clutter_gtk libuuid webkitgtk gnome3.tracker - gnome3.gnome_online_accounts zeitgeist desktop_file_utils - gnome3.gsettings_desktop_schemas makeWrapper - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/bijiben" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Bijiben; - description = "Note editor designed to remain simple to use"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix deleted file mode 100644 index f0356352098e..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight, sqlite -, pkgconfig, gtk3, glib, hicolor_icon_theme, libnotify, gtkspell3 -, makeWrapper, itstool, shared_mime_info, libical, db, gcr -, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool -, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }: - -stdenv.mkDerivation rec { - name = "evolution-3.12.5"; - - src = fetchurl { - url = "mirror://gnome/sources/evolution/3.12/${name}.tar.xz"; - sha256 = "08y1qiydbbk4fq8rrql9sgbwsny8bwz6f7m5kbbj5zjqvf1baksj"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool - gdk_pixbuf gnome3.gnome_icon_theme librsvg db icu - gnome3.evolution_data_server libsecret libical gcr - webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3 - libcanberra_gtk3 gnome3.gtkhtml bogofilter gnome3.libgdata - gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - nss nspr libnotify procps highlight gnome3.libgweather - gnome3.gsettings_desktop_schemas makeWrapper sqlite ]; - - configureFlags = [ "--disable-spamassassin" "--disable-pst-import" ]; - - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; - - enableParallelBuilding = true; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram "$f" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Evolution; - description = "Personal information management application that provides integrated mail, calendaring and address book functionality"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix deleted file mode 100644 index deff8494866b..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive -, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf, hicolor_icon_theme }: - -stdenv.mkDerivation rec { - name = "file-roller-${version}"; - - majVersion = "3.12"; - version = "${majVersion}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/file-roller/${majVersion}/${name}.tar.xz"; - sha256 = "0677be6618dba609eae2d76420e8a5a8d9a414bcec654e7b71e65b941764eacf"; - }; - - # TODO: support nautilus - # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so - - buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive - hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic - attr bzip2 acl gdk_pixbuf librsvg makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/file-roller" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/FileRoller; - description = "Archive manager for the GNOME desktop environment"; - platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix deleted file mode 100644 index c65a28c34467..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, intltool, fetchurl, enchant, isocodes -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool, libsoup, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - name = "gedit-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gedit/3.12/${name}.tar.xz"; - sha256 = "0lxnswqa0ysr57cqh062wp41sd76p6q7y3mnkl7rligd5c8hnikm"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool enchant isocodes - gdk_pixbuf gnome3.gnome_icon_theme librsvg libsoup - gnome3.libpeas gnome3.gtksourceview libxml2 - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas makeWrapper file ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/gedit" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Gedit; - description = "Official text editor of the GNOME desktop environment"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix deleted file mode 100644 index 4783804f200a..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, intltool, fetchurl, python -, pkgconfig, gtk3, glib, hicolor_icon_theme -, makeWrapper, itstool, libxml2, docbook_xsl -, gnome3, librsvg, gdk_pixbuf, libxslt }: - -stdenv.mkDerivation rec { - name = "glade-3.16.1"; - - src = fetchurl { - url = "mirror://gnome/sources/glade/3.16/${name}.tar.xz"; - sha256 = "994ac258bc100d3907ed40a2880c3144f13997b324477253e812d59f2716523f"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python - gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl - gdk_pixbuf gnome3.gnome_icon_theme librsvg libxslt - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/glade" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Glade; - description = "User interface designer for GTK+ applications"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix deleted file mode 100644 index 7d33933656a3..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib -, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk -, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala -, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg -, hicolor_icon_theme, desktop_file_utils, mtools, cdrkit, libcdio -}: - -# TODO: ovirt (optional) - -stdenv.mkDerivation rec { - name = "gnome-boxes-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-boxes/3.12/${name}.tar.xz"; - sha256 = "0kzdh8kk9isaskbfyj7r7nybgdyhj7i4idkgahdsl9xs9sj2pmc8"; - }; - - enableParallelBuilding = true; - - doCheck = true; - - buildInputs = [ - makeWrapper pkgconfig intltool itstool libvirt-glib glib - gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol - libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp - gdbm cyrus_sasl gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic - librsvg hicolor_icon_theme desktop_file_utils - ]; - - preFixup = '' - for prog in "$out/bin/"*; do - wrapProgram "$prog" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin" - done - ''; - - meta = with stdenv.lib; { - description = "Simple GNOME 3 application to access remote or virtual systems"; - homepage = https://wiki.gnome.org/action/show/Apps/Boxes; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix deleted file mode 100644 index 47bcbf692ad6..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, intltool, fetchurl, libgweather, libnotify -, pkgconfig, gtk3, glib, hicolor_icon_theme -, makeWrapper, itstool, libcanberra_gtk3, libtool -, gnome3, librsvg, gdk_pixbuf, geoclue2 }: - -stdenv.mkDerivation rec { - name = "gnome-clocks-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-clocks/3.12/${name}.tar.xz"; - sha256 = "3fc0ce2b7b2540d6c2d791ff63ab1670f189a339c804fcf24c9010a478314604"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 - gnome3.gsettings_desktop_schemas makeWrapper - gdk_pixbuf gnome3.gnome_icon_theme librsvg - gnome3.gnome_desktop gnome3.geocode_glib geoclue2 - libgweather libnotify libtool - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/gnome-clocks" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Clocks; - description = "Clock application designed for GNOME 3"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix deleted file mode 100644 index 642e0044a757..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, intltool, fetchurl, evince, gjs -, pkgconfig, gtk3, glib, hicolor_icon_theme -, makeWrapper, itstool, libxslt, webkitgtk -, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl -, gobjectIntrospection, json_glib -, gmp, desktop_file_utils }: - -stdenv.mkDerivation rec { - name = "gnome-documents-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-documents/3.12/${name}.tar.xz"; - sha256 = "6d0df1d90781d56992ed5d5c2591833e89e3aa756ccab63f82dd935185ce5a53"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt - docbook_xsl desktop_file_utils - gnome3.gsettings_desktop_schemas makeWrapper gmp - gdk_pixbuf gnome3.gnome_icon_theme librsvg evince - libsoup webkitgtk gjs gobjectIntrospection gnome3.rest - gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts - gnome3.gnome_desktop gnome3.libzapojit json_glib - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - enableParallelBuilding = true; - - preFixup = - let - libPath = stdenv.lib.makeLibraryPath - [ evince gtk3 gnome3.tracker gnome3.gnome_online_accounts ]; - in - '' - substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication" - - for f in $out/bin/* $out/libexec/*; do - wrapProgram "$f" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH ":" "${libPath}" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --run "if [ -z \"\$XDG_CACHE_DIR\" ]; then XDG_CACHE_DIR=\$HOME/.cache; fi; if [ -w \"\$XDG_CACHE_DIR/..\" ]; then mkdir -p \"\$XDG_CACHE_DIR/gnome-documents\"; fi" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Documents; - description = "Document manager application designed to work with GNOME 3"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix deleted file mode 100644 index ebcd4c0d01ed..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker -, python3, libxml2, python3Packages, libnotify -, pkgconfig, gtk3, glib, hicolor_icon_theme, cairo -, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }: - -stdenv.mkDerivation rec { - name = "gnome-music-3.12.2.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-music/3.12/${name}.tar.xz"; - sha256 = "1vwzjv5001pg37qc0sh4ph3srqwg3vgibbdlqpim9w2k70l9j34z"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart - gdk_pixbuf gnome3.gnome_icon_theme librsvg python3 cairo - gnome3.grilo libxml2 python3Packages.pygobject3 libnotify - python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas makeWrapper tracker ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/gnome-music" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ - --prefix PYTHONPATH : "$PYTHONPATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Music; - description = "Music player and management application for the GNOME desktop environment"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix deleted file mode 100644 index 4d080039a880..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, intltool, fetchurl, exempi, libxml2 -, pkgconfig, gtk3, glib, hicolor_icon_theme -, makeWrapper, itstool, gegl, babl, lcms2 -, desktop_file_utils, gmp -, gnome3, librsvg, gdk_pixbuf, libexif }: - -stdenv.mkDerivation rec { - name = "gnome-photos-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-photos/3.12/${name}.tar.xz"; - sha256 = "077cc6c2ae28680457fba435a22184e25f3a60a6fbe1901a75e42f6f6136538f"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl - gnome3.gsettings_desktop_schemas makeWrapper gmp - gdk_pixbuf gnome3.gnome_icon_theme librsvg exempi - gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo - gnome3.gnome_online_accounts gnome3.gnome_desktop - lcms2 libexif gnome3.tracker libxml2 desktop_file_utils - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - preFixup = '' - substituteInPlace $out/bin/gnome-photos --replace gapplication "${glib}/bin/gapplication" - - for f in $out/bin/* $out/libexec/*; do - wrapProgram "$f" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Photos; - description = "Photos is an application to access, organize and share your photos with GNOME 3"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix deleted file mode 100644 index 5a85e00e4e45..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool -, gobjectIntrospection, makeWrapper }: - -stdenv.mkDerivation rec { - name = "nautilus-sendto-${version}"; - - version = "3.8.1"; - - src = fetchurl { - url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz"; - sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab"; - }; - - buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ]; - - meta = with stdenv.lib; { - description = "Integrates Evolution and Pidgin into the Nautilus file manager"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix deleted file mode 100644 index 6289fd4a6db5..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{stdenv, fetchurl, makeWrapper, intltool, pkgconfig, gobjectIntrospection, glib -, gtk3, telepathy_glib, gnome3, telepathy_idle, telepathy_logger, libsoup -, gdk_pixbuf, librsvg }: - -stdenv.mkDerivation rec { - name = "polari-3.12.2"; - - src = fetchurl { - url = "https://download.gnome.org/sources/polari/3.12/${name}.tar.xz"; - sha256 = "8b10f369fac9e5e48a7bed51320754262d00c1bb14899a321b02843e20c0a995"; - }; - - buildInputs = [ makeWrapper intltool pkgconfig gobjectIntrospection glib gtk3 - telepathy_glib gnome3.gjs telepathy_logger libsoup - gdk_pixbuf librsvg - gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - propagatedUserEnvPkgs = [ telepathy_idle ]; - - preFixup = '' - wrapProgram "$out/bin/polari" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "Internet Relay Chat (IRC) client designed for GNOME 3"; - homepage = https://wiki.gnome.org/Apps/Polari; - platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix deleted file mode 100644 index 152acb26b1bc..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper, - dbus_glib, libcanberra, gst_all_1, upower, vala, gnome3_12, gtk3, gst_plugins_base, - glib, gobjectIntrospection, hicolor_icon_theme -}: - -stdenv.mkDerivation rec { - rev = "0.10.3"; - name = "gnome-shell-pomodoro-${rev}-61df3fa"; - - src = fetchFromGitHub { - owner = "codito"; - repo = "gnome-shell-pomodoro"; - rev = "${rev}"; - sha256 = "0i0glmijalppb5hdb1xd6xnmv824l2w831rpkqmhxi0iqbvaship"; - }; - - configureScript = ''./autogen.sh''; - - buildInputs = [ - which automake113x intltool glib gobjectIntrospection pkgconfig libtool - makeWrapper dbus_glib libcanberra upower vala gst_all_1.gstreamer - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gnome3_12.gsettings_desktop_schemas gnome3_12.gnome_desktop - gnome3_12.gnome_common gnome3_12.gnome_shell hicolor_icon_theme gtk3 - ]; - - preBuild = '' - sed -i \ - -e 's|/usr\(/share/gir-1.0/UPowerGlib\)|${upower}\1|' \ - -e 's|/usr\(/share/gir-1.0/GnomeDesktop\)|${gnome3_12.gnome_desktop}\1|' \ - vapi/Makefile - ''; - - preFixup = '' - wrapProgram $out/bin/gnome-pomodoro \ - --prefix XDG_DATA_DIRS : \ - "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS" - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/codito/gnome-shell-pomodoro; - description = - "Personal information management application that provides integrated " + - "mail, calendaring and address book functionality"; - maintainers = with maintainers; [ DamienCassou ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix deleted file mode 100644 index 02365d6b3d5a..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, intltool, fetchurl, vala -, pkgconfig, gtk3, glib, hicolor_icon_theme -, makeWrapper, itstool, gnupg, libsoup -, gnome3, librsvg, gdk_pixbuf, gpgme -, libsecret, avahi, p11_kit }: - -stdenv.mkDerivation rec { - name = "seahorse-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/seahorse/3.12/${name}.tar.xz"; - sha256 = "5e6fb25373fd4490e181e2fa0f5cacf99b78b2f6caa5d91c9c605900fb5f3839"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr - gnome3.gsettings_desktop_schemas makeWrapper gnupg - gdk_pixbuf gnome3.gnome_icon_theme librsvg gpgme - libsecret avahi libsoup p11_kit vala gnome3.gcr - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - preFixup = '' - wrapProgram "$out/bin/seahorse" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Seahorse; - description = "Application for managing encryption keys and passwords in the GnomeKeyring"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix deleted file mode 100644 index 4d6c91787a37..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, intltool, fetchurl, vala, libgtop -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - name = "baobab-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/baobab/3.12/${name}.tar.xz"; - sha256 = "494808d8a5b1776377749a1dcd5b251eb399208a4c90380dc8b8c789811e514c"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2 - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - preFixup = '' - wrapProgram "$out/bin/baobab" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Baobab; - description = "Graphical application to analyse disk usage in any Gnome environment"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix deleted file mode 100644 index 3a6c3f0dd357..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2 -, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core }: - - -stdenv.mkDerivation rec { - name = "caribou-0.4.13"; - - src = fetchurl { - url = "mirror://gnome/sources/caribou/0.4/${name}.tar.xz"; - sha256 = "953ba618621fda8a828d0d797fc916dbe35990dc01d7aa99d15e5e2241ee2782"; - }; - - buildInputs = with gnome3; - [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python pythonPackages.pygobject3 - libxml2 libXtst gtk2 intltool libxslt ]; - - propagatedBuildInputs = [ gnome3.libgee libxklavier ]; - - preBuild = '' - patchShebangs . - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix deleted file mode 100644 index a1d98449bee9..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 -, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }: - -stdenv.mkDerivation rec { - name = "dconf-${version}"; - version = "0.20.0"; - - src = fetchurl { - url = "mirror://gnome/sources/dconf/0.20/${name}.tar.xz"; - sha256 = "22c046a247d05ea65ad181e3aef4009c898a5531f76c0181f8ec0dfef83447d9"; - }; - - buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 - intltool docbook_xsl docbook_xsl_ns makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/dconf-editor" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - - rm $out/lib/gio/modules/giomodule.cache - rm $out/share/icons/hicolor/icon-theme.cache - rm $out/share/icons/HighContrast/icon-theme.cache - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix deleted file mode 100644 index a10450d93328..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf -, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream -, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts -, gcr, libsecret, folks, pulseaudio, telepathy_mission_control -, telepathy_logger, libnotify, clutter, libsoup, gnutls -, evolution_data_server -, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info -, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee }: - -# TODO: enable more features - -stdenv.mkDerivation rec { - name = "empathy-3.12.5"; - - src = fetchurl { - url = "mirror://gnome/sources/empathy/3.12/${name}.tar.xz"; - sha256 = "0rhgpiv75aafmdh6r7d4ci59lnxqmmwg9hvsa5b3mk7j2d2pma86"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard - gnome_online_accounts shared_mime_info ]; - propagatedBuildInputs = [ folks telepathy_logger evolution_data_server - telepathy_mission_control ]; - buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool - libxml2 libxslt icu file makeWrapper - telepathy_glib clutter_gtk clutter-gst cogl - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gcr libsecret pulseaudio gnome3.yelp_xsl gdk_pixbuf - libnotify clutter libsoup gnutls libgee p11_kit - libcanberra_gtk3 telepathy_farstream farstream - gnome3.gnome_icon_theme hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas file libtool librsvg ]; - - NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0" - "-I${dbus_libs}/include/dbus-1.0" - "-I${dbus_libs}/lib/dbus-1.0/include" ]; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Empathy; - description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols"; - maintainers = with maintainers; [ lethalman ]; - # TODO: license = [ licenses.gpl2 licenses.lgpl2 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix b/pkgs/desktops/gnome-3/3.12/core/eog/default.nix deleted file mode 100644 index de30f0dbbe14..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3 -, shared_mime_info, makeWrapper, librsvg, libexif }: - - -stdenv.mkDerivation rec { - name = "eog-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/eog/3.12/${name}.tar.xz"; - sha256 = "0ca8be7f20c98e9b104b2c1fa53df293e5403e6d517de845ae0f3b72777453fd"; - }; - - buildInputs = with gnome3; - [ intltool pkgconfig itstool libxml2 libjpeg gtk glib libpeas makeWrapper librsvg - gsettings_desktop_schemas shared_mime_info gnome_icon_theme gnome_desktop libexif ]; - - preFixup = '' - wrapProgram "$out/bin/eog" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${shared_mime_info}/share:${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/EyeOfGnome; - platforms = platforms.linux; - description = "GNOME image viewer"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix deleted file mode 100644 index d159965c5443..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu -, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool -, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit -, sqlite, gcr, avahi, nss, isocodes, itstool, file, which -, hicolor_icon_theme, gdk_pixbuf, librsvg, gnome_common }: - -stdenv.mkDerivation rec { - name = "epiphany-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/epiphany/3.12/${name}.tar.xz"; - sha256 = "16d9f8f10443328b2f226c2da545e75c8433f50f103af8aeb692b098d5fbbf93"; - }; - - # Tests need an X display - configureFlags = [ "--disable-static --disable-tests" ]; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - nativeBuildInputs = [ pkgconfig file ]; - - configureScript = "./autogen.sh"; - - buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file - webkitgtk libsoup libsecret gnome_desktop libnotify libtool - sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools - gdk_pixbuf gnome3.gnome_icon_theme librsvg which gnome_common - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ]; - - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; - - enableParallelBuilding = true; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram "$f" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - patches = [ ./libxml_missing_dep.patch ]; - patchFlags = "-p0"; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Epiphany; - description = "WebKit based web browser for GNOME"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch b/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch deleted file mode 100644 index c4dc85cd97e6..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.orig 2014-05-19 13:28:28.493988695 +0200 -+++ configure.ac 2014-05-19 13:28:54.837159748 +0200 -@@ -115,6 +115,7 @@ - - PKG_CHECK_MODULES(WEB_EXTENSION, [ - $WEBKIT_GTK_PC_NAME >= $WEBKIT_GTK_REQUIRED -+ libxml-2.0 >= $LIBXML_REQUIRED - libsecret-1 >= $LIBSECRET_REQUIRED - ]) - AC_SUBST(WEB_EXTENSION_CFLAGS) diff --git a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix deleted file mode 100644 index d1ad071d426a..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2 -, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 -, poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper -, librsvg, recentListSize ? null # 5 is not enough, allow passing a different number -, gobjectIntrospection -}: - -stdenv.mkDerivation rec { - name = "evince-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/evince/3.12/${name}.tar.xz"; - sha256 = "30c243bbfde56338c25a39003b4848143be42157177e2163a368f14139909f7d"; - }; - - buildInputs = [ - pkgconfig intltool perl perlXMLParser libxml2 - glib gtk3 pango atk gdk_pixbuf gobjectIntrospection - itstool gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas - poppler ghostscriptX djvulibre libspectre - makeWrapper libsecret librsvg - ]; - - configureFlags = [ - "--disable-nautilus" # Do not use nautilus - "--enable-introspection" - ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - preConfigure = with stdenv.lib; - optionalString doCheck '' - for file in test/*.py; do - echo "patching $file" - sed '1s,/usr,${python},' -i "$file" - done - '' + optionalString (recentListSize != null) '' - sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c - sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c - ''; - - preFixup = '' - # Tell Glib/GIO about the MIME info directory, which is used - # by `g_file_info_get_content_type ()'. - wrapProgram "$out/bin/evince" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - doCheck = false; # would need pythonPackages.dogTail, which is missing - - meta = with stdenv.lib; { - homepage = http://www.gnome.org/projects/evince/; - description = "GNOME's document viewer"; - - longDescription = '' - Evince is a document viewer for multiple document formats. It - currently supports PDF, PostScript, DjVu, TIFF and DVI. The goal - of Evince is to replace the multiple document viewers that exist - on the GNOME Desktop with a single simple application. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.vcunat ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix deleted file mode 100644 index a92cf684a761..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, python, sqlite -, intltool, libsoup, libxml2, libsecret, icu -, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }: - - -stdenv.mkDerivation rec { - name = "evolution-data-server-3.12.5"; - - src = fetchurl { - url = "mirror://gnome/sources/evolution-data-server/3.12/${name}.tar.xz"; - sha256 = "d3a2f832f823cb2a41467926dcaec984a15b2cb51ef89cf41267e337ca750811"; - }; - - buildInputs = with gnome3; - [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret - gcr p11_kit db nspr nss libgweather libical libgdata gperf makeWrapper icu sqlite ] - ++ stdenv.lib.optional valaSupport vala; - - # uoa irrelevant for now - configureFlags = ["--disable-uoa" "--with-nspr-includes=${nspr}/include/nspr" "--with-nss-includes=${nss}/include/nss"] - ++ stdenv.lib.optional valaSupport "--enable-vala-bindings"; - - preFixup = '' - for f in "$out/libexec/"*; do - wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix deleted file mode 100644 index 7e3af8405a4b..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool -, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs -, telepathy_glib, evolution_data_server, libsecret, db }: - -# TODO: enable more folks backends - -stdenv.mkDerivation rec { - name = "folks-0.9.8"; - - src = fetchurl { - url = "mirror://gnome/sources/folks/0.9/${name}.tar.xz"; - sha256 = "09cbs3ihcswpi1wg8xbjmkqjbhnxa1idy1fbzmz0gah7l5mxmlfj"; - }; - - propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; - # dbus_daemon needed for tests - buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs - vala libsecret libxml2 libsoup nspr nss intltool db ]; - nativeBuildInputs = [ pkgconfig ]; - - configureFlags = "--disable-fatal-warnings"; - - NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss" - "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"]; - - enableParallelBuilding = true; - - postBuild = "rm -rf $out/share/gtk-doc"; - - meta = { - description = "Folks"; - - homepage = https://wiki.gnome.org/Projects/Folks; - - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = with stdenv.lib.maintainers; [ lethalman ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix deleted file mode 100644 index a4cb3e8c1464..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2 -, intltool, polkit, orbit, withGtk ? false }: - -assert withGtk -> (gnome3 != null); - -stdenv.mkDerivation rec { - - versionMajor = "3.2"; - versionMinor = "6"; - moduleName = "GConf"; - - origName = "${moduleName}-${versionMajor}.${versionMinor}"; - - name = "gconf-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz"; - sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"; - }; - - buildInputs = [ libxml2 polkit orbit ] ++ stdenv.lib.optional withGtk gnome3.gtk; - propagatedBuildInputs = [ glib dbus_glib ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - # ToDo: ldap reported as not found but afterwards reported as supported - - meta = with stdenv.lib; { - homepage = http://projects.gnome.org/gconf/; - description = "A system for storing application preferences"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix deleted file mode 100644 index 6dd69a64fd71..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib -, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk -, gobjectIntrospection, makeWrapper, libxslt, vala }: - -stdenv.mkDerivation rec { - name = "gcr-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gcr/3.12/${name}.tar.xz"; - sha256 = "456e20615ab178aa92eeabdea64dcce535c10d5af189171d9375291a2447d21c"; - }; - - buildInputs = [ - pkgconfig intltool gnupg p11_kit glib gobjectIntrospection libxslt - libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala - ]; - - #doCheck = true; - - preFixup = '' - wrapProgram "$out/bin/gcr-viewer" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix deleted file mode 100644 index a939a8d4fd9f..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus -, intltool, accountsservice, libX11, gnome3, systemd, gnome_session -, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }: - -stdenv.mkDerivation rec { - name = "gdm-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gdm/3.12/${name}.tar.xz"; - sha256 = "cc91fff5afd2a7c3e712c960a0b60744774167dcfc16f486372e1eb3c0aa1cc4"; - }; - - # Only needed to make it build - preConfigure = '' - substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X" - ''; - - configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; - - buildInputs = [ pkgconfig glib itstool libxml2 intltool - accountsservice gnome3.dconf systemd - gobjectIntrospection libX11 gtk - libcanberra_gtk3 pam libtool ]; - - #enableParallelBuilding = true; # problems compiling - - preBuild = '' - substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session' - substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch' - ''; - - patches = [ ./xserver_path.patch ./sessions_dir.patch ./propagate_env.patch ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GDM; - description = "A program that manages graphical display servers and handles graphical user logins"; - platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch deleted file mode 100644 index b3e356a65c3e..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/daemon/gdm-launch-environment.c 2014-11-24 15:43:55.532879804 +0100 -+++ a/daemon/gdm-launch-environment.c 2014-11-28 18:22:42.636313967 +0100 -@@ -220,8 +220,8 @@ - "LANG", "LANGUAGE", "LC_CTYPE", "LC_NUMERIC", "LC_TIME", - "LC_COLLATE", "LC_MONETARY", "LC_MESSAGES", "LC_PAPER", - "LC_NAME", "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT", -- "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH", -- NULL -+ "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH", "XCURSOR_PATH", -+ "XDG_CONFIG_DIRS", NULL - }; - char *system_data_dirs; - int i; diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch deleted file mode 100644 index b8fbad4d731d..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c -index f759d2d..d154716 100644 ---- a/daemon/gdm-session.c -+++ b/daemon/gdm-session.c -@@ -373,9 +373,12 @@ get_system_session_dirs (void) - #ifdef ENABLE_WAYLAND_SUPPORT - DATADIR "/wayland-sessions/", - #endif -+ NULL, - NULL - }; - -+ search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL; -+ - return search_dirs; - } - diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch deleted file mode 100644 index 412daee9f270..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/daemon/gdm-server.c 2014-07-30 23:00:17.786841724 +0200 -+++ b/daemon/gdm-server.c 2014-07-30 23:02:10.491239180 +0200 -@@ -322,7 +322,11 @@ - fallback: - #endif - -- server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options); -+ if (g_getenv("GDM_X_SERVER") != NULL) { -+ server->priv->command = g_strdup (g_getenv("GDM_X_SERVER")); -+ } else { -+ server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options); -+ } - } - - static gboolean diff --git a/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix deleted file mode 100644 index 6a461e3bde6e..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }: - - -stdenv.mkDerivation rec { - name = "geocode-glib-3.12.2"; - - - src = fetchurl { - url = "mirror://gnome/sources/geocode-glib/3.12/${name}.tar.xz"; - sha256 = "5ca581a927cac3025adc2afadfdaf9a493ca887537a548aa47296bc77bcfa49e"; - }; - - buildInputs = with gnome3; - [ intltool pkgconfig glib libsoup json_glib ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix deleted file mode 100644 index c1e5486d3a71..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_24, pango }: - - -stdenv.mkDerivation rec { - name = "gjs-1.40.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gjs/1.40/${name}.tar.xz"; - sha256 = "2f0d80ec96c6284785143abe51377d8a284977ea6c3cf0cef1020d92eae41793"; - }; - - buildInputs = with gnome3; - [ gobjectIntrospection pkgconfig glib pango ]; - - propagatedBuildInputs = [ spidermonkey_24 ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix deleted file mode 100644 index 46db008787f6..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool }: - -stdenv.mkDerivation rec { - name = "gnome-backgrounds-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-backgrounds/3.12/${name}.tar.xz"; - sha256 = "ac4d3e0fffc5991865ca748e728a1ab87f167400105250ce2195b03502427180"; - }; - - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix deleted file mode 100644 index fae47476898d..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, gnome3, pkgconfig, intltool, glib -, udev, itstool, libxml2 }: - -stdenv.mkDerivation rec { - name = "gnome-bluetooth-${gnome3.version}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.version}/${name}.tar.xz"; - sha256 = "0rsw27yj6887axk7s2vwpsr0pmic0wdskl7sx8rk4kns7b0ifs88"; - }; - - buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2 - gsettings_desktop_schemas itstool ]; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en; - description = "Application that let you manage Bluetooth in the GNOME destkop"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix deleted file mode 100644 index 19d0c9c10e89..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, libxml2 -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "gnome-calculator-3.12.3"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-calculator/3.12/${name}.tar.xz"; - sha256 = "0bn3agh3g22iradfpzkc19a2b33b1mbf0ciy1hf2sijrczi24410"; - }; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool - libxml2 gnome3.gtksourceview - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-calculator" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/Calculator; - description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix deleted file mode 100644 index b534d6922b76..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, which, autoconf, automake }: - -stdenv.mkDerivation rec { - name = "gnome-common-3.12.0"; - - src = fetchurl { - url = "https://download.gnome.org/sources/gnome-common/3.12/${name}.tar.xz"; - sha256 = "18712bc2df6b2dd88a11b9f7f874096d1c0c6e7ebc9cfc0686ef963bd590e1d8"; - }; - - patches = [(fetchurl { - url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935"; - sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl"; - })]; - - propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch deleted file mode 100644 index 926762defbde..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.orig 2014-04-08 10:25:49.497620879 +0200 -+++ configure.ac 2014-04-08 10:26:36.639440950 +0200 -@@ -43,6 +43,7 @@ - folks-telepathy - folks-eds - libnotify -+ dbus-glib-1 - telepathy-glib >= 0.17.5 - libebook-1.2 >= 3.5.3 - libedataserver-1.2 >= 3.5.3 diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix deleted file mode 100644 index 5b4ca5c34182..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, intltool, fetchurl, evolution_data_server, db -, pkgconfig, gtk3, glib, hicolor_icon_theme, libsecret -, bash, makeWrapper, itstool, folks, libnotify, libxml2 -, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss -, libsoup, vala, dbus_glib, automake114x, autoconf }: - -stdenv.mkDerivation rec { - name = "gnome-contacts-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-contacts/3.12/${name}.tar.xz"; - sha256 = "fb3f25d409032b24fb67241e67d4da10cf6f77a48c088709455cea5f6f33e87d"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ]; - - # force build from vala - preBuild = '' - touch src/*.vala - ''; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server - gnome3.gsettings_desktop_schemas makeWrapper file libnotify - folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib - libxml2 libsoup gnome3.gnome_online_accounts nspr nss - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - vala automake114x autoconf db ]; - - preFixup = '' - for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - patches = [ ./configure_dbus_glib.patch ]; - - patchFlags = "-p0"; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Contacts; - description = "Contacts is GNOME's integrated address book"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix deleted file mode 100644 index 4a394b3b8975..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper -, libcanberra, accountsservice, libpwquality, pulseaudio, fontconfig -, gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify -, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk -, cracklib, python, krb5, networkmanagerapplet, networkmanager -, libwacom, samba, shared_mime_info, tzdata, icu, libtool -, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk }: - -# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules -# TODO: bluetooth, wacom, smbclient, printers - -stdenv.mkDerivation rec { - name = "gnome-control-center-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-control-center/3.12/${name}.tar.xz"; - sha256 = "5297d448eff0ec58f6c0ad9fbd1b94bed0a850496df0ee65571c0622b49c1582"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.libgnomekbd ]; - - enableParallelBuilding = true; - - buildInputs = with gnome3; - [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas - libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus - gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality - accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile - shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo - gdk_pixbuf gnome3.gnome_icon_theme librsvg clutter clutter_gtk - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.vino - networkmanager modemmanager makeWrapper ]; - - preBuild = '' - substituteInPlace tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" - substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" - - # hack to make test-endianess happy - mkdir -p $out/share/locale - substituteInPlace panels/datetime/test-endianess.c --replace "/usr/share/locale/" "$out/share/locale/" - ''; - - preFixup = with gnome3; '' - wrapProgram $out/bin/gnome-control-center \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - for i in $out/share/applications/*; do - substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" - done - ''; - - patches = [ ./search_providers_dir.patch ./vpn_plugins_path.patch ]; - - meta = with stdenv.lib; { - description = "Single sign-on framework for GNOME"; - maintainers = with maintainers; [ lethalman ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch deleted file mode 100644 index 7f5ad970f34e..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/panels/search/cc-search-panel.c b/panels/search/cc-search-panel.c -index d08e230..3bff4ad 100644 ---- a/panels/search/cc-search-panel.c -+++ b/panels/search/cc-search-panel.c -@@ -574,7 +574,11 @@ populate_search_providers (CcSearchPanel *self) - { - GFile *providers_location; - -- providers_location = g_file_new_for_path (DATADIR "/gnome-shell/search-providers"); -+ const gchar* search_providers_dir = g_getenv ("GNOME_SEARCH_PROVIDERS_DIR"); -+ if (search_providers_dir == NULL) { -+ search_providers_dir = DATADIR "/gnome-shell/search-providers"; -+ } -+ providers_location = g_file_new_for_path (search_providers_dir); - g_file_enumerate_children_async (providers_location, - "standard::type,standard::name,standard::content-type", - G_FILE_QUERY_INFO_NONE, diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch deleted file mode 100644 index e25105a303f4..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/panels/network/connection-editor/vpn-helpers.c b/panels/network/connection-editor/vpn-helpers.c -index 7dc23c2..fcb1384 100644 ---- a/panels/network/connection-editor/vpn-helpers.c -+++ b/panels/network/connection-editor/vpn-helpers.c -@@ -95,14 +95,6 @@ vpn_get_plugins (GError **error) - if (!so_path) - goto next; - -- /* Remove any path and extension components, then reconstruct path -- * to the SO in LIBDIR -- */ -- so_name = g_path_get_basename (so_path); -- g_free (so_path); -- so_path = g_build_filename (NM_VPN_MODULE_DIR, so_name, NULL); -- g_free (so_name); -- - module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); - if (!module) { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load the VPN plugin which provides the " diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix deleted file mode 100644 index e8d4efc1c806..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib -, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland -, gobjectIntrospection }: - -stdenv.mkDerivation rec { - - majorVersion = "3.12"; - minorVersion = "2"; - name = "gnome-desktop-${majorVersion}.${minorVersion}"; - - # this should probably be setuphook for glib - NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; - - enableParallelBuilding = true; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-desktop/${majorVersion}/${name}.tar.xz"; - sha256 = "b7d691363ccc90182caff1980efa7d99e4569bea968d39654102a0c4e824a44d"; - }; - - buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 xkeyboard_config isocodes itstool wayland - gtk3 glib intltool gnome_doc_utils libxkbfile gnome3.gsettings_desktop_schemas gobjectIntrospection ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix deleted file mode 100644 index 6f68916b781e..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - name = "gnome-dictionary-3.10.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-dictionary/3.10/${name}.tar.xz"; - sha256 = "258b60fe50f7d0580a7dc3bb83f7fe2f6f0597d4013d97ac083c3f062c350ed7"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-dictionary" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Dictionary; - description = "Dictionary is the GNOME application to look up definitions"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix deleted file mode 100644 index a68624ba0e10..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper, cracklib, libnotify -, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python -, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }: - -stdenv.mkDerivation rec { - name = "gnome-disk-utility-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-disk-utility/3.12/${name}.tar.xz"; - sha256 = "5994bfae57063d74be45736050cf166cda5b1600a599703240b641b39375718e"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool - libxslt libtool libsecret libpwquality cracklib - libnotify libdvdread libcanberra_gtk3 docbook_xsl - gdk_pixbuf gnome3.gnome_icon_theme - librsvg udisks2 gnome3.gnome_settings_daemon - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-disks" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = http://en.wikipedia.org/wiki/GNOME_Disks; - description = "A udisks graphical front-end"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix deleted file mode 100644 index a74c5722ba2a..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool -, gnome3, librsvg, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "gnome-font-viewer-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-font-viewer/3.12/${name}.tar.xz"; - sha256 = "fca50711b7bd4edd1213dd4f05a309911cd1e832974142944c06d52ae07cbe45"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-font-viewer" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - description = "Program that can preview fonts and create thumbnails for fonts"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix deleted file mode 100644 index 066951c63a68..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, iconnamingutils, gtk }: - -stdenv.mkDerivation rec { - name = "gnome-icon-theme-symbolic-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-icon-theme-symbolic/3.12/${name}.tar.xz"; - sha256 = "851a4c9d8e8cb0000c9e5e78259ab8b8e67c5334e4250ebcc8dfdaa33520068b"; - }; - - configureFlags = "--enable-icon-mapping"; - - # Avoid postinstall make hooks - installPhase = '' - make install-exec-am install-data-local install-pkgconfigDATA - make -C src install - ''; - - buildInputs = [ pkgconfig iconnamingutils gtk ]; - - propagatedBuildInputs = [ gnome3.gnome_icon_theme ]; - - propagatedUserEnvPkgs = [ gnome3.gnome_icon_theme ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix deleted file mode 100644 index 34a3b67af7e4..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk, hicolor_icon_theme }: - -stdenv.mkDerivation rec { - name = "gnome-icon-theme-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-icon-theme/3.12/${name}.tar.xz"; - sha256 = "359e720b9202d3aba8d477752c4cd11eced368182281d51ffd64c8572b4e503a"; - }; - - nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; - - propagatedBuildInputs = [ hicolor_icon_theme ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix deleted file mode 100644 index 59667fe3323d..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt -, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper -, docbook_xsl_ns, docbook_xsl, gnome3 }: - -stdenv.mkDerivation rec { - name = "gnome-keyring-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-keyring/3.12/${name}.tar.xz"; - sha256 = "3bc39a42d445b82d24247a8c39eeb0eef7ecb1c8ebb8e6ec62671868be93fd4c"; - }; - - buildInputs = with gnome3; [ - dbus libgcrypt pam python gtk3 gconf libgnome_keyring - pango gcr gdk_pixbuf atk p11_kit makeWrapper - ]; - - propagatedBuildInputs = [ glib libtasn1 libxslt ]; - - nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ]; - - configureFlags = [ - "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path - "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories - "--with-pkcs11-modules=$$out/lib/pkcs11/" - ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-keyring" \ - --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - wrapProgram "$out/bin/gnome-keyring-daemon" \ - --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix deleted file mode 100644 index 37d2ea1c0863..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }: - -stdenv.mkDerivation rec { - name = "gnome-menus-${version}"; - version = "3.10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz"; - sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6"; - }; - - makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - - preBuild = "patchShebangs ./scripts"; - - buildInputs = [ intltool pkgconfig glib gobjectIntrospection ]; - - meta = { - homepage = "http://www.gnome.org"; - description = "Gnome menu specification"; - - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix deleted file mode 100644 index e113a854a8b9..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, webkitgtk, json_glib, rest, libsecret, dbus_glib -, telepathy_glib, intltool, dbus_libs, icu, libsoup, docbook_xsl_ns, docbook_xsl -}: - -stdenv.mkDerivation rec { - name = "gnome-online-accounts-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-online-accounts/3.12/${name}.tar.xz"; - sha256 = "cac7758e09d32eb54af50ab6b23d65da0c8d48c555c8db011a0cf5b977d542ec"; - }; - - NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0"; - - enableParallelBuilding = true; - - buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest libsecret dbus_glib telepathy_glib intltool icu libsoup docbook_xsl_ns docbook_xsl]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix deleted file mode 100644 index 394a3ee447cd..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2 -, libsoup, json_glib, gmp, openssl, makeWrapper }: - -stdenv.mkDerivation rec { - name = "gnome-online-miners-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-online-miners/3.12/${name}.tar.xz"; - sha256 = "734db67bb158a046bc8bbbe418f0fdaf6d8652ac86406907a8d17d069fa48f23"; - }; - - doCheck = true; - - buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl - gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins - gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart - gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ]; - - enableParallelBuilding = true; - - preFixup = '' - for f in $out/libexec/*; do - wrapProgram "$f" \ - --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners; - description = "A set of crawlers that go through your online content and index them locally in Tracker"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix deleted file mode 100644 index 349df0b103c9..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3 -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "gnome-screenshot-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-screenshot/3.12/${name}.tar.xz"; - sha256 = "ae4bf706652ae9b28c7930d22c2c37469a78d7f6656d312960b3c75ee5c36eb1"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-screenshot" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot; - description = "Utility used in the GNOME desktop environment for taking screenshots"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix deleted file mode 100644 index bebd0b4b77c4..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower -, libxslt, intltool, makeWrapper, systemd, xorg }: - - -stdenv.mkDerivation rec { - name = "gnome-session-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-session/3.12/${name}.tar.xz"; - sha256 = "fa308771ac18bc5f77e5a5be3b2d93df1625168cb40167c1dfa898e9006e25d3"; - }; - - configureFlags = "--enable-systemd"; - - buildInputs = with gnome3; - [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt - gnome3.gnome_settings_daemon xorg.xtrans - gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-session" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix deleted file mode 100644 index 81b49e6bc643..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst -, libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit -, geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool -, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }: - -stdenv.mkDerivation rec { - name = "gnome-settings-daemon-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/3.12/${name}.tar.xz"; - sha256 = "e887bd63c733febccb7f2c1453c075016342e223214fa9cfc60d90f1e16e080f"; - }; - - # fatal error: gio/gunixfdlist.h: No such file or directory - NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; - - buildInputs = with gnome3; - [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas - libnotify gnome_desktop lcms2 libXtst libxkbfile pulseaudio - libcanberra_gtk3 upower colord libgweather xkeyboard_config - polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt - libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ]; - - preFixup = '' - wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix PATH : "${glib}/bin" \ - --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix deleted file mode 100644 index 8503af44613c..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, intltool, fetchurl, libgtop -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool -, gnome3, file }: - -stdenv.mkDerivation rec { - name = "gnome-shell-extensions-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-shell-extensions/3.12/${name}.tar.xz"; - sha256 = "30ba6e4792062e5a5cdd18e4a12230e68bfed1ded7de433ad241dd75e7ae2fc6"; - }; - - doCheck = true; - - buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool - makeWrapper file ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions; - description = "Modify and extend GNOME Shell functionality and behavior"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix deleted file mode 100644 index 578081ccf89d..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret -, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core -, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip -, hicolor_icon_theme, sqlite -, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper -, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: - -# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup - -stdenv.mkDerivation rec { - name = "gnome-shell-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-shell/3.12/${name}.tar.xz"; - sha256 = "3ae230e8cb7a31e7b782c16ca178af5957858810788e26a6d630b69b3f85ce71"; - }; - - buildInputs = with gnome3; - [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice - libcroco intltool libsecret pkgconfig python libsoup polkit libcanberra gdk_pixbuf librsvg - clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns - libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server - libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm gnome_control_center - hicolor_icon_theme gnome_icon_theme gnome_icon_theme_symbolic sqlite - at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ]; - - installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ]; - - preBuild = '' - patchShebangs src/data-to-c.pl - substituteInPlace data/Makefile --replace " install-keysDATA" "" - ''; - - preFixup = with gnome3; '' - wrapProgram "$out/bin/gnome-shell" \ - --prefix PATH : "${unzip}/bin" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - - wrapProgram "$out/libexec/gnome-shell-calendar-server" \ - --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - - echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path - ''; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix deleted file mode 100644 index 9abeda537447..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }: - -stdenv.mkDerivation rec { - name = "gnome-system-log-3.9.90"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz"; - sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool - gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-system-log" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-system-log/3.9/; - description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix deleted file mode 100644 index 622df1c5db21..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2 -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }: - -stdenv.mkDerivation rec { - name = "gnome-system-monitor-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-system-monitor/3.12/${name}.tar.xz"; - sha256 = "ba074e2157302d91d73b68e13207bf85452b84234e429b1ec9b9a7b1c70736d8"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 - gtkmm3 libgtop makeWrapper - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-system-monitor" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/; - description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix deleted file mode 100644 index 057ef191a6f4..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, libuuid -, desktop_file_utils, itstool, makeWrapper, appdata-tools }: - -stdenv.mkDerivation rec { - - versionMajor = "3.12"; - versionMinor = "2"; - - name = "gnome-terminal-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-terminal/${versionMajor}/${name}.tar.xz"; - sha256 = "ea19ce610af2873d26e1e75491415e17af6a5080366db966f9220fdeea5ebecd"; - }; - - buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools - gnome3.dconf itstool makeWrapper gnome3.nautilus ]; - - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ]; - - # FIXME: enable for gnome3 - configureFlags = [ "--disable-search-provider" "--disable-migration" ]; - - preFixup = '' - for f in "$out/libexec/gnome-terminal-server"; do - wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix deleted file mode 100644 index 5128a1951411..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, fetchurl, intltool, gtk3, librsvg, pkgconfig, pango, atk, gtk2, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "gnome-themes-standard-3.12.0"; - src = fetchurl { - url = "mirror://gnome/sources/gnome-themes-standard/3.12/${name}.tar.xz"; - sha256 = "a05d1b7ca872b944a69d0c0cc2369408ece32ff4355e37f8594a1b70d13c3217"; - }; - - buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix deleted file mode 100644 index 2a237b15c21c..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }: - -stdenv.mkDerivation rec { - name = "gnome-user-docs-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-user-docs/3.12/${name}.tar.xz"; - sha256 = "1cj45lpa74vkbxyila3d6pn5m1gh51nljp9fjirxmzwi1h6wg7jd"; - }; - - buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ]; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-help/3.12; - description = "User and system administration help for the Gnome desktop"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.cc-by-30; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix deleted file mode 100644 index fde47a66340b..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus -, pkgconfig, gtk3, glib, hicolor_icon_theme, libxml2, gnused -, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd -, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }: - -stdenv.mkDerivation rec { - name = "gnome-user-share-3.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-user-share/3.10/${name}.tar.xz"; - sha256 = "1d1ea57a49224c36e7cba04f80265e835639377f474a7582c9e8ac946eda0f8f"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - preConfigure = '' - sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf - ''; - - configureFlags = [ "--with-httpd=${apacheHttpd_2_2}/bin/httpd" - "--with-modules-path=${apacheHttpd_2_2}/modules" - "--disable-bluetooth" - "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool - makeWrapper file gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - nautilus libnotify libcanberra_gtk3 ]; - - postInstall = '' - mkdir -p $out/share/gsettings-schemas/$name - mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name - ${glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas - ''; - - preFixup = '' - wrapProgram "$out/libexec/gnome-user-share" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-user-share/3.8; - description = "Service that exports the contents of the Public folder in your home directory on the local network"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix deleted file mode 100644 index 9076d5c58390..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite -, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av -, gmime, json_glib, avahi, tracker, itstool }: - -stdenv.mkDerivation rec { - name = "grilo-plugins-0.2.13"; - - src = fetchurl { - url = "mirror://gnome/sources/grilo-plugins/0.2/${name}.tar.xz"; - sha256 = "008jwm5ydl0k25p3d2fkcail40fj9y3qknihxb5fg941p8qlhm55"; - }; - - installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-0.2" ]; - - buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata - lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts - gnome3.totem-pl-parser gnome3.rest gmime json_glib - avahi gnome3.libmediaart tracker intltool itstool ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Grilo; - description = "A collection of plugins for the Grilo framework"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix deleted file mode 100644 index 9c0e3f9a0bc9..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib -, libxml2, gnome3, gobjectIntrospection, libsoup }: - -stdenv.mkDerivation rec { - name = "grilo-0.2.11"; - - src = fetchurl { - url = "mirror://gnome/sources/grilo/0.2/${name}.tar.xz"; - sha256 = "8a52c37521de80d6caf08a519a708489b9e2b097c2758a0acaab6fbd26d30ea6"; - }; - - configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ]; - - preConfigure = '' - for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do - substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/" - substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0" - done - ''; - - buildInputs = [ pkgconfig file intltool glib libxml2 libsoup - gnome3.totem-pl-parser gobjectIntrospection ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Grilo; - description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix deleted file mode 100644 index 917bcd99c95f..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection - # just for passthru -, gtk3, gsettings_desktop_schemas }: - -stdenv.mkDerivation rec { - - versionMajor = "3.12"; - versionMinor = "2"; - moduleName = "gsettings-desktop-schemas"; - - name = "${moduleName}-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "da75021e9c45a60d0a97ea3486f93444275d0ace86dbd1b97e5d09000d8c4ad1"; - }; - - buildInputs = [ glib gobjectIntrospection ]; - - nativeBuildInputs = [ pkgconfig intltool ]; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix deleted file mode 100644 index 5779b6d04802..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango -, libxml2Python, perl, intltool, gettext }: - -stdenv.mkDerivation rec { - name = "gtksourceview-${version}"; - version = "3.12.3"; - - src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/3.12/gtksourceview-${version}.tar.xz"; - sha256 = "1xzmw9n9zbkaasl8xi7s5h49wiv5dq4qf8hr2pzjkack3ai5j6gk"; - }; - - propagatedBuildInputs = [ gtk3 ]; - - buildInputs = [ pkgconfig atk cairo glib pango - libxml2Python perl intltool gettext ]; - - preBuild = '' - substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share" - ''; - - patches = [ ./nix_share_path.patch ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch deleted file mode 100644 index c87350167c25..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/gtksourceview/gtksourceview-utils.c 2014-07-13 16:13:57.418687726 +0200 -+++ b/gtksourceview/gtksourceview-utils.c 2014-07-13 16:14:20.550847767 +0200 -@@ -68,6 +68,8 @@ - basename, - NULL)); - -+ g_ptr_array_add (dirs, g_build_filename ("@NIX_SHARE_PATH@", SOURCEVIEW_DIR, basename, NULL)); -+ - g_ptr_array_add (dirs, NULL); - - return (gchar**) g_ptr_array_free (dirs, FALSE); diff --git a/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix deleted file mode 100644 index 590f8706fff5..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtk3 -, glib, desktop_file_utils, bash -, makeWrapper, gnome3, file, itstool, libxml2 }: - -# TODO: icons and theme still does not work -# use packaged gnome3.gnome_icon_theme_symbolic - -stdenv.mkDerivation rec { - name = "gucharmap-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gucharmap/3.12/${name}.tar.xz"; - sha256 = "5e260767da43f6dc31a8be33ca363da56781349b367464fa9c478bca66aa18d9"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - - buildInputs = [ pkgconfig gtk3 intltool itstool glib - gnome3.yelp_tools libxml2 file desktop_file_utils - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gucharmap" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Gucharmap; - description = "GNOME Character Map, based on the Unicode Character Database"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix deleted file mode 100644 index 1875c1491f96..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, glib }: - -stdenv.mkDerivation rec { - name = "libcroco-0.6.8"; - - src = fetchurl { - url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz"; - sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa"; - }; - - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; - - buildInputs = [ pkgconfig libxml2 glib ]; - - meta = with stdenv.lib; { - platforms = platforms.unix; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix deleted file mode 100644 index 9a1a45e0d1ac..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib -, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl }: - -stdenv.mkDerivation rec { - name = "libgdata-0.14.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libgdata/0.14/${name}.tar.xz"; - sha256 = "1scjs944kjazbsh86kdj6w2vprib6yd3wzxzabcs59acmr0m4hax"; - }; - - NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1"; - - buildInputs = with gnome3; - [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection - liboauth gcr gnome_online_accounts p11_kit openssl ]; - - meta = with stdenv.lib; { - description = "GData API library"; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; - license = licenses.lgpl21Plus; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix deleted file mode 100644 index b21c274ce516..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }: -let - ver_maj = "0.14"; - ver_min = "0"; -in -stdenv.mkDerivation rec { - name = "libgee-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz"; - sha256 = "08e466d3f214c9466860b5a82629de0de9eb89b1de7bd918fe154e569b5834cd"; - }; - - doCheck = true; - - patches = [ ./fix_introspection_paths.patch ]; - - buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ]; - - meta = with stdenv.lib; { - description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch deleted file mode 100644 index 67003f451645..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- fix_introspection_paths.patch/configure 2014-01-07 17:43:53.521339338 +0000 -+++ fix_introspection_paths.patch/configure-fix 2014-01-07 17:45:11.068635069 +0000 -@@ -12085,8 +12085,8 @@ - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -+ INTROSPECTION_GIRDIR="${datadir}/gir-1.0" -+ INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection diff --git a/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix deleted file mode 100644 index c6c9323c010a..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }: - -stdenv.mkDerivation rec { - name = "libgnome-keyring-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libgnome-keyring/3.12/${name}.tar.xz"; - sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783"; - }; - - propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = { - description = "Framework for managing passwords and other secrets"; - homepage = http://live.gnome.org/GnomeKeyring; - license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; - inherit (glib.meta) platforms maintainers; - - longDescription = '' - gnome-keyring is a program that keeps password and other secrets for - users. The library libgnome-keyring is used by applications to integrate - with the gnome-keyring system. - ''; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix deleted file mode 100644 index 1156474e5a7c..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper }: - -stdenv.mkDerivation rec { - name = "libgnomekbd-3.6.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libgnomekbd/3.6/${name}.tar.xz"; - sha256 = "c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09"; - }; - - buildInputs = [ pkgconfig file intltool glib gtk3 libxklavier makeWrapper ]; - - preFixup = '' - wrapProgram $out/bin/gkbd-keyboard-display \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - description = "Keyboard management library"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix deleted file mode 100644 index 8246a2183b7a..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf -, pango, gdk_pixbuf, atk, tzdata }: - -stdenv.mkDerivation rec { - name = "libgweather-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/libgweather/3.12/${name}.tar.xz"; - sha256 = "54ef096350d7774ab1b3f23ed768246301cdcedfaa762a2c46920bf87fcc1c37"; - }; - - makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - - configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ]; - propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix deleted file mode 100644 index 72d307f4f1a7..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff -, openssl, bzip2, acl, attr -}: - -stdenv.mkDerivation rec { - name = "libgxps-0.2.2"; - - src = fetchurl { - url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz"; - sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r"; - }; - - buildInputs = [ pkgconfig glib cairo libarchive freetype libjpeg libtiff acl openssl bzip2 attr]; - - configureFlags = "--without-liblcms2"; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix deleted file mode 100644 index 547a52ccf9ab..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool -, glib, gtk3, gobjectIntrospection, python, pygobject3 -}: - -stdenv.mkDerivation rec { - name = "libpeas-${version}"; - version = "1.10.0"; - - buildInputs = [ - intltool pkgconfig - glib gtk3 gobjectIntrospection python pygobject3 - ]; - - src = fetchurl { - url = "mirror://gnome/sources/libpeas/1.10/${name}.tar.xz"; - sha256 = "4695bc40e4885a903dbc5ce6a3704392feae63af51fd4da7a3888bb88ca78c47"; - }; - - preFixup = '' - rm $out/share/icons/hicolor/icon-theme.cache - ''; - - meta = { - description = "A GObject-based plugins engine"; - homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix deleted file mode 100644 index 5a8117528b68..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }: - -stdenv.mkDerivation rec { - name = "libzapojit-0.0.3"; - - src = fetchurl { - url = "mirror://gnome/sources/libzapojit/0.0/${name}.tar.xz"; - sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; - }; - - buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix deleted file mode 100644 index aa1af1ebd556..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo -, pango, cogl, clutter, libstartup_notification, libcanberra, zenity, libcanberra_gtk3 -, libtool, makeWrapper }: - - -stdenv.mkDerivation rec { - name = "mutter-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/mutter/3.12/${name}.tar.xz"; - sha256 = "e653cf3e8c29af8d8c086bebcaa06781c48695be949417b72278fee37fe9e173"; - }; - - # fatal error: gio/gunixfdlist.h: No such file or directory - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra"; - - buildInputs = with gnome3; - [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower - gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra - libcanberra_gtk3 zenity libtool makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/mutter" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix deleted file mode 100644 index dceb7c817bda..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif -, gtk, gnome3, libunique, intltool, gobjectIntrospection -, libnotify, makeWrapper, exempi, librsvg, tracker }: - -stdenv.mkDerivation rec { - name = "nautilus-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/nautilus/3.12/${name}.tar.xz"; - sha256 = "969c2bedc324eab7b9399bdb3a7db61f819a2995c733349ded081b059a1cafb1"; - }; - - buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg - gnome3.gnome_desktop gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas libnotify makeWrapper tracker ]; - - preFixup = '' - wrapProgram "$out/bin/nautilus" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - patches = [ ./extension_dir.patch ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch deleted file mode 100644 index 317b82579924..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/libnautilus-private/nautilus-module.c b/libnautilus-private/nautilus-module.c -index 6273a76..4adcc8a 100644 ---- a/libnautilus-private/nautilus-module.c -+++ b/libnautilus-private/nautilus-module.c -@@ -242,11 +242,17 @@ void - nautilus_module_setup (void) - { - static gboolean initialized = FALSE; -+ const gchar* extensiondir = NULL; - - if (!initialized) { - initialized = TRUE; -- -- load_module_dir (NAUTILUS_EXTENSIONDIR); -+ -+ extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR"); -+ if (extensiondir == NULL) { -+ extensiondir = NAUTILUS_EXTENSIONDIR; -+ } -+ -+ load_module_dir (extensiondir); - - eel_debug_call_at_shutdown (free_module_objects); - } diff --git a/pkgs/desktops/gnome-3/3.12/core/rest/default.nix b/pkgs/desktops/gnome-3/3.12/core/rest/default.nix deleted file mode 100644 index 9e19d4f90058..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/rest/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection }: - -stdenv.mkDerivation rec { - name = "rest-0.7.91"; - - src = fetchurl { - url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz"; - sha256 = "838814d935143f2dc99eb79f1ac69c615e7b547339f6cd226dd0ed4d7c16b67a"; - }; - - buildInputs = [ pkgconfig glib libsoup gobjectIntrospection]; - - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt"; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix deleted file mode 100644 index 2830d5bac27e..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib -, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz -, webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1 -, gdk_pixbuf, librsvg, hicolor_icon_theme }: - -stdenv.mkDerivation rec { - name = "sushi-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/sushi/3.12/${name}.tar.xz"; - sha256 = "78594a858371b671671205e7b2518e7eb82ed8c2540b62f45a657aaabdf1a9ff"; - }; - - propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; - - buildInputs = [ pkgconfig file intltool gobjectIntrospection glib - clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf librsvg - gnome3.gnome_icon_theme hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - libmusicbrainz5 webkitgtk gnome3.evince icu makeWrapper ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram $out/libexec/sushi-start \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = "http://en.wikipedia.org/wiki/Sushi_(software)"; - description = "A quick previewer for Nautilus"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix deleted file mode 100644 index f1b3bfe53c13..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup }: - -stdenv.mkDerivation rec { - name = "totem-pl-parser-3.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz"; - sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469"; - }; - - buildInputs = [ pkgconfig file intltool gmime libxml2 libsoup ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Videos; - description = "Simple GObject-based library to parse and save a host of playlist formats"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix deleted file mode 100644 index 9c2db40f89d3..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, intltool, fetchurl, gst_all_1 -, clutter_gtk, clutter-gst, pygobject3, shared_mime_info -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool, libxml2, dbus_glib -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - name = "totem-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/totem/3.12/${name}.tar.xz"; - sha256 = "1law033wxbs8v3l2fk0p1v8lf9m45dm997yhq0cmqgw10jxxiybn"; - }; - - doCheck = true; - - enableParallelBuilding = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo - clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gnome3.libpeas pygobject3 shared_mime_info dbus_glib - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas makeWrapper file ]; - - preFixup = '' - wrapProgram "$out/bin/totem" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Videos; - description = "Movie player for the GNOME desktop based on GStreamer"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix deleted file mode 100644 index d14b088f5304..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, intltool, fetchurl, libxml2, upower -, pkgconfig, gtk3, glib, hicolor_icon_theme, gobjectIntrospection -, bash, makeWrapper, itstool, vala, sqlite, automake114x, autoconf -, gnome3, librsvg, gdk_pixbuf, file, libnotify -, evolution_data_server, gst_all_1, poppler, libtool -, icu, taglib, libjpeg, libtiff, giflib, libcue -, libvorbis, flac, exempi, networkmanager -, libpng, libexif, libgsf, libuuid, bzip2 }: - -stdenv.mkDerivation rec { - name = "tracker-1.0.3"; - - src = fetchurl { - url = "mirror://gnome/sources/tracker/1.0/${name}.tar.xz"; - sha256 = "11pqcldgh07mjn38dlbj6ry5qkfbpf79ln5sqx7q86hhqzh3712h"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - enableParallelBuilding = true; - - 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 - bzip2 gnome3.totem-pl-parser gobjectIntrospection - automake114x autoconf libtool - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.gnome_icon_theme librsvg sqlite - upower libnotify evolution_data_server gnome3.libgee - gst_all_1.gstreamer gst_all_1.gst-plugins-base flac - poppler icu taglib libjpeg libtiff giflib libvorbis - exempi networkmanager libpng libexif libgsf libuuid - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Tracker; - description = "Desktop-neutral user information store, search tool and indexer"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix b/pkgs/desktops/gnome-3/3.12/core/vino/default.nix deleted file mode 100644 index 1692b2c9c96f..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper -, hicolor_icon_theme, gnome3 -, libnotify, file, telepathy_glib, dbus_glib }: - -stdenv.mkDerivation rec { - name = "vino-${versionMajor}.${versionMinor}"; - versionMajor = "3.12"; - versionMinor = "0"; - - src = fetchurl { - url = "mirror://gnome/sources/vino/${versionMajor}/${name}.tar.xz"; - sha256 = "86c9d8b60d79982e4488815db0d441c398e011ad8262659789afecc97a01ca5b"; - }; - - doCheck = true; - - buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify - hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic - dbus_glib telepathy_glib file makeWrapper ]; - - preFixup = '' - wrapProgram "$out/libexec/vino-server" \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Vino; - description = "GNOME desktop sharing server"; - maintainers = with maintainers; [ lethalman iElectric ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix deleted file mode 100644 index d3245e232edd..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection -, selectTextPatch ? false }: - -stdenv.mkDerivation rec { - versionMajor = "0.36"; - versionMinor = "3"; - moduleName = "vte"; - - name = "${moduleName}-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c"; - }; - - patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.patch; - - buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ]; - - configureFlags = [ "--enable-introspection" ]; - - enableParallelBuilding = true; - - postInstall = '' - substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses" - ''; - - meta = with stdenv.lib; { - homepage = http://www.gnome.org/; - description = "A library implementing a terminal emulator widget for GTK+"; - longDescription = '' - VTE is a library (libvte) implementing a terminal emulator widget for - GTK+, and a minimal sample application (vte) using that. Vte is - mainly used in gnome-terminal, but can also be used to embed a - console/terminal in games, editors, IDEs, etc. VTE supports Unicode and - character set conversion, as well as emulating any terminal known to - the system's terminfo database. - ''; - license = licenses.lgpl2; - maintainers = with maintainers; [ astsmtl antono lethalman ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch b/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch deleted file mode 100644 index 0a9b82a85982..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch +++ /dev/null @@ -1,227 +0,0 @@ -Only in vte-0.38.0.new: expose_select_text.patch -diff -aur vte-0.38.0/src/vteaccess.c vte-0.38.0.new/src/vteaccess.c ---- vte-0.38.0/src/vteaccess.c 2014-08-13 08:00:38.000000000 -0400 -+++ vte-0.38.0.new/src/vteaccess.c 2014-09-21 17:05:23.934641193 -0400 -@@ -1427,7 +1427,7 @@ - *start_offset = offset_from_xy (priv, start_x, start_y); - _vte_terminal_get_end_selection (terminal, &end_x, &end_y); - *end_offset = offset_from_xy (priv, end_x, end_y); -- return _vte_terminal_get_selection (terminal); -+ return vte_terminal_get_selection (terminal); - } - - static gboolean -diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c ---- vte-0.38.0/src/vte.c 2014-09-13 03:23:47.000000000 -0400 -+++ vte-0.38.0.new/src/vte.c 2014-09-21 17:03:04.671656749 -0400 -@@ -122,7 +122,6 @@ - gpointer data, - GArray *attributes, - gboolean include_trailing_spaces); --static void _vte_terminal_disconnect_pty_read(VteTerminal *terminal); - static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal); - static void vte_terminal_stop_processing (VteTerminal *terminal); - -@@ -3267,9 +3266,10 @@ - _vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n"); - terminal->pvt->pty_input_source = 0; - } --static void --_vte_terminal_connect_pty_read(VteTerminal *terminal) -+void -+vte_terminal_connect_pty_read(VteTerminal *terminal) - { -+ g_return_if_fail(VTE_IS_TERMINAL(terminal)); - if (terminal->pvt->pty_channel == NULL) { - return; - } -@@ -3321,9 +3321,10 @@ - } - } - --static void --_vte_terminal_disconnect_pty_read(VteTerminal *terminal) -+void -+vte_terminal_disconnect_pty_read(VteTerminal *terminal) - { -+ g_return_if_fail(VTE_IS_TERMINAL(terminal)); - if (terminal->pvt->pty_input_source != 0) { - _vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n"); - g_source_remove(terminal->pvt->pty_input_source); -@@ -6154,6 +6155,28 @@ - } - } - -+/** -+ * vte_terminal_set_cursor_position: -+ * @terminal: a #VteTerminal -+ * @column: the new cursor column -+ * @row: the new cursor row -+ * -+ * Set the location of the cursor. -+ */ -+void -+vte_terminal_set_cursor_position(VteTerminal *terminal, -+ long column, long row) -+{ -+ g_return_if_fail(VTE_IS_TERMINAL(terminal)); -+ -+ _vte_invalidate_cursor_once(terminal, FALSE); -+ terminal->pvt->screen->cursor_current.col = column; -+ terminal->pvt->screen->cursor_current.row = row; -+ _vte_invalidate_cursor_once(terminal, FALSE); -+ _vte_check_cursor_blink(terminal); -+ vte_terminal_queue_cursor_moved(terminal); -+} -+ - static GtkClipboard * - vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board) - { -@@ -6319,7 +6342,7 @@ - vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE); - - /* Temporarily stop caring about input from the child. */ -- _vte_terminal_disconnect_pty_read(terminal); -+ vte_terminal_disconnect_pty_read(terminal); - } - - static gboolean -@@ -6336,7 +6359,7 @@ - terminal->pvt->selecting = FALSE; - - /* Reconnect to input from the child if we paused it. */ -- _vte_terminal_connect_pty_read(terminal); -+ vte_terminal_connect_pty_read(terminal); - - return TRUE; - } -@@ -6834,6 +6857,50 @@ - vte_terminal_deselect_all (terminal); - } - -+/** -+ * vte_terminal_get_selection_block_mode: -+ * @terminal: a #VteTerminal -+ * -+ * Checks whether or not block selection is enabled. -+ * -+ * Returns: %TRUE if block selection is enabled, %FALSE if not -+ */ -+gboolean -+vte_terminal_get_selection_block_mode(VteTerminal *terminal) { -+ g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE); -+ return terminal->pvt->selection_block_mode; -+} -+ -+/** -+ * vte_terminal_set_selection_block_mode: -+ * @terminal: a #VteTerminal -+ * @block_mode: whether block selection is enabled -+ * -+ * Sets whether or not block selection is enabled. -+ */ -+void -+vte_terminal_set_selection_block_mode(VteTerminal *terminal, gboolean block_mode) { -+ g_return_if_fail(VTE_IS_TERMINAL(terminal)); -+ terminal->pvt->selection_block_mode = block_mode; -+} -+ -+/** -+ * vte_terminal_select_text: -+ * @terminal: a #VteTerminal -+ * @start_col: the starting column for the selection -+ * @start_row: the starting row for the selection -+ * @end_col: the end column for the selection -+ * @end_row: the end row for the selection -+ * -+ * Sets the current selection region. -+ */ -+void -+vte_terminal_select_text(VteTerminal *terminal, -+ long start_col, long start_row, -+ long end_col, long end_row) { -+ _vte_terminal_select_text(terminal, start_col, start_row, end_col, end_row, 0, 0); -+} -+ - /* Autoscroll a bit. */ - static gboolean - vte_terminal_autoscroll(VteTerminal *terminal) -@@ -8476,7 +8543,7 @@ - #endif - kill(terminal->pvt->pty_pid, SIGHUP); - } -- _vte_terminal_disconnect_pty_read(terminal); -+ vte_terminal_disconnect_pty_read(terminal); - _vte_terminal_disconnect_pty_write(terminal); - if (terminal->pvt->pty_channel != NULL) { - g_io_channel_unref (terminal->pvt->pty_channel); -@@ -12533,7 +12600,7 @@ - g_object_freeze_notify(object); - - if (pvt->pty != NULL) { -- _vte_terminal_disconnect_pty_read(terminal); -+ vte_terminal_disconnect_pty_read(terminal); - _vte_terminal_disconnect_pty_write(terminal); - - if (terminal->pvt->pty_channel != NULL) { -@@ -12588,7 +12655,7 @@ - _vte_terminal_setup_utf8 (terminal); - - /* Open channels to listen for input on. */ -- _vte_terminal_connect_pty_read (terminal); -+ vte_terminal_connect_pty_read (terminal); - - g_object_notify(object, "pty"); - -@@ -12623,7 +12690,7 @@ - } - - char * --_vte_terminal_get_selection(VteTerminal *terminal) -+vte_terminal_get_selection(VteTerminal *terminal) - { - g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL); - -Only in vte-0.38.0.new/src: .vte.c.swp -diff -aur vte-0.38.0/src/vteint.h vte-0.38.0.new/src/vteint.h ---- vte-0.38.0/src/vteint.h 2014-05-16 13:51:26.000000000 -0400 -+++ vte-0.38.0.new/src/vteint.h 2014-09-21 17:05:44.934589281 -0400 -@@ -25,7 +25,6 @@ - G_BEGIN_DECLS - - void _vte_terminal_accessible_ref(VteTerminal *terminal); --char* _vte_terminal_get_selection(VteTerminal *terminal); - void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y); - void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y); - void _vte_terminal_select_text(VteTerminal *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset); -diff -aur vte-0.38.0/src/vteterminal.h vte-0.38.0.new/src/vteterminal.h ---- vte-0.38.0/src/vteterminal.h 2014-09-13 03:23:47.000000000 -0400 -+++ vte-0.38.0.new/src/vteterminal.h 2014-09-21 17:03:39.094903032 -0400 -@@ -170,6 +170,18 @@ - - void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); - void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); -+gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); -+void vte_terminal_set_selection_block_mode(VteTerminal *terminal, -+ gboolean block_mode) _VTE_GNUC_NONNULL(1); -+void vte_terminal_select_text(VteTerminal *terminal, -+ long start_col, long start_row, -+ long end_col, long end_row) _VTE_GNUC_NONNULL(1); -+char * -+vte_terminal_get_selection(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); -+ -+/* pause and unpause output */ -+void vte_terminal_disconnect_pty_read(VteTerminal *vte); -+void vte_terminal_connect_pty_read(VteTerminal *vte); - - /* Set the terminal's size. */ - void vte_terminal_set_size(VteTerminal *terminal, -@@ -276,6 +288,8 @@ - void vte_terminal_get_cursor_position(VteTerminal *terminal, - glong *column, - glong *row) _VTE_GNUC_NONNULL(1); -+void vte_terminal_set_cursor_position(VteTerminal *terminal, -+ long column, long row) _VTE_GNUC_NONNULL(1); - - /* Add a matching expression, returning the tag the widget assigns to that - * expression. */ diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix deleted file mode 100644 index ba83380f86d5..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: - -stdenv.mkDerivation rec { - name = "yelp-tools-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/yelp-tools/3.12/${name}.tar.xz"; - sha256 = "7a5370d7adbec3b6e6b7b5e7e5ed966cb99c797907a186b94b93c184e97f0172"; - }; - - buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ]; - - doCheck = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp/Tools; - description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation"; - maintainers = with maintainers; [ iElectric ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix deleted file mode 100644 index e99118230738..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, bash -, itstool, libxml2, libxslt }: - -stdenv.mkDerivation rec { - name = "yelp-xsl-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/yelp-xsl/3.12/${name}.tar.xz"; - sha256 = "dd0b8af338b1cdae50444273d7c761e3f511224421487311103edc95a4493656"; - }; - - doCheck = true; - - buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp; - description = "Yelp's universal stylesheets for Mallard and DocBook"; - maintainers = with maintainers; [ lethalman ]; - license = [licenses.gpl2 licenses.lgpl2]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix deleted file mode 100644 index 2e7715d1efc0..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf, sqlite -, bash, makeWrapper, itstool, libxml2, libxslt, icu }: - -stdenv.mkDerivation rec { - name = "yelp-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/yelp/3.12/${name}.tar.xz"; - sha256 = "0k2a1fggidmh98x2fv8zki2lbx7wx7p4b25iq11p6q8j9fwr2ff8"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - - buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool - libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl - librsvg gdk_pixbuf gnome3.gnome_icon_theme - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas sqlite ]; - - preFixup = '' - wrapProgram "$out/bin/yelp" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/yelp:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp; - description = "The help viewer in Gnome"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix deleted file mode 100644 index ca20bbc785de..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, itstool }: - -stdenv.mkDerivation rec { - - versionMajor = "3.12"; - versionMinor = "1"; - - name = "zenity-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/zenity/${versionMajor}/${name}.tar.xz"; - sha256 = "a59705cdd1ea5318fdae3075c1cedcbead479230e9bead204391566d973dae11"; - }; - - buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ]; - - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix deleted file mode 100644 index 670ceb105af3..000000000000 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ /dev/null @@ -1,299 +0,0 @@ -{ callPackage, pkgs }: - -rec { - corePackages = with gnome3; [ - pkgs.desktop_file_utils pkgs.ibus - pkgs.shared_mime_info # for update-mime-database - gtk3 # for gtk-update-icon-cache - glib_networking gvfs dconf gnome-backgrounds gnome_control_center - gnome-menus gnome_settings_daemon gnome_shell - gnome_themes_standard defaultIconTheme - ]; - - optionalPackages = with gnome3; [ baobab empathy eog epiphany evince - gucharmap nautilus totem vino yelp gnome-bluetooth - gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot - gnome-shell-extensions gnome-system-log gnome-system-monitor - gnome_terminal gnome-user-docs bijiben evolution file-roller gedit - gnome-clocks gnome-music gnome-tweak-tool gnome-photos - nautilus-sendto - ]; - - inherit (pkgs) glib gtk2 gtk3 gnome2; - gnome3 = pkgs.gnome3_12 // { recurseForDerivations = false; }; - - # DO NOT UPGRADE CLUTTER, IT BREAKS GNOME 3.12 - clutter = pkgs.clutter_1_18; - clutter_gtk = pkgs.clutter_gtk.override { inherit clutter; }; - clutter-gst = pkgs.clutter-gst.override { inherit clutter; }; - cogl = pkgs.cogl_1_18; - - gtk = gtk3; # just to be sure - libcanberra = pkgs.libcanberra_gtk3; # just to be sure - inherit (pkgs.gnome2) ORBit2; - orbit = ORBit2; - inherit (pkgs) libsoup; - - version = "3.12"; - -# Simplify the nixos module and gnome packages - defaultIconTheme = gnome_icon_theme_symbolic; - -#### Core (http://ftp.acc.umu.se/pub/GNOME/core/) - - baobab = callPackage ./core/baobab { }; - - caribou = callPackage ./core/caribou { }; - - dconf = callPackage ./core/dconf { }; - - empathy = callPackage ./core/empathy { - webkitgtk = pkgs.webkitgtk24x; - }; - - epiphany = callPackage ./core/epiphany { - webkitgtk = pkgs.webkitgtk24x; - }; - - evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests - - evolution_data_server = callPackage ./core/evolution-data-server { }; - - gconf = callPackage ./core/gconf { }; - - geocode_glib = callPackage ./core/geocode-glib { }; - - gcr = callPackage ./core/gcr { }; # ToDo: tests fail - - gdm = callPackage ./core/gdm { }; - - gjs = callPackage ./core/gjs { }; - - glib_networking = pkgs.glib_networking.override { - inherit gsettings_desktop_schemas; - }; - - gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; - - gnome-bluetooth = callPackage ./core/gnome-bluetooth { }; - - gnome-contacts = callPackage ./core/gnome-contacts { }; - - gnome_control_center = callPackage ./core/gnome-control-center { }; - - gnome-calculator = callPackage ./core/gnome-calculator { }; - - gnome_common = callPackage ./core/gnome-common { }; - - gnome_desktop = callPackage ./core/gnome-desktop { }; - - gnome-dictionary = callPackage ./core/gnome-dictionary { }; - - gnome-disk-utility = callPackage ./core/gnome-disk-utility { }; - - gnome-font-viewer = callPackage ./core/gnome-font-viewer { }; - - gnome_icon_theme = callPackage ./core/gnome-icon-theme { }; - - gnome_icon_theme_symbolic = callPackage ./core/gnome-icon-theme-symbolic { }; - - gnome-menus = callPackage ./core/gnome-menus { }; - - gnome_keyring = callPackage ./core/gnome-keyring { }; - - libgnome_keyring = callPackage ./core/libgnome-keyring { }; - - libgnomekbd = callPackage ./core/libgnomekbd { }; - - folks = callPackage ./core/folks { }; - - gnome_online_accounts = callPackage ./core/gnome-online-accounts { - webkitgtk = pkgs.webkitgtk24x; - }; - - gnome-online-miners = callPackage ./core/gnome-online-miners { }; - - gnome_session = callPackage ./core/gnome-session { }; - - gnome_shell = callPackage ./core/gnome-shell { }; - - gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { }; - - gnome-screenshot = callPackage ./core/gnome-screenshot { }; - - gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { }; - - gnome-system-log = callPackage ./core/gnome-system-log { }; - - gnome-system-monitor = callPackage ./core/gnome-system-monitor { }; - - gnome_terminal = callPackage ./core/gnome-terminal { }; - - gnome_themes_standard = callPackage ./core/gnome-themes-standard { }; - - gnome-user-docs = callPackage ./core/gnome-user-docs { }; - - gnome-user-share = callPackage ./core/gnome-user-share { }; - - grilo = callPackage ./core/grilo { }; - - grilo-plugins = callPackage ./core/grilo-plugins { }; - - gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { }; - - gtksourceview = callPackage ./core/gtksourceview { }; - - gucharmap = callPackage ./core/gucharmap { }; - - gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; - - eog = callPackage ./core/eog { }; - - libcroco = callPackage ./core/libcroco {}; - - libgee = callPackage ./core/libgee { }; - - libgdata = callPackage ./core/libgdata { }; - - libgxps = callPackage ./core/libgxps { }; - - libpeas = callPackage ./core/libpeas {}; - - libgweather = callPackage ./core/libgweather { }; - - libzapojit = callPackage ./core/libzapojit { }; - - mutter = callPackage ./core/mutter { }; - - nautilus = callPackage ./core/nautilus { }; - - networkmanager_openvpn = pkgs.networkmanager_openvpn.override { - inherit gnome3; - }; - - networkmanager_pptp = pkgs.networkmanager_pptp.override { - inherit gnome3; - }; - - networkmanager_vpnc = pkgs.networkmanager_vpnc.override { - inherit gnome3; - }; - - networkmanager_openconnect = pkgs.networkmanager_openconnect.override { - inherit gnome3; - }; - - networkmanager_l2tp = pkgs.networkmanager_l2tp.override { - inherit gnome3; - }; - - networkmanagerapplet = pkgs.networkmanagerapplet.override { - inherit gnome3 gsettings_desktop_schemas glib_networking; - }; - - rest = callPackage ./core/rest { }; - - sushi = callPackage ./core/sushi { - webkitgtk = pkgs.webkitgtk24x; - }; - - totem = callPackage ./core/totem { }; - - totem-pl-parser = callPackage ./core/totem-pl-parser { }; - - tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; }; - - vte = callPackage ./core/vte { }; - - vino = callPackage ./core/vino { }; - - yelp = callPackage ./core/yelp { - webkitgtk = pkgs.webkitgtk24x; - }; - - yelp_xsl = callPackage ./core/yelp-xsl { }; - - yelp_tools = callPackage ./core/yelp-tools { }; - - zenity = callPackage ./core/zenity { }; - - -#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - - bijiben = callPackage ./apps/bijiben { - webkitgtk = pkgs.webkitgtk24x; - }; - - evolution = callPackage ./apps/evolution { - webkitgtk = pkgs.webkitgtk24x; - }; - - file-roller = callPackage ./apps/file-roller { }; - - gedit = callPackage ./apps/gedit { }; - - glade = callPackage ./apps/glade { }; - - gnome-boxes = callPackage ./apps/gnome-boxes { - gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; }; - spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; }; - }; - - gnome-clocks = callPackage ./apps/gnome-clocks { }; - - gnome-documents = callPackage ./apps/gnome-documents { - webkitgtk = pkgs.webkitgtk24x; - }; - - gnome-music = callPackage ./apps/gnome-music { }; - - gnome-photos = callPackage ./apps/gnome-photos { }; - - nautilus-sendto = callPackage ./apps/nautilus-sendto { }; - - # scrollkeeper replacement - rarian = callPackage ./desktop/rarian { }; - - seahorse = callPackage ./apps/seahorse { }; - - polari = callPackage ./apps/polari { }; - - pomodoro = callPackage ./apps/pomodoro { }; - -#### Dev http://ftp.gnome.org/pub/GNOME/devtools/ - - anjuta = callPackage ./devtools/anjuta { }; - - gdl = callPackage ./devtools/gdl { }; - -#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ - - geary = callPackage ./misc/geary { - webkitgtk = pkgs.webkitgtk24x; - }; - - gfbgraph = callPackage ./misc/gfbgraph { }; - - goffice = callPackage ./misc/goffice { }; - - gitg = callPackage ./misc/gitg { - webkitgtk = pkgs.webkitgtk24x; - }; - - libgda = callPackage ./misc/libgda { }; - - libgit2-glib = callPackage ./misc/libgit2-glib { - libgit2 = pkgs.libgit2.override { libssh2 = null; }; - }; - - libmediaart = callPackage ./misc/libmediaart { }; - - gexiv2 = callPackage ./misc/gexiv2 { }; - - gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { }; - - gpaste = callPackage ./misc/gpaste { }; - - gtkhtml = callPackage ./misc/gtkhtml { }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix deleted file mode 100644 index a1b38b21869a..000000000000 --- a/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}: - -stdenv.mkDerivation rec { - name = "rarian-0.8.1"; - src = fetchurl { - url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2"; - sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; - }; - - buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; - configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix deleted file mode 100644 index 79bfd8952578..000000000000 --- a/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, - itstool, python }: - -let - major = "3.13"; - minor = "1"; - -in stdenv.mkDerivation rec { - version = "${major}.${minor}"; - name = "anjuta-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/anjuta/${major}/${name}.tar.xz"; - sha256 = "71bdad9a0e427d9481858eec40b9c1facef4b551d732023cc18a50019df4b78b"; - }; - - enableParallelBuilding = true; - - buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl - gnome3.libgda gnome3.gtksourceview intltool itstool python ]; - - meta = with stdenv.lib; { - description = "Software development studio"; - homepage = http://anjuta.org/; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix deleted file mode 100644 index 1dae33cd4e91..000000000000 --- a/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, intltool }: - -let - major = "3.12"; - minor = "0"; - -in stdenv.mkDerivation rec { - version = "${major}.${minor}"; - name = "gdl-${version}"; - - src = fetchurl { - url = "https://download.gnome.org/sources/gdl/${major}/${name}.tar.xz"; - sha256 = "4770f959f31ed5e616fe623c284e8dd6136e49902d19b6e37938d34be4f6b88d"; - }; - - buildInputs = [ pkgconfig libxml2 gtk3 intltool ]; - - meta = with stdenv.lib; { - description = "Gnome docking library"; - homepage = https://developer.gnome.org/gdl/; - license = [ licenses.gpl2 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix deleted file mode 100644 index 4df287c7b8b5..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala -, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils -, libnotify, libcanberra, libsecret, gmime -, libpthreadstubs, hicolor_icon_theme, sqlite -, gnome3, librsvg, gnome_doc_utils, webkitgtk }: - -stdenv.mkDerivation rec { - name = "geary-0.6.2"; - - src = fetchurl { - url = "mirror://gnome/sources/geary/0.6/${name}.tar.xz"; - sha256 = "0ap40mpj89sx82kcxlhl9gipq34ks2b70yhiv9s8zc5wg0nm7rpg"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils - vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime sqlite - libpthreadstubs gnome3.gsettings_desktop_schemas hicolor_icon_theme - gdk_pixbuf librsvg gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ]; - - preConfigure = '' - substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0' - ''; - - postInstall = '' - mkdir -p $out/share/gsettings-schemas/${name}/ - mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name} - ''; - - preFixup = '' - wrapProgram "$out/bin/geary" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - enableParallelBuilding = true; - - patches = [ ./disable_valadoc.patch ]; - patchFlags = "-p0"; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Geary; - description = "Mail client for GNOME 3"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch b/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch deleted file mode 100644 index e65c0dea7472..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- src/CMakeLists.txt.orig 2014-05-23 14:41:20.809160364 +0200 -+++ src/CMakeLists.txt 2014-05-23 14:41:29.240261581 +0200 -@@ -696,21 +696,6 @@ - ${CMAKE_COMMAND} -E copy geary-mailer ${CMAKE_BINARY_DIR}/ - ) - --# Valadoc --################################################# --foreach(pkg ${ENGINE_PACKAGES}) -- list(APPEND valadoc_pkg_opts "--pkg=${pkg}") --endforeach(pkg ${ENGINE_PACKAGES}) -- --include(FindValadoc) --add_custom_target( -- valadoc -- WORKING_DIRECTORY -- ${CMAKE_SOURCE_DIR}/src -- COMMAND -- ${VALADOC_EXECUTABLE} --force --no-protected -b ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_SOURCE_DIR}/valadoc --package-name=geary --package-version=${VERSION} ${ENGINE_SRC} ${valadoc_pkg_opts} --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi --) -- - ## Make clean: remove copied files - ################################################## - set_property( diff --git a/pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix deleted file mode 100644 index 86942c13f34f..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4 }: - - -stdenv.mkDerivation rec { - name = "gexiv2-${version}"; - version = "0.7.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gexiv2/0.7/${name}.tar.xz"; - sha256 = "12pfc5a57dhlf0c3yg5x3jissxi7jy2b6ir6y99cn510801gwcdn"; - }; - - preConfigure = '' - patchShebangs . - ''; - - buildInputs = [ pkgconfig glib libtool m4 ]; - propagatedBuildInputs = [ exiv2 ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/gexiv2; - description = "GObject wrapper around the Exiv2 photo metadata library"; - platforms = platforms.linux; - }; -} \ No newline at end of file diff --git a/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix deleted file mode 100644 index d36534f0d32f..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, glib -, gnome3, libsoup, json_glib }: - -stdenv.mkDerivation rec { - name = "gfbgraph-0.2.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz"; - sha256 = "66c7b1c951863565c179d0b4b5207f27b3b36f80afed9f6a9acfc5fc3ae775d4"; - }; - - buildInputs = [ pkgconfig glib gnome3.gnome_online_accounts ]; - propagatedBuildInputs = [ libsoup json_glib gnome3.rest ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "GLib/GObject wrapper for the Facebook Graph API"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix deleted file mode 100644 index 37e1975fd57b..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchurl, fetchgit, vala, intltool, libgit2, pkgconfig, gtk3, glib -, json_glib, webkitgtk, makeWrapper, libpeas, bash, gobjectIntrospection -, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg }: - -# TODO: icons and theme still does not work -# use packaged gnome3.gnome_icon_theme_symbolic - -stdenv.mkDerivation rec { - name = "gitg-3.13.91"; - - src = fetchurl { - url = "mirror://gnome/sources/gitg/3.13/${name}.tar.xz"; - sha256 = "1c2016grvgg5f3l5xkracz85rblsc1a4brzr6vgn6kh2h494rv37"; - }; - - preCheck = '' - substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash" - ''; - doCheck = true; - - makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - - propagatedUserEnvPkgs = [ shared_mime_info - gnome3.gnome_themes_standard ]; - - buildInputs = [ vala intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas - libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview librsvg - gobjectIntrospection makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ]; - - preFixup = '' - wrapProgram "$out/bin/gitg" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/gitg/icons/hicolor/icon-theme.cache - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/Gitg; - description = "GNOME GUI client to view git repositories"; - maintainers = with maintainers; [ iElectric ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix deleted file mode 100644 index 26e9144349f2..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, intltool, fetchurl, python, pygobject3, atk -, pkgconfig, gtk3, glib, hicolor_icon_theme, libsoup -, bash, makeWrapper, itstool, libxml2, python3Packages -, gnome3, librsvg, gdk_pixbuf, file, libnotify }: - -stdenv.mkDerivation rec { - name = "gnome-tweak-tool-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-tweak-tool/3.12/${name}.tar.xz"; - sha256 = "f8811d638797ef62500770a8dccc5bc689a427c8396a0dff8cbeddffdebf0e29"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - makeFlags = [ "DESTDIR=/" ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - python pygobject3 libnotify gnome3.gnome_shell - libsoup gnome3.gnome_settings_daemon gnome3.nautilus - gnome3.gnome_desktop ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-tweak-tool" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)" - ''; - - patches = [ ./find_gsettings.patch ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool; - description = "A tool to customize advanced GNOME 3 options"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch deleted file mode 100644 index 3e68c04cb3ab..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py -index a00fe19..dce74b2 100644 ---- a/gtweak/gsettings.py -+++ b/gtweak/gsettings.py -@@ -33,10 +33,15 @@ class GSettingsMissingError(Exception): - - class _GSettingsSchema: - def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options): -- if not schema_dir: -- schema_dir = gtweak.GSETTINGS_SCHEMA_DIR - if not schema_filename: - schema_filename = schema_name + ".gschema.xml" -+ if not schema_dir: -+ schema_dir = gtweak.GSETTINGS_SCHEMA_DIR -+ for xdg_dir in GLib.get_system_data_dirs(): -+ dir = os.path.join(xdg_dir, "glib-2.0", "schemas") -+ if os.path.exists(os.path.join(dir, schema_filename)): -+ schema_dir = dir -+ break - - schema_path = os.path.join(schema_dir, schema_filename) - if not os.path.exists(schema_path): diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix b/pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix deleted file mode 100644 index 02520a9f121a..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2 -, pango, libgsf, libxml2, libart, intltool, gettext -, cairo, gconf, libgnomeui, pcre, gnome3/*just meta*/ }: - -stdenv.mkDerivation rec { - name = "goffice-0.8.17"; - - src = fetchurl { - url = "mirror://gnome/sources/goffice/0.8/${name}.tar.xz"; - sha256 = "165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15"; - }; - - # fix linking error: undefined reference to pcre_info - patches = [ ./pcre_info.patch ]; # inspired by https://bugs.php.net/bug.php?id=60986 - - buildInputs = [ - pkgconfig libglade bzip2 libart intltool gettext - gconf libgnomeui pcre - ]; - - propagatedBuildInputs = [ - # All these are in the "Requires:" field of `libgoffice-0.6.pc'. - glib libgsf libxml2 gtk libglade libart cairo pango - ]; - - postInstall = - '' - # Get GnuCash to build. Might be unnecessary if we upgrade pkgconfig. - substituteInPlace $out/lib/pkgconfig/libgoffice-*.pc --replace Requires.private Requires - ''; - - doCheck = true; - - meta = gnome3.goffice.meta // { - maintainers = [ ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix deleted file mode 100644 index f116f5b53cd8..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3 -, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }: - -stdenv.mkDerivation rec { - name = "goffice-0.10.18"; - - src = fetchurl { - url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; - sha256 = "4743a148d4452743f3484ed28285a6889adb4af2a61b72448e0ddfe7d5142c64"; - }; - - nativeBuildInputs = [ pkgconfig intltool ]; - - propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection? - glib gtk3 libxml2 cairo pango libgsf - ]; - - buildInputs = [ libxslt librsvg ]; - - enableParallelBuilding = true; - doCheck = true; - - meta = { - description = "A Glib/GTK+ set of document centric objects and utilities"; - - longDescription = '' - There are common operations for document centric applications that are - conceptually simple, but complex to implement fully: plugins, load/save - documents, undo/redo. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.gnu; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch b/pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch deleted file mode 100644 index cd4ef3c9fed7..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/goffice/utils/regutf8.c b/goffice/utils/regutf8.c -index bc4aae4..3adb696 100644 ---- a/goffice/utils/regutf8.c -+++ b/goffice/utils/regutf8.c -@@ -155,7 +155,7 @@ go_regcomp (GORegexp *gor, const char *pat, int cflags) - default: return GO_REG_BADPAT; - } - } else { -- gor->re_nsub = pcre_info (r, NULL, NULL); -+ gor->re_nsub = pcre_fullinfo (r, NULL, NULL, NULL); - gor->nosub = (cflags & GO_REG_NOSUB) != 0; - return 0; - } diff --git a/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix deleted file mode 100644 index f87431653c93..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala, glib -, pango, gtk3, gnome3, dbus, clutter, appdata-tools, makeWrapper }: - -stdenv.mkDerivation rec { - version = "3.12.3.1"; - name = "gpaste-${version}"; - - src = fetchurl { - url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "05afbhn3gw015cf2z3045lvlnj4cz06p6libkglb2wqsfb7azbl0"; - }; - - buildInputs = [ intltool autoreconfHook pkgconfig vala glib - gtk3 gnome3.gnome_control_center dbus.libs - clutter pango appdata-tools makeWrapper ]; - - preConfigure = "intltoolize -f"; - - configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings" - "--with-dbusservicesdir=$(out)/share/dbus-1/services" ]; - - enableParallelBuilding = true; - - preFixup = - let - libPath = stdenv.lib.makeLibraryPath - [ glib gtk3 clutter pango ]; - in - '' - for i in $out/libexec/gpaste/*; do - wrapProgram $i \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" - done - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/Keruspe/GPaste; - description = "Clipboard management system with GNOME3 integration"; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix deleted file mode 100644 index 5e27b474cbd7..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, intltool -, gnome3, enchant, isocodes }: - -stdenv.mkDerivation rec { - name = "gtkhtml-4.6.6"; - - src = fetchurl { - url = "mirror://gnome/sources/gtkhtml/4.6/${name}.tar.xz"; - sha256 = "145d23bbe729ff4ee7e7027bb5ff405b34822271327fdd81fe913134831374cd"; - }; - - buildInputs = [ pkgconfig gtk3 intltool gnome3.gnome_icon_theme - gnome3.gsettings_desktop_schemas ]; - - propagatedBuildInputs = [ enchant isocodes ]; - -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix deleted file mode 100644 index 3944644a4536..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3 }: - -let - major = "5.2"; - minor = "2"; - -in stdenv.mkDerivation rec { - version = "${major}.${minor}"; - name = "libgda-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/libgda/${major}/${name}.tar.xz"; - sha256 = "c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4"; - }; - - configureFlags = [ - "--enable-gi-system-install=no" - ]; - - enableParallelBuilding = true; - - buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 ]; - - meta = with stdenv.lib; { - description = "Database access library"; - homepage = http://www.gnome-db.org/; - license = [ licenses.lgpl2 licenses.gpl2 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix deleted file mode 100644 index 94776c90cf99..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala -, gtk_doc, gobjectIntrospection, libgit2, glib }: - -stdenv.mkDerivation rec { - name = "libgit2-glib-${version}"; - version = "0.0.20"; - - src = fetchurl { - url = "https://github.com/GNOME/libgit2-glib/archive/v${version}.tar.gz"; - sha256 = "1s2hj0ji73ishniqvr6mx90l1ji5jjwwrwhp91i87fxk0d3sry5x"; - }; - - configureScript = "sh ./autogen.sh"; - - buildInputs = [ gnome3.gnome_common libtool pkgconfig vala - gtk_doc gobjectIntrospection libgit2 glib ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix deleted file mode 100644 index 4985bfa902c3..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "libmediaart-0.4.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libmediaart/0.4/${name}.tar.xz"; - sha256 = "e8ec92a642f4df7f988364f6451adf89e1611d7379a636d8c7eff4ca21a0fd1c"; - }; - - buildInputs = [ pkgconfig glib gdk_pixbuf ]; - - meta = with stdenv.lib; { - description = "Library tasked with managing, extracting and handling media art caches"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix index f442bd889736..c425f41e8e1f 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper -, libcanberra, accountsservice, libpwquality, pulseaudio, fontconfig +, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, pulseaudio, fontconfig , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk , cracklib, python, krb5, networkmanagerapplet, networkmanager @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo - gdk_pixbuf gnome3.adwaita-icon-theme librsvg clutter clutter_gtk - hicolor_icon_theme gnome3.adwaita-icon-theme gnome3.vino udev + gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk + gnome3.vino udev libcanberra_gtk3 networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth ]; preBuild = '' diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix index f7e3efd1dd90..f99c0c2b5a46 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret , python3, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip -, hicolor_icon_theme, sqlite, libgweather +, sqlite, libgweather, libcanberra_gtk3 , pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: @@ -23,8 +23,9 @@ stdenv.mkDerivation rec { libcroco intltool libsecret pkgconfig python3 libsoup polkit libcanberra gdk_pixbuf librsvg clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server - libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm gnome_control_center - hicolor_icon_theme adwaita-icon-theme sqlite gnome3.gnome-bluetooth + libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm + libcanberra_gtk3 gnome_control_center + defaultIconTheme sqlite gnome3.gnome-bluetooth libgweather # not declared at build time, but typelib is needed at runtime gnome3.gnome-clocks # schemas needed at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ]; diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix index 933e89dcd647..6ec1ee011f53 100644 --- a/pkgs/desktops/gnome-3/3.16/default.nix +++ b/pkgs/desktops/gnome-3/3.16/default.nix @@ -19,10 +19,8 @@ rec { nautilus-sendto dconf-editor ]; - inherit (pkgs) libsoup glib gtk2; + inherit (pkgs) libsoup glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra; inherit (pkgs.gnome2) ORBit2; - gtk3 = pkgs.gtk3_16; - gtkmm3 = pkgs.gtkmm3_16; orbit = ORBit2; gnome3 = self // { recurseForDerivations = false; }; clutter = pkgs.clutter_1_22; @@ -34,20 +32,6 @@ rec { vala = pkgs.vala_0_26; gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; - # Due to gtk 3.12 -> 3.16 transition - libcanberra_gtk3 = pkgs.libcanberra_gtk3.override { inherit gtk; }; - libcanberra = libcanberra_gtk3; - ibus = pkgs.ibus.override { inherit gnome3; }; - colord-gtk = pkgs.colord-gtk.override { inherit gtk3; }; - webkitgtk24x = pkgs.webkitgtk24x.override { inherit gtk3; }; - webkitgtk = pkgs.webkitgtk.override { inherit gtk3; }; - libwnck3 = pkgs.libwnck3.override { inherit gtk3; }; - gtkspell3 = pkgs.gtkspell3.override { inherit gtk3; }; - librsvg = pkgs.librsvg.override { inherit gtk3; }; - iconnamingutils = pkgs.iconnamingutils.override { inherit librsvg; }; - libchamplain = pkgs.libchamplain.override { inherit gtk3 clutter_gtk; }; - djvulibre = pkgs.djvulibre.override { inherit librsvg; }; - version = "3.16"; # Simplify the nixos module and gnome packages diff --git a/pkgs/development/libraries/clutter/1.18.nix b/pkgs/development/libraries/clutter/1.18.nix deleted file mode 100644 index 7a9d114ce8e3..000000000000 --- a/pkgs/development/libraries/clutter/1.18.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes -, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, -gobjectIntrospection -}: - -let - ver_maj = "1.18"; - ver_min = "2"; -in -stdenv.mkDerivation rec { - name = "clutter-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz"; - sha256 = "f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63"; - }; - - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = - [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango - atk json_glib gobjectIntrospection - ]; - - configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK - - #doCheck = true; # no tests possible without a display - - meta = { - description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; - - longDescription = - '' Clutter is free software library for creating fast, compelling, - portable, and dynamic graphical user interfaces. It is a core part - of MeeGo, and is supported by the open source community. Its - development is sponsored by Intel. - - Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use - on mobile and embedded platforms), but wraps an easy to use, - efficient, flexible API around GL's complexity. - - Clutter enforces no particular user interface style, but provides a - rich, generic foundation for higher-level toolkits tailored to - specific needs. - ''; - - license = stdenv.lib.licenses.lgpl2Plus; - homepage = http://www.clutter-project.org/; - - maintainers = with stdenv.lib.maintainers; [ urkud ]; - platforms = stdenv.lib.platforms.mesaPlatforms; - }; -} diff --git a/pkgs/development/libraries/cogl/1.18.nix b/pkgs/development/libraries/cogl/1.18.nix deleted file mode 100644 index f6927770d860..000000000000 --- a/pkgs/development/libraries/cogl/1.18.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty -, pangoSupport ? true, pango, cairo, gobjectIntrospection -, gstreamerSupport ? true, gst_all_1 }: - -let - ver_maj = "1.18"; - ver_min = "0"; -in -stdenv.mkDerivation rec { - name = "cogl-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz"; - sha256 = "0phg76jpkn0j948axavzr15gyrqipzmzzr66nlp3dfksgszixnd4"; - }; - - nativeBuildInputs = [ pkgconfig ]; - - configureFlags = [ - "--enable-introspection" - "--enable-gles1" - "--enable-gles2" - "--enable-kms-egl-platform" - ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"; - - propagatedBuildInputs = with xorg; [ - glib gdk_pixbuf gobjectIntrospection - mesa_noglu libXrandr libXfixes libXcomposite libXdamage - ] - ++ libintlOrEmpty - ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer - gst_all_1.gst-plugins-base ]; - - buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; - - COGL_PANGO_DEP_CFLAGS - = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport) - "-I${pango}/include/pango-1.0 -I${cairo}/include/cairo"; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - - #doCheck = true; # all tests fail (no idea why) - - meta = with stdenv.lib; { - description = "A small open source library for using 3D graphics hardware for rendering"; - maintainers = with maintainers; [ lovek323 ]; - - longDescription = '' - Cogl is a small open source library for using 3D graphics hardware for - rendering. The API departs from the flat state machine style of OpenGL - and is designed to make it easy to write orthogonal components that can - render without stepping on each other's toes. - ''; - - platforms = stdenv.lib.platforms.mesaPlatforms; - }; -} diff --git a/pkgs/development/libraries/gtk+/3.16.nix b/pkgs/development/libraries/gtk+/3.16.nix deleted file mode 100644 index 84bea07602fd..000000000000 --- a/pkgs/development/libraries/gtk+/3.16.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl -, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection -, xlibs, x11, wayland, libxkbcommon, epoxy -, xineramaSupport ? stdenv.isLinux -, cupsSupport ? stdenv.isLinux, cups ? null -}: - -assert xineramaSupport -> xlibs.libXinerama != null; -assert cupsSupport -> cups != null; - -let - ver_maj = "3.16"; - ver_min = "2"; - version = "${ver_maj}.${ver_min}"; -in -stdenv.mkDerivation rec { - name = "gtk+3-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "1yhwg2l72l3khfkprydcjlpxjrg11ccqfc80sjl56llz3jk66fd0"; - }; - - nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; - - buildInputs = [ libxkbcommon epoxy ]; - 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 ] - ++ optional stdenv.isDarwin x11 - ++ optional xineramaSupport libXinerama - ++ optional cupsSupport cups; - - # demos fail to install, no idea where's the problem - preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in"; - - enableParallelBuilding = true; - - postInstall = "rm -rf $out/share/gtk-doc"; - - passthru = { - gtkExeEnvPostBuild = '' - rm $out/lib/gtk-3.0/3.0.0/immodules.cache - $out/bin/gtk-query-immodules-3.0 $out/lib/gtk-3.0/3.0.0/immodules/*.so > $out/lib/gtk-3.0/3.0.0/immodules.cache - ''; # workaround for bug of nix-mode for Emacs */ ''; - }; - - meta = { - description = "A multi-platform toolkit for creating graphical user interfaces"; - - longDescription = '' - GTK+ is a highly usable, feature rich toolkit for creating - graphical user interfaces which boasts cross platform - compatibility and an easy to use API. GTK+ it is written in C, - but has bindings to many other popular programming languages - such as C++, Python and C# among others. GTK+ is licensed - under the GNU LGPL 2.1 allowing development of both free and - proprietary software with GTK+ without any license fees or - royalties. - ''; - - homepage = http://www.gtk.org/; - - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 35b40a507a83..84bea07602fd 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gettext, perl , expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection -, xlibs, x11, wayland, libxkbcommon +, xlibs, x11, wayland, libxkbcommon, epoxy , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null }: @@ -9,7 +9,7 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; let - ver_maj = "3.12"; + ver_maj = "3.16"; ver_min = "2"; version = "${ver_maj}.${ver_min}"; in @@ -18,17 +18,15 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "1l45nd7ln2pnrf99vdki3l7an5wrzkbak11hnnj1w6r3fkm4xmv1"; + sha256 = "1yhwg2l72l3khfkprydcjlpxjrg11ccqfc80sjl56llz3jk66fd0"; }; - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; - buildInputs = [ libxkbcommon ]; + buildInputs = [ libxkbcommon epoxy ]; propagatedBuildInputs = with xlibs; with stdenv.lib; - [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ] - ++ optionals stdenv.isLinux [ wayland ] + [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ] + ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor wayland ] ++ optional stdenv.isDarwin x11 ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; @@ -65,7 +63,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat]; + maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/gtkmm/3.16.nix b/pkgs/development/libraries/gtkmm/3.16.nix deleted file mode 100644 index bc3274688555..000000000000 --- a/pkgs/development/libraries/gtkmm/3.16.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }: - -let - ver_maj = "3.16"; - ver_min = "0"; -in -stdenv.mkDerivation rec { - name = "gtkmm-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz"; - sha256 = "036xn22jkaf3akpid7w23b8vkqa3xxqz93mwacmyar5vw7slm3cv"; - }; - - nativeBuildInputs = [ pkgconfig ]; - - propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ]; - - enableParallelBuilding = true; - doCheck = true; - - meta = { - description = "C++ interface to the GTK+ graphical user interface library"; - - longDescription = '' - gtkmm is the official C++ interface for the popular GUI library - GTK+. Highlights include typesafe callbacks, and a - comprehensive set of widgets that are easily extensible via - inheritance. You can create user interfaces either in code or - with the Glade User Interface designer, using libglademm. - There's extensive documentation, including API reference and a - tutorial. - ''; - - homepage = http://gtkmm.org/; - - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = with stdenv.lib.maintainers; [ raskin urkud vcunat ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index e158c64f73a4..bc3274688555 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }: let - ver_maj = "3.12"; + ver_maj = "3.16"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz"; - sha256 = "86c526ceec15d889996822128d566748bb36f70cf5a2c270530dfc546a2574e1"; + sha256 = "036xn22jkaf3akpid7w23b8vkqa3xxqz93mwacmyar5vw7slm3cv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c052849fb36..5b38bef1fc24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5691,10 +5691,6 @@ let clutter = callPackage ../development/libraries/clutter { }; - clutter_1_18 = callPackage ../development/libraries/clutter/1.18.nix { - cogl = cogl_1_18; - }; - clutter_1_22 = callPackage ../development/libraries/clutter/1.22.nix { cogl = cogl_1_20; }; @@ -5713,8 +5709,6 @@ let cogl = callPackage ../development/libraries/cogl { }; - cogl_1_18 = callPackage ../development/libraries/cogl/1.18.nix { }; - cogl_1_20 = callPackage ../development/libraries/cogl/1.20.nix { }; coin3d = callPackage ../development/libraries/coin3d { }; @@ -6185,9 +6179,7 @@ let cupsSupport = config.gtk2.cups or stdenv.isLinux; }; - gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { }; - - gtk3_16 = callPackage ../development/libraries/gtk+/3.16.nix { + gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { gettext = gettextWithExpat gettext_0_19; }; @@ -6195,9 +6187,6 @@ let gtkmm = callPackage ../development/libraries/gtkmm/2.x.nix { }; gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; - gtkmm3_16 = callPackage ../development/libraries/gtkmm/3.16.nix { - gtk3 = gtk3_16; - }; gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { gtksharp = gtk-sharp; @@ -12329,7 +12318,7 @@ let termite = callPackage ../applications/misc/termite { gtk = gtk3; - vte = gnome3_16.vte-select-text; + vte = gnome3.vte-select-text; }; tesseract = callPackage ../applications/graphics/tesseract { }; @@ -13362,16 +13351,12 @@ let inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils; }; - gnome3_12 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.12 { - callPackage = pkgs.newScope pkgs.gnome3_12; - }); - gnome3_16 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.16 { callPackage = pkgs.newScope pkgs.gnome3_16; self = pkgs.gnome3_16; }); - gnome3 = gnome3_12; + gnome3 = gnome3_16; gnome = recurseIntoAttrs gnome2; From 81c115ba99a4efa51bf5777a2741aba4693fd53a Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 18 May 2015 12:31:29 +0200 Subject: [PATCH 310/615] termite: update and use vte 0.40 --- pkgs/applications/misc/termite/default.nix | 4 +- .../gnome-3/3.16/core/vte/default.nix | 2 +- ....patch => expose_select_text.0.40.0.patch} | 63 +++++++++---------- 3 files changed, 34 insertions(+), 35 deletions(-) rename pkgs/desktops/gnome-3/3.16/core/vte/{expose_select_text.0.38.0.patch => expose_select_text.0.40.0.patch} (82%) diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 7c1fe5fc5cbd..ba3d3db3267d 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "termite-${version}"; - version = "9"; + version = "10"; src = fetchgit { url = "https://github.com/thestinger/termite"; rev = "refs/tags/v${version}"; - sha256 = "0bnzfjk5yl5i96v5jnlvrz0d1jcp5lal6ppl7y8wx13166i6sdnh"; + sha256 = "107v59x8q2m1cx1x3i5ciibw4nl1qbq7p58bfw0irkhp7sl7kjk2"; }; makeFlags = "VERSION=v${version}"; diff --git a/pkgs/desktops/gnome-3/3.16/core/vte/default.nix b/pkgs/desktops/gnome-3/3.16/core/vte/default.nix index 822522249062..89a1405f62b7 100644 --- a/pkgs/desktops/gnome-3/3.16/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/vte/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0lnq0bgkmsixjwmfacb2ch9qfjqjxa8zkk1hiv3l29kgca0n3nal"; }; - patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.0.38.0.patch; + patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.0.40.0.patch; buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses vala libxml2 ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.38.0.patch b/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.40.0.patch similarity index 82% rename from pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.38.0.patch rename to pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.40.0.patch index 0a9b82a85982..c18f1b76b410 100644 --- a/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.38.0.patch +++ b/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.40.0.patch @@ -1,8 +1,8 @@ -Only in vte-0.38.0.new: expose_select_text.patch -diff -aur vte-0.38.0/src/vteaccess.c vte-0.38.0.new/src/vteaccess.c ---- vte-0.38.0/src/vteaccess.c 2014-08-13 08:00:38.000000000 -0400 -+++ vte-0.38.0.new/src/vteaccess.c 2014-09-21 17:05:23.934641193 -0400 -@@ -1427,7 +1427,7 @@ +Only in vte-0.40.0.new: .git +diff --unified -aur vte-0.40.0/src/vteaccess.c vte-0.40.0.new/src/vteaccess.c +--- vte-0.40.0/src/vteaccess.c 2015-03-16 06:34:37.000000000 -0400 ++++ vte-0.40.0.new/src/vteaccess.c 2015-04-10 00:08:53.146853382 -0400 +@@ -1444,7 +1444,7 @@ *start_offset = offset_from_xy (priv, start_x, start_y); _vte_terminal_get_end_selection (terminal, &end_x, &end_y); *end_offset = offset_from_xy (priv, end_x, end_y); @@ -11,10 +11,10 @@ diff -aur vte-0.38.0/src/vteaccess.c vte-0.38.0.new/src/vteaccess.c } static gboolean -diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c ---- vte-0.38.0/src/vte.c 2014-09-13 03:23:47.000000000 -0400 -+++ vte-0.38.0.new/src/vte.c 2014-09-21 17:03:04.671656749 -0400 -@@ -122,7 +122,6 @@ +diff --unified -aur vte-0.40.0/src/vte.c vte-0.40.0.new/src/vte.c +--- vte-0.40.0/src/vte.c 2015-03-18 12:38:09.000000000 -0400 ++++ vte-0.40.0.new/src/vte.c 2015-04-10 00:08:53.150186722 -0400 +@@ -123,7 +123,6 @@ gpointer data, GArray *attributes, gboolean include_trailing_spaces); @@ -22,7 +22,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal); static void vte_terminal_stop_processing (VteTerminal *terminal); -@@ -3267,9 +3266,10 @@ +@@ -3344,9 +3343,10 @@ _vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n"); terminal->pvt->pty_input_source = 0; } @@ -35,7 +35,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c if (terminal->pvt->pty_channel == NULL) { return; } -@@ -3321,9 +3321,10 @@ +@@ -3398,9 +3398,10 @@ } } @@ -48,7 +48,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c if (terminal->pvt->pty_input_source != 0) { _vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n"); g_source_remove(terminal->pvt->pty_input_source); -@@ -6154,6 +6155,28 @@ +@@ -6302,6 +6303,28 @@ } } @@ -67,8 +67,8 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c + g_return_if_fail(VTE_IS_TERMINAL(terminal)); + + _vte_invalidate_cursor_once(terminal, FALSE); -+ terminal->pvt->screen->cursor_current.col = column; -+ terminal->pvt->screen->cursor_current.row = row; ++ terminal->pvt->cursor.col = column; ++ terminal->pvt->cursor.row = row; + _vte_invalidate_cursor_once(terminal, FALSE); + _vte_check_cursor_blink(terminal); + vte_terminal_queue_cursor_moved(terminal); @@ -77,7 +77,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c static GtkClipboard * vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board) { -@@ -6319,7 +6342,7 @@ +@@ -6465,7 +6488,7 @@ vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE); /* Temporarily stop caring about input from the child. */ @@ -86,7 +86,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c } static gboolean -@@ -6336,7 +6359,7 @@ +@@ -6482,7 +6505,7 @@ terminal->pvt->selecting = FALSE; /* Reconnect to input from the child if we paused it. */ @@ -95,7 +95,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c return TRUE; } -@@ -6834,6 +6857,50 @@ +@@ -6982,6 +7005,50 @@ vte_terminal_deselect_all (terminal); } @@ -146,7 +146,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c /* Autoscroll a bit. */ static gboolean vte_terminal_autoscroll(VteTerminal *terminal) -@@ -8476,7 +8543,7 @@ +@@ -8631,7 +8698,7 @@ #endif kill(terminal->pvt->pty_pid, SIGHUP); } @@ -155,7 +155,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c _vte_terminal_disconnect_pty_write(terminal); if (terminal->pvt->pty_channel != NULL) { g_io_channel_unref (terminal->pvt->pty_channel); -@@ -12533,7 +12600,7 @@ +@@ -12188,7 +12255,7 @@ g_object_freeze_notify(object); if (pvt->pty != NULL) { @@ -164,7 +164,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c _vte_terminal_disconnect_pty_write(terminal); if (terminal->pvt->pty_channel != NULL) { -@@ -12588,7 +12655,7 @@ +@@ -12243,7 +12310,7 @@ _vte_terminal_setup_utf8 (terminal); /* Open channels to listen for input on. */ @@ -173,7 +173,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c g_object_notify(object, "pty"); -@@ -12623,7 +12690,7 @@ +@@ -12276,7 +12343,7 @@ } char * @@ -182,10 +182,9 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c { g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL); -Only in vte-0.38.0.new/src: .vte.c.swp -diff -aur vte-0.38.0/src/vteint.h vte-0.38.0.new/src/vteint.h ---- vte-0.38.0/src/vteint.h 2014-05-16 13:51:26.000000000 -0400 -+++ vte-0.38.0.new/src/vteint.h 2014-09-21 17:05:44.934589281 -0400 +diff --unified -aur vte-0.40.0/src/vteint.h vte-0.40.0.new/src/vteint.h +--- vte-0.40.0/src/vteint.h 2014-05-28 08:22:48.000000000 -0400 ++++ vte-0.40.0.new/src/vteint.h 2015-04-10 00:08:53.153520062 -0400 @@ -25,7 +25,6 @@ G_BEGIN_DECLS @@ -194,10 +193,10 @@ diff -aur vte-0.38.0/src/vteint.h vte-0.38.0.new/src/vteint.h void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y); void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y); void _vte_terminal_select_text(VteTerminal *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset); -diff -aur vte-0.38.0/src/vteterminal.h vte-0.38.0.new/src/vteterminal.h ---- vte-0.38.0/src/vteterminal.h 2014-09-13 03:23:47.000000000 -0400 -+++ vte-0.38.0.new/src/vteterminal.h 2014-09-21 17:03:39.094903032 -0400 -@@ -170,6 +170,18 @@ +diff --unified -aur vte-0.40.0/src/vteterminal.h vte-0.40.0.new/src/vteterminal.h +--- vte-0.40.0/src/vteterminal.h 2015-03-18 12:38:09.000000000 -0400 ++++ vte-0.40.0.new/src/vteterminal.h 2015-04-10 00:08:53.150186722 -0400 +@@ -169,6 +169,18 @@ void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); @@ -214,9 +213,9 @@ diff -aur vte-0.38.0/src/vteterminal.h vte-0.38.0.new/src/vteterminal.h +void vte_terminal_disconnect_pty_read(VteTerminal *vte); +void vte_terminal_connect_pty_read(VteTerminal *vte); - /* Set the terminal's size. */ - void vte_terminal_set_size(VteTerminal *terminal, -@@ -276,6 +288,8 @@ + /* By-word selection */ + void vte_terminal_set_word_char_exceptions(VteTerminal *terminal, +@@ -280,6 +292,8 @@ void vte_terminal_get_cursor_position(VteTerminal *terminal, glong *column, glong *row) _VTE_GNUC_NONNULL(1); From a43bd6bbcd1f189b034bb9431ae4b813d3cad95c Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 18 May 2015 12:46:22 +0200 Subject: [PATCH 311/615] go: add disabled flag for packages --- pkgs/development/go-modules/generic/default.nix | 5 +++++ pkgs/top-level/go-packages.nix | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 271e0ed66336..7bdb8c3805cd 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -2,6 +2,9 @@ { name, buildInputs ? [] +# Disabled flag +, disabled ? false + # Go import path of the package , goPackagePath @@ -15,6 +18,8 @@ , meta ? {}, ... } @ args': +if disabled then throw "${name} not supported for go ${go.meta.branch}" else + let args = lib.filterAttrs (name: _: name != "extraSrcs") args'; in diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 278360f1ce12..3b7e8f3cc967 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -3,7 +3,10 @@ { overrides, stdenv, go, buildGoPackage, git, pkgconfig, libusb , fetchgit, fetchhg, fetchurl, fetchFromGitHub, fetchbzr, pkgs }: -let self = _self // overrides; _self = with self; { +let + isGo13 = go.meta.branch == "1.3"; + isGo14 = go.meta.branch == "1.4"; + self = _self // overrides; _self = with self; { inherit go buildGoPackage; @@ -14,6 +17,7 @@ let self = _self // overrides; _self = with self; { name = "go-crypto-${rev}"; goPackagePath = "golang.org/x/crypto"; goPackageAliases = [ "code.google.com/p/go.crypto" ]; + disabled = isGo13; src = fetchFromGitHub { inherit rev; From 1a3de464170dc38784fb2c5620003f89bcd0ce9c Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 18 May 2015 12:47:24 +0200 Subject: [PATCH 312/615] go: also remove disabled from the derivation --- pkgs/development/go-modules/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 7bdb8c3805cd..2ff1438006f9 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -25,7 +25,7 @@ let in go.stdenv.mkDerivation ( - (builtins.removeAttrs args [ "goPackageAliases" ]) // { + (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // { name = "go${go.meta.branch}-${name}"; buildInputs = [ go ] ++ buildInputs ++ (lib.optional (!dontRenameImports) govers) ; From d511369fcc0c524457ff01379afda96b3fe0f360 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 18 May 2015 12:55:02 +0200 Subject: [PATCH 313/615] go: document disabled flag --- doc/language-support.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/doc/language-support.xml b/doc/language-support.xml index 5942fe01e2ed..da709b34a94b 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -674,6 +674,7 @@ net = buildGoPackage rec { goPackageAliases = [ "code.google.com/p/go.net" ]; propagatedBuildInputs = [ goPackages.text ]; buildFlags = "--tags release"; + disabled = isGo13; }; @@ -731,6 +732,18 @@ the following arguments are of special significance to the function: + + + If disabled is true, + nix will refuse to build this package. + + + In this example the package will not be built for go 1.3. The isGo13 + is an utility function that returns true if go used to build the + package has version 1.3.x. + + + From 99b14de505df21a5b5cc6636ca679f7ac179d8ba Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 18 May 2015 13:05:26 +0200 Subject: [PATCH 314/615] Fix evaluation of goffice 0.8 across gnome updates --- pkgs/desktops/gnome-3/3.16/default.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 8 +------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix index 6ec1ee011f53..6243b2dd6d40 100644 --- a/pkgs/desktops/gnome-3/3.16/default.nix +++ b/pkgs/desktops/gnome-3/3.16/default.nix @@ -279,6 +279,12 @@ rec { goffice = callPackage ./misc/goffice { }; + goffice_0_8 = callPackage ./misc/goffice/0.8.nix { + inherit (pkgs.gnome2) libglade libgnomeui; + gconf = pkgs.gnome2.GConf; + libart = pkgs.gnome2.libart_lgpl; + }; + gitg = callPackage ./misc/gitg { webkitgtk = webkitgtk24x; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b38bef1fc24..5b89bdfa81b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11068,15 +11068,9 @@ let gconf = gnome2.GConf; guile = guile_1_8; slibGuile = slibGuile.override { scheme = guile_1_8; }; - goffice = goffice_0_8; + goffice = gnome3.goffice_0_8; }; - goffice_0_8 = callPackage ../desktops/gnome-3/3.12/misc/goffice/0.8.nix { - inherit (gnome2) libglade libgnomeui; - gconf = gnome2.GConf; - libart = gnome2.libart_lgpl; - }; # latest version: gnome3.goffice - idea = recurseIntoAttrs (callPackage ../applications/editors/idea { androidsdk = androidsdk_4_4; }); libquvi = callPackage ../applications/video/quvi/library.nix { }; From 6af3e25bb9f1e3e9cbce2f67680573341781d27c Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 18 May 2015 13:08:48 +0200 Subject: [PATCH 315/615] Add goffice_0_8 back to toplevel --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b89bdfa81b0..17870460aa6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11068,9 +11068,11 @@ let gconf = gnome2.GConf; guile = guile_1_8; slibGuile = slibGuile.override { scheme = guile_1_8; }; - goffice = gnome3.goffice_0_8; + goffice = goffice_0_8; }; + goffice_0_8 = gnome3.goffice_0_8; + idea = recurseIntoAttrs (callPackage ../applications/editors/idea { androidsdk = androidsdk_4_4; }); libquvi = callPackage ../applications/video/quvi/library.nix { }; From 73e164f575d5589f6c6c863e4e40d48ceabe49b4 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 18 May 2015 12:27:42 +0200 Subject: [PATCH 316/615] pkgs charybdis: change platforms to linux only --- pkgs/servers/irc/charybdis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index ab0ba4fd9343..a38a25c8a5cb 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/atheme/charybdis; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.lassulus ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; From 12f0b619675d591bfef01e253cdb826eee509378 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Mon, 18 May 2015 13:15:50 +0200 Subject: [PATCH 317/615] hipchat: update 2.2.1287 -> 2.2.1373 --- .../networking/instant-messengers/hipchat/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index b9f9667ad3b6..f82ffa5ecd38 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -5,7 +5,7 @@ let - version = "2.2.1287"; + version = "2.2.1373"; rpath = stdenv.lib.makeSearchPath "lib" [ stdenv.glibc @@ -47,12 +47,12 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "http://downloads.hipchat.com/linux/arch/x86_64/hipchat-${version}-x86_64.pkg.tar.xz"; - sha256 = "170izy3v18rgriz84h4gyf9354jvjrsbkgg53czq9l0scyz8x55b"; + sha256 = "0mxjzigncp8sh5w2rpr7kvkiahagm3adss1zv6rqk8hc1awrnd8n"; } else if stdenv.system == "i686-linux" then fetchurl { url = "http://downloads.hipchat.com/linux/arch/i686/hipchat-${version}-i686.pkg.tar.xz"; - sha256 = "150q7pxg5vs14is5qf36yfsf7r70g49q9xr1d1rknmc5m4qa5rc5"; + sha256 = "1f4cjbazgifxpyr6589frs417h4wpxbykf46w5qiw0m2wiqpqff5"; } else throw "HipChat is not supported on ${stdenv.system}"; @@ -92,10 +92,11 @@ stdenv.mkDerivation { mv opt/HipChat/bin/linuxbrowserlaunch $out/libexec/hipchat/bin/ ''; - meta = { + meta = with stdenv.lib; { description = "Desktop client for HipChat services"; homepage = http://www.hipchat.com; - license = stdenv.lib.licenses.unfree; + license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ jgeerds ]; }; } From 22c8244605cd500d344142569b7d000aabdb8b10 Mon Sep 17 00:00:00 2001 From: Sven Keidel Date: Sat, 16 May 2015 22:20:33 +0200 Subject: [PATCH 318/615] zeal: update to 0.1.1 (close #7858) --- pkgs/data/documentation/zeal/default.nix | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 6b8399a8b3f4..7bc1b9fa1fdd 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -1,38 +1,26 @@ { stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive }: stdenv.mkDerivation rec { - version = "20141123"; + version = "0.1.1"; name = "zeal-${version}"; src = fetchFromGitHub { owner = "zealdocs"; repo = "zeal"; - rev = "76405f8387d6a82697faab9630c78f31417d8450"; - sha256 = "1057py3j2flzxyiks031s0mwm9h82v033iqn5cq8sycmrb3ihj2s"; + rev = "v${version}"; + sha256 = "172wf50fq1l5p8hq1irvpwr7ljxkjaby71afrm82jz3ixl6dg2ii"; }; - buildInputs = [ pkgconfig qt5.base qt5.webkit libarchive ]; + buildInputs = [ pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive ]; - patchPhase = '' - substituteInPlace src/main.cpp \ - --replace /usr/share/pixmaps/zeal $out/share/pixmaps/zeal - ''; - - buildPhase = '' - qmake PREFIX=$out - make + configurePhase = '' + qmake PREFIX=/ ''; installPhase = '' make INSTALL_ROOT=$out install ''; - preFixup = '' - mv $out/usr/bin $out/bin - mv $out/usr/share $out/share - rmdir $out/usr - ''; - enableParallelBuilding = true; meta = { From 5b7837c0d37622b6ad1888c669039c7dfd5c6229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 18 May 2015 13:42:49 +0200 Subject: [PATCH 319/615] libjpeg-turbo: make Hydra only build it on Linux I don't know what's wrong with darwin. Anyway, it's unused on darwin by default. --- pkgs/development/libraries/libjpeg-turbo/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 6a650de85646..c9de127c9056 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -17,8 +17,10 @@ stdenv.mkDerivation rec { homepage = http://libjpeg-turbo.virtualgl.org/; description = "A faster (using SIMD) libjpeg implementation"; license = licenses.ijg; # and some parts under other BSD-style licenses - platforms = platforms.all; maintainers = [ maintainers.vcunat ]; + # upstream supports darwin (and others), but it doesn't build currently + platforms = platforms.all; + hydraPlatforms = platforms.linux; }; } From 27aba150070b4c7e0843ead95196af77d7eb974f Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Mon, 18 May 2015 06:43:26 +0000 Subject: [PATCH 320/615] freetds-stable.tgz has gone --- pkgs/development/libraries/freetds/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 3980c5b61b31..11d10e73cdd7 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -3,12 +3,12 @@ assert odbcSupport -> unixODBC != null; -stdenv.mkDerivation { - name = "freetds-0.91"; +stdenv.mkDerivation rec { + name = "freetds-0.91.112"; src = fetchurl { - url = ftp://ftp.astron.com/pub/freetds/stable/freetds-stable.tgz; - sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba"; + url = "ftp://ftp.astron.com/pub/freetds/stable/${name}.tar.gz"; + sha256 = "be4f04ee57328c32e7e7cd7e2e1483e535071cec6101e46b9dd15b857c5078ed"; }; buildInputs = stdenv.lib.optional odbcSupport [ unixODBC ]; From 04622fe3baceba49042a0b5e2c89d309e93d8928 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 18 May 2015 08:52:50 -0500 Subject: [PATCH 321/615] firefoxWrapper: fix typo Accidentally tried to hardlink a directory! Should have been `ln -s` all along. Affects non-Firefox browsers that use firefoxWrapper. --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index a2134afdcf78..409f7d29ba2f 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { if [ -e "${browser}/share/icons" ]; then mkdir -p "$out/share" - ln "${browser}/share/icons" "$out/share/icons" + ln -s "${browser}/share/icons" "$out/share/icons" else mkdir -p "$out/share/icons/hicolor/128x128/apps" ln -s "$out/lib/$libdirbasename/browser/icons/mozicon128.png" \ From 132570bacee4cbefbbae8ede0ca8a7f684b4d2a8 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 18 May 2015 16:06:33 +0200 Subject: [PATCH 322/615] Add colm, a language for program analysis and transformation --- pkgs/development/compilers/colm/default.nix | 28 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/compilers/colm/default.nix diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix new file mode 100644 index 000000000000..ebfee6c4188e --- /dev/null +++ b/pkgs/development/compilers/colm/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, makeWrapper, gcc }: + +stdenv.mkDerivation rec { + name = "colm-${version}"; + version = "0.12.0"; + + src = fetchurl { + url = "http://www.colm.net/files/colm/${name}.tar.gz"; + sha256 = "0kbfipxv3nvggd1a2nahk3jg22iifp2l7lkm55i5r7qkpms5sm3v"; + }; + + buildInputs = [ makeWrapper ]; + + doCheck = true; + checkPhase = ''sh ./test/runtests.sh''; + + postInstall = '' + wrapProgram $out/bin/colm \ + --prefix PATH ":" ${gcc}/bin + ''; + + meta = with stdenv.lib; { + description = "A programming language for the analysis and transformation of computer languages"; + homepage = http://www.colm.net/open-source/colm; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17870460aa6b..d8845c94c3ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3413,6 +3413,8 @@ let bigloo = callPackage ../development/compilers/bigloo { }; + colm = callPackage ../development/compilers/colm { }; + fetchegg = callPackage ../build-support/fetchegg { }; eggDerivation = callPackage ../development/compilers/chicken/eggDerivation.nix { }; From c45a4b4a921819fbc8ae30a16530c105b3727cef Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 18 May 2015 16:58:21 +0300 Subject: [PATCH 323/615] urxvt-tabbedex: update --- .../misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix index db388cea5fbb..ba68a46cf0c7 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation { src = fetchgit { url = "https://github.com/mina86/urxvt-tabbedex"; - rev = "54c8d6beb4d65278ed6db24693ca56e1ee65bb42"; - sha256 = "f8734ee289e1cfc517d0699627191c98d32ae3549e0f1935af2a5ccb86d4dc1e"; + rev = "b0a02018b1cbaaba2a0c8ea7af9368db0adf3363"; + sha256 = "f0025f2741d424736620147d9fc39faac68193cb9f74bde0fb6e02a6f1ae61c3"; }; installPhase = '' From e919cf0be2b8c4c2033edbbafba3ac8732656947 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 18 May 2015 16:58:37 +0300 Subject: [PATCH 324/615] pidgin-otr: update homepage --- .../instant-messengers/pidgin-plugins/otr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index c290975152cd..7b80ec85661a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libotr pidgin intltool ]; meta = with stdenv.lib; { - homepage = http://www.cypherpunks.ca/otr; + homepage = https://otr.cypherpunks.ca/; description = "Plugin for Pidgin 2.x which implements OTR Messaging"; license = licenses.gpl2; platforms = platforms.linux; From 19b4eb82089dfc1b54132e996b3034a72e847223 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 18 May 2015 16:59:02 +0300 Subject: [PATCH 325/615] bomi: update, add youtube-dl support --- pkgs/applications/video/bomi/default.nix | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index 83fb7546a3bc..be0517b6376b 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python3, which +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python, which, makeWrapper , libX11, libxcb, qt5, mesa , ffmpeg , libchardet @@ -15,12 +15,16 @@ , portaudioSupport ? false, portaudio ? null , pulseSupport ? true, pulseaudio ? null , cddaSupport ? false, libcdda ? null +, youtubeSupport ? true, youtube-dl ? null }: +with stdenv.lib; + assert jackSupport -> jack != null; assert portaudioSupport -> portaudio != null; assert pulseSupport -> pulseaudio != null; assert cddaSupport -> libcdda != null; +assert youtubeSupport -> youtube-dl != null; let waf = fetchurl { @@ -32,18 +36,18 @@ in stdenv.mkDerivation rec { name = "bomi-${version}"; - version = "0.9.5"; + version = "0.9.10"; src = fetchFromGitHub { owner = "xylosper"; repo = "bomi"; rev = "v${version}"; - sha256 = "1pf82dp7v18yd7knsjl853sfzhq4rqc3sq15jgqiw37096gp0sll"; + sha256 = "1c7497gks7yxzfy6jx77vn9zs2pdq7y6l9w61miwnkdm91093n17"; }; buildInputs = with stdenv.lib; [ libX11 libxcb mesa - qt5.base qt5.quick1 qt5.x11extras + qt5.base qt5.x11extras qt5.declarative qt5.quickcontrols ffmpeg libchardet mpg123 @@ -65,13 +69,17 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs configure - # src/mpv/waf build-mpv; do ''; preBuild = '' - patchShebangs build-mpv install -m755 ${waf} src/mpv/waf - sed -i '1 s,.*,#!${python3.interpreter},' src/mpv/waf + patchShebangs src/mpv/waf + patchShebangs build-mpv + ''; + + postInstall = '' + wrapProgram $out/bin/bomi \ + ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"} ''; configureFlags = with stdenv.lib; @@ -82,7 +90,7 @@ stdenv.mkDerivation rec { ++ optional cddaSupport "--enable-cdda" ; - nativeBuildInputs = [ pkgconfig perl which ]; + nativeBuildInputs = [ pkgconfig perl python which qt5.tools makeWrapper ]; enableParallelBuilding = true; From f79effa2ebc65fd4ba468fffab4db3401d6eda09 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 18 May 2015 16:59:44 +0300 Subject: [PATCH 326/615] haskell-graphviz: fix for GHC 7.10 --- .../haskell-modules/configuration-ghc-7.10.x.nix | 5 +++-- .../haskell-modules/graphviz-fix-ghc710.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/haskell-modules/graphviz-fix-ghc710.patch 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 53512826a5bd..e5717ba899f8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -241,8 +241,6 @@ self: super: { hbb = dontDistribute super.hbb; hsdev = dontDistribute super.hsdev; - # http://hub.darcs.net/ivanm/graphviz/issue/5 - graphviz = markBroken super.graphviz; Graphalyze = dontDistribute super.Graphalyze; HLearn-approximation = dontDistribute super.HLearn-approximation; HLearn-classification = dontDistribute super.HLearn-classification; @@ -288,6 +286,9 @@ self: super: { # https://github.com/ocharles/tasty-rerun/issues/5 tasty-rerun = dontHaddock (appendConfigureFlag super.tasty-rerun "--ghc-option=-XFlexibleContexts"); + # http://hub.darcs.net/ivanm/graphviz/issue/5 + graphviz = appendPatch super.graphviz ./graphviz-fix-ghc710.patch; + # Broken with GHC 7.10.x. aeson_0_7_0_6 = markBroken super.aeson_0_7_0_6; annotated-wl-pprint_0_5_3 = markBroken super.annotated-wl-pprint_0_5_3; diff --git a/pkgs/development/haskell-modules/graphviz-fix-ghc710.patch b/pkgs/development/haskell-modules/graphviz-fix-ghc710.patch new file mode 100644 index 000000000000..e72bb793da73 --- /dev/null +++ b/pkgs/development/haskell-modules/graphviz-fix-ghc710.patch @@ -0,0 +1,11 @@ +diff -ru3 graphviz.old/Data/GraphViz/Algorithms.hs graphviz/Data/GraphViz/Algorithms.hs +--- graphviz.old/Data/GraphViz/Algorithms.hs 2015-05-18 15:21:38.379771357 +0300 ++++ graphviz/Data/GraphViz/Algorithms.hs 2015-05-18 15:01:01.940122684 +0300 +@@ -38,6 +38,7 @@ + import Data.GraphViz.Types.Canonical + import Data.GraphViz.Types.Internal.Common + ++import Prelude hiding (traverse) + import Control.Arrow (first, second, (***)) + import Control.Monad (unless) + import Control.Monad.Trans.State From c244457121a1bf50bc00428d598de07a7299551c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 18 May 2015 17:01:06 +0300 Subject: [PATCH 327/615] double-conversion: update --- pkgs/development/libraries/double-conversion/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 6eedf6fc23be..7de7cb4d102d 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "2.0.1"; + version = "1.1.5"; name = "double-conversion-${version}"; src = fetchFromGitHub { - owner = "floitsch"; + owner = "google"; repo = "double-conversion"; rev = "v${version}"; - sha256 = "05x5rdwndgp1vdq2z1bpvng0dd8pn93kw4vhl6nsvv9vsara2q4b"; + sha256 = "1a264wpnvxmnq5pdlnp417ld1ybrng83lnbg38bv4ahz7a29ap4z"; }; nativeBuildInputs = [ cmake ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Binary-decimal and decimal-binary routines for IEEE doubles"; - homepage = https://github.com/floitsch/double-conversion; + homepage = https://github.com/google/double-conversion; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; From 2120cdec76010f42c5df8de18df4ff26b3502c68 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 18 May 2015 17:01:19 +0300 Subject: [PATCH 328/615] folly: update --- pkgs/development/libraries/folly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 0110511c3356..79584a99f630 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -2,14 +2,14 @@ , google-gflags, python, libiberty, openssl }: stdenv.mkDerivation rec { - version = "0.32.0"; + version = "0.38.0"; name = "folly-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "0yviih6b220bv6d1rg4lx1hqprqapnzfv4rv64cwjxbmz49ckmzh"; + sha256 = "0b273iwizy08r8lap367q79lai4l4aib2bvd827lkkdax5jpqf6b"; }; buildInputs = [ libiberty boost.lib libevent double_conversion glog google-gflags openssl ]; From 9867951a50700ec7e4a215c17b98742aff8aae08 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 18 May 2015 17:01:31 +0300 Subject: [PATCH 329/615] ijs: update --- pkgs/development/libraries/ijs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix index 5350630dac40..fbba11c10c93 100644 --- a/pkgs/development/libraries/ijs/default.nix +++ b/pkgs/development/libraries/ijs/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, autoreconfHook }: -let version = "9.15"; +let version = "9.16"; in stdenv.mkDerivation { name = "ijs-${version}"; src = fetchurl { url = "http://downloads.ghostscript.com/public/ghostscript-${version}.tar.bz2"; - sha256 = "0p1isp6ssfay141klirn7n9s8b546vcz6paksfmksbwy0ljsypg6"; + sha256 = "0vdqbjkickb0109lk6397bb2zjmg1s46dac5p5j4gfxa4pwl8b9y"; }; prePatch = "cd ijs"; From 809991152869e90f954c7a8b84819bbebbdfd8a2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 18 May 2015 17:02:36 +0300 Subject: [PATCH 330/615] libaacs: fix building --- pkgs/development/libraries/libaacs/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix index 717dae8fb256..631c7c778ae2 100644 --- a/pkgs/development/libraries/libaacs/default.nix +++ b/pkgs/development/libraries/libaacs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgcrypt, yacc, flex }: +{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }: # library that allows libbluray to play AACS protected bluray disks # libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info. @@ -7,7 +7,6 @@ # http://vlc-bluray.whoknowsmy.name/ # https://wiki.archlinux.org/index.php/BluRay - let baseName = "libaacs"; version = "0.8.0"; in @@ -20,13 +19,13 @@ stdenv.mkDerivation { sha256 = "155sah8z4vbp6j3sq9b17mcn6rj1938ijszz97m8pd2cgif58i2y"; }; - buildInputs = [ libgcrypt ]; + buildInputs = [ libgcrypt libgpgerror ]; nativeBuildInputs = [ yacc flex ]; meta = with stdenv.lib; { homepage = http://www.videolan.org/developers/libbluray.html; - description = "Library to access Blu-Ray disks for video playback"; + description = "Library to access AACS protected Blu-Ray disks"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; }; From 49363242731858b8366545bdf30216e54ea53d6d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 18 May 2015 17:04:19 +0300 Subject: [PATCH 331/615] libbdplus: add package --- .../libraries/libbdplus/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/libbdplus/default.nix diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix new file mode 100644 index 000000000000..8cc2e8069320 --- /dev/null +++ b/pkgs/development/libraries/libbdplus/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }: + +# library that allows libbluray to play BDplus protected bluray disks +# libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info. + +# Info on how to use / obtain aacs keys: +# http://vlc-bluray.whoknowsmy.name/ +# https://wiki.archlinux.org/index.php/BluRay + + +let baseName = "libbdplus"; + version = "0.1.2"; +in + +stdenv.mkDerivation { + name = "${baseName}-${version}"; + + src = fetchurl { + url = "http://download.videolan.org/pub/videolan/${baseName}/${version}/${baseName}-${version}.tar.bz2"; + sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6"; + }; + + buildInputs = [ libgcrypt libgpgerror ]; + + nativeBuildInputs = [ ]; + + meta = with stdenv.lib; { + homepage = http://www.videolan.org/developers/libbdplus.html; + description = "Library to access BD+ protected Blu-Ray disks"; + license = licenses.lgpl21; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8845c94c3ec..932a942a5df7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6422,6 +6422,8 @@ let libbluedevil = callPackage ../development/libraries/libbluedevil { }; + libbdplus = callPackage ../development/libraries/libbdplus { }; + libbluray = callPackage ../development/libraries/libbluray { }; libbs2b = callPackage ../development/libraries/audio/libbs2b { }; From a5fc6f702e0ed5fca2b171ea3c5dcb6f9da8dfb4 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 18 May 2015 17:04:50 +0300 Subject: [PATCH 332/615] libbluray: update, fix building, AACS and Java --- .../libbluray/BDJ-JARFILE-path.patch | 23 +++++----- .../libraries/libbluray/default.nix | 45 ++++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch index 64f0e74084fc..2680b1c6de5c 100644 --- a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch +++ b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch @@ -1,8 +1,7 @@ -diff --git a/configure.ac b/configure.ac -index 3609d88..48c6bc6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -227,6 +227,7 @@ if [[ $use_bdjava = "yes" ]]; then +diff -ru3 libbluray-0.8.0/configure.ac libbluray-0.8.0-new/configure.ac +--- libbluray-0.8.0/configure.ac 2015-04-10 09:48:23.000000000 +0300 ++++ libbluray-0.8.0-new/configure.ac 2015-05-18 14:22:01.002075482 +0300 +@@ -231,6 +231,7 @@ AC_DEFINE([USING_BDJAVA], [1], ["Define to 1 if using BD-Java"]) AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."]) AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""]) @@ -10,16 +9,14 @@ index 3609d88..48c6bc6 100644 fi AM_CONDITIONAL([USING_BDJAVA], [ test $use_bdjava = "yes" ]) -diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c -index c622801..f4aab9b 100644 ---- a/src/libbluray/bdj/bdj.c -+++ b/src/libbluray/bdj/bdj.c -@@ -210,7 +210,7 @@ static const char *_find_libbluray_jar(void) +diff -ru3 libbluray-0.8.0/src/libbluray/bdj/bdj.c libbluray-0.8.0-new/src/libbluray/bdj/bdj.c +--- libbluray-0.8.0/src/libbluray/bdj/bdj.c 2015-04-06 19:25:09.000000000 +0300 ++++ libbluray-0.8.0-new/src/libbluray/bdj/bdj.c 2015-05-18 14:22:59.241312808 +0300 +@@ -228,6 +228,7 @@ #ifdef _WIN32 "" BDJ_JARFILE, #else -- "/usr/share/java/" BDJ_JARFILE, + JARDIR "/" BDJ_JARFILE, + "/usr/share/java/" BDJ_JARFILE, + "/usr/share/libbluray/lib/" BDJ_JARFILE, #endif - }; - diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 170c4e461882..de0fa1a56d3c 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -1,12 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, fontconfig -, withAACS ? false, libaacs ? null, jdk ? null, ant ? null +{ stdenv, fetchurl, pkgconfig, fontconfig, autoreconfHook +, withJava ? true, jdk ? null, ant ? null +, withAACS ? false, libaacs ? null +, withBDplus ? false, libbdplus ? null , withMetadata ? true, libxml2 ? null , withFonts ? true, freetype ? null -# Need to run autoreconf hook after BDJ jarfile patch -, autoreconfHook ? null }: -assert withAACS -> jdk != null && ant != null && libaacs != null && autoreconfHook != null; +with stdenv.lib; + +assert withJava -> jdk != null && ant != null; +assert withAACS -> libaacs != null; +assert withBDplus -> libbdplus != null; assert withMetadata -> libxml2 != null; assert withFonts -> freetype != null; @@ -15,41 +19,40 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { baseName = "libbluray"; - version = "0.7.0"; + version = "0.8.0"; name = "${baseName}-${version}"; src = fetchurl { url = "ftp://ftp.videolan.org/pub/videolan/${baseName}/${version}/${name}.tar.bz2"; - sha256 = "13dngs4b4cv29f6b825dq14n77mfhvk1kjb42axpq494pfgyp6zp"; + sha256 = "027xbdbsjyp1spfiva2331pzixrzw6vm97xlvgz16hzm5a5j103v"; }; - nativeBuildInputs = with stdenv.lib; - [pkgconfig] - ++ optional withAACS ant + nativeBuildInputs = [ pkgconfig autoreconfHook ] + ++ optionals withJava [ ant ] ; - buildInputs = with stdenv.lib; - [fontconfig] - ++ optionals withAACS [ jdk autoreconfHook ] - ++ optional withMetadata libxml2 - ++ optional withFonts freetype - ; + buildInputs = [ fontconfig ] + ++ optional withJava jdk + ++ optional withMetadata libxml2 + ++ optional withFonts freetype + ; propagatedBuildInputs = stdenv.lib.optional withAACS libaacs; - preConfigure = stdenv.lib.optionalString withAACS '' - export JDK_HOME=${jdk.home} - export LIBS="$LIBS -L${libaacs} -laacs" + preConfigure = '' + ${optionalString withJava ''export JDK_HOME="${jdk.home}"''} + ${optionalString withAACS ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${libaacs}/lib -laacs"''} + ${optionalString withBDplus ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${libbdplus}/lib -lbdplus"''} ''; configureFlags = with stdenv.lib; - optional withAACS "--enable-bdjava" + optional (! withJava) "--disable-bdjava" ++ optional (! withMetadata) "--without-libxml2" ++ optional (! withFonts) "--without-freetype" ; # Fix search path for BDJ jarfile - patches = stdenv.lib.optional withAACS ./BDJ-JARFILE-path.patch; + patches = stdenv.lib.optional withJava ./BDJ-JARFILE-path.patch; meta = with stdenv.lib; { homepage = http://www.videolan.org/developers/libbluray.html; From f1b51945bc81c3c5837df9065c8b6fec7c0bcdbf Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 18 May 2015 17:05:19 +0300 Subject: [PATCH 333/615] ti-rpc: update package --- pkgs/development/libraries/science/math/ipopt/default.nix | 4 ++-- pkgs/development/libraries/ti-rpc/default.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 544ab215345a..4dd1ca46e956 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, unzip, blas, liblapack, gfortran }: stdenv.mkDerivation rec { - version = "3.12.1"; + version = "3.12.3"; name = "ipopt-${version}"; src = fetchurl { url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; - sha256 = "0x0wcc21d2bfs3zq8nvhva1nv7xi86wjbyixvvxvcrg2kqjlybdy"; + sha256 = "0h8qx3hq2m21qrg4v3n26v2qbhl6saxrpa7rbhnmkkcfj5s942yr"; }; preConfigure = '' diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 55438e2c201f..b135e49f52bb 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -1,14 +1,14 @@ -{ fetchurl, stdenv, kerberos }: +{ fetchurl, stdenv, krb5 }: stdenv.mkDerivation rec { - name = "libtirpc-0.2.5"; + name = "libtirpc-0.3.0"; src = fetchurl { url = "mirror://sourceforge/libtirpc/${name}.tar.bz2"; - sha256 = "1nq2w227j9nh8qsz7b3c1pha00k5yvzf2c3pfmlcb1l65iydxyb2"; + sha256 = "07d1wlfzf3ia09mjn3f3ay8isk7yx4a6ckfkzx5khnqlc7amkzna"; }; - buildInputs = [ kerberos ]; + propagatedBuildInputs = [ krb5 ]; # http://www.sourcemage.org/projects/grimoire/repository/revisions/d6344b6a3a94b88ed67925a474de5930803acfbf preConfigure = '' From 925a21aa2a2911204f945739a784ea6b6401865b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 18 May 2015 17:06:42 +0300 Subject: [PATCH 334/615] rpcbind: update package --- pkgs/servers/rpcbind/default.nix | 5 +++-- pkgs/servers/rpcbind/sunrpc.patch | 30 ++++++++++++++++-------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index 854a2ab94b76..6eb8a57cab4f 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -1,13 +1,13 @@ { fetchurl, stdenv, pkgconfig, libtirpc , useSystemd ? true, systemd }: -let version = "0.2.2"; +let version = "0.2.3"; in stdenv.mkDerivation rec { name = "rpcbind-${version}"; src = fetchurl { url = "mirror://sourceforge/rpcbind/${version}/${name}.tar.bz2"; - sha256 = "0acgl1c07ymnks692b90aq5ldj4h0km7n03kz26wxq6vjv3winqk"; + sha256 = "0yyjzv4161rqxrgjcijkrawnk55rb96ha0pav48s03l2klx855wq"; }; patches = [ ./sunrpc.patch ]; @@ -23,6 +23,7 @@ in stdenv.mkDerivation rec { description = "ONC RPC portmapper"; license = licenses.bsd3; platforms = platforms.unix; + homepage = http://sourceforge.net/projects/rpcbind/; maintainers = with maintainers; [ abbradar ]; longDescription = '' Universal addresses to RPC program number mapper. diff --git a/pkgs/servers/rpcbind/sunrpc.patch b/pkgs/servers/rpcbind/sunrpc.patch index af9b3b716798..450d33aa1c40 100644 --- a/pkgs/servers/rpcbind/sunrpc.patch +++ b/pkgs/servers/rpcbind/sunrpc.patch @@ -3,9 +3,10 @@ http://projects.archlinux.org/svntogit/packages.git/tree/trunk/rpcbind-sunrpc.pa Lookup "sunrpc" instead of "rpcbind" in /etc/services, since the former is the official IANA name. ---- rpcbind-0.1.7/src/rpcbind.c.orig 2008-11-19 14:17:34.000000000 +0100 -+++ rpcbind-0.1.7/src/rpcbind.c 2010-01-07 13:03:37.416632894 +0100 -@@ -114,7 +114,7 @@ +diff -ru3 rpcbind-0.2.3/src/rpcbind.c rpcbind-0.2.3.new/src/rpcbind.c +--- rpcbind-0.2.3/src/rpcbind.c 2015-04-27 17:07:43.000000000 +0300 ++++ rpcbind-0.2.3.new/src/rpcbind.c 2015-05-18 16:29:24.938380694 +0300 +@@ -132,7 +132,7 @@ char *udp_uaddr; /* Universal UDP address */ char *tcp_uaddr; /* Universal TCP address */ #endif @@ -14,14 +15,15 @@ official IANA name. static char superuser[] = "superuser"; int main __P((int, char *[])); ---- rpcbind-0.1.7/src/rpcinfo.c~ 2010-01-08 16:14:24.592156602 +0000 -+++ rpcbind-0.1.7/src/rpcinfo.c 2010-01-08 16:14:31.578838609 +0000 -@@ -633,7 +633,7 @@ - { - memset (&hints, 0, sizeof hints); - hints.ai_family = AF_INET; -- if ((error = getaddrinfo (host, "rpcbind", &hints, &res)) != 0 && -+ if ((error = getaddrinfo (host, "sunrpc", &hints, &res)) != 0 && - (error = getaddrinfo (host, "portmapper", &hints, &res)) != 0) - { - fprintf (stderr, "rpcinfo: %s: %s\n", +diff -ru3 rpcbind-0.2.3/src/rpcinfo.c rpcbind-0.2.3.new/src/rpcinfo.c +--- rpcbind-0.2.3/src/rpcinfo.c 2015-04-27 17:07:43.000000000 +0300 ++++ rpcbind-0.2.3.new/src/rpcinfo.c 2015-05-18 16:30:14.197025336 +0300 +@@ -1842,7 +1842,7 @@ + + /* Get the address of the rpcbind */ + memset (&hints, 0, sizeof hints); +- if ((getaddrinfo (host, "rpcbind", &hints, &res) != 0) && ++ if ((getaddrinfo (host, "sunrpc", &hints, &res) != 0) && + (getaddrinfo (host, "portmapper",&hints, &res) != 0)) + { + rpc_createerr.cf_stat = RPC_N2AXLATEFAILURE; From ab7d2f7f39b2214815f72e75601016942eddfb9d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 18 May 2015 17:07:03 +0300 Subject: [PATCH 335/615] network-manager-l2tp: add homepage --- pkgs/tools/networking/network-manager/l2tp.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix index a104f321c12d..f415b4f3bedd 100644 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "L2TP plugin for NetworkManager"; inherit (networkmanager.meta) platforms; + homepage = https://github.com/seriyps/NetworkManager-l2tp; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; }; From e2f0e08b021e422abf4be955c0c9a9550246b974 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 18 May 2015 17:07:25 +0300 Subject: [PATCH 336/615] bomi: build with PulseAudio support by default --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 932a942a5df7..e0789bf6e3e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10471,7 +10471,7 @@ let bomi = callPackage ../applications/video/bomi { stdenv = overrideCC stdenv gcc49; - pulseSupport = config.pulseaudio or false; + pulseSupport = config.pulseaudio or true; }; cmus = callPackage ../applications/audio/cmus { }; From a14966e8271aa0a2b958ff9723524157dfc3ccd2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 17 May 2015 14:39:19 +0200 Subject: [PATCH 337/615] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/eb2884c12cce16ac2ef55e5fd9576213b68b0597 with hackage2nix revision bf850da9044b16efb9ef06a05c645fa981513444 --- .../haskell-modules/hackage-packages.nix | 556 +++++++++--------- 1 file changed, 290 insertions(+), 266 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 09156dbb459b..328e0fcb966e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -13307,8 +13307,8 @@ self: { }: mkDerivation { pname = "Saturnin"; - version = "0.1.0"; - sha256 = "14ipl6mi1g874y66i3lvaqdisfl3agy5cj005ghpq81hv5wp770g"; + version = "0.1.0.1"; + sha256 = "19vbaj2zd083lw4jvgi9sdkhyk0hfgb88i9sksg6i1j569ypjk78"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -18009,15 +18009,18 @@ self: { }) {}; "alfred" = callPackage - ({ mkDerivation, aeson, base, bytestring, hexpat, HTTP, network-uri - , text, xmlgen + ({ mkDerivation, aeson, base, bytestring, hexpat, http-conduit + , http-types, network-uri, text, xmlgen }: mkDerivation { pname = "alfred"; - version = "0.4"; - sha256 = "1zmjllvcpj42cp01n1p2f2kzzx2ik4fql2vwbzlkaay9v9pskjk0"; + version = "0.5"; + revision = "1"; + sha256 = "1c6ak56g29wkas66x7yhg1zk039mp2mvlp7njixchhh2c4kx9fvn"; + editedCabalFile = "06e4b9ba672fc3d29452df70d2e9f9018ada5e8b62aa5890b9a70d9d937d6581"; buildDepends = [ - aeson base bytestring hexpat HTTP network-uri text xmlgen + aeson base bytestring hexpat http-conduit http-types network-uri + text xmlgen ]; description = "utility library for Alfred version 2"; license = stdenv.lib.licenses.bsd3; @@ -19336,18 +19339,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "annotated-wl-pprint_0_5_3" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "annotated-wl-pprint"; - version = "0.5.3"; - sha256 = "0g8b4hmgh7jhiknfrlaqr9sxr7a6sikkpaws15dy8mg4r792bbis"; - buildDepends = [ base ]; - homepage = "https://github.com/david-christiansen/annotated-wl-pprint"; - description = "The Wadler/Leijen Pretty Printer, with annotation support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - "annotated-wl-pprint" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -21848,8 +21839,8 @@ self: { }: mkDerivation { pname = "auto"; - version = "0.4.2.2"; - sha256 = "1n2kknp7b8agkvn3nk6w6cabzh3n89jakzx8pi46ig2ghcxz90wf"; + version = "0.4.2.3"; + sha256 = "1vzsmmim3h3r0ikzci9zb32rm42gr0x2m1lmm11my5jcf88gwck7"; buildDepends = [ base base-orphans bytestring cereal containers deepseq MonadRandom profunctors random semigroups transformers @@ -26009,27 +26000,6 @@ 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 - ]; - jailbreak = true; - 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 @@ -26119,26 +26089,6 @@ self: { 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 - ]; - jailbreak = true; - 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 @@ -31350,8 +31300,8 @@ self: { }: mkDerivation { pname = "clash-ghc"; - version = "0.5.5"; - sha256 = "1s5r7sjkxri02zxsjnkdxd03sk2j77l5r819sjw1wi6930p2fwa4"; + version = "0.5.6"; + sha256 = "0x538nxibz4hiyij1s9ljrgjvsmizha4nacszil1530qh7ss34n9"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -31376,8 +31326,8 @@ self: { }: mkDerivation { pname = "clash-lib"; - version = "0.5.4"; - sha256 = "08is6gr5z2i478lmah6liqinbp8r72zjqfcbfmrxa4vjr3ajrpw7"; + version = "0.5.5"; + sha256 = "0k6k45fhkwrr3azqhp278abf4kr7is67zsqyabf71hdyp68242dx"; buildDepends = [ aeson attoparsec base bytestring clash-prelude concurrent-supply containers deepseq directory errors fgl filepath hashable lens mtl @@ -33288,14 +33238,13 @@ self: { }: mkDerivation { pname = "compdata-param"; - version = "0.8.0.2"; - sha256 = "0496i1vnawl7m7ymvf5hl3kxy352rnhxy2gni4xkfz36psnnr7fs"; + version = "0.9"; + sha256 = "1b7kdg4g1mqpzy10wdxm90mbjfwmfpprkbb52ba9qbcg7scap4i4"; buildDepends = [ base compdata mtl template-haskell transformers ]; testDepends = [ base compdata containers HUnit mtl template-haskell test-framework test-framework-hunit transformers ]; - jailbreak = true; description = "Parametric Compositional Data Types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -37277,6 +37226,7 @@ self: { ]; description = "Library for drawing curve based images"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "custom-prelude" = callPackage @@ -42596,6 +42546,7 @@ self: { homepage = "https://github.com/factisresearch/dockercook"; description = "A build tool for multiple docker image layers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "docopt" = callPackage @@ -42604,8 +42555,8 @@ self: { }: mkDerivation { pname = "docopt"; - version = "0.7.0.1"; - sha256 = "1i8san365h3g1jhkwh4dyphczdfyd1558744hj4sv5q9lnq86l4q"; + version = "0.7.0.2"; + sha256 = "0c62lz0xmrd3ycnpmw254jbc5s999nb0xzrrkbv3cj3n9zzcyzak"; buildDepends = [ base containers parsec template-haskell th-lift ]; testDepends = [ aeson ansi-terminal base bytestring containers parsec split @@ -44223,17 +44174,18 @@ self: { }) { inherit (pkgs) libedit;}; "editor-open" = callPackage - ({ mkDerivation, base, bytestring, directory, process, temporary - , unix + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , directory, process, resourcet, temporary, transformers, unix }: mkDerivation { pname = "editor-open"; - version = "0.4.0.2"; - sha256 = "14vddpdwgjj5fi1g7ampqjsxpig87kiyddjw24kjjlxwava6nn16"; + version = "0.5.0.0"; + sha256 = "184i45vzf4xv5whp5q688fmrgxwyrhkqg88hw56yx34blcxywzcr"; isLibrary = true; isExecutable = true; buildDepends = [ - base bytestring directory process temporary unix + base bytestring conduit conduit-extra directory process resourcet + temporary transformers unix ]; homepage = "https://github.com/pharpend/editor-open"; description = "Open the user's $EDITOR for text input"; @@ -45008,7 +44960,9 @@ self: { mkDerivation { pname = "elocrypt"; version = "0.3.1"; + revision = "1"; sha256 = "1hh1nf0zfijzrz6pp2gq7zh7rv3fwrybm5cfj59wfb0j0dikz8v4"; + editedCabalFile = "d5781bd7efe030d5ee31448a6df16a3a6c3e4e72e4cabb73a42ad243240f7f6a"; isLibrary = true; isExecutable = true; buildDepends = [ base MonadRandom random ]; @@ -45018,6 +44972,7 @@ self: { homepage = "https://www.github.com/sgillespie/elocrypt"; description = "Generate easy-to-remember, hard-to-guess passwords"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "email" = callPackage @@ -45086,7 +45041,9 @@ self: { mkDerivation { pname = "email-validate"; version = "2.1.2"; + revision = "1"; sha256 = "13r67kk5rjl54mwk4shap1rf8jdp1hsd6wpg4hgkf10vzk5vara5"; + editedCabalFile = "0add2fe9264e4307cb7d464ddaf54c8147396f36740228d124224f5a27689582"; buildDepends = [ attoparsec base bytestring ghc-prim ]; testDepends = [ base bytestring HUnit QuickCheck test-framework @@ -46334,8 +46291,8 @@ self: { }: mkDerivation { pname = "eventloop"; - version = "0.4.1.0"; - sha256 = "0g4qlkvl313mi4immx5i78bdbzg0ld57ld114l8jf42fwk3qd5zd"; + version = "0.4.1.1"; + sha256 = "0d870kzcb08pc0ngrdkfibi0yq4zs5vcgg8acqpa8gdjaiksm8jg"; buildDepends = [ aeson base bytestring network suspend text timers websockets ]; @@ -46511,8 +46468,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "exceptional"; - version = "0.1.4.2"; - sha256 = "0macyynwj779wy1abzrl87g8zmpwa98x5vc5yqc0wnr06glmma2b"; + version = "0.1.4.3"; + sha256 = "0rhcqnpw97b9sy87nq7dqwiw8vl91h8yyix68d9sz10s9bi1xnlv"; buildDepends = [ base ]; homepage = "https://github.com/pharpend/exceptional"; description = "Essentially the Maybe type with error messages"; @@ -48276,8 +48233,8 @@ self: { }: mkDerivation { pname = "filediff"; - version = "1.0.0.1"; - sha256 = "1341xriaylrvclbz8c5pc1dppbz4kqq1hmbrga0dlpb6vr83amv2"; + version = "1.0.0.4"; + sha256 = "0vzknflpbhxririabjq6wpwb9lvj0829smj94icjyrx3s9i968k6"; buildDepends = [ base bytestring data-default data-memocombinators directory either mtl rainbow tasty tasty-hunit text threads time transformers Zora @@ -50811,10 +50768,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "functor-monadic"; - version = "0.1.0.2"; - sha256 = "03jipdzark9dhwlym7ky887zzl3cdsc18wwwmg5szl1wgg30li1n"; + version = "0.1.0.3"; + sha256 = "1qfrnny4qsn94n24q705z8d9gh9llz9nbyqbyy7hwh79bf1rkrcg"; buildDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/ombocomp/FunctorMonadic/"; description = "Monad-style combinators for functors"; license = stdenv.lib.licenses.asl20; @@ -51454,7 +51410,9 @@ self: { mkDerivation { pname = "generic-aeson"; version = "0.2.0.5"; + revision = "1"; sha256 = "109jxrny3r1wsf2kr23vvgdid4rmq5lpqjlfbk4n7yxb9bvdbhy5"; + editedCabalFile = "9b825c5d437c1a3a47dfb27781100229b7c535982ad42721414083cab309e461"; buildDepends = [ aeson attoparsec base generic-deriving mtl tagged text unordered-containers vector @@ -52427,8 +52385,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ghc-prof-flamegraph"; - version = "0.1.0.0"; - sha256 = "1hrikiv6a8l7pq9j7zjb98zl1qlb8gdggfkcw49zmk7zay0bd1c2"; + version = "0.1.0.1"; + sha256 = "1k34mh63rsgx71kxhn3brscq2k20pih78axwkr0q9dg7icyg05wi"; isLibrary = false; isExecutable = true; buildDepends = [ base ]; @@ -54806,10 +54764,10 @@ self: { ({ mkDerivation, array, base, containers }: mkDerivation { pname = "graph-wrapper"; - version = "0.2.4.3"; - sha256 = "1wfazkczc9m1r0snzv5b4ax315g93qgrnqc2wnrqqnzhcfy1symg"; + version = "0.2.4.4"; + sha256 = "0ks4mj1f3ky8h8p9kc1djslbzs2vvlh9frab8jl09x63b15f8xzd"; buildDepends = [ array base containers ]; - homepage = "http://www.github.com/batterseapower/graph-wrapper"; + homepage = "https://github.com/soenkehahn/graph-wrapper"; description = "A wrapper around the standard Data.Graph with a less awkward interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -57080,6 +57038,7 @@ self: { ]; description = "Hackage and Portage integration tool"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hactor" = callPackage @@ -58242,6 +58201,7 @@ self: { homepage = "http://www.happstack.com/"; description = "Happstack Authentication Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-clientsession" = callPackage @@ -59185,6 +59145,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hashids" = callPackage + ({ mkDerivation, base, bytestring, containers, split }: + mkDerivation { + pname = "hashids"; + version = "1.0.2"; + sha256 = "07qrsabhb825jhdbc4ka35ss7ci07avgvi8jsr69r17bnp87wnma"; + buildDepends = [ base bytestring containers split ]; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hashmap" = callPackage ({ mkDerivation, base, containers, deepseq, hashable }: mkDerivation { @@ -61780,26 +61751,26 @@ self: { "hbro" = callPackage ({ mkDerivation, aeson, base, bytestring, classy-prelude, cond - , containers, data-default-class, dyre, errors, fast-logger, glib - , gtk3, lens, lifted-async, lifted-base, monad-control - , monad-logger, mtl, network-uri, optparse-applicative, pango - , parsec, process, resourcet, safe, semigroups, stm-chans - , system-fileio, text, time, transformers, transformers-base, unix - , webkitgtk3, zeromq4-haskell + , containers, data-default-class, directory, dyre, errors + , exceptions, fast-logger, filepath, glib, gtk3, lens, lifted-async + , lifted-base, monad-control, monad-logger, mtl, network-uri + , optparse-applicative, pango, parsec, process, resourcet, safe + , semigroups, stm-chans, text, time, transformers + , transformers-base, unix, webkitgtk3, zeromq4-haskell }: mkDerivation { pname = "hbro"; - version = "1.3.0.0"; - sha256 = "114g9dz9f7s59s9d8hb38qffmdif617nhbs2z9vsdqmylgirirmz"; + version = "1.4.0.0"; + sha256 = "08vw5j3a22gszbsjhjp13dkgvxj2875zjsx6w3w7c2dkjg4lijpr"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base bytestring classy-prelude cond containers - data-default-class dyre errors fast-logger glib gtk3 lens - lifted-async lifted-base monad-control monad-logger mtl network-uri - optparse-applicative pango parsec process resourcet safe semigroups - stm-chans system-fileio text time transformers transformers-base - unix webkitgtk3 zeromq4-haskell + data-default-class directory dyre errors exceptions fast-logger + filepath glib gtk3 lens lifted-async lifted-base monad-control + monad-logger mtl network-uri optparse-applicative pango parsec + process resourcet safe semigroups stm-chans text time transformers + transformers-base unix webkitgtk3 zeromq4-haskell ]; homepage = "https://github.com/k0ral/hbro"; description = "Minimal extensible web-browser"; @@ -61808,20 +61779,18 @@ self: { "hbro-contrib" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , classy-prelude, containers, glib, gtk3, hbro, lens, monad-control - , mtl, network-uri, pango, parsec, process, resourcet, safe - , system-fileio, text, time, transformers-base, unix, webkitgtk3 + , classy-prelude, containers, directory, glib, gtk3, hbro, lens + , monad-control, mtl, network-uri, pango, parsec, process + , resourcet, safe, text, time, transformers-base, unix, webkitgtk3 }: mkDerivation { pname = "hbro-contrib"; - version = "1.3.0.0"; - revision = "1"; - sha256 = "09q7n5x61gsrjcv7ixh36daq3hj4sip5iph5ll7pfwpqd9mhxq95"; - editedCabalFile = "1df0341291f1e2820b8b0833b4951a555a96df54b3ef7cee754d32a6e53c69f0"; + version = "1.4.0.0"; + sha256 = "0v7qxg1phac5m06raspaq6782iid7rnvkinkji0fs0yjigbblps2"; buildDepends = [ - aeson aeson-pretty base bytestring classy-prelude containers glib - gtk3 hbro lens monad-control mtl network-uri pango parsec process - resourcet safe system-fileio text time transformers-base unix + aeson aeson-pretty base bytestring classy-prelude containers + directory glib gtk3 hbro lens monad-control mtl network-uri pango + parsec process resourcet safe text time transformers-base unix webkitgtk3 ]; homepage = "https://github.com/k0ral/hbro-contrib"; @@ -62572,9 +62541,9 @@ self: { mkDerivation { pname = "heist"; version = "0.14.1"; - revision = "3"; + revision = "4"; sha256 = "11g6nrg9xn9ypwrz7mj3hqjhg45ia1miihh1ydls7vfdm2fqlagy"; - editedCabalFile = "eac3bf21f0c39ced491fbd542f7a96928c13e8e3672254eb970414168afbaddf"; + editedCabalFile = "d61d5b4f4b360c12b46179000fe761037a23182489362188c929476a42248876"; buildDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist errors filepath hashable @@ -67330,15 +67299,14 @@ self: { }: mkDerivation { pname = "hruby"; - version = "0.3.1.3"; - sha256 = "1gzbdpsighs8jj92gi1xsrhpb7zh5mc86wiv4fszmgfrwaq1w8ab"; + version = "0.3.1.4"; + sha256 = "0pymwdpdl1xwjcgpblsrfyyib4sz2avxwidgxzr2bac91lhf3fpm"; buildDepends = [ aeson attoparsec base bytestring scientific stm text unordered-containers vector ]; testDepends = [ aeson attoparsec base QuickCheck text vector ]; extraLibraries = [ ruby ]; - jailbreak = true; description = "Embed a Ruby intepreter in your Haskell program !"; license = stdenv.lib.licenses.bsd3; }) { inherit (pkgs) ruby;}; @@ -72788,6 +72756,7 @@ self: { ]; description = "Internationalization for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iCalendar" = callPackage @@ -73074,12 +73043,12 @@ self: { , network, optparse-applicative, parsers, pretty, process, safe , split, text, time, transformers, transformers-compat, trifecta , uniplate, unix, unordered-containers, utf8-string, vector - , vector-binary-instances, xml, zlib + , vector-binary-instances, xml, zip-archive, zlib }: mkDerivation { pname = "idris"; - version = "0.9.17.1"; - sha256 = "16a3z7jq1pmqnb411aqn9qmirwyzpx3bqb0hrawc1404kbq7gdx7"; + version = "0.9.18"; + sha256 = "09bskx00lxzf7fdw66sbi55bqr7z1d92cabf9askjf2ych07k26s"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -73089,7 +73058,7 @@ self: { haskeline lens libffi mtl network optparse-applicative parsers pretty process safe split text time transformers transformers-compat trifecta uniplate unix unordered-containers - utf8-string vector vector-binary-instances xml zlib + utf8-string vector vector-binary-instances xml zip-archive zlib ]; buildTools = [ happy ]; extraLibraries = [ boehmgc gmp ]; @@ -75178,6 +75147,7 @@ self: { free haskell-lexer lens network old-locale split stm text time tls transformers vty x509 x509-store x509-system x509-validation ]; + jailbreak = true; homepage = "https://github.com/glguy/irc-core"; description = "An IRC client library and text client"; license = stdenv.lib.licenses.bsd3; @@ -75237,6 +75207,7 @@ self: { buildDepends = [ base QuickCheck ]; description = "Real numbers and intervals with relatively efficient exact arithmetic"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iron-mq" = callPackage @@ -76245,8 +76216,8 @@ self: { }: mkDerivation { pname = "jmacro"; - version = "0.6.11"; - sha256 = "1b45graag0nmadaf1ssaps4g9p7xx7d2h7dy84nzmdhrpvdlw4xs"; + version = "0.6.12"; + sha256 = "08n00mmfixr6s3pgh6mccq1sk7932md8b36wdds3zb1p5icrrdpr"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -76266,8 +76237,8 @@ self: { }: mkDerivation { pname = "jmacro-rpc"; - version = "0.3"; - sha256 = "1fkcky2f51764xcbbwnxpxyhk2mmnp364hf8njfcjsijanv938zw"; + version = "0.3.2"; + sha256 = "1nf5f62s749xsji2rg25dgj7mc668l3n7i7l9n1pjkn8gfwm6bx3"; buildDepends = [ aeson attoparsec base blaze-html bytestring containers contravariant jmacro mtl scientific split text unordered-containers @@ -76698,6 +76669,7 @@ self: { homepage = "http://github.com/snoyberg/json-enumerator"; description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-extra" = callPackage @@ -77579,18 +77551,17 @@ self: { }) {}; "keys" = callPackage - ({ mkDerivation, array, base, comonad, containers, free - , semigroupoids, semigroups, transformers + ({ mkDerivation, array, base, comonad, containers, free, hashable + , semigroupoids, semigroups, transformers, unordered-containers }: mkDerivation { pname = "keys"; - version = "3.10.1"; - sha256 = "007lbpfan5n1cgswsrzc4xjv0kjmjr9vn4lpqm3gwk3lnfpg8i4n"; + version = "3.10.2"; + sha256 = "1xmyhsqpz4rvm2i8f8xgd1wpj8qlps0lvbif1li73lzg13jiwps2"; buildDepends = [ - array base comonad containers free semigroupoids semigroups - transformers + array base comonad containers free hashable semigroupoids + semigroups transformers unordered-containers ]; - jailbreak = true; homepage = "http://github.com/ekmett/keys/"; description = "Keyed functors and containers"; license = stdenv.lib.licenses.bsd3; @@ -79524,12 +79495,17 @@ self: { }) {}; "lattices" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, deepseq, hashable + , unordered-containers + }: mkDerivation { pname = "lattices"; - version = "1.2.1.1"; - sha256 = "0ppqvc3w7v56zya43b3fqwis50c8b57hlighzmk8jphv39y3ilp6"; - buildDepends = [ base containers ]; + version = "1.3"; + sha256 = "1jp63rh1girf9ka0lfi219wlisni8dsckf67h6413ihdxdh2mp3l"; + buildDepends = [ + base containers deepseq hashable unordered-containers + ]; + homepage = "http://github.com/phadej/lattices/"; description = "Fine-grained library for constructing and manipulating lattices"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -79839,12 +79815,14 @@ self: { }) {}; "leapseconds-announced" = callPackage - ({ mkDerivation, base, time }: + ({ mkDerivation, base, QuickCheck, time }: mkDerivation { pname = "leapseconds-announced"; - version = "2015"; - sha256 = "14k57jw0n9nqrc9rrqsjiafk3li7z8azf9cm72gm3yrms72ph3m8"; + version = "2015.0.0.1"; + sha256 = "0k8khjfq1cr8wb2wgwwk7yv6461h7z6wf6qn21qd9zq9i22bpyhm"; buildDepends = [ base time ]; + testDepends = [ base QuickCheck time ]; + homepage = "https://github.com/bjornbm/leapseconds-announced"; description = "Leap seconds announced at library release time"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -80016,43 +79994,6 @@ self: { 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 = "3"; - sha256 = "1j9d7g4sj38zq2r8vhy05b2kbxx1sg2k0b3yx05lbxlb79wcm1j1"; - editedCabalFile = "6ac87d4c8600c9497c965d54b1e97f10d0073bed3c45381b78d1ba4b81da57c8"; - 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 - ]; - jailbreak = true; - homepage = "http://github.com/ekmett/lens/"; - description = "Lenses, Folds and Traversals"; - license = stdenv.lib.licenses.bsd3; - }) {}; - "lens" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, comonad , containers, contravariant, deepseq, directory, distributive @@ -80066,8 +80007,8 @@ self: { }: mkDerivation { pname = "lens"; - version = "4.10"; - sha256 = "01vmb0kknzayv3ppqgrnhnrybxw192gb4hk1kchwiiam7vr6kngd"; + version = "4.11"; + sha256 = "1699jbsdgffnhzpy6c2k6ld13crqibm7vc3x2gx95gwzx5hlccxm"; buildDepends = [ array base bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim hashable @@ -80290,6 +80231,7 @@ self: { homepage = "http://github.com/kim/leveldb-haskell"; description = "Haskell bindings to LevelDB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) leveldb;}; "leveldb-haskell-fork" = callPackage @@ -81096,8 +81038,8 @@ self: { }: mkDerivation { pname = "lifted-async"; - version = "0.7.0"; - sha256 = "1i9wm7pz8mh0gjyp7jhf3as82yi1axskv1mp5596gq7pszgglyd6"; + version = "0.7.0.1"; + sha256 = "0skfpgqlxni3bdn7pdg2732xkijmwsz655962wrbmflh987ms8y3"; buildDepends = [ async base constraints lifted-base monad-control transformers-base ]; @@ -82877,8 +82819,8 @@ self: { }: mkDerivation { pname = "logic-TPTP"; - version = "0.4.2.0"; - sha256 = "1pqs0hr05b4jsnf73fqfgqng3h63dlswlx18142fbkv1bhphg8al"; + version = "0.4.3.0"; + sha256 = "0hjznn92ippwgrsmklj02w2pf6dfylyiw1kifa4svjqwa9mx4hpv"; buildDepends = [ ansi-wl-pprint array base containers mtl pointed QuickCheck syb transformers transformers-compat @@ -85441,6 +85383,7 @@ self: { jailbreak = true; description = "A silly container"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mega-sdist" = callPackage @@ -86835,6 +86778,7 @@ self: { homepage = "https://github.com/DanBurton/modular-prelude#readme"; description = "A new Prelude featuring first class modules"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "modular-prelude-classy" = callPackage @@ -89672,6 +89616,7 @@ self: { ]; description = "Monadic interface for mwc-random"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "myTestlll" = callPackage @@ -89818,16 +89763,15 @@ self: { }) {}; "mysql-simple-typed" = callPackage - ({ mkDerivation, base, haskell-src-meta, mysql, mysql-simple - , template-haskell, typedquery, utf8-string + ({ mkDerivation, base, mysql, mysql-simple, template-haskell + , typedquery, utf8-string }: mkDerivation { pname = "mysql-simple-typed"; - version = "0.1.1.1"; - sha256 = "0cizs7c51884j05409nc8ldzlsbjcwpwc1ral1p1g1c98y1mpkcc"; + version = "0.1.1.2"; + sha256 = "19wnvmrb523n8xl5cp9kypcqcrs0xs8pwdk771y1bdin5ds9j095"; buildDepends = [ - base haskell-src-meta mysql mysql-simple template-haskell - typedquery utf8-string + base mysql mysql-simple template-haskell typedquery utf8-string ]; homepage = "https://github.com/tolysz/mysql-simple-typed"; description = "Typed extension to mysql simple"; @@ -91063,12 +91007,12 @@ self: { }) {}; "network-data" = callPackage - ({ mkDerivation, base, bytestring, cereal, pretty, prettyclass }: + ({ mkDerivation, base, bytestring, cereal, pretty }: mkDerivation { pname = "network-data"; - version = "0.5.2"; - sha256 = "0vbmg1m4qylzbmj3z5746srfkiwvh32qi9zyc39gc87bfw2gzn8s"; - buildDepends = [ base bytestring cereal pretty prettyclass ]; + version = "0.5.3"; + sha256 = "0zbwplzrr899lj0ig2nyq58cayy6f8pkn4wnqbrd1i50lhq61szz"; + buildDepends = [ base bytestring cereal pretty ]; description = "Library for network data structures and their serialization"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -93207,6 +93151,7 @@ self: { testDepends = [ base postgresql-simple product-profunctors profunctors time ]; + jailbreak = true; homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; @@ -96921,6 +96866,7 @@ self: { jailbreak = true; description = "Elsen Accelerated Computing Engine"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "phantom-state" = callPackage @@ -98134,8 +98080,8 @@ self: { }: mkDerivation { pname = "plugins-multistage"; - version = "0.6"; - sha256 = "02wf1q3c65ki0hgmxsqd7x48p42hh33bx3vyjykkv69jiz1why7y"; + version = "0.6.1"; + sha256 = "0kwibjp9r9gwkmi8i79cc217jhnqljcgdkvpsk7hclmaa7ir3caq"; buildDepends = [ base directory ghc process template-haskell th-desugar ]; @@ -98144,6 +98090,7 @@ self: { ]; description = "Dynamic linking for embedded DSLs with staged compilation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plumbers" = callPackage @@ -98265,8 +98212,8 @@ self: { }: mkDerivation { pname = "pointed"; - version = "4.2.0.1"; - sha256 = "1ysif8x5vlllib3gpdd3i0kdlanlzaw1pm0sjx1qayv19m1ddph7"; + version = "4.2.0.2"; + sha256 = "0ynswx6ybl7b6vbrm2bd2zj2sbvsclhdi440lpv1aix5smd8m2jb"; buildDepends = [ base comonad containers data-default-class hashable kan-extensions semigroupoids semigroups stm tagged transformers @@ -98961,17 +98908,18 @@ self: { }) {}; "posix-pty" = callPackage - ({ mkDerivation, base, bytestring, unix }: + ({ mkDerivation, base, bytestring, process, unix, util }: mkDerivation { pname = "posix-pty"; - version = "0.1.1"; - sha256 = "0ndr47bfm07b00kfy2p48jm7fjrd76bxbw3l7wm5yc0d0jyi65cd"; - buildDepends = [ base bytestring unix ]; + version = "0.2.0.1"; + sha256 = "1f0jyhfl41fvnjc290lm7x4dik2bhymcfxzf0il1iza5rpcjabxa"; + buildDepends = [ base bytestring process unix ]; + extraLibraries = [ util ]; homepage = "https://bitbucket.org/merijnv/posix-pty"; description = "Pseudo terminal interaction with subprocesses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) { util = null;}; "posix-realtime" = callPackage ({ mkDerivation, base, unix }: @@ -99220,18 +99168,17 @@ self: { }) {}; "postgresql-simple-typed" = callPackage - ({ mkDerivation, base, haskell-src-meta, postgresql-libpq - , postgresql-simple, template-haskell, typedquery, utf8-string + ({ mkDerivation, base, postgresql-libpq, postgresql-simple + , template-haskell, transformers, typedquery, utf8-string }: mkDerivation { pname = "postgresql-simple-typed"; - version = "0.1.0.0"; - sha256 = "1n9fkg1qcrycb7gvx4pln4xq3hpbczic4p2zv0f9hq7ljb5h3f1a"; + version = "0.1.0.1"; + sha256 = "0rgy0sx4fwcsr8ln14vhrp23hc1b67c07gw0hj5csrsjn40s0c2c"; buildDepends = [ - base haskell-src-meta postgresql-libpq postgresql-simple - template-haskell typedquery utf8-string + base postgresql-libpq postgresql-simple template-haskell + transformers typedquery utf8-string ]; - jailbreak = true; homepage = "https://github.com/tolysz/postgresql-simple-typed"; description = "Typed extension for PostgreSQL simple"; license = stdenv.lib.licenses.bsd3; @@ -99263,24 +99210,25 @@ self: { "postgrest" = callPackage ({ mkDerivation, aeson, base, base64-string, bcrypt, blaze-builder - , bytestring, case-insensitive, containers, convertible, hasql - , hasql-backend, hasql-postgres, hlint, hspec, hspec-wai - , hspec-wai-json, HTTP, http-media, http-types, MissingH, mtl - , network, network-uri, optparse-applicative, packdeps, process - , QuickCheck, Ranged-sets, regex-base, regex-tdfa, regex-tdfa-text - , resource-pool, scientific, split, string-conversions - , stringsearch, text, time, transformers, unordered-containers - , vector, wai, wai-cors, wai-extra, wai-middleware-static, warp + , bytestring, case-insensitive, cassava, containers, convertible + , hasql, hasql-backend, hasql-postgres, heredoc, hlint, hspec + , hspec-wai, hspec-wai-json, HTTP, http-media, http-types, MissingH + , mtl, network, network-uri, optparse-applicative, packdeps + , process, QuickCheck, Ranged-sets, regex-base, regex-tdfa + , regex-tdfa-text, resource-pool, scientific, split + , string-conversions, stringsearch, text, time, transformers + , unordered-containers, vector, wai, wai-cors, wai-extra + , wai-middleware-static, warp }: mkDerivation { pname = "postgrest"; - version = "0.2.7.0"; - sha256 = "1mr7wka4kxxmpnhw9p49a4vh68iavrh74shc712z17gmr9yahvcx"; + version = "0.2.8.0"; + sha256 = "1hmscdlg89r65q0i43ll22kb6iy9ryx6gmfxk795h8wsrk2f18sw"; isLibrary = false; isExecutable = true; buildDepends = [ aeson base base64-string bcrypt blaze-builder bytestring - case-insensitive containers convertible hasql hasql-backend + case-insensitive cassava containers convertible hasql hasql-backend hasql-postgres HTTP http-types MissingH mtl network network-uri optparse-applicative Ranged-sets regex-base regex-tdfa regex-tdfa-text resource-pool scientific split string-conversions @@ -99289,14 +99237,16 @@ self: { ]; testDepends = [ aeson base base64-string bcrypt blaze-builder bytestring - case-insensitive containers convertible hasql hasql-backend - hasql-postgres hlint hspec hspec-wai hspec-wai-json HTTP http-media - http-types MissingH mtl network network-uri optparse-applicative - packdeps process QuickCheck Ranged-sets regex-base regex-tdfa - regex-tdfa-text resource-pool scientific split string-conversions - stringsearch text time transformers unordered-containers vector wai - wai-cors wai-extra wai-middleware-static warp + case-insensitive cassava containers convertible hasql hasql-backend + hasql-postgres heredoc hlint hspec hspec-wai hspec-wai-json HTTP + http-media http-types MissingH mtl network network-uri + optparse-applicative packdeps process QuickCheck Ranged-sets + regex-base regex-tdfa regex-tdfa-text resource-pool scientific + split string-conversions stringsearch text time transformers + unordered-containers vector wai wai-cors wai-extra + wai-middleware-static warp ]; + jailbreak = true; homepage = "https://github.com/begriffs/postgrest"; description = "REST API for any Postgres database"; license = stdenv.lib.licenses.mit; @@ -100017,6 +99967,7 @@ self: { ]; description = "A Perl printf like formatter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "printxosd" = callPackage @@ -100404,6 +100355,7 @@ self: { editedCabalFile = "ac8ac15500d9a5f4c678489d77c6abea03b24a704ceb235eecf9f49ef08da757"; buildDepends = [ base contravariant profunctors template-haskell ]; testDepends = [ base profunctors ]; + jailbreak = true; homepage = "https://github.com/tomjaguarpaw/product-profunctors"; description = "product-profunctors"; license = stdenv.lib.licenses.bsd3; @@ -100480,8 +100432,8 @@ self: { }: mkDerivation { pname = "profunctors"; - version = "5.0.1"; - sha256 = "1n6lk1r10j5ssb88ia13zll1k2gsakvf314m51sz3nzmdcgx03ll"; + version = "5.1"; + sha256 = "0jw563wi9j4l5521jc5lr1apx2msh987r0pbpn3zqhb8c8gqgrgw"; buildDepends = [ base comonad distributive tagged transformers ]; homepage = "http://github.com/ekmett/profunctors/"; description = "Profunctors"; @@ -100801,8 +100753,8 @@ self: { }: mkDerivation { pname = "protobuf"; - version = "0.2.0.4"; - sha256 = "0gg678cb1psgdsjzv9x7mhcjmywj8bgzmp9pd850d3p9zyiw9l2j"; + version = "0.2.1.0"; + sha256 = "0i8hjrj6jycqmq7i1wl0kr9s17g4qfyc0gfwcbhbv70yxwf499di"; buildDepends = [ base bytestring cereal data-binary-ieee754 deepseq mtl text unordered-containers @@ -101820,16 +101772,16 @@ self: { "quandl-api" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring - , http-conduit, http-types, old-locale, syb, text, time + , http-conduit, http-types, syb, text, time, time-locale-compat , unordered-containers }: mkDerivation { pname = "quandl-api"; - version = "0.2.0.0"; - sha256 = "1h6gh9wssb8dw9r5f7caanxq542d0jw9shvp7wx0i1k47f54kb3k"; + version = "0.2.1.0"; + sha256 = "01mjwg7myal3hc98s7v582ycabv7qx2j6lcsyvhxbmhzs1wl8sqf"; buildDepends = [ - aeson base blaze-builder bytestring http-conduit http-types - old-locale syb text time unordered-containers + aeson base blaze-builder bytestring http-conduit http-types syb + text time time-locale-compat unordered-containers ]; homepage = "https://github.com/pvdbrand/quandl-api"; description = "Quandl.com API library"; @@ -102213,6 +102165,7 @@ self: { homepage = "http://www.github.com/massysett/quickpull"; description = "Generate Main module with QuickCheck tests"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickset" = callPackage @@ -103476,13 +103429,12 @@ self: { }: mkDerivation { pname = "record"; - version = "0.3.1.1"; - sha256 = "08rmxy2hy19jz614ml5qfwhmdnhfs0qllgk65p0p7bb4v65cg5s9"; + version = "0.3.1.2"; + sha256 = "02kpi21l2kwysk8qgxgl10ngqnmc0mx50qxf9jq0fmi8rv3fm9xp"; buildDepends = [ attoparsec base base-prelude template-haskell text transformers ]; testDepends = [ base base-prelude directory doctest filepath ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/record"; description = "First class records implemented with quasi-quotation"; license = stdenv.lib.licenses.mit; @@ -105196,20 +105148,19 @@ self: { "repl-toolkit" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, directory - , exceptions, functor-monadic, ListLike, listsafe, monad-loops, mtl - , numericpeano, parsec, semigroupoids, system-filepath, text + , exceptions, filepath, functor-monadic, ListLike, listsafe + , monad-loops, mtl, numericpeano, parsec, semigroupoids, text , transformers }: mkDerivation { pname = "repl-toolkit"; - version = "0.4.0.0"; - sha256 = "1r4gyj3jjm9sv597zlksckg5cl9r2k633hz5avzczf92b0j4ikr3"; + version = "0.5.0.0"; + sha256 = "0m0jh734zfmxc2bfilb1ka12y3nhsm94hxcg0q6wwf6bxkl564vq"; buildDepends = [ - aeson base bytestring data-default directory exceptions + aeson base bytestring data-default directory exceptions filepath functor-monadic ListLike listsafe monad-loops mtl numericpeano - parsec semigroupoids system-filepath text transformers + parsec semigroupoids text transformers ]; - jailbreak = true; homepage = "https://github.com/ombocomp/repl-toolkit"; description = "Toolkit for quickly whipping up config files and command-line interfaces"; license = stdenv.lib.licenses.asl20; @@ -105510,10 +105461,8 @@ self: { }: mkDerivation { pname = "resourcet"; - version = "1.1.4.1"; - revision = "1"; - sha256 = "1qw9bjr22g8a1fr84cmwjqpqs7cfc8iagix4s618snrg1r1gp6p2"; - editedCabalFile = "28106769e7204b32cfdfb46603990697cfef6f1a9e720d47ec76873edfb06ad7"; + version = "1.1.5"; + sha256 = "063v7xfhwqgf1yvdiidg4anx38nfvgcwb0sqim5rcbqhz0fmkypy"; buildDepends = [ base containers exceptions lifted-base mmorph monad-control mtl transformers transformers-base transformers-compat @@ -105787,6 +105736,7 @@ self: { jailbreak = true; description = "Convert between camel case and separated words style"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "resumable-exceptions" = callPackage @@ -106275,6 +106225,64 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rivet" = callPackage + ({ mkDerivation, base, rivet-core, rivet-simple-deploy }: + mkDerivation { + pname = "rivet"; + version = "0.1.0.0"; + sha256 = "1hiwgn0xyl42y9cmmc25464y42w7grf68xv8cvjznwzv0v1v63cg"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base rivet-core rivet-simple-deploy ]; + homepage = "https://github.com/dbp/rivet"; + description = "A project management tool for Haskell applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "rivet-core" = callPackage + ({ mkDerivation, base, configurator, directory, directory-tree + , filepath, postgresql-simple, process, shake, template-haskell + , text, time, unordered-containers + }: + mkDerivation { + pname = "rivet-core"; + version = "0.1.0.1"; + sha256 = "102zgb1ryfl341h8r9hxm9zbmg8jq67bkn57hxhnfsjxv7952x21"; + buildDepends = [ + base configurator directory directory-tree filepath + postgresql-simple process shake template-haskell text time + unordered-containers + ]; + homepage = "https://github.com/dbp/rivet"; + description = "Core library for project management tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "rivet-migration" = callPackage + ({ mkDerivation, base, postgresql-simple, text }: + mkDerivation { + pname = "rivet-migration"; + version = "0.1.0.0"; + sha256 = "1ki6jk2shxh9r4kzpn1bsa1a7jc8vvpgigv4gg87sialr2k0f4zr"; + buildDepends = [ base postgresql-simple text ]; + jailbreak = true; + homepage = "https://github.com/dbp/rivet"; + description = "Postgresql migration support for project management tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "rivet-simple-deploy" = callPackage + ({ mkDerivation, base, configurator, mtl, rivet-core, text }: + mkDerivation { + pname = "rivet-simple-deploy"; + version = "0.1.0.0"; + sha256 = "1003sm8mpnc7l7fbp1j08cvc55va54arp6j0qdg2cc2m8cy5bpxf"; + buildDepends = [ base configurator mtl rivet-core text ]; + homepage = "https://github.com/dbp/rivet"; + description = "Basic deployment support for project management tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rmonad" = callPackage ({ mkDerivation, base, containers, HUnit, suitable, test-framework , test-framework-hunit, transformers @@ -109832,6 +109840,7 @@ self: { jailbreak = true; description = "Use Pandoc to render servant API documentation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-pool" = callPackage @@ -111512,8 +111521,8 @@ self: { }: mkDerivation { pname = "simple-sendfile"; - version = "0.2.18"; - sha256 = "1dc7c4bkcwzfhbm982svi9j6dzxxf0z6pjkdrs23m9bc9g8aly49"; + version = "0.2.19"; + sha256 = "1qg97j4rm1wksdni29vrrra3rgff04afaadb58q8g1yy2w4lh5a5"; buildDepends = [ base bytestring network unix ]; testDepends = [ base bytestring conduit conduit-extra directory hspec HUnit network @@ -112388,6 +112397,7 @@ self: { homepage = "https://github.com/leepike/SmartCheck"; description = "A smarter QuickCheck"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smartconstructor" = callPackage @@ -115413,6 +115423,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stable-heap" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "stable-heap"; + version = "0.1.0.0"; + sha256 = "14wx42lmk2vd6v356q5cbd78y9xdnmkwcn6ddpnkyzq331hk23s1"; + buildDepends = [ base ]; + homepage = "http://hub.darcs.net/jmcarthur/stable-heap"; + description = "Purely functional stable heaps (fair priority queues)"; + license = stdenv.lib.licenses.mit; + }) {}; + "stable-maps" = callPackage ({ mkDerivation, base, containers, ghc-prim }: mkDerivation { @@ -115665,8 +115687,8 @@ self: { }: mkDerivation { pname = "stackage-sandbox"; - version = "0.1.3"; - sha256 = "0nkar4nax7h7hp5lmwi98inzy5pyg9sr819rhf78c27vjdmimrjr"; + version = "0.1.4"; + sha256 = "0y6m2ph1pgzlncirngbid7igdwkiv7yxcj27cgm0xpq8ii4lsq4x"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -118605,6 +118627,7 @@ self: { homepage = "https://github.com/d12frosted/CanonicalPath"; description = "Abstract data type for canonical paths with some utilities"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "system-command" = callPackage @@ -120627,8 +120650,8 @@ self: { }: mkDerivation { pname = "test-framework-th-prime"; - version = "0.0.7"; - sha256 = "056d66jk7gn0ghsb75f2kpspws0gs1w9vnw0ywpq6kbskv992v0p"; + version = "0.0.8"; + sha256 = "0gb7bpdxzsd8fnh4ck4p1ks7nxrk7fsw97x90d4zjds5hnw3hchr"; buildDepends = [ base cpphs haskell-src-exts template-haskell test-framework ]; @@ -120672,8 +120695,8 @@ self: { }: mkDerivation { pname = "test-sandbox"; - version = "0.1.4"; - sha256 = "1x7vsi1brrdj71gwszc75qz159y8i4xln9dpcnxf70xjlswjmiqj"; + version = "0.1.5"; + sha256 = "1cknqblzf2wqq46casmfq00lx4zh3y9g07bqsbchxbq4xmd000js"; buildDepends = [ base bytestring cereal containers data-default directory filepath lifted-base monad-control monad-loops mtl network process random @@ -130064,6 +130087,7 @@ self: { ]; description = "A simple cache for serving static files in a WAI middleware"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-static-pages" = callPackage @@ -130325,6 +130349,7 @@ self: { jailbreak = true; description = "Opinionated filesystem watcher"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "watchit" = callPackage @@ -130722,8 +130747,8 @@ self: { }: mkDerivation { pname = "webcrank"; - version = "0.2.0.1"; - sha256 = "0l6mc3gyflb0lqmcs5x0nc3r5szyf4ig6y268f7crp74h05mvnlr"; + version = "0.2.1"; + sha256 = "0px4dy4crivkga0h2ca9j6fxlzwyl8qm8xzd2xyllqm2gzvcc3l7"; buildDepends = [ attoparsec base blaze-builder bytestring case-insensitive either exceptions http-date http-media http-types lens mtl semigroups text @@ -132458,12 +132483,11 @@ self: { }: mkDerivation { pname = "xdot"; - version = "0.2.4.6"; - sha256 = "123vygzkqlycc298zh3321y7w85xnynbavzqms6cb8zgzya42wrs"; + version = "0.2.4.7"; + sha256 = "1izf892748g7f1h4m49d52zkbzfv164r4zyqss5lsbh3brh15v3g"; isLibrary = true; isExecutable = true; buildDepends = [ base cairo graphviz gtk mtl polyparse text ]; - jailbreak = true; description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -134005,13 +134029,12 @@ self: { }: mkDerivation { pname = "yaml-light-lens"; - version = "0.3.1.9"; - sha256 = "0gxwa792g2nbgm2j6gl478qq5vgr06z6zzbbxranvh5fq7pq6al5"; + version = "0.3.1.10"; + sha256 = "1hpjzml8bw5n4lv82x3j6h8dzkz53mbhhsc7dhp79hwn75nq3aiz"; buildDepends = [ base bytestring bytestring-lexing containers lens yaml-light ]; testDepends = [ base doctest ]; - jailbreak = true; description = "Lens interface to yaml-light"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -135347,6 +135370,7 @@ self: { homepage = "https://github.com/docmunch/yesod-routes-typescript"; description = "generate TypeScript routes for Yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-rst" = callPackage From 807146cf751976103724a612ed369eb86cf7a3c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 8 Feb 2015 13:22:13 +0100 Subject: [PATCH 338/615] haskell-ng: make overrideScope respect the default lookup scope Build environments created by overrideScope lost the ability to find packages outside of the Haskell package set without help. This patch remedies this issue. Fixes https://github.com/NixOS/nixpkgs/issues/6192. --- pkgs/development/haskell-modules/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index e4e077def96f..6bfe92e43385 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -42,11 +42,11 @@ let }); callPackageWithScope = scope: drv: args: (stdenv.lib.callPackageWith scope drv args) // { - overrideScope = f: callPackageWithScope (fix (extend scope.__unfix__ f)) drv args; + overrideScope = f: callPackageWithScope (mkScope (fix (extend scope.__unfix__ f))) drv args; }; - defaultScope = pkgs // pkgs.xlibs // pkgs.gnome // self; - callPackage = drv: args: callPackageWithScope defaultScope drv args; + mkScope = scope: pkgs // pkgs.xlibs // pkgs.gnome // scope; + callPackage = drv: args: callPackageWithScope (mkScope self) drv args; in import ./hackage-packages.nix { inherit pkgs stdenv callPackage; } self // { From b9152b89c2a89e36468d0c4e0de7ed0177d8376e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 May 2015 10:55:29 +0200 Subject: [PATCH 339/615] haskell-ng: reduce memory requirements of overrideScope by improved sharing With this patch applied, "nix-env -qaP -A haskellngPackages" succeeds fine without running out of memory. Thanks to @bennofs for catching this in https://github.com/peti/nixpkgs/commit/bbb422af92305137a12e898c406a3b11371c264c#commitcomment-11235596. --- pkgs/development/haskell-modules/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 6bfe92e43385..62d74b0ac7d4 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -46,7 +46,8 @@ let }; mkScope = scope: pkgs // pkgs.xlibs // pkgs.gnome // scope; - callPackage = drv: args: callPackageWithScope (mkScope self) drv args; + defaultScope = mkScope self; + callPackage = drv: args: callPackageWithScope defaultScope drv args; in import ./hackage-packages.nix { inherit pkgs stdenv callPackage; } self // { From c959a59f47c49a4a76bb9c39516397e7874cd412 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 May 2015 11:46:40 +0200 Subject: [PATCH 340/615] haskell-snap: jailbreak to fix build with current attoparsec and lens libraries --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a71fa7fe92ee..703fda23f369 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -813,4 +813,9 @@ self: super: { cheapskate = markBrokenVersion "0.1.0.3" super.cheapskate; lit = dontDistribute super.lit; + # https://github.com/snapframework/snap/issues/148 + snap = overrideCabal super.snap (drv: { + patchPhase = "sed -i -e 's|attoparsec.*>=.*,|attoparsec,|' -e 's|lens.*>=.*|lens|' snap.cabal"; + }); + } From a14ebb03d9cee3e08d754ad93b868c0157691508 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 May 2015 12:25:22 +0200 Subject: [PATCH 341/615] haskell-gitlib: mark build as broken https://github.com/jwiegley/gitlib/issues/46 --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 703fda23f369..c9075ac313d6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -818,4 +818,9 @@ self: super: { patchPhase = "sed -i -e 's|attoparsec.*>=.*,|attoparsec,|' -e 's|lens.*>=.*|lens|' snap.cabal"; }); + # https://github.com/jwiegley/gitlib/issues/46 + gitlib = markBroken super.gitlib; + gitlib-sample = dontDistribute super.gitlib-sample; + gitlib-test = dontDistribute super.gitlib-test; + } From b2d483f14625263b16af51d7bae744d75c5e7c0c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 May 2015 12:29:10 +0200 Subject: [PATCH 342/615] haskell-Saturnin: test suite has undeclared build-time dependencies --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c9075ac313d6..8a443cce5137 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -823,4 +823,7 @@ self: super: { gitlib-sample = dontDistribute super.gitlib-sample; gitlib-test = dontDistribute super.gitlib-test; + # https://github.com/yaccz/saturnin/issues/3 + Saturnin = dontCheck super.Saturnin; + } From 3cdd27cbe69d8fec2766ccb413fbf0944983310b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 May 2015 12:32:02 +0200 Subject: [PATCH 343/615] haskell-binary: version 0.7.4.0 can't compile its test suite --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8a443cce5137..1f2bbdb6f71c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -826,4 +826,7 @@ self: super: { # https://github.com/yaccz/saturnin/issues/3 Saturnin = dontCheck super.Saturnin; + # https://github.com/kolmodin/binary/issues/74 + binary_0_7_4_0 = dontCheck super.binary_0_7_4_0; + } From 7268605e00f4af6e02becf6f951eac2f76a49cbc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 May 2015 12:40:55 +0200 Subject: [PATCH 344/615] idris: remove outdated overrides The Idris build is broken for several reasons, I'm afraid, and has been broken since a while. It' seems unnecessary to carry these non-functioning overrides around. --- .../haskell-modules/configuration-ghc-7.8.x.nix | 10 ---------- 1 file changed, 10 deletions(-) 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 660fc5d9a4eb..b7430c455b1c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -48,16 +48,6 @@ self: super: { # haddock-api 2.16 requires ghc>=7.10 haddock-api = super.haddock-api_2_15_0_2; - # Idris needs special version of some libraries - idris = let super1 = super; in overrideCabal (super.idris.overrideScope (self: super: { - annotated-wl-pprint = self.annotated-wl-pprint_0_5_3; - blaze-html = self.blaze-html_0_7_0_3; - blaze-markup = self.blaze-markup_0_6_2_0; - lens = self.lens_4_7_0_1; - })) (drv: { - patchPhase = "find . -name '*.hs' -exec sed -i -s 's|-Werror||' {} +"; - }); # warning: "Module ‘Control.Monad.Error’ is deprecated" - # This is part of bytestring in our compiler. bytestring-builder = dontHaddock super.bytestring-builder; From 2dc73b0e88894a08fc76e1f70ad6eef74eada34f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 May 2015 14:07:48 +0200 Subject: [PATCH 345/615] Drop obsolete overrides for old versions of annotated-wl-pprint and lens. --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index e5717ba899f8..e50567efc290 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -291,7 +291,6 @@ self: super: { # Broken with GHC 7.10.x. aeson_0_7_0_6 = markBroken super.aeson_0_7_0_6; - annotated-wl-pprint_0_5_3 = markBroken super.annotated-wl-pprint_0_5_3; c2hs_0_20_1 = markBroken super.c2hs_0_20_1; Cabal_1_20_0_3 = markBroken super.Cabal_1_20_0_3; cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0; @@ -299,7 +298,6 @@ self: super: { control-monad-free_0_5_3 = markBroken super.control-monad-free_0_5_3; equivalence_0_2_5 = markBroken super.equivalence_0_2_5; haddock-api_2_15_0_2 = markBroken super.haddock-api_2_15_0_2; - lens_4_7_0_1 = markBroken super.lens_4_7_0_1; optparse-applicative_0_10_0 = markBroken super.optparse-applicative_0_10_0; QuickCheck_1_2_0_1 = markBroken super.QuickCheck_1_2_0_1; seqid-streams_0_1_0 = markBroken super.seqid-streams_0_1_0; From 54db9d427db1be8868db9ec9f5c4ee8ec10651df Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 May 2015 15:22:11 +0200 Subject: [PATCH 346/615] ghc-6.x: mark broken because of https://github.com/NixOS/nixpkgs/issues/7810 6.10.4 and 6.12.3 are broken because they need 6.10.2-binary for bootstrapping. --- pkgs/development/compilers/ghc/6.10.2-binary.nix | 10 ++++++++-- pkgs/development/compilers/ghc/6.10.4.nix | 1 + pkgs/development/compilers/ghc/6.12.3.nix | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index 1e755ab6c0cc..3a649c2420a9 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -97,6 +97,12 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; - meta.license = stdenv.lib.licenses.bsd3; - meta.platforms = ["x86_64-linux" "i686-linux"]; + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + license = stdenv.lib.licenses.bsd3; + platforms = ["x86_64-linux" "i686-linux"]; + broken = true; # https://github.com/NixOS/nixpkgs/issues/7810 + }; + } diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix index d8157673fbc3..0df0ef27ca04 100644 --- a/pkgs/development/compilers/ghc/6.10.4.nix +++ b/pkgs/development/compilers/ghc/6.10.4.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { description = "The Glasgow Haskell Compiler"; platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. inherit (ghc.meta) license; + broken = true; # https://github.com/NixOS/nixpkgs/issues/7810 }; } diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix index f6beaf3a0067..499f1db79bac 100644 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ b/pkgs/development/compilers/ghc/6.12.3.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. inherit (ghc.meta) license; + broken = true; # https://github.com/NixOS/nixpkgs/issues/7810 }; } From a65fd950c35f5f8261548632576fe7605b663c12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 May 2015 15:40:11 +0200 Subject: [PATCH 347/615] haskell-harp: mark as broken --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ++++ 1 file changed, 4 insertions(+) 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 e50567efc290..bfd2e89fa8e7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -309,4 +309,8 @@ self: super: { # https://github.com/HugoDaniel/RFC3339/issues/14 timerep = dontCheck super.timerep; + # Upstream has no issue tracker. + harp = markBrokenVersion "0.4" super.harp; + happstack-authenticate = dontDistribute super.happstack-authenticate; + } From 61224338fffafe4a36a70f0d0c94d18a2d996874 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 May 2015 15:54:41 +0200 Subject: [PATCH 348/615] cabal2nix: update to version 20150518 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index d933b97d1c11..73b115083745 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "cabal2nix"; - version = "20150505"; + version = "20150518"; src = fetchgit { url = "http://github.com/NixOS/cabal2nix.git"; - rev = "db53ac3a644eebda581c9f036ccd55a19ff3c629"; - sha256 = "1bimja9qsq865dmpjpy5wxxz43rc8wk9yva58l7hydmm87a4ch8y"; + rev = "bf850da9044b16efb9ef06a05c645fa981513444"; + sha256 = "0kwiwakff1iaglf7mfvz096smqi73pgcfd975dvp5w1cd8yazd73"; deepClone = true; }; isExecutable = true; From ae444ea4c4e12853e9791d6c567964e345fea922 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 18 May 2015 04:21:50 +0000 Subject: [PATCH 349/615] agda: Remove `extraBuildFlags` This is unused, future users can just use override `buildFlags` and extend/replace as needed. `includeDirs` is provided for this purpose. We should add `dirOf self.everythingFile` rather than `.`, but `dirOf` breaks on relative paths so that is not an option. --- pkgs/build-support/agda/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index d268bc3b122a..a513d50d04c7 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -21,7 +21,6 @@ in sourceDirectories = filter (y: !(y == null)) x.sourceDirectories; propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs; propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs; - extraBuildFlags = filter (y : ! (y == null)) x.extraBuildFlags; everythingFile = if x.everythingFile == "" then "Everything.agda" else x.everythingFile; }; @@ -50,11 +49,11 @@ in # would make a direct copy of the whole thing. topSourceDirectories = [ "src" ]; - # Extra stuff to pass to the Agda binary. - extraBuildFlags = [ "-i ." ]; - buildFlags = let r = map (x: "-i " + x + "/share/agda") self.buildDepends; - d = map (x : "-i " + x) (self.sourceDirectories ++ self.topSourceDirectories); - in unwords (r ++ d ++ self.extraBuildFlags); + # FIXME: `dirOf self.everythingFile` is what we really want, not hardcoded "./" + includeDirs = let r = map (x: x + "/share/agda") self.buildDepends; + d = self.sourceDirectories ++ self.topSourceDirectories; + in r ++ d ++ [ "." ]; + buildFlags = unwords (map (x: "-i " + x) self.includeDirs); # We expose this as a mere convenience for any tools. AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDepends; From 92398e92ffd44efba0f18ed6bb3a0c1dd7911abb Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 14 May 2015 19:27:07 -0700 Subject: [PATCH 350/615] goPackages: Standardize source of built ins --- pkgs/top-level/go-packages.nix | 46 ++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 3b7e8f3cc967..44da3e7e8367 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -14,7 +14,7 @@ let crypto = buildGoPackage rec { rev = "4d48e5fa3d62b5e6e71260571bf76c767198ca02"; - name = "go-crypto-${rev}"; + name = "crypto-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "golang.org/x/crypto"; goPackageAliases = [ "code.google.com/p/go.crypto" ]; disabled = isGo13; @@ -29,8 +29,9 @@ let glog = buildGoPackage rec { rev = "44145f04b68cf362d9c4df2182967c2275eaefed"; - name = "glog-${rev}"; + name = "glog-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/golang/glog"; + src = fetchFromGitHub { inherit rev; owner = "golang"; @@ -40,18 +41,20 @@ let }; image = buildGoPackage rec { - rev = "490b1ad139b3"; - name = "go.image-${rev}"; - goPackagePath = "code.google.com/p/go.image"; - src = fetchhg { + rev = "d8e202c6ce59fad0017414839b6648851d10767e"; + name = "image-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "golang.org/x/image"; + + src = fetchFromGitHub { inherit rev; - url = "https://${goPackagePath}"; - sha256 = "02m6ifwby2fi88njarbbb6dimwg0pd2b6llkgyadh4b9wzp2vy4r"; + owner = "golang"; + repo = "image"; + sha256 = "0cxymm28rgbzsk76d19wm8fwp40dkwxhzmmdjnbkw5541272339l"; }; }; net = buildGoPackage rec { - rev = "e0403b4e005737430c05a57aac078479844f919c"; + rev = "d1d694760b7a3a9fa32e4d1c49e08b2d672221d8"; name = "net-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "golang.org/x/net"; goPackageAliases = [ "code.google.com/p/go.net" ]; @@ -60,7 +63,7 @@ let inherit rev; owner = "golang"; repo = "net"; - sha256 = "1g7cjzw4g4301a3yqpbk8n1d4s97sfby2aysl275x04g0zh8jxqp"; + sha256 = "1fk62vjxsyca8hmlpca9rkgy8wqg9zw920d56ib442sjn9ys3zic"; }; propagatedBuildInputs = [ text ]; @@ -87,8 +90,8 @@ let protobuf = buildGoPackage rec { - rev = "efd7476481382c195beb33acd8ec2f1527167fb4"; - name = "goprotobuf-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "39e27fc0f226450c58e11eda145b542bc5dff3fe"; + name = "protobuf-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/golang/protobuf"; goPackageAliases = [ "code.google.com/p/goprotobuf" ]; @@ -96,10 +99,8 @@ let inherit rev; owner = "golang"; repo = "protobuf"; - sha256 = "1wc3m4jpsdmmqdcf2isc9913mmwfyv791c0rd26kpjjwynh5dhdm"; + sha256 = "12l036ix0dc8hg35xrqmdcr3bpwncrdkgqkhp3s90w6a3qpva3gs"; }; - - subPackages = [ "proto" "protoc-gen-go" ]; }; text = buildGoPackage rec { @@ -117,15 +118,16 @@ let tools = buildGoPackage rec { - rev = "140fcaadc5860b1a014ec69fdeec807fe3b787e8"; - name = "go.tools-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "code.google.com/p/go.tools"; - src = fetchhg { + rev = "7d75e8b219c3efda2d08ae38acd6b42f8da4f5f9"; + name = "tools-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "golang.org/x/tools"; + + src = fetchFromGitHub { inherit rev; - url = "http://code.google.com/p/go.tools"; - sha256 = "1vgz4kxy0p56qh6pfbs2c68156hakgx4cmrci9jbg7lnrdaz4y56"; + owner = "golang"; + repo = "tools"; + sha256 = "0vq0l3pjhgsp97v6ndlr3jcs029r5zilwai30snwfq74s580sriq"; }; - subPackages = [ "go/vcs" ]; }; ## THIRD PARTY From e7d4e7ebce32742923ac4d0cdb2d6a25f53e1a7d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 18 May 2015 09:59:46 -0700 Subject: [PATCH 351/615] go1.4: Decouple tools --- pkgs/development/compilers/go/1.4.nix | 40 +++------ .../compilers/go/remove-tools.patch | 81 +++++++++++++++++++ 2 files changed, 94 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/compilers/go/remove-tools.patch diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 473ff458ff87..1feaf68930ac 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -1,26 +1,19 @@ -{ stdenv, lib, fetchurl, fetchgit, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl, Security }: +{ stdenv, lib, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl, Security, goPackages }: let loader386 = "${glibc}/lib/ld-linux.so.2"; loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2"; loaderArm = "${glibc}/lib/ld-linux.so.3"; - srcs = { - golang = fetchurl { - url = https://github.com/golang/go/archive/go1.4.2.tar.gz; - sha256 = "3e5d07bc5214a1ffe187cf6406c5b5a80ee44f12f6bca97a5463db0afee2f6ac"; - }; - tools = fetchgit { - url = https://github.com/golang/tools.git; - rev = "c836fe615a448dbf9ff5448c1aa657479a0d0aeb"; - sha256 = "0q9jnhmgmm3xzjss7ndsi6nyykmmb1y984n98118c2sipi183xp5"; - }; - }; in -stdenv.mkDerivation { - name = "go-1.4.2"; +stdenv.mkDerivation rec { + name = "go-${version}"; + version = "1.4.2"; - src = srcs.golang; + src = fetchurl { + url = "https://github.com/golang/go/archive/go${version}.tar.gz"; + sha256 = "3e5d07bc5214a1ffe187cf6406c5b5a80ee44f12f6bca97a5463db0afee2f6ac"; + }; # perl is used for testing go vet buildInputs = [ bison bash makeWrapper perl ] @@ -41,9 +34,6 @@ stdenv.mkDerivation { mv * go fi - mkdir -p $out/share/go/src/golang.org/x - cp -r --no-preserve=mode,ownership ${srcs.tools} $out/share/go/src/golang.org/x/tools - cd go patchShebangs ./ # replace /bin/bash @@ -68,7 +58,10 @@ stdenv.mkDerivation { sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c ''; - patches = [ ./cacert-1.4.patch ]; + patches = [ + ./cacert-1.4.patch + ./remove-tools.patch + ]; GOOS = if stdenv.isDarwin then "darwin" else "linux"; GOARCH = if stdenv.isDarwin then "amd64" @@ -91,13 +84,6 @@ stdenv.mkDerivation { export PATH="$GOBIN:$PATH" cd ./src ./all.bash - cd - - - # Build extra tooling - # TODO: Fix godoc tests - TOOL_ROOT=golang.org/x/tools/cmd - go install -v $TOOL_ROOT/cover $TOOL_ROOT/vet $TOOL_ROOT/godoc - go test -v $TOOL_ROOT/cover $TOOL_ROOT/vet # $TOOL_ROOT/godoc ''; setupHook = ./setup-hook.sh; @@ -107,7 +93,7 @@ stdenv.mkDerivation { homepage = http://golang.org/; description = "The Go Programming language"; license = "BSD"; - maintainers = with stdenv.lib.maintainers; [ cstrahan ]; + maintainers = with stdenv.lib.maintainers; [ cstrahan wkennington ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/go/remove-tools.patch b/pkgs/development/compilers/go/remove-tools.patch new file mode 100644 index 000000000000..807ab8e089c1 --- /dev/null +++ b/pkgs/development/compilers/go/remove-tools.patch @@ -0,0 +1,81 @@ +diff --git a/misc/makerelease/makerelease.go b/misc/makerelease/makerelease.go +index 3b511b1..a46ebd8 100644 +--- a/misc/makerelease/makerelease.go ++++ b/misc/makerelease/makerelease.go +@@ -65,9 +65,6 @@ const ( + // These must be the command that cmd/go knows to install to $GOROOT/bin + // or $GOROOT/pkg/tool. + var toolPaths = []string{ +- "golang.org/x/tools/cmd/cover", +- "golang.org/x/tools/cmd/godoc", +- "golang.org/x/tools/cmd/vet", + } + + var preBuildCleanFiles = []string{ +diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c +index b6c61b4..2006bc2 100644 +--- a/src/cmd/dist/build.c ++++ b/src/cmd/dist/build.c +@@ -210,7 +210,9 @@ init(void) + workdir = xworkdir(); + xatexit(rmworkdir); + +- bpathf(&b, "%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch); ++ xgetenv(&b, "GOTOOLDIR"); ++ if (b.len == 0) ++ bpathf(&b, "%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch); + tooldir = btake(&b); + + bfree(&b); +diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go +index b71feb7..8468ea8 100644 +--- a/src/cmd/go/pkg.go ++++ b/src/cmd/go/pkg.go +@@ -401,9 +401,9 @@ var goTools = map[string]targetDir{ + "cmd/pack": toTool, + "cmd/pprof": toTool, + "cmd/yacc": toTool, +- "golang.org/x/tools/cmd/cover": toTool, +- "golang.org/x/tools/cmd/godoc": toBin, +- "golang.org/x/tools/cmd/vet": toTool, ++ "nixos.org/x/tools/cmd/cover": toTool, ++ "nixos.org/x/tools/cmd/godoc": toBin, ++ "nixos.org/x/tools/cmd/vet": toTool, + "code.google.com/p/go.tools/cmd/cover": stalePath, + "code.google.com/p/go.tools/cmd/godoc": stalePath, + "code.google.com/p/go.tools/cmd/vet": stalePath, +diff --git a/src/go/build/build.go b/src/go/build/build.go +index 311ecb0..f151d8f 100644 +--- a/src/go/build/build.go ++++ b/src/go/build/build.go +@@ -1367,7 +1367,7 @@ func init() { + } + + // ToolDir is the directory containing build tools. +-var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) ++var ToolDir = runtime.GOTOOLDIR() + + // IsLocalImport reports whether the import path is + // a local import path, like ".", "..", "./foo", or "../foo". +diff --git a/src/runtime/extern.go b/src/runtime/extern.go +index 6cc5df8..9a9a964 100644 +--- a/src/runtime/extern.go ++++ b/src/runtime/extern.go +@@ -152,6 +152,17 @@ func GOROOT() string { + return defaultGoroot + } + ++// GOTOOLDIR returns the root of the Go tree. ++// It uses the GOTOOLDIR environment variable, if set, ++// or else the root used during the Go build. ++func GOTOOLDIR() string { ++ s := gogetenv("GOTOOLDIR") ++ if s != "" { ++ return s ++ } ++ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH ++} ++ + // Version returns the Go tree's version string. + // It is either the commit hash and date at the time of the build or, + // when possible, a release tag like "go1.3". From 2f897aad70a0902a92f83e8ad4d281ba264143dc Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 18 May 2015 10:11:19 -0700 Subject: [PATCH 352/615] buildGoPackage: Allow excluding of specific modules --- pkgs/development/go-modules/generic/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 2ff1438006f9..1c40c3f87956 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -71,13 +71,15 @@ go.stdenv.mkDerivation ( else (cd go/src find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq | while read d; do - local OUT; + [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && continue + local OUT if ! OUT="$(go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d 2>&1)"; then if ! echo "$OUT" | grep -q 'no buildable Go source files'; then echo "$OUT" >&2 exit 1 fi fi + echo "$OUT" >&2 done) fi From e89f90cd33f1efb7e5d52b74ffc24449968a41b1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 18 May 2015 10:11:52 -0700 Subject: [PATCH 353/615] buildGoPackage: Only create if needed --- pkgs/development/go-modules/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 1c40c3f87956..2b4d59ca7fb5 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -106,7 +106,7 @@ go.stdenv.mkDerivation ( installPhase = args.installPhase or '' runHook preInstall - mkdir $out + mkdir -p $out if [ -z "$dontInstallSrc" ]; then local dir From 6eecaddcedc75dd127f10b72cdba0c7f9b8d8c80 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 18 May 2015 10:12:30 -0700 Subject: [PATCH 354/615] goPackages.tools: Make the build work with the go decoupling --- pkgs/top-level/go-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 44da3e7e8367..7fd57bb74efc 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -122,12 +122,26 @@ let name = "tools-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "golang.org/x/tools"; + preConfigure = '' + # Make the builtin tools available here + mkdir -p $out/bin + eval $(go env | grep GOTOOLDIR) + find $GOTOOLDIR -type f | while read x; do + ln -sv "$x" "$out/bin" + done + export GOTOOLDIR=$out/bin + ''; + + excludedPackages = "testdata"; + src = fetchFromGitHub { inherit rev; owner = "golang"; repo = "tools"; sha256 = "0vq0l3pjhgsp97v6ndlr3jcs029r5zilwai30snwfq74s580sriq"; }; + + buildInputs = [ net ]; }; ## THIRD PARTY From 023aaf8f6dcec62bf498d1e9a08d80ebc7d96835 Mon Sep 17 00:00:00 2001 From: Siarhei Zirukin Date: Mon, 18 May 2015 17:50:50 +0200 Subject: [PATCH 355/615] add package: uni-vga --- pkgs/data/fonts/uni-vga/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/data/fonts/uni-vga/default.nix diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix new file mode 100644 index 000000000000..63f74bb41b4a --- /dev/null +++ b/pkgs/data/fonts/uni-vga/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, mkfontdir, mkfontscale }: + +stdenv.mkDerivation { + name = "uni-vga"; + + src = fetchurl { + url = http://www.inp.nsk.su/~bolkhov/files/fonts/univga/uni-vga.tgz; + sha256 = "05sns8h5yspa7xkl81ri7y1yxf5icgsnl497f3xnaryhx11s2rv6"; + }; + + buildInputs = [ mkfontdir mkfontscale ]; + + installPhase = '' + mkdir -p $out/share/fonts + cp *.bdf $out/share/fonts + cd $out/share/fonts + mkfontdir + mkfontscale + ''; + + meta = { + description = "Unicode VGA font"; + maintainers = [stdenv.lib.maintainers.ftrvxmtrx]; + homepage = http://www.inp.nsk.su/~bolkhov/files/fonts/univga/; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0789bf6e3e8..4c429a3b238d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10211,6 +10211,8 @@ let ucsFonts = callPackage ../data/fonts/ucs-fonts { }; + uni-vga = callPackage ../data/fonts/uni-vga { }; + unifont = callPackage ../data/fonts/unifont { }; vistafonts = callPackage ../data/fonts/vista-fonts { }; From 8dbd385e1cc6f486b8913235ed92e952ae96c16a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 18 May 2015 14:32:29 -0400 Subject: [PATCH 356/615] kernel config: Fix grsecurity-specific config Refs 13a38440c6993438ec7847eb8f00ad66fb3fd946 --- pkgs/os-specific/linux/kernel/common-config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 4f3813f6ed87..25b707614ed0 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -234,7 +234,7 @@ with stdenv.lib; # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default - ${optionalString (!features.grsecurity or true) '' + ${optionalString (!(features.grsecurity or false)) '' DEVKMEM n # Disable /dev/kmem ''} ${if versionOlder version "3.14" then '' @@ -380,7 +380,7 @@ with stdenv.lib; # Virtualisation. PARAVIRT? y - ${optionalString (!features.grsecurity or true) + ${optionalString (!(features.grsecurity or false)) (if versionAtLeast version "3.10" then '' HYPERVISOR_GUEST y '' else '' From 8e48f0928425c53dd8ded131bd3732eddb79715c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 May 2015 19:40:01 +0200 Subject: [PATCH 357/615] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/6ccfe7a3207e9e88547bc33fb4728f9a7313414b with hackage2nix revision d339b0fe58a504a61db589362b73992a5912304e --- .../haskell-modules/hackage-packages.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 328e0fcb966e..074145a93545 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -22244,7 +22244,9 @@ self: { mkDerivation { pname = "aws-kinesis-client"; version = "0.4.0.2"; + revision = "1"; sha256 = "1vygs2qdnwjw8pygbsncc22cq9294hmlbzi2fysi3agva2qxzmwx"; + editedCabalFile = "4bd055f19f3ced5d6f52eec169220d7c5159cfa521128a3118aedecc9c3ad2f3"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22255,6 +22257,7 @@ self: { monad-control mtl nats optparse-applicative random resourcet stm stm-chans stm-queue-extras text transformers unordered-containers ]; + jailbreak = true; description = "A producer & consumer client library for AWS Kinesis"; license = stdenv.lib.licenses.asl20; }) {}; @@ -59150,8 +59153,12 @@ self: { mkDerivation { pname = "hashids"; version = "1.0.2"; + revision = "3"; sha256 = "07qrsabhb825jhdbc4ka35ss7ci07avgvi8jsr69r17bnp87wnma"; + editedCabalFile = "58394f52df9a7e4427962fe1e59eb21cb751b3af58f997453f2b2f34cb9271dc"; buildDepends = [ base bytestring containers split ]; + homepage = "http://hashids.org/"; + description = "Hashids generates short, unique, non-sequential ids from numbers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -126956,15 +126963,15 @@ self: { }) {}; "uri-bytestring" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, derive, HUnit, lens - , QuickCheck, quickcheck-instances, tasty, tasty-hunit - , tasty-quickcheck + ({ mkDerivation, attoparsec, base, blaze-builder, bytestring + , derive, HUnit, lens, QuickCheck, quickcheck-instances, tasty + , tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "uri-bytestring"; - version = "0.1"; - sha256 = "16fvijiaqnrlw8hhv96cnp0qh5sq3bhixihw0k73i6j7wp1wp9i1"; - buildDepends = [ attoparsec base bytestring ]; + version = "0.1.1"; + sha256 = "19nqdv61bsp470m94vq9cdpcyw1q9rwfplmpj09dd5pkmp7f6m8s"; + buildDepends = [ attoparsec base blaze-builder bytestring ]; testDepends = [ attoparsec base bytestring derive HUnit lens QuickCheck quickcheck-instances tasty tasty-hunit tasty-quickcheck @@ -132059,7 +132066,6 @@ self: { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wxAsteroids" = callPackage From 72f54f51e3ef91445cc2a313bb168529b4a89d13 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 May 2015 18:15:55 +0200 Subject: [PATCH 358/615] haskell-graphviz: the test suite build is broken by QuickCheck 2.8 --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bfd2e89fa8e7..c47d29e54bf0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -287,7 +287,7 @@ self: super: { tasty-rerun = dontHaddock (appendConfigureFlag super.tasty-rerun "--ghc-option=-XFlexibleContexts"); # http://hub.darcs.net/ivanm/graphviz/issue/5 - graphviz = appendPatch super.graphviz ./graphviz-fix-ghc710.patch; + graphviz = dontCheck (dontJailbreak (appendPatch super.graphviz ./graphviz-fix-ghc710.patch)); # Broken with GHC 7.10.x. aeson_0_7_0_6 = markBroken super.aeson_0_7_0_6; From 0197da662d8c5d849d6cb83d2f94193e4b409b69 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 May 2015 18:16:38 +0200 Subject: [PATCH 359/615] haskell: enable builds that used to fail because they depend on graphviz --- .../configuration-ghc-7.10.x.nix | 61 +++++++++---------- 1 file changed, 28 insertions(+), 33 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index c47d29e54bf0..1d7eee6d3a44 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -241,39 +241,6 @@ self: super: { hbb = dontDistribute super.hbb; hsdev = dontDistribute super.hsdev; - Graphalyze = dontDistribute super.Graphalyze; - HLearn-approximation = dontDistribute super.HLearn-approximation; - HLearn-classification = dontDistribute super.HLearn-classification; - HLearn-distributions = dontDistribute super.HLearn-distributions; - SourceGraph = dontDistribute super.SourceGraph; - Zora = dontDistribute super.Zora; - ampersand = dontDistribute super.ampersand; - caffegraph = dontDistribute super.caffegraph; - dot2graphml = dontDistribute super.dot2graphml; - dvda = dontDistribute super.dvda; - erd = dontDistribute super.erd; - filediff = dontDistribute super.filediff; - fsmActions = dontDistribute super.fsmActions; - gbu = dontDistribute super.gbu; - geni-gui = dontDistribute super.geni-gui; - ghc-vis = dontDistribute super.ghc-vis; - grammar-combinators = dontDistribute super.grammar-combinators; - llvm-analysis = dontDistribute super.llvm-analysis; - llvm-base-types = dontDistribute super.llvm-base-types; - llvm-data-interop = dontDistribute super.llvm-data-interop; - llvm-tools = dontDistribute super.llvm-tools; - marxup = dontDistribute super.marxup; - mathgenealogy = dontDistribute super.mathgenealogy; - optimusprime = dontDistribute super.optimusprime; - phybin = dontDistribute super.phybin; - prolog-graph = dontDistribute super.prolog-graph; - prolog-graph-lib = dontDistribute super.prolog-graph-lib; - teams = dontDistribute super.teams; - vacuum-graphviz = dontDistribute super.vacuum-graphviz; - vampire = dontDistribute super.vampire; - visual-graphrewrite = dontDistribute super.visual-graphrewrite; - xdot = dontDistribute super.xdot; - # https://github.com/lymar/hastache/issues/47 hastache = dontCheck super.hastache; @@ -313,4 +280,32 @@ self: super: { harp = markBrokenVersion "0.4" super.harp; happstack-authenticate = dontDistribute super.happstack-authenticate; + # Upstream has no issue tracker. + llvm-base-types = markBroken super.llvm-base-types; + llvm-analysis = dontDistribute super.llvm-analysis; + llvm-data-interop = dontDistribute super.llvm-data-interop; + llvm-tools = dontDistribute super.llvm-tools; + + # Upstream has no issue tracker. + MaybeT = markBroken super.MaybeT; + grammar-combinators = dontDistribute super.grammar-combinators; + + # Required to fix version 0.91.0.0. + wx = dontHaddock (appendConfigureFlag super.wx "--ghc-option=-XFlexibleContexts"); + + # Upstream has no issue tracker. + Graphalyze = markBroken super.Graphalyze; + gbu = dontDistribute super.gbu; + SourceGraph = dontDistribute super.SourceGraph; + + # Upstream has no issue tracker. + markBroken = super.protocol-buffers; + caffegraph = dontDistribute super.caffegraph; + + # Deprecated: https://github.com/mikeizbicki/ConstraintKinds/issues/8 + ConstraintKinds = markBroken super.ConstraintKinds; + HLearn-approximation = dontDistribute super.HLearn-approximation; + HLearn-distributions = dontDistribute super.HLearn-distributions; + HLearn-classification = dontDistribute super.HLearn-classification; + } From c0e2c4809e49dc3954b7994b1052d626cb9ef0c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 May 2015 19:26:56 +0200 Subject: [PATCH 360/615] cabal-install: fix build for GHC 7.0.x and 7.2.x --- pkgs/development/haskell-modules/configuration-common.nix | 1 + pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix | 1 - pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1f2bbdb6f71c..a7b72fa7f9a0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -9,6 +9,7 @@ self: super: { Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3; Cabal_1_22_3_0 = dontCheck super.Cabal_1_22_3_0; cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_3_0; zlib = self.zlib_0_5_4_2; }); + cabal-install_1_18_1_0 = dontCheck (super.cabal-install_1_18_1_0.override { Cabal = self.Cabal_1_18_1_6; zlib = self.zlib_0_5_4_2; }); # Break infinite recursions. Dust-crypto = dontCheck super.Dust-crypto; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index 4686c813b3c5..6e1754c5f3bf 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -48,7 +48,6 @@ self: super: { # Newer versions don't compile. Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6; - cabal-install_1_18_1_0 = super.cabal-install_1_18_1_0.override { Cabal = self.Cabal_1_18_1_6; }; cabal-install = self.cabal-install_1_18_1_0; # Needs Cabal >= 1.18.x. diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index 46a4b0d02e64..4a8d4242bdc9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -45,7 +45,6 @@ self: super: { # Newer versions don't compile. Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6; - cabal-install_1_18_1_0 = super.cabal-install_1_18_1_0.override { Cabal = self.Cabal_1_18_1_6; }; cabal-install = self.cabal-install_1_18_1_0; # https://github.com/tibbe/hashable/issues/85 From ef9cfd3dda9ba1f33cab84e915644cb6e52a9b8b Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sun, 10 May 2015 21:33:00 +0200 Subject: [PATCH 361/615] wine: enable 64bit build for wineStaging --- pkgs/misc/emulators/wine/base.nix | 28 ++++++++++++------------- pkgs/misc/emulators/wine/builder-wow.sh | 1 + pkgs/misc/emulators/wine/default.nix | 21 ++++++++++++------- pkgs/misc/emulators/wine/staging.nix | 19 ++++++++++------- pkgs/misc/emulators/wine/util.nix | 9 ++++++++ pkgs/misc/emulators/wine/versions.nix | 4 ++++ pkgs/top-level/all-packages.nix | 8 +------ 7 files changed, 54 insertions(+), 36 deletions(-) create mode 100644 pkgs/misc/emulators/wine/util.nix diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index ce39740f1133..bf63340d35d0 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -6,30 +6,29 @@ assert stdenv.isLinux; assert stdenv.cc.cc.isGNU or false; +with import ./util.nix { inherit lib; }; + stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { builder = buildScript; -}) // { +}) // rec { inherit name src configureFlags; - buildInputs = lib.concatLists (map (pkgs: (with pkgs; [ - pkgconfig alsaLib ncurses libpng libjpeg lcms2 fontforge libxml2 libxslt - openssl gnutls cups makeWrapper flex bison mesa mesa_noglu.osmesa + buildInputs = toBuildInputs pkgArches (pkgs: with pkgs; [ + pkgconfig alsaLib lcms2 fontforge libxml2 libxslt makeWrapper flex bison + ]); + + nativeBuildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [ + freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses ]) ++ (with pkgs.xlibs; [ xlibs libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite - ])) pkgArches); + ])); # Wine locates a lot of libraries dynamically through dlopen(). Add # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. - NIX_LDFLAGS = map (path: "-rpath ${path}/lib") ([ - stdenv.cc.cc - ] ++ (lib.concatLists (map (pkgs: - (with pkgs; [ - freetype fontconfig mesa mesa_noglu.osmesa libdrm - libpng libjpeg openssl gnutls cups ncurses - ]) ++ (with pkgs.xlibs; [ - libXinerama libXrender libXrandr libXcursor libXcomposite - ])) pkgArches))); + NIX_LDFLAGS = map + (path: "-rpath ${path}/lib") + ([ stdenv.cc.cc ] ++ nativeBuildInputs); # Don't shrink the ELF RPATHs in order to keep the extra RPATH # elements specified above. @@ -51,6 +50,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { enableParallelBuilding = true; + passthru = { inherit pkgArches; }; meta = { inherit version platforms; homepage = "http://www.winehq.org/"; diff --git a/pkgs/misc/emulators/wine/builder-wow.sh b/pkgs/misc/emulators/wine/builder-wow.sh index 9f946f3b71fd..c7d9ed55a3f7 100644 --- a/pkgs/misc/emulators/wine/builder-wow.sh +++ b/pkgs/misc/emulators/wine/builder-wow.sh @@ -3,6 +3,7 @@ source $stdenv/setup unpackPhase +cd $TMP/$sourceRoot patchPhase configureScript=$TMP/$sourceRoot/configure diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 962aee9fb5d9..8b7e438a115f 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -1,15 +1,22 @@ ## Configuration: # Control you default wine config in nixpkgs-config: # wine = { -# release = "stable"; # "stable", "unstable" +# release = "stable"; # "stable", "unstable", "staging" # build = "wineWow"; # "wine32", "wine64", "wineWow" # }; # Make additional configurations on demand: -# wine.overrideConfig { build = "wine32"; }; -{ lib, system, callPackage, +# wine.override { wineBuild = "wine32"; wineRelease = "staging"; }; +{ lib, pkgs, system, callPackage, wineRelease ? "stable", - wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32") }: + wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"), + libtxc_dxtn_Name ? "libtxc_dxtn_s2tc" }: -lib.getAttr wineBuild (callPackage ./packages.nix { - inherit wineRelease; -}) +if wineRelease == "staging" then + callPackage ./staging.nix { + inherit libtxc_dxtn_Name; + wine = lib.getAttr wineBuild (callPackage ./packages.nix { wineRelease = "unstable"; }); + } +else + lib.getAttr wineBuild (callPackage ./packages.nix { + inherit wineRelease; + }) diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index a6ff309b08e3..beea0bb3c125 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchFromGitHub, wine, perl, autoconf, utillinux -, pulseaudio, libtxc_dxtn }: +{ stdenv, callPackage, lib, fetchFromGitHub, wine, libtxc_dxtn_Name }: -let version = "1.7.42"; +with callPackage ./util.nix {}; + +let v = (import ./versions.nix).staging; + inherit (v) version; patch = fetchFromGitHub { + inherit (v) sha256; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; - sha256 = "1qi1hf1w97n17vmj137p7da75g01ky84a3xvs50xrmxb7f62sm17"; }; - + build-inputs = pkgNames: extra: + (mkBuildInputs wine.pkgArches pkgNames) ++ extra; in assert (builtins.parseDrvName wine.name).version == version; stdenv.lib.overrideDerivation wine (self: { - nativeBuildInputs = [ pulseaudio libtxc_dxtn ] ++ self.nativeBuildInputs; - buildInputs = [ perl utillinux autoconf ] ++ self.buildInputs; + nativeBuildInputs = build-inputs [ "pulseaudio" libtxc_dxtn_Name ] self.nativeBuildInputs; + buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs; name = "${self.name}-staging"; @@ -23,7 +26,7 @@ stdenv.lib.overrideDerivation wine (self: { chmod +w patches cd patches patchShebangs gitapply.sh - ./patchinstall.sh DESTDIR=.. --all + ./patchinstall.sh DESTDIR="$TMP/$sourceRoot" --all cd .. ''; }) diff --git a/pkgs/misc/emulators/wine/util.nix b/pkgs/misc/emulators/wine/util.nix new file mode 100644 index 000000000000..b90a68e72df5 --- /dev/null +++ b/pkgs/misc/emulators/wine/util.nix @@ -0,0 +1,9 @@ +{ lib }: +rec { + toPackages = pkgNames: pkgs: + map (pn: lib.getAttr pn pkgs) pkgNames; + toBuildInputs = pkgArches: archPkgs: + lib.concatLists (map archPkgs pkgArches); + mkBuildInputs = pkgArches: pkgNames: + toBuildInputs pkgArches (toPackages pkgNames); +} diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix index e599f04f8575..9ac87ab2e3ba 100644 --- a/pkgs/misc/emulators/wine/versions.nix +++ b/pkgs/misc/emulators/wine/versions.nix @@ -22,4 +22,8 @@ #monoVersion = "0.0.8"; #monoSha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x"; }; + staging = { + version = "1.7.42"; + sha256 = "1qi1hf1w97n17vmj137p7da75g01ky84a3xvs50xrmxb7f62sm17"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c429a3b238d..40a77f8a623d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14461,18 +14461,12 @@ let }; wineStable = wine.override { wineRelease = "stable"; }; wineUnstable = wine.override { wineRelease = "unstable"; }; + wineStaging = wine.override { wineRelease = "staging"; }; winetricks = callPackage ../misc/emulators/wine/winetricks.nix { inherit (gnome2) zenity; }; - ### FIXME integrate wineStaging into 64bit - wineStaging = callPackage_i686 ../misc/emulators/wine/staging.nix { - wine = pkgsi686Linux.wineUnstable; - # Patent issues - libtxc_dxtn = pkgsi686Linux.libtxc_dxtn_s2tc; - }; - wmutils-core = callPackage ../tools/X11/wmutils-core { }; wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { }; From b4c2351806e09cdbff29a1b98b8f2434601c08f6 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Mon, 18 May 2015 19:39:37 +0200 Subject: [PATCH 362/615] wine: unstable 1.7.42 -> 1.7.43 --- pkgs/misc/emulators/wine/versions.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix index 9ac87ab2e3ba..6bebe11d49d1 100644 --- a/pkgs/misc/emulators/wine/versions.nix +++ b/pkgs/misc/emulators/wine/versions.nix @@ -1,7 +1,7 @@ { unstable = { - wineVersion = "1.7.42"; - wineSha256 = "18iv4dsx2p7bk5qhiqqc6fpnnzny9rx8vgbjlpnf3gr0n615qzss"; + wineVersion = "1.7.43"; + wineSha256 = "08kqj02m8xc1ppzhs5y83zzykjnz0qliq495rx1n90ybzyd9pm2k"; geckoVersion = "2.36"; geckoSha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g"; gecko64Version = "2.36"; @@ -23,7 +23,7 @@ #monoSha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x"; }; staging = { - version = "1.7.42"; - sha256 = "1qi1hf1w97n17vmj137p7da75g01ky84a3xvs50xrmxb7f62sm17"; + version = "1.7.43"; + sha256 = "01b7npa8hc2nrv4hm16r9ikic4wd34nbz1lvfhy0ali2jbcsaqqb"; }; } From 2f53355ff67ea26455d4fcedf9f63de5714001a9 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Mon, 18 May 2015 20:29:46 +0200 Subject: [PATCH 363/615] winetricks: 20150316 -> 20150416 --- pkgs/misc/emulators/wine/versions.nix | 4 ++++ pkgs/misc/emulators/wine/winetricks.nix | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix index 6bebe11d49d1..84a3ff8f86d6 100644 --- a/pkgs/misc/emulators/wine/versions.nix +++ b/pkgs/misc/emulators/wine/versions.nix @@ -26,4 +26,8 @@ version = "1.7.43"; sha256 = "01b7npa8hc2nrv4hm16r9ikic4wd34nbz1lvfhy0ali2jbcsaqqb"; }; + winetricks = { + version = "20150416"; + sha256 = "0467cn5hqry6fscjskpvxw0y00lr059jmldv1csicbav4l0dxx8k"; + }; } diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index 34a2a6efbbba..39aaa098cfef 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, wine, perl, which, coreutils, zenity, curl , cabextract, unzip, p7zip, gnused, gnugrep, bash } : -let version = "20150316"; +let v = (import ./versions.nix).winetricks; in stdenv.mkDerivation rec { - name = "winetricks-${version}"; + name = "winetricks-${v.version}"; src = fetchFromGitHub { owner = "Winetricks"; repo = "winetricks"; - rev = version; - sha256 = "00c55jpca6l3v3p02xc0gy5l4xb17gf90282hq5h85nh72kqsbrh"; + rev = v.version; + sha256 = v.sha256; }; buildInputs = [ perl which ]; From 9119103656063726e35815ec773b35516cad7b65 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Mon, 18 May 2015 15:09:24 -0400 Subject: [PATCH 364/615] command-line-tools: Update url --- pkgs/os-specific/darwin/command-line-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/command-line-tools/default.nix b/pkgs/os-specific/darwin/command-line-tools/default.nix index 9bbf5882e5dd..2d1eb7b6b3ca 100644 --- a/pkgs/os-specific/darwin/command-line-tools/default.nix +++ b/pkgs/os-specific/darwin/command-line-tools/default.nix @@ -7,7 +7,7 @@ let src = fetchurl { # Magic url found in: # https://swscan.apple.com/content/catalogs/others/index-10.9-1.sucatalog - url = "http://swcdn.apple.com/content/downloads/27/02/031-06182/yiervn212jfs091cp9hwmb7gjq7ky91crs/${name}.pkg"; + url = "http://swcdn.apple.com/content/downloads/27/02/031-06182/xxog8vxu8i6af781ivf4uhy6yt1lslex34/${name}.pkg"; inherit sha256; }; From 7639474c72ad4de310e0b86db088901021f25736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Mon, 18 May 2015 21:06:35 +0200 Subject: [PATCH 365/615] firmware-linux-nonfree.src: use http:// to enable better availability for proxied users --- .../linux/firmware/firmware-linux-nonfree/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index fa7af6a8c1b6..8ab80ee1e4d0 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2015-05-13"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; + url = "http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; rev = "3161bfa479d5e9ed4f46b57df9bcecbbc4f8eb3c"; sha256 = "0np6vwcnas3pzp38man3cs8j5ijs0p3skyzla19sfxzpwmjvfpjq"; }; From fd588f939cf456f3932619b4a8587731669cc0a7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 18 May 2015 13:04:16 -0700 Subject: [PATCH 366/615] cryptsetup: Use openssl instead of libgcrypt When libgcrypt added support for libcap, it started dropping capabilities of the cryptsetup process. This meant that cryptsetup was unable to communicate with device mapper. This patch fixes that issue by removing the dependency on libgcrypt and instead uses openssl for the implementation of low-level cryptographic functions. Fixes #7859. --- pkgs/os-specific/linux/cryptsetup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 50ea3f6a0675..4e3ede284b45 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt +{ stdenv, fetchurl, devicemapper, openssl, libuuid, pkgconfig, popt , enablePython ? false, python ? null }: @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { sha256 = "0878vwblazms1dac2ds7vyz8pgi1aac8870ccnl2s0v2sv428g62"; }; - configureFlags = [ "--enable-cryptsetup-reencrypt" ] + configureFlags = [ "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" ] ++ stdenv.lib.optional enablePython "--enable-python"; - buildInputs = [ devicemapper libgcrypt libuuid pkgconfig popt ] + buildInputs = [ devicemapper openssl libuuid pkgconfig popt ] ++ stdenv.lib.optional enablePython python; meta = { From d60058af4b5a88ed41ad428645583b720b72ab19 Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Mon, 18 May 2015 13:11:52 -0700 Subject: [PATCH 367/615] lua: update patch for 5.2 on darwin --- .../interpreters/lua-5/5.2.darwin.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/5.2.darwin.patch b/pkgs/development/interpreters/lua-5/5.2.darwin.patch index ffc3ff34be70..b314bd2abac3 100644 --- a/pkgs/development/interpreters/lua-5/5.2.darwin.patch +++ b/pkgs/development/interpreters/lua-5/5.2.darwin.patch @@ -1,27 +1,27 @@ diff --git a/Makefile b/Makefile -index 209a132..9387b09 100644 +index d2c7db4..dc107b3 100644 --- a/Makefile +++ b/Makefile -@@ -43,5 +43,5 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris +@@ -41,7 +41,7 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris # What to install. TO_BIN= lua luac TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp -TO_LIB= liblua.a +TO_LIB= liblua.${version}.dylib TO_MAN= lua.1 luac.1 - + # Lua version and release. -@@ -64,3 +64,5 @@ install: dummy +@@ -63,6 +63,8 @@ install: dummy cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) + ln -s -f liblua.${version}.dylib $(INSTALL_LIB)/liblua.${majorVersion}.dylib + ln -s -f liblua.${majorVersion}.dylib $(INSTALL_LIB)/liblua.dylib - - ranlib: - cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB) + + uninstall: + cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN) diff --git a/src/Makefile b/src/Makefile -index fea895b..d9146d0 100644 +index 7b4b2b7..25001e5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -28,7 +28,7 @@ MYOBJS= From 02e46cacc6b051a31b8f18df2ac7bd3658ac6c85 Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Wed, 13 May 2015 17:03:59 -0500 Subject: [PATCH 368/615] keychain: fixup shebang, use upstream builder, install manpage fixup shebang - build was not running fixupPhase, and shebang was pointing to /bin/sh. On a system where /bin/sh links to dash, this results in errors: /nix/store/v40yk16fl1rhvr6zz91ij753ziyphwwp-keychain-2.8.0/bin/.keychain-wrapped: 59: /nix/store/v40yk16fl1rhvr6zz91ij753ziyphwwp-keychain-2.8.0/bin/.keychain-wrapped: shopt: not found /nix/store/v40yk16fl1rhvr6zz91ij753ziyphwwp-keychain-2.8.0/bin/.keychain-wrapped: 686: /nix/store/v40yk16fl1rhvr6zz91ij753ziyphwwp-keychain-2.8.0/bin/.keychain-wrapped: Syntax error: "(" unexpected (expecting ")") use upstream builder - the include Makefile uses perl to generate a manpage and insert the same text into the keychain script for '--help' output, which was otherwise missing: $ keychain --help * keychain 2.8.0 ~ http://www.funtoo.org [snip] INSERT_POD_OUTPUT_HERE install manpage - self explanatory --- pkgs/tools/misc/keychain/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 1ed6be071a59..0892061a50d0 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg -, procps, gnugrep, gawk, findutils, gnused }: +, perl, procps, gnugrep, gawk, findutils, gnused }: stdenv.mkDerivation rec { name = "keychain-${version}"; @@ -12,15 +12,12 @@ stdenv.mkDerivation rec { sha256 = "0ajas58cv8mp5wb6hn1zhsqiwfxvx69p4f91a5j2as299rxgrxlp"; }; - phases = [ "unpackPhase" "patchPhase" "buildPhase" ]; + buildInputs = [ makeWrapper perl ]; - buildInputs = [ makeWrapper ]; - - patchPhase = "sed -i -e 's,version=.*,version=\"${version}\",g' keychain.sh"; - - buildPhase = '' - mkdir -p $out/bin - cp keychain.sh $out/bin/keychain + installPhase = '' + mkdir -p $out/{bin,share/man/man1} + cp keychain $out/bin/keychain + cp keychain.1 $out/share/man/man1 wrapProgram $out/bin/keychain \ --prefix PATH ":" "${coreutils}/bin" \ --prefix PATH ":" "${openssh}/bin" \ From 3ac31fe04135fe8aa2cbe23a19066c8a1ec37b8c Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 18 May 2015 22:40:39 +0200 Subject: [PATCH 369/615] calibre: fix build by using qt53 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 3d0bac560c08..fc013e9125fc 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng -, imagemagick, libjpeg, fontconfig, podofo, qt5, icu, sqlite +, imagemagick, libjpeg, fontconfig, podofo, qt53, icu, sqlite , pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp , xdg_utils }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg - fontconfig podofo qt5.base pil chmlib icu sqlite libusb1 libmtp xdg_utils + fontconfig podofo qt53 pil chmlib icu sqlite libusb1 libmtp xdg_utils pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw From db4993600c063a7bfc40f11c43e5431abbb2ca21 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Mon, 18 May 2015 02:57:41 +0200 Subject: [PATCH 370/615] dropbox: 3.4.4 -> 3.4.6 --- pkgs/applications/networking/dropbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 97573fb1e7b0..8a58450c5ea4 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -27,9 +27,9 @@ let else throw "Dropbox client for: ${stdenv.system} not supported!"; # NOTE: When updating, please also update in current stable, as older versions stop working - version = "3.4.4"; - sha256 = if stdenv.system == "x86_64-linux" then "05ncbxwkimq7cl3bad759qvda7zjdh07f5wh6aw12g472l4yqq98" - else if stdenv.system == "i686-linux" then "18089bh6i64yw75pswgn2vkcl1kf7ipxxncmssw3qhb6791qfhbk" + version = "3.4.6"; + sha256 = if stdenv.system == "x86_64-linux" then "0crhv21q48lwa86qcqgbcd9g73biibfrc2vgbavi67cwxvzcskky" + else if stdenv.system == "i686-linux" then "0kli84kzg1wcwszjni948zb4qih8mynmyqhdwyiv1l7v5lrhb8k2" else throw "Dropbox client for: ${stdenv.system} not supported!"; # relative location where the dropbox libraries are stored From feec95b437e904f409c99f4e83c6d6a20b63e252 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 18 May 2015 15:34:15 -0500 Subject: [PATCH 371/615] dropbox: move updateable attributes to the top --- .../networking/dropbox/default.nix | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 8a58450c5ea4..060c5ee88b35 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -18,19 +18,25 @@ # them with our own. let - arch = if stdenv.system == "x86_64-linux" then "x86_64" - else if stdenv.system == "i686-linux" then "x86" - else throw "Dropbox client for: ${stdenv.system} not supported!"; - - interpreter = if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" - else if stdenv.system == "i686-linux" then "ld-linux.so.2" - else throw "Dropbox client for: ${stdenv.system} not supported!"; - - # NOTE: When updating, please also update in current stable, as older versions stop working + # NOTE: When updating, please also update in current stable, as older versions stop working version = "3.4.6"; - sha256 = if stdenv.system == "x86_64-linux" then "0crhv21q48lwa86qcqgbcd9g73biibfrc2vgbavi67cwxvzcskky" - else if stdenv.system == "i686-linux" then "0kli84kzg1wcwszjni948zb4qih8mynmyqhdwyiv1l7v5lrhb8k2" - else throw "Dropbox client for: ${stdenv.system} not supported!"; + sha256 = + { + "x86_64-linux" = "0crhv21q48lwa86qcqgbcd9g73biibfrc2vgbavi67cwxvzcskky"; + "i686-linux" = "0kli84kzg1wcwszjni948zb4qih8mynmyqhdwyiv1l7v5lrhb8k2"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + + arch = + { + "x86_64-linux" = "x86_64"; + "i686-linux" = "x86"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + + interpreter = + { + "x86_64-linux" = "ld-linux-x86-64.so.2"; + "i686-linux" = "ld-linux.so.2"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); # relative location where the dropbox libraries are stored appdir = "opt/dropbox"; From 6d52aa7e59d6d6195b9de86ff154b82bba0e774e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 18 May 2015 15:36:49 -0500 Subject: [PATCH 372/615] dropbox: install icons --- pkgs/applications/networking/dropbox/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 060c5ee88b35..14360f9ff0bb 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -115,6 +115,9 @@ in stdenv.mkDerivation { mkdir -p "$out/bin" makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \ --prefix LD_LIBRARY_PATH : "${ldpath}" + + mkdir -p "$out/share/icons" + ln -s "$out/${appdir}/images/hicolor" "$out/share/icons/hicolor" ''; meta = { From 3c94a9da90c9c7f4ed3f344d53fa00dc95b2cb21 Mon Sep 17 00:00:00 2001 From: C0DEHERO Date: Mon, 18 May 2015 19:10:03 -0400 Subject: [PATCH 373/615] obs-studio: update 0.9.1 -> 0.10.0 --- pkgs/applications/video/obs-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 87e3047ed19f..54d13d117685 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "0.9.1"; + version = "0.10.0"; src = fetchurl { url = "https://github.com/jp9000/obs-studio/archive/${version}.tar.gz"; - sha256 = "198ymfdrg58i3by58fs68df835rkpnpagnvyzlilmn9ypvpa8h81"; + sha256 = "1xms48gl20pr9g8bv8ygykh6m99c3wjphsavr4hb1d5263r9f4in"; }; buildInputs = [ cmake From 01d4651a019370980e8f1b2f65afdda1fe4c279c Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 19 May 2015 01:15:22 +0200 Subject: [PATCH 374/615] rustc: Fix snapshot info It was wrong and it was causing a build failure. --- pkgs/development/compilers/rustc/1.0.0.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/rustc/1.0.0.nix b/pkgs/development/compilers/rustc/1.0.0.nix index 008e958f6d44..bd02397986be 100644 --- a/pkgs/development/compilers/rustc/1.0.0.nix +++ b/pkgs/development/compilers/rustc/1.0.0.nix @@ -3,12 +3,12 @@ callPackage ./makeRustcDerivation.nix { shortVersion = "1.0.0"; isRelease = true; srcSha = "1fjyk5xhg9dx85d1kkjmb1jai7awvdmzcjf2fdmi2pdjyzacn163"; - snapshotHashLinux686 = "0bc8cffdce611fb71fd7d3d8e7cdbfaf748a4f16"; - snapshotHashLinux64 = "94089740e48167c5975c92c139ae9c286764012f"; - snapshotHashDarwin686 = "54cc35e76497e6e94fddf38d6e40e9d168491ddb"; - snapshotHashDarwin64 = "43a1c1fba0d1dfee4c2ca310d506f8f5f51b3f6f"; - snapshotDate = "2015-04-27"; - snapshotRev = "857ef6e"; + snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec"; + snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349"; + snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234"; + snapshotHashDarwin64 = "5f35d9c920b8083a7420ef8cf5b00d5ef3085dfa"; + snapshotDate = "2015-03-27"; + snapshotRev = "5520801"; patches = [ ./patches/beta.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; From 85c48934bcba36a7531db1c657781ff2d64967d5 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 19 May 2015 02:37:47 +0200 Subject: [PATCH 375/615] racerRust: 2015-05-04 -> 2015-05-18 Fixes build failure with rustc 1.0.0. --- pkgs/development/tools/rust/racer/default.nix | 10 +++---- .../development/tools/rust/racer/pr-232.patch | 26 ------------------- 2 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 pkgs/development/tools/rust/racer/pr-232.patch diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 5169cd1567ca..61fe2238a779 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -4,16 +4,14 @@ with rustPlatform; buildRustPackage rec { #TODO add emacs support - name = "racer-git-2015-05-04"; + name = "racer-git-2015-05-18"; src = fetchgit { url = https://github.com/phildawes/racer; - rev = "bf2373ec08b0be03598283bd610c5b61bdb8738c"; - sha256 = "0ldf05d19ghxk3fslxrc87j18zg8bam2y0ygdy456h37y2p1d1ck"; + rev = "c2d31ed49baa11f06ffc0c7bc8f95dd00037d035"; + sha256 = "0g420cbqpknhl61a4mpk3bbia8agf657d9vzzcqr338lmni80qz7"; }; - patches = [ ./pr-232.patch ]; - - depsSha256 = "0rinyh365znx39aygxyyxmi496pw0alblf2dl7l8fbmz63nkhfv2"; + depsSha256 = "1wmpd2cjmk59382dq59hmb0xa6fxbnmmaz4nfs96qf613r5ylvra"; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/racer/pr-232.patch b/pkgs/development/tools/rust/racer/pr-232.patch deleted file mode 100644 index 354307d71e4f..000000000000 --- a/pkgs/development/tools/rust/racer/pr-232.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3f354d69881424c7c902408d22f9138412a872b4 Mon Sep 17 00:00:00 2001 -From: Ricardo Martins -Date: Sat, 9 May 2015 17:12:55 +0100 -Subject: [PATCH] Use `Vec::extend` instead of binary operation `+`. - ---- - src/racer/nameres.rs | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/racer/nameres.rs b/src/racer/nameres.rs -index 60636c6..ad1e01c 100644 ---- a/src/racer/nameres.rs -+++ b/src/racer/nameres.rs -@@ -620,9 +620,9 @@ pub fn search_scope(start: usize, point: usize, src: &str, - } - - // There's a good chance of a match. Run the matchers -- out = out + &*run_matchers_on_blob(src, start+blobstart, start+blobend, -- searchstr, -- filepath, search_type, local, namespace); -+ out.extend(run_matchers_on_blob(src, start+blobstart, start+blobend, -+ searchstr, -+ filepath, search_type, local, namespace)); - if let ExactMatch = search_type { - if !out.is_empty() { - return out.into_iter(); From 49d9476608144f9657632b27ac99a9a64d5892ed Mon Sep 17 00:00:00 2001 From: Chris Double Date: Tue, 19 May 2015 14:19:15 +1200 Subject: [PATCH 376/615] Update to tor 0.2.6.7 --- pkgs/tools/security/tor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 603dd05fc659..3e7d5e0e920c 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libevent, openssl, zlib, torsocks }: stdenv.mkDerivation rec { - name = "tor-0.2.5.12"; + name = "tor-0.2.6.7"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "0j9byw3i2b7ji88vsqwmsxxg2nlxwkk45k5qbc1y7hdlzvzxl3sm"; + sha256 = "0v4yp29cxzb4zjpbqg97vs8q3qnhmk05wn9xilmb5l9faj5fhawc"; }; # Note: torsocks is specified as a dependency, as the distributed From c2a85e04e8e48c6e4538c23d32ac1dfa1a46ebf1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 18 May 2015 15:27:33 -0700 Subject: [PATCH 377/615] buildGoPackage: Take into account propagatedBuildInputs during rename --- pkgs/development/go-modules/generic/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 2b4d59ca7fb5..34cf65b844d2 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -54,8 +54,9 @@ go.stdenv.mkDerivation ( renameImports = args.renameImports or ( let - inputsWithAliases = lib.filter (x: x ? goPackageAliases) buildInputs; - rename = to: from: "echo Renaming '${from}' to '${to}'; govers -m ${from} ${to}"; + inputsWithAliases = lib.filter (x: x ? goPackageAliases) + (buildInputs ++ (args.propagatedBuildInputs or [ ])); + rename = to: from: "echo Renaming '${from}' to '${to}'; govers -d -m ${from} ${to}"; renames = p: lib.concatMapStringsSep "\n" (rename p.goPackagePath) p.goPackageAliases; in lib.concatMapStringsSep "\n" renames inputsWithAliases); From 1dbd67ee820159c3829f04b2aba66451c43109e9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 18 May 2015 15:27:52 -0700 Subject: [PATCH 378/615] buildGoPackage: Don't print blank lines --- pkgs/development/go-modules/generic/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 34cf65b844d2..5860176ecad3 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -80,7 +80,9 @@ go.stdenv.mkDerivation ( exit 1 fi fi - echo "$OUT" >&2 + if [ -n "$OUT" ]; then + echo "$OUT" >&2 + fi done) fi From 414b3f2909a0a912cb7fb4a5890b7cd31867d8f1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 18 May 2015 15:38:27 -0700 Subject: [PATCH 379/615] consul: Move into the go-packages framework --- .../go-modules/generic/default.nix | 4 +- pkgs/servers/consul/default.nix | 63 --- pkgs/servers/consul/ui.nix | 39 ++ pkgs/top-level/all-packages.nix | 6 +- pkgs/top-level/go-packages.nix | 367 +++++++++++++++--- 5 files changed, 359 insertions(+), 120 deletions(-) delete mode 100644 pkgs/servers/consul/default.nix create mode 100644 pkgs/servers/consul/ui.nix diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 5860176ecad3..17341238deaf 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -1,6 +1,6 @@ { go, govers, lib }: -{ name, buildInputs ? [] +{ name, buildInputs ? [], passthru ? {} # Disabled flag , disabled ? false @@ -126,7 +126,7 @@ go.stdenv.mkDerivation ( runHook postInstall ''; - passthru = lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; }; + passthru = passthru // lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; }; meta = meta // { # add an extra maintainer to every package diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix deleted file mode 100644 index b299981bee2a..000000000000 --- a/pkgs/servers/consul/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv, lib, go, fetchgit, fetchhg, fetchbzr, fetchFromGitHub , ruby , nodejs -, bundlerEnv }: - -let - version = "0.5.0"; - # `sass` et al - gems = bundlerEnv { - name = "consul-deps"; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; - }; -in - -with lib; -stdenv.mkDerivation { - name = "consul-${version}"; - - src = import ./deps.nix { - inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; - }; - - buildInputs = [ go ruby gems nodejs ]; - - buildPhase = '' - # Build consul binary - export GOPATH=$src - go build -v -o consul github.com/hashicorp/consul - - # Build ui static files - ({ - cp -r src/github.com/hashicorp/consul/ui . - cd ui - chmod -R u+w . - make dist - }) - ''; - - outputs = [ "out" "ui" ]; - - installPhase = '' - # Fix references to go-deps in the binary - hash=$(echo $src | sed 's,.*/\([^/-]*\).*,\1,g') - xs=$(printf 'x%.0s' $(seq 2 $(echo $hash | wc -c))) - sed -i "s,$hash,$xs,g" consul - - # Install consul binary - mkdir -p $out/bin - cp consul $out/bin - - # Install ui static files - mkdir -p $ui - mv ui/dist/* $ui - ''; - - meta = with lib; { - homepage = http://www.consul.io/; - description = "A tool for service discovery, monitoring and configuration"; - maintainers = with maintainers; [ cstrahan wkennington ]; - license = licenses.mpl20 ; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix new file mode 100644 index 000000000000..eb7093ec615d --- /dev/null +++ b/pkgs/servers/consul/ui.nix @@ -0,0 +1,39 @@ +{ stdenv, goPackages, ruby , nodejs, bundlerEnv }: + +let + # `sass` et al + gems = bundlerEnv { + name = "consul-ui-deps"; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + }; +in + +stdenv.mkDerivation { + name = "consul-ui-${goPackages.consul.rev}"; + + src = goPackages.consul.src; + + buildInputs = [ ruby gems nodejs ]; + + buildPhase = '' + # Build ui static files + cd ui + make dist + ''; + + installPhase = '' + # Install ui static files + mkdir -p $out + mv dist/* $out + ''; + + meta = with stdenv.lib; { + homepage = http://www.consul.io/; + description = "A tool for service discovery, monitoring and configuration"; + maintainers = with maintainers; [ cstrahan wkennington ]; + license = licenses.mpl20 ; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40a77f8a623d..bc2b7ee5b313 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -758,11 +758,9 @@ let cloud-init = callPackage ../tools/virtualization/cloud-init { }; - consul = callPackage ../servers/consul { - # inherit ruby; - }; + consul = goPackages.consul; - consul_ui = consul.ui; + consul-ui = callPackage ../servers/consul/ui.nix { }; consul-alerts = callPackage ../servers/consul/alerts.nix { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 7fd57bb74efc..ae84dd691177 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -57,7 +57,10 @@ let rev = "d1d694760b7a3a9fa32e4d1c49e08b2d672221d8"; name = "net-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "golang.org/x/net"; - goPackageAliases = [ "code.google.com/p/go.net" ]; + goPackageAliases = [ + "code.google.com/p/go.net" + "github.com/hashicorp/go.net" + ]; src = fetchFromGitHub { inherit rev; @@ -214,6 +217,19 @@ let }; }; + bolt = buildGoPackage rec { + rev = "957d850b5158a4eebf915476058e720f43459584"; + name = "bolt-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/boltdb/bolt"; + + src = fetchFromGitHub { + inherit rev; + owner = "boltdb"; + repo = "bolt"; + sha256 = "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf"; + }; + }; + bufio = buildGoPackage rec { rev = "24e7e48f60fc2d9e99e43c07485d9fff42051e66"; name = "bufio-${stdenv.lib.strings.substring 0 7 rev}"; @@ -241,6 +257,7 @@ let rev = "f092b4f207b6e5cce0569056fba9e1a2735cb6cf"; name = "circbuf-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/armon/circbuf"; + src = fetchFromGitHub { inherit rev; owner = "armon"; @@ -250,15 +267,18 @@ let }; cli = buildGoPackage rec { - rev = "8262fe3f76f0da53b5674eb35c8c6436430794c3"; + rev = "6cc8bc522243675a2882b81662b0b0d2e04b99c9"; name = "cli-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/mitchellh/cli"; + src = fetchFromGitHub { inherit rev; owner = "mitchellh"; repo = "cli"; - sha256 = "0pqkxh1q49kkxihggrfjs8174d927g4c5qqx00ggw8sqqsgrw6vn"; + sha256 = "05w9ypliva9lyn3h4rahznj04mh0fws7vaqlwhxfs5nnd5g03dma"; }; + + propagatedBuildInputs = [ crypto ]; }; cobra = buildGoPackage rec { @@ -275,14 +295,15 @@ let }; columnize = buildGoPackage rec { - rev = "785d943a7b6886e0bb2f139a60487b823dd8d9de"; + rev = "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a"; name = "columnize-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/ryanuber/columnize"; + src = fetchFromGitHub { inherit rev; owner = "ryanuber"; repo = "columnize"; - sha256 = "1h3sxzhiwz65vf3cvclirlf6zhdr97v01dpn5cmf3m09rxxpnp3f"; + sha256 = "1qrqr76cw58x2hkjic6h88na5ihgvkmp8mqapj8kmjcjzdxkzhr9"; }; }; @@ -300,6 +321,44 @@ let subPackages = [ "./" ]; }; + consul = buildGoPackage rec { + rev = "v0.5.1"; + name = "consul-${rev}"; + goPackagePath = "github.com/hashicorp/consul"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "consul"; + sha256 = "0glmvw52mgf3gwqr0f8v19ip5i6csiimv25jh30ilkig29k7027k"; + }; + + buildInputs = [ + circbuf armon.go-metrics go-radix gomdb bolt consul-migrate go-checkpoint + ugorji.go go-multierror go-syslog golang-lru hcl logutils memberlist + net-rpc-msgpackrpc raft raft-boltdb raft-mdb scada-client serf yamux + muxado dns cli mapstructure columnize crypto + ]; + + # Keep consul.ui for backward compatability + passthru.ui = pkgs.consul-ui; + }; + + consul-migrate = buildGoPackage rec { + rev = "4977886fc950a0db1a6f0bbadca56dfabf170f9c"; + name = "consul-migrate-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/consul-migrate"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "consul-migrate"; + sha256 = "0kjziwhz1ifj4wpy5viba6z17sfgjjibdhnn73ffp7q5q8abg8w3"; + }; + + buildInputs = [ raft raft-boltdb raft-mdb ]; + }; + dbus = buildGoPackage rec { rev = "88765d85c0fdadcd98a54e30694fa4e4f5b51133"; name = "dbus-${stdenv.lib.strings.substring 0 7 rev}"; @@ -317,14 +376,15 @@ let }; dns = buildGoPackage rec { - rev = "fd694e564b3ceaf34a8bbe9ef18f65c64df8ed03"; + rev = "bb1103f648f811d2018d4bedcb2d4b2bce34a0f1"; name = "dns-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/miekg/dns"; + src = fetchFromGitHub { inherit rev; owner = "miekg"; repo = "dns"; - sha256 = "1g15l00jypjac0fd2j39lifw1j3md49vk6fq35mv8kc8ighhvxaq"; + sha256 = "1c1gasvzlcmgwyqhksm656p03nc76kxjxllbcw9bwfy5v7p9w7qq"; }; }; @@ -403,6 +463,20 @@ let }; }; + ugorji.go = buildGoPackage rec { + rev = "821cda7e48749cacf7cad2c6ed01e96457ca7e9d"; + name = "ugorji-go-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/ugorji/go"; + goPackageAliases = [ "github.com/hashicorp/go-msgpack" ]; + + src = fetchFromGitHub { + inherit rev; + owner = "ugorji"; + repo = "go"; + sha256 = "1ay1l6gijxjgc7j0093drp5mjm93fmrp7r20qbqz4k05l43mqb3j"; + }; + }; + goamz = buildGoPackage rec { rev = "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7"; name = "goamz-${rev}"; @@ -455,6 +529,19 @@ let doCheck = false; # please check again }; + gomdb = buildGoPackage rec { + rev = "151f2e08ef45cb0e57d694b2562f351955dff572"; + name = "gomdb-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/armon/gomdb"; + + src = fetchFromGitHub { + inherit rev; + owner = "armon"; + repo = "gomdb"; + sha256 = "02wdhgfarmmwfbc75snd1dh6p9k9c1y2135apdm6mkr062qlxx61"; + }; + }; + govers = buildGoPackage rec { rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9"; name = "govers-${stdenv.lib.strings.substring 0 7 rev}"; @@ -468,6 +555,19 @@ let }; }; + golang-lru = buildGoPackage rec { + rev = "995efda3e073b6946b175ed93901d729ad47466a"; + name = "golang-lru-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/golang-lru"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "golang-lru"; + sha256 = "0ilnzg9qq2pfa8qb9yd25s5afi0fvsm78kqzqy39kgg8zsx70xyj"; + }; + }; + golang_protobuf_extensions = buildGoPackage rec { rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; name = "golang-protobuf-extensions-${stdenv.lib.strings.substring 0 7 rev}"; @@ -611,15 +711,16 @@ let }; }; - go-codec = buildGoPackage rec { - rev = "71c2886f5a673a35f909803f38ece5810165097b"; - name = "go-codec-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/ugorji/go"; + go-checkpoint = buildGoPackage rec { + rev = "88326f6851319068e7b34981032128c0b1a6524d"; + name = "go-checkpoint-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/go-checkpoint"; + src = fetchFromGitHub { inherit rev; - owner = "ugorji"; - repo = "go"; - sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j"; + owner = "hashicorp"; + repo = "go-checkpoint"; + sha256 = "1npasn9lmvx57nw3wkswwvl5k0wmn01jpalbwv832x5wq4r0nsz4"; }; }; @@ -725,22 +826,6 @@ let buildInputs = [ go-systemd osext ]; }; - gucumber = buildGoPackage rec { - rev = "fba94dc5a9077fa81eb85199fa9dfdaa8af82ab5"; - name = "gucumber-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/lsegal/gucumber"; - - src = fetchFromGitHub { - inherit rev; - owner = "lsegal"; - repo = "gucumber"; - sha256 = "028wczwpicwmggk3221pz8ffzh30l47x8217gvdzcqq6h9iiaczr"; - }; - - buildInputs = [ testify ]; - propagatedBuildInputs = [ ansicolor ]; - }; - rcrowley.go-metrics = buildGoPackage rec { rev = "f770e6f5e91a8770cecee02d5d3f7c00b023b4df"; name = "rcrowley.go-metrics-${stdenv.lib.strings.substring 0 7 rev}"; @@ -770,15 +855,16 @@ let buildInputs = [ prometheus.client_golang ]; }; - go-msgpack = buildGoPackage rec { - rev = "75092644046c5e38257395b86ed26c702dc95b92"; - name = "go-msgpack-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/ugorji/go-msgpack"; + go-multierror = buildGoPackage rec { + rev = "fcdddc395df1ddf4247c69bd436e84cfa0733f7e"; + name = "go-multierror-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/go-multierror"; + src = fetchFromGitHub { inherit rev; - owner = "ugorji"; - repo = "go-msgpack"; - sha256 = "1bmqi16bfiqw7qhb3d5hbh0dfzhx2bbq1g15nh2pxwxckwh80x98"; + owner = "hashicorp"; + repo = "go-multierror"; + sha256 = "1gvrm2bqi425mfg55m01z9gppfd7v4ljz1z8bykmh2sc82fj25jz"; }; }; @@ -871,14 +957,15 @@ let }; go-syslog = buildGoPackage rec { - rev = "ac3963b72ac367e48b1e68a831e62b93fb69091c"; + rev = "42a2b573b664dbf281bd48c3cc12c086b17a39ba"; name = "go-syslog-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/hashicorp/go-syslog"; + src = fetchFromGitHub { inherit rev; owner = "hashicorp"; repo = "go-syslog"; - sha256 = "1r9s1gsa4azcs05gx1179ixk7qvrkrik3v92wr4s8gwm00m0gf81"; + sha256 = "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3"; }; }; @@ -952,6 +1039,37 @@ let propagatedBuildInputs = [ http2 glog net protobuf oauth2 ]; }; + gucumber = buildGoPackage rec { + rev = "fba94dc5a9077fa81eb85199fa9dfdaa8af82ab5"; + name = "gucumber-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/lsegal/gucumber"; + + src = fetchFromGitHub { + inherit rev; + owner = "lsegal"; + repo = "gucumber"; + sha256 = "028wczwpicwmggk3221pz8ffzh30l47x8217gvdzcqq6h9iiaczr"; + }; + + buildInputs = [ testify ]; + propagatedBuildInputs = [ ansicolor ]; + }; + + hcl = buildGoPackage rec { + rev = "513e04c400ee2e81e97f5e011c08fb42c6f69b84"; + name = "hcl-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/hcl"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "hcl"; + sha256 = "041js0k8bj7qsgr79p207m6r3nkpw7839gq31747618sap6w3g8c"; + }; + + buildInputs = [ go-multierror ]; + }; + hologram = buildGoPackage rec { rev = "2bf08f0edee49297358bd06a0c9bf44ba9051e9c"; name = "hologram-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1068,55 +1186,59 @@ let }; logutils = buildGoPackage rec { - rev = "8e0820fe7ac5eb2b01626b1d99df47c5449eb2d8"; + rev = "367a65d59043b4f846d179341d138f01f988c186"; name = "logutils-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/hashicorp/logutils"; + src = fetchFromGitHub { inherit rev; owner = "hashicorp"; repo = "logutils"; - sha256 = "033rbkc066g657r0dnzysigjz2bs4biiz0kmiypd139d34jvslwz"; + sha256 = "0rjag8c6fn3f51nysrq62r46ma6gzyvijxba47q7cdfjq35mydb8"; }; }; mapstructure = buildGoPackage rec { - rev = "6fb2c832bcac61d01212ab1d172f7a14a8585b07"; + rev = "f7d28d5aeab42b9b95d2e6d6b956f73a290077fc"; name = "mapstructure-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/mitchellh/mapstructure"; + src = fetchFromGitHub { inherit rev; owner = "mitchellh"; repo = "mapstructure"; - sha256 = "0mx855lwhv0rk461wmbnbzbpkhmq5p2ipmrm5bhzimagrr1w17hw"; + sha256 = "1l9bxx0lrxdb75bxgy3jq2f6sgin2xd5ll70z5797vi96mlz8ydb"; }; }; mdns = buildGoPackage rec { - rev = "70462deb060d44247356ee238ebafd7699ddcffe"; + rev = "2b439d37011456df8ff83a70ffd1cd6046410113"; name = "mdns-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/armon/mdns"; + goPackagePath = "github.com/hashicorp/mdns"; + src = fetchFromGitHub { inherit rev; - owner = "armon"; + owner = "hashicorp"; repo = "mdns"; - sha256 = "0xkm3d0hsixdm1yrkx9c39723kfjkb3wvrzrmx3np9ylcwn6h5p5"; + sha256 = "17zwk212zmyramnjylpvvrvbbsz0qb5crkhly6yiqkyll3qzpb96"; }; - propagatedBuildInputs = [ dns net ]; + propagatedBuildInputs = [ net dns ]; }; memberlist = buildGoPackage rec { - rev = "17d39b695094be943bfb98442a80b082e6b9ac47"; + rev = "6025015f2dc659ca2c735112d37e753bda6e329d"; name = "memberlist-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/hashicorp/memberlist"; + src = fetchFromGitHub { inherit rev; owner = "hashicorp"; repo = "memberlist"; - sha256 = "0nvgjnwmfqhv2wvr77d2q5mq1bfw4xbpil6wgyj4fyrmhsfzrv3g"; + sha256 = "01s2gwnbgvwz4wshz9d4za0p12ji4fnapnlmz3jwfcmcwjpyqfb7"; }; - propagatedBuildInputs = [ go-codec armon.go-metrics ]; + propagatedBuildInputs = [ ugorji.go armon.go-metrics ]; }; mesos-stats = buildGoPackage rec { @@ -1171,6 +1293,19 @@ let }; }; + muxado = buildGoPackage rec { + rev = "f693c7e88ba316d1a0ae3e205e22a01aa3ec2848"; + name = "muxado-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/inconshreveable/muxado"; + + src = fetchFromGitHub { + inherit rev; + owner = "inconshreveable"; + repo = "muxado"; + sha256 = "1vgiwwxhgx9c899f6ikvrs0w6vfsnypzalcqyr0mqm2w816r9hhs"; + }; + }; + mysql = buildGoPackage rec { rev = "0cc29e9fe8e25c2c58cf47bcab566e029bbaa88b"; name = "mysql-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1184,6 +1319,21 @@ let }; }; + net-rpc-msgpackrpc = buildGoPackage rec { + rev = "d377902b7aba83dd3895837b902f6cf3f71edcb2"; + name = "net-rpc-msgpackrpc-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/net-rpc-msgpackrpc"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "net-rpc-msgpackrpc"; + sha256 = "05q8qlf42ygafcp8zdyx7y7kv9vpjrxnp8ak4qcszz9kgl2cg969"; + }; + + propagatedBuildInputs = [ ugorji.go ]; + }; + ntp = buildGoPackage rec { rev = "0a5264e2563429030eb922f258229ae3fee5b5dc"; name = "ntp-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1396,6 +1546,51 @@ let }; }; + raft = buildGoPackage rec { + rev = "a8065f298505708bf60f518c09178149f3c06f21"; + name = "raft-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/raft"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "raft"; + sha256 = "122mjijphas7ybbvssxv1r36sb8i907gdr9kvplnx6yg9w52j3mn"; + }; + + propagatedBuildInputs = [ armon.go-metrics ugorji.go ]; + }; + + raft-boltdb = buildGoPackage rec { + rev = "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee"; + name = "raft-boltdb-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/raft-boltdb"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "raft-boltdb"; + sha256 = "0p609w6x0h6bapx4b0d91dxnp2kj7dv0534q4blyxp79shv2a8ia"; + }; + + propagatedBuildInputs = [ bolt ugorji.go raft ]; + }; + + raft-mdb = buildGoPackage rec { + rev = "4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0"; + name = "raft-mdb-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/raft-mdb"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "raft-mdb"; + sha256 = "15l4n6zygwn3h118m2945h9jxkryaxxcgy8xij2rxjhzrzpfyj3i"; + }; + + propagatedBuildInputs = [ gomdb ugorji.go raft ]; + }; + raw = buildGoPackage rec { rev = "724aedf6e1a5d8971aafec384b6bde3d5608fba4"; name = "raw-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1420,6 +1615,39 @@ let }; }; + scada-client = buildGoPackage rec { + rev = "c26580cfe35393f6f4bf1b9ba55e6afe33176bae"; + name = "scada-client-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/scada-client"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "scada-client"; + sha256 = "0s8xg49fa7d2d0vv8pi37f43rjrgkb7w6x6ydkikz1v8ccg05p3b"; + }; + + buildInputs = [ armon.go-metrics net-rpc-msgpackrpc yamux ]; + }; + + serf = buildGoPackage rec { + rev = "668982d8f90f5eff4a766583c1286393c1d27f68"; + name = "serf-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/serf"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "serf"; + sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk"; + }; + + buildInputs = [ + circbuf armon.go-metrics ugorji.go go-syslog logutils mdns memberlist + cli mapstructure columnize + ]; + }; + sets = buildGoPackage rec { rev = "6c54cb57ea406ff6354256a4847e37298194478f"; name = "sets-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1561,6 +1789,30 @@ let buildInputs = [ pkgconfig libusb ]; }; + vault = buildGoPackage rec { + rev = "v0.1.2"; + name = "vault-${rev}"; + goPackagePath = "github.com/hashicorp/vault"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "vault"; + sha256 = "0q6wlw0s9dig11mzcfg25fh2wz7g70zxkqm7c5f58fncxdby2nqj"; + }; + + extraSrcs = [ + { inherit (consul) src goPackagePath; } + ]; + + buildInputs = [ + armon.go-metrics go-radix mysql go-querystring aws-sdk-go errwrap + go-multierror go-syslog golang-lru hcl logutils pq cli copystructure + go-homedir mapstructure reflectwalk columnize go-zookeeper asn1-ber ldap + go-ini crypto net oauth2 + ]; + }; + vulcand = buildGoPackage rec { rev = "v0.8.0-beta.3"; name = "vulcand-${rev}"; @@ -1599,4 +1851,17 @@ let }; }; + yamux = buildGoPackage rec { + rev = "b2e55852ddaf823a85c67f798080eb7d08acd71d"; + name = "yamux-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/yamux"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "yamux"; + sha256 = "0mr87my5m8lgc0byjcddlclxg34d07cpi9p78ps3rhzq7p37g533"; + }; + }; + }; in self From f0d324c23aaef6475eb6746e55b878696246cd9c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 18 May 2015 15:55:55 -0700 Subject: [PATCH 380/615] consul-template: Move to go-packages --- pkgs/servers/consul/template.nix | 34 -------------------------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/go-packages.nix | 21 ++++++++++++++++++++ 3 files changed, 22 insertions(+), 35 deletions(-) delete mode 100644 pkgs/servers/consul/template.nix diff --git a/pkgs/servers/consul/template.nix b/pkgs/servers/consul/template.nix deleted file mode 100644 index 59ca524b51e3..000000000000 --- a/pkgs/servers/consul/template.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, lib, go, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: - -stdenv.mkDerivation rec { - name = "consul-template-${version}"; - version = "0.7.0"; - - src = import ./deps.nix { - inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; - }; - - buildInputs = [ go ]; - - buildPhase = '' - GOPATH=$src go build -v -o consul-template github.com/hashicorp/consul-template - ''; - - installPhase = '' - # Fix references to go-deps in the binary - hash=$(echo $src | sed 's,.*/\([^/-]*\).*,\1,g') - xs=$(printf 'x%.0s' $(seq 2 $(echo $hash | wc -c))) - sed -i "s,$hash,$xs,g" consul-template - - mkdir -p $out/bin - cp consul-template $out/bin - ''; - - meta = with lib; { - description = "Generic template rendering and notifications with Consul"; - homepage = https://github.com/hashicorp/consul-template; - license = licenses.mpl20; - maintainers = with maintainers; [ puffnfresh wkennington ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc2b7ee5b313..d892f4443a01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -764,7 +764,7 @@ let consul-alerts = callPackage ../servers/consul/alerts.nix { }; - consul-template = callPackage ../servers/consul/template.nix { }; + consul-template = goPackages.consul-template; corosync = callPackage ../servers/corosync { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index ae84dd691177..e68ded9a3064 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -359,6 +359,27 @@ let buildInputs = [ raft raft-boltdb raft-mdb ]; }; + consul-template = buildGoPackage rec { + rev = "v0.9.0"; + name = "consul-template-${rev}"; + goPackagePath = "github.com/hashicorp/consul-template"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "consul-template"; + sha256 = "1k64rjskzn7cxn7rxab978847jq8gr4zj4cnzgznhn44nzasgymj"; + }; + + # We just want the consul api not all of consul and vault + extraSrcs = [ + { inherit (consul) src goPackagePath; } + { inherit (vault) src goPackagePath; } + ]; + + buildInputs = [ go-multierror go-syslog hcl logutils mapstructure ]; + }; + dbus = buildGoPackage rec { rev = "88765d85c0fdadcd98a54e30694fa4e4f5b51133"; name = "dbus-${stdenv.lib.strings.substring 0 7 rev}"; From d0e45e274be2ec002c60c878d82d1fe378883ccf Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 18 May 2015 16:11:19 -0700 Subject: [PATCH 381/615] fetchFromBitbucket: Add --- pkgs/top-level/all-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d892f4443a01..d9137617b07d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -375,6 +375,12 @@ let inherit sha256; }; + fetchFromBitbucket = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { + inherit name; + url = "https://bitbucket.org/${owner}/${repo}/get/${rev}.tar.gz"; + inherit sha256; + }; + # gitorious example fetchFromGitorious = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { inherit name; From a6d5a2e442bd67cdf285e6ec1f41b656c9877ab6 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 18 May 2015 18:18:37 -0700 Subject: [PATCH 382/615] consul-alerts: Make go-package --- pkgs/servers/consul/alerts.nix | 27 --- pkgs/servers/consul/deps.nix | 315 ------------------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/go-packages.nix | 394 ++++++++++++++++++++++++++++++-- 4 files changed, 373 insertions(+), 365 deletions(-) delete mode 100644 pkgs/servers/consul/alerts.nix delete mode 100644 pkgs/servers/consul/deps.nix diff --git a/pkgs/servers/consul/alerts.nix b/pkgs/servers/consul/alerts.nix deleted file mode 100644 index b3dbb21d5bbb..000000000000 --- a/pkgs/servers/consul/alerts.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - name = "consul-alerts-${version}"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "AcalephStorage"; - repo = "consul-alerts"; - rev = "v${version}"; - sha256 = "02rgz68g3i408biq2aqilpqraqirzmba9mh7avdga5bljp427jgn"; - }; - - goPackagePath = "github.com/AcalephStorage/consul-alerts"; - dontInstallSrc = true; - subPackages = [ "./" ]; - - meta = with lib; { - description = "A simple daemon to send notifications based on Consul health checks"; - homepage = https://github.com/AcalephStorage/consul-alerts; - license = licenses.gpl2; - maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/consul/deps.nix b/pkgs/servers/consul/deps.nix deleted file mode 100644 index ad41dbb70a59..000000000000 --- a/pkgs/servers/consul/deps.nix +++ /dev/null @@ -1,315 +0,0 @@ -{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: - -let - goDeps = [ - { - root = "github.com/armon/circbuf"; - src = fetchFromGitHub { - owner = "armon"; - repo = "circbuf"; - rev = "f092b4f207b6e5cce0569056fba9e1a2735cb6cf"; - sha256 = "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s"; - }; - } - { - root = "github.com/armon/consul-api"; - src = fetchFromGitHub { - owner = "armon"; - repo = "consul-api"; - rev = "dcfedd50ed5334f96adee43fc88518a4f095e15c"; - sha256 = "1k3yl34j4d8y6xxqdm70pjrbdcnp11dbf8i1mp60480xg0cwpb6d"; - }; - } - { - root = "github.com/armon/go-metrics"; - src = fetchFromGitHub { - owner = "armon"; - repo = "go-metrics"; - rev = "88b7658f24511c4b885942b26e9ea7a61ee37ebc"; - sha256 = "18f7nr6khirdmcsy5mic1yggwc189wfiqvms8i7yfcvfns5nq9cc"; - }; - } - { - root = "github.com/armon/go-radix"; - src = fetchFromGitHub { - owner = "armon"; - repo = "go-radix"; - rev = "e39d623f12e8e41c7b5529e9a9dd67a1e2261f80"; - sha256 = "10vhgr35dfbsm90q8aqp82vhdf4izqrx8bzzgn0h3vrx94c2pnq1"; - }; - } - { - root = "github.com/armon/gomdb"; - src = fetchFromGitHub { - owner = "armon"; - repo = "gomdb"; - rev = "151f2e08ef45cb0e57d694b2562f351955dff572"; - sha256 = "02wdhgfarmmwfbc75snd1dh6p9k9c1y2135apdm6mkr062qlxx61"; - }; - } - { - root = "github.com/golang/protobuf"; - src = fetchFromGitHub { - owner = "golang"; - repo = "protobuf"; - rev = "c22ae3cf020a21ebb7ae566dccbe90fc8ea4f9ea"; - sha256 = "1ab605jw0cprq0kbp0b5iyjw805wk08r3p9mvcyland7v4gfqys2"; - }; - } - { - root = "github.com/hashicorp/consul"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "consul"; - rev = "a022dfcb32246274adc8fb383882353c056d1da3"; - sha256 = "1al6bc62c8qygq4yhr8rq9jkx51ijv11816kipphylw73kyyrzg5"; - }; - } - { - root = "github.com/hashicorp/go-multierror"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "go-multierror"; - rev = "fcdddc395df1ddf4247c69bd436e84cfa0733f7e"; - sha256 = "1gvrm2bqi425mfg55m01z9gppfd7v4ljz1z8bykmh2sc82fj25jz"; - }; - } - { - root = "github.com/hashicorp/consul-template"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "consul-template"; - rev = "v0.7.0"; - sha256 = "0xaym2mi8j3hw1waplhqfypnxv32fi81xxx3clfzk0a6bjmaihfx"; - }; - } - { - root = "github.com/hashicorp/go-checkpoint"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "go-checkpoint"; - rev = "88326f6851319068e7b34981032128c0b1a6524d"; - sha256 = "1npasn9lmvx57nw3wkswwvl5k0wmn01jpalbwv832x5wq4r0nsz4"; - }; - } - { - root = "github.com/hashicorp/go-msgpack"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "go-msgpack"; - rev = "71c2886f5a673a35f909803f38ece5810165097b"; - sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j"; - }; - } - { - root = "github.com/hashicorp/go-syslog"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "go-syslog"; - rev = "42a2b573b664dbf281bd48c3cc12c086b17a39ba"; - sha256 = "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3"; - }; - } - { - root = "github.com/hashicorp/golang-lru"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "golang-lru"; - rev = "f09f965649501e2ac1b0c310c632a7bebdbdc1d4"; - sha256 = "0yjnmk2d2x0kqvkg1sdfkl3jr408yl76rpyqzkkbpkvdcjrz554c"; - }; - } - { - root = "github.com/hashicorp/hcl"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "hcl"; - rev = "513e04c400ee2e81e97f5e011c08fb42c6f69b84"; - sha256 = "041js0k8bj7qsgr79p207m6r3nkpw7839gq31747618sap6w3g8c"; - }; - } - { - root = "github.com/hashicorp/logutils"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "logutils"; - rev = "23b0af5510a2d1442103ef83ffcf53eb82f3debc"; - sha256 = "018bfknmc2qdk0br1ri6dgd45sx308j3qd77sxnzxsyaivw1mm0d"; - }; - } - { - root = "github.com/hashicorp/memberlist"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "memberlist"; - rev = "3d05e25e06bbb9e2b0e0afbd0b1c7dcebdd29cab"; - sha256 = "1pjknjfvbs692y6laizgd4fmd4pqn039vvnmnag7q362mrpf5aj4"; - }; - } - { - root = "github.com/hashicorp/net-rpc-msgpackrpc"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "net-rpc-msgpackrpc"; - rev = "d377902b7aba83dd3895837b902f6cf3f71edcb2"; - sha256 = "05q8qlf42ygafcp8zdyx7y7kv9vpjrxnp8ak4qcszz9kgl2cg969"; - }; - } - { - root = "github.com/hashicorp/raft"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "raft"; - rev = "a88bfa8385bc52c1f25d0fc02d1b55a2708d04ab"; - sha256 = "02kr7919m6iv7l26wnihalfi4lydz886j6x75a53vgchdcsbv7ai"; - }; - } - { - root = "github.com/hashicorp/raft-mdb"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "raft-mdb"; - rev = "4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0"; - sha256 = "15l4n6zygwn3h118m2945h9jxkryaxxcgy8xij2rxjhzrzpfyj3i"; - }; - } - { - root = "github.com/hashicorp/scada-client"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "scada-client"; - rev = "c26580cfe35393f6f4bf1b9ba55e6afe33176bae"; - sha256 = "0s8xg49fa7d2d0vv8pi37f43rjrgkb7w6x6ydkikz1v8ccg05p3b"; - }; - } - { - root = "github.com/hashicorp/serf"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "serf"; - rev = "f1fd5030d6a55d3edc6916d2ba58e933c21314de"; - sha256 = "0w84iw255aray7acasacwn8njm36aqbxiyalnjqwfsn0pwfjla0b"; - }; - } - { - root = "github.com/hashicorp/terraform"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "terraform"; - rev = "v0.3.7"; - sha256 = "04cs6sjwysg95l5cfsmnpnx3d126bv86qbkg91gj8h98knk5bs6z"; - }; - } - { - root = "github.com/hashicorp/yamux"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "yamux"; - rev = "b4f943b3f25da97dec8e26bee1c3269019de070d"; - sha256 = "18ivpiix006f0g085a11gra8z0n6bq344rrgc5rphn7nmnghqchz"; - }; - } - { - root = "github.com/inconshreveable/muxado"; - src = fetchFromGitHub { - owner = "inconshreveable"; - repo = "muxado"; - rev = "f693c7e88ba316d1a0ae3e205e22a01aa3ec2848"; - sha256 = "1vgiwwxhgx9c899f6ikvrs0w6vfsnypzalcqyr0mqm2w816r9hhs"; - }; - } - { - root = "github.com/matttproud/golang_protobuf_extensions"; - src = fetchFromGitHub { - owner = "matttproud"; - repo = "golang_protobuf_extensions"; - rev = "ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c"; - sha256 = "1vz6zj94v90x8mv9h6qfp1211kmzn60ri5qh7p9fzpjkhga5k936"; - }; - } - { - root = "github.com/miekg/dns"; - src = fetchFromGitHub { - owner = "miekg"; - repo = "dns"; - rev = "6427527bba3ea8fdf2b56fba43d20d1e3e76336d"; - sha256 = "1zszpn44kak4cs5lmy9i7sslizqngldgb0ixn0la9x9gxf16h9zn"; - }; - } - { - root = "github.com/mitchellh/cli"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "cli"; - rev = "e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0"; - sha256 = "1fwf7wmlhri19bl2yyjd4zlgndgwwqrdry45clpszzjsr8b5wfgm"; - }; - } - { - root = "github.com/mitchellh/mapstructure"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "mapstructure"; - rev = "442e588f213303bec7936deba67901f8fc8f18b1"; - sha256 = "076svhy5jlnw4jykm3dsrx2dswifajrpr7d09mz9y6g3lg901rqd"; - }; - } - { - root = "github.com/prometheus/client_golang"; - src = fetchFromGitHub { - owner = "prometheus"; - repo = "client_golang"; - rev = "0.2.0"; - sha256 = "0iq2hlmdazwmpjq2k9gvpv2zprzxzmyzsc89c2kalrwl52ksg250"; - }; - } - { - root = "github.com/prometheus/client_model"; - src = fetchFromGitHub { - owner = "prometheus"; - repo = "client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - root = "github.com/prometheus/procfs"; - src = fetchFromGitHub { - owner = "prometheus"; - repo = "procfs"; - rev = "6c34ef819e19b4e16f410100ace4aa006f0e3bf8"; - sha256 = "1n48jhx50bhnjznxds4nmz04digbbbbjq3hkvvl29js1grylda0i"; - }; - } - { - root = "github.com/ryanuber/columnize"; - src = fetchFromGitHub { - owner = "ryanuber"; - repo = "columnize"; - rev = "v2.0.1"; - sha256 = "1h3sxzhiwz65vf3cvclirlf6zhdr97v01dpn5cmf3m09rxxpnp3f"; - }; - } - { - root = "github.com/ugorji/go"; - src = fetchFromGitHub { - owner = "ugorji"; - repo = "go"; - rev = "c8676e5e9db1226325ca0ed7771633fb0109878b"; - sha256 = "18r1iajmc9a461kx0pz3lpv91lzlfg93cjw0k0j7ffk6901m0084"; - }; - } - ]; - -in - -stdenv.mkDerivation rec { - name = "go-deps"; - - buildCommand = - lib.concatStrings - (map (dep: '' - mkdir -p $out/src/`dirname ${dep.root}` - ln -s ${dep.src} $out/src/${dep.root} - '') goDeps); -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9137617b07d..201f6d59ac59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -768,7 +768,7 @@ let consul-ui = callPackage ../servers/consul/ui.nix { }; - consul-alerts = callPackage ../servers/consul/alerts.nix { }; + consul-alerts = goPackages.consul-alerts; consul-template = goPackages.consul-template; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index e68ded9a3064..557d6cc344fe 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1,7 +1,7 @@ /* This file defines the composition for Go packages. */ { overrides, stdenv, go, buildGoPackage, git, pkgconfig, libusb -, fetchgit, fetchhg, fetchurl, fetchFromGitHub, fetchbzr, pkgs }: +, fetchgit, fetchhg, fetchurl, fetchFromGitHub, fetchFromBitbucket, fetchbzr, pkgs }: let isGo13 = go.meta.branch == "1.3"; @@ -149,6 +149,19 @@ let ## THIRD PARTY + airbrake-go = buildGoPackage rec { + rev = "5b5e269e1bc398d43f67e43dafff3414a59cd5a2"; + name = "airbrake-go-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/tobi/airbrake-go"; + + src = fetchFromGitHub { + inherit rev; + owner = "tobi"; + repo = "airbrake-go"; + sha256 = "1bps4y3vpphpj63mshjg2aplh579cvqac0hz7qzvac0d1fqcgkdz"; + }; + }; + ansicolor = buildGoPackage rec { rev = "8368d3b31cf6f2c2464c7a91675342c9a0ac6658"; name = "ansicolor-${stdenv.lib.strings.substring 0 7 rev}"; @@ -242,6 +255,21 @@ let }; }; + bugsnag-go = buildGoPackage rec { + rev = "v1.0.3"; + name = "bugsnag-go-${rev}"; + goPackagePath = "github.com/bugsnag/bugsnag-go"; + + src = fetchFromGitHub { + inherit rev; + owner = "bugsnag"; + repo = "bugsnag-go"; + sha256 = "1ymi5hrvd2nyfwfd12xll43gn00ii3bjb5ma9dfhaaxv2asi3ajx"; + }; + + propagatedBuildInputs = [ panicwrap revel ]; + }; + check-v1 = buildGoPackage rec { rev = "871360013c92e1c715c2de6d06b54899468a8a2d"; name = "check-v1-${stdenv.lib.strings.substring 0 7 rev}"; @@ -321,6 +349,19 @@ let subPackages = [ "./" ]; }; + config = buildGoPackage rec { + rev = "0f78529c8c7e3e9a25f15876532ecbc07c7d99e6"; + name = "config-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/robfig/config"; + + src = fetchFromGitHub { + inherit rev; + owner = "robfig"; + repo = "config"; + sha256 = "0xmxy8ay0wzd307x7xba3rmigvr6rjlpfk9fmn6ir2nc97ifv3i0"; + }; + }; + consul = buildGoPackage rec { rev = "v0.5.1"; name = "consul-${rev}"; @@ -344,6 +385,36 @@ let passthru.ui = pkgs.consul-ui; }; + consul-alerts = buildGoPackage rec { + rev = "7dff28aa4c8c883a65106f8ec22796e1a589edab"; + name = "consul-alerts-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/AcalephStorage/consul-alerts"; + + renameImports = '' + # Remove all references to included dependency store + rm -rf go/src/${goPackagePath}/Godeps + govers -d -m github.com/AcalephStorage/consul-alerts/Godeps/_workspace/src/ "" + + # Fix references to consul-api + govers -d -m github.com/armon/consul-api github.com/hashicorp/consul/api + sed -i 's,consulapi,api,g' go/src/${goPackagePath}/consul/client.go + ''; + + src = fetchFromGitHub { + inherit rev; + owner = "AcalephStorage"; + repo = "consul-alerts"; + sha256 = "1vwybkvjgyilxk3l6avzivd31l8gnk8d0v7bl10qll0cd068fabq"; + }; + + # We just want the consul api not all of consul + extraSrcs = [ + { inherit (consul) src goPackagePath; } + ]; + + buildInputs = [ logrus consul-skipper docopt-go hipchat-go influxdb gopherduty ]; + }; + consul-migrate = buildGoPackage rec { rev = "4977886fc950a0db1a6f0bbadca56dfabf170f9c"; name = "consul-migrate-${stdenv.lib.strings.substring 0 7 rev}"; @@ -359,6 +430,31 @@ let buildInputs = [ raft raft-boltdb raft-mdb ]; }; + consul-skipper = buildGoPackage rec { + rev = "729b4fdcc7f572f7c083673595f939256b80b76f"; + name = "consul-skipper-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/darkcrux/consul-skipper"; + + renameImports = '' + govers -d -m github.com/armon/consul-api github.com/hashicorp/consul/api + sed -i 's,consulapi,api,g' go/src/${goPackagePath}/skipper.go + ''; + + src = fetchFromGitHub { + inherit rev; + owner = "darkcrux"; + repo = "consul-skipper"; + sha256 = "0shqvihbmq1w5ddnkn62qd4k6gs5zalq6k4alacjz92bwf6d2x6x"; + }; + + # We just want the consul api not all of consul + extraSrcs = [ + { inherit (consul) src goPackagePath; } + ]; + + buildInputs = [ logrus ]; + }; + consul-template = buildGoPackage rec { rev = "v0.9.0"; name = "consul-template-${rev}"; @@ -409,6 +505,19 @@ let }; }; + docopt-go = buildGoPackage rec { + rev = "854c423c810880e30b9fecdabb12d54f4a92f9bb"; + name = "docopt-go-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/docopt/docopt-go"; + + src = fetchFromGitHub { + inherit rev; + owner = "docopt"; + repo = "docopt-go"; + sha256 = "1sddkxgl1pwlipfvmv14h8vg9b9wq1km427j1gjarhb5yfqhh3l1"; + }; + }; + ed25519 = buildGoPackage rec { rev = "d2b94fd789ea21d12fac1a4443dd3a3f79cda72c"; name = "ed25519-${stdenv.lib.strings.substring 0 7 rev}"; @@ -420,15 +529,16 @@ let }; }; - fsnotify = buildGoPackage rec { - rev = "4894fe7efedeeef21891033e1cce3b23b9af7ad2"; - name = "fsnotify-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/howeyc/fsnotify"; + fsnotify.v1 = buildGoPackage rec { + rev = "v1.2.0"; + name = "fsnotify.v1-${rev}"; + goPackagePath = "gopkg.in/fsnotify.v1"; + src = fetchFromGitHub { inherit rev; - owner = "howeyc"; + owner = "go-fsnotify"; repo = "fsnotify"; - sha256 = "09r3h200nbw8a4d3rn9wxxmgma2a8i6ssaplf3zbdc2ykizsq7mn"; + sha256 = "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2"; }; }; @@ -537,6 +647,19 @@ let }; }; + gocolorize = buildGoPackage rec { + rev = "v1.0.0"; + name = "gocolorize-${rev}"; + goPackagePath = "github.com/agtorre/gocolorize"; + + src = fetchFromGitHub { + inherit rev; + owner = "agtorre"; + repo = "gocolorize"; + sha256 = "1dj7s8bgw9qky344d0k9gz661c0m317a08a590184drw7m51hy9p"; + }; + }; + goconvey = buildGoPackage rec { version = "1.5.0"; name = "goconvey-${version}"; @@ -617,6 +740,19 @@ let propagatedBuildInputs = [ ginkgo gomega gosnappy ]; }; + gollectd = buildGoPackage rec { + rev = "cf6dec97343244b5d8a5485463675d42f574aa2d"; + name = "gollectd-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/kimor79/gollectd"; + + src = fetchFromGitHub { + inherit rev; + owner = "kimor79"; + repo = "gollectd"; + sha256 = "1f3ml406cprzjc192csyr2af4wcadkc74kg8n4c0zdzglxxfsqxa"; + }; + }; + gomega = buildGoPackage rec { rev = "8adf9e1730c55cdc590de7d49766cb2acc88d8f2"; name = "gomega-${stdenv.lib.strings.substring 0 7 rev}"; @@ -629,6 +765,19 @@ let }; }; + gomemcache = buildGoPackage rec { + rev = "72a68649ba712ee7c4b5b4a943a626bcd7d90eb8"; + name = "gomemcache-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/bradfitz/gomemcache"; + + src = fetchFromGitHub { + inherit rev; + owner = "bradfitz"; + repo = "gomemcache"; + sha256 = "1r8fpzwhakq8fsppc33n4iivq1pz47xhs0h6bv4x5qiip5mswwvg"; + }; + }; + google-api-go-client = buildGoPackage rec { rev = "34c5554e6406f7f715ede3616b39034247545ce0"; name = "google-api-go-client-${stdenv.lib.strings.substring 0 7 rev}"; @@ -661,6 +810,19 @@ let buildInputs = [ crypto ]; }; + gopherduty = buildGoPackage rec { + rev = "f4906ce7e59b33a50bfbcba93e2cf58778c11fb9"; + name = "gopherduty-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/darkcrux/gopherduty"; + + src = fetchFromGitHub { + inherit rev; + owner = "darkcrux"; + repo = "gopherduty"; + sha256 = "11w1yqc16fxj5q1y5ha5m99j18fg4p9lyqi542x2xbrmjqqialcf"; + }; + }; + gosnappy = buildGoPackage rec { rev = "ce8acff4829e0c2458a67ead32390ac0a381c862"; name = "gosnappy-${stdenv.lib.strings.substring 0 7 rev}"; @@ -732,6 +894,35 @@ let }; }; + pmylund.go-cache = buildGoPackage rec { + rev = "93d85800f2fa6bd0a739e7bd612bfa3bc008b72d"; + name = "go-cache-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/pmylund/go-cache"; + goPackageAliases = [ + "github.com/robfig/go-cache" + ]; + + src = fetchFromGitHub { + inherit rev; + owner = "pmylund"; + repo = "go-cache"; + sha256 = "08wfwm7nk381lv6a95p0hfgqwaksn0vhzz1xxdncjdw6w71isyy7"; + }; + }; + + robfig.go-cache = buildGoPackage rec { + rev = "9fc39e0dbf62c034ec4e45e6120fc69433a3ec51"; + name = "go-cache-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/robfig/go-cache"; + + src = fetchFromGitHub { + inherit rev; + owner = "robfig"; + repo = "go-cache"; + sha256 = "032nh3y43bpzpcm7bdkxfh55aydvzc2jzhigvy5gd9f648m4j9ha"; + }; + }; + go-checkpoint = buildGoPackage rec { rev = "88326f6851319068e7b34981032128c0b1a6524d"; name = "go-checkpoint-${stdenv.lib.strings.substring 0 7 rev}"; @@ -858,7 +1049,7 @@ let sha256 = "07dc74kiam8v5my7rhi3yxqrpnaapladhk8b3qbnrpjk3shvnx5f"; }; - buildInputs = [ influxdb-go stathat ]; + buildInputs = [ influxdb stathat ]; }; armon.go-metrics = buildGoPackage rec { @@ -1091,6 +1282,21 @@ let buildInputs = [ go-multierror ]; }; + hipchat-go = buildGoPackage rec { + rev = "1dd13e154219c15e2611fe46adbb6bf65db419b7"; + name = "hipchat-go-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/tbruyelle/hipchat-go"; + + excludedPackages = "examples"; + + src = fetchFromGitHub { + inherit rev; + owner = "tbruyelle"; + repo = "hipchat-go"; + sha256 = "060wg5yjlh28v03mvm80kwgxyny6cyj7zjpcdg032b8b1sz9z81s"; + }; + }; + hologram = buildGoPackage rec { rev = "2bf08f0edee49297358bd06a0c9bf44ba9051e9c"; name = "hologram-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1131,16 +1337,22 @@ let }; }; - influxdb-go = buildGoPackage rec { - rev = "63c9a5f67dcb633d05164bf8442160c9e2e402f7"; - name = "influxdb-go-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/influxdb/influxdb-go"; + influxdb = buildGoPackage rec { + rev = "d80ef2286d476d9e306548305e47c3ba967f5bc2"; + name = "influxdb-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/influxdb/influxdb"; + goPackageAliases = [ + "github.com/influxdb/influxdb-go" + ]; + src = fetchFromGitHub { inherit rev; owner = "influxdb"; - repo = "influxdb-go"; - sha256 = "16in1xhx94pir06aw166inn0hzpb7836xbws16laabs1p2np7bld"; + repo = "influxdb"; + sha256 = "0p3s0pbn5x294qg2r0qgysb5wmspsvjxhccxh2hs6hc24dl6y93b"; }; + + buildInputs = [ bolt crypto statik liner toml pat gollectd ]; }; eckardt.influxdb-go = buildGoPackage rec { @@ -1192,6 +1404,19 @@ let subPackages = [ "./" ]; }; + liner = buildGoPackage rec { + rev = "1bb0d1c1a25ed393d8feb09bab039b2b1b1fbced"; + name = "liner-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/peterh/liner"; + + src = fetchFromGitHub { + inherit rev; + owner = "peterh"; + repo = "liner"; + sha256 = "05ihxpmp6x3hw71xzvjdgxnyvyx2s4lf23xqnfjj16s4j4qidc48"; + }; + }; + log4go = buildGoPackage rec { rev = "48"; name = "log4go-${rev}"; @@ -1206,6 +1431,23 @@ let subPackages = [ "./" ]; # don't build examples }; + logrus = buildGoPackage rec { + rev = "v0.7.3"; + name = "logrus-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/Sirupsen/logrus"; + + excludedPackages = "examples"; + + src = fetchFromGitHub { + inherit rev; + owner = "Sirupsen"; + repo = "logrus"; + sha256 = "1sxksbarllmqb8wz5b2wbwr6q2i32vqasf7bpz4djywy3ig7jwk8"; + }; + + propagatedBuildInputs = [ airbrake-go bugsnag-go raven-go ]; + }; + logutils = buildGoPackage rec { rev = "367a65d59043b4f846d179341d138f01f988c186"; name = "logutils-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1434,16 +1676,62 @@ let }; osext = buildGoPackage rec { - rev = "10"; - name = "osext-${rev}"; - goPackagePath = "bitbucket.org/kardianos/osext"; - src = fetchhg { + rev = "8fef92e41e22a70e700a96b29f066cda30ea24ef"; + name = "osext-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/kardianos/osext"; + goPackageAliases = [ + "github.com/bugsnag/osext" + ]; + + src = fetchFromGitHub { inherit rev; - url = "https://${goPackagePath}"; - sha256 = "1sj9r5pm28l9sqx6354fwp032n53znx9k8495k3dfnyqjrkvlw6n"; + owner = "kardianos"; + repo = "osext"; + sha256 = "1md9c0qlmfhwcwgqg92vfykcy95snci4n815plb15mgj5cf8dm7d"; }; }; + pat = buildGoPackage rec { + rev = "b8a35001b773c267eb260a691f4e5499a3531600"; + name = "pat-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/bmizerany/pat"; + + src = fetchFromGitHub { + inherit rev; + owner = "bmizerany"; + repo = "pat"; + sha256 = "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz"; + }; + }; + + pathtree = buildGoPackage rec { + rev = "41257a1839e945fce74afd070e02bab2ea2c776a"; + name = "pathtree-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/robfig/pathtree"; + + src = fetchFromGitHub { + inherit rev; + owner = "robfig"; + repo = "pathtree"; + sha256 = "087hvskjx1zw815h1617i135vwsn5288v579mz6yral91wbn0kvi"; + }; + }; + + panicwrap = buildGoPackage rec { + rev = "e5f9854865b9778a45169fc249e99e338d4d6f27"; + name = "panicwrap-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/bugsnag/panicwrap"; + + src = fetchFromGitHub { + inherit rev; + owner = "bugsnag"; + repo = "panicwrap"; + sha256 = "01afviklmgm25i82c0z9xkjgbrh0j1fm9a1adqfd2jqv0cm41k9d"; + }; + + propagatedBuildInputs = [ osext ]; + }; + perks = buildGoPackage rec { rev = "aac9e2eab5a334037057336897fd10b0289a5ae8"; name = "perks-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1624,6 +1912,51 @@ let }; }; + raven-go = buildGoPackage rec { + rev = "c8f8fb7c415203f52ca882e2661d21bc6dcb54d7"; + name = "raven-go-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/getsentry/raven-go"; + + src = fetchFromGitHub { + inherit rev; + owner = "getsentry"; + repo = "raven-go"; + sha256 = "052avpl8xsqlcmjmi3v00nm23lhs95af6vpaw2sh5xckln0lfbxh"; + }; + }; + + redigo = buildGoPackage rec { + rev = "535138d7bcd717d6531c701ef5933d98b1866257"; + name = "redigo-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/garyburd/redigo"; + + src = fetchFromGitHub { + inherit rev; + owner = "garyburd"; + repo = "redigo"; + sha256 = "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v"; + }; + }; + + revel = buildGoPackage rec { + rev = "v0.12.0"; + name = "revel-${rev}"; + goPackagePath = "github.com/revel/revel"; + + src = fetchFromGitHub { + inherit rev; + owner = "revel"; + repo = "revel"; + sha256 = "1g88fw5lqh3a9qmx182s64zk3h1s1mx8bljyghissmd9z505pbzf"; + }; + + # Using robfig's old go-cache due to compilation errors. + # Try to switch to pmylund.go-cache after v0.12.0 + propagatedBuildInputs = [ + gocolorize config net pathtree fsnotify.v1 robfig.go-cache redigo gomemcache + ]; + }; + rgbterm = buildGoPackage rec { rev = "c07e2f009ed2311e9c35bca12ec00b38ccd48283"; name = "rgbterm-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1731,6 +2064,21 @@ let }; }; + statik = buildGoPackage rec { + rev = "274df120e9065bdd08eb1120e0375e3dc1ae8465"; + name = "statik-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/rakyll/statik"; + + excludedPackages = "example"; + + src = fetchFromGitHub { + inherit rev; + owner = "rakyll"; + repo = "statik"; + sha256 = "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp"; + }; + }; + termbox-go = buildGoPackage rec { rev = "9aecf65084a5754f12d27508fa2e6ed56851953b"; name = "termbox-go-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1786,14 +2134,15 @@ let }; toml = buildGoPackage rec { - rev = "f87ce853111478914f0bcffa34d43a93643e6eda"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; name = "toml-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/BurntSushi/toml"; + src = fetchFromGitHub { inherit rev; owner = "BurntSushi"; repo = "toml"; - sha256 = "0g8203y9ycf34j2q3ymxb8nh4habgwdrjn9vdgrginllx73yq565"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; }; }; @@ -1822,6 +2171,7 @@ let sha256 = "0q6wlw0s9dig11mzcfg25fh2wz7g70zxkqm7c5f58fncxdby2nqj"; }; + # We just want the consul api not all of consul extraSrcs = [ { inherit (consul) src goPackagePath; } ]; From b10472fae90ee2acfb5de8c6734bf75e86f23547 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 18 May 2015 18:45:57 -0700 Subject: [PATCH 383/615] goPackages: Add dependencies for vault --- pkgs/top-level/go-packages.nix | 143 ++++++++++++++++++++++++++++++--- 1 file changed, 130 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 557d6cc344fe..8359fc541414 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -88,7 +88,7 @@ let { inherit (gcloud-golang) src goPackagePath; } ]; - buildInputs = [ net ]; + propagatedBuildInputs = [ net ]; }; @@ -176,14 +176,15 @@ let }; asn1-ber = buildGoPackage rec { - rev = "ec51d5ed21377b4023ca7b1e70ae4cb296ee6047"; + rev = "295c7b21db5d9525ad959e3382610f3aff029663"; name = "asn1-ber-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/nmcclain/asn1-ber"; + goPackagePath = "github.com/vanackere/asn1-ber"; + src = fetchFromGitHub { inherit rev; - owner = "nmcclain"; + owner = "vanackere"; repo = "asn1-ber"; - sha256 = "0a2d38k7zpcnf148zlxq2rm7s1s1hzybb3w5ygxilipz0m7qkdsb"; + sha256 = "1zamvcbk2xk3vznvckgqmdag32nlv7ip0fr1cc0z9ggai22ddh8n"; }; }; @@ -206,6 +207,9 @@ let rev = "5e038f730cbb99b144eeb1dbf92cd06c2d00b503"; name = "aws-sdk-go-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/awslabs/aws-sdk-go"; + goPackageAliases = [ + "github.com/hashicorp/aws-sdk-go" + ]; src = fetchFromGitHub { inherit rev; @@ -217,6 +221,21 @@ let buildInputs = [ go-ini gucumber testify ]; }; + hashicorp.aws-sdk-go = buildGoPackage rec { + rev = "e6ea0192eee4640f32ec73c0cbb71f63e4f2b65a"; + name = "aws-sdk-go-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/aws-sdk-go"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "aws-sdk-go"; + sha256 = "1qrc2jl38marbarnl31sag7s0h18j2wx1cxkcqin5m1pqg62p4cn"; + }; + + buildInputs = [ go-ini net sandblast ]; + }; + binarydist = buildGoPackage rec { rev = "9955b0ab8708602d411341e55fffd7e0700f86bd"; name = "binarydist-${stdenv.lib.strings.substring 0 7 rev}"; @@ -335,6 +354,21 @@ let }; }; + copystructure = buildGoPackage rec { + rev = "6fc66267e9da7d155a9d3bd489e00dad02666dc6"; + name = "copystructure-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/mitchellh/copystructure"; + + src = fetchFromGitHub { + inherit rev; + owner = "mitchellh"; + repo = "copystructure"; + sha256 = "193s5vhw68d8npjyf5yvc5j24crazvy7d5dk316hl7590qrmbxrd"; + }; + + buildInputs = [ reflectwalk ]; + }; + confd = buildGoPackage rec { rev = "v0.9.0"; name = "confd-${rev}"; @@ -529,6 +563,19 @@ let }; }; + errwrap = buildGoPackage rec { + rev = "7554cd9344cec97297fa6649b055a8c98c2a1e55"; + name = "errwrap-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/hashicorp/errwrap"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "errwrap"; + sha256 = "0kmv0p605di6jc8i1778qzass18m0mv9ks9vxxrfsiwcp4la82jf"; + }; + }; + fsnotify.v1 = buildGoPackage rec { rev = "v1.2.0"; name = "fsnotify.v1-${rev}"; @@ -1064,7 +1111,7 @@ let sha256 = "0ia9i96nac7vnmf5qb98rs74npf3vg55kdsvmql8cwgfpmqqcfdh"; }; - buildInputs = [ prometheus.client_golang ]; + propagatedBuildInputs = [ prometheus.client_golang ]; }; go-multierror = buildGoPackage rec { @@ -1222,6 +1269,19 @@ let }; }; + go-zookeeper = buildGoPackage rec { + rev = "d0e0d8e11f318e000a8cc434616d69e329edc374"; + name = "go-zookeeper-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/samuel/go-zookeeper"; + + src = fetchFromGitHub { + inherit rev; + owner = "samuel"; + repo = "go-zookeeper"; + sha256 = "0v6g14ygnjl1l2fykyfjyvnab82a70jy0zzmsn5swlyy45b9gq2d"; + }; + }; + grafana = buildGoPackage rec { version = "2.0.0-beta1"; name = "grafana-v${version}"; @@ -1307,7 +1367,7 @@ let repo = "hologram"; sha256 = "1ra6rdniqh3pi84fm29zam4irzv52a1dd2sppaqngk07f7rkkhi4"; }; - buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir ldap g2s gox ]; + buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir nmcclain.ldap g2s gox ]; }; http2 = buildGoPackage rec { @@ -1390,18 +1450,34 @@ let }; }; - ldap = buildGoPackage rec { + nmcclain.ldap = buildGoPackage rec { rev = "469fe5a802d61523b40dbb29bb8012a6b99b06b5"; name = "ldap-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/nmcclain/ldap"; + src = fetchFromGitHub { inherit rev; owner = "nmcclain"; repo = "ldap"; sha256 = "0xq5dc03ym0wlg9mvf4gbrmj74l4c8bgkls8fd7c98a128qw2srk"; }; + + propagatedBuildInputs = [ asn1-ber ]; + }; + + vanackere.ldap = buildGoPackage rec { + rev = "e29b797d1abde6567ccb4ab56236e033cabf845a"; + name = "ldap-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/vanackere/ldap"; + + src = fetchFromGitHub { + inherit rev; + owner = "vanackere"; + repo = "ldap"; + sha256 = "069n242wszl04z0cyrwfzpdf64ziw5c3ps4czrsdsx7h4msmvr1x"; + }; + propagatedBuildInputs = [ asn1-ber ]; - subPackages = [ "./" ]; }; liner = buildGoPackage rec { @@ -1770,6 +1846,19 @@ let doCheck = false; # bad import path in tests }; + pq = buildGoPackage rec { + rev = "93e9980741c9e593411b94e07d5bad8cfb4809db"; + name = "pq-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/lib/pq"; + + src = fetchFromGitHub { + inherit rev; + owner = "lib"; + repo = "pq"; + sha256 = "1q0zlizsk3xn7jn0skbvbhcxsfhq7z3dva96cm72n2r5vs5ld783"; + }; + }; + pretty = buildGoPackage rec { rev = "bc9499caa0f45ee5edb2f0209fbd61fbf3d9018f"; name = "pretty-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1938,6 +2027,19 @@ let }; }; + reflectwalk = buildGoPackage rec { + rev = "242be0c275dedfba00a616563e6db75ab8f279ec"; + name = "reflectwalk-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/mitchellh/reflectwalk"; + + src = fetchFromGitHub { + inherit rev; + owner = "mitchellh"; + repo = "reflectwalk"; + sha256 = "0xjyjs7ci7yaslk0rcgdw99ys2kq0p14cx6c90pmdzl0m9pcc9v4"; + }; + }; + revel = buildGoPackage rec { rev = "v0.12.0"; name = "revel-${rev}"; @@ -1969,6 +2071,21 @@ let }; }; + sandblast = buildGoPackage rec { + rev = "694d24817b9b7b8bacb6d458b7989b30d7fe3555"; + name = "sandblast-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/aarzilli/sandblast"; + + src = fetchFromGitHub { + inherit rev; + owner = "aarzilli"; + repo = "sandblast"; + sha256 = "1pj0bic3x89v44nr8ycqxwnafkiz3cr5kya4wfdfj5ldbs5xnq9l"; + }; + + buildInputs = [ net text ]; + }; + scada-client = buildGoPackage rec { rev = "c26580cfe35393f6f4bf1b9ba55e6afe33176bae"; name = "scada-client-${stdenv.lib.strings.substring 0 7 rev}"; @@ -2177,10 +2294,10 @@ let ]; buildInputs = [ - armon.go-metrics go-radix mysql go-querystring aws-sdk-go errwrap - go-multierror go-syslog golang-lru hcl logutils pq cli copystructure - go-homedir mapstructure reflectwalk columnize go-zookeeper asn1-ber ldap - go-ini crypto net oauth2 + armon.go-metrics go-radix mysql go-querystring hashicorp.aws-sdk-go + errwrap go-multierror go-syslog golang-lru hcl logutils pq cli + copystructure go-homedir mapstructure reflectwalk columnize go-zookeeper + asn1-ber vanackere.ldap go-ini crypto net oauth2 osext go-github ]; }; From 609002cc94325b165991e566c904d8f27584d2f2 Mon Sep 17 00:00:00 2001 From: Chris Double Date: Tue, 19 May 2015 14:52:52 +1200 Subject: [PATCH 384/615] Update tor-browser to 4.5.1 --- pkgs/tools/security/tor/torbrowser.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 67d8b1105681..4ab0cabbcd31 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "4.5"; + version = "4.5.1"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz"; sha256 = if bits == "64" then - "15scfjzpbih7pzpqh4jd7jmc9g93sx2myfs6ykr70f5hbc7qhwmg" else - "0lrvhka3z9bh0snplsnxshs8i9iww187ipfn7f96hp5rxgl30p49"; + "0nbjw04xbzb5d4q0j05nq9p8vdpzqxzhbywjxdgpc5mc73jyv8mr" else + "0fkzgdyxi7gl3kyfp0jmbky61a1b2yg9747h75bgkkndnqxnmkqw"; }; patchPhase = '' From 76c34a9590585702c0bc75cf7f60499b6a682825 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 19 May 2015 10:43:06 +0200 Subject: [PATCH 385/615] prometheus/pushgateway: fix after golang_protobuf_extensions update --- pkgs/servers/monitoring/prometheus/pushgateway/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix index db66e963208e..c16cb7a9408e 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix @@ -37,6 +37,9 @@ buildGoPackage rec { ( cd "go/src/$goPackagePath" go-bindata ./resources/ + ${govers}/bin/govers -d -m github.com/matttproud/golang_protobuf_extensions/ext github.com/matttproud/golang_protobuf_extensions/pbutil + substituteInPlace handler/push.go \ + --replace ext.ReadDelimited pbutil.ReadDelimited ) ''; From 557c1401afee15975a4b7f896a7a98171570d259 Mon Sep 17 00:00:00 2001 From: Paulus Esterhazy Date: Tue, 21 Apr 2015 12:25:09 +0200 Subject: [PATCH 386/615] Add unfree Oracle instant client and SQLPlus CLI utility. --- .../oracle-instantclient/default.nix | 67 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 69 insertions(+) create mode 100644 pkgs/development/libraries/oracle-instantclient/default.nix diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix new file mode 100644 index 000000000000..ebb3aaeee582 --- /dev/null +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -0,0 +1,67 @@ +{ stdenv, requireFile, libelf, gcc, glibc, patchelf, unzip, rpmextract, libaio }: + +let requireSource = version: part: hash: (requireFile rec { + name = "oracle-instantclient12.1-${part}-${version}.x86_64.rpm"; + message = '' + This Nix expression requires that ${name} already + be part of the store. Download the file + manually at + + http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html + + and add it to the Nix store with the following command: + + nix-prefetch-url file://${name} ${hash} --type sha256 +''; + url = "http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html"; + sha256 = hash; +}); in stdenv.mkDerivation rec { + version = "12.1.0.2.0-1"; + name = "oracle-instantclient-${version}"; + + srcBase = (requireSource version "basic" "f0e51e247cc3f210b950fd939ab1f696de9ca678d1eb179ba49ac73acb9a20ed"); + srcDevel = (requireSource version "devel" "13b638882f07d6cfc06c85dc6b9eb5cac37064d3d594194b6b09d33483a08296"); + srcSqlplus = (requireSource version "sqlplus" "16d87w1lii0ag47c8srnr7v4wfm9q4hy6gka8m3v6gp9cc065vam"); + + buildInputs = [ glibc patchelf rpmextract ]; + + buildCommand = '' + mkdir -p "${name}" + cd "${name}" + ${rpmextract}/bin/rpmextract "${srcBase}" + ${rpmextract}/bin/rpmextract "${srcDevel}" + ${rpmextract}/bin/rpmextract "${srcSqlplus}" + + mkdir -p "$out/"{bin,include,lib,"share/${name}/demo/"} + mv "usr/share/oracle/12.1/client64/demo/"* "$out/share/${name}/demo/" + mv "usr/include/oracle/12.1/client64/"* "$out/include/" + mv "usr/lib/oracle/12.1/client64/lib/"* "$out/lib/" + mv "usr/lib/oracle/12.1/client64/bin/"* "$out/bin/" + ln -s "$out/bin/sqlplus" "$out/bin/sqlplus64" + + for lib in $out/lib/lib*.so; do + test -f $lib || continue + chmod +x $lib + patchelf --force-rpath --set-rpath "$out/lib:${libaio}/lib" \ + $lib + done + + for exe in $out/bin/sqlplus; do + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --force-rpath --set-rpath "$out/lib:${libaio}/lib" \ + $exe + done + ''; + + meta = with stdenv.lib; { + description = "Oracle instant client libraries and sqlplus CLI."; + longDescription = '' + Oracle instant client provides access to Oracle databases (OCI, + OCCI, Pro*C, ODBC or JDBC). This package includes the sqlplus + command line SQL client. + ''; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ pesterhazy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 201f6d59ac59..35d76ceb36ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -623,6 +623,8 @@ let pass = callPackage ../tools/security/pass { }; + oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { }; + setfile = callPackage ../os-specific/darwin/setfile { }; install_name_tool = callPackage ../os-specific/darwin/install_name_tool { }; From 68bf202b6570e2b01e5c2b90449bb6559bbdda99 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 19 May 2015 13:26:23 +0200 Subject: [PATCH 387/615] easytag: use gnome defaultIconTheme --- pkgs/applications/audio/easytag/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 2d738f55c286..cb1def12dfd0 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib , libvorbis, libogg, flac, itstool, libxml2, gsettings_desktop_schemas -, makeWrapper, gnome_icon_theme, dconf +, makeWrapper, gnome3 }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram $out/bin/easytag \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" ''; NIX_LDFLAGS = "-lid3tag -lz"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ pkgconfig intltool gtk3 glib libid3tag id3lib taglib libvorbis libogg flac - itstool libxml2 gsettings_desktop_schemas gnome_icon_theme dconf + itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme gnome3.dconf ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35d76ceb36ab..60b175e93fc8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11615,9 +11615,7 @@ let inherit (xlibs) libX11 xproto; }; - easytag = callPackage ../applications/audio/easytag { - inherit (gnome3) gnome_icon_theme dconf; - }; + easytag = callPackage ../applications/audio/easytag { }; mp3gain = callPackage ../applications/audio/mp3gain { }; From 2274382be9fe6a79299e2637ec50db172619cabc Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 19 May 2015 13:37:44 +0200 Subject: [PATCH 388/615] gpodder: use gnome defaultIconTheme --- pkgs/applications/audio/gpodder/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index e8c14a9c763d..853cdff4a515 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,5 +1,5 @@ { pkgs, stdenv, fetchurl, python, buildPythonPackage, pythonPackages, mygpoclient, intltool, - ipodSupport ? true, libgpod, gnome3, hicolor_icon_theme }: + ipodSupport ? true, libgpod, gnome3 }: with pkgs.lib; @@ -16,8 +16,7 @@ in buildPythonPackage rec { buildInputs = [ coverage feedparser minimock sqlite3 mygpoclient intltool - gnome3.gnome_themes_standard gnome3.gnome_icon_theme - gnome3.gnome_icon_theme_symbolic hicolor_icon_theme + gnome3.gnome_themes_standard gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ]; From 1b6401fd2e5de0b89dd181d0602e67036ec72c37 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 19 May 2015 14:40:04 +0200 Subject: [PATCH 389/615] More usage of gnome3.defaultIconTheme --- pkgs/applications/audio/pavucontrol/default.nix | 2 +- pkgs/applications/graphics/shotwell/default.nix | 3 +-- pkgs/applications/misc/finalterm/default.nix | 2 +- .../networking/instant-messengers/ekiga/default.nix | 3 +-- pkgs/applications/networking/newsreaders/liferea/default.nix | 4 ++-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 8e4c31302e26..7e392679c712 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ pulseaudio gtkmm3 libcanberra_gtk3 makeWrapper - gnome3.gnome_icon_theme ]; + gnome3.defaultIconTheme ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 629126503c92..d438bb77b859 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -51,8 +51,7 @@ in stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev gnome3.gexiv2 libraw rest json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg makeWrapper gnome_doc_utils - gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic - hicolor_icon_theme ]; + gnome3.defaultIconTheme ]; meta = with stdenv.lib; { description = "Popular photo organizer for the GNOME desktop"; diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index e4b0675aa945..bdd1a9e8e28e 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { wrapProgram "$out/bin/finalterm" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index cae9fe294f34..7ce47d53d141 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool perl perlXMLParser evolution_data_server gnome_doc_utils avahi libsigcxx gtk dbus_glib libnotify libXext xextproto sqlite - gnome3.libsoup glib gnome3.gnome_icon_theme_symbolic - hicolor_icon_theme gnome3.gnome_icon_theme boost + gnome3.libsoup glib gnome3.defaultIconTheme boost autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr nss zlib libsecret libXrandr randrproto which libxslt libtasn1 gmp nettle makeWrapper ]; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 904f69049798..26078c8e5830 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { webkitgtk json_glib gobjectIntrospection gnome3.gsettings_desktop_schemas gnome3.libpeas gnome3.dconf gst-plugins-base gst-plugins-good gst-plugins-bad - gnome3.libgnome_keyring + gnome3.libgnome_keyring gnome3.defaultIconTheme libnotify makeWrapper ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" done ''; From 9adde87feae51574d0317cb6a9e0e60a40388466 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 19 May 2015 14:44:27 +0200 Subject: [PATCH 390/615] More usage of gnome3.defaultIconTheme --- pkgs/applications/video/pitivi/default.nix | 2 +- pkgs/development/tools/misc/d-feet/default.nix | 2 +- pkgs/misc/emulators/cdemu/analyzer.nix | 3 ++- pkgs/misc/emulators/cdemu/gui.nix | 3 ++- pkgs/tools/audio/gvolicon/default.nix | 4 ++-- pkgs/tools/audio/pasystray/default.nix | 9 ++++++--- pkgs/tools/networking/gupnp-tools/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 4 +--- 8 files changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 5b77ec916b08..743df2647f1a 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { buildInputs = [ gobjectIntrospection clutter-gst clutter-gtk librsvg gnome3.gnome_desktop - hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic + gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas libnotify ] ++ (with gst; [ gstreamer gst-python gst-editing-services diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 5afe5525d0e2..df26db519dcd 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 itstool intltool glib gtk3 pep8 python - gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic + gnome3.defaultIconTheme makeWrapper pygobject3 libwnck3 ]; diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix index 6126108b642d..c9651fd06145 100644 --- a/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/pkgs/misc/emulators/cdemu/analyzer.nix @@ -5,7 +5,8 @@ let pkg = import ./base.nix { pkgSha256 = "1rb3f7c08dxc02zrwrkfvq7qlzlmm0kd2ah1fhxj6ajiyshi8q4v"; }; in callPackage pkg { - buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme gdk_pixbuf librsvg ]; + buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper + gnome3.defaultIconTheme gdk_pixbuf librsvg ]; drvParams = { postFixup = '' wrapProgram $out/bin/image-analyzer \ diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix index b3d7f6d23ec7..226031a2eb75 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/misc/emulators/cdemu/gui.nix @@ -5,7 +5,8 @@ let pkg = import ./base.nix { pkgSha256 = "1m5ab325r586v2y2d93a817phn6wck67y5mfkf948mph40ks0mqk"; }; in callPackage pkg { - buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme gdk_pixbuf librsvg ]; + buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper + gnome3.defaultIconTheme gdk_pixbuf librsvg ]; drvParams = { postFixup = '' wrapProgram $out/bin/gcdemu \ diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 6bcddfa72f1b..d885a6ac902e 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, hicolor_icon_theme, gdk_pixbuf, librsvg }: +{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, gdk_pixbuf, librsvg }: stdenv.mkDerivation { name = "gvolicon"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; buildInputs = [ pkgconfig makeWrapper alsaLib gnome3.gtk ]; - propagatedBuildInputs = [ gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic hicolor_icon_theme gdk_pixbuf librsvg ]; + propagatedBuildInputs = [ gnome3.defaultIconTheme gdk_pixbuf librsvg ]; installPhase = '' make install PREFIX=$out wrapProgram "$out/bin/gvolicon" \ diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 42a2c9c3a12c..0a378dbe36b8 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, unzip, autoconf, automake, makeWrapper, pkgconfig, gnome_icon_theme, avahi, gtk3, libnotify, pulseaudio, x11}: +{stdenv, fetchurl, unzip, autoconf, automake, makeWrapper, pkgconfig +, avahi, gtk3, libnotify, pulseaudio, x11}: stdenv.mkDerivation rec { name = "pasystray-0.4.0"; @@ -8,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1gpb7yqcxqglv50iqbkg2lg3r0z07jm4ir2zqmvns6sgddks590w"; }; - buildInputs = [ unzip autoconf automake makeWrapper pkgconfig gnome_icon_theme avahi gtk3 libnotify pulseaudio x11 ]; + buildInputs = [ unzip autoconf automake makeWrapper pkgconfig + gnome3.defaultIconTheme + avahi gtk3 libnotify pulseaudio x11 ]; preConfigure = '' aclocal @@ -19,7 +22,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/pasystray" \ - --prefix XDG_DATA_DIRS : "${gnome_icon_theme}/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index 54f3e860e0c7..d0f2ef546691 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -9,10 +9,11 @@ stdenv.mkDerivation rec { sha256 = "160dgh9pmlb85qfavwqz46lqawpshs8514bx2b57f9rbiny8kbij"; }; - buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av gnome3.gnome_icon_theme gnome3.gnome_themes_standard makeWrapper]; + buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av + gnome3.defaultIconTheme gnome3.gnome_themes_standard makeWrapper]; postInstall = '' - wrapProgram "$out/bin/gupnp-av-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme}/share:$out/share" - wrapProgram "$out/bin/gupnp-universal-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme}/share:$out/share" + wrapProgram "$out/bin/gupnp-av-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.defaultIconTheme}/share:$out/share" + wrapProgram "$out/bin/gupnp-universal-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.defaultIconTheme}/share:$out/share" ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60b175e93fc8..10143e76d5d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2208,9 +2208,7 @@ let pa_applet = callPackage ../tools/audio/pa-applet { }; - pasystray = callPackage ../tools/audio/pasystray { - inherit (gnome3) gnome_icon_theme; - }; + pasystray = callPackage ../tools/audio/pasystray { }; pnmixer = callPackage ../tools/audio/pnmixer { }; From 22f957dad28ba7df6a32c56f8189662c67106acc Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 19 May 2015 14:45:00 +0200 Subject: [PATCH 391/615] Drop gnome_icon_theme* from gnome3 --- pkgs/desktops/gnome-3/3.16/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix index 6243b2dd6d40..15f4a210e04a 100644 --- a/pkgs/desktops/gnome-3/3.16/default.nix +++ b/pkgs/desktops/gnome-3/3.16/default.nix @@ -37,10 +37,6 @@ rec { # Simplify the nixos module and gnome packages defaultIconTheme = adwaita-icon-theme; -# Backward compatibility, must be removed in favor of defaultIconTheme - gnome_icon_theme = adwaita-icon-theme; - gnome_icon_theme_symbolic = adwaita-icon-theme; - #### Core (http://ftp.acc.umu.se/pub/GNOME/core/) adwaita-icon-theme = callPackage ./core/adwaita-icon-theme { }; From 10f49c84dd23339ac8b7707db3e27d4c5c915338 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 19 May 2015 14:46:45 +0200 Subject: [PATCH 392/615] Remove last reference to gnome3.gnome_icon_theme --- pkgs/applications/office/gnumeric/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index e82ce2d7b9ed..14e130ba1ffc 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser -, goffice, makeWrapper, gtk3, gnome_icon_theme, gnome3 +, gnome3, makeWrapper, gtk3 }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # ToDo: optional libgda, python, introspection? buildInputs = [ pkgconfig intltool perl perlXMLParser - goffice gtk3 makeWrapper + gnome3.goffice gtk3 makeWrapper gnome3.defaultIconTheme ]; preFixup = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10143e76d5d9..d582114946cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11114,9 +11114,7 @@ let inherit (gnome) GConf; }; - gnumeric = callPackage ../applications/office/gnumeric { - inherit (gnome3) goffice gnome_icon_theme; - }; + gnumeric = callPackage ../applications/office/gnumeric { }; gnunet = callPackage ../applications/networking/p2p/gnunet { }; From 8f648b2d14db39b73d31d23d4fcbc54eb6f9d0e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 19 May 2015 15:25:52 +0200 Subject: [PATCH 393/615] rbtools: 0.7.1 -> 0.7.2 --- pkgs/development/python-modules/rbtools/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix index 889f3df52aef..b63750815513 100644 --- a/pkgs/development/python-modules/rbtools/default.nix +++ b/pkgs/development/python-modules/rbtools/default.nix @@ -1,13 +1,17 @@ { stdenv, fetchurl, pythonPackages, python }: pythonPackages.buildPythonPackage rec { - name = "rbtools-0.7.1"; + name = "rbtools-0.7.2"; namePrefix = ""; src = fetchurl { - url = "http://downloads.reviewboard.org/releases/RBTools/0.7/RBTools-0.7.1.tar.gz"; - sha256 = "0axi4jf19ia2jwrs3b0xni7v317v03wj35richi111cm3pw6p2gb"; + url = "http://downloads.reviewboard.org/releases/RBTools/0.7/RBTools-0.7.2.tar.gz"; + sha256 = "1ng8l8cx81cz23ls7fq9wz4ijs0zbbaqh4kj0mj6plzcqcf8na4i"; }; propagatedBuildInputs = [ python.modules.sqlite3 pythonPackages.six ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; } From 9d07c54fa11bc577f8fc946aef9be9d059d4f40a Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 16 May 2015 23:22:35 +0200 Subject: [PATCH 394/615] nixos: add bird module patch bird to look in /var/run for birc.ctl --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/bird.nix | 76 +++++++++++++++++++ pkgs/servers/bird/default.nix | 8 ++ .../servers/bird/dont-create-sysconfdir.patch | 13 ++++ 5 files changed, 100 insertions(+) create mode 100644 nixos/modules/services/networking/bird.nix create mode 100644 pkgs/servers/bird/dont-create-sysconfdir.patch diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 0039ca74ba85..3f45f78a9d89 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -217,6 +217,7 @@ lambdabot = 191; asterisk = 192; plex = 193; + bird = 195; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -412,6 +413,7 @@ #asterisk = 192; # unused plex = 193; sabnzbd = 194; + bird = 195; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 043b0470edf2..bef3f7f2fe73 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -252,6 +252,7 @@ ./services/networking/atftpd.nix ./services/networking/avahi-daemon.nix ./services/networking/bind.nix + ./services/networking/bird.nix ./services/networking/bitlbee.nix ./services/networking/btsync.nix ./services/networking/charybdis.nix diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix new file mode 100644 index 000000000000..2fa1d6af7d2f --- /dev/null +++ b/nixos/modules/services/networking/bird.nix @@ -0,0 +1,76 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkEnableOption mkIf mkOption singleton types; + inherit (pkgs) bird; + cfg = config.services.bird; + + configFile = pkgs.writeText "bird.conf" '' + ${cfg.config} + ''; +in + +{ + + ###### interface + + options = { + + services.bird = { + + enable = mkEnableOption "BIRD Internet Routing Daemon"; + + config = mkOption { + type = types.string; + description = '' + BIRD Internet Routing Daemon configuration file. + http://bird.network.cz/?get_doc&f=bird-3.html + ''; + }; + + user = mkOption { + type = types.string; + default = "ircd"; + description = '' + BIRD Internet Routing Daemon user. + ''; + }; + + group = mkOption { + type = types.string; + default = "ircd"; + description = '' + BIRD Internet Routing Daemon group. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + users.extraUsers = singleton { + name = cfg.user; + description = "BIRD Internet Routing Daemon user"; + uid = config.ids.uids.bird; + group = cfg.group; + }; + + users.extraGroups = singleton { + name = cfg.group; + gid = config.ids.gids.bird; + }; + + systemd.services.bird = { + description = "BIRD Internet Routing Daemon"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${bird}/bin/bird -d -c ${configFile} -s /var/run/bird.ctl -u ${cfg.user} -g ${cfg.group}"; + }; + }; + }; +} diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 9b17551a8cbb..c13ad64fca3f 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -10,6 +10,14 @@ stdenv.mkDerivation rec { buildInputs = [ flex bison readline ]; + patches = [ + ./dont-create-sysconfdir.patch + ]; + + configureFlags = [ + "--localstatedir /var" + ]; + meta = { description = "BIRD Internet Routing Daemon"; homepage = http://bird.network.cz; diff --git a/pkgs/servers/bird/dont-create-sysconfdir.patch b/pkgs/servers/bird/dont-create-sysconfdir.patch new file mode 100644 index 000000000000..0a11c8a2a8d8 --- /dev/null +++ b/pkgs/servers/bird/dont-create-sysconfdir.patch @@ -0,0 +1,13 @@ +diff --git a/tools/Makefile.in b/tools/Makefile.in +index 062ba91..4fd7453 100644 +--- a/tools/Makefile.in ++++ b/tools/Makefile.in +@@ -68,7 +68,7 @@ tags: + cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]` + + install: all +- $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@ ++ $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) + $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX@ + $(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl@SUFFIX@ + if test -n "@CLIENT@" ; then \ From cae7278fae3e9988d42b98e46c98702fea8e61df Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 19 May 2015 14:25:28 +0000 Subject: [PATCH 395/615] titaniumsdk: upgrade 3.5.0 to 3.5.1 --- pkgs/development/mobile/titaniumenv/default.nix | 4 ++-- .../mobile/titaniumenv/examples/default.nix | 2 +- .../mobile/titaniumenv/titaniumsdk-3.5.nix | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 14ef4c20047e..cc3f607c0c32 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,4 +1,4 @@ -{pkgs, pkgs_i686, xcodeVersion ? "6.1.1", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "3.5.0.GA"}: +{pkgs, pkgs_i686, xcodeVersion ? "6.1.1", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "3.5.1.GA"}: let # We have to use Oracle's JDK. On Darwin, just simply expose the host system's @@ -33,7 +33,7 @@ rec { else if tiVersion == "3.2.3.GA" then ./titaniumsdk-3.2.nix else if tiVersion == "3.3.0.GA" then ./titaniumsdk-3.3.nix else if tiVersion == "3.4.0.GA" then ./titaniumsdk-3.4.nix - else if tiVersion == "3.5.0.GA" then ./titaniumsdk-3.5.nix + else if tiVersion == "3.5.1.GA" then ./titaniumsdk-3.5.nix else throw "Titanium version not supported: "+tiVersion; in import titaniumSdkFile { diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index 487f93052f2f..13345f5dedd6 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -2,7 +2,7 @@ , systems ? [ "x86_64-linux" "x86_64-darwin" ] , xcodeVersion ? "6.1.1" , xcodeBaseDir ? "/Applications/Xcode.app" -, tiVersion ? "3.5.0.GA" +, tiVersion ? "3.5.1.GA" , rename ? false , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "8.1", iosWwdrCertificate ? null , allowUnfree ? false diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix index 8a868321e136..f9c5ce8812f3 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl, unzip, makeWrapper, python, jdk}: stdenv.mkDerivation { - name = "mobilesdk-3.5.0.GA"; + name = "mobilesdk-3.5.1.GA"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://builds.appcelerator.com/mobile/3.5.0/mobilesdk-3.5.0.GA-linux.zip; - sha1 = "c9850d5db29d8fb0c26b114e8c34bb2c91958eed"; + url = http://builds.appcelerator.com/mobile/3.5.1/mobilesdk-3.5.1.GA-linux.zip; + sha1 = "2fd8c50081af9d03b65ffaf824e2e417832efd92"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://builds.appcelerator.com/mobile/3.5.0/mobilesdk-3.5.0.GA-osx.zip; - sha1 = "a5ce74f13da09215b7efa81d626c6e6e83d6dc3b"; + url = http://builds.appcelerator.com/mobile/3.5.1/mobilesdk-3.5.1.GA-osx.zip; + sha1 = "f000e66980c2c3a40b6a6fd40a0bd0554fcb0424"; } else throw "Platform: ${stdenv.system} not supported!"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { # Rename ugly version number cd mobilesdk/* - cd 3.5.0.GA + cd 3.5.1.GA # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that # Yes, I know it's nasty :-) From 3e35ea305f69fab6e139772340b71f8e5f8ddc1d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 13 May 2015 16:10:07 +0300 Subject: [PATCH 396/615] postgresql-backup: cleanup --- nixos/modules/services/backup/postgresql-backup.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix index c4127543f10d..4a5ebebc682e 100644 --- a/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixos/modules/services/backup/postgresql-backup.nix @@ -3,9 +3,9 @@ with lib; let - inherit (pkgs) postgresql gzip; + inherit (pkgs) gzip; - location = config.services.postgresqlBackup.location ; + location = config.services.postgresqlBackup.location; postgresqlBackupCron = db: '' From e697219d3d5eae7718eceb5e30bda6765a5b170d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Tue, 19 May 2015 18:22:12 +0200 Subject: [PATCH 397/615] openjdk8: work around gnupatch latest feature of not following symlinks, even when --follow-symlinks is specified. --- .../compilers/openjdk/fix-java-home-jdk8.patch | 15 +++++++++++++++ pkgs/development/compilers/openjdk/openjdk8.nix | 11 ++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch b/pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch new file mode 100644 index 000000000000..6189412c999c --- /dev/null +++ b/pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch @@ -0,0 +1,15 @@ +--- a/hotspot/src/os/linux/vm/os_linux.cpp 2015-02-04 21:14:39.000000000 +0100 ++++ b/hotspot/src/os/linux/vm/os_linux.cpp 2015-05-19 16:17:29.960107613 +0200 +@@ -2304,10 +2304,8 @@ + assert(ret, "cannot locate libjvm"); + char *rp = NULL; + if (ret && dli_fname[0] != '\0') { +- rp = realpath(dli_fname, buf); ++ snprintf(buf, buflen, "%s", dli_fname); + } +- if (rp == NULL) +- return; + + if (Arguments::created_by_gamma_launcher()) { + // Support for the gamma launcher. Typical value for buf is + diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix index 44e934741635..b26baef88590 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/openjdk8.nix @@ -50,11 +50,16 @@ let ''; prePatch = '' # despite --with-override-jdk the build still searchs here - ln -s "../jdk-${repover}" "jdk"; - ln -s "../hotspot-${repover}" "hotspot"; + # GNU Patch bug, follow symlinks only follow the last symlink.. + mv "../jdk-${repover}" "jdk"; + mv "../hotspot-${repover}" "hotspot"; + ''; + postPatch = '' + mv jdk "../jdk-${repover}"; + mv hotspot "../hotspot-${repover}"; ''; patches = [ - ./fix-java-home.patch + ./fix-java-home-jdk8.patch ./read-truststore-from-env-jdk8.patch ./currency-date-range-jdk8.patch ]; From b84f3e85d9921c7ebc9e9526cafcd84077d396ad Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 19 May 2015 08:11:42 -0500 Subject: [PATCH 398/615] Fix QGtkStyle for Qt 5 versions --- pkgs/development/libraries/qt-5/5.3/default.nix | 4 +++- pkgs/development/libraries/qt-5/5.4/qtbase.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix index 55de4265d3ee..907cec49020c 100644 --- a/pkgs/development/libraries/qt-5/5.3/default.nix +++ b/pkgs/development/libraries/qt-5/5.3/default.nix @@ -119,6 +119,7 @@ stdenv.mkDerivation rec { -xcb -qpa xcb -${optionalString (cups == null) "no-"}cups + -${optionalString (!gtkStyle) "no-"}gtkstyle -no-eglfs -no-directfb @@ -155,7 +156,8 @@ stdenv.mkDerivation rec { ++ optionals mesaSupported [ mesa mesa_glu ] ++ optional (cups != null) cups ++ optional (mysql != null) mysql.lib - ++ optional (postgresql != null) postgresql; + ++ optional (postgresql != null) postgresql + ++ optionals gtkStyle [gnome_vfs libgnomeui gtk GConf]; 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 746889f279d7..9e11dcdde868 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix @@ -115,6 +115,7 @@ stdenv.mkDerivation { -xcb -qpa xcb -${optionalString (cups == null) "no-"}cups + -${optionalString (!gtkStyle) "no-"}gtkstyle -no-eglfs -no-directfb @@ -150,7 +151,8 @@ stdenv.mkDerivation { ++ optionals mesaSupported [ mesa mesa_glu ] ++ optional (cups != null) cups ++ optional (mysql != null) mysql.lib - ++ optional (postgresql != null) postgresql; + ++ optional (postgresql != null) postgresql + ++ optionals gtkStyle [gnome_vfs libgnomeui gtk GConf]; buildInputs = [ gdb bison flex gperf ruby ]; From 24be3cfcff6d1014e03a902b020675edc1d66d44 Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Tue, 19 May 2015 00:42:09 -0700 Subject: [PATCH 399/615] ghc: add Darwin patch for #10322 --- pkgs/development/compilers/ghc/7.10.1.nix | 3 + .../compilers/ghc/osx-dylib-resolver.patch | 60 +++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/compilers/ghc/osx-dylib-resolver.patch diff --git a/pkgs/development/compilers/ghc/7.10.1.nix b/pkgs/development/compilers/ghc/7.10.1.nix index 4eb4a501e4e3..34c2e3b36b0c 100644 --- a/pkgs/development/compilers/ghc/7.10.1.nix +++ b/pkgs/development/compilers/ghc/7.10.1.nix @@ -42,6 +42,9 @@ stdenv.mkDerivation rec { url = "https://git.haskell.org/ghc.git/patch/c46e4b184e0abc158ad8f1eff6b3f0421acaf984"; sha256 = "0fkdyqd4bqp742rydwmqq8d2n7gf61bgdhaiw8xf7jy0ix7lr60w"; }) + # Fix TH + indirect symbol resolution on OSX (or any system using gold linker) + # https://phabricator.haskell.org/D852 + ./osx-dylib-resolver.patch ]; postPatch = '' diff --git a/pkgs/development/compilers/ghc/osx-dylib-resolver.patch b/pkgs/development/compilers/ghc/osx-dylib-resolver.patch new file mode 100644 index 000000000000..50236026031e --- /dev/null +++ b/pkgs/development/compilers/ghc/osx-dylib-resolver.patch @@ -0,0 +1,60 @@ +diff --git a/compiler/ghci/Linker.hs b/compiler/ghci/Linker.hs +--- a/compiler/ghci/Linker.hs ++++ b/compiler/ghci/Linker.hs +@@ -119,9 +119,9 @@ + -- that is really important + pkgs_loaded :: ![PackageKey], + +- -- we need to remember the name of the last temporary DLL/.so +- -- so we can link it +- last_temp_so :: !(Maybe (FilePath, String)) } ++ -- we need to remember the name of previous temporary DLL/.so ++ -- libraries so we can link them (see #10322) ++ temp_sos :: ![(FilePath, String)] } + + + emptyPLS :: DynFlags -> PersistentLinkerState +@@ -131,7 +131,7 @@ + pkgs_loaded = init_pkgs, + bcos_loaded = [], + objs_loaded = [], +- last_temp_so = Nothing } ++ temp_sos = [] } + + -- Packages that don't need loading, because the compiler + -- shares them with the interpreted program. +@@ -841,19 +841,19 @@ + dflags2 = dflags1 { + -- We don't want the original ldInputs in + -- (they're already linked in), but we do want +- -- to link against the previous dynLoadObjs +- -- library if there was one, so that the linker ++ -- to link against previous dynLoadObjs ++ -- libraries if there were any, so that the linker + -- can resolve dependencies when it loads this + -- library. + ldInputs = +- case last_temp_so pls of +- Nothing -> [] +- Just (lp, l) -> ++ concatMap ++ (\(lp, l) -> + [ Option ("-L" ++ lp) + , Option ("-Wl,-rpath") + , Option ("-Wl," ++ lp) + , Option ("-l" ++ l) +- ], ++ ]) ++ (temp_sos pls), + -- Even if we're e.g. profiling, we still want + -- the vanilla dynamic libraries, so we set the + -- ways / build tag to be just WayDyn. +@@ -868,7 +868,7 @@ + consIORef (filesToNotIntermediateClean dflags) soFile + m <- loadDLL soFile + case m of +- Nothing -> return pls { last_temp_so = Just (libPath, libName) } ++ Nothing -> return pls { temp_sos = (libPath, libName) : temp_sos pls } + Just err -> panic ("Loading temp shared object failed: " ++ err) + + rmDupLinkables :: [Linkable] -- Already loaded From e2cc63424f39b7166554fc388e6e1f8732b422b6 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 19 May 2015 03:30:48 +0200 Subject: [PATCH 400/615] rustRegistry: 2015-05-13 -> 2015-05-19 --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index a408ae9e36ca..0de95d59c8e4 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,15 +7,15 @@ { runCommand, fetchFromGitHub, git }: let - version = "2015-05-13"; - rev = "8d879d4e998db3c1fad106503638d318e10fdba6"; + version = "2015-05-19"; + rev = "6280837d21e5a241d961daf968f5379e6e2e392f"; src = fetchFromGitHub { inherit rev; owner = "rust-lang"; repo = "crates.io-index"; - sha256 = "1100vcgxy3ddl1ih3ljd3nig4a2k44ajhawsql1lmcj9783aykav"; + sha256 = "1y5zhpd9l0zsknjnhk1ris45y5jka6d6fklzwwhss39h48vymf91"; }; in From de322b48b7006cf72d6adc37a833f2e045950536 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 19 May 2015 17:30:19 +0200 Subject: [PATCH 401/615] cargo: Fix src hash It seems that when you pass `leaveDotGit = true` to `fetchgit`, sometimes the output can still change (i.e. it's not completely deterministic). This could be due to changes in the upstream git repository... --- pkgs/development/tools/build-managers/cargo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix index f7dd77a12a71..3ac6e1c3e94c 100644 --- a/pkgs/development/tools/build-managers/cargo/default.nix +++ b/pkgs/development/tools/build-managers/cargo/default.nix @@ -11,7 +11,7 @@ buildRustPackage rec { src = fetchgit { url = "https://github.com/rust-lang/cargo.git"; rev = "d814fcbf8efda3027d54c09e11aa7eaf0006a83c"; - sha256 = "1hvsxjv9s30qylcq2vb2nqqn8fix4sk0ah718f8c0flrcqbwa58z"; + sha256 = "0sppd3x2cacmbnypcjip44amnh66lrrbwwzsbz8rqf3nq2ah496x"; leaveDotGit = true; }; From 9b752fd0e15df7a4f3d4f94f16883088614a70b7 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 19 May 2015 18:21:11 +0200 Subject: [PATCH 402/615] buildRustPackage: Don't hardcode registry index hash Instead, discover it automatically when building the package. This makes `buildRustPackage` more future-proof with respect to changes in how `cargo` generates the hash. Also, it fixes broken builds in i686 because apparently, cargo generates a different registry index hash in this architecture (compared to x86-64). --- pkgs/build-support/rust/default.nix | 32 ++++++++++++------- pkgs/build-support/rust/fetch-cargo-deps | 7 ++-- .../tools/build-managers/cargo/default.nix | 2 +- pkgs/development/tools/rust/racer/default.nix | 2 +- 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index ddf2fce3cae5..87115e392daf 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -11,14 +11,6 @@ let sha256 = depsSha256; }; - # The following is the directory name cargo creates when the registry index - # URL is file:///dev/null - # - # It's OK to use /dev/null as the URL because by the time we do this, cargo - # won't attempt to update the registry anymore, so the URL is more or less - # irrelevant - registryIndexDirName = "-ba82b75dd6681d6f"; - in stdenv.mkDerivation (args // { inherit cargoDeps rustRegistry; @@ -34,18 +26,34 @@ in stdenv.mkDerivation (args // { cp -r "$cargoDeps" deps chmod +w deps -R + # It's OK to use /dev/null as the URL because by the time we do this, cargo + # won't attempt to update the registry anymore, so the URL is more or less + # irrelevant + cat < deps/config [registry] index = "file:///dev/null" EOF - echo "Using rust registry from $rustRegistry" - - ln -s "$rustRegistry" "deps/registry/index/${registryIndexDirName}" - export CARGO_HOME="$(realpath deps)" + # Let's find out which $indexHash cargo uses for file:///dev/null + (cd $sourceRoot && cargo fetch &>/dev/null) + cd deps + indexHash="$(basename $(echo registry/index/*))" + + echo "Using indexHash '$indexHash'" + + rm -rf -- "registry/cache/$indexHash" \ + "registry/index/$indexHash" + + mv registry/cache/HASH "registry/cache/$indexHash" + + echo "Using rust registry from $rustRegistry" + ln -s "$rustRegistry" "registry/index/$indexHash" + # Retrieved the Cargo.lock file which we saved during the fetch + cd .. mv deps/Cargo.lock $sourceRoot/ ( diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps index c7799fb1b1f6..69eb404e6445 100755 --- a/pkgs/build-support/rust/fetch-cargo-deps +++ b/pkgs/build-support/rust/fetch-cargo-deps @@ -104,12 +104,9 @@ substituteInPlace Cargo.lock \ set -u mv Cargo.lock $out/ -# The following is the $indexHash cargo uses for the registry index when -# its URL is file:///dev/null, which is the registry index URL we use to make -# sure our output is deterministic. -registryIndexDirName="-ba82b75dd6681d6f" -mv $out/registry/cache/* $out/registry/cache/$registryIndexDirName +# Let's replace $indexHash with something more deterministic +mv $out/registry/cache/* $out/registry/cache/HASH # The registry index changes all the time, so it's not deterministic # We'll symlink it before running 'cargo build' diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix index 3ac6e1c3e94c..e7a45f1c3484 100644 --- a/pkgs/development/tools/build-managers/cargo/default.nix +++ b/pkgs/development/tools/build-managers/cargo/default.nix @@ -15,7 +15,7 @@ buildRustPackage rec { leaveDotGit = true; }; - depsSha256 = "0s9f00kg7q9dxd8g98k3z4qv404p9ra73l1bzxs6qzk54qhg44dp"; + depsSha256 = "1b0mpdxmp7inkg59n2phjwzpz5gx22wqg9rfd1s01a5ylara37jw"; buildInputs = [ file curl pkgconfig python openssl cmake zlib ]; diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 61fe2238a779..0b614f4edc61 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -11,7 +11,7 @@ buildRustPackage rec { sha256 = "0g420cbqpknhl61a4mpk3bbia8agf657d9vzzcqr338lmni80qz7"; }; - depsSha256 = "1wmpd2cjmk59382dq59hmb0xa6fxbnmmaz4nfs96qf613r5ylvra"; + depsSha256 = "0s951apqcr96lvc1jamk6qw3631gwnlnfgcx55vlznfm7shnmywn"; buildInputs = [ makeWrapper ]; From 2817e74d3743f9a5b85bd8f88eca7baa2a588246 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 19 May 2015 18:38:51 +0200 Subject: [PATCH 403/615] cargo: Add myself to maintainers --- pkgs/development/tools/build-managers/cargo/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/cargo/common.nix b/pkgs/development/tools/build-managers/cargo/common.nix index 84158e65a4d8..94b9ca1f6655 100644 --- a/pkgs/development/tools/build-managers/cargo/common.nix +++ b/pkgs/development/tools/build-managers/cargo/common.nix @@ -26,6 +26,7 @@ meta = with stdenv.lib; { homepage = http://crates.io; description = "Downloads your Rust project's dependencies and builds your project"; + maintainers = with maintainers; [ wizeman ]; license = [ licenses.mit licenses.asl20 ]; platforms = platforms.linux; }; From 0cb3c2d684e614b487ec9aae2c7690d995713848 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 19 May 2015 19:20:13 +0200 Subject: [PATCH 404/615] grsecurity: Update stable and test patches stable: 3.1-3.14.43-201505171736 -> 3.1-3.14.43-201505181929 test: 3.1-4.0.4-201505171737 -> 3.1-4.0.4-201505182014 --- pkgs/os-specific/linux/kernel/patches.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 8e24763b1690..4eda63423ed3 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.43"; - revision = "201505171736"; + revision = "201505181929"; branch = "stable"; - sha256 = "1c3wjccinm8aqnqn6dr0rlmff2p4dwc4m383cs8bi9lfj5s1fyzn"; + sha256 = "1ay5qkji09xibaqxnsrcxnnys4n5blxfa2jw9k6f5vzpfdv3mvqm"; }; grsecurity_unstable = grsecPatch { kversion = "4.0.4"; - revision = "201505171737"; + revision = "201505182014"; branch = "test"; - sha256 = "140c3qbv64q658vw9d4912rv0mjch217zkyz1qi9xn6bn1z5kvl5"; + sha256 = "1l1s00zbyzr53p46yj6yh75dbayg9kigv5r6g9mr5irfs5p8s2ay"; }; grsec_fix_path = From 10e001ab5b8e8d8c4390334b62a874df93280f8d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 19 May 2015 19:39:09 +0200 Subject: [PATCH 405/615] ocrad: update from 0.24 to 0.25 --- pkgs/applications/graphics/ocrad/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index b4becafdb0b4..3ec25b503ebf 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, lzip, texinfo }: stdenv.mkDerivation rec { - name = "ocrad-0.24"; + name = "ocrad-0.25"; src = fetchurl { url = "mirror://gnu/ocrad/${name}.tar.lz"; - sha256 = "0hhlx072d00bi9qia0nj5izsq4qkscpfz2mpbyfc72msl3hfvslv"; + sha256 = "1m2dblgvvjs48rsglfdwq0ib9zk8h9n34xsh67ibrg0g0ffbw477"; }; buildInputs = [ lzip texinfo ]; @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optical character recognition (OCR) program & library"; - longDescription = '' GNU Ocrad is an OCR (Optical Character Recognition) program based on a feature extraction method. It reads images in pbm (bitmap), pgm @@ -29,7 +28,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ pSub ]; platforms = platforms.gnu; # arbitrary choice }; From 2c8872f19186c45f18e4f8a0f254c28b309d3b62 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 19 May 2015 19:50:14 +0200 Subject: [PATCH 406/615] gtk-doc: update from 1.21 to 1.23 --- pkgs/development/tools/documentation/gtk-doc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index e1f7f19dd56f..58c8214bd462 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gtk-doc-${version}"; - version = "1.21"; + version = "1.23"; src = fetchurl { url = "mirror://gnome/sources/gtk-doc/${version}/${name}.tar.xz"; - sha256 = "0gpfh25qxsic7n25pfl74mjp38hdm3pr4islhlaxv3p05q0lv4sx"; + sha256 = "1i0q0zaj3f2xg478nxyfhaivkhi6mj0dn0s6qzshzhb625qj6p0b"; }; # maybe there is a better way to pass the needed dtd and xsl files From 7761b0454dfdded85437da9a164956d56cb46822 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 19 May 2015 20:04:26 +0200 Subject: [PATCH 407/615] rddtool: update from 1.4.9 to 1.5.3 --- pkgs/tools/misc/rrdtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 53c1b0de24e2..1688c2d329f3 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff }: stdenv.mkDerivation rec { - name = "rrdtool-1.4.9"; + name = "rrdtool-1.5.3"; src = fetchurl { url = "http://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz"; - sha256 = "1k1506v86nijd9vdljib93z4hrwj786kqnx37lqqbbqasvh2ca1y"; + sha256 = "17qjqq7k50xfahza1gkcfchzss2jjmgr422dzs4kx13lrzsv5rvr"; }; buildInputs = [ gettext perl pkgconfig libxml2 pango cairo groff ]; From b28d29ba0b83eedf5b245ea979fe857a3c3c1d1b Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Tue, 19 May 2015 21:08:16 +0300 Subject: [PATCH 408/615] fix missing argument --- pkgs/tools/audio/pasystray/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 0a378dbe36b8..bbe99eaccbe4 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, unzip, autoconf, automake, makeWrapper, pkgconfig -, avahi, gtk3, libnotify, pulseaudio, x11}: +, gnome3, avahi, gtk3, libnotify, pulseaudio, x11}: stdenv.mkDerivation rec { name = "pasystray-0.4.0"; From d811c6cf41f45e15262b22fa3de04aa10c3e7b3e Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 19 May 2015 20:30:49 +0200 Subject: [PATCH 409/615] skydns: fixed typo --- pkgs/servers/dns/skydns/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/dns/skydns/default.nix b/pkgs/servers/dns/skydns/default.nix index 6536ad972b74..ba311918c71e 100644 --- a/pkgs/servers/dns/skydns/default.nix +++ b/pkgs/servers/dns/skydns/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { sha256 = "1bnc9r22kwvmn1bgz7zaidkjqm7pmw99bn5n87r76vcrd7n2a9pd"; }; - buildInputs = with goPackages; [ go-etcd rcrowley.go-metrics influxdb-go go-systemd go-log dns stathat osext etcd ]; + buildInputs = with goPackages; [ go-etcd rcrowley.go-metrics influxdb go-systemd go-log dns stathat osext etcd ]; dontInstallSrc = true; subPackages = [ "." ]; From 2286e2ef8f75cdbbc2c126b4569510d9e8c25a7d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 19 May 2015 21:46:12 +0200 Subject: [PATCH 410/615] http-parser: update from 2.3 to 2.5.0 closes #7709 --- pkgs/development/libraries/http-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 9d5b11501fc1..e7247332059f 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, gyp, utillinux, python, fixDarwinDylibNames }: let - version = "2.3"; + version = "2.5.0"; in stdenv.mkDerivation { name = "http-parser-${version}"; src = fetchurl { url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz"; - sha256 = "1qnm466wp8zncr8na4xj2wndfzzfiahafhsaigj8cv35nx56pziv"; + sha256 = "108lh05pl4i5w7hmkw07k9wklk5pbh705pw1qyz5zvp6yicbmd73"; }; patches = [ ./build-shared.patch ]; From 65f1e8e048db75be3e97048fecb99ed39b0ce2e5 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 19 May 2015 22:06:12 +0200 Subject: [PATCH 411/615] ploticus: update from 2.41 to 2.42 --- pkgs/tools/graphics/ploticus/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix index 92dce64dcfd4..2619387df8b8 100644 --- a/pkgs/tools/graphics/ploticus/default.nix +++ b/pkgs/tools/graphics/ploticus/default.nix @@ -1,29 +1,28 @@ {stdenv, fetchurl, zlib, libX11, libpng}: stdenv.mkDerivation { - name = "ploticus-2.41"; + name = "ploticus-2.42"; builder = ./builder.sh; src = fetchurl { url = mirror://sourceforge/ploticus/ploticus/2.41/pl241src.tar.gz; - sha256 = "ecccb6afcf0008d5b31da2e9e74c448564101eb7b9bbde758a3dca1f2dc8c580"; + sha256 = "1065r0nizjixi9sxxfxrnwg10r458i6fgsd23nrxa200rypvdk7c"; }; - buildInputs = [zlib libX11 libpng]; + buildInputs = [ zlib libX11 libpng ]; - patches = [./ploticus-install.patch]; + patches = [ ./ploticus-install.patch ]; - meta = { + meta = with stdenv.lib; { description = "A non-interactive software package for producing plots and charts"; - longDescription = ''Ploticus is a free, GPL'd, non-interactive software package for producing plots, charts, and graphics from data. Ploticus is good for automated or just-in-time graph generation, handles date and time data nicely, and has basic statistical capabilities. It allows significant user control over colors, styles, options and details.''; - - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ pSub ]; homepage = http://ploticus.sourceforge.net/; }; } From 69d1f7630cb01c63095d123ba000f657af3f0dce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Tue, 19 May 2015 22:43:36 +0200 Subject: [PATCH 412/615] openjdk8: 40b25 -> 40b27 --- .../development/compilers/openjdk/openjdk8.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix index b26baef88590..95248dac76af 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/openjdk8.nix @@ -1,41 +1,41 @@ { stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype, alsaLib, openjdk, cacert, perl, liberation_ttf, fontconfig } : let update = "40"; - build = "25"; + build = "27"; baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u40"; repover = "jdk8u${update}-b${build}"; paxflags = if stdenv.isi686 then "msp" else "m"; jdk8 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "05s5j0rq45n8piymv9c1n0hxr4bk3j8lz6fw2wbp0m8kam6zzpza"; + sha256 = "0ra05jngvvy2g1da5b9anrp86m812g2wlkxpijc82kxv6c3h6g28"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "0p1z38szm63cf5f83697awbqwpf7b8q1ymrqc0v6r9hb5yf0p22r"; + sha256 = "0r9zdq13kgqqm8rgr36qf03h23psxcwzvdqffsncd4jvbfap3n5f"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "0sl0ima3zlbd1ai7qrg4msy5ibg64qpwdrv7z4l8cpalwby26y6p"; + sha256 = "07v3z38v5fdsx3g28c4pkdq76cdmnc4qflf1wb3lz46lhy230hkd"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "1ahvhap8av519813yf20v3hbvg82j9bq3gnqlayng1qggfivsb5s"; + sha256 = "0y20468f2yi14lijbd732f2mlgrn718pyfji3279l2rm4ad7r7pl"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "0n86fcy1z4z22jcgfnn9agzfi949709hn2x6s8wyhwwa055rjd1a"; + sha256 = "1sgfxmkq6z3vj9yq9kszr42b1ijvsknlss353jpcmyr1lljhyvfg"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "0hp19hq0dw3j8zz4mxd6bjk9zqlyr56fhwzgjwmm56b6pwkcmsn7"; + sha256 = "08p3657d0871pz0g5fg157az9q38r5h2zs49dm7512sc9qrn5c06"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "037za0hjiwvzvbzsckfxnrrbak1vbd52pmrnd855vxkik08jxp8c"; + sha256 = "1f1vlrvlvnjbyh8d168smizvmkcm076zc496sxk6njqamby16ip2"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "1np8hkg2fmj5s6ipd1vb8x0z6xy00kbi2ipqca9pxzib58caj6b2"; + sha256 = "1llf3l4483kd8m1a77n7y9fgvm6fa63nim3qhp5z4gnw68ldbhra"; }; openjdk8 = stdenv.mkDerivation { name = "openjdk-8u${update}b${build}"; From 7c9d5eeee528ae64cba72b64bc63867749c5750f Mon Sep 17 00:00:00 2001 From: Daniel Pfile Date: Tue, 19 May 2015 16:27:25 -0500 Subject: [PATCH 413/615] Upgrade Ansible to 1.9.1 --- pkgs/tools/system/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix index 284f6cbb3d28..374528872e8e 100644 --- a/pkgs/tools/system/ansible/default.nix +++ b/pkgs/tools/system/ansible/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pythonPackages, python }: pythonPackages.buildPythonPackage rec { - version = "1.8.4"; + version = "1.9.1"; name = "ansible-${version}"; namePrefix = ""; src = fetchurl { url = "http://releases.ansible.com/ansible/ansible-${version}.tar.gz"; - sha256 = "1hcy4f6l9c23aa05yi4mr0zbqp0c6v5zq4c3dim076yfmfrh8z6k"; + sha256 = "a6f975d565723765a4d490ff40cede96833a745f38908def4950a0075f1973f5"; }; prePatch = '' From e48f5bc19813e50fe8c9d4ecccd2ac033b2b7c0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Wed, 20 May 2015 01:55:05 +0200 Subject: [PATCH 414/615] openjdk8: readd symlinks and remove useless makeflags --- pkgs/development/compilers/openjdk/openjdk8.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix index 95248dac76af..63d42e6e3d64 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/openjdk8.nix @@ -50,13 +50,16 @@ let ''; prePatch = '' # despite --with-override-jdk the build still searchs here - # GNU Patch bug, follow symlinks only follow the last symlink.. + # GNU Patch bug, --follow-symlinks only follow the last dir part symlink mv "../jdk-${repover}" "jdk"; mv "../hotspot-${repover}" "hotspot"; ''; postPatch = '' mv jdk "../jdk-${repover}"; mv hotspot "../hotspot-${repover}"; + # Patching is over, lets re-add the links + ln -s "../jdk-${repover}" "jdk" + ln -s "../hotspot-${repover}" "hotspot" ''; patches = [ ./fix-java-home-jdk8.patch @@ -83,7 +86,7 @@ let "--with-milestone=fcs" ]; NIX_LDFLAGS= "-lfontconfig"; - buildFlags = "DEBUG_BINARIES=true all"; + buildFlags = "all"; installPhase = '' mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk From bd7eb18c1cff59b41af1c30598481bb8e201482d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Wed, 20 May 2015 01:56:48 +0200 Subject: [PATCH 415/615] idea.clion: 1.0.1 -> 1.0.2 --- pkgs/applications/editors/idea/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 5ca5e7dd093f..c09d1447621b 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -225,13 +225,13 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "1.0.1"; - build = "141.870"; + version = "1.0.2"; + build = "141.871"; description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/${name}.tar.gz"; - sha256 = "17hdna6w7y9n3vqncqifw7jvys3rydgg0mz97nzax817fl4kjf1r"; + sha256 = "1b9lsgl71pbcr5br0vkr2gn09b98dl9ykdxlqwzqpwnv7ckqcb69"; }; }; From 3705c62266dd0cbb10d9e7896af1bcc52b8f1791 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 20 May 2015 09:33:30 +0900 Subject: [PATCH 416/615] thunderbird-bin: update to version 31.7.0 --- .../mailreaders/thunderbird-bin/sources.nix | 222 +++++++++--------- 1 file changed, 111 insertions(+), 111 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix index 991f8cbd53bd..8dce20f60dab 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix @@ -4,117 +4,117 @@ # ruby generate_source.rb > source.nix { - version = "31.6.0"; + version = "31.7.0"; sources = [ - { 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"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "8d5dd6af05d9a285097db7f96372464e2c48a7fe"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "07866e3716bc3bd370e4aa4711ee2882be8380b9"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "f9c353e03792ade2c3df9842bad6707c50b59395"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "ecbfaa883c2dda597213ca739e92c30ec9c2eac1"; } + { locale = "be"; arch = "linux-i686"; sha1 = "ac1abca375cfbc2e45b7eb0f66b9cef73924ae4e"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "5f296643c42890a200416678a6ed8240ee219d9f"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "4b59b171b67641097da95fd76113efe1019fd2aa"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "13d5124fd8925de174f83a8075fb711aa14438b7"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "833c826ee2be3c8664060d4ad24c508b5c122a5e"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "b29fb50d9eb83e98802655236a6c1ccb56bf6be3"; } + { locale = "br"; arch = "linux-i686"; sha1 = "5985c09eab409db0c62e525e9cd3d7469b82f0e1"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "2e4e3efe1d89b8cf329a64894807b69555e505e2"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "1a81aabe1ded11bde92349e8b9f5ae499aaebdfa"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "406212f107939a627f2166d8fc6a72a0dcff56a4"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "6cc272e25d45e54c6008da968884de039eba9db9"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "6f7e54ff4fe7d8bfa477475aaad371fc8b2f85d4"; } + { locale = "da"; arch = "linux-i686"; sha1 = "8f944829ef98bfdb46eadfd10fafe75a353c1a4a"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "f22e4293a3462effa0a928be3ae1ddbd8273450f"; } + { locale = "de"; arch = "linux-i686"; sha1 = "c115ea9356b457b25526c8469ebcf7a8e1c6241a"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "04ac40b3e10f96e17db70c9541040970cbe2e480"; } + { locale = "el"; arch = "linux-i686"; sha1 = "b0ccb81db2b8cb505ade10a0fc1eaf4322f7de0d"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "410da87c432e3d4e4ddfbe4912bc00c8fcfb8dfd"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "b91bea9a1813f1772a85873fb712c9857234864f"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "f6a08558fb3b6ebd79fdf9b359286b7ba58f2a9c"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "b433601ffdf83cc2a90224f683f627f562d8e3e3"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "68624fead16c459f87cbdeefd75326bcabccd805"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "14c4a6abb6269dea926efccfdae41d2eeab9031a"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "ffd800950b8a768d4e7ec4c8666fc2e7a390a080"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "61889cee58be7c5da0f3424faae5192f07d31651"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "360335d5c3a1eccaba29095f88d9b50dc04fbc6d"; } + { locale = "et"; arch = "linux-i686"; sha1 = "ba1e1dbcb1c0c87ba1c916b1053cf876e42d76bf"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "c40a2e0c70d3c3af5e0c34045864a7279f95b2fa"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "45c6270bb1350799df089620cdae4919833d5a54"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "ee8cacf035658fda1605f3a2968c56fa03cd73d4"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "45329cd3222d74cefaa0e96e18b71b6ddc844e77"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "47c1ec1e67829a86111a76f6ea6cb40c9f178066"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "1f2e1edbb49f141c1ac63f20e47bc4bcbe0361f4"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "cf70711b4fb6130b31d3286ad1b2a102d5cb8fc5"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "938ee57e657b3b2f0a228bc1dc7a9bc2eebee1cc"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "5c807541fa4e232b6b5119cbc482a79dd9e4f54e"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "6f2ef03c505f4936f6263b643bbfd6e0befd54f4"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "7246ed88b0c3f504ca0043f3f20c5cc86eea8ac6"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "130f7ae3c0127d00e24946e9ec2558161fd3fcf1"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "aed0e1e7e699c6df4538663dc6a0556a106cb35f"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "69fca12c63c023f689463de709db731073a3c812"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "45ab4866e3f6989e4a08920564292622abea7f97"; } + { locale = "he"; arch = "linux-i686"; sha1 = "2898eed89af21c6a4122937bf596b97828cb9271"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "a3fb3b8564fcbe8cad29d430665d3f369d765369"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "143d8dcbccd3ad219330d7389e93597cb98d20f8"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "3fdc0095646678c2885e374e277ab50c4a4ffe53"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "4c135cfaa8644fab4558d53eb7f5f0ae53ed3704"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "a4faeb5aa6dc7f6a16d436a56ef9f954c80271fd"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "f3e60e515fa20c4092ecf4df64970bc750c849e5"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "2d6ea4a41a33db4e2aeb67d7bcd38f32f427f757"; } + { locale = "id"; arch = "linux-i686"; sha1 = "cd97780c5f70dca5e9c2a61e9af11f38f79b014b"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "da2ae751b6b0dd2caf5c54fcd30560a57c6746cb"; } + { locale = "is"; arch = "linux-i686"; sha1 = "f6f3b56e8b134e93e30ecfcf706e9ddbb9b181cc"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "a922a569b293005e5efc797bf51e0c33e87cea7f"; } + { locale = "it"; arch = "linux-i686"; sha1 = "2643526d774e44fc41b0b7b6872ba683b01a9c77"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "e91689f635060087f8c8c9806ac1607a59e26776"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "dafca3f2c34ae417b5bd3065026af4a075c9bee7"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "6a1d03062d599ea35af8479dea3e6cfc45840ba1"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "9b92baecd3906b35499513723685cd791e1aab9e"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "116c8b02f8be6c739595cc88888a19e225ed865d"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "85f44f77cc27deb9cf95487a9a3673918f102bd9"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "0bd82afbe4c27318ce8882eff62e53fda13d3590"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "07cd4e46a5811096759c565bb533adf1ee9cb0d9"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "ece8a8b69aef74f9c22db1660a14ae5205aa7ff7"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "1f1e30f5aef29bf96d0e2b8609acb03d1b6ec0aa"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "5a0ffeb38b183b835966568c1b3fc719c0908fea"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "9bbb5e61eecf09d059cfb17bd75fd0e64c455d78"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "e1115c4451ede51833387ef8c592ce7342d508d3"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "65dcef7d9bfcdbd35a09ff6a9e436261b79e4d90"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "cd64fb45459e699e0c8c2269a52bb0512e592db0"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "ea2650cb700a42dc96fb56ad1860061e87626bc9"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "976a52d128e8d912363fadb7e14adec0a7c9d973"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "323b876b6c11c4881c280cdb64d2867076970abf"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "952d5b82b0d3d47d5494f2d9667fc2a5b88408df"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "5ce1feb2446c6dba96c3b3a0e9afd6a00655b738"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "83115d2fdc8494451b79cc67d581c77b64c27af4"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "a26678482d8c425f3291116e99e0196952d0cb09"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "327391e44d43d58b4d3fee97904a336f5c52648e"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "8b67f03c053f89af7d50331eec056402cfbd5bf4"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "15ec5c6fa7e6aa843910bc6c6479bf308393b52f"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "09127b5202cf63c7b9715813061ca79bc27c2f37"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "8b409350741edcd33b3eeaf7928a133eb1c2a399"; } + { locale = "si"; arch = "linux-i686"; sha1 = "733d049ffd66d5007ef68c761f2d84ab579bd400"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "dc5460e82bdf613e9d778687d11533dc97b77ffb"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "b4b9b10b53c48adf224507faf77a04c19c750d58"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "81aeb1d95fd2b220c17f388ba882127fc6d290de"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "a621f04b7e5accf05f946ce775391667579679e6"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "f9086f1ce56d84e3b732f22d086fcce43d2373a7"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "1b2b11fd04b7d1979f88268db37510ef231c158b"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "f06ad4d533c7144695fbe2eb3ba700bb1d5151b7"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "92d4cd9bbc5f24045295bda6c75420708d593aac"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "53e661b5c485fae7c27770d2a2701d6d21e481c9"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "e4614597ef42eaa6ede065b4c3b9f11de491dd5b"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "e3c8af45ab65e7977a350ae617cd55afa685e8d0"; } + { locale = "ta-LK"; arch = "linux-i686"; sha1 = "17b3d419fe769a02a360b96042c78c497063b9e8"; } + { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "cbc34ab650bfc95926b98e63c474f1997a1256fa"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "ba63efda6864a6984d492cda30d4fca6157e26a8"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "9b8cb45aab578b3dbfeace90f44dad26eda6e798"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "36a9867155fa0e6924ed62d7dbc350a2425178e1"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "abbc155c34c5d404b3143ccc63a1bb5c99c3d395"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "850ac8190adef8d227166b9b4478ea8c88c90287"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "afba1f0043ba96a89bc8ab23fe6b6e19af4f826b"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "acda86b5c48b751eb06719754921e7604a1c222e"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "a88745a4a8f85d5d2861e40ba8d72b0af73bb055"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "c03e6e4fae7fec1ae0b30e5cb600a4cf28151cc7"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "c5788c6672b230681cfb3ee2fe97763ef81d34b1"; } ]; } From 8cbb97e6f3f6dcf2cf30cae48b9597930f28ffe9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 19 May 2015 20:12:17 -0700 Subject: [PATCH 417/615] buildGoPackage: Don't include private directories in the search --- pkgs/development/go-modules/generic/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 17341238deaf..353956e48630 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -72,6 +72,7 @@ go.stdenv.mkDerivation ( else (cd go/src find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq | while read d; do + echo "$d" | grep -q "/_" && continue [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && continue local OUT if ! OUT="$(go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d 2>&1)"; then From bbfac173ba694cc5655998c24cb424651f7dc3cc Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 19 May 2015 20:13:47 -0700 Subject: [PATCH 418/615] go-packages: Fix more packaging --- pkgs/top-level/go-packages.nix | 93 ++++++++++++++++++++-------------- 1 file changed, 56 insertions(+), 37 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 8359fc541414..7f0e3e3958e7 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -179,6 +179,9 @@ let rev = "295c7b21db5d9525ad959e3382610f3aff029663"; name = "asn1-ber-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/vanackere/asn1-ber"; + goPackageAliases = [ + "github.com/nmcclain/asn1-ber" + ]; src = fetchFromGitHub { inherit rev; @@ -511,18 +514,17 @@ let }; dbus = buildGoPackage rec { - rev = "88765d85c0fdadcd98a54e30694fa4e4f5b51133"; + rev = "a5942dec6340eb0d57f43f2003c190ce06e43dea"; name = "dbus-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/godbus/dbus"; - preBuild = '' - cd "go/src/$goPackagePath" - rm -r _examples - ''; + + excludedPackages = "examples"; + src = fetchFromGitHub { inherit rev; owner = "godbus"; repo = "dbus"; - sha256 = "0k80wzdx8091y3012nd4giwgc08n1pj6lcr9i44dsapcjnb80jkn"; + sha256 = "1vk31wal7ncvjwvnb8q1myrkihv1np46f3q8dndi5k0csflbxxdf"; }; }; @@ -947,6 +949,7 @@ let goPackagePath = "github.com/pmylund/go-cache"; goPackageAliases = [ "github.com/robfig/go-cache" + "github.com/influxdb/go-cache" ]; src = fetchFromGitHub { @@ -983,6 +986,19 @@ let }; }; + go-colortext = buildGoPackage rec { + rev = "13eaeb896f5985a1ab74ddea58707a73d875ba57"; + name = "go-colortext-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/daviddengcn/go-colortext"; + + src = fetchFromGitHub { + inherit rev; + owner = "daviddengcn"; + repo = "go-colortext"; + sha256 = "0618xs9lc5xfp5zkkb5j47dr7i30ps3zj5fj0zpv8afqh2cc689x"; + }; + }; + go-etcd = buildGoPackage rec { rev = "4734e7aca379f0d7fcdf04fbb2101696a4b45ce8"; name = "go-etcd-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1076,13 +1092,15 @@ let rev = "70d039bee4b0e389e5be560491d8291708506f59"; name = "go-log-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/coreos/go-log"; + src = fetchFromGitHub { inherit rev; owner = "coreos"; repo = "go-log"; sha256 = "1s95xmmhcgw4ascf4zr8c4ij2n4s3mr881nxcpmc61g0gb722b13"; }; - buildInputs = [ go-systemd osext ]; + + propagatedBuildInputs = [ osext go-systemd ]; }; rcrowley.go-metrics = buildGoPackage rec { @@ -1229,16 +1247,19 @@ let }; go-systemd = buildGoPackage rec { - rev = "2d21675230a81a503f4363f4aa3490af06d52bb8"; + rev = "2688e91251d9d8e404e86dd8f096e23b2f086958"; name = "go-systemd-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/coreos/go-systemd"; + + excludedPackages = "examples"; + src = fetchFromGitHub { inherit rev; owner = "coreos"; repo = "go-systemd"; - sha256 = "07g5c8khlcjnr86gniw3zr7l8jwrb9fhrj18zm5n6ccj24nidwam"; + sha256 = "0c1k3y5msc1xplhx0ksa7g08yqjaavns8s5zrfg4ig8az30gwlpa"; }; - subPackages = [ "activation" "daemon" "dbus" "journal" "login1" ]; + buildInputs = [ dbus ]; }; @@ -1361,13 +1382,14 @@ let rev = "2bf08f0edee49297358bd06a0c9bf44ba9051e9c"; name = "hologram-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/AdRoll/hologram"; + src = fetchFromGitHub { inherit rev; owner = "copumpkin"; repo = "hologram"; sha256 = "1ra6rdniqh3pi84fm29zam4irzv52a1dd2sppaqngk07f7rkkhi4"; }; - buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir nmcclain.ldap g2s gox ]; + buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir vanackere.ldap g2s gox ]; }; http2 = buildGoPackage rec { @@ -1412,7 +1434,7 @@ let sha256 = "0p3s0pbn5x294qg2r0qgysb5wmspsvjxhccxh2hs6hc24dl6y93b"; }; - buildInputs = [ bolt crypto statik liner toml pat gollectd ]; + propagatedBuildInputs = [ bolt crypto statik liner toml pat gollectd ]; }; eckardt.influxdb-go = buildGoPackage rec { @@ -1450,25 +1472,13 @@ let }; }; - nmcclain.ldap = buildGoPackage rec { - rev = "469fe5a802d61523b40dbb29bb8012a6b99b06b5"; - name = "ldap-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/nmcclain/ldap"; - - src = fetchFromGitHub { - inherit rev; - owner = "nmcclain"; - repo = "ldap"; - sha256 = "0xq5dc03ym0wlg9mvf4gbrmj74l4c8bgkls8fd7c98a128qw2srk"; - }; - - propagatedBuildInputs = [ asn1-ber ]; - }; - vanackere.ldap = buildGoPackage rec { rev = "e29b797d1abde6567ccb4ab56236e033cabf845a"; name = "ldap-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/vanackere/ldap"; + goPackageAliases = [ + "github.com/nmcclain/ldap" + ]; src = fetchFromGitHub { inherit rev; @@ -1494,17 +1504,24 @@ let }; log4go = buildGoPackage rec { - rev = "48"; - name = "log4go-${rev}"; - goPackagePath = "code.google.com/p/log4go"; + rev = "cb4cc51cd03958183d3b637d0750497d88c2f7a8"; + name = "log4go-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/ccpaging/log4go"; + goPackageAliases = [ + "github.com/alecthomas/log4go" + "code.google.com/p/log4go" + ]; - src = fetchhg { + excludedPackages = "examples"; + + src = fetchFromGitHub { inherit rev; - url = "https://${goPackagePath}"; - sha256 = "0q906sxrmwir295virfibqvdzlaj340qh2r4ysx1ccjrjazc0q5p"; + owner = "ccpaging"; + repo = "log4go"; + sha256 = "0l9f86zzhla9hq35q4xhgs837283qrm4gxbp5lrwwls54ifiq7k2"; }; - subPackages = [ "./" ]; # don't build examples + propagatedBuildInputs = [ go-colortext ]; }; logrus = buildGoPackage rec { @@ -1621,14 +1638,15 @@ let }; msgpack = buildGoPackage rec { - rev = "20c1b88a6c7fc5432037439f4e8c582e236fb205"; + rev = "9dbd4ac30c0b67927f0fb5557fb8341047bd35f7"; name = "msgpack-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/vmihailenco/msgpack"; + goPackagePath = "gopkg.in/vmihailenco/msgpack.v2"; + src = fetchFromGitHub { inherit rev; owner = "vmihailenco"; repo = "msgpack"; - sha256 = "1dj5scpfhgnw0yrh0w6jlrb9d03halvsv4l3wgjhazrrimdqf0q0"; + sha256 = "0nq9yb85hi3c35kwyl38ywv95vd8n7aywmj78wwylglld22nfmw2"; }; }; @@ -1757,6 +1775,7 @@ let goPackagePath = "github.com/kardianos/osext"; goPackageAliases = [ "github.com/bugsnag/osext" + "bitbucket.org/kardianos/osext" ]; src = fetchFromGitHub { From b835d4badefd230612cc066296ae3e3f6a36e6fa Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 19 May 2015 21:34:51 -0700 Subject: [PATCH 419/615] libunwind: Fix lzma propagation --- pkgs/development/libraries/libunwind/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index b08c169993eb..91895114ea0c 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -21,6 +21,12 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib" touch "$out/lib/libunwind-generic.so" ''; + + postInstall = '' + find $out -name \*.la | while read file; do + sed -i 's,-llzma,${xz}/lib/liblzma.la,' $file + done + ''; meta = with stdenv.lib; { homepage = http://www.nongnu.org/libunwind; From 9687d304fd0b2c08ff92b8bb8a393dec51bb77a9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 19 May 2015 21:43:48 -0700 Subject: [PATCH 420/615] wiredtiger: 2.5.2 -> 2.6.0 --- .../libraries/wiredtiger/default.nix | 50 +++++++++++++++---- 1 file changed, 40 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index 395a40401531..da4dc9d6bbc3 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -1,34 +1,64 @@ { stdenv, fetchFromGitHub, automake, autoconf, libtool -, bzip2, snappy, zlib, db + +# Optional Dependencies +, lz4 ? null, snappy ? null, zlib ? null, bzip2 ? null, db ? null +, gperftools ? null, leveldb ? null }: +with stdenv.lib; +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; + + shouldUsePkg = pkg: if pkg != null && any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; + + optLz4 = shouldUsePkg lz4; + optSnappy = shouldUsePkg snappy; + optZlib = shouldUsePkg zlib; + optBzip2 = shouldUsePkg bzip2; + optDb = shouldUsePkg db; + optGperftools = shouldUsePkg gperftools; + optLeveldb = shouldUsePkg leveldb; +in stdenv.mkDerivation rec { name = "wiredtiger-${version}"; - version = "2.5.2"; + version = "2.6.0"; src = fetchFromGitHub { repo = "wiredtiger"; owner = "wiredtiger"; rev = version; - sha256 = "1rk26gfs4zpz88mkbdkhz65q4admpgf46x5zsnghl0ndirmnvq3p"; + sha256 = "0i2r03bpq9xzp5pw7c67kjac5j7mssiawd9id8lqjdbr6c6772cv"; }; nativeBuildInputs = [ automake autoconf libtool ]; - buildInputs = [ bzip2 snappy zlib db ]; + buildInputs = [ optLz4 optSnappy optZlib optBzip2 optDb optGperftools optLeveldb ]; configureFlags = [ - "--with-berkeleydb=${db}" - "--enable-bzip2" - "--enable-leveldb" - "--enable-snappy" - "--enable-zlib" + (mkWith false "attach" null) + (mkWith true "builtins" "") + (mkEnable (optBzip2 != null) "bzip2" null) + (mkEnable false "diagnostic" null) + (mkEnable false "java" null) + (mkEnable (optLeveldb != null) "leveldb" null) + (mkEnable false "python" null) + (mkEnable (optSnappy != null) "snappy" null) + (mkEnable (optLz4 != null) "lz4" null) + (mkEnable (optGperftools != null) "tcmalloc" null) + (mkEnable (optZlib != null) "zlib" null) + (mkWith (optDb != null) "berkeleydb" optDb) + (mkWith false "helium" null) ]; preConfigure = '' ./autogen.sh ''; - meta = with stdenv.lib; { + meta = { homepage = http://wiredtiger.com/; description = ""; license = licenses.gpl2; From b76d6c1699253c8ea5ac8b5dcd4903ddd77e6276 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 19 May 2015 21:43:59 -0700 Subject: [PATCH 421/615] mongodb: 3.0.2 -> 3.0.3 --- pkgs/servers/nosql/mongodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index ef08dd3747fd..257d3c63e52c 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; -let version = "3.0.2"; +let version = "3.0.3"; system-libraries = [ "pcre" "wiredtiger" @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz"; - sha256 = "16c3cr7l8ddziavmxrg2aq9bp1knnscy57xx5zsvz6yv7hh24181"; + sha256 = "01q8fas8afch50h4kjdrdrcrb1qx243wafz6zdsbc2waq60mlxjp"; }; nativeBuildInputs = [ scons ]; From 3cb3247ae0bb9d5f6947fc6a30ce1bb108cdc818 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 19 May 2015 22:01:08 -0700 Subject: [PATCH 422/615] mongodb: Support 32 bit platforms --- pkgs/servers/nosql/mongodb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 257d3c63e52c..a465d1c4a592 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -17,14 +17,14 @@ let version = "3.0.3"; ] ++ optionals stdenv.isLinux [ "tcmalloc" ]; buildInputs = [ sasl boost gperftools pcre snappy - zlib libyamlcpp sasl openssl libpcap wiredtiger - ]; + zlib libyamlcpp sasl openssl libpcap + ] ++ optional stdenv.is64bit wiredtiger; other-args = concatStringsSep " " ([ "--c++11=on" "--ssl" #"--rocksdb" # Don't have this packaged yet - "--wiredtiger=on" + "--wiredtiger=${if stdenv.is64bit then "on" else "off"}" "--js-engine=v8-3.25" "--use-sasl-client" "--variant-dir=nixos" # Needed so we don't produce argument lists that are too long for gcc / ld From cf94a678f33ce3f051e75f22369dcf02489df005 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 19 May 2015 22:21:28 -0700 Subject: [PATCH 423/615] consul-alerts: Fix --- pkgs/top-level/go-packages.nix | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 7f0e3e3958e7..5d8b76fddcf0 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -435,6 +435,7 @@ let # Fix references to consul-api govers -d -m github.com/armon/consul-api github.com/hashicorp/consul/api sed -i 's,consulapi,api,g' go/src/${goPackagePath}/consul/client.go + sed -i 's,consulapi,api,g' go/src/${consul-skipper.goPackagePath}/skipper.go ''; src = fetchFromGitHub { @@ -447,9 +448,11 @@ let # We just want the consul api not all of consul extraSrcs = [ { inherit (consul) src goPackagePath; } + { inherit (influxdb8) src goPackagePath; } + { inherit (consul-skipper) src goPackagePath; } ]; - buildInputs = [ logrus consul-skipper docopt-go hipchat-go influxdb gopherduty ]; + buildInputs = [ logrus docopt-go hipchat-go gopherduty ]; }; consul-migrate = buildGoPackage rec { @@ -1437,6 +1440,24 @@ let propagatedBuildInputs = [ bolt crypto statik liner toml pat gollectd ]; }; + influxdb8 = buildGoPackage rec { + rev = "v0.8.8"; + name = "influxdb-${rev}"; + goPackagePath = "github.com/influxdb/influxdb"; + goPackageAliases = [ + "github.com/influxdb/influxdb-go" + ]; + + src = fetchFromGitHub { + inherit rev; + owner = "influxdb"; + repo = "influxdb"; + sha256 = "0xpigp76rlsxqj93apjzkbi98ha5g4678j584l6hg57p711gqsdv"; + }; + + buildInputs = [ statik crypto protobuf log4go toml pmylund.go-cache ]; + }; + eckardt.influxdb-go = buildGoPackage rec { rev = "8b71952efc257237e077c5d0672e936713bad38f"; name = "influxdb-go-${stdenv.lib.strings.substring 0 7 rev}"; From 35da88466730822573b19205d1d292f51924bdf8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 19 May 2015 22:56:44 -0700 Subject: [PATCH 424/615] ceph: Support newer versions --- pkgs/tools/filesystems/ceph/generic.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 36baee6b99d5..33d9b3dc64f3 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -62,10 +62,10 @@ let none = [ ]; }; - wrapArgs = "--prefix PYTHONPATH : \"$(toPythonPath $lib)\"" + wrapArgs = "--set PYTHONPATH : \"$(toPythonPath $lib)\"" + " --prefix PYTHONPATH : \"$(toPythonPath ${python.modules.readline})\"" + " --prefix PYTHONPATH : \"$(toPythonPath ${pythonPackages.flask})\"" - + " --prefix PATH : \"$out/bin\""; + + " --set PATH : \"$out/bin\""; in stdenv.mkDerivation { name="ceph-${version}"; @@ -79,7 +79,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ]; buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [ boost python libxml2 yasm libatomic_ops libs3 malloc pythonPackages.flask zlib - ] ++ optional (versionAtLeast version "0.95") [ + ] ++ optional (versionAtLeast version "9.0.0") [ git # Used for the gitversion string pythonPackages.sphinx # Used for docs ] ++ optional stdenv.isLinux [ @@ -158,6 +158,10 @@ stdenv.mkDerivation { (mkWith (libaio != null) "libaio" null) (mkWith (libxfs != null) "libxfs" null) (mkWith (zfs != null) "libzfs" null) + ] ++ optional (versionAtLeast version "10.0.0") [ + (mkWith true "man-pages" null) + (mkWith false "tcmalloc-minimal" null) + (mkWith false "valgrind" null) ]; installFlags = [ "sysconfdir=\${out}/etc" ]; From 5c8ea1958dc2d39ea3aea36c18690211f16f2417 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Wed, 20 May 2015 06:57:17 +0100 Subject: [PATCH 425/615] youtube-dl: update to 2015.05.15 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 60d31fec8c3d..12f6cb18aa2e 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "youtube-dl-${version}"; - version = "2015.04.03"; + version = "2015.05.15"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0ndzswv6vq5ld5p1ny23sh76cx6acf8yli9gi9r21dm94ida2885"; + sha256 = "0b4fnlgfnwdh1z8avydbc8rr75jpcyvfpvs39ln1gh7m8vyxwjz6"; }; buildInputs = [ python makeWrapper zip pandoc ]; From d2f21ab3fcf33582afc7ede5452ab3c28d80e58e Mon Sep 17 00:00:00 2001 From: Ossi Herrala Date: Wed, 20 May 2015 09:02:13 +0300 Subject: [PATCH 426/615] cfr: Update to version 0_101 and remove platform restrictions cfr is written in Java, so it should work in every platform supported by jre. This fix makes cfr usable in Darwin. --- pkgs/development/tools/java/cfr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index 6025a59f44cb..a7be59a1fea1 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre }: -let version = "0_100"; in +let version = "0_101"; in stdenv.mkDerivation rec { name = "cfr-${version}"; src = fetchurl { - sha256 = "0q5kh5qdksykz339p55jz0q5cjqvxdzv3a7r4kkijgbfjm1ldr5f"; + sha256 = "0zwl3whypdm2qrw3hwaqjnifkb4wcdn8fx9scrjkli54bhr6dqch"; url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.benf.org/other/cfr/; license = with licenses; mit; - platforms = with platforms; linux; + platforms = with platforms; all; maintainers = with maintainers; [ nckx ]; }; From 72aa6aaa04d4616b38d253af10cc31746e4453a3 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 19 May 2015 23:03:16 -0700 Subject: [PATCH 427/615] lightdm: 1.14.0 -> 1.15.0 --- pkgs/applications/display-managers/lightdm/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 8a613ee68617..301eb60429e3 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -4,15 +4,15 @@ }: let - ver_branch = "1.14"; - version = "1.14.0"; + ver_branch = "1.15"; + version = "1.15.0"; in stdenv.mkDerivation rec { name = "lightdm-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; - sha256 = "0fkbzqncx34dhylrg5328fih7xywmsqj2p40smnx33nyf047jdgc"; + sha256 = "0f0c2irb7qq49dabxhh99bwyvkxpfpscy4vynm7y800sz15lm2hs"; }; buildInputs = [ @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional (qt5 != null) qt5.base; configureFlags = [ - "--enable-liblightdm-gobject" "--localstatedir=/var" "--sysconfdir=/etc" ] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt" From 69a990f6b34969e3db14c6b6b03aa71793903cb4 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 19 May 2015 23:30:51 -0700 Subject: [PATCH 428/615] libssh: 0.6.4 -> 0.7.0 --- pkgs/development/libraries/libssh/default.nix | 67 ++++++++++++++++--- 1 file changed, 59 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 88af054654b9..533cdc1a7093 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,22 +1,73 @@ -{ stdenv, fetchurl, pkgconfig, cmake, zlib, libgcrypt, openssl }: +{ stdenv, fetchurl, pkgconfig, cmake + +# Optional Dependencies +, heimdal ? null, zlib ? null, libsodium ? null + +# Crypto Dependencies +, openssl ? null, libgcrypt ? null +}: + +let + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; + + # Prefer openssl + cryptoStr = if shouldUsePkg openssl != null then "openssl" + else if shouldUsePkg libgcrypt != null then "libgcrypt" + else "none"; + crypto = { + openssl = openssl; + libgcrypt = libgcrypt; + none = null; + }.${cryptoStr}; + + optHeimdal = shouldUsePkg heimdal; + optZlib = shouldUsePkg zlib; + optLibsodium = shouldUsePkg libsodium; +in + +assert crypto != null; stdenv.mkDerivation rec { - name = "libssh-0.6.4"; + name = "libssh-0.7.0"; src = fetchurl { - url = "https://red.libssh.org/attachments/download/107/${name}.tar.gz"; - sha256 = "0lkb45sc7w0wd67p46yh8rsprglssnkqar1sp0impwsvx7i0acky"; + url = "https://red.libssh.org/attachments/download/140/libssh-0.7.0.tar.xz"; + sha256 = "0as07vz3h5qa14ysvgsddb90m1qh605p6ccv6kf1sr1k3wsbql85"; }; - # option we don't provide (yet): use libgcrypt instead of openssl - buildInputs = [ zlib /*libgcrypt*/ openssl ]; + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ optHeimdal optZlib optLibsodium crypto ]; - nativeBuildInputs = [ cmake pkgconfig ]; + cmakeFlags = [ + "-DWITH_GSSAPI=${if optHeimdal != null then "ON" else "OFF"}" + "-DWITH_ZLIB=${if optZlib != null then "ON" else "OFF"}" + "-DWITH_SSH1=OFF" + "-DWITH_SFTP=ON" + "-DWITH_SERVER=ON" + "-DWITH_STATIC_LIB=OFF" + "-DWITH_DEBUG_CRYPTO=OFF" + "-DWITH_DEBUG_CALLTRACE=OFF" + "-DWITH_GCRYPT=${if cryptoStr == "libgcrypt" then "ON" else "OFF"}" + "-DWITH_PCAP=ON" + "-DWITH_INTERNAL_DOC=OFF" + "-DWITH_TESTING=OFF" + "-DWITH_CLIENT_TESTING=OFF" + "-DWITH_BENCHMARKS=OFF" + "-DWITH_EXAMPLES=OFF" + "-DWITH_NACL=${if optLibsodium != null then "ON" else "OFF"}" + ] ++ stdenv.lib.optionals (optLibsodium != null) [ + "-DNACL_LIBRARY=${optLibsodium}/lib" + "-DNACL_INCLUDE_DIR=${optLibsodium}/include" + ]; + + postPatch = '' + sed -i 's,nacl/,sodium/,g' include/libssh/curve25519.h src/curve25519.c + ''; meta = with stdenv.lib; { description = "SSH client library"; license = licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ sander urkud ]; + maintainers = with maintainers; [ sander urkud wkennington ]; platforms = platforms.all; }; } From ef7c804a6f308630e325f58c78a7850423c110c0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 19 May 2015 23:53:54 -0700 Subject: [PATCH 429/615] openresolv: 3.5.7 -> 3.7.0 --- pkgs/tools/networking/openresolv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index ee5241bfcad8..4b9f868bf1b7 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, coreutils }: stdenv.mkDerivation rec { - name = "openresolv-3.5.7"; + name = "openresolv-3.7.0"; src = fetchurl { url = "mirror://roy/openresolv/${name}.tar.bz2"; - sha256 = "14n51wqnh49zdvx11l79s3fh1jhg7kg9cfny5vk7zsix78spmyx7"; + sha256 = "1pimiipic4m90f832rgw3ayqrh457qfymcpfpj9iidb5c4phnz4b"; }; buildInputs = [ makeWrapper ]; From 5c6f06e56a5a456be830a0f0795f6c8c6dc13a06 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 19 May 2015 23:51:36 -0700 Subject: [PATCH 430/615] lxc: 1.1.1 -> 1.1.2 --- pkgs/os-specific/linux/lxc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 9939a5525747..0d80fe6d2b1b 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -9,13 +9,13 @@ let in with stdenv.lib; stdenv.mkDerivation rec { - name = "lxc-1.1.1"; + name = "lxc-1.1.2"; src = fetchFromGitHub { owner = "lxc"; repo = "lxc"; rev = name; - sha256 = "04zpznd364862y3dwn97klvwfw9i2b6n1lh4fkci0z74c6z9svql"; + sha256 = "149nq630h9bg87hb3cn086ci0cz29l7fp3i6qf1mqxv7hnildm8p"; }; buildInputs = [ From 3ee72b7379964467526dd8de88415ce363981ef8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 19 May 2015 23:48:55 -0700 Subject: [PATCH 431/615] lxc: Cleanup postInstall --- pkgs/os-specific/linux/lxc/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 0d80fe6d2b1b..8115aa1055be 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -41,18 +41,13 @@ stdenv.mkDerivation rec { "--enable-tests" ]; - installFlags = [ "DESTDIR=\${out}" ]; - - postInstall = '' - mv $out/$out/* $out - DIR=$out/$out - while rmdir $DIR 2>/dev/null; do - DIR="$(dirname "$DIR")" - done - - # Remove the unneeded var/lib directories - rm -rf $out/var - ''; + installFlags = [ + "localstatedir=\${TMPDIR}" + "sysconfdir=\${out}/etc" + "sysconfigdir=\${out}/etc/default" + "READMEdir=\${TMPDIR}/var/lib/lxc/rootfs" + "LXCPATH=\${TMPDIR}/var/lib/lxc" + ]; meta = { homepage = "http://lxc.sourceforge.net"; From d220ea72e5cb04e25353bc47441cf3a5a53241ec Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 May 2015 00:26:12 -0700 Subject: [PATCH 432/615] gnu-efi: 3.0b -> 3.0.2 --- .../development/libraries/gnu-efi/default.nix | 25 ++++++------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index a78d98907291..43479a8f66d1 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, pciutils }: stdenv.mkDerivation rec { - name = "gnu-efi_${version}"; - version = "3.0u"; + name = "gnu-efi-${version}"; + version = "3.0.2"; src = fetchurl { - url = "mirror://sourceforge/gnu-efi/${name}.orig.tar.gz"; - sha256 = "0klkdxh1aqwwfm393q67nxww6liffyp2lfybbnh4q819b06la39w"; + url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2"; + sha256 = "1mxl6xarwickhssn0nc5hyvayyf2cjh5p10l37jd1ymirl75hjqr"; }; - arch = with stdenv.lib; head (splitString "-" stdenv.system); + buildInputs = [ pciutils ]; makeFlags = [ + "PREFIX=\${out}" "CC=gcc" "AS=as" "LD=ld" @@ -20,18 +21,6 @@ stdenv.mkDerivation rec { "OBJCOPY=objcopy" ]; - buildPhase = '' - make $makeFlags - make $makeFlags -C apps clean all - ''; - - installPhase = '' - mkdir -pv $out/include/efi/{protocol,$arch} - make PREFIX="$out" $makeFlags install - mkdir -pv $out/share/gnu-efi - install -D -m644 apps/*.efi $out/share/gnu-efi - ''; - meta = with stdenv.lib; { description = "GNU EFI development toolchain"; homepage = http://sourceforge.net/projects/gnu-efi/; From 3b79ea5ce4dd53a1e34f3c18f781598e23f32b87 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 May 2015 00:26:45 -0700 Subject: [PATCH 433/615] libtheora: Refactor --- .../libraries/libtheora/default.nix | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index ef7a8ab09a8e..da590adae062 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl, libogg, libvorbis, tremor, autoconf, automake, libtool, pkgconfig}: -stdenv.mkDerivation ({ +stdenv.mkDerivation rec { name = "libtheora-1.1.1"; + src = fetchurl { - url = http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.gz; + url = "http://downloads.xiph.org/releases/theora/${name}.tar.gz"; sha256 = "0swiaj8987n995rc7hw0asvpwhhzpjiws8kr3s6r44bqqib2k5a0"; }; - buildInputs = [pkgconfig]; - - propagatedBuildInputs = [libogg libvorbis]; + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ libogg libvorbis ]; # GCC's -fforce-addr flag is not supported by clang # It's just an optimization, so it's safe to simply remove it @@ -17,23 +17,11 @@ stdenv.mkDerivation ({ substituteInPlace configure --replace "-fforce-addr" "" ''; - crossAttrs = { - propagatedBuildInputs = [libogg.crossDrv tremor.crossDrv]; - configureFlags = "--disable-examples"; - }; - meta = with stdenv.lib; { homepage = http://www.theora.org/; description = "Library for Theora, a free and open video compression format"; license = licenses.bsd3; - maintainers = [ maintainers.spwhitt ]; + maintainers = with maintainers; [ spwhitt wkennington ]; platforms = platforms.unix; }; } - -# It has an old config.guess that doesn't know the mips64el. -// stdenv.lib.optionalAttrs (stdenv.system == "mips64el-linux") -{ - propagatedBuildInputs = [libogg libvorbis autoconf automake libtool]; - preConfigure = "rm config.guess; sh autogen.sh"; -}) From 0bc84ecccd9d4612673095f3505cea7a25246d3e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 May 2015 00:27:03 -0700 Subject: [PATCH 434/615] gummiboot: 45 -> 48 --- pkgs/tools/misc/gummiboot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/gummiboot/default.nix b/pkgs/tools/misc/gummiboot/default.nix index 376550200620..8adea97ff14a 100644 --- a/pkgs/tools/misc/gummiboot/default.nix +++ b/pkgs/tools/misc/gummiboot/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gnu-efi, unzip, pkgconfig, utillinux, libxslt, docbook_xsl, docbook_xml_dtd_42 }: stdenv.mkDerivation rec { - name = "gummiboot-45"; + name = "gummiboot-48"; buildInputs = [ gnu-efi pkgconfig libxslt utillinux ]; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = http://pkgs.fedoraproject.org/repo/pkgs/gummiboot/gummiboot-45.tar.xz/5d4957390e959cb9f325b87712ddd3f1/gummiboot-45.tar.xz; - sha256 = "15227d6abi90vg7rs234fm13af511nsd6dv87c3jvsjhgb9ib0hm"; + url = http://pkgs.fedoraproject.org/repo/pkgs/gummiboot/gummiboot-48.tar.xz/05ef3951e8322b76c31f2fd14efdc185/gummiboot-48.tar.xz; + sha256 = "1bzygyglgglhb3aj77w2qcb0dz9sxgb7lq5krxf6417431h198rg"; }; meta = { From 9a159fc2bcbc868e16769a85d92366989d125db3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 20 May 2015 11:34:08 +0200 Subject: [PATCH 435/615] php: Update to latest versions --- pkgs/development/interpreters/php/5.4.nix | 4 ++-- pkgs/development/interpreters/php/5.5.nix | 4 ++-- pkgs/development/interpreters/php/5.6.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 7133b1e0824f..c10425631b3c 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -1,6 +1,6 @@ { callPackage, apacheHttpd }: callPackage ./generic.nix { - phpVersion = "5.4.40"; - sha = "06m5b3hw5kgwvnarhiylymadj504xalpczagr662vjrwmklgz628"; + phpVersion = "5.4.41"; + sha = "0wl27f5z6vymajm2bzfp440zsp1jdxqn71avryiq1zw029db9i2v"; apacheHttpd = apacheHttpd; } diff --git a/pkgs/development/interpreters/php/5.5.nix b/pkgs/development/interpreters/php/5.5.nix index fdc1ab79c769..0d66e64693a9 100644 --- a/pkgs/development/interpreters/php/5.5.nix +++ b/pkgs/development/interpreters/php/5.5.nix @@ -1,6 +1,6 @@ { callPackage, apacheHttpd }: callPackage ./generic.nix { - phpVersion = "5.5.21"; - sha = "1zl3valcak5hb4fmivpfa66arwpvi19js1d5cxq5vjn4fncl5sb2"; + phpVersion = "5.5.25"; + sha = "0qrc4qll07hfs5a3l4ajrj7969w10d0n146zq1smdl6x4pkkgpv8"; apacheHttpd = apacheHttpd; } diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix index 5f69e46189fa..425f51ce5c66 100644 --- a/pkgs/development/interpreters/php/5.6.nix +++ b/pkgs/development/interpreters/php/5.6.nix @@ -1,6 +1,6 @@ { callPackage, apacheHttpd }: callPackage ./generic.nix { - phpVersion = "5.6.6"; - sha = "0k5vml94p5809bk2d5a8lhzf3h7f1xgs75b9qy6ikj70cndmqqh9"; + phpVersion = "5.6.9"; + sha = "1fdwk8g509gxd5ad3y1s3j49hfkjdg8mgmzn9ki3pflbgdxvilqr"; apacheHttpd = apacheHttpd; } From f247481b5dc10a25970f4a44b66628166e56f4b9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 May 2015 02:34:00 -0700 Subject: [PATCH 436/615] buildGoPackage: Only install files from the goPackagePath --- pkgs/development/go-modules/generic/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 353956e48630..f747ade72f27 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -113,12 +113,12 @@ go.stdenv.mkDerivation ( mkdir -p $out if [ -z "$dontInstallSrc" ]; then - local dir - for d in pkg src; do - mkdir -p $out/share/go - dir="$NIX_BUILD_TOP/go/$d" - [ -e "$dir" ] && cp -r $dir $out/share/go - done + (cd "$NIX_BUILD_TOP/go" + find . -type f | while read f; do + echo "$f" | grep -q '^./\(src\|pkg/[^/]*\)/${goPackagePath}' || continue + mkdir -p "$(dirname "$out/share/go/$f")" + cp $NIX_BUILD_TOP/go/$f $out/share/go/$f + done) fi dir="$NIX_BUILD_TOP/go/bin" From 3d2d78cb396a5a3fe144b15207069bb11775ff9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 20 May 2015 09:51:42 +0200 Subject: [PATCH 437/615] nixos/libvirtd: add 'extraOptions' option And move the '--verbose' flag to extraOptions, so that users can easily disable it. --- nixos/modules/virtualisation/libvirtd.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 7410609e0642..14c4e992d3b6 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -57,6 +57,17 @@ in ''; }; + virtualisation.libvirtd.extraOptions = + mkOption { + type = types.listOf types.str; + default = [ "--verbose" ]; # for historical reasons, should be empty + example = [ "--verbose" ]; + description = + '' + Extra command line arguments passed to libvirtd on startup. + ''; + }; + virtualisation.libvirtd.onShutdown = mkOption { type = types.enum ["shutdown" "suspend" ]; @@ -140,7 +151,7 @@ in done ''; # */ - serviceConfig.ExecStart = ''@${pkgs.libvirt}/sbin/libvirtd libvirtd --config "${configFile}" --daemon --verbose''; + serviceConfig.ExecStart = ''@${pkgs.libvirt}/sbin/libvirtd libvirtd --config "${configFile}" --daemon ${concatStringsSep " " cfg.extraOptions}''; serviceConfig.Type = "forking"; serviceConfig.KillMode = "process"; # when stopping, leave the VMs alone From db991a40245ffd55cb49ccfe300c9851e0851924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 20 May 2015 10:06:21 +0200 Subject: [PATCH 438/615] nixos/libvirtd: remove --verbose flag Because it spams the log: .libvirtd-wrapp[1950]: OBJECT_UNREF: obj=0x7f5d900b4200 .libvirtd-wrapp[1950]: EVENT_POLL_UPDATE_HANDLE: watch=874 events=13 .libvirtd-wrapp[1950]: OBJECT_UNREF: obj=0x7f5d900b4200 .libvirtd-wrapp[1950]: EVENT_POLL_RUN: nhandles=24 timeout=-1 .libvirtd-wrapp[1950]: EVENT_POLL_DISPATCH_HANDLE: watch=874 events=1 .libvirtd-wrapp[1950]: OBJECT_REF: obj=0x7f5d900b4200 .libvirtd-wrapp[1950]: [137B blob data] --- nixos/modules/virtualisation/libvirtd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 14c4e992d3b6..16aedbbb185d 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -60,7 +60,7 @@ in virtualisation.libvirtd.extraOptions = mkOption { type = types.listOf types.str; - default = [ "--verbose" ]; # for historical reasons, should be empty + default = [ ]; example = [ "--verbose" ]; description = '' From 2fe90843977bb7809c964047822d33b4f520e93d Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 3 May 2015 20:18:18 +0300 Subject: [PATCH 439/615] azure-image: fix, split into bootstrap and regular configurations Conflicts: nixos/modules/virtualisation/azure-image.nix --- nixos/modules/virtualisation/azure-common.nix | 60 +++++++++++++++++++ nixos/modules/virtualisation/azure-image.nix | 32 +--------- 2 files changed, 61 insertions(+), 31 deletions(-) create mode 100644 nixos/modules/virtualisation/azure-common.nix diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix new file mode 100644 index 000000000000..4fc7a085f868 --- /dev/null +++ b/nixos/modules/virtualisation/azure-common.nix @@ -0,0 +1,60 @@ +{ config, lib, pkgs, ... }: + +with lib; +{ + imports = [ ../profiles/headless.nix ]; + + boot.kernelParams = [ "console=ttyS0" "earlyprintk=ttyS0" "rootdelay=300" "panic=1" "boot.panic_on_fail" ]; + boot.initrd.kernelModules = [ "hv_vmbus" "hv_netvsc" "hv_utils" "hv_storvsc" ]; + + # Generate a GRUB menu. + boot.loader.grub.device = "/dev/sda"; + boot.loader.grub.version = 2; + boot.loader.grub.timeout = 0; + + # Don't put old configurations in the GRUB menu. The user has no + # way to select them anyway. + boot.loader.grub.configurationLimit = 0; + + fileSystems."/".device = "/dev/disk/by-label/nixos"; + + # Allow root logins only using the SSH key that the user specified + # at instance creation time, ping client connections to avoid timeouts + services.openssh.enable = true; + services.openssh.permitRootLogin = "without-password"; + services.openssh.extraConfig = '' + ClientAliveInterval 180 + ''; + + # Force getting the hostname from Azure + networking.hostName = mkDefault ""; + + # Always include cryptsetup so that NixOps can use it. + environment.systemPackages = [ pkgs.cryptsetup ]; + + networking.usePredictableInterfaceNames = false; + + services.udev.extraRules = '' + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:0", ATTR{removable}=="0", SYMLINK+="disk/by-lun/0", + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:1", ATTR{removable}=="0", SYMLINK+="disk/by-lun/1", + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:2", ATTR{removable}=="0", SYMLINK+="disk/by-lun/2" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:3", ATTR{removable}=="0", SYMLINK+="disk/by-lun/3" + + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:4", ATTR{removable}=="0", SYMLINK+="disk/by-lun/4" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:5", ATTR{removable}=="0", SYMLINK+="disk/by-lun/5" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:6", ATTR{removable}=="0", SYMLINK+="disk/by-lun/6" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:7", ATTR{removable}=="0", SYMLINK+="disk/by-lun/7" + + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:8", ATTR{removable}=="0", SYMLINK+="disk/by-lun/8" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:9", ATTR{removable}=="0", SYMLINK+="disk/by-lun/9" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:10", ATTR{removable}=="0", SYMLINK+="disk/by-lun/10" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:11", ATTR{removable}=="0", SYMLINK+="disk/by-lun/11" + + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:12", ATTR{removable}=="0", SYMLINK+="disk/by-lun/12" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:13", ATTR{removable}=="0", SYMLINK+="disk/by-lun/13" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:14", ATTR{removable}=="0", SYMLINK+="disk/by-lun/14" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:15", ATTR{removable}=="0", SYMLINK+="disk/by-lun/15" + + ''; + +} diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index ab5a9c51fa5b..3f554d127c35 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -5,8 +5,6 @@ let diskSize = "4096"; in { - imports = [ ../profiles/headless.nix ]; - system.build.azureImage = pkgs.vmTools.runInLinuxVM ( pkgs.runCommand "azure-image" @@ -24,7 +22,6 @@ in postVM = '' - echo Converting mkdir -p $out ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vpc $diskImage $out/disk.vhd rm $diskImage @@ -93,34 +90,11 @@ in '' ); - fileSystems."/".device = "/dev/disk/by-label/nixos"; + imports = [ ./azure-common.nix ]; # Azure metadata is available as a CD-ROM drive. fileSystems."/metadata".device = "/dev/sr0"; - boot.kernelParams = [ "console=ttyS0" "earlyprintk=ttyS0" "rootdelay=300" "panic=1" "boot.panic_on_fail" ]; - boot.initrd.kernelModules = [ "hv_vmbus" "hv_netvsc" "hv_utils" "hv_storvsc" ]; - - # Generate a GRUB menu. - boot.loader.grub.device = "/dev/sda"; - boot.loader.grub.version = 2; - boot.loader.grub.timeout = 0; - - # Don't put old configurations in the GRUB menu. The user has no - # way to select them anyway. - boot.loader.grub.configurationLimit = 0; - - # Allow root logins only using the SSH key that the user specified - # at instance creation time. - services.openssh.enable = true; - services.openssh.permitRootLogin = "without-password"; - - # Force getting the hostname from Azure - networking.hostName = mkDefault ""; - - # Always include cryptsetup so that NixOps can use it. - environment.systemPackages = [ pkgs.cryptsetup ]; - systemd.services.fetch-ssh-keys = { description = "Fetch host keys and authorized_keys for root user"; @@ -157,8 +131,4 @@ in serviceConfig.StandardOutput = "journal+console"; }; - networking.usePredictableInterfaceNames = false; - - #users.extraUsers.root.openssh.authorizedKeys.keys = [ (builtins.readFile ) ]; - } From d6a8bdcdc62087b279f4d1e3b4b6849413063cc9 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 17 May 2015 19:26:43 +0300 Subject: [PATCH 440/615] azure sdk for python: update from 0.9.0 to 0.11.0 Conflicts: pkgs/top-level/python-packages.nix --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dd96c9234ce2..20436811c494 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -750,13 +750,13 @@ let })); azure = buildPythonPackage rec { - version = "0.10.2"; + version = "0.11.0"; name = "azure-${version}"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/azure/${name}.zip"; - md5 = "8eaa0f8e649b21b6527a5ee801cef33a"; + md5 = "5499efd85c54c757c0e757b5407ee47f"; }; propagatedBuildInputs = with self; [ dateutil futures pyopenssl requests ]; From 8ed3ab50eab1ebfe7f1f295d03b395098ea09de6 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 20 May 2015 13:22:20 +0300 Subject: [PATCH 441/615] azure-image: common: add sg3_utils --- nixos/modules/virtualisation/azure-common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix index 4fc7a085f868..47022c6887c3 100644 --- a/nixos/modules/virtualisation/azure-common.nix +++ b/nixos/modules/virtualisation/azure-common.nix @@ -30,7 +30,8 @@ with lib; networking.hostName = mkDefault ""; # Always include cryptsetup so that NixOps can use it. - environment.systemPackages = [ pkgs.cryptsetup ]; + # sg_scan is needed to finalize disk removal on older kernels + environment.systemPackages = [ pkgs.cryptsetup pkgs.sg3_utils ]; networking.usePredictableInterfaceNames = false; From 404608478d0d7d89fd7708995cf8e32c8d97364b Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 20 May 2015 11:57:15 +0000 Subject: [PATCH 442/615] networkmanagerapplet: fix VPN plugins path. Closes #7908 --- pkgs/tools/networking/network-manager-applet/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 1ea61b0fea2b..dc1079c8226b 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { sha256 = "0liia390bhkl09lvk2rplcwhmfbxpjffa1xszfawc0h00v9fivaz"; }; + configureFlags = [ "--sysconfdir=/etc" ]; + buildInputs = [ gnome3.gtk libglade networkmanager libnotify libsecret dbus_glib gsettings_desktop_schemas polkit isocodes makeWrapper udev gnome3.gconf gnome3.libgnome_keyring @@ -30,6 +32,11 @@ stdenv.mkDerivation rec { ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' ]; + preInstall = + '' + installFlagsArray=( "sysconfdir=$out/etc" ) + ''; + preFixup = '' wrapProgram "$out/bin/nm-applet" \ --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules:${gnome3.dconf}/lib/gio/modules" \ From e98da673e4d2f7e45dff25c280ea7c29915fb0eb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 20 May 2015 13:51:57 +0200 Subject: [PATCH 443/615] nixos-checkout: Add nixpkgs-channels as a remote This way, you can do things like git checkout channels/nixos-14.12 to get the latest tested and built version of NixOS. --- .../installer/tools/nixos-checkout.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-checkout.nix b/nixos/modules/installer/tools/nixos-checkout.nix index 3338e5119acb..9cdd8a74a188 100644 --- a/nixos/modules/installer/tools/nixos-checkout.nix +++ b/nixos/modules/installer/tools/nixos-checkout.nix @@ -1,5 +1,5 @@ -# This module generates the nixos-checkout script, which replaces the -# Nixpkgs source trees in /etc/nixos/nixpkgs with a Git checkout. +# This module generates the nixos-checkout script, which performs a +# checkout of the Nixpkgs Git repository. { config, lib, pkgs, ... }: @@ -37,8 +37,19 @@ let mv nixpkgs nixpkgs-$backupTimestamp fi - # Check out the NixOS and Nixpkgs sources. - git clone git://github.com/NixOS/nixpkgs.git nixpkgs + # Check out the Nixpkgs sources. + if ! [ -e nixpkgs/.git ]; then + echo "Creating repository in $prefix/nixpkgs..." + git init --quiet nixpkgs + else + echo "Updating repository in $prefix/nixpkgs..." + fi + cd nixpkgs + git remote add origin git://github.com/NixOS/nixpkgs.git || true + git remote add channels git://github.com/NixOS/nixpkgs-channels.git || true + git remote set-url origin --push git@github.com:NixOS/nixpkgs.git + git remote update + git checkout master ''; }; From 10ce7ae76938da13aba228b4d79f32479a4ea085 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 20 May 2015 14:16:00 +0200 Subject: [PATCH 444/615] Document the nixpkgs-channels repo This replaces update-channel-branches.sh with standard Git invocations. --- nixos/doc/manual/development/sources.xml | 44 +++++++++++++++--------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml index 3ac07da19f12..879a31e32c59 100644 --- a/nixos/doc/manual/development/sources.xml +++ b/nixos/doc/manual/development/sources.xml @@ -24,6 +24,9 @@ $ mkdir -p /my/sources $ cd /my/sources $ nix-env -i git $ git clone git://github.com/NixOS/nixpkgs.git +$ cd nixpkgs +$ git remote add channels git://github.com/NixOS/nixpkgs-channels.git +$ git remote update channels This will check out the latest NixOS sources to @@ -31,7 +34,12 @@ This will check out the latest NixOS sources to and the Nixpkgs sources to /my/sources/nixpkgs. (The NixOS source tree lives in a subdirectory of the Nixpkgs -repository.) +repository.) The remote channels refers to a +read-only repository that tracks the Nixpkgs/NixOS channels (see for more information about channels). Thus, +the Git branch channels/nixos-14.12 will contain +the latest built and tested version available in the +nixos-14.12 channel. It’s often inconvenient to develop directly on the master branch, since if somebody has just committed (say) a change to GCC, @@ -40,28 +48,32 @@ rebuild everything from source. So you may want to create a local branch based on your current NixOS version: -$ /my/sources/nixpkgs/maintainers/scripts/update-channel-branches.sh -Fetching channels from https://nixos.org/channels: - * [new branch] cbe467e -> channels/remotes/nixos-unstable -Fetching channels from nixos-version: - * [new branch] 9ff4738 -> channels/current-system -Fetching channels from ~/.nix-defexpr: - * [new branch] 0d4acad -> channels/root/nixos -$ git checkout -b local channels/current-system +$ nixos-version +14.04.273.ea1952b (Baboon) + +$ git checkout -b local ea1952b -Or, to base your local branch on the latest version available in the +Or, to base your local branch on the latest version available in a NixOS channel: -$ /my/sources/nixpkgs/maintainers/scripts/update-channel-branches.sh -$ git checkout -b local channels/remotes/nixos-unstable +$ git remote update channels +$ git checkout -b local channels/nixos-14.12 -You can then use git rebase to sync your local -branch with the upstream branch, and use git -cherry-pick to copy commits from your local branch to the -upstream branch. +(Replace nixos-14.12 with the name of the channel +you want to use.) You can use git merge or +git rebase to keep your local branch in sync with +the channel, e.g. + + +$ git remote update channels +$ git merge channels/nixos-14.12 + + +You can use git cherry-pick to copy commits from +your local branch to the upstream branch. If you want to rebuild your system using your (modified) sources, you need to tell nixos-rebuild about them From 49fa221c624a9a0d982b1f1b77a0a9376abda352 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 20 May 2015 07:24:14 -0500 Subject: [PATCH 445/615] Update libbluedevil to 2.1 The bluedevil build has been failing since it was updated to 2.1.1. Bluedevil and libbluedevil must be kept at the same major version! --- pkgs/development/libraries/libbluedevil/default.nix | 8 +++++--- pkgs/tools/bluetooth/bluedevil/default.nix | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libbluedevil/default.nix b/pkgs/development/libraries/libbluedevil/default.nix index 8443ddaa6062..44b8d47b5e3b 100644 --- a/pkgs/development/libraries/libbluedevil/default.nix +++ b/pkgs/development/libraries/libbluedevil/default.nix @@ -3,11 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libbluedevil"; - version = "1.9.3"; + # bluedevil must have the same major version (x.y) as libbluedevil! + # do not update this package without checking bluedevil + version = "2.1"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "0fdq083145mb3ynw14pc471ahp7is48wqpmswrvfz3hkyayriss3"; + url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "0p4f0brhcz9gfxfd6114fa5x6swfdmgzv350xwncdr0s1qnamk8c"; }; buildInputs = [ cmake qt4 ]; diff --git a/pkgs/tools/bluetooth/bluedevil/default.nix b/pkgs/tools/bluetooth/bluedevil/default.nix index 229b0512679b..e018972d2aaf 100644 --- a/pkgs/tools/bluetooth/bluedevil/default.nix +++ b/pkgs/tools/bluetooth/bluedevil/default.nix @@ -3,6 +3,8 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bluedevil"; + # bluedevil must have the same major version (x.y) as libbluedevil! + # do not update this package without checking libbluedevil version = "2.1.1"; src = fetchurl { From cf6ab47be2e2417601af102f0b947e383c142d9e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 May 2015 16:18:33 +0200 Subject: [PATCH 446/615] oracle-instantclient: don't strip or patchelf this library --- pkgs/development/libraries/oracle-instantclient/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index ebb3aaeee582..a2c007194638 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -53,6 +53,9 @@ let requireSource = version: part: hash: (requireFile rec { done ''; + dontStrip = true; + dontPatchELF = true; + meta = with stdenv.lib; { description = "Oracle instant client libraries and sqlplus CLI."; longDescription = '' From b4ceac808b5b6197a307f3539625727da59d452f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 May 2015 01:42:08 +0200 Subject: [PATCH 447/615] cassandra 2.0.14 -> 2.0.15 --- pkgs/servers/nosql/cassandra/2.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix index defb4f657d6c..adda65ce60a3 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.14"; - sha256 = "06vsv141dk5i5z47nh1glkqpscjl5fgynbhaxb4yjab9lskwv5jk"; + version = "2.0.15"; + sha256 = "00rxmf8il9w1fmfpxfy9gbhbvgid5h8d80g3ljw25jscr00lcyh0"; in From 622bd2e15f2e4e1a992cefc3f07015a13e5a0246 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 May 2015 01:46:56 +0200 Subject: [PATCH 448/615] cassandra 2.1.4 -> 2.1.5 --- pkgs/servers/nosql/cassandra/2.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix index d62e8aa450c4..88a1d464b671 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.4"; - sha256 = "1wdp1hcp541bwja0h5kb0ff2yy74mlhkr93chrlz2199lynynpgv"; + version = "2.1.5"; + sha256 = "1zrnmwyxcrdphcbi82ps0qp81yrn1gny4iv2wa4n4mwwp8pqwxid"; in From d01927269e395983d9c892b2b29b91dc253b8a3a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 May 2015 02:15:40 +0200 Subject: [PATCH 449/615] uae: use archive.org links The original homepage is long gone (as is the tarball it hosted). --- pkgs/misc/emulators/uae/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index 85fc6df9520f..f877eff5c641 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, pkgconfig, gtk, alsaLib, SDL}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "uae-0.8.29"; src = fetchurl { - url = http://www.amigaemulator.org/files/sources/develop/uae-0.8.29.tar.bz2; + url = "http://web.archive.org/web/20130905032631/http://www.amigaemulator.org/files/sources/develop/${name}.tar.bz2"; sha256 = "05s3cd1rd5a970s938qf4c2xm3l7f54g5iaqw56v8smk355m4qr4"; }; configureFlags = [ "--with-sdl" "--with-sdl-sound" "--with-sdl-gfx" "--with-alsa" ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { description = "Ultimate/Unix/Unusable Amiga Emulator"; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://www.amigaemulator.org; + homepage = http://web.archive.org/web/20130901222855/http://www.amigaemulator.org/; maintainers = [ stdenv.lib.maintainers.sander ]; }; } From 8a53e1a312c6ac2c0d16eb8e910f36453cc0ca9d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2015 16:42:13 +0200 Subject: [PATCH 450/615] geolite-legacy -> 2015-05-20 --- pkgs/data/misc/geolite-legacy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 7715a0db2362..ef7511afb17f 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,7 +8,7 @@ let # Annoyingly, these files are updated without a change in URL. This means that # builds will start failing every month or so, until the hashes are updated. - version = "2015-05-07"; + version = "2015-05-20"; in stdenv.mkDerivation { name = "geolite-legacy-${version}"; @@ -22,9 +22,9 @@ stdenv.mkDerivation { srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "1jlxd60l7ic7md0d93fhiyd2vqms1fcirp6wkm0glh347j64srsb"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" - "1y5b68s1giw01vw98c99qdhjiaxx6l4hrc2mx4rdaja46zic4maz"; + "09vv3jg6gnz2k30pkwgcakvfvklfrkwsj0xq5q2awcw6ik0vkfcm"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" - "0crl31yc11w4jzgvbr9pgqd7x6ivpsgsip19s1g5xl71qbpmmjxm"; + "1qdprh1idxa1l4s23lcjg33hi4i8qzlk4fjril2zcd3prff1xkz2"; meta = with stdenv.lib; { inherit version; From 33c28bdc833effbf4cd31971e782eeb925f88877 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 18 May 2015 04:46:48 +0000 Subject: [PATCH 451/615] agda: Agda dependencies are treated seperately - Only they are added to the optional build path (share/agda) - Only they are are passed as an include dir (share/agda) - Only they are propigatedBuildInputs --- pkgs/build-support/agda/default.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index a513d50d04c7..6e9aef5499aa 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -28,16 +28,24 @@ in # There is no Hackage for Agda so we require src. inherit (self) src name; + isAgdaPackage = true; + buildInputs = [ Agda ] ++ self.buildDepends; buildDepends = []; + + buildDependsAgda = filter + (dep: dep ? isAgdaPackage && dep.isAgdaPackage) + self.buildDepends; + buildDependsAgdaShareAgda = map (x: x + "/share/agda") self.buildDependsAgda; + # Not much choice here ;) LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; everythingFile = "Everything.agda"; - propagatedBuildInputs = self.buildDepends; - propagatedUserEnvPkgs = self.buildDepends; + propagatedBuildInputs = self.buildDependsAgda; + propagatedUserEnvPkgs = self.buildDependsAgda; # Immediate source directories under which modules can be found. sourceDirectories = [ ]; @@ -50,13 +58,13 @@ in topSourceDirectories = [ "src" ]; # FIXME: `dirOf self.everythingFile` is what we really want, not hardcoded "./" - includeDirs = let r = map (x: x + "/share/agda") self.buildDepends; - d = self.sourceDirectories ++ self.topSourceDirectories; - in r ++ d ++ [ "." ]; + includeDirs = self.buildDependsAgdaShareAgda + ++ self.sourceDirectories ++ self.topSourceDirectories + ++ [ "." ]; buildFlags = unwords (map (x: "-i " + x) self.includeDirs); # We expose this as a mere convenience for any tools. - AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDepends; + AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDependsAgdaShareAgda; # Makes a wrapper available to the user. Very useful in # nix-shell where all dependencies are -i'd. From 91ab6c9e899605be047e0e96af1144b964e6b64e Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 18 May 2015 04:50:37 +0000 Subject: [PATCH 452/615] agda: Wrapper is no longer built by default Instead it is provided to the user who can choose whether or not to include it in the final derivati. Example of including would be: ```nix callPackage ... (self: { inherit (self.extras) extraThing; }) ``` These extras are also available downstream without being built by default. This is achieved with `passthru`. --- pkgs/build-support/agda/default.nix | 39 +++++++++++++++++------------ 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 6e9aef5499aa..69c4897d1a4b 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -22,6 +22,9 @@ in propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs; propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs; everythingFile = if x.everythingFile == "" then "Everything.agda" else x.everythingFile; + + passthru = { inherit (x) extras; }; + extras = null; }; defaults = self : { @@ -63,25 +66,11 @@ in ++ [ "." ]; buildFlags = unwords (map (x: "-i " + x) self.includeDirs); - # We expose this as a mere convenience for any tools. - AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDependsAgdaShareAgda; - - # Makes a wrapper available to the user. Very useful in - # nix-shell where all dependencies are -i'd. - agdaWrapper = writeScriptBin "agda" '' - ${Agda}/bin/agda ${self.buildFlags} "$@" - ''; - - # configurePhase is idempotent - configurePhase = '' - runHook preConfigure - export PATH="${self.agdaWrapper}/bin:$PATH" - runHook postConfigure - ''; + agdaWithArgs = "${Agda}/bin/agda ${self.buildFlags}"; buildPhase = '' runHook preBuild - ${Agda}/bin/agda ${self.buildFlags} ${self.everythingFile} + ${self.agdaWithArgs} ${self.everythingFile} runHook postBuild ''; @@ -91,6 +80,24 @@ in cp -pR ${unwords self.sourceDirectories} ${mapInside self.topSourceDirectories} $out/share/agda runHook postInstall ''; + + # Optionally-built conveniences + extras = { + # Makes a wrapper available to the user. Very useful in + # nix-shell where all dependencies are -i'd. + agdaWrapper = writeScriptBin "agda" '' + ${self.agdaWithArgs} "$@" + ''; + + # Use this to stick `agdaWrapper` at the front of the PATH: + # + # agda.mkDerivation (self: { PATH = self.extras.agdaWrapperPATH; }) + # + # Not sure this is the best way to handle conflicts.... + agdaWrapperPATH = "${self.extras.agdaWrapper}/bin:$PATH"; + + AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDependsAgdaShareAgda; + }; }; in stdenv.mkDerivation (postprocess (let super = defaults self // args self; From 52a6589559ea424857b30b531f766c3c783b60a8 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 18 May 2015 01:49:19 -0400 Subject: [PATCH 453/615] agda: the Iowa stdlib seems to be behind a private SVN now --- pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix index 2c76c2f43508..cda2cd9bb05d 100644 --- a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix @@ -22,5 +22,7 @@ agda.mkDerivation (self: rec { license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + + broken = true; }; }) From 57ec8364163f748b7b88167b52e5dea23e5a632e Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 20 May 2015 18:06:18 +0200 Subject: [PATCH 454/615] aliceml: update version string --- pkgs/development/compilers/aliceml/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index a57cd5b60064..6fbc1a350f5c 100644 --- a/pkgs/development/compilers/aliceml/default.nix +++ b/pkgs/development/compilers/aliceml/default.nix @@ -1,7 +1,7 @@ {stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkgconfig, perl, gnome, pango, sqlite, libxml2, zlib, gmp, smlnj }: stdenv.mkDerivation { - name = "aliceml-1.4-493cd356"; + name = "aliceml-1.4-7d44dc8e"; src = fetchgit { url = "https://github.com/aliceml/aliceml"; From 824da827ac40eea4ff8dfe909c368164ab32f22b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 20 May 2015 18:53:06 +0200 Subject: [PATCH 455/615] phpPackages.redis: update from 2.2.5 to 2.2.7 --- pkgs/top-level/php-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 9187d5606028..fe06043a8596 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -90,9 +90,8 @@ let self = with self; { }; redis = buildPecl { - name = "redis-2.2.5"; - - sha256 = "0hrk0lf8h6l30zrjld29csl186zb1cl2rz1gfn9dma33np4iisyw"; + name = "redis-2.2.7"; + sha256 = "00n9dpk9ak0bl35sbcd3msr78sijrxdlb727nhg7f2g7swf37rcm"; }; composer = pkgs.stdenv.mkDerivation rec { From e3ed4b590b0f867a430c13ea92dd496a595ba78e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 20 May 2015 14:09:15 -0400 Subject: [PATCH 456/615] Fix tarball --- pkgs/applications/audio/gtkpod/default.nix | 2 +- pkgs/servers/monitoring/prometheus/alertmanager/default.nix | 2 +- pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 9c08b2ab6d7d..f01abb13e67c 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig makeWrapper intltool curl gettext perl perlXMLParser flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta - gnome.gdl gnome.gnome_icon_theme_symbolic gnome.gnome_icon_theme + gnome.gdl gnome.defaultIconTheme hicolor_icon_theme ]; patchPhase = '' diff --git a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix index 4ef870bfcf93..06dfc1ef1c97 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { buildInputs = [ goPackages.glog goPackages.protobuf - goPackages.fsnotify + goPackages.fsnotify.v1 goPackages.httprouter goPackages.prometheus.client_golang goPackages.pushover diff --git a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix index da15952f0f37..b6548b90f299 100644 --- a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix +++ b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix @@ -13,7 +13,7 @@ goPackages.buildGoPackage rec { }; buildInputs = with goPackages; [ - fsnotify + fsnotify.v1 prometheus.client_golang ]; From 64ecc21b9a5e49fa894b21ae260d19a34c87e5f0 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 31 Mar 2015 09:34:48 +0200 Subject: [PATCH 457/615] Add mozc and its dependency zinnia. --- pkgs/tools/inputmethods/mozc/default.nix | 73 +++++++++++++++++++ .../tegaki-zinnia-japanese/default.nix | 23 ++++++ pkgs/tools/inputmethods/zinnia/default.nix | 23 ++++++ pkgs/top-level/all-packages.nix | 7 ++ 4 files changed, 126 insertions(+) create mode 100644 pkgs/tools/inputmethods/mozc/default.nix create mode 100644 pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix create mode 100644 pkgs/tools/inputmethods/zinnia/default.nix diff --git a/pkgs/tools/inputmethods/mozc/default.nix b/pkgs/tools/inputmethods/mozc/default.nix new file mode 100644 index 000000000000..20789a33a0c0 --- /dev/null +++ b/pkgs/tools/inputmethods/mozc/default.nix @@ -0,0 +1,73 @@ +{ clangStdenv, fetchFromGitHub, fetchsvn, gyp, which, ninja, python, pkgconfig, protobuf, ibus, gtk, zinnia, qt4, libxcb, tegaki-zinnia-japanese }: + +let + japanese_usage_dictionary = fetchsvn { + url = "http://japanese-usage-dictionary.googlecode.com/svn/trunk"; + rev = "10"; + sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm"; + }; +in clangStdenv.mkDerivation rec { + name = "mozc-${version}"; + version = "2015-05-02"; + + meta = with clangStdenv.lib; { + description = "Japanese input method from Google"; + homepage = http://code.google.com/p/mozc/; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.gebner ]; + }; + + nativeBuildInputs = [ gyp which ninja python pkgconfig ]; + buildInputs = [ protobuf ibus gtk zinnia qt4 libxcb ]; + + src = fetchFromGitHub { + owner = "google"; + repo = "mozc"; + rev = "d9783737ecfcb68c3d98d84e7052d716f4d0e0cb"; + sha256 = "52a83658e2e4a7b38e31a4085682be24c9c5f4c51a01578598a30b9833827b72"; + }; + postUnpack = '' + ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary + ''; + + configurePhase = '' + export GYP_DEFINES="ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc ibus_mozc_icon_path=$out/share/ibus-mozc/product_icon.png document_dir=$out/share/doc/mozc zinnia_model_file=${tegaki-zinnia-japanese}/share/tegaki/models/zinnia/handwriting-ja.model use_libprotobuf=1" + python src/build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc + ''; + + buildPhase = '' + python src/build_mozc.py build -c Release \ + unix/ibus/ibus.gyp:ibus_mozc \ + unix/emacs/emacs.gyp:mozc_emacs_helper \ + server/server.gyp:mozc_server \ + gui/gui.gyp:mozc_tool \ + renderer/renderer.gyp:mozc_renderer + ''; + + checkPhase = '' + python src/build_mozc.py runtests -c Release + ''; + + installPhase = '' + install -D -m 755 src/out_linux/Release/mozc_server $out/lib/mozc/mozc_server + install -m 755 src/out_linux/Release/mozc_tool $out/lib/mozc/mozc_tool + + install -d $out/share/doc/mozc + install -m 644 src/data/installer/*.html $out/share/doc/mozc/ + + install -D -m 755 src/out_linux/Release/ibus_mozc $out/lib/ibus-mozc/ibus-engine-mozc + install -D -m 644 src/out_linux/Release/gen/unix/ibus/mozc.xml $out/share/ibus/component/mozc.xml + install -D -m 644 src/data/images/unix/ime_product_icon_opensource-32.png $out/share/ibus-mozc/product_icon.png + install -m 644 src/data/images/unix/ui-tool.png $out/share/ibus-mozc/tool.png + install -m 644 src/data/images/unix/ui-properties.png $out/share/ibus-mozc/properties.png + install -m 644 src/data/images/unix/ui-dictionary.png $out/share/ibus-mozc/dictionary.png + install -m 644 src/data/images/unix/ui-direct.png $out/share/ibus-mozc/direct.png + install -m 644 src/data/images/unix/ui-hiragana.png $out/share/ibus-mozc/hiragana.png + install -m 644 src/data/images/unix/ui-katakana_half.png $out/share/ibus-mozc/katakana_half.png + install -m 644 src/data/images/unix/ui-katakana_full.png $out/share/ibus-mozc/katakana_full.png + install -m 644 src/data/images/unix/ui-alpha_half.png $out/share/ibus-mozc/alpha_half.png + install -m 644 src/data/images/unix/ui-alpha_full.png $out/share/ibus-mozc/alpha_full.png + install -D -m 755 src/out_linux/Release/mozc_renderer $out/lib/mozc/mozc_renderer + ''; +} diff --git a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix new file mode 100644 index 000000000000..55cf09455823 --- /dev/null +++ b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "tegaki-zinnia-japanese-${version}"; + version = "0.3"; + + src = fetchurl { + url = "http://www.tegaki.org/releases/0.3/models/tegaki-zinnia-japanese-0.3.zip"; + sha256 = "1nmg9acxhcqly9gwkyb9m0hpy76fll91ywk4b1q4xms0ajxip1h7"; + }; + + meta = with stdenv.lib; { + description = "Japanese handwriting model for the Zinnia engine"; + homepage = http://tegaki.org/; + license = licenses.lgpl21; + platforms = platforms.unix; + maintainers = [ maintainers.gebner ]; + }; + + buildInputs = [ unzip ]; + + makeFlags = [ "installpath=$(out)/share/tegaki/models/zinnia/" ]; +} diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/tools/inputmethods/zinnia/default.nix new file mode 100644 index 000000000000..fd8c9bd7c79d --- /dev/null +++ b/pkgs/tools/inputmethods/zinnia/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "zinnia-${version}"; + version = "2015-03-15"; + + src = fetchFromGitHub { + owner = "taku910"; + repo = "zinnia"; + rev = "d8de1180d5175d7579e6c41b000f1ab4dd9cd697"; + sha256 = "ac09a16c04c5ef9b46626984e627250dc717d85711d14f1bbfa7f1ca0ca713dc"; + }; + + setSourceRoot = "export sourceRoot=$(echo zinnia-*/zinnia/)"; + + meta = with stdenv.lib; { + description = "Online hand recognition system with machine learning"; + homepage = "http://taku910.github.io/zinnia/"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.gebner ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9936330936c2..4a20ae872b06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1045,6 +1045,10 @@ let anthy = callPackage ../tools/inputmethods/anthy { }; + mozc = callPackage ../tools/inputmethods/mozc { + inherit (pythonPackages) gyp; + }; + ibus = callPackage ../tools/inputmethods/ibus { }; ibus-qt = callPackage ../tools/inputmethods/ibus-qt { }; @@ -3315,6 +3319,9 @@ let zile = callPackage ../applications/editors/zile { }; + zinnia = callPackage ../tools/inputmethods/zinnia { }; + tegaki-zinnia-japanese = callPackage ../tools/inputmethods/tegaki-zinnia-japanese { }; + zip = callPackage ../tools/archivers/zip { }; zpaq = callPackage ../tools/archivers/zpaq { }; From 97160a8644dddc2d08a2f40ee1bed7ccd53f9cc0 Mon Sep 17 00:00:00 2001 From: Ozan Sener Date: Mon, 19 Jan 2015 02:14:02 +0200 Subject: [PATCH 458/615] Add Thrust 0.7.6 --- lib/maintainers.nix | 1 + pkgs/development/tools/thrust/default.nix | 47 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 52 insertions(+) create mode 100644 pkgs/development/tools/thrust/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 875d66e04bd4..bf1e1bba1c8f 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -151,6 +151,7 @@ offline = "Jaka Hudoklin "; olcai = "Erik Timan "; orbitz = "Malcolm Matalka "; + osener = "Ozan Sener "; page = "Carles Pagès "; paholg = "Paho Lurie-Gregg "; pakhfn = "Fedor Pakhomov "; diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix new file mode 100644 index 000000000000..02b21b3569f8 --- /dev/null +++ b/pkgs/development/tools/thrust/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk, atk +, pango, freetype, fontconfig, gdk_pixbuf , cairo, cups, expat, nspr, gconf, nss +, xlibs, libcap, unzip +}: + +let + thrustEnv = buildEnv { + name = "env-thrust"; + paths = [ + stdenv.cc.gcc glib dbus gtk atk pango freetype fontconfig gdk_pixbuf + cairo cups expat alsaLib nspr gconf nss xlibs.libXrender xlibs.libX11 + xlibs.libXext xlibs.libXdamage xlibs.libXtst xlibs.libXcomposite + xlibs.libXi xlibs.libXfixes xlibs.libXrandr xlibs.libXcursor libcap + ]; + }; +in stdenv.mkDerivation rec { + name = "thrust-${version}"; + version = "0.7.6"; + + src = fetchurl { + url = "https://github.com/breach/thrust/releases/download/v${version}/thrust-v${version}-linux-x64.zip"; + sha256 = "07rrnlj0gk500pvar4b1wdqm05p4n9yjwn911x93bd2qwc8r5ymc"; + }; + + buildInputs = [ thrustEnv makeWrapper unzip ]; + + phases = [ "installPhase" "fixupPhase" ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/libexec/thrust + unzip -d $out/libexec/thrust/ $src + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/libexec/thrust/thrust_shell + wrapProgram $out/libexec/thrust/thrust_shell \ + --prefix "LD_LIBRARY_PATH" : "${thrustEnv}/lib:${thrustEnv}/lib64" + ln -s $out/libexec/thrust/thrust_shell $out/bin + ''; + + meta = with stdenv.lib; { + description = "Chromium-based cross-platform / cross-language application framework"; + homepage = https://github.com/breach/thrust; + license = [ licenses.mit ]; + maintainers = [ maintainers.osener ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d582114946cd..ca79a3e9a924 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4479,6 +4479,10 @@ let teyjus = callPackage ../development/compilers/teyjus { omake = omake_rc1; }; + + thrust = callPackage ../development/tools/thrust { + gconf = pkgs.gnome.GConf; + }; tinycc = callPackage ../development/compilers/tinycc { }; From 2043857a7331f927c78f920be55ba0d36c6438c5 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 20 May 2015 21:14:45 +0200 Subject: [PATCH 459/615] youtube-dl: update from 2015-05-15 to 2015-05-20 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 12f6cb18aa2e..14d6dccb041f 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "youtube-dl-${version}"; - version = "2015.05.15"; + version = "2015.05.20"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0b4fnlgfnwdh1z8avydbc8rr75jpcyvfpvs39ln1gh7m8vyxwjz6"; + sha256 = "1crfada7vq3d24062wr06sfam66cf14j06wnhg7w5ljzrbynvpll"; }; buildInputs = [ python makeWrapper zip pandoc ]; From 98ad87fb4de1fddc91fdbce6e0138a1420d8d66f Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 20 May 2015 15:41:23 -0500 Subject: [PATCH 460/615] t1lib: Conditionalize a recent change for Darwin --- pkgs/development/libraries/t1lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 039dc59774c5..5ed773c56d2c 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 libXaw ]; buildFlags = "without_doc"; - postInstall = "chmod +x $out/lib/*.so.*"; # ?? + postInstall = stdenv.lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? } From 05a6c34e04c0f16f02f8045ce567dec4b43ca082 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 20 May 2015 13:56:42 -0600 Subject: [PATCH 461/615] New package: mpDris2, MPRIS 2 support for mpd --- pkgs/tools/audio/mpdris2/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 9 +++++++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/audio/mpdris2/default.nix diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix new file mode 100644 index 000000000000..82ddc85fd880 --- /dev/null +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, autoreconfHook, intltool +, python, wrapPython, mpd, pygtk, dbus, pynotify +}: + +stdenv.mkDerivation rec { + name = "mpDris2"; + version = "0.6"; + + src = fetchurl { + url = "https://github.com/eonpatapon/${name}/archive/${version}.tar.gz"; + sha256 = "0zdmamj2ldhr6y3s464w8y2x3yizda784jnlrg3j3myfabssisvz"; + }; + + buildInputs = [ intltool autoreconfHook ]; + propagatedBuildInputs = [ python wrapPython ]; + pythonPath = [ mpd pygtk dbus pynotify ]; + postInstall = "wrapPythonPrograms"; + + meta = with stdenv.lib; { + description = "MPRIS 2 support for mpd"; + homepage = https://github.com/eonpatapon/mpDris2/; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ pjones ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d582114946cd..3c60bb2bb3be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -842,6 +842,15 @@ let mpdcron = callPackage ../tools/audio/mpdcron { }; + mpdris2 = callPackage ../tools/audio/mpdris2 { + python = pythonFull; + wrapPython = pythonPackages.wrapPython; + mpd = pythonPackages.mpd; + pygtk = pythonPackages.pygtk; + dbus = pythonPackages.dbus; + pynotify = pythonPackages.notify; + }; + syslogng = callPackage ../tools/system/syslog-ng { }; syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { }; From bfc1582b81937b24466a4e20d4dbbb1830c14108 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 21 May 2015 01:09:32 +0200 Subject: [PATCH 462/615] jumanji: fix gsettings schemas, closes #7916 --- pkgs/applications/networking/browsers/jumanji/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix index c44db8db759b..1969a1f502f2 100644 --- a/pkgs/applications/networking/browsers/jumanji/default.nix +++ b/pkgs/applications/networking/browsers/jumanji/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchgit, pkgconfig, girara, gtk, webkitgtk, glib_networking, makeWrapper }: +{ stdenv, fetchgit, pkgconfig, girara, gtk, webkitgtk, glib_networking, makeWrapper +, gsettings_desktop_schemas }: stdenv.mkDerivation rec { name = "jumanji-${version}"; @@ -10,13 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1xq06iabr4y76faf4w1cx6fhwdksfsxggz1ndny7icniwjzk98h9"; }; - buildInputs = [ girara pkgconfig gtk webkitgtk makeWrapper ]; + buildInputs = [ girara pkgconfig gtk webkitgtk makeWrapper gsettings_desktop_schemas ]; makeFlags = [ "PREFIX=$(out)" ]; preFixup='' wrapProgram "$out/bin/jumanji" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { From c13b94388edab9834e7ff14880b8b6c06e8060c9 Mon Sep 17 00:00:00 2001 From: codyopel Date: Wed, 20 May 2015 20:07:30 -0400 Subject: [PATCH 463/615] x265: 1.6 -> 1.7 --- pkgs/development/libraries/x265/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index a2af56cbca6c..1598fec61948 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -16,11 +16,11 @@ in stdenv.mkDerivation rec { name = "x265-${version}"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "https://github.com/videolan/x265/archive/${version}.tar.gz"; - sha256 = "17c1phwmgcvvh9bakh1249rj2js77nr7y9igg34i3f8hsrdc4x0w"; + sha256 = "18w3whmbjlalvysny51kdq9b228iwg3rdav4kmifazksvrm4yacq"; }; patchPhase = '' From 61fa78293dece8d75957782f6006f0266a62ed01 Mon Sep 17 00:00:00 2001 From: codyopel Date: Wed, 20 May 2015 20:45:59 -0400 Subject: [PATCH 464/615] ffmpeg(-full): 2.6.2 -> 2.6.3 --- pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++-- pkgs/development/libraries/ffmpeg/2.6.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 137340663402..fd5ca0545a3b 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -231,11 +231,11 @@ assert x11grabExtlib -> libX11 != null && libXv != null; stdenv.mkDerivation rec { name = "ffmpeg-${version}"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { url = "https://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1fi93zy98wmls7x3jpr2yvckk2ia6a1yyygwrfaxq95pd6h3m7l8"; + sha256 = "1yqc3vm1xrwf866q262qd4nr9d6ifp4gg183pjdc4sl9np0rissr"; }; patchPhase = ''patchShebangs .''; diff --git a/pkgs/development/libraries/ffmpeg/2.6.nix b/pkgs/development/libraries/ffmpeg/2.6.nix index 0974af75ccd5..60fc32e030e0 100644 --- a/pkgs/development/libraries/ffmpeg/2.6.nix +++ b/pkgs/development/libraries/ffmpeg/2.6.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // rec { - version = "${branch}.2"; + version = "${branch}.3"; branch = "2.6"; - sha256 = "1fi93zy98wmls7x3jpr2yvckk2ia6a1yyygwrfaxq95pd6h3m7l8"; + sha256 = "1yqc3vm1xrwf866q262qd4nr9d6ifp4gg183pjdc4sl9np0rissr"; }) From 737d77db75eff3b51727a9b5764a852943de147e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 May 2015 14:06:11 -0700 Subject: [PATCH 465/615] btrfsprogs: 4.0 -> 4.0.1 --- pkgs/tools/filesystems/btrfsprogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index e2ed76494a15..c50367726db4 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "4.0"; in +let version = "4.0.1"; in stdenv.mkDerivation (rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "07ss0spfkb6dkvcwmkljy6bbyf437abwzngip141a1mhq6ng370p"; + sha256 = "1jwk0bnb4nvhw6b7i9mw5wkvqc6igx99qqg8zwpaj5nxkvki0bic"; }; buildInputs = [ From d6c6253be0e1cc785733c5d5f4a198e797bc9362 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 May 2015 13:03:41 -0700 Subject: [PATCH 466/615] libseccomp: 2.2.0 -> 2.2.1 --- pkgs/development/libraries/libseccomp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index 00655b51afc7..61f22701111c 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libseccomp-${version}"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "seccomp"; repo = "libseccomp"; rev = "v${version}"; - sha256 = "0vfd6hx92cp1jaqxxaj30r92bfm6fmamxi2yqxrl82mqism1lk84"; + sha256 = "153k3jflcgij19nxghmwlvqlngl84vkld514d31490c6sfkr5fy2"; }; buildInputs = [ autoreconfHook getopt ]; From 19c259161b987fcb5e1c3b7a87c746372ce017ee Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 May 2015 12:46:14 -0700 Subject: [PATCH 467/615] qemu: 2.2.2 -> 2.3.0 --- .../virtualization/qemu/default.nix | 262 +++++++++++++++--- pkgs/development/libraries/attr/default.nix | 3 +- pkgs/development/libraries/mesa/default.nix | 6 +- pkgs/development/libraries/nspr/default.nix | 3 +- pkgs/development/libraries/nss/default.nix | 3 +- pkgs/tools/networking/vde2/default.nix | 3 +- pkgs/top-level/all-packages.nix | 11 +- 7 files changed, 236 insertions(+), 55 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 69888e22a019..5b23e36af83a 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,70 +1,240 @@ -{ stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman -, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy -, libseccomp, libaio, libcap_ng, gnutls -, makeWrapper -, pulseSupport ? true, pulseaudio -, sdlSupport ? true, SDL -, vncSupport ? true, libjpeg, libpng -, spiceSupport ? true, spice, spice_protocol, usbredir -, x86Only ? false +{ stdenv, fetchurl, pkgconfig, libtool, python, perl, texinfo, flex, bison +, gettext, makeWrapper, glib, zlib, pixman + +# Optional Arguments +, SDL2 ? null, gtk ? null, gnutls ? null, cyrus_sasl ? null, libjpeg ? null +, libpng ? null, ncurses ? null, curl ? null, libcap ? null, attr ? null +, bluez ? null, libibverbs ? null, librdmacm ? null, libuuid ? null, vde2 ? null +, libaio ? null, libcap_ng ? null, spice ? null, spice_protocol ? null +, libceph ? null, libxfs ? null, nss ? null, nspr ? null, libusb ? null +, usbredir ? null, mesa ? null, lzo ? null, snappy ? null, bzip2 ? null +, libseccomp ? null, glusterfs ? null, libssh2 ? null, numactl ? null + +# Audio libraries +, libpulseaudio ? null, alsaLib ? null + +#, pixman ? null +#, python, zlib, glib, ncurses, perl +#, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy +#, libseccomp, libaio, libcap_ng, gnutls +#, makeWrapper +#, pulseSupport ? true, pulseaudio +#, sdlSupport ? true, SDL +#, vncSupport ? true, libjpeg, libpng +#, spiceSupport ? true, spice, spice_protocol, usbredir + +# Extra options +, type ? "" }: with stdenv.lib; let - n = "qemu-2.2.1"; - audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," - + optionalString pulseSupport "pa," - + optionalString sdlSupport "sdl,"; + n = "qemu-2.3.0"; + + 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; + + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; + + optSDL2 = if type == "nix" then null else shouldUsePkg SDL2; + optGtk = if type == "nix" then null else shouldUsePkg gtk; + optLibcap = if type == "nix" then null else shouldUsePkg libcap; + optAttr = if type == "nix" then null else shouldUsePkg attr; + optGnutls = if type == "nix" then null else shouldUsePkg gnutls; + optCyrus_sasl = if type == "nix" then null else shouldUsePkg cyrus_sasl; + optLibjpeg = if type == "nix" then null else shouldUsePkg libjpeg; + optLibpng = if type == "nix" then null else shouldUsePkg libpng; + optNcurses = if type == "nix" then null else shouldUsePkg ncurses; + optCurl = if type == "nix" then null else shouldUsePkg curl; + optBluez = if type == "nix" then null else shouldUsePkg bluez; + optLibibverbs = if type == "nix" then null else shouldUsePkg libibverbs; + optLibrdmacm = if type == "nix" then null else shouldUsePkg librdmacm; + optLibuuid = if type == "nix" then null else shouldUsePkg libuuid; + optVde2 = if type == "nix" then null else shouldUsePkg vde2; + optLibaio = shouldUsePkg libaio; + optLibcap_ng = shouldUsePkg libcap_ng; + optSpice = if type == "nix" then null else shouldUsePkg spice; + optSpice_protocol = if type == "nix" then null else shouldUsePkg spice_protocol; + optLibceph = if type == "nix" then null else shouldUsePkg libceph; + optLibxfs = if type == "nix" then null else shouldUsePkg libxfs; + optNss = if type == "nix" then null else shouldUsePkg nss; + optNspr = if type == "nix" then null else shouldUsePkg nspr; + optLibusb = if type == "nix" then null else shouldUsePkg libusb; + optUsbredir = if type == "nix" then null else shouldUsePkg usbredir; + optMesa = if type == "nix" then null else shouldUsePkg mesa; + optLzo = if type == "nix" then null else shouldUsePkg lzo; + optSnappy = if type == "nix" then null else shouldUsePkg snappy; + optBzip2 = if type == "nix" then null else shouldUsePkg bzip2; + optLibseccomp = if type == "nix" then null else shouldUsePkg libseccomp; + optGlusterfs = if type == "nix" then null else shouldUsePkg glusterfs; + optLibssh2 = if type == "nix" then null else shouldUsePkg libssh2; + optNumactl = if type == "nix" then null else shouldUsePkg numactl; + + hasSDLAbi = if optSDL2 != null then true else null; + + hasVirtfs = stdenv.isLinux && optLibcap != null && optAttr != null; + + hasVnc = type != "nix"; + hasVncTls = hasVnc && optGnutls != null; + hasVncSasl = hasVnc && optCyrus_sasl != null; + hasVncJpeg = hasVnc && optLibjpeg != null; + hasVncPng = hasVnc && optLibpng != null; + hasVncWs = hasVnc && optGnutls != null; + + hasFdt = type != "nix"; + + hasRdma = optLibibverbs != null && optLibrdmacm != null; + + hasLinuxAio = stdenv.isLinux && optLibaio != null; + + hasSpice = optSpice != null && optSpice_protocol != null; + + hasNss = optNss != null && optNspr != null; + + optLibpulseaudio = if type == "nix" then null else shouldUsePkg libpulseaudio; + optAlsaLib = if type == "nix" then null else shouldUsePkg alsaLib; + audio = concatStringsSep "," ( + optional (optSDL2 != null) "sdl" + ++ optional (optLibpulseaudio != null) "pa" + ++ optional (optAlsaLib != null) "alsa" + ); + + systemBinary = if stdenv.system == "x86_64-linux" then "x86_64" + else if stdenv.system == "i686-linux" then "i386" + else null; + + targetList = if stdenv.system == "x86_64-linux" then "x86_64-softmmu,i386-softmmu" + else if stdenv.system == "i686-linux" then "i386-softmmu" + else null; in stdenv.mkDerivation rec { - name = n + (if x86Only then "-x86-only" else ""); + name = "${n}${optionalString (type != null && type != "") "-${type}"}"; src = fetchurl { url = "http://wiki.qemu.org/download/${n}.tar.bz2"; - sha256 = "181m2ddsg3adw8y5dmimsi8x678imn9f6i5p20zbhi7pdr61a5s6"; + sha256 = "120m53c3p28qxmfzllicjzr8syjv6v4d9rsyrgkp7gnmcgvvgfmn"; }; - buildInputs = - [ python zlib pkgconfig glib ncurses perl pixman attr libcap - vde2 texinfo libuuid flex bison makeWrapper lzo snappy libseccomp - libcap_ng gnutls - ] - ++ optionals pulseSupport [ pulseaudio ] - ++ optionals sdlSupport [ SDL ] - ++ optionals vncSupport [ libjpeg libpng ] - ++ optionals spiceSupport [ spice_protocol spice usbredir ] - ++ optionals (hasSuffix "linux" stdenv.system) [ alsaLib libaio ]; + nativeBuildInputs = [ pkgconfig libtool perl texinfo flex bison gettext makeWrapper ]; + + buildInputs = [ + python glib zlib pixman optSDL2 optGtk optNcurses optCurl optBluez optVde2 + optLibcap_ng optAttr optLibuuid optLibceph optLibxfs optLibusb optUsbredir + optMesa optLzo optSnappy optBzip2 optLibseccomp optGlusterfs optLibssh2 + optNumactl optLibpulseaudio optAlsaLib + ] ++ optionals (hasVncTls || hasVncWs) [ + optGnutls + ] ++ optionals hasVncSasl [ + optCyrus_sasl + ] ++ optionals hasVncJpeg [ + optLibjpeg + ] ++ optionals hasVncPng [ + optLibpng + ] ++ optionals hasVirtfs [ + optLibcap + ] ++ optionals hasRdma [ + optLibibverbs optLibrdmacm + ] ++ optionals hasLinuxAio [ + optLibaio + ] ++ optionals hasSpice [ + optSpice optSpice_protocol + ] ++ optionals hasNss [ + optNss optNspr + ]; enableParallelBuilding = true; - patches = [ ./no-etc-install.patch ]; + configureFlags = [ + (mkOther "smbd" "smbd") + (mkOther "sysconfdir" "/etc") + (mkOther "localstatedir" "/var") + (mkEnable true "modules" null) + (mkEnable false "debug-tcg" null) + (mkEnable false "debug-info" null) + (mkEnable false "sparse" null) + (mkEnable false "werror" null) + (mkEnable (optSDL2 != null) "sdl" null) + (mkWith hasSDLAbi "sdlabi" "2.0") + (mkEnable (optGtk != null) "gtk" null) + (mkEnable hasVirtfs "virtfs" null) + (mkEnable hasVnc "vnc" null) + (mkEnable stdenv.isDarwin "cocoa" null) + (mkOther "audio-drv-list" audio) + (mkEnable false "xen" null) + (mkEnable false "xen-pci-passthrough" null) + (mkEnable false "brlapi" null) + (mkEnable hasVncTls "vnc-tls" null) + (mkEnable hasVncSasl "vnc-sasl" null) + (mkEnable hasVncJpeg "vnc-jpeg" null) + (mkEnable hasVncPng "vnc-png" null) + (mkEnable hasVncWs "vnc-ws" null) + (mkEnable (optNcurses != null) "curses" null) + (mkEnable (optCurl != null) "curl" null) + (mkEnable hasFdt "fdt" null) + (mkEnable (optBluez != null) "bluez" null) + (mkEnable stdenv.isLinux "kvm" null) + (mkEnable hasRdma "rdma" null) + (mkEnable (type != "nix") "system" null) + (mkEnable (type != "kvm-only") "user" null) + (mkEnable (type != "kvm-only") "guest-base" null) + (mkEnable true "pie" null) + (mkEnable (optLibuuid != null) "uuid" null) + (mkEnable (optVde2 != null) "vde" null) + (mkEnable false "netmap" null) # TODO(wkennington): Add Support + (mkEnable hasLinuxAio "linux-aio" null) + (mkEnable (optLibcap_ng != null) "cap-ng" null) + (mkEnable (optAttr != null) "attr" null) + (mkEnable (type != "nix") "docs" null) + (mkEnable stdenv.isLinux "vhost-net" null) + (mkEnable hasSpice "spice" null) + (mkEnable (optLibceph != null) "rbd" null) + (mkEnable false "libiscsi" null) # TODO(wkennington): Add support + (mkEnable false "libnfs" null) # TODO(wkennington): Add support + (mkEnable (optLibxfs != null) "xfsctl" null) + (mkEnable hasNss "smartcard-nss" null) + (mkEnable (optLibusb != null) "libusb" null) + (mkEnable (optUsbredir != null) "usb-redir" null) + (mkEnable (optMesa != null) "opengl" null) + (mkEnable (optLzo != null) "lzo" null) + (mkEnable (optSnappy != null) "snappy" null) + (mkEnable (optBzip2 != null) "bzip2" null) + (mkEnable true "guest-agent" null) + (mkEnable (optLibseccomp != null) "seccomp" null) + (mkEnable (optGlusterfs != null) "glusterfs" null) + (mkEnable false "archipelago" null) + (mkEnable true "tpm" null) + (mkEnable (optLibssh2 != null) "libssh2" null) + (mkEnable (optLibuuid != null) "vhdx" null) + (mkEnable (optGnutls != null) "quorum" null) + (mkEnable (optNumactl != null) "numa" null) + ] ++ optionals (type == "kvm-only") [ + (mkOther "target-list" targetList) + ]; - configureFlags = - [ "--enable-seccomp" - "--smbd=smbd" # use `smbd' from $PATH - "--audio-drv-list=${audio}" - "--sysconfdir=/etc" - "--localstatedir=/var" - ] - ++ optional spiceSupport "--enable-spice" - ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu" - ++ optional (hasSuffix "linux" stdenv.system) "--enable-linux-aio"; + installFlags = [ + "sysconfdir=\${out}/etc" + "qemu_confdir=\${out}/etc/qemu" + "qemu_localstatedir=\${TMPDIR}" + ]; - postInstall = - '' - # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. - p="$out/bin/qemu-system-${if stdenv.system == "x86_64-linux" then "x86_64" else "i386"}" - if [ -e "$p" ]; then - makeWrapper "$p" $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)" - fi - ''; + postInstall = optionalString (systemBinary != null) '' + # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. + p="$out/bin/qemu-system-${systemBinary}" + if [ -e "$p" ]; then + makeWrapper "$p" $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)" + fi + ''; meta = with stdenv.lib; { homepage = http://www.qemu.org/; description = "A generic and open source machine emulator and virtualizer"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric shlevy eelco ]; - platforms = platforms.linux; + maintainers = with maintainers; [ viric shlevy eelco wkennington ]; + platforms = if type == "kvm-only" then platforms.linux else platforms.all; }; } diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index 8d87e2ee50dd..75dd10d8caa5 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -14,8 +14,9 @@ stdenv.mkDerivation rec { installTargets = "install install-lib install-dev"; - meta = { + meta = with stdenv.lib; { homepage = http://savannah.nongnu.org/projects/attr/; description = "Library and tools for manipulating extended attributes"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2e94626411e3..1e84276ec00d 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -182,11 +182,11 @@ stdenv.mkDerivation { passthru = { inherit libdrm version driverLink; }; - meta = { + meta = with stdenv.lib; { description = "An open source implementation of OpenGL"; homepage = http://www.mesa3d.org/; license = "bsd"; - platforms = stdenv.lib.platforms.mesaPlatforms; - maintainers = with stdenv.lib.maintainers; [ eduarrrd simons vcunat ]; + platforms = platforms.mesaPlatforms; + maintainers = with maintainers; [ eduarrrd simons vcunat ]; }; } diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 1494092fc47d..dd508d687489 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -21,8 +21,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.mozilla.org/projects/nspr/; description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 5b1675584866..1b889c472f31 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -79,8 +79,9 @@ in stdenv.mkDerivation rec { find $out/bin -type f \( -name nss-config -o -delete \) ''; - meta = { + meta = with stdenv.lib; { homepage = https://developer.mozilla.org/en-US/docs/NSS; description = "A set of libraries for development of security-enabled client and server applications"; + platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index 72a31262e26f..282b6666aa45 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libpcap python ]; - meta = { + meta = with stdenv.lib; { homepage = http://vde.sourceforge.net/; description = "Virtual Distributed Ethernet, an Ethernet compliant virtual network"; + platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8975493f7399..711b86479d26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9749,7 +9749,7 @@ let watch = callPackage ../os-specific/linux/procps/watch.nix { }; - qemu_kvm = lowPrio (qemu.override { x86Only = true; }); + qemu_kvm = lowPrio (qemu.override { type = "kvm-only"; }); firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; @@ -11962,7 +11962,14 @@ let eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { lua5 = lua5_1; }; - qemu = callPackage ../applications/virtualization/qemu { }; + qemu = callPackage ../applications/virtualization/qemu { + gtk = gtk3; + bluez = bluez5; + libusb = libusb1; + mesa = mesa_noglu; + }; + + qemu-nix = qemu.override { type = "nix"; }; qmmp = callPackage ../applications/audio/qmmp { }; From acdc3e6c9abea475cc66b886c4189650a495ce98 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 May 2015 15:12:55 -0700 Subject: [PATCH 468/615] nixos/lightdm: Some fixups --- nixos/modules/services/x11/display-managers/lightdm.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 4aeaed8cd324..dedd0e63b5f1 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -65,7 +65,7 @@ let greeters-directory = ${cfg.greeter.package} sessions-directory = ${dmcfg.session.desktops} - [SeatDefaults] + [Seat:*] xserver-command = ${xserverWrapper} session-wrapper = ${dmcfg.session.script} greeter-session = ${cfg.greeter.name} @@ -124,6 +124,11 @@ in config = mkIf cfg.enable { + assertions = [ { + assertion = !config.services.accounts-daemon.enable; + message = "Lightdm does not properly support gnome accountservice"; + } ]; + services.xserver.displayManager.slim.enable = false; services.xserver.displayManager.job = { From 4ed8cdc3d46abfb441d36282d1fc1ada0e96d859 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 May 2015 18:53:54 -0700 Subject: [PATCH 469/615] nixos/bird: Fix doc compilation --- nixos/modules/services/networking/bird.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix index 2fa1d6af7d2f..e7e1db191529 100644 --- a/nixos/modules/services/networking/bird.nix +++ b/nixos/modules/services/networking/bird.nix @@ -24,7 +24,7 @@ in type = types.string; description = '' BIRD Internet Routing Daemon configuration file. - http://bird.network.cz/?get_doc&f=bird-3.html + ''; }; From 3988cfcbffe6e1912e15e1805ea3a8af8b1996c2 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 May 2015 19:14:31 -0700 Subject: [PATCH 470/615] lightdm: Add patch to fix some warnings --- .../display-managers/lightdm/default.nix | 2 + .../display-managers/lightdm/fix-paths.patch | 61 +++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 pkgs/applications/display-managers/lightdm/fix-paths.patch diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 301eb60429e3..4b04a6e79090 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "0f0c2irb7qq49dabxhh99bwyvkxpfpscy4vynm7y800sz15lm2hs"; }; + patches = [ ./fix-paths.patch ]; + buildInputs = [ pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt qt4 diff --git a/pkgs/applications/display-managers/lightdm/fix-paths.patch b/pkgs/applications/display-managers/lightdm/fix-paths.patch new file mode 100644 index 000000000000..56930418caca --- /dev/null +++ b/pkgs/applications/display-managers/lightdm/fix-paths.patch @@ -0,0 +1,61 @@ +diff --git a/common/user-list.c b/common/user-list.c +index 792c6d3..57fbfb7 100644 +--- a/common/user-list.c ++++ b/common/user-list.c +@@ -331,7 +331,7 @@ load_passwd_file (CommonUserList *user_list, gboolean emit_add_signal) + + value = g_key_file_get_string (config, "UserList", "hidden-shells", NULL); + if (!value) +- value = g_strdup ("/bin/false /usr/sbin/nologin"); ++ value = g_strdup ("/run/current-system/sw/bin/nologin"); + hidden_shells = g_strsplit (value, " ", -1); + g_free (value); + +diff --git a/src/seat.c b/src/seat.c +index f9b149d..9029742 100644 +--- a/src/seat.c ++++ b/src/seat.c +@@ -343,7 +343,7 @@ run_script (Seat *seat, DisplayServer *display_server, const gchar *script_name, + + /* Set POSIX variables */ + process_set_clear_environment (script, TRUE); +- process_set_env (script, "SHELL", "/bin/sh"); ++ process_set_env (script, "SHELL", "/run/current-system/sw/bin/sh"); + + /* Variables required for regression tests */ + if (g_getenv ("LIGHTDM_TEST_ROOT")) +@@ -354,7 +354,7 @@ run_script (Seat *seat, DisplayServer *display_server, const gchar *script_name, + process_set_env (script, "PATH", g_getenv ("PATH")); + } + else +- process_set_env (script, "PATH", "/usr/local/bin:/usr/bin:/bin"); ++ process_set_env (script, "PATH", "/run/current-system/sw/bin"); + + if (user) + { +diff --git a/src/session-child.c b/src/session-child.c +index e85f57d..93db0bd 100644 +--- a/src/session-child.c ++++ b/src/session-child.c +@@ -410,7 +410,7 @@ session_child_run (int argc, char **argv) + else + { + /* Set POSIX variables */ +- pam_putenv (pam_handle, "PATH=/usr/local/bin:/usr/bin:/bin"); ++ pam_putenv (pam_handle, "PATH=/run/current-system/sw/bin"); + pam_putenv (pam_handle, g_strdup_printf ("USER=%s", username)); + pam_putenv (pam_handle, g_strdup_printf ("LOGNAME=%s", username)); + pam_putenv (pam_handle, g_strdup_printf ("HOME=%s", user_get_home_directory (user))); +diff --git a/src/shared-data-manager.c b/src/shared-data-manager.c +index 47f1c10..cc82652 100644 +--- a/src/shared-data-manager.c ++++ b/src/shared-data-manager.c +@@ -68,7 +68,7 @@ delete_unused_user (gpointer key, gpointer value, gpointer user_data) + + gchar *path = g_build_filename (USERS_DIR, user, NULL); + gchar *quoted_path = g_shell_quote (path); +- gchar *cmd = g_strdup_printf ("/bin/rm -rf %s", quoted_path); ++ gchar *cmd = g_strdup_printf ("/run/current-system/sw/bin/rm -rf %s", quoted_path); + + g_spawn_command_line_async (cmd, &error); + if (error) From 3462d04e276b64ee4de2aed0258d3a1f4d89fa11 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 May 2015 23:00:28 -0700 Subject: [PATCH 471/615] kernel: 3.12.42 -> 3.12.43 --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 810087b55a76..2646bf93b0ac 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.42"; + version = "3.12.43"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0vp6yllal2gcyng1kklp9n8r18fhcb1m1ssavjbcbfax5chi7w5s"; + sha256 = "08nsppn3rpwydkq0pd8k8fgjfm67y2nbbrcz1hri227crxxx13dm"; }; features.iwlwifi = true; From 8d7d9723af023ba5f32206b0bd7733bd9f9351f5 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 May 2015 23:00:43 -0700 Subject: [PATCH 472/615] kernel: 3.18.13 -> 3.18.14 --- pkgs/os-specific/linux/kernel/linux-3.18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index eb694497931d..592086b65474 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.13"; + version = "3.18.14"; extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "043bqjvbamzi201csgnw7hsf8810qm0dn7x9p0kc7s9p9jnyq79n"; + sha256 = "1xh0vvn1l2g1kkg54f0mg0inbpsiqs24ybgsakksmcpcadjgqk1i"; }; features.iwlwifi = true; From a305e6855dd8723683c77635f45ae28411c8f36c Mon Sep 17 00:00:00 2001 From: codyopel Date: Thu, 21 May 2015 05:06:54 -0400 Subject: [PATCH 473/615] gyp: svn-1977 -> 2015-05-17 --- pkgs/top-level/python-packages.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 20436811c494..8d6e25e339e4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5811,23 +5811,25 @@ let }; gyp = buildPythonPackage rec { - rev = "1977"; - name = "gyp-r${rev}"; + name = "gyp-${version}"; + version = "2015-05-15"; - src = pkgs.fetchsvn { - url = "http://gyp.googlecode.com/svn/trunk"; - inherit rev; - sha256 = "0vnr75yd3bidysiwl9lljvf1dv6v9m9xqdnx0hdgyl92w689n9j8"; + src = pkgs.fetchgit { + url = "https://chromium.googlesource.com/external/gyp.git"; + rev = "9f594095c5b14f8bc518081a660e77890c294861"; + sha256 = "1xqi44alnw9c31jg2hz7flz5nabq003b4jyin12h3s9zl82y6vd5"; }; patches = optionals pkgs.stdenv.isDarwin [ ../development/python-modules/gyp/no-darwin-cflags.patch ]; - meta = { - homepage = http://code.google.com/p/gyp; - license = stdenv.lib.licenses.bsd3; - description = "Generate Your Projects"; + meta = with stdenv.lib; { + description = "A tool to generate native build files"; + homepage = https://chromium.googlesource.com/external/gyp/+/master/README.md; + license = licenses.bsd3; + maintainers = with maintainers; [ codyopel ]; + platforms = platforms.all; }; }; From ed8e6f62df3ce4f47a7fc5b4b56cf0394b48398f Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Thu, 21 May 2015 12:51:04 +0200 Subject: [PATCH 474/615] new goPackage(s): goquery, cascadia --- pkgs/top-level/go-packages.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 5d8b76fddcf0..b0985e459b21 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -292,6 +292,22 @@ let propagatedBuildInputs = [ panicwrap revel ]; }; + cascadia = buildGoPackage rec { + rev = "54abbbf07a45a3ef346ebe903e0715d9a3c19352"; #master + name = "cascadia-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/andybalholm/cascadia"; + goPackageAliases = [ "code.google.com/p/cascadia" ]; + propagatedBuildInputs = [ net ]; + buildInputs = propagatedBuildInputs; + + src = fetchFromGitHub { + inherit rev; + owner = "andybalholm"; + repo = "cascadia"; + sha256 = "1z21w6p5bp7mi2pvicvcqc871k9s8a6262pkwyjm2qfc859c203m"; + }; + }; + check-v1 = buildGoPackage rec { rev = "871360013c92e1c715c2de6d06b54899468a8a2d"; name = "check-v1-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1306,6 +1322,20 @@ let }; }; + goquery = buildGoPackage rec { + rev = "f065786d418c9d22a33cad33decd59277af31471"; #tag v.0.3.2 + name = "goquery-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/PuerkitoBio/goquery"; + propagatedBuildInputs = [ cascadia net ]; + buildInputs = [ cascadia net ]; + src = fetchFromGitHub { + inherit rev; + owner = "PuerkitoBio"; + repo = "goquery"; + sha256 = "0bskm3nja1v3pmg7g8nqjkmpwz5p72h1h81y076x1z17zrjaw585"; + }; + }; + grafana = buildGoPackage rec { version = "2.0.0-beta1"; name = "grafana-v${version}"; From d25472903490da9840dee94a9caf164c603257d4 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Thu, 21 May 2015 12:55:44 +0200 Subject: [PATCH 475/615] goPackage: enabled checks for goquery/cascadia --- pkgs/top-level/go-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index b0985e459b21..d890e88a7024 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -299,6 +299,7 @@ let goPackageAliases = [ "code.google.com/p/cascadia" ]; propagatedBuildInputs = [ net ]; buildInputs = propagatedBuildInputs; + doCheck = true; src = fetchFromGitHub { inherit rev; @@ -1328,6 +1329,7 @@ let goPackagePath = "github.com/PuerkitoBio/goquery"; propagatedBuildInputs = [ cascadia net ]; buildInputs = [ cascadia net ]; + doCheck = true; src = fetchFromGitHub { inherit rev; owner = "PuerkitoBio"; From 478e1d6f14123cdddc3132dba7bb662fe1d8cd40 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 21 May 2015 12:57:55 +0200 Subject: [PATCH 476/615] vanubi: use vte 2.90 --- pkgs/applications/editors/vanubi/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vanubi/default.nix b/pkgs/applications/editors/vanubi/default.nix index 692a728b12e4..189682ec4e3f 100644 --- a/pkgs/applications/editors/vanubi/default.nix +++ b/pkgs/applications/editors/vanubi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig vala which autoconf automake libtool glib gtk3 libwnck3 asciidoc - gnome3.gtksourceview gnome3.vte python3Packages.pygments ]; + gnome3.gtksourceview gnome3.vte_290 python3Packages.pygments ]; configureScript = "./autogen.sh"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 711b86479d26..04d258efd9e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12449,7 +12449,9 @@ let vanitygen = callPackage ../applications/misc/vanitygen { }; - vanubi = callPackage ../applications/editors/vanubi { vala = vala_0_26; }; + vanubi = callPackage ../applications/editors/vanubi { + vala = vala_0_26; + }; vbindiff = callPackage ../applications/editors/vbindiff { }; From 5d2c6f0353a2c85a755299c28d78cd2de493856f Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 21 May 2015 12:37:14 +0200 Subject: [PATCH 477/615] nixos/tests/installer: Allow to pass extra config. We're going to need it for installer tests where nixos-generate-config isn't yet able to fully detect the filesystems/hardware. for example for device mapper configurations other than LVM. Signed-off-by: aszlig --- nixos/tests/installer.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index af87705b9279..db029a5cc845 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -45,7 +45,8 @@ let # The configuration to install. makeConfig = { testChannel, grubVersion, grubDevice, grubIdentifier - , readOnly ? true, forceGrubReinstallCount ? 0 }: + , extraConfig, readOnly ? true, forceGrubReinstallCount ? 0 + }: pkgs.writeText "configuration.nix" '' { config, lib, pkgs, modulesPath, ... }: @@ -70,6 +71,7 @@ let environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ]; nix.binaryCaches = [ http://cache.nixos.org/ ]; + ${replaceChars ["\n"] ["\n "] extraConfig} } ''; @@ -106,7 +108,9 @@ let # disk, and then reboot from the hard disk. It's parameterized with # a test script fragment `createPartitions', which must create # partitions and filesystems. - testScriptFun = { createPartitions, testChannel, grubVersion, grubDevice, grubIdentifier }: + testScriptFun = { createPartitions, testChannel, grubVersion, grubDevice + , grubIdentifier, extraConfig + }: let # FIXME: OVMF doesn't boot from virtio http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg01501.html iface = if grubVersion == 1 then "scsi" else "virtio"; @@ -172,7 +176,7 @@ let $machine->succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2"); $machine->copyFileFromHost( - "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier; } }", + "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier extraConfig; } }", "/mnt/etc/nixos/configuration.nix"); # Perform the installation. @@ -210,7 +214,7 @@ let # We need to a writable nix-store on next boot $machine->copyFileFromHost( - "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier; readOnly = false; forceGrubReinstallCount = 1; } }", + "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 1; } }", "/etc/nixos/configuration.nix"); # Check whether nixos-rebuild works. @@ -227,7 +231,7 @@ let $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); $machine->waitForUnit("multi-user.target"); $machine->copyFileFromHost( - "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier; readOnly = false; forceGrubReinstallCount = 2; } }", + "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 2; } }", "/etc/nixos/configuration.nix"); $machine->succeed("nixos-rebuild boot >&2"); $machine->shutdown; @@ -241,13 +245,16 @@ let makeInstallerTest = name: - { createPartitions, testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda", grubIdentifier ? "uuid" }: + { createPartitions, testChannel ? false, grubVersion ? 2 + , grubDevice ? "/dev/vda", grubIdentifier ? "uuid", extraConfig ? "" + }: makeTest { inherit iso; name = "installer-" + name; nodes = if testChannel then { inherit webserver; } else { }; testScript = testScriptFun { - inherit createPartitions testChannel grubVersion grubDevice grubIdentifier; + inherit createPartitions testChannel grubVersion grubDevice + grubIdentifier extraConfig; }; }; From 3b396701fdc054795656562295d1092b72c192db Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 21 May 2015 12:40:07 +0200 Subject: [PATCH 478/615] nixos/tests/installer: Allow pre-boot commands. These commands will be executed directly after the machine is created, so it gives us the chance to for example type in passphrases using the virtual keyboard. Signed-off-by: aszlig --- nixos/tests/installer.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index db029a5cc845..8ef247d6c4df 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -109,7 +109,7 @@ let # a test script fragment `createPartitions', which must create # partitions and filesystems. testScriptFun = { createPartitions, testChannel, grubVersion, grubDevice - , grubIdentifier, extraConfig + , grubIdentifier, preBootCommands, extraConfig }: let # FIXME: OVMF doesn't boot from virtio http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg01501.html @@ -194,6 +194,9 @@ let # Now see if we can boot the installation. $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); + # For example to enter LUKS passphrase + ${preBootCommands} + # Did /boot get mounted? $machine->waitForUnit("local-fs.target"); @@ -229,6 +232,7 @@ let # Check whether a writable store build works $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); + ${preBootCommands} $machine->waitForUnit("multi-user.target"); $machine->copyFileFromHost( "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 2; } }", @@ -239,22 +243,24 @@ let # And just to be sure, check that the machine still boots after # "nixos-rebuild switch". $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); + ${preBootCommands} $machine->waitForUnit("network.target"); $machine->shutdown; ''; makeInstallerTest = name: - { createPartitions, testChannel ? false, grubVersion ? 2 - , grubDevice ? "/dev/vda", grubIdentifier ? "uuid", extraConfig ? "" + { createPartitions, preBootCommands ? "", extraConfig ? "" + , testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda" + , grubIdentifier ? "uuid" }: makeTest { inherit iso; name = "installer-" + name; nodes = if testChannel then { inherit webserver; } else { }; testScript = testScriptFun { - inherit createPartitions testChannel grubVersion grubDevice - grubIdentifier extraConfig; + inherit createPartitions preBootCommands testChannel grubVersion + grubDevice grubIdentifier extraConfig; }; }; From 1f34503010bee487b36ed5256fa27e3d2d29c968 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 21 May 2015 12:42:00 +0200 Subject: [PATCH 479/615] nixos/tests/installer: Add test for LUKS rootfs. This serves as a regression test for #7859. It's pretty straightforward, except from the fact that nixos-generate- config doesn't detect LUKS devices and the "sleep 60". As for the former, I have tried to add support for LUKS devices for nixos-generate-config, but it's not so easy as it sounds, because we need to create a device tree across all possible mappers and/or LVM up to the "real" device and then decide whether it is relevant to what is currently mounted. So I guess this is something for the nixpart branch (see #2079). And the latter isn't very trivial as well, because the LUKS passphrase prompt is issued on /dev/console, which is the last "console=..." kernel parameter (thus the `mkAfter`). So we can't simply grep the log, because the prompt ends up being on one terminal only (tty0) and using select() on $machine->{socket} doesn't work very well, because the FD is always "ready for read". If we would read the FD, we would conflict with $machine->connect and end up having an inconsistent state. Another idea would be to use multithreading to do $machine->connect while feeding the passphrase prompt in a loop and stop the thread once $machine->connect is done. Turns out that this is not so easy as well, because the threads need to share the $machine object and of course need to do properly locking. In the end I decided to use the "blindly hope that 60 seconds is enough" approach for now and come up with a better solution later. Other VM tests surely use sleep as well, but it's $machine->sleep, which is bound to the clock of the VM, so if the build machine is on high load, a $machine->sleep gets properly delayed but the timer outside the VM won't get that delay, so the test is not deterministic. Tested against the following revisions: 5e3fe39: Before the libgcrypt cleanup (a71f78a) that broke cryptsetup. 69a6848: While cryptsetup was broken (obviously the test failed). 15faa43: After cryptsetup has been switched to OpenSSL (fd588f9). Signed-off-by: aszlig --- nixos/tests/installer.nix | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 8ef247d6c4df..a67068dc30a5 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -334,6 +334,43 @@ in { ''; }; + # Boot off an encrypted root partition + luksroot = makeInstallerTest "luksroot" + { createPartitions = '' + $machine->succeed( + "parted /dev/vda mklabel msdos", + "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot + "parted /dev/vda -- mkpart primary linux-swap 50M 1024M", + "parted /dev/vda -- mkpart primary 1024M -1s", # LUKS + "udevadm settle", + "mkswap /dev/vda2 -L swap", + "swapon -L swap", + "modprobe dm_mod dm_crypt", + "echo -n supersecret | cryptsetup luksFormat -q /dev/vda3 -", + "echo -n supersecret | cryptsetup luksOpen --key-file - /dev/vda3 cryptroot", + "mkfs.ext3 -L nixos /dev/mapper/cryptroot", + "mount LABEL=nixos /mnt", + "mkfs.ext3 -L boot /dev/vda1", + "mkdir -p /mnt/boot", + "mount LABEL=boot /mnt/boot", + ); + ''; + # XXX: Currently, generate-config doesn't detect LUKS yet. + extraConfig = '' + boot.kernelParams = lib.mkAfter [ "console=tty0" ]; + boot.initrd.luks.devices = lib.singleton { + name = "cryptroot"; + device = "/dev/vda3"; + preLVM = true; + }; + ''; + preBootCommands = '' + $machine->start; + sleep 60; # XXX: Hopefully this is long enough :-/ + $machine->sendChars("supersecret\n"); + ''; + }; + swraid = makeInstallerTest "swraid" { createPartitions = '' From 7808efe5b7c9abd89d3977825f7115f0a39a5771 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 21 May 2015 13:17:25 +0200 Subject: [PATCH 480/615] nixos/release: Add luksroot test to "tested" job. We want to avoid getting broken LUKS systems into the latest channel, so let's ensure that the channel update won't happen if LUKS support is broken again. Signed-off-by: aszlig --- nixos/release-combined.nix | 1 + nixos/release.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index cb1c200ab475..a79f72823fdf 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -53,6 +53,7 @@ in rec { (all nixos.tests.firewall) (all nixos.tests.gnome3) (all nixos.tests.installer.lvm) + (all nixos.tests.installer.luksroot) (all nixos.tests.installer.separateBoot) (all nixos.tests.installer.simple) (all nixos.tests.installer.simpleLabels) diff --git a/nixos/release.nix b/nixos/release.nix index 375b65d040e6..dfc28173f1a3 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -255,6 +255,7 @@ in rec { tests.i3wm = callTest tests/i3wm.nix {}; tests.installer.grub1 = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).grub1.test); tests.installer.lvm = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).lvm.test); + tests.installer.luksroot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).luksroot.test); tests.installer.rebuildCD = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).rebuildCD.test); tests.installer.separateBoot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).separateBoot.test); tests.installer.simple = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simple.test); From c4a8acd9839c10016a16ddf5dd4c01672a6f0ce9 Mon Sep 17 00:00:00 2001 From: Paulus Esterhazy Date: Wed, 20 May 2015 15:54:18 +0200 Subject: [PATCH 481/615] Add sqlite3_analyzer --- .../libraries/sqlite/sqlite3_analyzer.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/libraries/sqlite/sqlite3_analyzer.nix diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix new file mode 100644 index 000000000000..4e5d360aea04 --- /dev/null +++ b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchurl, unzip, tcl }: + +stdenv.mkDerivation { + name = "sqlite3_analzer-3.8.10.1"; + + src = fetchurl { + url = "https://www.sqlite.org/2015/sqlite-src-3081001.zip"; + sha1 = "6z7w8y69jxr0xwxbhs8z3zf56zfs5x7z"; + }; + + buildInputs = [ unzip tcl ]; + + # A bug in the latest release of sqlite3 prevents bulding sqlite3_analyzer. + # Hopefully this work-around can be removed for future releases. + postConfigure = '' + substituteInPlace Makefile \ + --replace '"#define SQLITE_ENABLE_DBSTAT_VTAB"' '"#define SQLITE_ENABLE_DBSTAT_VTAB 1"' + ''; + + buildPhase = '' + make sqlite3_analyzer + ''; + + installPhase = '' + mkdir -p "$out/bin" + mv sqlite3_analyzer "$out/bin" + ''; + + meta = { + homepage = http://www.sqlite.org/; + description = "A tool that shows statistics about sqlite databases"; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ pesterhazy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04d258efd9e5..34584ef005f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7818,6 +7818,8 @@ let sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); + sqlite3_analyzer = lowPrio (callPackage ../development/libraries/sqlite/sqlite3_analyzer.nix { }); + sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }); sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher { From a0d3e234ecab15f463291fb7fc337eacb6c924ff Mon Sep 17 00:00:00 2001 From: Joel Moberg Date: Thu, 21 May 2015 13:59:58 +0200 Subject: [PATCH 482/615] rpy2: disable pypy --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 20436811c494..2a3b9a012557 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10957,6 +10957,7 @@ let rpy2 = buildPythonPackage rec { name = "rpy2-2.5.6"; + disabled = isPyPy; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/r/rpy2/${name}.tar.gz"; md5 = "a36e758b633ce6aec6a5f450bfee980f"; From 515f88cb549eec39fc06d8cc935f5bea28c8a22e Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 21 May 2015 14:08:19 +0200 Subject: [PATCH 483/615] openal 1.7.411 -> 1.16.0 --- pkgs/development/libraries/openal/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/openal/default.nix b/pkgs/development/libraries/openal/default.nix index 5a935691ca58..ac39ef2e84c1 100644 --- a/pkgs/development/libraries/openal/default.nix +++ b/pkgs/development/libraries/openal/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, alsaLib, cmake }: -let version = "1.7.411"; in +let version = "1.16.0"; in stdenv.mkDerivation rec { name = "openal-${version}"; src = fetchurl { - url = "http://connect.creativelabs.com/openal/Downloads/openal-soft-${version}.bz2"; - sha256 = "1nbqvg08hy5p2cxy2i2mmh2szmbpsg2dcvhr61iplyisw04rwc8i"; - name = "openal-soft-${version}.tar.bz2"; + url = "http://kcat.strangesoft.net/openal-releases/openal-soft-${version}.tar.bz2"; + sha256 = "0pqdykdclycfnk66v166srjrry936y39d1dz9wl92qz27wqwsg9g"; }; buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { is done from the perspective of the Listener. ''; - homepage = http://www.openal.org/; - license = stdenv.lib.licenses.gpl2Plus; + homepage = http://kcat.strangesoft.net/openal.html; + license = stdenv.lib.licenses.lgpl2Plus; }; } From c6f68fc17d6ed3b5cd7e97ccf03f405459f259d5 Mon Sep 17 00:00:00 2001 From: Joel Moberg Date: Thu, 21 May 2015 14:13:13 +0200 Subject: [PATCH 484/615] graph-tool update: 2.2.36 -> 2.2.42 --- pkgs/development/python-modules/graph-tool/2.x.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 aa5deb6d6db4..d3b023704604 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -3,7 +3,7 @@ pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, makeWrapper, gobjectIntrospection, pygobject3, gtk3, matplotlib }: stdenv.mkDerivation rec { - version = "2.2.36"; + version = "2.2.42"; name = "${python.libPrefix}-graph-tool-${version}"; meta = with stdenv.lib; { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - sha256 = "0wp81dp2kd4bzsl6f3gxjmf11hiqr7rz7g0wa1j38fc0chq31q71"; + sha256 = "124qmd0mgam7hm87gscp3836ymhhwwnlfm2c5pzpml06da1w0xg9"; }; preConfigure = '' From 5277bf945d6b5138f74a9dc1355b42a7158f8e25 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 21 May 2015 14:44:48 +0200 Subject: [PATCH 485/615] grsecurity: Update stable patch from 3.1-3.14.43-201505181929 -> 3.1-3.14.43-201505191737 --- pkgs/os-specific/linux/kernel/patches.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 4eda63423ed3..348b26b3d3b1 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -66,9 +66,9 @@ rec { grsecurity_stable = grsecPatch { kversion = "3.14.43"; - revision = "201505181929"; + revision = "201505191737"; branch = "stable"; - sha256 = "1ay5qkji09xibaqxnsrcxnnys4n5blxfa2jw9k6f5vzpfdv3mvqm"; + sha256 = "1ijrqmdwpdbkp10lhjw8msv0y02d98v5xgq6xb62ksrdb6k27fiw"; }; grsecurity_unstable = grsecPatch From 06d002acb53bd78c5eb0cda821b95602207ffd2d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 May 2015 21:11:20 +0200 Subject: [PATCH 486/615] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/25810f60543b87e9373feb1bcfd4aaf8c279c7c2 with hackage2nix revision a70a5194597133ba31b950c826ef09206249cca9 --- .../haskell-modules/hackage-packages.nix | 1146 +++++++++-------- 1 file changed, 584 insertions(+), 562 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 074145a93545..972d5d8f3829 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -256,7 +256,6 @@ self: { homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/"; description = "Efficient, high-level dynamic programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "AERN-Basics" = callPackage @@ -771,7 +770,6 @@ self: { homepage = "http://allureofthestars.com"; description = "Near-future Sci-Fi roguelike and tactical squad game"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "AndroidViewHierarchyImporter" = callPackage @@ -919,6 +917,7 @@ self: { homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/AspectAG"; description = "Attribute Grammars in the form of an EDSL"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "AttoBencode" = callPackage @@ -941,7 +940,6 @@ self: { homepage = "http://bitbucket.org/FlorianHartwig/attobencode"; description = "Fast Bencode encoding and parsing library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "AttoJson" = callPackage @@ -1050,7 +1048,6 @@ self: { ]; description = "Big Contact Map Tools"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BNFC" = callPackage @@ -1555,7 +1552,6 @@ self: { homepage = "http://byorgey.wordpress.com/blogliterately/"; description = "A tool for posting Haskelly articles to blogs"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BlogLiterately-diagrams" = callPackage @@ -1622,7 +1618,6 @@ self: { homepage = "http://www.cse.chalmers.se/~emax/bookshelf/Manual.shelf.html"; description = "A simple document organizer with some wiki functionality"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Boolean" = callPackage @@ -1670,13 +1665,10 @@ self: { ({ mkDerivation, base, bytestring, network, text }: mkDerivation { pname = "BufferedSocket"; - version = "0.1.1.0"; - revision = "2"; - sha256 = "1j0v2g7p8fmjgcdd10wfinakiviv9r1bh3mw897gsk1h5ycbxfjg"; - editedCabalFile = "646c24722f7f909e6430c9c55a225936c6c12db7d3d57ea0789d03cc800cbc59"; + version = "0.2.0.0"; + sha256 = "0sgwglnzsqwz1k11jbzp7lpb29h9ap2mny2lv9m9nrlr0ydhcdqf"; buildDepends = [ base bytestring network text ]; jailbreak = true; - homepage = "https://github.com/black0range/BufferedSocket"; description = "A socker wrapper that makes the IO of sockets much cleaner"; license = stdenv.lib.licenses.mit; }) {}; @@ -1825,7 +1817,6 @@ self: { homepage = "not available"; description = "preprocessor and library for Causal Commutative Arrows (CCA)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CHXHtml" = callPackage @@ -2225,7 +2216,6 @@ self: { homepage = "http://github.com/brinchj/cabalsearch"; description = "Search cabal packages by name"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Capabilities" = callPackage @@ -2812,7 +2802,6 @@ self: { jailbreak = true; description = "Repackages standard type classes with the ConstraintKinds extension"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Consumer" = callPackage @@ -3073,7 +3062,6 @@ self: { homepage = "http://floss.scru.org/hDAV"; description = "RFC 4918 WebDAV support"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "DBlimited" = callPackage @@ -3563,7 +3551,6 @@ self: { jailbreak = true; description = "A client library for the DigitalOcean API"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "DimensionalHash" = callPackage @@ -4392,7 +4379,6 @@ self: { homepage = "https://github.com/ddssff/haskell-extra"; description = "A grab bag of modules"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "FComp" = callPackage @@ -4884,7 +4870,6 @@ self: { homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/"; description = "(Context-free) grammars in formal language theory"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Foster" = callPackage @@ -5337,7 +5322,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/GeBoP"; description = "Several games"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GenI" = callPackage @@ -5589,7 +5573,6 @@ self: { buildDepends = [ base dataenc download-curl utf8-string xml ]; description = "Interface to Google Suggest API"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GoogleTranslate" = callPackage @@ -5636,7 +5619,6 @@ self: { homepage = "http://www.bioinf.uni-leipzig.de/gADP/"; description = "Grammar products and higher-dimensional grammars"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Graph500" = callPackage @@ -6131,7 +6113,6 @@ self: { homepage = "https://github.com/hdbc/hdbc-sqlite3"; description = "Sqlite v3 driver for HDBC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) sqlite;}; "HDRUtils" = callPackage @@ -7658,7 +7639,6 @@ self: { homepage = "https://github.com/egonSchiele/HandsomeSoup"; description = "Work with HTML more easily in HXT"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HarmTrace" = callPackage @@ -8506,7 +8486,6 @@ self: { homepage = "https://github.com/sjoerdvisscher/HueAPI"; description = "API for controlling Philips Hue lights"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Hungarian-Munkres" = callPackage @@ -9339,7 +9318,6 @@ self: { homepage = "http://github.com/LambdaHack/LambdaHack"; description = "A game engine library for roguelike dungeon crawlers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "LambdaINet" = callPackage @@ -9912,7 +9890,6 @@ self: { jailbreak = true; description = "MaybeT monad transformer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MaybeT-monads-tf" = callPackage @@ -10507,7 +10484,6 @@ self: { homepage = "http://floss.scru.org/hMusicBrainz"; description = "interface to MusicBrainz XML2 web service"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MusicBrainz-libdiscid" = callPackage @@ -10647,6 +10623,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Neks" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, directory + , hashable, messagepack, network, stm, vector + }: + mkDerivation { + pname = "Neks"; + version = "0.3.0.0"; + sha256 = "1nqww81d9hdm4d2kgv5k4vhp3wavlpa39vym4x7bddcxg1g5drmv"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base bytestring cereal containers directory hashable messagepack + network stm vector + ]; + jailbreak = true; + description = "Simple networked key/value store"; + license = stdenv.lib.licenses.mit; + }) {}; + "NestedFunctor" = callPackage ({ mkDerivation, base, comonad, distributive }: mkDerivation { @@ -12645,7 +12640,6 @@ self: { homepage = "http://hub.darcs.net/martingw/Rasenschach"; description = "Soccer simulation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Rasterific" = callPackage @@ -13145,17 +13139,15 @@ self: { ]; description = "Calculate db-data dependencies of functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "STL" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cereal, text }: mkDerivation { pname = "STL"; - version = "0.3.0.1"; - sha256 = "0w14kra36ksa8jn72rr9b01f36gff33fi6ffrcws640v4pwisrg5"; + version = "0.3.0.2"; + sha256 = "0papwfxp4y8rn1rqm0sw22lbfw6iaziziprh04z85isrwkfh8v43"; buildDepends = [ attoparsec base bytestring cereal text ]; - jailbreak = true; homepage = "http://github.com/bergey/STL"; description = "STL 3D geometry format parsing and pretty-printing"; license = stdenv.lib.licenses.bsd3; @@ -13208,7 +13200,6 @@ self: { ]; description = "Fonts from the SVG-Font format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SVGPath" = callPackage @@ -13302,13 +13293,13 @@ self: { "Saturnin" = callPackage ({ mkDerivation, base, bytestring, data-default, directory, either , exceptions, filepath, formatting, hlint, hspec, ini, mtl, network - , old-locale, process, regex-compat, spawn, stm, temporary, text - , time, unordered-containers, yaml + , old-locale, process, spawn, stm, temporary, text, time + , unordered-containers, yaml }: mkDerivation { pname = "Saturnin"; - version = "0.1.0.1"; - sha256 = "19vbaj2zd083lw4jvgi9sdkhyk0hfgb88i9sksg6i1j569ypjk78"; + version = "0.1.0.2"; + sha256 = "0f6z17ry2n0qkgajiwip09r7dbcn72dkz7gh4igwk3n0igxlpqsr"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -13316,9 +13307,7 @@ self: { formatting ini mtl network old-locale process spawn stm temporary text time unordered-containers yaml ]; - testDepends = [ - base data-default either hlint hspec mtl process regex-compat - ]; + testDepends = [ base data-default either hlint hspec mtl ]; description = "Saturnin CI / Job System"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -13922,7 +13911,6 @@ self: { homepage = "https://github.com/agrafix/Spock-digestive"; description = "Digestive functors support for Spock"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock-worker" = callPackage @@ -14185,6 +14173,7 @@ self: { homepage = "http://www.cs.uu.nl/wiki/Center/SyntaxMacrosForFree"; description = "Syntax Macros in the form of an EDSL"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Sysmon" = callPackage @@ -15541,7 +15530,6 @@ self: { ]; description = "Workflow patterns over a monad for thread state logging & recovery"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "WxGeneric" = callPackage @@ -15556,7 +15544,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/WxGeneric"; description = "Generic (SYB3) construction of wxHaskell widgets"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "X11" = callPackage @@ -16265,7 +16252,6 @@ self: { homepage = "https://github.com/AccelerateHS/accelerate/"; description = "An embedded language for accelerated array processing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-arithmetic" = callPackage @@ -17527,7 +17513,6 @@ self: { homepage = "https://github.com/noteed/aeson-streams"; description = "An HTTP client library for JSON-based APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-t" = callPackage @@ -17688,7 +17673,6 @@ self: { buildDepends = [ base containers ]; description = "Unification and Matching in an Abelian Group"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aig" = callPackage @@ -17716,7 +17700,6 @@ self: { homepage = "https://github.com/nfjinjing/air"; description = "air"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "air-extra" = callPackage @@ -17734,7 +17717,6 @@ self: { homepage = "https://github.com/nfjinjing/air-extra"; description = "air-extra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "air-spec" = callPackage @@ -17759,7 +17741,6 @@ self: { homepage = "https://github.com/nfjinjing/air-th"; description = "air"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "airbrake" = callPackage @@ -18296,7 +18277,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Some simple interactive programs for sending MIDI control messages via ALSA"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alsa-midi" = callPackage @@ -19144,6 +19124,7 @@ self: { homepage = "ampersand.sourceforge.net"; description = "Toolsuite for automated design of business processes"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amqp" = callPackage @@ -19423,7 +19404,6 @@ self: { homepage = "http://doomanddarkness.eu/pub/antisplice"; description = "A web interface to Antisplice dungeons"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "antfarm" = callPackage @@ -19529,7 +19509,6 @@ self: { homepage = "http://doomanddarkness.eu/pub/antisplice"; description = "An engine for text-based dungeons"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "antlrc" = callPackage @@ -20392,7 +20371,6 @@ self: { homepage = "http://archhaskell.wordpress.com/"; description = "Convert Arch Linux package updates in RSS to pretty markdown"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "arff" = callPackage @@ -21234,20 +21212,20 @@ self: { ({ mkDerivation, aeson, atlassian-connect-descriptor, base , base64-bytestring, bytestring, case-insensitive, cipher-aes , configurator, containers, cryptohash, hostname, http-client - , http-media, http-types, jwt, mtl, network, network-api-support - , network-uri, snap, snap-core, split, text, time, time-units - , transformers + , http-client-tls, http-media, http-types, jwt, mtl, network + , network-api-support, network-uri, snap, snap-core, split, text + , time, time-units, transformers }: mkDerivation { pname = "atlassian-connect-core"; - version = "0.5.1.0"; - sha256 = "02959rj5sdl28b3kj42ab1x83vcvkn61v5np7plgbqxbmrnnc9pr"; + version = "0.6.0.0"; + sha256 = "02kngpf1ply4222p4ahqndnlk8sz7w3d5i1411csh1g3nr9zsdw8"; buildDepends = [ aeson atlassian-connect-descriptor base base64-bytestring bytestring case-insensitive cipher-aes configurator containers - cryptohash hostname http-client http-media http-types jwt mtl - network network-api-support network-uri snap snap-core split text - time time-units transformers + cryptohash hostname http-client http-client-tls http-media + http-types jwt mtl network network-api-support network-uri snap + snap-core split text time time-units transformers ]; homepage = "https://bitbucket.org/ajknoll/atlassian-connect-core"; description = "Atlassian Connect snaplet for the Snap Framework and helper code"; @@ -21732,7 +21710,6 @@ self: { homepage = "https://github.com/fosskers/haskell-aur"; description = "Access metadata from the Arch Linux User Repository"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "authenticate" = callPackage @@ -22347,7 +22324,6 @@ self: { ]; description = "Amazon Route53 DNS service plugin for the aws package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-sdk" = callPackage @@ -22589,8 +22565,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.5.3"; - sha256 = "1dw6ylb7w4hycanx07qm4gzmvi1xw5jsh89dagbyaz9z9spl5fm4"; + version = "0.5.4"; + sha256 = "1a7329c39m63knb5071ln2bpgb79q5gd3mpix6pm18dim20gciqj"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22606,7 +22582,6 @@ self: { homepage = "https://github.com/sheyll/b9-vm-image-builder"; description = "A tool and library for building virtual machine images"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "babylon" = callPackage @@ -22620,7 +22595,6 @@ self: { buildDepends = [ array base containers random wx wxcore ]; description = "An implementation of a simple 2-player board game"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "backdropper" = callPackage @@ -23627,7 +23601,6 @@ self: { homepage = "https://github.com/feuerbach/bert"; description = "BERT implementation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "besout" = callPackage @@ -24360,7 +24333,6 @@ self: { homepage = "https://bitbucket.org/accursoft/binding"; description = "Data Binding in WxHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bindings" = callPackage @@ -25188,15 +25160,15 @@ self: { }) {}; "biophd" = callPackage - ({ mkDerivation, base, binary, biocore, bytestring, old-locale - , parsec, text, time + ({ mkDerivation, base, binary, biocore, bytestring, parsec, text + , time, time-locale-compat }: mkDerivation { pname = "biophd"; - version = "0.0.7"; - sha256 = "1n841kdny2ry8kmm3g87vvkpg6c4ia49hbb3qh1bnwd0nwq0x3mw"; + version = "0.0.8"; + sha256 = "0p3xfv61xzz29qg660pcsgns7r5q1cybk3hdvdnwf0cqdc9fhxbl"; buildDepends = [ - base binary biocore bytestring old-locale parsec text time + base binary biocore bytestring parsec text time time-locale-compat ]; homepage = "https://github.com/dfornika/biophd/wiki"; description = "Library for reading phd sequence files"; @@ -26290,16 +26262,13 @@ self: { }: mkDerivation { pname = "bloomfilter"; - version = "2.0.0.0"; - revision = "1"; - sha256 = "07fif8i5rinysli1mpi92k405kvw8va7w9v9w4wd5bylb87zy77f"; - editedCabalFile = "2e5d001d62c85fd1647aef4112ae5830181c099d588e03719a14048511ca702e"; + version = "2.0.1.0"; + sha256 = "03vrmncg1c10a2wcg5skq30m1yiknn7nwxz2gblyyfaxglshspkc"; buildDepends = [ array base bytestring deepseq ]; testDepends = [ base bytestring QuickCheck random test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/bos/bloomfilter"; description = "Pure and impure Bloom Filter implementations"; license = stdenv.lib.licenses.bsd3; @@ -26374,7 +26343,6 @@ self: { homepage = "https://blunt.herokuapp.com"; description = "Convert between pointfree and pointful expressions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bmp" = callPackage @@ -26789,7 +26757,6 @@ self: { homepage = "https://github.com/rnhmjoj/breve"; description = "a url shortener"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "brians-brain" = callPackage @@ -27299,6 +27266,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "byline" = callPackage + ({ mkDerivation, ansi-terminal, base, colour, containers + , exceptions, haskeline, mtl, terminfo-hs, text, transformers + }: + mkDerivation { + pname = "byline"; + version = "0.1.0.0"; + sha256 = "1w2blafifvsliz4z9lplfm73lpd95frjnp5y3jk6xzjrvsnyqahs"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + ansi-terminal base colour containers exceptions haskeline mtl + terminfo-hs text transformers + ]; + jailbreak = true; + homepage = "http://github.com/pjones/byline"; + description = "Library for creating command-line interfaces (colors, menus, etc.)"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "bytable" = callPackage ({ mkDerivation, base, bytestring, word24 }: mkDerivation { @@ -28018,7 +28005,6 @@ self: { homepage = "http://github.com/jaspervdj/cabal-dependency-licenses"; description = "Compose a list of a project's transitive dependencies with their licenses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-dev" = callPackage @@ -28382,15 +28368,14 @@ self: { }: mkDerivation { pname = "cabal-rpm"; - version = "0.9.5.1"; - sha256 = "0hqm7r209d5ny9860j7dwr3ksgm5xp4pgml9h379y4wf4ddwf0h2"; + version = "0.9.6"; + sha256 = "07ig7lwkf9lv10kacxcydpz3z6fhpmmpwcr6kq32xgh3larsf0g5"; isLibrary = false; isExecutable = true; buildDepends = [ base Cabal directory filepath process time unix ]; homepage = "https://github.com/juhp/cabal-rpm"; description = "RPM packaging tool for Haskell Cabal-based packages"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-scripts" = callPackage @@ -29684,7 +29669,6 @@ self: { homepage = "https://github.com/erochest/castle"; description = "A tool to manage shared cabal-install sandboxes"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "casui" = callPackage @@ -29905,6 +29889,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cef" = callPackage + ({ mkDerivation, base, bytestring, directory, doctest, filepath + , text, time + }: + mkDerivation { + pname = "cef"; + version = "0.1.0.0"; + sha256 = "0lr9yhlrp40kn8n5asw3xnz3xd28xd8nclh90y9f1ikci4i9xgxp"; + buildDepends = [ base bytestring text time ]; + testDepends = [ base directory doctest filepath ]; + homepage = "http://github.com/picussecurity/haskell-cef.git"; + description = "CEF log format"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ceilometer-common" = callPackage ({ mkDerivation, base, bimap, binary, bytestring, containers , data-ordlist, foldl, hspec, lens, lens-properties, mtl, pipes @@ -30264,8 +30263,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "chalk"; - version = "0.1.0.0"; - sha256 = "09apxk27s6j8ciq3d2zxhr70ihm9s79zhc2pyg1xb220h6p55swk"; + version = "0.1.0.1"; + sha256 = "0d9qp512ww5cpvv7pby4saqjxy9qyid3gf0gndqhglikcc0wayxy"; buildDepends = [ base ]; jailbreak = true; homepage = "http://github.com/joom/chalk"; @@ -30491,7 +30490,6 @@ self: { homepage = "http://doomanddarkness.eu/pub/chatty"; description = "Some monad transformers and typeclasses for abstraction of global dependencies"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chatty-text" = callPackage @@ -30504,7 +30502,6 @@ self: { homepage = "http://doomanddarkness.eu/pub/chatty"; description = "Provides some classes and types for dealing with text, using the fundaments of Chatty"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chatty-utils" = callPackage @@ -30517,7 +30514,6 @@ self: { homepage = "http://doomanddarkness.eu/pub/chatty"; description = "Some utilities every serious chatty-based application may need"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cheapskate" = callPackage @@ -30776,7 +30772,6 @@ self: { homepage = "https://github.com/nfjinjing/chu2"; description = "FFI for Chu2 Agda Web Server Interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chuchu" = callPackage @@ -31813,7 +31808,6 @@ self: { homepage = "https://github.com/tanakh/cless"; description = "Colorized LESS"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clevercss" = callPackage @@ -32418,7 +32412,6 @@ self: { buildDepends = [ array base containers ]; description = "Unification in a Commutative Monoid"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cnc-spec-compiler" = callPackage @@ -32562,27 +32555,27 @@ self: { }) {}; "codex" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, curl - , directory, either, filepath, hackage-db, machines - , machines-directory, MissingH, monad-loops, process, tar, text - , transformers, yaml, zlib + ({ mkDerivation, base, bytestring, Cabal, containers, cryptohash + , directory, either, filepath, hackage-db, http-client, lens + , machines, machines-directory, MissingH, monad-loops, network + , process, tar, text, transformers, wreq, yaml, zlib }: mkDerivation { pname = "codex"; - version = "0.2.1.8"; - sha256 = "0rswdfbrmmg9px0cwah56yy3dj3a4rfc4fsvzknd2vc9wbgi8ndf"; + version = "0.3"; + sha256 = "0sy9md1r44x0c0a9y012qc851hi5c0rj8fsbagdqy75ajlncp00s"; isLibrary = true; isExecutable = true; buildDepends = [ - base bytestring Cabal containers curl directory either filepath - hackage-db machines machines-directory MissingH monad-loops process - tar text transformers yaml zlib + base bytestring Cabal containers cryptohash directory either + filepath hackage-db http-client lens machines machines-directory + MissingH monad-loops network process tar text transformers wreq + yaml zlib ]; jailbreak = true; homepage = "http://github.com/aloiscochard/codex"; description = "A ctags file generator for cabal project dependencies"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "codo-notation" = callPackage @@ -32635,6 +32628,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "coinbase-exchange" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, base64-bytestring + , byteable, bytestring, conduit, conduit-extra, cryptohash, deepseq + , hashable, http-client, http-client-tls, http-conduit, http-types + , mtl, network, old-locale, resourcet, scientific, tasty + , tasty-hunit, tasty-quickcheck, tasty-th, text, time, transformers + , transformers-base, uuid, uuid-aeson, vector, websockets, wuss + }: + mkDerivation { + pname = "coinbase-exchange"; + version = "0.1.0.0"; + sha256 = "0l09gjn0lk7v51s1gw52p0m9i8amhci93qpi98p1r1nlxx09xj3v"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson aeson-casing base base64-bytestring byteable bytestring + conduit conduit-extra cryptohash deepseq hashable http-client + http-client-tls http-conduit http-types mtl network old-locale + resourcet scientific text time transformers transformers-base uuid + uuid-aeson vector websockets wuss + ]; + testDepends = [ + base bytestring http-client-tls http-conduit old-locale tasty + tasty-hunit tasty-quickcheck tasty-th time transformers uuid + ]; + jailbreak = true; + description = "Connector library for the coinbase exchange"; + license = stdenv.lib.licenses.mit; + }) {}; + "colada" = callPackage ({ mkDerivation, base, bytestring, cereal, cmdargs, containers , fclabels, ghc-prim, ListZipper, monad-atom, mtl, nlp-scores @@ -33193,7 +33216,6 @@ self: { ]; description = "Compositional Data Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compdata-automata" = callPackage @@ -33208,7 +33230,6 @@ self: { jailbreak = true; description = "Tree automata on Compositional Data Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compdata-dags" = callPackage @@ -33231,7 +33252,6 @@ self: { jailbreak = true; description = "Compositional Data Types on DAGs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compdata-param" = callPackage @@ -33250,7 +33270,6 @@ self: { ]; description = "Parametric Compositional Data Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compensated" = callPackage @@ -35220,7 +35239,6 @@ self: { homepage = "https://github.com/relrod/copr-hs"; description = "Haskell interface to the Fedora Copr system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "core" = callPackage @@ -35575,7 +35593,6 @@ self: { homepage = "https://github.com/ibotty/crypto-random-effect"; description = "Run random effect using cprng-aes, a crypto pseudo number generator"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cpsa" = callPackage @@ -36477,7 +36494,6 @@ self: { homepage = "https://github.com/ibotty/crypto-random-effect"; description = "A random effect using crypto-random"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crypto-totp" = callPackage @@ -36586,7 +36602,6 @@ self: { homepage = "http://www.cryptol.net/"; description = "Cryptol: The Language of Cryptography"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cryptsy-api" = callPackage @@ -37105,10 +37120,10 @@ self: { ({ mkDerivation, base, bytestring, hspec, rtld, time }: mkDerivation { pname = "curlhs"; - version = "0.1.5"; - revision = "2"; - sha256 = "0j0r238v3rlk9w7zby7lvh6drzy8d1hah6yzf4dz17hg27wb22ky"; - editedCabalFile = "0ed3a9937970ee46955e276b3e2fdeff9eff1c3165f3402ed11da009f8a8cd0f"; + version = "0.1.6"; + revision = "1"; + sha256 = "1yh7rfk9ppglpjymzzi2yc44g9bp0irnl2yvj77y55djdkmckq3b"; + editedCabalFile = "ac8dbe0348ce66746774f019fe62dbdaf40a200bed62f5b7fb0ecb9bd11cfa1c"; buildDepends = [ base bytestring rtld time ]; testDepends = [ base hspec ]; homepage = "https://github.com/kkardzis/curlhs"; @@ -37793,7 +37808,6 @@ self: { homepage = "http://www.github.com/jfeltz/dash-haskell"; description = "Command line tool to generate Dash docsets (IDE docs) from package haddock"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-accessor" = callPackage @@ -38258,8 +38272,8 @@ self: { }: mkDerivation { pname = "data-hash"; - version = "0.2.0.0"; - sha256 = "1bfsbc4fkg3jqgbgka1mg6k1fizynvvxbhf2zb0x1apgr579mcrm"; + version = "0.2.0.1"; + sha256 = "1ghbqvc48gf9p8wiy71hdpaj7by3b9cw6wgwi3qqz8iw054xs5wi"; buildDepends = [ array base containers ]; testDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -38620,10 +38634,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "data-reify"; - version = "0.6"; - revision = "1"; - sha256 = "0mif89mpj5zvw8czc51mfj27jw2ipxd2awnm9q13s46k6s5pv6a7"; - editedCabalFile = "60185d3fdb87fe62f297eb4473d58a7ccf93d1b6ee790a8b2faed79e1ac833c1"; + version = "0.6.1"; + sha256 = "00mjv6dc3fwhbqzrll02qxilwpfypahkzcdqnv17c4nbjqg0ldb1"; isLibrary = true; isExecutable = true; buildDepends = [ base containers ]; @@ -39094,7 +39106,6 @@ self: { ]; description = "An implementation of relational database \"migrations\""; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbus" = callPackage @@ -40126,7 +40137,6 @@ self: { homepage = "/dev/null"; description = "Template Haskell code to generate instances of classes in dependent-sum package"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "depends" = callPackage @@ -40828,7 +40838,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Postscript backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-qrcode" = callPackage @@ -40877,7 +40886,6 @@ self: { homepage = "https://github.com/timjb/rubiks-cube"; description = "Library for drawing the Rubik's Cube"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-solve" = callPackage @@ -40912,7 +40920,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "SVG backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-tikz" = callPackage @@ -41097,7 +41104,6 @@ self: { homepage = "https://github.com/bgamari/digamma"; description = "A robust implementation of the digamma function"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digest" = callPackage @@ -41140,7 +41146,6 @@ self: { jailbreak = true; description = "Speed up form designing using digestive functors and bootstrap"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-foundation-lucid" = callPackage @@ -41158,7 +41163,6 @@ self: { jailbreak = true; description = "Speed up form designing using digestive functors and foundation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors" = callPackage @@ -41181,7 +41185,6 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "A practical formlet library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-aeson" = callPackage @@ -41205,7 +41208,6 @@ self: { homepage = "http://github.com/ocharles/digestive-functors-aeson"; description = "Run digestive-functors forms against JSON"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-blaze" = callPackage @@ -41222,7 +41224,6 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Blaze frontend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-happstack" = callPackage @@ -41239,7 +41240,6 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Happstack backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-heist" = callPackage @@ -41256,7 +41256,6 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Heist frontend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-hsp" = callPackage @@ -41285,7 +41284,6 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Lucid frontend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-scotty" = callPackage @@ -41303,7 +41301,6 @@ self: { homepage = "https://bitbucket.org/wniare/digestive-functors-scotty"; description = "Scotty backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-snap" = callPackage @@ -41321,7 +41318,6 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Snap backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digit" = callPackage @@ -42272,8 +42268,8 @@ self: { }: mkDerivation { pname = "diversity"; - version = "0.6.2.1"; - sha256 = "1x1a02452kwrmm566bvrq2gqi8g2y8nmx9szgdmdj5wki07d188l"; + version = "0.6.3.0"; + sha256 = "176ichmxfkgjqrlpanpdbni54bzd6zp8hrqbknvg8cfa7faly2lx"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -42284,7 +42280,6 @@ self: { homepage = "https://github.com/GregorySchwartz/diversity"; description = "Return the diversity at each position for all sequences in a fasta file"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "djinn" = callPackage @@ -42648,7 +42643,6 @@ self: { testDepends = [ base doctest HUnit QuickCheck ]; description = "Allow QuickCheck-style property testing within doctest"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dom-lt" = callPackage @@ -42720,6 +42714,7 @@ self: { homepage = "http://github.com/egonschiele/dominion"; description = "A simulator for the board game Dominion"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "domplate" = callPackage @@ -42884,7 +42879,6 @@ self: { homepage = "http://code.haskell.org/~dons/code/download-curl"; description = "High-level file download based on URLs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "download-media-content" = callPackage @@ -43462,6 +43456,7 @@ self: { ]; description = "Efficient automatic differentiation and code generation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dvdread" = callPackage @@ -43723,7 +43718,6 @@ self: { ]; description = "Optionally serializable dynamic state keyed by type"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dynobud" = callPackage @@ -44107,7 +44101,6 @@ self: { homepage = "http://github.com/batterseapower/edit-distance"; description = "Levenshtein and restricted Damerau-Levenshtein edit distances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "edit-distance-vector" = callPackage @@ -44182,8 +44175,8 @@ self: { }: mkDerivation { pname = "editor-open"; - version = "0.5.0.0"; - sha256 = "184i45vzf4xv5whp5q688fmrgxwyrhkqg88hw56yx34blcxywzcr"; + version = "0.6.0.0"; + sha256 = "0raj0s8v72kz63hqpqhf58sx0a8mcwi4ania40spjirdrsdx3i9g"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -44191,7 +44184,7 @@ self: { temporary transformers unix ]; homepage = "https://github.com/pharpend/editor-open"; - description = "Open the user's $EDITOR for text input"; + description = "Open the user's $VISUAL or $EDITOR for text input"; license = stdenv.lib.licenses.asl20; }) {}; @@ -44962,10 +44955,8 @@ self: { }: mkDerivation { pname = "elocrypt"; - version = "0.3.1"; - revision = "1"; - sha256 = "1hh1nf0zfijzrz6pp2gq7zh7rv3fwrybm5cfj59wfb0j0dikz8v4"; - editedCabalFile = "d5781bd7efe030d5ee31448a6df16a3a6c3e4e72e4cabb73a42ad243240f7f6a"; + version = "0.3.2"; + sha256 = "0dz7xgg41gia57hism3dldd7w2xbnkj9kjs9kr2vkfkg5igrwvcx"; isLibrary = true; isExecutable = true; buildDepends = [ base MonadRandom random ]; @@ -45415,7 +45406,6 @@ self: { homepage = "https://github.com/michalt/enummapset"; description = "IntMap and IntSet with Enum keys/elements"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "enummapset-th" = callPackage @@ -45466,8 +45456,8 @@ self: { ({ mkDerivation, base, containers, hspec }: mkDerivation { pname = "envparse"; - version = "0.2.0"; - sha256 = "069blfr1kwcd938x2yarbkvbi9nal1fi4qpmyccrb4vx2llqrxkb"; + version = "0.2.1"; + sha256 = "1pkxlda74wpl3f4xd5h69bcbgrw6q045hkdfj98dqd6z2czr2wcg"; buildDepends = [ base containers ]; testDepends = [ base containers hspec ]; homepage = "https://supki.github.io/envparse"; @@ -45742,7 +45732,6 @@ self: { homepage = "http://code.haskell.org/~mokus/erf-native"; description = "Native Haskell implementation of the interface from the erf package"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "erlang" = callPackage @@ -45902,6 +45891,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "errors_2_0_0" = callPackage + ({ mkDerivation, base, safe, transformers }: + mkDerivation { + pname = "errors"; + version = "2.0.0"; + sha256 = "00s7vsqfvv23j3mpicrhspibbyzi5diqrdgajqx9n2snq8vxn9s5"; + buildDepends = [ base safe transformers ]; + description = "Simplified error-handling"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ersatz" = callPackage ({ mkDerivation, array, base, bytestring, containers, data-default , directory, doctest, filepath, lens, mtl, parsec, process @@ -45995,8 +45995,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "2.2.1"; - sha256 = "0379lqhsj09p6l2hkn6vl6rwmr2jradn6vnann4czxfxpzkc85ir"; + version = "2.2.3"; + sha256 = "11njnccxkhv2g6v8vh8jclhf0wxl0q4f61197qm439j64whzdj2c"; buildDepends = [ base conduit monad-logger persistent resourcet tagged text transformers unordered-containers @@ -46600,6 +46600,7 @@ self: { jailbreak = true; description = "Extensible Pandoc"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "expat-enumerator" = callPackage @@ -46918,7 +46919,6 @@ self: { homepage = "https://github.com/suhailshergill/extensible-effects"; description = "An Alternative to Monad Transformers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extensible-exceptions" = callPackage @@ -46950,8 +46950,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.1"; - sha256 = "0i8vv5y7rmfbcnfkqm2ac027nw6csvjbivfywgxd93xig42rzg4y"; + version = "1.2"; + sha256 = "1bj84p3jpbv1vyjbm22plp56jnkas5qwx4bqvbcqgy843mr41225"; buildDepends = [ base directory filepath process time unix ]; testDepends = [ base directory filepath QuickCheck time unix ]; homepage = "https://github.com/ndmitchell/extra#readme"; @@ -47271,8 +47271,8 @@ self: { }: mkDerivation { pname = "fasta"; - version = "0.7.0.0"; - sha256 = "04gbp9idml3ng48sqvwqyc70z91ds3a5lsimsqydwwfgc5mnxlx1"; + version = "0.7.1.0"; + sha256 = "0dh0vqcwapia5kdcyr7j2qnz28bxnyxb8zmfz32zj5cgyf4635wc"; buildDepends = [ base bytestring containers foldl lens parsec pipes pipes-bytestring pipes-group pipes-text split text @@ -47330,7 +47330,6 @@ self: { jailbreak = true; description = "find nearest neighbours by edit-distance"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fastirc" = callPackage @@ -47388,7 +47387,6 @@ self: { 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 @@ -47401,7 +47399,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 @@ -47417,7 +47414,6 @@ self: { ]; 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 @@ -47430,7 +47426,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 @@ -47457,7 +47452,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 @@ -47470,7 +47464,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 @@ -47483,7 +47476,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 @@ -47496,7 +47488,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 @@ -47509,8 +47500,8 @@ self: { }: mkDerivation { pname = "fb"; - version = "1.0.9"; - sha256 = "0f5zs1qnjkhrdlfvcl26l3j2xl58y97y7rh2dds12mvsyj7h446b"; + version = "1.0.10"; + sha256 = "11h2z8idndhvm1ijp6qylaqyg173qk1rybv9v0d73s2sq7jxbcx7"; buildDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bytestring cereal conduit conduit-extra crypto-api cryptohash @@ -47695,7 +47686,6 @@ self: { homepage = "https://github.com/relrod/fedora-packages-hs"; description = "Haskell interface to the Fedora Packages webapp API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "feed" = callPackage @@ -47716,7 +47706,6 @@ self: { homepage = "https://github.com/bergmark/feed"; description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "feed-cli" = callPackage @@ -48013,7 +48002,6 @@ self: { jailbreak = true; description = "Bindings to the FFTW library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; "fftwRaw" = callPackage @@ -48027,7 +48015,6 @@ self: { homepage = "https://github.com/adamwalker/haskell-fftw-simple"; description = "Low level bindings to FFTW"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) fftw;}; "fgl" = callPackage @@ -48158,6 +48145,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "file-collection" = callPackage + ({ mkDerivation, base, bytestring, clock, directory, zip-archive }: + mkDerivation { + pname = "file-collection"; + version = "0.1.1.3"; + sha256 = "19wx2z66gcmvcxjbhz96c2finzmgkynsd52dwy309af3fbpmgcn0"; + buildDepends = [ base bytestring clock directory zip-archive ]; + homepage = "https://github.com/joelwilliamson/file-collection"; + description = "Provide a uniform interface over file archives and directories"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "file-command-qq" = callPackage ({ mkDerivation, base, parsec, process, system-filepath , template-haskell, text @@ -48231,16 +48230,17 @@ self: { "filediff" = callPackage ({ mkDerivation, base, bytestring, data-default - , data-memocombinators, directory, either, mtl, rainbow, tasty - , tasty-hunit, text, threads, time, transformers, Zora + , data-memocombinators, directory, either, hashmap, mtl, rainbow + , tasty, tasty-hunit, text, threads, time, transformers, Zora }: mkDerivation { pname = "filediff"; - version = "1.0.0.4"; - sha256 = "0vzknflpbhxririabjq6wpwb9lvj0829smj94icjyrx3s9i968k6"; + version = "1.0.0.5"; + sha256 = "1mi0qywbaw0v3ilscmrn3cq467f8y2p09v4xsfa1hk90aybyz2lv"; buildDepends = [ base bytestring data-default data-memocombinators directory either - mtl rainbow tasty tasty-hunit text threads time transformers Zora + hashmap mtl rainbow tasty tasty-hunit text threads time + transformers Zora ]; testDepends = [ base directory either mtl tasty tasty-hunit text time transformers @@ -48673,7 +48673,6 @@ self: { homepage = "http://github.com/jvranish/FixedList/tree/master"; description = "A fixed length list type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixed-point" = callPackage @@ -49159,7 +49158,6 @@ self: { homepage = "http://taylor.fausak.me/flow/"; description = "Write more understandable Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flow2dot" = callPackage @@ -50343,7 +50341,6 @@ self: { homepage = "https://github.com/RaphaelJ/friday"; description = "A functional image processing library for Haskell"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "friday-devil" = callPackage @@ -50361,7 +50358,6 @@ self: { homepage = "https://github.com/RaphaelJ/friday-devil"; description = "Uses the DevIL C library to read and write images from and to files and memory buffers"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) libdevil;}; "friendly-time" = callPackage @@ -50374,7 +50370,6 @@ self: { testDepends = [ base hspec old-locale time ]; description = "Print time information in friendly ways"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "frisby" = callPackage @@ -50453,6 +50448,7 @@ self: { homepage = "http://projects.haskell.org/fsmActions/"; description = "Finite state machines and FSM actions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fsnotify" = callPackage @@ -50491,7 +50487,6 @@ self: { homepage = "http://www.cse.chalmers.se/alumni/markus/fstStudio/"; description = "Finite state transducers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fsutils" = callPackage @@ -50654,7 +50649,6 @@ self: { jailbreak = true; description = "In-memory full text search engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fullstop" = callPackage @@ -50724,6 +50718,7 @@ self: { jailbreak = true; description = "Combinators that allow for a more functional/monadic style of Arrow programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "functor-apply" = callPackage @@ -51588,12 +51583,17 @@ self: { }) {}; "generic-xmlpickler" = callPackage - ({ mkDerivation, base, generic-deriving, hxt, text }: + ({ mkDerivation, base, generic-deriving, hxt, hxt-pickle-utils + , tasty, tasty-hunit, tasty-th, text + }: mkDerivation { pname = "generic-xmlpickler"; - version = "0.1.0.0"; - sha256 = "0ybh3laciskf7yyhb8li4l8w758avgywfl7gy0df16im3x0cx0jy"; + version = "0.1.0.2"; + sha256 = "1nc7gi54y144ivgbv9qbyg143s4rvn4w514lgcb6z05sx7cyiajn"; buildDepends = [ base generic-deriving hxt text ]; + testDepends = [ + base hxt hxt-pickle-utils tasty tasty-hunit tasty-th + ]; homepage = "http://github.com/silkapp/generic-xmlpickler"; description = "Generic generation of HXT XmlPickler instances using GHC Generics"; license = stdenv.lib.licenses.bsd3; @@ -51655,6 +51655,7 @@ self: { homepage = "http://projects.haskell.org/GenI"; description = "GenI graphical user interface"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geni-util" = callPackage @@ -52388,9 +52389,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ghc-prof-flamegraph"; - version = "0.1.0.1"; - sha256 = "1k34mh63rsgx71kxhn3brscq2k20pih78axwkr0q9dg7icyg05wi"; - isLibrary = false; + version = "0.1.1.0"; + sha256 = "0vc456155wsf0qgzih4m3lijzxx99rxpfa149hh8zcqsx1pgq7gm"; + isLibrary = true; isExecutable = true; buildDepends = [ base ]; description = "Generates data to be used with flamegraph.pl from .prof files."; @@ -52573,7 +52574,6 @@ self: { homepage = "https://github.com/larskuhtz/ghci-pretty"; description = "colored pretty-printing within ghci"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcid" = callPackage @@ -53061,7 +53061,6 @@ self: { homepage = "github.com/aloiscochard/git-sanity"; description = "A sanity checker for your git history"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "git-vogue" = callPackage @@ -53158,7 +53157,6 @@ self: { homepage = "https://github.com/jwiegley/github"; description = "Access to the Github API, v3"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-backup" = callPackage @@ -53183,7 +53181,6 @@ self: { homepage = "https://github.com/joeyh/github-backup"; description = "backs up everything github knows about a repository, to the repository"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) git;}; "github-post-receive" = callPackage @@ -53225,7 +53222,6 @@ self: { homepage = "https://github.com/greenrd/github-utils"; description = "Useful functions that use the GitHub API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitignore" = callPackage @@ -53276,7 +53272,6 @@ self: { homepage = "http://gitit.net"; description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitlib" = callPackage @@ -53780,7 +53775,6 @@ self: { homepage = "https://github.com/Twey/gloss-banana"; description = "An Interface for gloss in terms of a reactive-banana Behavior"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-devil" = callPackage @@ -54055,7 +54049,6 @@ self: { homepage = "https://john-millikin.com/software/haskell-gnutls/"; description = "Bindings for GNU libgnutls"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) gnutls;}; "goa" = callPackage @@ -54773,7 +54766,6 @@ self: { homepage = "https://github.com/soenkehahn/graph-wrapper"; description = "A wrapper around the standard Data.Graph with a less awkward interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graphbuilder" = callPackage @@ -55128,7 +55120,6 @@ self: { homepage = "http://github.com/lykahb/groundhog"; description = "Type-safe datatype-database mapping library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "groundhog-mysql" = callPackage @@ -55198,7 +55189,6 @@ self: { ]; description = "Type-safe datatype-database mapping library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "group-with" = callPackage @@ -55328,7 +55318,6 @@ self: { homepage = "https://john-millikin.com/software/haskell-gsasl/"; description = "Bindings for GNU libgsasl"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) gsasl;}; "gsc-weighting" = callPackage @@ -55865,6 +55854,7 @@ self: { homepage = "http://code.atnnn.com/project/guess"; description = "Generate simple combinators given their type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gulcii" = callPackage @@ -56177,7 +56167,6 @@ self: { homepage = "https://github.com/BioHaskell/hPDB-examples"; description = "Examples for hPDB library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hPushover" = callPackage @@ -56642,7 +56631,6 @@ self: { homepage = "https://github.com/nfjinjing/hack2-contrib"; description = "Hack2 contrib"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hack2-contrib-extra" = callPackage @@ -56661,7 +56649,6 @@ self: { homepage = "https://github.com/nfjinjing/hack2-contrib"; description = "Hack2 contrib extra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hack2-handler-happstack-server" = callPackage @@ -56721,7 +56708,6 @@ self: { homepage = "https://github.com/nfjinjing/hack2-handler-snap-server"; description = "Hack2 Snap server handler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hack2-handler-warp" = callPackage @@ -56970,8 +56956,8 @@ self: { }: mkDerivation { pname = "hackager"; - version = "1.0.1"; - sha256 = "03vnqrvb1iby58gnd6hrx1c5q3zvfy3szp8qwp10c9s4cdddxyvy"; + version = "1.2.0.1"; + sha256 = "06lrsfs70zjhxqsz93wmhrmyq1v64kiq0580f9im9nw69w4yl4ax"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -57610,7 +57596,6 @@ self: { homepage = "https://bitbucket.org/rvlm/hakyll-contrib-hyphenation"; description = "automatic hyphenation for Hakyll"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-contrib-links" = callPackage @@ -57768,7 +57753,6 @@ self: { homepage = "https://github.com/timjb/halma"; description = "Library implementing Halma rules"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haltavista" = callPackage @@ -57883,7 +57867,6 @@ self: { homepage = "http://code.google.com/p/hgdata"; description = "Library and command-line utility for accessing Google services and APIs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "handa-geodata" = callPackage @@ -57983,7 +57966,6 @@ self: { ]; description = "IPv4 Network Stack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hans-pcap" = callPackage @@ -57997,7 +57979,6 @@ self: { homepage = "https://github.com/tolysz/hans-pcap"; description = "Driver for real ethernet devices for HaNS"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hans-pfq" = callPackage @@ -58036,7 +58017,6 @@ self: { homepage = "https://github.com/stackbuilders/hapistrano"; description = "A deployment library for Haskell applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happindicator" = callPackage @@ -58204,7 +58184,6 @@ self: { homepage = "http://www.happstack.com/"; description = "Happstack Authentication Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-clientsession" = callPackage @@ -58222,7 +58201,6 @@ self: { homepage = "http://happstack.com"; description = "client-side session data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-contrib" = callPackage @@ -58362,7 +58340,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 @@ -58516,7 +58493,6 @@ self: { homepage = "http://www.happstack.com/"; description = "Support for using JMacro with Happstack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-lite" = callPackage @@ -58884,7 +58860,6 @@ self: { homepage = "http://www.cs.chalmers.se/~d00nibro/harp/"; description = "HaRP allows pattern-matching with regular expressions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "harpy" = callPackage @@ -58893,15 +58868,14 @@ self: { }: mkDerivation { pname = "harpy"; - version = "0.5.0.0"; - sha256 = "11h235j9348i01qcmvc389khl8xp5azj3y31g75cs59kiblz1bk7"; + version = "0.6.0.0"; + sha256 = "0vc6p72imiss9zwzbmkxl42lm21kzc33j4l6f5x8a6r95m85iwq8"; buildDepends = [ array base containers disassembler mtl parsec pretty template-haskell ]; - homepage = "http://code.haskell.org/harpy/"; description = "Runtime code generation for x86 machine code"; - license = "GPL"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -59851,7 +59825,6 @@ self: { homepage = "http://documentup.com/haskell-suite/haskell-packages"; description = "Haskell suite library for package management and integration with Cabal"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-pdf-presenter" = callPackage @@ -60647,6 +60620,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskellscript" = callPackage + ({ mkDerivation, base, cryptohash, directory, either, filepath, mtl + , process, text + }: + mkDerivation { + pname = "haskellscript"; + version = "0.1.2"; + sha256 = "0d3h2pz8f1mi19il9p03dxrb5f973wr2zl7f6mjn3c565rs3nzgs"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base cryptohash directory either filepath mtl process text + ]; + homepage = "http://github.com/seanparsons/haskellscript/"; + description = "Command line tool for running Haskell scripts with a hashbang"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskelm" = callPackage ({ mkDerivation, aeson, base, binary, containers, directory, Elm , haskell-src-exts, haskell-src-meta, mtl, parsec, pretty @@ -62292,7 +62283,6 @@ self: { homepage = "https://github.com/mvoidex/hdocs"; description = "Haskell docs tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hdph" = callPackage @@ -62969,20 +62959,20 @@ self: { }) {}; "hermit" = callPackage - ({ mkDerivation, alex, ansi-terminal, array, base, containers - , data-default-class, directory, ghc, happy, haskeline, kure - , marked-pretty, mtl, operational, process, stm, temporary - , terminfo, transformers, transformers-compat + ({ mkDerivation, alex, ansi-terminal, array, base, base-compat + , containers, data-default-class, directory, ghc, happy, haskeline + , kure, marked-pretty, mtl, process, stm, temporary, terminfo + , transformers, transformers-compat }: mkDerivation { pname = "hermit"; - version = "0.7.1.0"; - sha256 = "0ckjh7ql2s6l09lbgdn9plfpvmdcx6b3yh9lbdih9l4lcf1k8f56"; + version = "1.0.0.0"; + sha256 = "1m3dgp22ix3l64basv8bx0k9waagi0rckprpgqnfpxnir7cbhrkv"; isLibrary = true; isExecutable = true; buildDepends = [ - ansi-terminal array base containers data-default-class directory - ghc haskeline kure marked-pretty mtl operational process stm + ansi-terminal array base base-compat containers data-default-class + directory ghc haskeline kure marked-pretty mtl process stm temporary terminfo transformers transformers-compat ]; buildTools = [ alex happy ]; @@ -64229,8 +64219,8 @@ self: { }: mkDerivation { pname = "hint"; - version = "0.4.2.2"; - sha256 = "1gv4nmwqp8xxvz90g9k48bixpc3cabx8591vj1zv6aah8fbng06w"; + version = "0.4.2.3"; + sha256 = "1ds09bd369qmy2672vkhll8igbp63q83wdzwkpky4ab9pac3yayg"; buildDepends = [ base directory exceptions extensible-exceptions filepath ghc ghc-mtl ghc-paths mtl random unix @@ -64888,7 +64878,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 @@ -65948,7 +65937,6 @@ self: { homepage = "http://github.com/yogsototh/holy-project"; description = "Start your Haskell project with cabal, git and tests"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "homeomorphic" = callPackage @@ -66042,8 +66030,8 @@ self: { ({ mkDerivation, array, base }: mkDerivation { pname = "hood"; - version = "0.2"; - sha256 = "16p6jr9mkd1qv725655awcx623samrkcswlpml0kvhbm1i5kfmcn"; + version = "0.2.1"; + sha256 = "1f98v1bqrmh6cmmbsmcsdm3f250imp4rk0zi34di8fzlyqfcf2yh"; buildDepends = [ array base ]; homepage = "http://www.ittc.ku.edu/csdl/fpg/Hood"; description = "Debugging by observing in place"; @@ -66283,8 +66271,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "4.2.40"; - sha256 = "11clwdqgsg38lw0jc382xkazlgm8lpa7d8sydgi14wkgwy4v9zqv"; + version = "4.2.41"; + sha256 = "1gm1sw7d88vzh53myqjzls2sxc3cnk1ni31dcagkj54khh0h7f56"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -67737,7 +67725,6 @@ self: { homepage = "https://github.com/codygman/hs-scrape/"; description = "Simple and easy web scraping and automation in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-twitter" = callPackage @@ -68018,7 +68005,6 @@ self: { ]; description = "Backend for uploading benchmark data to Google Fusion Tables"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc2hs" = callPackage @@ -68672,7 +68658,6 @@ self: { homepage = "https://github.com/tmhedberg/hsenv"; description = "Virtual Haskell Environment builder"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hserv" = callPackage @@ -68894,7 +68879,6 @@ self: { ]; description = "Package for user configuration files (INI)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hskeleton" = callPackage @@ -69480,7 +69464,6 @@ self: { homepage = "https://github.com/hspec/hspec-expectations#readme"; description = "hspec-expectations with pretty printing on failure"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-experimental" = callPackage @@ -70475,8 +70458,8 @@ self: { ({ mkDerivation, base, hxt, kure }: mkDerivation { pname = "html-kure"; - version = "0.2"; - sha256 = "022m9lm642g7as0a5qkgmmamsh51kgx9nk6y01wgq24ln65injmr"; + version = "0.2.1"; + sha256 = "1x72f3r6nayv03y0a7x5dyj2lnbli14nmqi5i7i8isqbngsvca0l"; buildDepends = [ base hxt kure ]; homepage = "www.ittc.ku.edu/csdl/fpg/software/html-kure"; description = "HTML rewrite engine, using KURE"; @@ -70587,7 +70570,6 @@ self: { homepage = "http://github.com/pirapira/htodo"; description = "A todo application"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "htoml" = callPackage @@ -71158,8 +71140,8 @@ self: { }: mkDerivation { pname = "http-reverse-proxy"; - version = "0.4.1.3"; - sha256 = "1j51a93j0m7waki875k29d7p8s08nk36xhlx8v4bmgpr4v7w92fh"; + version = "0.4.2"; + sha256 = "10cd6h1n1fp55jpwcp4nnk64yslxy2cnm7rhzd25xvi5fkhfl61i"; buildDepends = [ async base blaze-builder bytestring case-insensitive conduit conduit-extra containers data-default-class http-client http-types @@ -71236,7 +71218,6 @@ self: { homepage = "http://research.operationaldynamics.com/projects/http-streams/"; description = "An HTTP client using io-streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-test" = callPackage @@ -72350,7 +72331,6 @@ self: { homepage = "https://www.github.com/ktvoelker/hydrogen"; description = "An alternate Prelude"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hydrogen-cli" = callPackage @@ -73074,7 +73054,6 @@ self: { homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) boehmgc; inherit (pkgs) gmp;}; "ieee" = callPackage @@ -73233,7 +73212,6 @@ self: { homepage = "https://github.com/dmcclean/igrf"; description = "International Geomagnetic Reference Field"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell" = callPackage @@ -73466,6 +73444,7 @@ self: { jailbreak = true; description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihttp" = callPackage @@ -73671,7 +73650,9 @@ self: { mkDerivation { pname = "imm"; version = "0.6.0.3"; + revision = "1"; sha256 = "0fhqb36xj2xr1hhfrhk1npms9lnvbh6fmvki9mmm3gqs06hb925l"; + editedCabalFile = "c14d5caa0066c05d15589dfbb663c5397bcb6d12ab4477de1d7572e3a16b132d"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -74024,7 +74005,6 @@ self: { buildDepends = [ base gtk HDBC HDBC-sqlite3 ]; description = "Indian Language Font Converter"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "indices" = callPackage @@ -74078,7 +74058,6 @@ self: { homepage = "https://github.com/sinelaw/infernu"; description = "Type inference and checker for JavaScript (experimental)"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "infinite-search" = callPackage @@ -74201,7 +74180,6 @@ self: { homepage = "http://doomanddarkness.eu/pub/informative"; description = "A yesod subsite serving a wiki"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ini" = callPackage @@ -74246,6 +74224,44 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "inline-c" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring + , containers, cryptohash, directory, filepath, gsl, gslcblas, hspec + , mtl, parsec, parsers, QuickCheck, raw-strings-qq, regex-posix + , template-haskell, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "inline-c"; + version = "0.5.0.1"; + sha256 = "1gkk9ldlac8jfiibyw15madrxa731fk2qbll22c8lm0l83r9kpsa"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + ansi-wl-pprint base binary bytestring containers cryptohash + directory filepath mtl parsec parsers QuickCheck template-haskell + transformers unordered-containers vector + ]; + testDepends = [ + ansi-wl-pprint base containers hspec parsers QuickCheck + raw-strings-qq regex-posix template-haskell transformers vector + ]; + extraLibraries = [ gsl gslcblas ]; + description = "Write Haskell source files including C code inline. No FFI required."; + license = stdenv.lib.licenses.mit; + }) { inherit (pkgs) gsl; gslcblas = null;}; + + "inline-c-cpp" = callPackage + ({ mkDerivation, base, inline-c, template-haskell }: + mkDerivation { + pname = "inline-c-cpp"; + version = "0.1.0.0"; + sha256 = "0iba77p2ncxbg5sb4ks8f3lgp6zdnjhzvrr2ap3yg49is5b9f5rf"; + buildDepends = [ base inline-c template-haskell ]; + testDepends = [ base ]; + description = "Lets you embed C++ code into Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "inquire" = callPackage ({ mkDerivation, aether, base, text }: mkDerivation { @@ -74957,6 +74973,7 @@ self: { pkgconfigDepends = [ ipopt nlopt ]; description = "haskell binding to ipopt and nlopt including automatic differentiation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) ipopt; inherit (pkgs) nlopt;}; "ipprint" = callPackage @@ -74968,7 +74985,6 @@ self: { buildDepends = [ base Extra haskell-src ]; description = "Tiny helper for pretty-printing values in ghci console"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iproute" = callPackage @@ -75145,7 +75161,9 @@ self: { mkDerivation { pname = "irc-core"; version = "1.1.0.1"; + revision = "1"; sha256 = "01n10wcnq4h2wpmxl1rh9zgqayk3mllbz563fg8qw1k01n7q9257"; + editedCabalFile = "e0fedfac6e4dccddc4034d99d9123c69127309df42c2a338a8643f4cf48b1a50"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -75154,7 +75172,6 @@ self: { free haskell-lexer lens network old-locale split stm text time tls transformers vty x509 x509-store x509-system x509-validation ]; - jailbreak = true; homepage = "https://github.com/glguy/irc-core"; description = "An IRC client library and text client"; license = stdenv.lib.licenses.bsd3; @@ -75228,7 +75245,6 @@ self: { homepage = "https://github.com/arnoblalam/iron_mq_haskell"; description = "Iron.IO message queueing client library"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ironforge" = callPackage @@ -75247,7 +75263,6 @@ self: { homepage = "http://doomanddarkness.eu/pub/antisplice"; description = "A technical demo for Antisplice"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "is" = callPackage @@ -75971,7 +75986,9 @@ self: { mkDerivation { pname = "jailbreak-cabal"; version = "1.3"; + revision = "2"; sha256 = "1i4a8azbq74r3pb4hvb816amy13z03afpq4jvyps3s399id6zhx2"; + editedCabalFile = "eb10d8166cc3a40e8d731ab1fba7d37ef57d155d6122c7234297ddbf776ec28a"; isLibrary = false; isExecutable = true; buildDepends = [ base Cabal ]; @@ -76234,7 +76251,6 @@ self: { ]; description = "QuasiQuotation library for programmatic generation of Javascript code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jmacro-rpc" = callPackage @@ -76254,7 +76270,6 @@ self: { homepage = "http://hub.darcs.net/gershomb/jmacro"; description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jmacro-rpc-happstack" = callPackage @@ -76263,8 +76278,8 @@ self: { }: mkDerivation { pname = "jmacro-rpc-happstack"; - version = "0.3.1"; - sha256 = "0b77nrvrh1wzsp6djji0hkgl6flyl664l7kzbf5kpi30mqh45a6a"; + version = "0.3.2"; + sha256 = "0r5h8hlsjppnhqdxa0dsrjkpv3pldbkv5v4dryd4km2v38yfxkcr"; buildDepends = [ aeson base blaze-html bytestring containers happstack-server jmacro jmacro-rpc mtl @@ -76272,7 +76287,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 @@ -76289,7 +76303,6 @@ self: { homepage = "http://hub.darcs.net/gershomb/jmacro-rpc"; description = "Snap backend for jmacro-rpc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jobqueue" = callPackage @@ -76417,20 +76430,18 @@ self: { , bytestring, cereal, cipher-aes, containers, cprng-aes , crypto-cipher-types, crypto-numbers, crypto-pubkey , crypto-pubkey-types, crypto-random, cryptohash, doctest, either - , errors, hspec, HUnit, mtl, QuickCheck, text, time + , errors, hspec, HUnit, mtl, old-locale, QuickCheck, text, time , unordered-containers, vector }: mkDerivation { pname = "jose-jwt"; - version = "0.5"; - revision = "2"; - sha256 = "0pk6fq3wsbl6pl79dcyns1c94xmv98acfr6rbxhyfqmc5lys759s"; - editedCabalFile = "e3f6e8d368c88a0be06d656e627e86b8ad481cf75578a97af2a5c29bf0bb55b6"; + version = "0.6"; + sha256 = "0bap7a7d984mz0ss04vva5m2qy0kly60r6plxrihvj381bnq69k4"; buildDepends = [ aeson base base64-bytestring byteable bytestring cereal cipher-aes containers crypto-cipher-types crypto-numbers crypto-pubkey - crypto-pubkey-types crypto-random cryptohash errors mtl text time - unordered-containers vector + crypto-pubkey-types crypto-random cryptohash errors mtl old-locale + text time unordered-containers vector ]; testDepends = [ aeson aeson-qq base base64-bytestring bytestring cipher-aes @@ -76441,6 +76452,7 @@ self: { homepage = "http://github.com/tekul/jose-jwt"; description = "JSON Object Signing and Encryption Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jpeg" = callPackage @@ -77488,8 +77500,8 @@ self: { }: mkDerivation { pname = "keter"; - version = "1.4.0.1"; - sha256 = "0bzd0f8i88bdwz2aqvx3q2mfidm0947wwrnxrdii778mjr8c1nyb"; + version = "1.4.1"; + sha256 = "1pxvddb6mkxq4j7w0l3zgvarlj8kvrd4c75mivsia330wzkhc4ay"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -78214,8 +78226,8 @@ self: { ({ mkDerivation, base, containers, mtl }: mkDerivation { pname = "lambda-options"; - version = "0.5.1.0"; - sha256 = "0h4s46z734l8b7ivx8h1kh2nhbqsz6zswxs1dqfhqrbcyf4vi2fl"; + version = "0.6.0.0"; + sha256 = "12w53cpqlqcnx3f54xx14dj532xdwdrdp8yz2a43jb3rdf9ffz5c"; buildDepends = [ base containers mtl ]; jailbreak = true; homepage = "https://github.com/thomaseding/lambda-options"; @@ -78356,7 +78368,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot core functionality"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-haskell-plugins" = callPackage @@ -78403,7 +78414,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "IRC plugins for lambdabot"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-misc-plugins" = callPackage @@ -78427,7 +78437,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot miscellaneous plugins"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-novelty-plugins" = callPackage @@ -78466,7 +78475,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot reference plugins"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-social-plugins" = callPackage @@ -78483,7 +78491,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Social plugins for Lambdabot"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-trusted" = callPackage @@ -79039,22 +79046,21 @@ self: { }) {}; "language-glsl" = callPackage - ({ mkDerivation, base, HUnit, parsec, pretty, prettyclass - , test-framework, test-framework-hunit + ({ mkDerivation, base, HUnit, parsec, prettyclass, test-framework + , test-framework-hunit }: mkDerivation { pname = "language-glsl"; - version = "0.1.1"; - sha256 = "06dc339a2cddzgjda3nzprgr0v2clbhlpl8j81m04i66bbj2l15y"; + version = "0.2.0"; + sha256 = "1wmfzif1cc3a8sls3swms9x54hm9ic8y301zav6fg4mr7xa4hqr3"; isLibrary = true; isExecutable = true; - buildDepends = [ base parsec pretty prettyclass ]; + buildDepends = [ base parsec prettyclass ]; testDepends = [ base HUnit parsec prettyclass test-framework test-framework-hunit ]; description = "GLSL abstract syntax tree, parser, and pretty-printer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-go" = callPackage @@ -79998,7 +80004,6 @@ self: { homepage = "https://www.lendingclub.com/developers/lc-api.action"; description = "Bindings for the LendingClub marketplace API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens" = callPackage @@ -80052,6 +80057,7 @@ self: { homepage = "http://github.com/ekmett/lens-action/"; description = "Monadic Getters and Folds"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-aeson" = callPackage @@ -80185,7 +80191,6 @@ self: { homepage = "http://github.com/jvranish/Lenses/tree/master"; description = "Simple Functional Lenses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lensref" = callPackage @@ -80221,8 +80226,8 @@ self: { }: mkDerivation { pname = "leveldb-haskell"; - version = "0.6.2"; - sha256 = "0gx9rn5vbmy5nq1n2ga1v5v7b7p11d0rxhdh75pz4dqgazxyjlax"; + version = "0.6.3"; + sha256 = "0vljwjcd9m63wk7zmkl2s6b6kpjn7hqmwwg0p2bjm0d7ras69pk5"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -80234,7 +80239,6 @@ self: { tasty tasty-quickcheck temporary transformers ]; extraLibraries = [ leveldb ]; - jailbreak = true; homepage = "http://github.com/kim/leveldb-haskell"; description = "Haskell bindings to LevelDB"; license = stdenv.lib.licenses.bsd3; @@ -80590,7 +80594,6 @@ self: { homepage = "https://github.com/vincenthz/hs-libgit"; description = "Simple Git Wrapper"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libgraph" = callPackage @@ -81294,7 +81297,6 @@ self: { homepage = "http://github.com/ekmett/linear-accelerate/"; description = "Instances to use linear vector spaces on accelerate backends"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linear-algebra-cblas" = callPackage @@ -81500,7 +81502,6 @@ self: { homepage = "https://github.com/hlian/linklater"; description = "The fast and fun way to write Slack.com bots"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linux-blkid" = callPackage @@ -81761,13 +81762,13 @@ self: { ({ mkDerivation, ansi-terminal, array, attoparsec, base, bifunctors , bytestring, cmdargs, containers, deepseq, directory, filemanip , filepath, ghc-prim, hashable, intern, mtl, ocaml, parsec, pretty - , process, syb, text, text-format, transformers - , unordered-containers + , process, syb, tasty, tasty-hunit, tasty-rerun, text, text-format + , transformers, unordered-containers }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.2.3.2"; - sha256 = "0gm2cy4a1l6kh65cwj3ssv9r9ry4nk2sjr3cqhkp5i7mhmpc6q58"; + version = "0.3.0.0"; + sha256 = "14hpvnf46xpw1c3jmi9v91116dv5sglsn4v0gfqxds1nabjw1c5s"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -81776,11 +81777,15 @@ self: { intern mtl parsec pretty process syb text text-format transformers unordered-containers ]; + testDepends = [ + base directory filepath process tasty tasty-hunit tasty-rerun text + ]; buildTools = [ ocaml ]; configureFlags = [ "-fbuild-external" ]; homepage = "https://github.com/ucsd-progsys/liquid-fixpoint"; description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) ocaml;}; "liquidhaskell" = callPackage @@ -81900,7 +81905,6 @@ self: { ]; description = "List all remote forwards for mail accounts stored in a SQL database"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "list-t" = callPackage @@ -82783,7 +82787,6 @@ self: { testDepends = [ base hspec monad-logger unix ]; description = "Simplified logging in IO for application writers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-facade" = callPackage @@ -82835,7 +82838,6 @@ self: { buildTools = [ alex happy ]; description = "Import, export etc. for TPTP, a syntax for first-order logic"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logic-classes" = callPackage @@ -83706,7 +83708,6 @@ self: { homepage = "http://github.com/ekmett/machines/"; description = "Networked stream transducers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "machines-directory" = callPackage @@ -83715,16 +83716,14 @@ self: { }: mkDerivation { pname = "machines-directory"; - version = "0.2.0.2"; - sha256 = "1z17lj5hyldxf4n9dndnc2jzn0l6c2pk1sd7xyw7fikrf4ykg6ns"; + version = "0.2.0.4"; + sha256 = "059jxf636l4xy4dflp6imf2sbrb2sq5ig3mr13pjqx4s5agwcl8r"; buildDepends = [ base directory filepath machines machines-io transformers ]; - jailbreak = true; homepage = "http://github.com/aloiscochard/machines-directory"; description = "Directory (system) utilities for the machines library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "machines-io" = callPackage @@ -83733,16 +83732,14 @@ self: { }: mkDerivation { pname = "machines-io"; - version = "0.2.0.2"; - sha256 = "0v7jigl04nb3avqyyjs74fvcj7ialf4d8iw7ym4mzqam0sl74157"; + version = "0.2.0.4"; + sha256 = "078xr6hh27ssv07vw85h5h297akvpar13m5sykf7m0rz8kzdybgk"; buildDepends = [ base bytestring chunked-data machines transformers ]; - jailbreak = true; homepage = "http://github.com/aloiscochard/machines-io"; description = "IO utilities for the machines library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "machines-process" = callPackage @@ -83750,14 +83747,12 @@ self: { }: mkDerivation { pname = "machines-process"; - version = "0.2.0.2"; - sha256 = "1s3hdxk76jv9762lp42wgfq02dz5dn6a73yp986ghpn9hshkhqz2"; + version = "0.2.0.4"; + sha256 = "1v0jskb8m1s7cd51672v4fj9sjy5l1q01vm6qyvkrsabjp04lq4l"; buildDepends = [ base chunked-data machines machines-io process ]; - jailbreak = true; homepage = "http://github.com/aloiscochard/machines-process"; description = "Process (system) utilities for the machines library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "machines-zlib" = callPackage @@ -83772,7 +83767,6 @@ self: { homepage = "https://github.com/lshift/machines-zlib"; description = "Decompression support for machines"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "macho" = callPackage @@ -83910,7 +83904,6 @@ self: { homepage = "https://github.com/nfjinjing/maid"; description = "A simple static web server"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mailbox-count" = callPackage @@ -83935,7 +83928,6 @@ self: { ]; description = "Count mailboxes in a SQL database"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mailchimp-subscribe" = callPackage @@ -84061,7 +84053,6 @@ self: { homepage = "https://github.com/Philonous/make-package"; description = "Make a cabalized package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "makedo" = callPackage @@ -84492,7 +84483,6 @@ self: { ]; description = "Library for interfacing with the Mandrill JSON API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mandulia" = callPackage @@ -84704,15 +84694,15 @@ self: { }) {}; "marked-pretty" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, deepseq, ghc-prim }: mkDerivation { pname = "marked-pretty"; - version = "0.1"; - sha256 = "0xwymfwja9fh4wgqpqczi9zrn9bynxy069sfcg5d14zd5j54zy8w"; - isLibrary = true; - isExecutable = true; - buildDepends = [ base ]; - description = "Pretty-printing library, with scoping, based on pretty-1.0.0.0"; + version = "1.1.2.1"; + sha256 = "01dsqdckrm93ydc5frsxj55vgj238213qr31n1iybjdmw5x2r0dl"; + buildDepends = [ base deepseq ghc-prim ]; + testDepends = [ base ]; + homepage = "https://github.com/ku-fpg/marked-pretty"; + description = "Pretty-printing library, with scoping, based on pretty"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -84871,6 +84861,7 @@ self: { jailbreak = true; description = "Markup language preprocessor for Haskell"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "masakazu-bot" = callPackage @@ -85031,7 +85022,6 @@ self: { testDepends = [ base tasty tasty-hunit tasty-quickcheck vector ]; description = "native matrix based on vector"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "matrix" = callPackage @@ -85455,8 +85445,10 @@ self: { }: mkDerivation { pname = "memcache"; - version = "0.0.1"; - sha256 = "1fzppfyizli64g7dwsdayn5qlbxi8fp1cwwxgw391w5gl07h228f"; + version = "0.1.0.0"; + revision = "1"; + sha256 = "1x2lw802m02p9z28rsmvwczsax9f6vl16p9kwjq4zmn8ak0s74m5"; + editedCabalFile = "6e2508fa18aae99fee1c0aa41cc86e97d73ff504647b5265e54adf3566ca81e7"; buildDepends = [ base binary blaze-builder bytestring hashable network resource-pool time vector vector-algorithms @@ -85509,7 +85501,6 @@ self: { ]; description = "Memcache procotol library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "memcached" = callPackage @@ -85588,6 +85579,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "memory" = callPackage + ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "memory"; + version = "0.2"; + sha256 = "05v7ywbxn61bk8gk8sc4fpm1n76kcvbab1jgvbq82m6g56dhmrh0"; + buildDepends = [ base bytestring deepseq ghc-prim ]; + testDepends = [ base tasty tasty-hunit tasty-quickcheck ]; + homepage = "https://github.com/vincenthz/hs-memory"; + description = "memory and related abtraction stuff"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "memscript" = callPackage ({ mkDerivation, base, readline }: mkDerivation { @@ -86022,7 +86029,6 @@ self: { homepage = "http://www.youtube.com/watch?v=cOlR73h2uII"; description = "A Memory-like (Concentration, Pairs, ...) game for tones"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midisurface" = callPackage @@ -86880,7 +86886,6 @@ self: { homepage = "https://github.com/nfjinjing/moe"; description = "html with style"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mohws" = callPackage @@ -88111,8 +88116,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "monomorphic"; - version = "0.0.3.2"; - sha256 = "13zw506wifz2lf7n4a48rkn7ym44jpiqag21zc1py6xxdlkbrhh2"; + version = "0.0.3.3"; + sha256 = "0x7fig4ms5qqiah4847ghl13s2r1xv2372hj6xrhjw6bdfh85cln"; buildDepends = [ base ]; homepage = "https://github.com/konn/monomorphic"; description = "Library to convert polymorphic datatypes to/from its monomorphic represetation"; @@ -89133,6 +89138,7 @@ self: { homepage = "http://www.cs.uu.nl/wiki/Center/CoCoCo"; description = "MUtually Recursive Definitions Explicitly Represented"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "murmur-hash" = callPackage @@ -89616,8 +89622,8 @@ self: { }: mkDerivation { pname = "mwc-random-monad"; - version = "0.7.3.0"; - sha256 = "16l42xybkkp99qvv8ilcxqvzzmvhrwx974n38yxj27yy74ds3rk5"; + version = "0.7.3.1"; + sha256 = "0h4ljwwhqg4yy513lqk2ix0m9q2hmk276hgfrc6n3ja6wqbpkwyh"; buildDepends = [ base monad-primitive mwc-random primitive transformers vector ]; @@ -89732,7 +89738,6 @@ self: { homepage = "https://github.com/ibotty/mysql-effect"; description = "An extensible mysql effect using extensible-effects and mysql-simple"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mysql-simple" = callPackage @@ -90351,7 +90356,6 @@ self: { homepage = "http://github.com/nfjinjing/nemesis"; description = "a task management tool for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nemesis-titan" = callPackage @@ -90469,7 +90473,6 @@ self: { ]; description = "Declarative, compositional Wai responses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nested-sets" = callPackage @@ -90540,6 +90543,7 @@ self: { homepage = "http://frenetic-lang.org"; description = "The NetCore compiler and runtime system for OpenFlow networks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netlines" = callPackage @@ -90710,6 +90714,7 @@ self: { jailbreak = true; description = "FRP for controlling networks of OpenFlow switches"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nettle-netkit" = callPackage @@ -90725,6 +90730,7 @@ self: { ]; description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nettle-openflow" = callPackage @@ -90741,6 +90747,7 @@ self: { ]; description = "OpenFlow protocol messages, binary formats, and servers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netwire" = callPackage @@ -90870,7 +90877,6 @@ self: { homepage = "https://github.com/markhibberd/network-api-support"; description = "Toolkit for building http client libraries over Network.Http.Conduit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-attoparsec" = callPackage @@ -91022,7 +91028,6 @@ self: { buildDepends = [ base bytestring cereal pretty ]; description = "Library for network data structures and their serialization"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-dbus" = callPackage @@ -91251,7 +91256,6 @@ self: { homepage = "https://john-millikin.com/software/haskell-xmpp/"; description = "Client library for the XMPP protocol"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-rpca" = callPackage @@ -91738,7 +91742,6 @@ self: { homepage = "http://github.com/YoEight/ngrams-loader"; description = "Ngrams loader based on http://www.ngrams.info format"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nibblestring" = callPackage @@ -91806,7 +91809,6 @@ self: { homepage = "https://github.com/dahlia/nicovideo-translator"; description = "Nico Nico Douga (ニコニコ動画) Comment Translator"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nikepub" = callPackage @@ -92678,6 +92680,7 @@ self: { homepage = "http://www.cs.uu.nl/wiki/Center/CoCoCo"; description = "Oberon0 Compiler"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "obj" = callPackage @@ -92740,6 +92743,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "observable-sharing" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "observable-sharing"; + version = "0.1.0.0"; + sha256 = "1l9l7jjk1zxc6wzw2n89l4mr964ys87b37sc55jsm73km19q07jy"; + buildDepends = [ base ]; + description = "Simple observable sharing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "octohat" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , base64-bytestring, bytestring, containers, cryptohash, dotenv @@ -92767,7 +92781,6 @@ self: { homepage = "https://github.com/stackbuilders/octohat"; description = "A tested, minimal wrapper around GitHub's API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "octopus" = callPackage @@ -92945,7 +92958,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 @@ -93198,7 +93210,6 @@ self: { homepage = "https://github.com/emilaxelsson/open-typerep"; description = "Open type representations and dynamic types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "open-union" = callPackage @@ -93481,7 +93492,6 @@ self: { testDepends = [ base opentheory-primitive QuickCheck ]; description = "The standard theory library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opentheory-bits" = callPackage @@ -93560,7 +93570,6 @@ self: { testDepends = [ base opentheory opentheory-primitive QuickCheck ]; description = "Stream parsers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opentheory-prime" = callPackage @@ -93581,7 +93590,6 @@ self: { ]; description = "Prime natural numbers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opentheory-primitive" = callPackage @@ -93594,7 +93602,6 @@ self: { testDepends = [ base QuickCheck random ]; description = "Haskell primitives used by OpenTheory packages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opentheory-probability" = callPackage @@ -93771,6 +93778,7 @@ self: { homepage = "http://optimusprime.posterous.com/"; description = "A supercompiler for f-lite"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optional" = callPackage @@ -93902,7 +93910,6 @@ self: { ]; description = "An API client for http://orchestrate.io/."; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "orchid" = callPackage @@ -94401,7 +94408,6 @@ self: { homepage = "https://github.com/diogob/pagarme_haskell"; description = "Pagarme API wrapper"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pager" = callPackage @@ -94559,8 +94565,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.7.1"; - sha256 = "1kyxr7ld6j60hq1pbrxvv4c7vsvq46fxpky272ywacayhqq1a2qg"; + version = "0.7.1.1"; + sha256 = "1n96g7l16cn1qcp9xsbdmp844078lpcjsz3lg1x81drnzax9fpa1"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -95509,7 +95515,6 @@ self: { jailbreak = true; description = "A webpage scraper for Patreon which dumps a list of patrons to a text file"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pattern-arrows" = callPackage @@ -95577,7 +95582,6 @@ self: { homepage = "https://github.com/fanjam/paypal-adaptive-hoops"; description = "Client for a limited part of PayPal's Adaptive Payments API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "paypal-api" = callPackage @@ -95820,7 +95824,6 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf-toolbox-core" = callPackage @@ -95838,7 +95841,6 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf-toolbox-document" = callPackage @@ -95858,7 +95860,6 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf-toolbox-viewer" = callPackage @@ -95880,7 +95881,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 @@ -96594,7 +96594,6 @@ self: { homepage = "https://github.com/travitch/persistent-vector"; description = "A persistent sequence based on array mapped tries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-zookeeper" = callPackage @@ -96798,7 +96797,6 @@ self: { ]; description = "simply download a video from webpage and play it"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pgm" = callPackage @@ -97036,6 +97034,7 @@ self: { homepage = "http://www.cs.indiana.edu/~rrnewton/projects/phybin/"; description = "Utility for clustering phylogenetic trees in Newick format based on Robinson-Foulds distance"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pi-calculus" = callPackage @@ -97206,7 +97205,20 @@ self: { homepage = "https://github.com/jonschoning/pinboard"; description = "Access to the Pinboard API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "pipeclip" = callPackage + ({ mkDerivation, base, bytestring, editor-open, Hclip, safe }: + mkDerivation { + pname = "pipeclip"; + version = "0.1.0.1"; + sha256 = "1hmbhgnrq894jnm7gy6yc812nysvkrbjk6qqjmk7g7fsj46xpdfg"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base bytestring editor-open Hclip safe ]; + homepage = "https://github.com/pharpend/pipeclip"; + description = "Open your editor, pipe the output to the system clipboard"; + license = stdenv.lib.licenses.bsd2; }) {}; "pipes" = callPackage @@ -97438,9 +97450,10 @@ self: { ({ mkDerivation, base, errors, pipes }: mkDerivation { pname = "pipes-errors"; - version = "0.2.1"; - sha256 = "08i3rzqz7r5vkjfry0bdw3gpxjzhni8xmwwa6p8hdkixznjq7539"; + version = "0.3"; + sha256 = "1vbpchs3v08sc1rfa9fl89wzxg9ak823xjbkl0k37ycwwc36fn76"; buildDepends = [ base errors pipes ]; + jailbreak = true; homepage = "https://github.com/jdnavarro/pipes-errors"; description = "Integration between pipes and errors"; license = stdenv.lib.licenses.bsd3; @@ -97705,7 +97718,6 @@ self: { ]; description = "Various proxies for streaming data into vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-wai" = callPackage @@ -98467,7 +98479,6 @@ self: { homepage = "https://github.com/mokus0/polynomial"; description = "Polynomials"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "polynomials-bernstein" = callPackage @@ -98925,7 +98936,6 @@ self: { homepage = "https://bitbucket.org/merijnv/posix-pty"; description = "Pseudo terminal interaction with subprocesses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { util = null;}; "posix-realtime" = callPackage @@ -99219,24 +99229,24 @@ self: { ({ mkDerivation, aeson, base, base64-string, bcrypt, blaze-builder , bytestring, case-insensitive, cassava, containers, convertible , hasql, hasql-backend, hasql-postgres, heredoc, hlint, hspec - , hspec-wai, hspec-wai-json, HTTP, http-media, http-types, MissingH - , mtl, network, network-uri, optparse-applicative, packdeps - , process, QuickCheck, Ranged-sets, regex-base, regex-tdfa - , regex-tdfa-text, resource-pool, scientific, split + , hspec-wai, hspec-wai-json, HTTP, http-media, http-types, jwt + , MissingH, mtl, network, network-uri, optparse-applicative + , packdeps, process, QuickCheck, Ranged-sets, regex-base + , regex-tdfa, regex-tdfa-text, resource-pool, scientific, split , string-conversions, stringsearch, text, time, transformers , unordered-containers, vector, wai, wai-cors, wai-extra , wai-middleware-static, warp }: mkDerivation { pname = "postgrest"; - version = "0.2.8.0"; - sha256 = "1hmscdlg89r65q0i43ll22kb6iy9ryx6gmfxk795h8wsrk2f18sw"; - isLibrary = false; + version = "0.2.9.1"; + sha256 = "0rgvqhhpg6q99q1bdbk3dhnlad8nfrl3xihcg3c0j55dlx3q1860"; + isLibrary = true; isExecutable = true; buildDepends = [ aeson base base64-string bcrypt blaze-builder bytestring case-insensitive cassava containers convertible hasql hasql-backend - hasql-postgres HTTP http-types MissingH mtl network network-uri + hasql-postgres HTTP http-types jwt MissingH mtl network network-uri optparse-applicative Ranged-sets regex-base regex-tdfa regex-tdfa-text resource-pool scientific split string-conversions stringsearch text time transformers unordered-containers vector wai @@ -99246,14 +99256,13 @@ self: { aeson base base64-string bcrypt blaze-builder bytestring case-insensitive cassava containers convertible hasql hasql-backend hasql-postgres heredoc hlint hspec hspec-wai hspec-wai-json HTTP - http-media http-types MissingH mtl network network-uri + http-media http-types jwt MissingH mtl network network-uri optparse-applicative packdeps process QuickCheck Ranged-sets regex-base regex-tdfa regex-tdfa-text resource-pool scientific split string-conversions stringsearch text time transformers unordered-containers vector wai wai-cors wai-extra wai-middleware-static warp ]; - jailbreak = true; homepage = "https://github.com/begriffs/postgrest"; description = "REST API for any Postgres database"; license = stdenv.lib.licenses.mit; @@ -99297,7 +99306,6 @@ self: { homepage = "https://github.com/apiengine/postmark"; description = "Library for postmarkapp.com HTTP Api"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postmaster" = callPackage @@ -99695,7 +99703,6 @@ self: { ]; description = "Make presentations for data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "press" = callPackage @@ -99719,8 +99726,8 @@ self: { }: mkDerivation { pname = "presto-hdbc"; - version = "0.1.0.2"; - sha256 = "1la8v44lw9hpfv24mh3pj9x92pkcf0v6j3w52dg765j54zz1v76y"; + version = "0.1.0.3"; + sha256 = "1353nh8pq3ja4pw1fps0a46rfizph47l7k5gqlnkbz8w8b41miap"; buildDepends = [ aeson aeson-pretty base bytestring convertible either either-unwrap errors HDBC HTTP http-streams io-streams lens mtl network-uri safe @@ -100407,15 +100414,14 @@ self: { }: mkDerivation { pname = "profiteur"; - version = "0.2.0.0"; - sha256 = "0pgjd7a8xflnk0v2r2smc5qb7j8zsr5qrlxkdk36547plfjfvnv4"; + version = "0.2.0.1"; + sha256 = "17h690m78xsvbcxms2yxq7g9d1w5dx31q1m3a2m3i4gfwby1ndnf"; isLibrary = false; isExecutable = true; buildDepends = [ aeson attoparsec base bytestring filepath text unordered-containers vector ]; - jailbreak = true; homepage = "http://github.com/jaspervdj/profiteur"; description = "Treemap visualiser for GHC prof files"; license = stdenv.lib.licenses.bsd3; @@ -100439,8 +100445,8 @@ self: { }: mkDerivation { pname = "profunctors"; - version = "5.1"; - sha256 = "0jw563wi9j4l5521jc5lr1apx2msh987r0pbpn3zqhb8c8gqgrgw"; + version = "5.1.1"; + sha256 = "0lw2ipacpnp9yqmi8zsp01pzpn5hwj8af3y0f3079mddrmw48gw7"; buildDepends = [ base comonad distributive tagged transformers ]; homepage = "http://github.com/ekmett/profunctors/"; description = "Profunctors"; @@ -100597,6 +100603,7 @@ self: { homepage = "https://github.com/Erdwolf/prolog"; description = "A command line tool to visualize query resolution in Prolog"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prolog-graph-lib" = callPackage @@ -100609,6 +100616,7 @@ self: { homepage = "https://github.com/Erdwolf/prolog"; description = "Generating images of resolution trees for Prolog queries"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "promise" = callPackage @@ -100718,7 +100726,6 @@ self: { homepage = "http://github.com/deviant-logic/props"; description = "Reusable quickcheck properties"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prosper" = callPackage @@ -100737,7 +100744,6 @@ self: { homepage = "https://api.prosper.com"; description = "Bindings to the Prosper marketplace API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proteaaudio" = callPackage @@ -100953,7 +100959,6 @@ self: { buildDepends = [ base template-haskell time ]; description = "cpp-style built-in macros using Template Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "psqueues" = callPackage @@ -101206,7 +101211,6 @@ self: { extraLibraries = [ pulseaudio ]; description = "binding to Simple API of pulseaudio"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) pulseaudio;}; "punkt" = callPackage @@ -101793,20 +101797,21 @@ self: { homepage = "https://github.com/pvdbrand/quandl-api"; description = "Quandl.com API library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quantfin" = callPackage ({ mkDerivation, base, containers, mersenne-random-pure64, mtl - , random-fu, rvar, transformers, vector + , random, random-fu, random-source, rvar, transformers, vector }: mkDerivation { pname = "quantfin"; - version = "0.1.0.1"; - sha256 = "1rx8jrdhlqnbj28d2yi7vb3x1z7g5qrvzrhfx44zdiqlgw215f05"; + version = "0.1.0.2"; + sha256 = "1m6208c8gxbm95a99kk0chh62bk2zb1fmwrdd7fwl7zpwzr8iany"; + isLibrary = true; + isExecutable = true; buildDepends = [ - base containers mersenne-random-pure64 mtl random-fu rvar - transformers vector + base containers mersenne-random-pure64 mtl random random-fu + random-source rvar transformers vector ]; jailbreak = true; homepage = "https://github.com/boundedvariation/quantfin"; @@ -102391,11 +102396,10 @@ self: { }: mkDerivation { pname = "rainbow"; - version = "0.26.0.2"; - sha256 = "1v94dd9y38ayslii6bjg720dbrjg37wwm13v08g9clbazf122901"; + version = "0.26.0.4"; + sha256 = "1ic6163igf0c815crccss42czdhnrg3y8rfqr05wqy0m4vza0nx4"; buildDepends = [ base bytestring lens process text ]; testDepends = [ base bytestring lens process QuickCheck text ]; - jailbreak = true; homepage = "https://www.github.com/massysett/rainbow"; description = "Print text to terminal with colors and effects"; license = stdenv.lib.licenses.bsd3; @@ -102837,8 +102841,8 @@ self: { }: mkDerivation { pname = "rasterific-svg"; - version = "0.2"; - sha256 = "1m8mmvnfvpddbyllrjlv9nxm458ikdxyhf68pr9xf18fxaxsipsb"; + version = "0.2.2.1"; + sha256 = "1p8bpy9kh1j2lhczw8wyj1918h26yf7w7ii370g6m63szx6v1lj6"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -102846,7 +102850,6 @@ 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; }) {}; @@ -103171,7 +103174,6 @@ self: { homepage = "http://wiki.haskell.org/Reactive-banana"; description = "Library for functional reactive programming (FRP)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-banana-sdl" = callPackage @@ -103221,7 +103223,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Reactive-banana"; description = "Examples for the reactive-banana library, using wxHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-fieldtrip" = callPackage @@ -103988,7 +103989,6 @@ self: { homepage = "http://www.happstack.com/"; description = "Add support for using HSP with Reform"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-applicative" = callPackage @@ -104934,6 +104934,7 @@ self: { homepage = "http://repa.ouroborus.net"; description = "Bulk array representations and operators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-bytestring" = callPackage @@ -104951,15 +104952,18 @@ self: { }) {}; "repa-convert" = callPackage - ({ mkDerivation, base, primitive, vector }: + ({ mkDerivation, base, bytestring, double-conversion, primitive + , repa-scalar, vector + }: mkDerivation { pname = "repa-convert"; - version = "4.1.0.1"; - sha256 = "197lqlyvljbngnckw742kij7frsx1rwakfa13xwaij6gxmyz9zx6"; - buildDepends = [ base primitive vector ]; - jailbreak = true; + version = "4.2.0.1"; + sha256 = "0y7xjcbrm2g3rgppb9lqbj4m1l7bvir12gjg11a18fkl1mzdh89l"; + buildDepends = [ + base bytestring double-conversion primitive repa-scalar vector + ]; homepage = "http://repa.ouroborus.net"; - description = "Packing and unpacking binary data"; + description = "Packing and unpacking flat tables"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -105021,7 +105025,6 @@ self: { testDepends = [ base repa tasty tasty-hunit tasty-quickcheck ]; description = "Perform fft with repa via FFTW"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-flow" = callPackage @@ -105075,6 +105078,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "repa-scalar" = callPackage + ({ mkDerivation, base, bytestring, double-conversion, primitive + , vector + }: + mkDerivation { + pname = "repa-scalar"; + version = "4.2.0.1"; + sha256 = "1mby4xa0i2jrzhiyvayif6bwxsmfz1ibvigxw8kwxjd5hqc0y6f6"; + buildDepends = [ + base bytestring double-conversion primitive vector + ]; + homepage = "http://repa.ouroborus.net"; + description = "Scalar data types and conversions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "repa-series" = callPackage ({ mkDerivation, base, ghc, ghc-prim, vector }: mkDerivation { @@ -105391,7 +105410,6 @@ self: { homepage = "https://github.com/wowus/resource-effect/"; description = "A port of the package 'resourcet' for extensible effects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "resource-embed" = callPackage @@ -105505,6 +105523,7 @@ self: { homepage = "https://github.com/raptros/respond"; description = "process and route HTTP requests and generate responses on top of WAI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rest-client" = callPackage @@ -105516,8 +105535,8 @@ self: { }: mkDerivation { pname = "rest-client"; - version = "0.5.0.2"; - sha256 = "1sykmz3mms714sypkpbjhk6dapb0saqsvwjjxnr3cklxdhxhyvz6"; + version = "0.5.0.3"; + sha256 = "02lgdjn4800301w8cki2wyl65jzc4yp4gxrhz5lwv9jcy69gbkkb"; buildDepends = [ aeson-utils base bytestring case-insensitive data-default exceptions http-conduit http-types hxt hxt-pickle-utils @@ -105532,21 +105551,20 @@ self: { ({ mkDerivation, aeson, aeson-utils, base, bytestring , case-insensitive, either, errors, fclabels, HUnit, hxt , hxt-pickle-utils, json-schema, mtl, mtl-compat, multipart, random - , rest-stringmap, rest-types, safe, semigroups, split - , test-framework, test-framework-hunit, text, transformers - , transformers-compat, unordered-containers, uri-encode - , utf8-string, uuid + , rest-stringmap, rest-types, safe, split, test-framework + , test-framework-hunit, text, transformers, transformers-compat + , unordered-containers, uri-encode, utf8-string, uuid }: mkDerivation { pname = "rest-core"; - version = "0.35.1"; - sha256 = "16mzvbkv69i0kabjj214166rmsqqc0ga5ad1i7yhm6202s11fx4n"; + version = "0.36.0.1"; + sha256 = "0a4l1ll2a16ma1lzq7cdhrcf4ld8p40hysfkz2l4m80gf5khzmby"; buildDepends = [ aeson aeson-utils base bytestring case-insensitive either errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat multipart - random rest-stringmap rest-types safe semigroups split text - transformers transformers-compat unordered-containers uri-encode - utf8-string uuid + random rest-stringmap rest-types safe split text transformers + transformers-compat unordered-containers uri-encode utf8-string + uuid ]; testDepends = [ base bytestring HUnit mtl test-framework test-framework-hunit @@ -105558,21 +105576,20 @@ self: { "rest-example" = callPackage ({ mkDerivation, aeson, base, containers, filepath, generic-aeson - , hxt, json-schema, mtl, regular, regular-xmlpickler, rest-core - , rest-gen, safe, stm, text, time, transformers, transformers-base + , generic-xmlpickler, hxt, json-schema, mtl, rest-core, rest-gen + , safe, stm, text, time, transformers, transformers-base , transformers-compat, unordered-containers }: mkDerivation { pname = "rest-example"; - version = "0.2.0.1"; - sha256 = "0pc8q6ky8flh0rz4s3fl7fyharg1p026v689s8h709mcf5q6kvkf"; + version = "0.2.0.2"; + sha256 = "13mq7zhjwp57rials06kkj8aq400wapldl5mc35h1xynm396xmpi"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base containers filepath generic-aeson hxt json-schema mtl - regular regular-xmlpickler rest-core rest-gen safe stm text time - transformers transformers-base transformers-compat - unordered-containers + aeson base containers filepath generic-aeson generic-xmlpickler hxt + json-schema mtl rest-core rest-gen safe stm text time transformers + transformers-base transformers-compat unordered-containers ]; homepage = "http://www.github.com/silkapp/rest"; description = "Example project for rest"; @@ -105589,8 +105606,10 @@ self: { }: mkDerivation { pname = "rest-gen"; - version = "0.17.0.3"; - sha256 = "0hydifrpyzgd2kyrxxwzh7z5iiz0x3584nlgx8gzikyqab8gbk04"; + version = "0.17.0.4"; + revision = "1"; + sha256 = "1ycdpqscdc8rxpj1fv6bjj7bvi6jww010c2rvcs6b155jxwdg5l2"; + editedCabalFile = "b218da6eb2fd339d0d16ac67e441379824aaba7ef2b8b2cc3f9acbb88d7be778"; buildDepends = [ aeson base blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt json-schema @@ -105611,8 +105630,8 @@ self: { }: mkDerivation { pname = "rest-happstack"; - version = "0.2.10.7"; - sha256 = "17fqfax3whslip0knwr21f2h674nz5ayqk6947dryhglvwhsyn5v"; + version = "0.2.10.8"; + sha256 = "0n1rc1b9vdq83ilm2s9ac96jln89g0g0img1pwg991dbm30k3v7y"; buildDepends = [ base containers happstack-server mtl rest-core rest-gen utf8-string ]; @@ -105626,8 +105645,8 @@ self: { }: mkDerivation { pname = "rest-snap"; - version = "0.1.17.17"; - sha256 = "1q2w9p9g66fv4mq566895l15l8ywz7nl4bf0zlyf1ng64fmi9far"; + version = "0.1.17.18"; + sha256 = "0g8srn4b7nxyi98vn28q27li4mk7ypdgg9l66ba7z5h0bg8w2766"; buildDepends = [ base bytestring case-insensitive rest-core safe snap-core unordered-containers uri-encode utf8-string @@ -105653,17 +105672,17 @@ self: { }) {}; "rest-types" = callPackage - ({ mkDerivation, aeson, base, case-insensitive, generic-aeson, hxt - , json-schema, mtl, regular, regular-xmlpickler, rest-stringmap - , text, transformers, transformers-compat, uuid + ({ mkDerivation, aeson, base, case-insensitive, generic-aeson + , generic-xmlpickler, hxt, json-schema, mtl, rest-stringmap, text + , transformers, transformers-compat, uuid }: mkDerivation { pname = "rest-types"; - version = "1.13.1"; - sha256 = "09lyx0a4w1mp1ivcky3wnlhisp2a8sd3f37zcr5ckxi8sjmcvsli"; + version = "1.14"; + sha256 = "02pixhkym28c9jc5w4bf3fjvpcid9vha3f5qd2v4kny4hfq47ybq"; buildDepends = [ - aeson base case-insensitive generic-aeson hxt json-schema mtl - regular regular-xmlpickler rest-stringmap text transformers + aeson base case-insensitive generic-aeson generic-xmlpickler hxt + json-schema mtl rest-stringmap text transformers transformers-compat uuid ]; description = "Silk Rest Framework Types"; @@ -105677,10 +105696,8 @@ self: { }: mkDerivation { pname = "rest-wai"; - version = "0.1.0.7"; - revision = "1"; - sha256 = "0agvs26x26cgzls66jx7pj2qdn01snjr11rv7sd3x3h4g3ww375v"; - editedCabalFile = "1b15b246eb06e388c3ac37b6a7eb5697109f04f085a46ced92d9e4e809841981"; + version = "0.1.0.8"; + sha256 = "0r11y2rl0h2axnlqcqhdy7w0b3c207qbyhg60rr0rnm9vsqj5l5d"; buildDepends = [ base bytestring case-insensitive containers http-types mime-types mtl rest-core text unordered-containers wai @@ -105931,7 +105948,6 @@ self: { homepage = "https://github.com/jcristovao/reverse-geocoding"; description = "Simple reverse geocoding using OpenStreeMap"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reversi" = callPackage @@ -106386,7 +106402,6 @@ self: { homepage = "http://github.com/agrafix/rocksdb-haskell"; description = "Haskell bindings to RocksDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) rocksdb;}; "roguestar" = callPackage @@ -107006,7 +107021,6 @@ self: { homepage = "https://github.com/adamwalker/hrtlsdr"; description = "Bindings to librtlsdr"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) rtl-sdr;}; "rtorrent-rpc" = callPackage @@ -107111,7 +107125,6 @@ self: { homepage = "https://github.com/UU-ComputerScience/ruler"; description = "Ruler tool for UHC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ruler-core" = callPackage @@ -108008,8 +108021,8 @@ self: { }: mkDerivation { pname = "scalpel"; - version = "0.2.0"; - sha256 = "0bqnjnyjvhhj2lh8jr6cris5l4crwyql95rfzrvc95wvkb75jwzv"; + version = "0.2.0.1"; + sha256 = "13fg89klhw9lwirhglbn1cvky0gwaf0idanrvcrd9wv875kxisd4"; buildDepends = [ base bytestring curl regex-base regex-tdfa tagsoup text ]; @@ -108617,7 +108630,6 @@ self: { homepage = "https://github.com/agrafix/scotty-session"; description = "Adding session functionality to scotty"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-tls" = callPackage @@ -108856,7 +108868,6 @@ self: { extraLibraries = [ SDL2 SDL2_ttf ]; description = "Binding to libSDL2-ttf"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; "sdnv" = callPackage @@ -109234,6 +109245,7 @@ self: { ]; description = "Weakened partial isomorphisms, reversible computations"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "semigroupoid-extras" = callPackage @@ -109246,7 +109258,6 @@ self: { homepage = "http://github.com/ekmett/semigroupoid-extras"; description = "Semigroupoids that depend on PolyKinds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "semigroupoids" = callPackage @@ -109672,10 +109683,9 @@ self: { ({ mkDerivation, base, unix }: mkDerivation { pname = "serial"; - version = "0.2.6"; - sha256 = "17z0pkc0nz3hf9s68spbb6ijcx6b2dw4y50cavf5110aav59kik1"; + version = "0.2.7"; + sha256 = "1h52h8i28bhamp57q57ih1w9h26ih9g1l25gg9rhiwv5ykhy2vfq"; buildDepends = [ base unix ]; - jailbreak = true; description = "POSIX serial port wrapper"; license = "LGPL"; }) {}; @@ -110446,7 +110456,6 @@ self: { homepage = "https://github.com/samplecount/shake-language-c"; description = "Utilities for cross-compiling with Shake"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shake-minify" = callPackage @@ -111528,8 +111537,8 @@ self: { }: mkDerivation { pname = "simple-sendfile"; - version = "0.2.19"; - sha256 = "1qg97j4rm1wksdni29vrrra3rgff04afaadb58q8g1yy2w4lh5a5"; + version = "0.2.20"; + sha256 = "0fzxlj3nmlj9nyzl4ygn6q2rgwvcgjpkypp6cpka64bhqfrgqyb3"; buildDepends = [ base bytestring network unix ]; testDepends = [ base bytestring conduit conduit-extra directory hspec HUnit network @@ -111883,7 +111892,6 @@ self: { homepage = "http://www.cis.upenn.edu/~eir/packages/singletons"; description = "A framework for generating singleton types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sink" = callPackage @@ -111965,15 +111973,17 @@ self: { }) {}; "sized-types" = callPackage - ({ mkDerivation, array, base, containers, singletons }: + ({ mkDerivation, array, base, base-compat, containers, QuickCheck + , singletons + }: mkDerivation { pname = "sized-types"; - version = "0.5.0"; - sha256 = "1cvgw2plzgpddg2p74hylx499dv4hn2nc8s085mnayp5n9jkn8md"; + version = "0.5.1"; + sha256 = "1nwr92gy8031f18w367ys0l27q4qvpkrkikbj03m93q2i7y74ry7"; isLibrary = true; isExecutable = true; - buildDepends = [ array base containers singletons ]; - jailbreak = true; + buildDepends = [ array base base-compat containers singletons ]; + testDepends = [ base QuickCheck ]; homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools"; description = "Sized types in Haskell using the GHC Nat kind"; license = stdenv.lib.licenses.bsd3; @@ -112129,7 +112139,6 @@ self: { testDepends = [ base ]; description = "Bindings to the Slack RTM API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "slack-notify-haskell" = callPackage @@ -112233,7 +112242,6 @@ self: { homepage = "http://github.com/akc/sloane"; description = "A command line interface to Sloane's On-Line Encyclopedia of Integer Sequences"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "slot-lambda" = callPackage @@ -112599,8 +112607,8 @@ self: { }: mkDerivation { pname = "snap"; - version = "0.14.0.3"; - sha256 = "0v493iicmk4pg97bv4rr0kvrxvsvhizc9wylxbrqrn3q979bahas"; + version = "0.14.0.4"; + sha256 = "0z0w6dig658cbl6adwq738dr9z56a3sj8lfhh5zfnmmy7x1794xs"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -112611,7 +112619,6 @@ self: { stm syb template-haskell text time transformers unordered-containers vector vector-algorithms xmlhtml ]; - jailbreak = true; homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; license = stdenv.lib.licenses.bsd3; @@ -112711,7 +112718,9 @@ self: { mkDerivation { pname = "snap-core"; version = "0.9.7.0"; + revision = "1"; sha256 = "0ambk7q35v76ww62m4y6j45ga63c141zi3wxkgazybbazk5i36nw"; + editedCabalFile = "052dd91058bbdf948c75693679c257ae4511bcf8c46428f975d8d31e78e860a4"; buildDepends = [ attoparsec attoparsec-enumerator base blaze-builder blaze-builder-enumerator bytestring bytestring-mmap @@ -112719,7 +112728,6 @@ self: { hashable HUnit MonadCatchIO-transformers mtl random regex-posix text time unix unix-compat unordered-containers vector zlib-enum ]; - jailbreak = true; homepage = "http://snapframework.com/"; description = "Snap: A Haskell Web Framework (core interfaces and types)"; license = stdenv.lib.licenses.bsd3; @@ -112880,7 +112888,9 @@ self: { mkDerivation { pname = "snap-server"; version = "0.9.5.1"; + revision = "1"; sha256 = "18ryin6f315picrs2159sn2668266l3xchs7jb8isw0gp52273xg"; + editedCabalFile = "7909ad539e7d3f23f3c799d736d1a54d0a9098dd55fd6be75c13b57794bfaa5c"; buildDepends = [ attoparsec attoparsec-enumerator base blaze-builder blaze-builder-enumerator bytestring case-insensitive containers @@ -112888,7 +112898,6 @@ self: { old-locale snap-core text time unix unix-compat ]; configureFlags = [ "-fopenssl" ]; - jailbreak = true; homepage = "http://snapframework.com/"; description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -113104,7 +113113,6 @@ 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 @@ -113250,7 +113258,6 @@ self: { homepage = "https://github.com/ixmatus/snaplet-mandrill"; description = "Snap framework snaplet for the Mandrill API library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-mongoDB" = callPackage @@ -113371,15 +113378,14 @@ self: { mkDerivation { pname = "snaplet-postgresql-simple"; version = "0.6.0.2"; - revision = "1"; + revision = "2"; sha256 = "0xx69x9mkv6xyd7arnip12zzyq7hdcqbypgypalgsj6vcjb8i4mp"; - editedCabalFile = "35658dea054cbb2db7cb63fbe81a4a7c546f80645a056f357baf29e94096d21b"; + editedCabalFile = "cfc56ee20478bf05a650bdcb457b606a640daa71b84a3a2a3bdb8930dcbbeb7b"; buildDepends = [ base bytestring clientsession configurator errors lens 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; @@ -113400,7 +113406,6 @@ self: { homepage = "https://github.com/LukeHoersten/snaplet-postmark"; description = "Postmark snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-purescript" = callPackage @@ -114054,7 +114059,6 @@ self: { homepage = "https://github.com/mhwombat/som"; description = "Self-Organising Maps"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sonic-visualiser" = callPackage @@ -114107,7 +114111,6 @@ self: { homepage = "https://github.com/nfjinjing/sort-by-pinyin"; description = "Sort simplified Chinese by PinYin"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sorted" = callPackage @@ -114556,7 +114559,6 @@ self: { ]; description = "Computational combinatorial species"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "speculation" = callPackage @@ -114600,7 +114602,6 @@ self: { homepage = "https://github.com/gregwebs/haskell-spell-suggest"; description = "Spelling suggestion tool with library and command-line interfaces"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sphero" = callPackage @@ -115769,8 +115770,8 @@ self: { }: mkDerivation { pname = "stackage-upload"; - version = "0.1.0.4"; - sha256 = "12233xn9gjd7a7d75rpzf58r2fw86vcvhv0snkkj97y83mm4r3ga"; + version = "0.1.0.5"; + sha256 = "0fxkscyzpl6ph28100b0l663rjny9vp2jrhcca19dc0jzj0kfdgi"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -116488,9 +116489,10 @@ self: { mkDerivation { pname = "stm-lifted"; version = "0.1.0.0"; + revision = "1"; sha256 = "1x3yxxyik0vyh3p530msxh2a1aylmh8zab05qpq7nfl5m9v6v090"; + editedCabalFile = "d313721a31d8e7ccc725c3a1542f4ac3f8c84fbcad10094cd1067c133edc6c54"; buildDepends = [ base stm transformers ]; - jailbreak = true; description = "Software Transactional Memory lifted to MonadIO"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -117801,13 +117803,12 @@ self: { }: mkDerivation { pname = "svg-tree"; - version = "0.3"; - sha256 = "0r83c5422bk50k0s5sbcbzw808r9am1zy35dlny4y28hvljm1pad"; + version = "0.3.1"; + sha256 = "1fnj7d2nw4p9m46wp64gz99ssggxd0rz4737732hpk9vr5xq78lc"; buildDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml ]; - jailbreak = true; description = "SVG file loader and serializer"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -117939,7 +117940,6 @@ self: { testDepends = [ aeson base bytestring tasty tasty-hunit ]; description = "Implementation of swagger data model"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "swapper" = callPackage @@ -118206,19 +118206,19 @@ self: { "syncthing-hs" = callPackage ({ mkDerivation, aeson, base, bytestring, connection, containers , data-default, derive, either, exceptions, http-client - , http-client-tls, http-types, lens, old-locale - , quickcheck-instances, regex-posix, scientific, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers, unordered-containers - , vector, wreq + , http-client-tls, http-types, lens, quickcheck-instances + , regex-posix, scientific, tasty, tasty-hunit, tasty-quickcheck + , text, time, time-locale-compat, transformers + , unordered-containers, vector, wreq }: mkDerivation { pname = "syncthing-hs"; - version = "0.2.0.0"; - sha256 = "172jyv2lxq1ys7r2hcrria91s6k5fks2bqnd7whppln79g1nd7vi"; + version = "0.3.0.0"; + sha256 = "0mancdrf3miicjcsrszxgv5bnka9nvbcsynyw4ljn19c2mk2628r"; buildDepends = [ aeson base bytestring connection containers either exceptions - http-client http-client-tls lens old-locale regex-posix text time - transformers unordered-containers vector wreq + http-client http-client-tls lens regex-posix text time + time-locale-compat transformers unordered-containers vector wreq ]; testDepends = [ aeson base bytestring containers data-default derive either @@ -118274,7 +118274,6 @@ self: { homepage = "https://github.com/emilaxelsson/syntactic"; description = "Generic representation and manipulation of abstract syntax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "syntactical" = callPackage @@ -118303,6 +118302,7 @@ self: { ]; description = "Reversible parsing and pretty-printing"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "syntax-attoparsec" = callPackage @@ -118318,6 +118318,7 @@ self: { ]; description = "Syntax instances for Attoparsec"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "syntax-example" = callPackage @@ -118336,6 +118337,7 @@ self: { ]; description = "Example application using syntax, a library for abstract syntax descriptions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "syntax-example-json" = callPackage @@ -118354,6 +118356,7 @@ self: { ]; description = "Example JSON parser/pretty-printer"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "syntax-pretty" = callPackage @@ -118366,6 +118369,7 @@ self: { buildDepends = [ base pretty scientific semi-iso syntax text ]; description = "Syntax instance for pretty, the pretty printing library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "syntax-printer" = callPackage @@ -118383,6 +118387,7 @@ self: { jailbreak = true; description = "Text and ByteString printers for 'syntax'"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "syntax-trees" = callPackage @@ -119997,6 +120002,7 @@ self: { buildDepends = [ base containers fgl graphviz ]; description = "Graphical modeling tools for sequential teams"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "teeth" = callPackage @@ -120324,8 +120330,8 @@ self: { }: mkDerivation { pname = "term-rewriting"; - version = "0.1.2.2"; - sha256 = "0j69a4vvsv5lbh8zx3908bpk76lmg871glm6hqv0nq4xzircp184"; + version = "0.2"; + sha256 = "07axcgr8llrj8icaysi1awq29p8vgpakvv56shvjrcgjf9ar0m11"; buildDepends = [ ansi-wl-pprint array base containers mtl multiset parsec union-find-array @@ -120664,7 +120670,6 @@ self: { ]; description = "Template Haskell for test framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-invariant" = callPackage @@ -121300,7 +121305,6 @@ self: { homepage = "https://github.com/RyanGlScott/text-show-instances"; description = "Additional instances for text-show"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-stream-decode" = callPackage @@ -121621,7 +121625,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 @@ -121693,7 +121696,6 @@ self: { homepage = "http://github.com/bennofs/th-lift-instances/"; description = "Lift instances for template-haskell for common data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-orphans" = callPackage @@ -122402,7 +122404,6 @@ self: { jailbreak = true; description = "Nice API for a Slackbot"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tighttp" = callPackage @@ -122672,6 +122673,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "timeconsole" = callPackage + ({ mkDerivation, base, process, time }: + mkDerivation { + pname = "timeconsole"; + version = "0.1.0.0"; + sha256 = "0zmrysri8hxxvr4dffmawv5cb8lyz92w8ixfj5kah8ya2p422yc0"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base process time ]; + jailbreak = true; + description = "Time commands by lines of STDOUT"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "timeit" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -122787,7 +122802,6 @@ self: { ]; description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timers" = callPackage @@ -123244,7 +123258,6 @@ self: { homepage = "https://github.com/hvr/token-bucket"; description = "Rate limiter using lazy bucket algorithm"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tokenify" = callPackage @@ -123269,7 +123282,6 @@ self: { homepage = "https://bitbucket.org/gchrupala/lingo/overview"; description = "Simple tokenizer for English text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "toktok" = callPackage @@ -124318,6 +124330,7 @@ self: { buildDepends = [ base HList template-haskell ]; description = "Morph between tuples, or convert them from and to HLists"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tuple-th" = callPackage @@ -124442,7 +124455,6 @@ self: { jailbreak = true; description = "Used as Lab Assignments Environment at the University of Twente"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twentefp-eventloop-trees" = callPackage @@ -124465,7 +124477,6 @@ self: { buildDepends = [ base twentefp-eventloop-graphics ]; description = "Lab Assignments Environment at Univeriteit Twente"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twentefp-number" = callPackage @@ -124504,7 +124515,6 @@ self: { buildDepends = [ base twentefp-eventloop-graphics ]; description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and ParseTree"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twentefp-websockets" = callPackage @@ -124524,7 +124534,6 @@ self: { jailbreak = true; description = "A fork of the popular websockets package. It is used for the practical assignments of the University of Twente. A sensible and clean way to write WebSocket-capable servers in Haskell."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twhs" = callPackage @@ -125930,7 +125939,6 @@ self: { homepage = "http://github.com/lambdageek/unbound-generics"; description = "Support for programming with names and binders using GHC Generics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unbounded-delays" = callPackage @@ -126563,6 +126571,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unix-fcntl" = callPackage + ({ mkDerivation, base, foreign-var, unix }: + mkDerivation { + pname = "unix-fcntl"; + version = "0.0.0"; + sha256 = "18rjz14x1mbwdppf18gv3x4jwvz68bb2n1b11ygck60yl4pqbhb9"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base foreign-var unix ]; + homepage = "https://github.com/maoe/unix-fcntl"; + description = "Comprehensive bindings to fcntl(2)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "unix-handle" = callPackage ({ mkDerivation, base, unix }: mkDerivation { @@ -126856,6 +126878,7 @@ self: { homepage = "https://github.com/thomaseding/up"; description = "Command line tool to generate pathnames to facilitate moving upward in a file system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "up-grade" = callPackage @@ -127527,7 +127550,6 @@ self: { homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; description = "Parse command line options using uu-interleave and uu-parsinglib"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uu-parsinglib" = callPackage @@ -127848,6 +127870,7 @@ self: { jailbreak = true; description = "A library for transforming vacuum graphs into GraphViz output"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vacuum-opengl" = callPackage @@ -127985,7 +128008,6 @@ self: { homepage = "https://github.com/mavenraven/validations"; description = "A nice way to define field validations in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "value-supply" = callPackage @@ -128017,6 +128039,7 @@ self: { homepage = "https://github.com/benzrf/vampire"; description = "Analyze and visualize expression trees"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "var" = callPackage @@ -128266,7 +128289,6 @@ self: { homepage = "http://github.com/cpdurham/vect-floating-accelerate"; description = "Accelerate instances for vect-floating types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vect-opengl" = callPackage @@ -128771,7 +128793,6 @@ self: { extraLibraries = [ ncurses ]; description = "An MPD client with vim-like key bindings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) ncurses;}; "vintage-basic" = callPackage @@ -128924,6 +128945,7 @@ self: { homepage = "http://github.com/zsol/visual-graphrewrite/"; description = "Visualize the graph-rewrite steps of a Haskell program"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "visual-prof" = callPackage @@ -129182,6 +129204,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "waddle" = callPackage + ({ mkDerivation, base, binary, bytestring, case-insensitive + , containers + }: + mkDerivation { + pname = "waddle"; + version = "0.1.0.2"; + sha256 = "00c6yd2ivrlgwp90q2p4s2ci4j4g40p0qsl29skg4jzw13rncchp"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base binary bytestring case-insensitive containers + ]; + jailbreak = true; + description = "WAD file utilities"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, hspec, http-types , network, text, vault @@ -129309,7 +129349,6 @@ self: { homepage = "https://github.com/singpolyma/wai-digestive-functors"; description = "Helpers to bind digestive-functors onto wai requests"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-dispatch" = callPackage @@ -129891,7 +129930,6 @@ self: { ]; description = "WAI Middleware for Request Throttling"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-predicates" = callPackage @@ -130230,24 +130268,23 @@ self: { , bytestring, case-insensitive, doctest, ghc-prim, hashable, hspec , HTTP, http-date, http-types, HUnit, iproute, lifted-base, network , old-locale, QuickCheck, simple-sendfile, streaming-commons, text - , time, transformers, unix, unix-compat, vault, void, wai + , time, transformers, unix, unix-compat, vault, wai }: mkDerivation { pname = "warp"; - version = "3.0.13"; - sha256 = "0ggjbkgxzrvi7smjvrprr07c49n6d3s21jqnjc9l4ss3f3nd7699"; + version = "3.0.13.1"; + sha256 = "17vik5xf2amyi4pwq7wfia2a6f1pksa4ll155hbhkndhbwszvrkc"; buildDepends = [ array auto-update base blaze-builder bytestring case-insensitive ghc-prim hashable http-date http-types iproute network - simple-sendfile streaming-commons text unix unix-compat vault void - wai + simple-sendfile streaming-commons text unix unix-compat vault wai ]; testDepends = [ array async auto-update base blaze-builder bytestring case-insensitive doctest ghc-prim hashable hspec HTTP http-date http-types HUnit iproute lifted-base network old-locale QuickCheck simple-sendfile streaming-commons text time transformers unix - unix-compat vault void wai + unix-compat vault wai ]; homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; @@ -130569,7 +130606,6 @@ self: { homepage = "http://hub.darcs.net/ertes/web-page"; description = "Monoidally construct web pages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "web-plugins" = callPackage @@ -130770,7 +130806,6 @@ self: { 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 @@ -130805,7 +130840,6 @@ self: { homepage = "https://github.com/webcrank/webcrank-wai"; description = "Build a WAI Application from Webcrank Resources"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webdriver" = callPackage @@ -131536,7 +131570,6 @@ self: { homepage = "http://github.com/ekmett/wl-pprint-terminfo/"; description = "A color pretty printer with terminfo support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wl-pprint-text" = callPackage @@ -131851,7 +131884,6 @@ self: { homepage = "http://www.serpentine.com/wreq"; description = "An easy-to-use HTTP client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wreq-sb" = callPackage @@ -131926,7 +131958,6 @@ self: { jailbreak = true; description = "A small tool to list, add and remove webseeds from a torrent file"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wtk" = callPackage @@ -133762,7 +133793,6 @@ self: { homepage = "http://github.com/alanz/xtc"; description = "eXtended & Typed Controls for wxHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xtest" = callPackage @@ -133882,7 +133912,6 @@ self: { homepage = "http://github.com/snoyberg/yackage"; description = "Personal Hackage replacement for testing new packages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yahoo-finance-conduit" = callPackage @@ -133899,7 +133928,6 @@ self: { jailbreak = true; description = "Streaming aproach to the yahoo finance api"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yahoo-web-search" = callPackage @@ -134378,8 +134406,8 @@ self: { }: mkDerivation { pname = "yesod-angular-ui"; - version = "0.1.0.1"; - sha256 = "1kj2lbg57sp4bsl4ri3p73gr5a2k17lx7gf01ay7x0960gj5ql92"; + version = "0.1.1.0"; + sha256 = "08rr8w4bibjjchgfp1j9gywldr8v10vg8ddmkxj6dx5b6w2kvm8k"; buildDepends = [ base blaze-html containers directory hjsmin mtl resourcet shakespeare template-haskell text transformers yesod yesod-core @@ -134590,7 +134618,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "OAuth Authentication for Yesod"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-oauth2" = callPackage @@ -134680,8 +134707,8 @@ self: { }: mkDerivation { pname = "yesod-bin"; - version = "1.4.9.1"; - sha256 = "0ja7ayl1vmbjrlxngfvamfbw0cnqappdv0fqm6kdfhd8phpp9x94"; + version = "1.4.9.2"; + sha256 = "0bbr9bjgj75jh8q9jzv9h1ivz87svz3j02hwphq32487f3682gd0"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -134922,7 +134949,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 @@ -135781,7 +135807,6 @@ self: { homepage = "https://yi-editor.github.io"; description = "The Haskell-Scriptable Editor"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-contrib" = callPackage @@ -135884,7 +135909,6 @@ self: { homepage = "https://github.com/Fuuzetsu/yi-monokai"; description = "Monokai colour theme for the Yi text editor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-rope" = callPackage @@ -135915,7 +135939,6 @@ self: { homepage = "https://github.com/yi-editor/yi-snippet"; description = "Snippet support for Yi"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-spolsky" = callPackage @@ -135929,7 +135952,6 @@ self: { homepage = "https://github.com/melrief/yi-spolsky"; description = "Spolsky colour theme for the Yi text editor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-vty" = callPackage From 493663d785eff00cc3c2a9a6a580e26bfec301d8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 May 2015 12:13:13 +0200 Subject: [PATCH 487/615] jailbreak-cabal: always build the tool with Cabal 1.20 This change mitigates the effects of https://github.com/peti/jailbreak-cabal/issues/9. --- .../development/haskell-modules/configuration-ghc-7.0.x.nix | 6 ++++-- .../haskell-modules/configuration-ghc-7.10.x.nix | 4 ++-- .../development/haskell-modules/configuration-ghc-7.2.x.nix | 6 ++++-- .../development/haskell-modules/configuration-ghc-7.4.x.nix | 4 ++-- .../development/haskell-modules/configuration-ghc-7.6.x.nix | 4 ++-- .../development/haskell-modules/configuration-ghc-7.8.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-head.nix | 4 ++-- 7 files changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index 6e1754c5f3bf..f6b2b2304b93 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -50,8 +50,10 @@ self: super: { Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6; cabal-install = self.cabal-install_1_18_1_0; - # Needs Cabal >= 1.18.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; }; + # https://github.com/peti/jailbreak-cabal/issues/9 + jailbreak-cabal = super.jailbreak-cabal.override { + Cabal = dontJailbreak (self.Cabal_1_20_0_3.override { deepseq = dontJailbreak self.deepseq_1_3_0_1; }); + }; # Haddock chokes on the prologue from the cabal file. ChasingBottoms = dontHaddock super.ChasingBottoms; 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 1d7eee6d3a44..66e2f8d4299f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -41,8 +41,8 @@ self: super: { # Cabal_1_22_1_1 requires filepath >=1 && <1.4 cabal-install = dontCheck (super.cabal-install.override { Cabal = null; }); - # We have Cabal 1.22.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; + # Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9. + jailbreak-cabal = pkgs.haskell.packages.ghc784.jailbreak-cabal; # GHC 7.10.x's Haddock binary cannot generate hoogle files. # https://ghc.haskell.org/trac/ghc/ticket/9921 diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index 4a8d4242bdc9..98bad4fa1be0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -50,8 +50,10 @@ self: super: { # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; - # Needs Cabal >= 1.18.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; }; + # https://github.com/peti/jailbreak-cabal/issues/9 + jailbreak-cabal = super.jailbreak-cabal.override { + Cabal = dontJailbreak (self.Cabal_1_20_0_3.override { deepseq = dontJailbreak self.deepseq_1_3_0_1; }); + }; # Haddock chokes on the prologue from the cabal file. ChasingBottoms = dontHaddock super.ChasingBottoms; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index 56f1edb66201..88fa300e2e7f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -43,8 +43,8 @@ self: super: { # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; - # Needs Cabal >= 1.18.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; }; + # https://github.com/peti/jailbreak-cabal/issues/9 + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_3; }; # Haddock chokes on the prologue from the cabal file. ChasingBottoms = dontHaddock super.ChasingBottoms; 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 0970108eef7f..2ee401054398 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -45,8 +45,8 @@ self: super: { # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; - # Needs Cabal >= 1.18.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; }; + # https://github.com/peti/jailbreak-cabal/issues/9 + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_3; }; # Haddock chokes on the prologue from the cabal file. ChasingBottoms = dontHaddock super.ChasingBottoms; 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 b7430c455b1c..8c5b399e68c0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -37,6 +37,9 @@ self: super: { unix = null; xhtml = null; + # https://github.com/peti/jailbreak-cabal/issues/9 + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_3; }; + # mtl 2.2.x needs the latest transformers. mtl_2_2_1 = super.mtl.override { transformers = self.transformers_0_4_3_0; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index cef72a2b1884..291f050e1746 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -33,8 +33,8 @@ self: super: { unix = null; xhtml = null; - # We have Cabal 1.22.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; + # Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9. + jailbreak-cabal = pkgs.haskell.packages.ghc784.jailbreak-cabal; # GHC 7.10.x's Haddock binary cannot generate hoogle files. # https://ghc.haskell.org/trac/ghc/ticket/9921 From bf468dac2b09cac7e9fc57adfe06da4512972ddd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 19 May 2015 11:47:27 +0200 Subject: [PATCH 488/615] haskell-HList: the build errors have been fixed upstream --- .../configuration-ghc-7.10.x.nix | 30 +------------------ 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 66e2f8d4299f..7a73731e2c84 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -180,35 +180,7 @@ self: super: { cubical = dontDistribute super.cubical; # contacted maintainer by e-mail - HList = markBrokenVersion "0.3.4.1" super.HList; - AspectAG = dontDistribute super.AspectAG; - Rlang-QQ = dontDistribute super.Rlang-QQ; - SyntaxMacros = dontDistribute super.SyntaxMacros; - expand = dontDistribute super.expand; - functional-arrow = dontDistribute super.functional-arrow; - guess-combinator = dontDistribute super.guess-combinator; - ihaskell-rlangqq = dontDistribute super.ihaskell-rlangqq; - ipopt-hs = dontDistribute super.ipopt-hs; - murder = dontDistribute super.murder; - netcore = dontDistribute super.netcore; - nettle-frp = dontDistribute super.nettle-frp; - nettle-netkit = dontDistribute super.nettle-netkit; - nettle-openflow = dontDistribute super.nettle-openflow; - oberon0 = dontDistribute super.oberon0; - poly-arity = dontDistribute super.poly-arity; - respond = dontDistribute super.respond; - semi-iso = dontDistribute super.semi-iso; - syntax = dontDistribute super.syntax; - syntax-attoparsec = dontDistribute super.syntax-attoparsec; - syntax-example = dontDistribute super.syntax-example; - syntax-example-json = dontDistribute super.syntax-example-json; - syntax-pretty = dontDistribute super.syntax-pretty; - syntax-printer = dontDistribute super.syntax-printer; - tuple-hlist = dontDistribute super.tuple-hlist; - tuple-morph = dontDistribute super.tuple-morph; - - # contacted maintainer by e-mail - cmdlib = markBroken super.cmdlib; + cmdlib = markBrokenVersion "0.3.5" super.cmdlib; darcs-fastconvert = dontDistribute super.darcs-fastconvert; ivory-backend-c = dontDistribute super.ivory-backend-c; ivory-bitdata = dontDistribute super.ivory-bitdata; From 743c265797b17bd2a95be07f327d5f9f79fd05f9 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 19 May 2015 16:13:01 +0300 Subject: [PATCH 489/615] haskell-pandoc: use ordinary jailbreak --- pkgs/development/haskell-modules/configuration-common.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a7b72fa7f9a0..49774ab2738d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -680,11 +680,8 @@ 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/2156 - pandoc = overrideCabal (dontJailbreak super.pandoc) (drv: { - doCheck = false; # https://github.com/jgm/pandoc/issues/2036 - patchPhase = "sed -i -e 's|zlib .*,|zlib,|' -e 's|QuickCheck .*,|QuickCheck,|' pandoc.cabal"; - }); + # https://github.com/jgm/pandoc/issues/2036 + pandoc = dontCheck super.pandoc; # Broken by GLUT update. Monadius = markBroken super.Monadius; From 03f9f0a634c391d09aebf4b5e94ae6d3e70688f2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 19 May 2015 16:13:35 +0300 Subject: [PATCH 490/615] haskell-cheapskate: not broken now --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 49774ab2738d..36cc0fd48591 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -807,10 +807,6 @@ self: super: { # Obsolete for GHC versions after GHC 6.10.x. utf8-prelude = markBroken super.utf8-prelude; - # https://github.com/jgm/cheapskate/issues/11 - cheapskate = markBrokenVersion "0.1.0.3" super.cheapskate; - lit = dontDistribute super.lit; - # https://github.com/snapframework/snap/issues/148 snap = overrideCabal super.snap (drv: { patchPhase = "sed -i -e 's|attoparsec.*>=.*,|attoparsec,|' -e 's|lens.*>=.*|lens|' snap.cabal"; From 7e55534e8d1da6054dd9934de97e293c3005fb57 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 19 May 2015 16:14:14 +0300 Subject: [PATCH 491/615] haskell-idris: fix build --- .../haskell-modules/configuration-ghc-7.10.x.nix | 13 +++++++++++++ .../haskell-modules/configuration-ghc-7.8.x.nix | 3 +++ 2 files changed, 16 insertions(+) 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 7a73731e2c84..297c849d650c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -48,6 +48,19 @@ self: super: { # https://ghc.haskell.org/trac/ghc/ticket/9921 mkDerivation = drv: super.mkDerivation (drv // { doHoogle = false; }); + idris = + let idris' = overrideCabal super.idris (drv: { + # "idris" binary cannot find Idris library otherwise while building. + # After installing it's completely fine though. + # Seems like Nix-specific issue so not reported. + preBuild = '' + export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH + ''; + }); + in idris'.overrideScope (self: super: { + zlib = self.zlib_0_5_4_2; + }); + Extra = appendPatch super.Extra (pkgs.fetchpatch { url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch"; sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f"; 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 8c5b399e68c0..84994bc683fb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -78,6 +78,9 @@ self: super: { ghc-exactprint = dontDistribute super.ghc-exactprint; ghc-typelits-natnormalise = dontDistribute super.ghc-typelits-natnormalise; + # Needs directory >= 1.2.2.0. + idris = markBroken super.idris; + # Newer versions require transformers 0.4.x. seqid = super.seqid_0_1_0; seqid-streams = super.seqid-streams_0_1_0; From f26b51e00e498f8c238c54840f2f752797f30b3a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 May 2015 12:22:57 +0200 Subject: [PATCH 492/615] haskell-language-glsl: build has been fixed upstream --- .../development/haskell-modules/configuration-ghc-7.10.x.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 297c849d650c..b1bd3fda7fe1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -66,11 +66,6 @@ self: super: { sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f"; }); - language-glsl = appendPatch super.language-glsl (pkgs.fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/noteed/language-glsl/pull/10.patch"; - sha256 = "1d8dmfqw9y7v7dlszb7l3wp0vj77j950z2r3r0ar9mcvyrmfm4in"; - }); - # haddock: No input file(s). nats = dontHaddock super.nats; bytestring-builder = dontHaddock super.bytestring-builder; From 0a85cee798b2819937d015b59b739ccfcd960428 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 May 2015 11:47:34 +0200 Subject: [PATCH 493/615] haskell-curlhs: disable failing test suite --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 36cc0fd48591..166d15e5405b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -823,4 +823,7 @@ self: super: { # https://github.com/kolmodin/binary/issues/74 binary_0_7_4_0 = dontCheck super.binary_0_7_4_0; + # https://github.com/kkardzis/curlhs/issues/6 + curlhs = dontCheck super.curlhs; + } From 9b9d94def48ed6dcb39c07c3ad6ffa8db27836af Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 May 2015 11:56:01 +0200 Subject: [PATCH 494/615] Disable builds for broken Haskell packages lens-action and servant-server. --- .../haskell-modules/configuration-common.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 166d15e5405b..322ff8268b58 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -826,4 +826,14 @@ self: super: { # https://github.com/kkardzis/curlhs/issues/6 curlhs = dontCheck super.curlhs; + # https://github.com/ekmett/lens-action/issues/5 + lens-action = markBroken super.lens-action; + aws-kinesis-client = markBroken super.aws-kinesis-client; + + # https://github.com/haskell-servant/servant-server/issues/45 + servant-server = markBroken super.servant-server; + servant-client = dontDistribute super.servant-client; + servant-jquery = dontDistribute super.servant-jquery; + language-puppet = dontDistribute super.language-puppet; + } From 0c35edb25c80be61be50e2fb8ad1195a573d762e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 May 2015 11:56:21 +0200 Subject: [PATCH 495/615] haskell-wuss: test suite needs network access --> disable to fix the build --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 322ff8268b58..628ffcfa4b71 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -315,6 +315,7 @@ self: super: { warp = dontCheck super.warp; # http://hydra.cryp.to/build/501073/nixlog/5/raw wreq = dontCheck super.wreq; # http://hydra.cryp.to/build/501895/nixlog/1/raw wreq-sb = dontCheck super.wreq-sb; # http://hydra.cryp.to/build/783948/log/raw + wuss = dontCheck super.wuss; # http://hydra.cryp.to/build/875964/nixlog/2/raw # https://github.com/NICTA/digit/issues/3 digit = dontCheck super.digit; From 71aaebc954da23f5084614f23d223914a956f129 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 21 May 2015 15:24:05 +0200 Subject: [PATCH 496/615] thrust: fix build --- pkgs/development/tools/thrust/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index 02b21b3569f8..7f50b816cc19 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -7,7 +7,7 @@ let thrustEnv = buildEnv { name = "env-thrust"; paths = [ - stdenv.cc.gcc glib dbus gtk atk pango freetype fontconfig gdk_pixbuf + stdenv.cc.cc glib dbus gtk atk pango freetype fontconfig gdk_pixbuf cairo cups expat alsaLib nspr gconf nss xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr xlibs.libXcursor libcap From 16a745fbb99c3bd003d7c5d410e2c05c565abebd Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 21 May 2015 15:41:06 +0200 Subject: [PATCH 497/615] libs3: fix meta attributes --- pkgs/development/libraries/libs3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix index 3d8699918e16..62970b719048 100644 --- a/pkgs/development/libraries/libs3/default.nix +++ b/pkgs/development/libraries/libs3/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = https://github.com/bji/libs3; - description = "a library for interfacing with amazon s3"; - licenses = licenses.gpl3; + description = "A library for interfacing with amazon s3"; + license = licenses.gpl3; platforms = platforms.unix; }; } From b5820a5ebd034126d5d7d8c8cc60aa2d7a7c1b87 Mon Sep 17 00:00:00 2001 From: rushmorem Date: Sat, 16 May 2015 20:48:13 +0200 Subject: [PATCH 498/615] Update Marathon module The new module makes it possible to pass extra commandline arguments to Marathon as well as environment variables. --- .../doc/manual/release-notes/rl-unstable.xml | 1 + nixos/modules/misc/ids.nix | 2 - .../modules/services/scheduling/marathon.nix | 51 +++++++++++++++---- 3 files changed, 42 insertions(+), 12 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index c4691aa663f4..581c530866f0 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -17,6 +17,7 @@ brltty +marathon diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 0039ca74ba85..c47f20ad3111 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -196,7 +196,6 @@ nylon = 168; apache-kafka = 169; panamax = 170; - marathon = 171; exim = 172; #fleet = 173; # unused #input = 174; # unused @@ -390,7 +389,6 @@ gitlab = 165; nylon = 168; panamax = 170; - #marathon = 171; # unused exim = 172; fleet = 173; input = 174; diff --git a/nixos/modules/services/scheduling/marathon.nix b/nixos/modules/services/scheduling/marathon.nix index 8513d1174c38..ab93334f5fc9 100644 --- a/nixos/modules/services/scheduling/marathon.nix +++ b/nixos/modules/services/scheduling/marathon.nix @@ -12,27 +12,56 @@ in { options.services.marathon = { enable = mkOption { - description = "Whether to enable the marathon mesos framework."; - default = false; type = types.uniq types.bool; + default = false; + description = '' + Whether to enable the marathon mesos framework. + ''; }; httpPort = mkOption { - description = "Marathon listening port"; - default = 8080; type = types.int; + default = 8080; + description = '' + Marathon listening port for HTTP connections. + ''; }; master = mkOption { - description = "Marathon mesos master zookeeper address"; - default = "zk://${head cfg.zookeeperHosts}/mesos"; type = types.str; + default = "zk://${concatStringsSep "," cfg.zookeeperHosts}/mesos"; + example = "zk://1.2.3.4:2181,2.3.4.5:2181,3.4.5.6:2181/mesos"; + description = '' + Mesos master address. See for details. + ''; }; zookeeperHosts = mkOption { - description = "Marathon mesos zookepper addresses"; - default = [ "localhost:2181" ]; type = types.listOf types.str; + default = [ "localhost:2181" ]; + example = [ "1.2.3.4:2181" "2.3.4.5:2181" "3.4.5.6:2181" ]; + description = '' + ZooKeeper hosts' addresses. + ''; + }; + + extraCmdLineOptions = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "--https_port=8443" "--zk_timeout=10000" "--marathon_store_timeout=2000" ]; + description = '' + Extra command line options to pass to Marathon. + See for all possible flags. + ''; + }; + + environment = mkOption { + default = { }; + type = types.attrs; + example = { JAVA_OPTS = "-Xmx512m"; MESOSPHERE_HTTP_CREDENTIALS = "username:password"; }; + description = '' + Environment variables passed to Marathon. + ''; }; }; @@ -41,17 +70,19 @@ in { config = mkIf cfg.enable { systemd.services.marathon = { description = "Marathon Service"; + environment = cfg.environment; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" "zookeeper.service" "mesos-master.service" "mesos-slave.service" ]; serviceConfig = { - ExecStart = "${pkgs.marathon}/bin/marathon --master ${cfg.master} --zk zk://${head cfg.zookeeperHosts}/marathon"; + ExecStart = "${pkgs.marathon}/bin/marathon --master ${cfg.master} --zk zk://${concatStringsSep "," cfg.zookeeperHosts}/marathon --http_port ${toString cfg.httpPort} ${concatStringsSep " " cfg.extraCmdLineOptions}"; User = "marathon"; + Restart = "always"; + RestartSec = "2"; }; }; users.extraUsers.marathon = { - uid = config.ids.uids.marathon; description = "Marathon mesos framework user"; }; }; From ee4096be8c19fd7e5508e5c602f1183e7e7046c2 Mon Sep 17 00:00:00 2001 From: Joel Moberg Date: Thu, 21 May 2015 16:43:07 +0200 Subject: [PATCH 499/615] graph-tool: enable openmp --- pkgs/development/python-modules/graph-tool/2.x.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d3b023704604..46571978a6d3 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; preConfigure = '' - configureFlags="--with-python-module-path=$out/${python.sitePackages}" + configureFlags="--with-python-module-path=$out/${python.sitePackages} --enable-openmp" ''; buildInputs = [ automake m4 pkgconfig makeWrapper ]; From 725005b89f19f50ec960b516e85b07dc9edfeed7 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 21 May 2015 10:55:00 -0500 Subject: [PATCH 500/615] emacs24Macport: Upgrade Mac Port patch to 5.8 --- pkgs/applications/editors/emacs-24/macport-24.5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix index db0d05584e1c..a9f3e53fb595 100644 --- a/pkgs/applications/editors/emacs-24/macport-24.5.nix +++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { emacsName = "emacs-24.5"; - name = "${emacsName}-mac-5.7"; + name = "${emacsName}-mac-5.8"; #builder = ./builder.sh; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; - sha256 = "1a86l3556h24x9ml6r8n6xbrxymb9gr38sicny3f0m281myhlsvv"; + sha256 = "0ljhrag5lag8i72xfsmgk9lndqv0b3sahyyd48svj6jlg4jachir"; }; buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ]; From 7d4b5d04c8e6cc20b0ba3bfe82e307691aa4a3d2 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 21 May 2015 10:55:17 -0500 Subject: [PATCH 501/615] bedrock: Change build to use "src native" --- pkgs/development/coq-modules/bedrock/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/coq-modules/bedrock/default.nix b/pkgs/development/coq-modules/bedrock/default.nix index 92a3d16963b6..fc3c16d00492 100644 --- a/pkgs/development/coq-modules/bedrock/default.nix +++ b/pkgs/development/coq-modules/bedrock/default.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { buildPhase = '' make -j$NIX_BUILD_CORES -C src/reification make -j$NIX_BUILD_CORES -C src + make -j$NIX_BUILD_CORES -C src native + # make -j$NIX_BUILD_CORES -C platform + # make -j$NIX_BUILD_CORES -C platform -f Makefile.cito ''; installPhase = '' From 597aebc94d1d9cdea387b83cd49f272df63e2fa4 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 21 May 2015 10:55:54 -0500 Subject: [PATCH 502/615] libgcrypt: Set libpcap to null on Darwin --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34584ef005f7..fca6146a14ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6658,7 +6658,9 @@ let libftdi1 = callPackage ../development/libraries/libftdi/1.x.nix { }; - libgcrypt = callPackage ../development/libraries/libgcrypt { }; + libgcrypt = callPackage ../development/libraries/libgcrypt { + libcap = if stdenv.isDarwin then null else pkgs.libcap; + }; libgdiplus = callPackage ../development/libraries/libgdiplus { }; From aca9050ad9af744856c59f88cca029bec4c5cb3a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 21 May 2015 18:08:48 +0300 Subject: [PATCH 503/615] Use 32-bit Wine for Pipelight --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fca6146a14ac..c662b413caa4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7474,7 +7474,9 @@ let physfs = callPackage ../development/libraries/physfs { }; - pipelight = callPackage ../tools/misc/pipelight { }; + pipelight = callPackage ../tools/misc/pipelight { + wineStaging = pkgsi686Linux.wineStaging; + }; pkcs11helper = callPackage ../development/libraries/pkcs11helper { }; From 86da6fae7431c73b8314a898126a4c329bfcf137 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 21 May 2015 19:47:03 +0300 Subject: [PATCH 504/615] Update fltk to 1.3.3; apparently it includes most of the old patch now --- pkgs/development/libraries/fltk/fltk13.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/fltk/fltk13.nix b/pkgs/development/libraries/fltk/fltk13.nix index 8fb4d40b1dba..df89482536f0 100644 --- a/pkgs/development/libraries/fltk/fltk13.nix +++ b/pkgs/development/libraries/fltk/fltk13.nix @@ -6,13 +6,13 @@ let inherit (composableDerivation) edf; in -let version = "1.3.2"; in +let version = "1.3.3"; in composableDerivation.composableDerivation {} { name = "fltk-${version}"; src = fetchurl { url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz"; - sha256 = "1974brlk723095vf8z72kazq1cbqr9a51kq6b0xda6zkjkgl8q0p"; + sha256 = "15qd7lkz5d5ynz70xhxhigpz3wns39v9xcf7ggkl0792syc8sfgq"; }; propagatedBuildInputs = [ x11 inputproto libXi freeglut ]; @@ -56,9 +56,5 @@ composableDerivation.composableDerivation {} { }; patches = [ - # https://bugs.archlinux.org/task/36186 - (fetchurl { - url = "https://bugs.archlinux.org/task/36186?getfile=10750"; - sha256 = "1hpb1i87nc3zw6mgpgf3bfv557ci930bsn6rwlhaif51nlqd2wbj"; - }) ]; + ]; } From 9ce93b6c299ccde6c97099c5f5aa88fde877eaeb Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 21 May 2015 19:48:07 +0300 Subject: [PATCH 505/615] Update TigerVNC to Git version; needed for GNU TLS compatibility --- pkgs/tools/admin/tigervnc/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index cc341922ddb1..f2c18bd7f942 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXext, gettext, libICE, libXtst, libXi, libSM, xorgserver +{ stdenv, fetchgit, libX11, libXext, gettext, libICE, libXtst, libXi, libSM, xorgserver , autoconf, automake, cvs, libtool, nasm, utilmacros, pixman, xkbcomp, xkeyboard_config , fontDirectories, fontutil, libgcrypt, gnutls, pam, flex, bison , fixesproto, damageproto, xcmiscproto, bigreqsproto, randrproto, renderproto @@ -10,12 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.4.3"; + version = "git-20150504"; name = "tigervnc-${version}"; - src = fetchurl { - url = "https://github.com/TigerVNC/tigervnc/archive/v${version}.tar.gz"; - sha256 = "0938fmlll1vxccc65hdhzdxii7c1v65n2nbgizjddprj5gdh69hb"; + src = fetchgit { + url = "https://github.com/TigerVNC/tigervnc/"; + sha256 = "1ib8f870wqa8kpvif01fvd2690dhq7fg233pc78pl9ag6pxlihmn"; + rev = "bc84faa2f366ed8fa0f44abc7e3e481e0a54859d"; }; inherit fontDirectories; From 691b98fc28f0383a8e0a2683f5827b2c47fc9f2c Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 21 May 2015 18:51:07 +0200 Subject: [PATCH 506/615] tightvnc: refactoring --- pkgs/tools/admin/tightvnc/builder.sh | 45 ------------------------- pkgs/tools/admin/tightvnc/default.nix | 47 +++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 48 deletions(-) delete mode 100644 pkgs/tools/admin/tightvnc/builder.sh diff --git a/pkgs/tools/admin/tightvnc/builder.sh b/pkgs/tools/admin/tightvnc/builder.sh deleted file mode 100644 index 10590bbfcf1e..000000000000 --- a/pkgs/tools/admin/tightvnc/builder.sh +++ /dev/null @@ -1,45 +0,0 @@ -source $stdenv/setup - -patchPhase() { - fontPath= - for i in $fontDirectories; do - for j in $(find $i -name fonts.dir); do - addToSearchPathWithCustomDelimiter "," fontPath $(dirname $j) - done - done -} - -buildPhase() { - - xmkmf - make World - - sed -e 's@/usr/bin/perl@'$perl'/bin/perl@' \ - -e 's@unix/:7100@'$fontPath'@' \ - -i vncserver - - cd Xvnc - sed -e 's@.* CppCmd .*@#define CppCmd '$gcc'/bin/cpp@' -i config/cf/linux.cf - sed -e 's@.* CppCmd .*@#define CppCmd '$gcc'/bin/cpp@' -i config/cf/Imake.tmpl - sed -i \ - -e 's@"uname","xauth","Xvnc","vncpasswd"@"uname","Xvnc","vncpasswd"@g' \ - -e "s@\@$xauth/bin/xauth@g" \ - ../vncserver - ./configure - make - cd .. -} - -installPhase() { - mkdir -p $out/bin - mkdir -p $out/share/man/man1 - ./vncinstall $out/bin $out/share/man - - # fix HTTP client: - t=$out/share/tightvnc - mkdir -p $t - sed -i "s@/usr/local/vnc/classes@$out/vnc/classes@g" $out/bin/vncserver - cp -r classes $t -} - -genericBuild diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index 6feff044f06d..d6b0e80ea624 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, x11, zlib, libjpeg, imake, gccmakedep, libXmu, libXaw, libXpm, libXp , perl, xauth, fontDirectories}: +{ stdenv, fetchurl, x11, zlib, libjpeg, imake, gccmakedep, libXmu +, libXaw, libXpm, libXp , perl, xauth, fontDirectories }: stdenv.mkDerivation { name = "tightvnc-1.3.10"; @@ -12,8 +13,48 @@ stdenv.mkDerivation { inherit xauth fontDirectories perl; gcc = stdenv.cc.cc; - buildInputs = [x11 zlib libjpeg imake gccmakedep libXmu libXaw libXpm libXp xauth]; - builder = ./builder.sh; + buildInputs = [ x11 zlib libjpeg imake gccmakedep libXmu libXaw + libXpm libXp xauth ]; + + patchPhase = '' + fontPath= + for i in $fontDirectories; do + for j in $(find $i -name fonts.dir); do + addToSearchPathWithCustomDelimiter "," fontPath $(dirname $j) + done + done + ''; + + buildPhase = '' + xmkmf + make World + sed -e 's@/usr/bin/perl@${perl}/bin/perl@' \ + -e 's@unix/:7100@'$fontPath'@' \ + -i vncserver + + cd Xvnc + sed -e 's@.* CppCmd .*@#define CppCmd '$gcc'/bin/cpp@' -i config/cf/linux.cf + sed -e 's@.* CppCmd .*@#define CppCmd '$gcc'/bin/cpp@' -i config/cf/Imake.tmpl + sed -i \ + -e 's@"uname","xauth","Xvnc","vncpasswd"@"uname","Xvnc","vncpasswd"@g' \ + -e "s@\@${xauth}/bin/xauth@g" \ + ../vncserver + ./configure + make + cd .. + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + ./vncinstall $out/bin $out/share/man + + # fix HTTP client: + t=$out/share/tightvnc + mkdir -p $t + sed -i "s@/usr/local/vnc/classes@$out/vnc/classes@g" $out/bin/vncserver + cp -r classes $t + ''; meta = { license = stdenv.lib.licenses.gpl2Plus; From f3867899ee48b679f9a1d43fccef1679039b7644 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 21 May 2015 18:51:43 +0200 Subject: [PATCH 507/615] tightvnc: replace occurences to /usr/bin/ssh closes #3669 --- pkgs/tools/admin/tightvnc/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index d6b0e80ea624..a1a091a90cca 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, x11, zlib, libjpeg, imake, gccmakedep, libXmu -, libXaw, libXpm, libXp , perl, xauth, fontDirectories }: +, libXaw, libXpm, libXp , perl, xauth, fontDirectories, openssh }: stdenv.mkDerivation { name = "tightvnc-1.3.10"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { gcc = stdenv.cc.cc; buildInputs = [ x11 zlib libjpeg imake gccmakedep libXmu libXaw - libXpm libXp xauth ]; + libXpm libXp xauth openssh ]; patchPhase = '' fontPath= @@ -23,6 +23,8 @@ stdenv.mkDerivation { addToSearchPathWithCustomDelimiter "," fontPath $(dirname $j) done done + + sed -i "s@/usr/bin/ssh@${openssh}/bin/ssh@g" vncviewer/vncviewer.h ''; buildPhase = '' From 5ac9e87b1bf7192d2077f90940906a9e5518ccf3 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 21 May 2015 12:41:57 -0500 Subject: [PATCH 508/615] nginx: Fix build for Darwin (no AIO there) --- pkgs/servers/http/nginx/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index fe500bf34628..de964f1776ac 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -102,9 +102,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-select_module" "--with-poll_module" - "--with-aio_module" "--with-threads" - "--with-file-aio" "--with-http_ssl_module" "--with-http_spdy_module" "--with-http_realip_module" @@ -133,7 +131,8 @@ stdenv.mkDerivation rec { ++ optional echo "--add-module=${echo-ext}" ++ optional ngx_lua "--add-module=${develkit-ext} --add-module=${lua-ext}" ++ optional set_misc "--add-module=${set-misc-ext}" - ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio" + ++ optionals (elem stdenv.system (with platforms; linux ++ freebsd)) + [ "--with-file-aio" "--with-aio_module" ] ++ optional fluent "--add-module=${fluentd}"; From 235c2228ca9f608f898bc455c9b5bb1e3c4cb3f0 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 21 May 2015 19:06:09 +0200 Subject: [PATCH 509/615] nixos/test-driver: Add new getScreenText function. Basically, this creates a screenshot and throws tesseract at it to recognize the characters from the screenshot. In order to produce a result that is well enough, we're using lanczos scaling and scale the image up to 400% of its original size. This provides the base functionality for a new Machine method which will be called waitForText. I originally had that idea long ago when writing the VM tests for VirtualBox and Chromium, but thought it would be disproportionate to the case. The downside however is that VM tests now depend on tesseract, but given the average runtime of our tests it really shouldn't have a too big impact and it's only a runtime dependency after all. Another issue is that the OCR process takes quite some time to finish, but IMHO it's better (as in more deterministic) than to rely on sleep(). Signed-off-by: aszlig --- .../development/writing-nixos-tests.xml | 7 ++++++ nixos/lib/test-driver/Machine.pm | 25 +++++++++++++++++++ nixos/lib/testing.nix | 4 +-- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index bbb655eed2a6..6224be0ca1a5 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -154,6 +154,13 @@ startAll; log. + + getScreenText + Return a textual representation of what is currently + visible on the machine's screen using optical character + recognition. + + sendMonitorCommand Send a command to the QEMU monitor. This is rarely diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index e0791692d3ef..0dddc1dc14b1 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -9,6 +9,7 @@ use FileHandle; use Cwd; use File::Basename; use File::Path qw(make_path); +use File::Slurp; my $showGraphics = defined $ENV{'DISPLAY'}; @@ -493,6 +494,30 @@ sub screenshot { } +# Take a screenshot and return the result as text using optical character +# recognition. +sub getScreenText { + my ($self) = @_; + + my $text; + $self->nest("performing optical character recognition", sub { + my $tmpbase = Cwd::abs_path(".")."/ocr"; + my $tmpin = $tmpbase."in.ppm"; + my $tmpout = "$tmpbase.ppm"; + + $self->sendMonitorCommand("screendump $tmpin"); + system("ppmtopgm $tmpin | pamscale 4 -filter=lanczos > $tmpout") == 0 + or die "cannot scale screenshot"; + unlink $tmpin; + system("tesseract $tmpout $tmpbase") == 0 or die "OCR failed"; + unlink $tmpout; + $text = read_file("$tmpbase.txt"); + unlink "$tmpbase.txt"; + }); + return $text; +} + + # Wait until it is possible to connect to the X server. Note that # testing the existence of /tmp/.X11-unix/X0 is insufficient. sub waitForX { diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index c14f15a1ad5d..431e3de6a8ce 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -27,8 +27,8 @@ rec { cp ${./test-driver/Logger.pm} $libDir/Logger.pm wrapProgram $out/bin/nixos-test-driver \ - --prefix PATH : "${qemu_kvm}/bin:${vde2}/bin:${netpbm}/bin:${coreutils}/bin" \ - --prefix PERL5LIB : "${lib.makePerlPath [ perlPackages.TermReadLineGnu perlPackages.XMLWriter perlPackages.IOTty ]}:$out/lib/perl5/site_perl" + --prefix PATH : "${qemu_kvm}/bin:${vde2}/bin:${netpbm}/bin:${coreutils}/bin:${tesseract}/bin" \ + --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl" ''; }; From 8bd025a75e295609647af0510544efb857678ec8 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 21 May 2015 19:49:08 +0200 Subject: [PATCH 510/615] nixos/test-driver: Add new waitForText function. As promised in the previous commit, this can be used similarly to $machine->waitForWindow, where you supply a regular expression and it's retrying OCR until the regexp matches. Signed-off-by: aszlig --- nixos/doc/manual/development/writing-nixos-tests.xml | 7 +++++++ nixos/lib/test-driver/Machine.pm | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index 6224be0ca1a5..322778d1c209 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -244,6 +244,13 @@ startAll; connections. + + waitForText + Wait until the supplied regular expressions matches + the textual contents of the screen by using optical character recognition + (see getScreenText). + + waitForWindow Wait until an X11 window has appeared whose name diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 0dddc1dc14b1..d149634e9e62 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -518,6 +518,17 @@ sub getScreenText { } +# Wait until a specific regexp matches the textual contents of the screen. +sub waitForText { + my ($self, $regexp) = @_; + $self->nest("waiting for $regexp to appear on the screen", sub { + retry sub { + return 1 if $self->getScreenText =~ /$regexp/; + } + }); +} + + # Wait until it is possible to connect to the X server. Note that # testing the existence of /tmp/.X11-unix/X0 is insufficient. sub waitForX { From 77d7aa6742a25f11cad469805ec948c39a194707 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 21 May 2015 19:51:47 +0200 Subject: [PATCH 511/615] nixos/tests/luksroot: Switch to use waitForText. Fixes the "blindly hope that 60 seconds is enough" issue from 1f34503, so that we now have a (hopefully) reliable way to wait for the passphrase prompt. Signed-off-by: aszlig --- nixos/tests/installer.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index a67068dc30a5..f491b0460330 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -366,7 +366,7 @@ in { ''; preBootCommands = '' $machine->start; - sleep 60; # XXX: Hopefully this is long enough :-/ + $machine->waitForText(qr/Enter passphrase/); $machine->sendChars("supersecret\n"); ''; }; From a65bba1e2796dffcea4621388b05f21897b69155 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 21 May 2015 19:59:50 +0200 Subject: [PATCH 512/615] tuareg-mode: fix hash --- pkgs/applications/editors/emacs-modes/tuareg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs-modes/tuareg/default.nix b/pkgs/applications/editors/emacs-modes/tuareg/default.nix index 364daed439d2..be03938f8a53 100644 --- a/pkgs/applications/editors/emacs-modes/tuareg/default.nix +++ b/pkgs/applications/editors/emacs-modes/tuareg/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation { name = "tuareg-mode-${version}"; src = fetchzip { url = "https://github.com/ocaml/tuareg/releases/download/${version}/tuareg-${version}.tar.gz"; - sha256 = "1rd7ai1wn476zfkkxv2xk72bbzi4d9c17gngd35882q4b5vzp756"; + sha256 = "13rh5ddwvwwz5jf0n3wagc5m9zq4cbaylnsknzjalryyvipwfyh3"; }; buildInputs = [ emacs ]; From 7689f0b6738646c8a464d5e31805bd691dfb6333 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 20 May 2015 19:17:17 +0200 Subject: [PATCH 513/615] fsharp: update from 3.1.1.31 to 3.1.1.32 --- pkgs/development/compilers/fsharp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index f1161dd4dd16..82742cf9af69 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fsharp-${version}"; - version = "3.1.1.31"; + version = "3.1.1.32"; src = fetchurl { url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz"; - sha256 = "1c38jpisnh8slqaaw1bsccxgllpc6yivrpb86raw4xalcbsc6fcv"; + sha256 = "16kqgdx0y0lmxv59mc4g7l5ll60nixg5b8bg07vxfnqrf7i6dffd"; }; buildInputs = [ mono pkgconfig autoconf automake which ]; From 064623599f24c6b13c0a251950f37dde6bde55e7 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 21 May 2015 20:37:40 +0200 Subject: [PATCH 514/615] Remove reference to missing autogen.sh. --- pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix index 0bcf85e1d424..dbdd2cc7fd13 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { sha256 = "8a0a6f65d86f2c8cb9bcb20c5e0ea6fd02271399292a71fc7e6852f13adbbdb8"; }; - configureScript = "sh ./autogen.sh"; - buildInputs = [ gnome3.gnome_common libtool pkgconfig vala gtk_doc gobjectIntrospection libgit2 glib ]; From 43a150c05aaca759c005bd077e66faba7c44d0fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 21 May 2015 21:13:31 +0200 Subject: [PATCH 515/615] zed: 1.0.0 -> 1.1.0 --- pkgs/applications/editors/zed/default.nix | 4 +- pkgs/applications/editors/zed/node.nix | 1438 ++++++++++++--------- 2 files changed, 862 insertions(+), 580 deletions(-) diff --git a/pkgs/applications/editors/zed/default.nix b/pkgs/applications/editors/zed/default.nix index 0d4b9fd1dab5..0170319871f0 100644 --- a/pkgs/applications/editors/zed/default.nix +++ b/pkgs/applications/editors/zed/default.nix @@ -3,7 +3,7 @@ let name = "zed-${version}"; - version = "1.0.0"; + version = "1.1.0"; # When upgrading node.nix / node packages: # fetch package.json from Zed's repository @@ -31,7 +31,7 @@ let src = fetchgit { url = "git://github.com/zedapp/zed"; rev = "refs/tags/v${version}"; - sha256 = "1kdvj9mvdwm4cswqw6nn9j6kgqvs4d7vycpsmmfha9a2rkryw9zh"; + sha256 = "1zvlngv73h968jd2m42ylr9vfhf35n80wzy616cv2ic7gmr1fl9p"; }; buildInputs = [ makeWrapper zip ]; diff --git a/pkgs/applications/editors/zed/node.nix b/pkgs/applications/editors/zed/node.nix index cd75f2d58fa9..e74ff1ec45f4 100644 --- a/pkgs/applications/editors/zed/node.nix +++ b/pkgs/applications/editors/zed/node.nix @@ -1,23 +1,24 @@ { self, fetchurl, fetchgit ? null, lib }: { - by-spec."accepts"."~1.1.0" = - self.by-version."accepts"."1.1.1"; - by-version."accepts"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-accepts-1.1.1"; + by-spec."accepts"."~1.2.7" = + self.by-version."accepts"."1.2.7"; + by-version."accepts"."1.2.7" = lib.makeOverridable self.buildNodePackage { + name = "accepts-1.2.7"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.1.1.tgz"; - name = "accepts-1.1.1.tgz"; - sha1 = "3b40bf6abc3fe3bc004534f4672ae1efd0063a96"; + url = "http://registry.npmjs.org/accepts/-/accepts-1.2.7.tgz"; + name = "accepts-1.2.7.tgz"; + sha1 = "efea24e36e0b5b93d001a7598ac441c32ef56003"; }) ]; buildInputs = (self.nativeDeps."accepts" or []); - deps = [ - self.by-version."mime-types"."2.0.2" - self.by-version."negotiator"."0.4.8" - ]; + deps = { + "mime-types-2.0.12" = self.by-version."mime-types"."2.0.12"; + "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3"; + }; peerDependencies = [ ]; passthru.names = [ "accepts" ]; @@ -25,7 +26,8 @@ by-spec."asn1"."0.1.11" = self.by-version."asn1"."0.1.11"; by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage { - name = "node-asn1-0.1.11"; + name = "asn1-0.1.11"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; @@ -35,46 +37,48 @@ ]; buildInputs = (self.nativeDeps."asn1" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "asn1" ]; }; - by-spec."assert-plus"."0.1.2" = - self.by-version."assert-plus"."0.1.2"; - by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-assert-plus-0.1.2"; + by-spec."assert-plus"."^0.1.5" = + self.by-version."assert-plus"."0.1.5"; + by-version."assert-plus"."0.1.5" = lib.makeOverridable self.buildNodePackage { + name = "assert-plus-0.1.5"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"; - name = "assert-plus-0.1.2.tgz"; - sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8"; + url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; + name = "assert-plus-0.1.5.tgz"; + sha1 = "ee74009413002d84cec7219c6ac811812e723160"; }) ]; buildInputs = (self.nativeDeps."assert-plus" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "assert-plus" ]; }; 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"; + self.by-version."async"."0.9.2"; + by-version."async"."0.9.2" = lib.makeOverridable self.buildNodePackage { + name = "async-0.9.2"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz"; - name = "async-0.9.0.tgz"; - sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7"; + url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz"; + name = "async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; }) ]; buildInputs = (self.nativeDeps."async" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "async" ]; @@ -82,7 +86,8 @@ by-spec."aws-sign2"."~0.5.0" = self.by-version."aws-sign2"."0.5.0"; by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "node-aws-sign2-0.5.0"; + name = "aws-sign2-0.5.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; @@ -92,64 +97,88 @@ ]; buildInputs = (self.nativeDeps."aws-sign2" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "aws-sign2" ]; }; - by-spec."block-stream"."*" = - self.by-version."block-stream"."0.0.7"; - by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage { - name = "node-block-stream-0.0.7"; + by-spec."balanced-match"."^0.2.0" = + self.by-version."balanced-match"."0.2.0"; + by-version."balanced-match"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "balanced-match-0.2.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"; - name = "block-stream-0.0.7.tgz"; - sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed"; + url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"; + name = "balanced-match-0.2.0.tgz"; + sha1 = "38f6730c03aab6d5edbb52bd934885e756d71674"; + }) + ]; + buildInputs = + (self.nativeDeps."balanced-match" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "balanced-match" ]; + }; + by-spec."block-stream"."*" = + self.by-version."block-stream"."0.0.8"; + by-version."block-stream"."0.0.8" = lib.makeOverridable self.buildNodePackage { + name = "block-stream-0.0.8"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"; + name = "block-stream-0.0.8.tgz"; + sha1 = "0688f46da2bbf9cff0c4f68225a0cb95cbe8a46b"; }) ]; buildInputs = (self.nativeDeps."block-stream" or []); - deps = [ - self.by-version."inherits"."2.0.1" - ]; + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; peerDependencies = [ ]; passthru.names = [ "block-stream" ]; }; by-spec."body-parser"."^1.6.3" = - self.by-version."body-parser"."1.9.0"; - by-version."body-parser"."1.9.0" = lib.makeOverridable self.buildNodePackage { - name = "node-body-parser-1.9.0"; + self.by-version."body-parser"."1.12.4"; + by-version."body-parser"."1.12.4" = lib.makeOverridable self.buildNodePackage { + name = "body-parser-1.12.4"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/body-parser/-/body-parser-1.9.0.tgz"; - name = "body-parser-1.9.0.tgz"; - sha1 = "95d72943b1a4f67f56bbac9e0dcc837b68703605"; + url = "http://registry.npmjs.org/body-parser/-/body-parser-1.12.4.tgz"; + name = "body-parser-1.12.4.tgz"; + sha1 = "090700c4ba28862a8520ef378395fdee5f61c229"; }) ]; buildInputs = (self.nativeDeps."body-parser" or []); - deps = [ - self.by-version."bytes"."1.0.0" - self.by-version."depd"."1.0.0" - self.by-version."iconv-lite"."0.4.4" - self.by-version."media-typer"."0.3.0" - self.by-version."on-finished"."2.1.0" - self.by-version."qs"."2.2.4" - self.by-version."raw-body"."1.3.0" - self.by-version."type-is"."1.5.2" - ]; + deps = { + "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; + "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + "depd-1.0.1" = self.by-version."depd"."1.0.1"; + "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; + "qs-2.4.2" = self.by-version."qs"."2.4.2"; + "raw-body-2.0.1" = self.by-version."raw-body"."2.0.1"; + "type-is-1.6.2" = self.by-version."type-is"."1.6.2"; + }; peerDependencies = [ ]; passthru.names = [ "body-parser" ]; }; - "body-parser" = self.by-version."body-parser"."1.9.0"; + "body-parser" = self.by-version."body-parser"."1.12.4"; by-spec."boom"."0.4.x" = self.by-version."boom"."0.4.2"; by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "node-boom-0.4.2"; + name = "boom-0.4.2"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; @@ -159,17 +188,40 @@ ]; buildInputs = (self.nativeDeps."boom" or []); - deps = [ - self.by-version."hoek"."0.9.1" - ]; + deps = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + }; peerDependencies = [ ]; passthru.names = [ "boom" ]; }; - by-spec."bytes"."1" = + by-spec."brace-expansion"."^1.0.0" = + self.by-version."brace-expansion"."1.1.0"; + by-version."brace-expansion"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "brace-expansion-1.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz"; + name = "brace-expansion-1.1.0.tgz"; + sha1 = "c9b7d03c03f37bc704be100e522b40db8f6cfcd9"; + }) + ]; + buildInputs = + (self.nativeDeps."brace-expansion" or []); + deps = { + "balanced-match-0.2.0" = self.by-version."balanced-match"."0.2.0"; + "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "brace-expansion" ]; + }; + by-spec."bytes"."1.0.0" = self.by-version."bytes"."1.0.0"; by-version."bytes"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-bytes-1.0.0"; + name = "bytes-1.0.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"; @@ -179,30 +231,49 @@ ]; buildInputs = (self.nativeDeps."bytes" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "bytes" ]; }; - by-spec."bytes"."1.0.0" = - self.by-version."bytes"."1.0.0"; - by-spec."combined-stream"."~0.0.4" = - self.by-version."combined-stream"."0.0.5"; - by-version."combined-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-combined-stream-0.0.5"; + by-spec."bytes"."2.0.1" = + self.by-version."bytes"."2.0.1"; + by-version."bytes"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "bytes-2.0.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz"; - name = "combined-stream-0.0.5.tgz"; - sha1 = "29ed76e5c9aad07c4acf9ca3d32601cce28697a2"; + url = "http://registry.npmjs.org/bytes/-/bytes-2.0.1.tgz"; + name = "bytes-2.0.1.tgz"; + sha1 = "673743059be43d929f9c225dd7363ee0f8b15d97"; + }) + ]; + buildInputs = + (self.nativeDeps."bytes" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bytes" ]; + }; + by-spec."combined-stream"."~0.0.4" = + self.by-version."combined-stream"."0.0.7"; + by-version."combined-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage { + name = "combined-stream-0.0.7"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + name = "combined-stream-0.0.7.tgz"; + sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; }) ]; buildInputs = (self.nativeDeps."combined-stream" or []); - deps = [ - self.by-version."delayed-stream"."0.0.5" - ]; + deps = { + "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5"; + }; peerDependencies = [ ]; passthru.names = [ "combined-stream" ]; @@ -210,7 +281,8 @@ by-spec."commander"."~2.1.0" = self.by-version."commander"."2.1.0"; by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-commander-2.1.0"; + name = "commander-2.1.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; @@ -220,16 +292,77 @@ ]; buildInputs = (self.nativeDeps."commander" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "commander" ]; }; + by-spec."concat-map"."0.0.1" = + self.by-version."concat-map"."0.0.1"; + by-version."concat-map"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "concat-map-0.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + name = "concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }) + ]; + buildInputs = + (self.nativeDeps."concat-map" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "concat-map" ]; + }; + by-spec."content-disposition"."0.5.0" = + self.by-version."content-disposition"."0.5.0"; + by-version."content-disposition"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "content-disposition-0.5.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; + name = "content-disposition-0.5.0.tgz"; + sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; + }) + ]; + buildInputs = + (self.nativeDeps."content-disposition" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "content-disposition" ]; + }; + by-spec."content-type"."~1.0.1" = + self.by-version."content-type"."1.0.1"; + by-version."content-type"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "content-type-1.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz"; + name = "content-type-1.0.1.tgz"; + sha1 = "a19d2247327dc038050ce622b7a154ec59c5e600"; + }) + ]; + buildInputs = + (self.nativeDeps."content-type" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "content-type" ]; + }; by-spec."cookie"."0.1.2" = self.by-version."cookie"."0.1.2"; by-version."cookie"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-cookie-0.1.2"; + name = "cookie-0.1.2"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; @@ -239,46 +372,48 @@ ]; buildInputs = (self.nativeDeps."cookie" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "cookie" ]; }; - by-spec."cookie-signature"."1.0.5" = - self.by-version."cookie-signature"."1.0.5"; - by-version."cookie-signature"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-cookie-signature-1.0.5"; + by-spec."cookie-signature"."1.0.6" = + self.by-version."cookie-signature"."1.0.6"; + by-version."cookie-signature"."1.0.6" = lib.makeOverridable self.buildNodePackage { + name = "cookie-signature-1.0.6"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz"; - name = "cookie-signature-1.0.5.tgz"; - sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9"; + url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; + name = "cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }) ]; buildInputs = (self.nativeDeps."cookie-signature" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "cookie-signature" ]; }; - by-spec."crc"."3.0.0" = - self.by-version."crc"."3.0.0"; - by-version."crc"."3.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-crc-3.0.0"; + by-spec."crc"."3.2.1" = + self.by-version."crc"."3.2.1"; + by-version."crc"."3.2.1" = lib.makeOverridable self.buildNodePackage { + name = "crc-3.2.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/crc/-/crc-3.0.0.tgz"; - name = "crc-3.0.0.tgz"; - sha1 = "d11e97ec44a844e5eb15a74fa2c7875d0aac4b22"; + url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz"; + name = "crc-3.2.1.tgz"; + sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082"; }) ]; buildInputs = (self.nativeDeps."crc" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "crc" ]; @@ -286,7 +421,8 @@ by-spec."cryptiles"."0.2.x" = self.by-version."cryptiles"."0.2.2"; by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-cryptiles-0.2.2"; + name = "cryptiles-0.2.2"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; @@ -296,48 +432,50 @@ ]; buildInputs = (self.nativeDeps."cryptiles" or []); - deps = [ - self.by-version."boom"."0.4.2" - ]; + deps = { + "boom-0.4.2" = self.by-version."boom"."0.4.2"; + }; peerDependencies = [ ]; passthru.names = [ "cryptiles" ]; }; - by-spec."ctype"."0.5.2" = - self.by-version."ctype"."0.5.2"; - by-version."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "node-ctype-0.5.2"; + by-spec."ctype"."0.5.3" = + self.by-version."ctype"."0.5.3"; + by-version."ctype"."0.5.3" = lib.makeOverridable self.buildNodePackage { + name = "ctype-0.5.3"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; - name = "ctype-0.5.2.tgz"; - sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d"; + url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; + name = "ctype-0.5.3.tgz"; + sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; }) ]; buildInputs = (self.nativeDeps."ctype" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "ctype" ]; }; - by-spec."debug"."~2.0.0" = - self.by-version."debug"."2.0.0"; - by-version."debug"."2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-debug-2.0.0"; + by-spec."debug"."~2.2.0" = + self.by-version."debug"."2.2.0"; + by-version."debug"."2.2.0" = lib.makeOverridable self.buildNodePackage { + name = "debug-2.2.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz"; - name = "debug-2.0.0.tgz"; - sha1 = "89bd9df6732b51256bc6705342bba02ed12131ef"; + url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + name = "debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; }) ]; buildInputs = (self.nativeDeps."debug" or []); - deps = [ - self.by-version."ms"."0.6.2" - ]; + deps = { + "ms-0.7.1" = self.by-version."ms"."0.7.1"; + }; peerDependencies = [ ]; passthru.names = [ "debug" ]; @@ -345,7 +483,8 @@ by-spec."delayed-stream"."0.0.5" = self.by-version."delayed-stream"."0.0.5"; by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-delayed-stream-0.0.5"; + name = "delayed-stream-0.0.5"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; @@ -355,46 +494,28 @@ ]; buildInputs = (self.nativeDeps."delayed-stream" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "delayed-stream" ]; }; - by-spec."depd"."0.4.5" = - self.by-version."depd"."0.4.5"; - by-version."depd"."0.4.5" = lib.makeOverridable self.buildNodePackage { - name = "node-depd-0.4.5"; + by-spec."depd"."~1.0.1" = + self.by-version."depd"."1.0.1"; + by-version."depd"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "depd-1.0.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/depd/-/depd-0.4.5.tgz"; - name = "depd-0.4.5.tgz"; - sha1 = "1a664b53388b4a6573e8ae67b5f767c693ca97f1"; + url = "http://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; + name = "depd-1.0.1.tgz"; + sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; }) ]; buildInputs = (self.nativeDeps."depd" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "depd" ]; - }; - by-spec."depd"."~1.0.0" = - self.by-version."depd"."1.0.0"; - by-version."depd"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-depd-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/depd/-/depd-1.0.0.tgz"; - name = "depd-1.0.0.tgz"; - sha1 = "2fda0d00e98aae2845d4991ab1bf1f2a199073d5"; - }) - ]; - buildInputs = - (self.nativeDeps."depd" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "depd" ]; @@ -402,7 +523,8 @@ by-spec."destroy"."1.0.3" = self.by-version."destroy"."1.0.3"; by-version."destroy"."1.0.3" = lib.makeOverridable self.buildNodePackage { - name = "node-destroy-1.0.3"; + name = "destroy-1.0.3"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; @@ -412,27 +534,28 @@ ]; buildInputs = (self.nativeDeps."destroy" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "destroy" ]; }; - by-spec."ee-first"."1.0.5" = - self.by-version."ee-first"."1.0.5"; - by-version."ee-first"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-ee-first-1.0.5"; + by-spec."ee-first"."1.1.0" = + self.by-version."ee-first"."1.1.0"; + by-version."ee-first"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "ee-first-1.1.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz"; - name = "ee-first-1.0.5.tgz"; - sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0"; + url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"; + name = "ee-first-1.1.0.tgz"; + sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4"; }) ]; buildInputs = (self.nativeDeps."ee-first" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "ee-first" ]; @@ -440,7 +563,8 @@ by-spec."escape-html"."1.0.1" = self.by-version."escape-html"."1.0.1"; by-version."escape-html"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-escape-html-1.0.1"; + name = "escape-html-1.0.1"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; @@ -450,92 +574,97 @@ ]; buildInputs = (self.nativeDeps."escape-html" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "escape-html" ]; }; - by-spec."etag"."~1.4.0" = - self.by-version."etag"."1.4.0"; - by-version."etag"."1.4.0" = lib.makeOverridable self.buildNodePackage { - name = "node-etag-1.4.0"; + by-spec."etag"."~1.6.0" = + self.by-version."etag"."1.6.0"; + by-version."etag"."1.6.0" = lib.makeOverridable self.buildNodePackage { + name = "etag-1.6.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/etag/-/etag-1.4.0.tgz"; - name = "etag-1.4.0.tgz"; - sha1 = "3050991615857707c04119d075ba2088e0701225"; + url = "http://registry.npmjs.org/etag/-/etag-1.6.0.tgz"; + name = "etag-1.6.0.tgz"; + sha1 = "8bcb2c6af1254c481dfc8b997c906ef4e442c207"; }) ]; buildInputs = (self.nativeDeps."etag" or []); - deps = [ - self.by-version."crc"."3.0.0" - ]; + deps = { + "crc-3.2.1" = self.by-version."crc"."3.2.1"; + }; peerDependencies = [ ]; passthru.names = [ "etag" ]; }; by-spec."express"."^4.8.3" = - self.by-version."express"."4.9.5"; - by-version."express"."4.9.5" = lib.makeOverridable self.buildNodePackage { - name = "node-express-4.9.5"; + self.by-version."express"."4.12.4"; + by-version."express"."4.12.4" = lib.makeOverridable self.buildNodePackage { + name = "express-4.12.4"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.9.5.tgz"; - name = "express-4.9.5.tgz"; - sha1 = "7f62aa84ac8f5e96acfb98e2944dde0bf1cf8688"; + url = "http://registry.npmjs.org/express/-/express-4.12.4.tgz"; + name = "express-4.12.4.tgz"; + sha1 = "8fec2510255bc6b2e58107c48239c0fa307c1aa2"; }) ]; buildInputs = (self.nativeDeps."express" or []); - deps = [ - self.by-version."accepts"."1.1.1" - self.by-version."cookie-signature"."1.0.5" - self.by-version."debug"."2.0.0" - self.by-version."depd"."0.4.5" - self.by-version."escape-html"."1.0.1" - self.by-version."etag"."1.4.0" - self.by-version."finalhandler"."0.2.0" - self.by-version."fresh"."0.2.4" - self.by-version."media-typer"."0.3.0" - self.by-version."methods"."1.1.0" - self.by-version."on-finished"."2.1.0" - self.by-version."parseurl"."1.3.0" - self.by-version."path-to-regexp"."0.1.3" - self.by-version."proxy-addr"."1.0.3" - self.by-version."qs"."2.2.4" - self.by-version."range-parser"."1.0.2" - self.by-version."send"."0.9.3" - self.by-version."serve-static"."1.6.3" - self.by-version."type-is"."1.5.2" - self.by-version."vary"."1.0.0" - self.by-version."cookie"."0.1.2" - self.by-version."merge-descriptors"."0.0.2" - self.by-version."utils-merge"."1.0.0" - ]; + deps = { + "accepts-1.2.7" = self.by-version."accepts"."1.2.7"; + "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; + "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; + "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; + "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + "depd-1.0.1" = self.by-version."depd"."1.0.1"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "etag-1.6.0" = self.by-version."etag"."1.6.0"; + "finalhandler-0.3.6" = self.by-version."finalhandler"."0.3.6"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0"; + "methods-1.1.1" = self.by-version."methods"."1.1.1"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3"; + "proxy-addr-1.0.8" = self.by-version."proxy-addr"."1.0.8"; + "qs-2.4.2" = self.by-version."qs"."2.4.2"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + "send-0.12.3" = self.by-version."send"."0.12.3"; + "serve-static-1.9.3" = self.by-version."serve-static"."1.9.3"; + "type-is-1.6.2" = self.by-version."type-is"."1.6.2"; + "vary-1.0.0" = self.by-version."vary"."1.0.0"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + }; peerDependencies = [ ]; passthru.names = [ "express" ]; }; - "express" = self.by-version."express"."4.9.5"; - by-spec."finalhandler"."0.2.0" = - self.by-version."finalhandler"."0.2.0"; - by-version."finalhandler"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-finalhandler-0.2.0"; + "express" = self.by-version."express"."4.12.4"; + by-spec."finalhandler"."0.3.6" = + self.by-version."finalhandler"."0.3.6"; + by-version."finalhandler"."0.3.6" = lib.makeOverridable self.buildNodePackage { + name = "finalhandler-0.3.6"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz"; - name = "finalhandler-0.2.0.tgz"; - sha1 = "794082424b17f6a4b2a0eda39f9db6948ee4be8d"; + url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.6.tgz"; + name = "finalhandler-0.3.6.tgz"; + sha1 = "daf9c4161b1b06e001466b1411dfdb6973be138b"; }) ]; buildInputs = (self.nativeDeps."finalhandler" or []); - deps = [ - self.by-version."debug"."2.0.0" - self.by-version."escape-html"."1.0.1" - ]; + deps = { + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; + }; peerDependencies = [ ]; passthru.names = [ "finalhandler" ]; @@ -543,7 +672,8 @@ by-spec."forever-agent"."~0.5.0" = self.by-version."forever-agent"."0.5.2"; by-version."forever-agent"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "node-forever-agent-0.5.2"; + name = "forever-agent-0.5.2"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; @@ -553,8 +683,8 @@ ]; buildInputs = (self.nativeDeps."forever-agent" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "forever-agent" ]; @@ -562,7 +692,8 @@ by-spec."form-data"."~0.1.0" = self.by-version."form-data"."0.1.4"; by-version."form-data"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "node-form-data-0.1.4"; + name = "form-data-0.1.4"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; @@ -572,11 +703,11 @@ ]; buildInputs = (self.nativeDeps."form-data" or []); - deps = [ - self.by-version."combined-stream"."0.0.5" - self.by-version."mime"."1.2.11" - self.by-version."async"."0.9.0" - ]; + deps = { + "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "async-0.9.2" = self.by-version."async"."0.9.2"; + }; peerDependencies = [ ]; passthru.names = [ "form-data" ]; @@ -584,7 +715,8 @@ by-spec."forwarded"."~0.1.0" = self.by-version."forwarded"."0.1.0"; by-version."forwarded"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-forwarded-0.1.0"; + name = "forwarded-0.1.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; @@ -594,8 +726,8 @@ ]; buildInputs = (self.nativeDeps."forwarded" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "forwarded" ]; @@ -603,7 +735,8 @@ by-spec."fresh"."0.2.4" = self.by-version."fresh"."0.2.4"; by-version."fresh"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "node-fresh-0.2.4"; + name = "fresh-0.2.4"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"; @@ -613,8 +746,8 @@ ]; buildInputs = (self.nativeDeps."fresh" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "fresh" ]; @@ -622,7 +755,8 @@ by-spec."fstream"."~0.1.28" = self.by-version."fstream"."0.1.31"; by-version."fstream"."0.1.31" = lib.makeOverridable self.buildNodePackage { - name = "node-fstream-0.1.31"; + name = "fstream-0.1.31"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz"; @@ -632,31 +766,56 @@ ]; buildInputs = (self.nativeDeps."fstream" or []); - deps = [ - self.by-version."graceful-fs"."3.0.2" - self.by-version."inherits"."2.0.1" - self.by-version."mkdirp"."0.5.0" - self.by-version."rimraf"."2.2.8" - ]; + deps = { + "graceful-fs-3.0.7" = self.by-version."graceful-fs"."3.0.7"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; + "rimraf-2.3.4" = self.by-version."rimraf"."2.3.4"; + }; peerDependencies = [ ]; passthru.names = [ "fstream" ]; }; - by-spec."graceful-fs"."~3.0.2" = - self.by-version."graceful-fs"."3.0.2"; - by-version."graceful-fs"."3.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-graceful-fs-3.0.2"; + by-spec."glob"."^4.4.2" = + self.by-version."glob"."4.5.3"; + by-version."glob"."4.5.3" = lib.makeOverridable self.buildNodePackage { + name = "glob-4.5.3"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"; - name = "graceful-fs-3.0.2.tgz"; - sha1 = "2cb5bf7f742bea8ad47c754caeee032b7e71a577"; + url = "http://registry.npmjs.org/glob/-/glob-4.5.3.tgz"; + name = "glob-4.5.3.tgz"; + sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f"; + }) + ]; + buildInputs = + (self.nativeDeps."glob" or []); + deps = { + "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "minimatch-2.0.8" = self.by-version."minimatch"."2.0.8"; + "once-1.3.2" = self.by-version."once"."1.3.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "glob" ]; + }; + by-spec."graceful-fs"."~3.0.2" = + self.by-version."graceful-fs"."3.0.7"; + by-version."graceful-fs"."3.0.7" = lib.makeOverridable self.buildNodePackage { + name = "graceful-fs-3.0.7"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.7.tgz"; + name = "graceful-fs-3.0.7.tgz"; + sha1 = "e935be4b3e57892d289dc3bef7be8c02779d2b54"; }) ]; buildInputs = (self.nativeDeps."graceful-fs" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "graceful-fs" ]; @@ -664,7 +823,8 @@ by-spec."hawk"."~1.0.0" = self.by-version."hawk"."1.0.0"; by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-hawk-1.0.0"; + name = "hawk-1.0.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; @@ -674,12 +834,12 @@ ]; buildInputs = (self.nativeDeps."hawk" or []); - deps = [ - self.by-version."hoek"."0.9.1" - self.by-version."boom"."0.4.2" - self.by-version."cryptiles"."0.2.2" - self.by-version."sntp"."0.2.4" - ]; + deps = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + "boom-0.4.2" = self.by-version."boom"."0.4.2"; + "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2"; + "sntp-0.2.4" = self.by-version."sntp"."0.2.4"; + }; peerDependencies = [ ]; passthru.names = [ "hawk" ]; @@ -687,7 +847,8 @@ by-spec."hoek"."0.9.x" = self.by-version."hoek"."0.9.1"; by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage { - name = "node-hoek-0.9.1"; + name = "hoek-0.9.1"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; @@ -697,57 +858,82 @@ ]; buildInputs = (self.nativeDeps."hoek" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "hoek" ]; }; by-spec."http-signature"."~0.10.0" = - self.by-version."http-signature"."0.10.0"; - by-version."http-signature"."0.10.0" = lib.makeOverridable self.buildNodePackage { - name = "node-http-signature-0.10.0"; + self.by-version."http-signature"."0.10.1"; + by-version."http-signature"."0.10.1" = lib.makeOverridable self.buildNodePackage { + name = "http-signature-0.10.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz"; - name = "http-signature-0.10.0.tgz"; - sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582"; + url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; + name = "http-signature-0.10.1.tgz"; + sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; }) ]; buildInputs = (self.nativeDeps."http-signature" or []); - deps = [ - self.by-version."assert-plus"."0.1.2" - self.by-version."asn1"."0.1.11" - self.by-version."ctype"."0.5.2" - ]; + deps = { + "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5"; + "asn1-0.1.11" = self.by-version."asn1"."0.1.11"; + "ctype-0.5.3" = self.by-version."ctype"."0.5.3"; + }; peerDependencies = [ ]; passthru.names = [ "http-signature" ]; }; - by-spec."iconv-lite"."0.4.4" = - self.by-version."iconv-lite"."0.4.4"; - by-version."iconv-lite"."0.4.4" = lib.makeOverridable self.buildNodePackage { - name = "node-iconv-lite-0.4.4"; + by-spec."iconv-lite"."0.4.8" = + self.by-version."iconv-lite"."0.4.8"; + by-version."iconv-lite"."0.4.8" = lib.makeOverridable self.buildNodePackage { + name = "iconv-lite-0.4.8"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz"; - name = "iconv-lite-0.4.4.tgz"; - sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8"; + url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz"; + name = "iconv-lite-0.4.8.tgz"; + sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; }) ]; buildInputs = (self.nativeDeps."iconv-lite" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "iconv-lite" ]; }; + by-spec."inflight"."^1.0.4" = + self.by-version."inflight"."1.0.4"; + by-version."inflight"."1.0.4" = lib.makeOverridable self.buildNodePackage { + name = "inflight-1.0.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"; + name = "inflight-1.0.4.tgz"; + sha1 = "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a"; + }) + ]; + buildInputs = + (self.nativeDeps."inflight" or []); + deps = { + "once-1.3.2" = self.by-version."once"."1.3.2"; + "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "inflight" ]; + }; 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"; + name = "inherits-2.0.1"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; @@ -757,48 +943,50 @@ ]; buildInputs = (self.nativeDeps."inherits" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "inherits" ]; }; by-spec."inherits"."~2.0.0" = self.by-version."inherits"."2.0.1"; - by-spec."ipaddr.js"."0.1.3" = - self.by-version."ipaddr.js"."0.1.3"; - by-version."ipaddr.js"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-ipaddr.js-0.1.3"; + by-spec."ipaddr.js"."1.0.1" = + self.by-version."ipaddr.js"."1.0.1"; + by-version."ipaddr.js"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "ipaddr.js-1.0.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.3.tgz"; - name = "ipaddr.js-0.1.3.tgz"; - sha1 = "27a9ca37f148d2102b0ef191ccbf2c51a8f025c6"; + url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.1.tgz"; + name = "ipaddr.js-1.0.1.tgz"; + sha1 = "5f38801dc73e0400fc7076386f6ed5215fbd8f95"; }) ]; buildInputs = (self.nativeDeps."ipaddr.js" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "ipaddr.js" ]; }; by-spec."json-stringify-safe"."~5.0.0" = - self.by-version."json-stringify-safe"."5.0.0"; - by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-json-stringify-safe-5.0.0"; + self.by-version."json-stringify-safe"."5.0.1"; + by-version."json-stringify-safe"."5.0.1" = lib.makeOverridable self.buildNodePackage { + name = "json-stringify-safe-5.0.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; - name = "json-stringify-safe-5.0.0.tgz"; - sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e"; + url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + name = "json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }) ]; buildInputs = (self.nativeDeps."json-stringify-safe" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "json-stringify-safe" ]; @@ -806,7 +994,8 @@ by-spec."media-typer"."0.3.0" = self.by-version."media-typer"."0.3.0"; by-version."media-typer"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-media-typer-0.3.0"; + name = "media-typer-0.3.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; @@ -816,54 +1005,77 @@ ]; buildInputs = (self.nativeDeps."media-typer" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "media-typer" ]; }; - by-spec."merge-descriptors"."0.0.2" = - self.by-version."merge-descriptors"."0.0.2"; - by-version."merge-descriptors"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-merge-descriptors-0.0.2"; + by-spec."merge-descriptors"."1.0.0" = + self.by-version."merge-descriptors"."1.0.0"; + by-version."merge-descriptors"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "merge-descriptors-1.0.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; - name = "merge-descriptors-0.0.2.tgz"; - sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; + url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz"; + name = "merge-descriptors-1.0.0.tgz"; + sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864"; }) ]; buildInputs = (self.nativeDeps."merge-descriptors" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "merge-descriptors" ]; }; - by-spec."methods"."1.1.0" = - self.by-version."methods"."1.1.0"; - by-version."methods"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-methods-1.1.0"; + by-spec."methods"."~1.1.1" = + self.by-version."methods"."1.1.1"; + by-version."methods"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "methods-1.1.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/methods/-/methods-1.1.0.tgz"; - name = "methods-1.1.0.tgz"; - sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f"; + url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz"; + name = "methods-1.1.1.tgz"; + sha1 = "17ea6366066d00c58e375b8ec7dfd0453c89822a"; }) ]; buildInputs = (self.nativeDeps."methods" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "methods" ]; }; - by-spec."mime"."1.2.11" = + by-spec."mime"."1.3.4" = + self.by-version."mime"."1.3.4"; + by-version."mime"."1.3.4" = lib.makeOverridable self.buildNodePackage { + name = "mime-1.3.4"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; + name = "mime-1.3.4.tgz"; + sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; + }) + ]; + buildInputs = + (self.nativeDeps."mime" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "mime" ]; + }; + by-spec."mime"."~1.2.11" = self.by-version."mime"."1.2.11"; by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage { - name = "node-mime-1.2.11"; + name = "mime-1.2.11"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; @@ -873,59 +1085,81 @@ ]; buildInputs = (self.nativeDeps."mime" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "mime" ]; }; - by-spec."mime"."~1.2.11" = - self.by-version."mime"."1.2.11"; by-spec."mime"."~1.2.9" = self.by-version."mime"."1.2.11"; - by-spec."mime-db"."~1.1.0" = - self.by-version."mime-db"."1.1.0"; - by-version."mime-db"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-mime-db-1.1.0"; + by-spec."mime-db"."~1.10.0" = + self.by-version."mime-db"."1.10.0"; + by-version."mime-db"."1.10.0" = lib.makeOverridable self.buildNodePackage { + name = "mime-db-1.10.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.1.0.tgz"; - name = "mime-db-1.1.0.tgz"; - sha1 = "4613f418ab995450bf4bda240cd0ab38016a07a9"; + url = "http://registry.npmjs.org/mime-db/-/mime-db-1.10.0.tgz"; + name = "mime-db-1.10.0.tgz"; + sha1 = "e6308063c758ebd12837874c3d1ea9170766b03b"; }) ]; buildInputs = (self.nativeDeps."mime-db" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "mime-db" ]; }; - by-spec."mime-types"."~2.0.2" = - self.by-version."mime-types"."2.0.2"; - by-version."mime-types"."2.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-mime-types-2.0.2"; + by-spec."mime-types"."~2.0.11" = + self.by-version."mime-types"."2.0.12"; + by-version."mime-types"."2.0.12" = lib.makeOverridable self.buildNodePackage { + name = "mime-types-2.0.12"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.2.tgz"; - name = "mime-types-2.0.2.tgz"; - sha1 = "c74b779f2896c367888622bd537aaaad4c0a2c08"; + url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.12.tgz"; + name = "mime-types-2.0.12.tgz"; + sha1 = "87ae9f124e94f8e440c93d1a72d0dccecdb71135"; }) ]; buildInputs = (self.nativeDeps."mime-types" or []); - deps = [ - self.by-version."mime-db"."1.1.0" - ]; + deps = { + "mime-db-1.10.0" = self.by-version."mime-db"."1.10.0"; + }; peerDependencies = [ ]; passthru.names = [ "mime-types" ]; }; + by-spec."minimatch"."^2.0.1" = + self.by-version."minimatch"."2.0.8"; + by-version."minimatch"."2.0.8" = lib.makeOverridable self.buildNodePackage { + name = "minimatch-2.0.8"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz"; + name = "minimatch-2.0.8.tgz"; + sha1 = "0bc20f6bf3570a698ef0ddff902063c6cabda6bf"; + }) + ]; + buildInputs = + (self.nativeDeps."minimatch" or []); + deps = { + "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "minimatch" ]; + }; by-spec."minimist"."0.0.8" = self.by-version."minimist"."0.0.8"; by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage { - name = "node-minimist-0.0.8"; + name = "minimist-0.0.8"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; @@ -935,47 +1169,49 @@ ]; buildInputs = (self.nativeDeps."minimist" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "minimist" ]; }; by-spec."mkdirp"."0.5" = - self.by-version."mkdirp"."0.5.0"; - by-version."mkdirp"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.5.0"; + self.by-version."mkdirp"."0.5.1"; + by-version."mkdirp"."0.5.1" = lib.makeOverridable self.buildNodePackage { + name = "mkdirp-0.5.1"; + bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; - name = "mkdirp-0.5.0.tgz"; - sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + name = "mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }) ]; buildInputs = (self.nativeDeps."mkdirp" or []); - deps = [ - self.by-version."minimist"."0.0.8" - ]; + deps = { + "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; + }; peerDependencies = [ ]; passthru.names = [ "mkdirp" ]; }; - 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"; + by-spec."ms"."0.7.1" = + self.by-version."ms"."0.7.1"; + by-version."ms"."0.7.1" = lib.makeOverridable self.buildNodePackage { + name = "ms-0.7.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; - name = "ms-0.6.2.tgz"; - sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; + url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + name = "ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; }) ]; buildInputs = (self.nativeDeps."ms" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "ms" ]; @@ -983,7 +1219,8 @@ by-spec."nan"."~1.0.0" = self.by-version."nan"."1.0.0"; by-version."nan"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-nan-1.0.0"; + name = "nan-1.0.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz"; @@ -993,46 +1230,48 @@ ]; buildInputs = (self.nativeDeps."nan" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "nan" ]; }; - by-spec."negotiator"."0.4.8" = - self.by-version."negotiator"."0.4.8"; - by-version."negotiator"."0.4.8" = lib.makeOverridable self.buildNodePackage { - name = "node-negotiator-0.4.8"; + by-spec."negotiator"."0.5.3" = + self.by-version."negotiator"."0.5.3"; + by-version."negotiator"."0.5.3" = lib.makeOverridable self.buildNodePackage { + name = "negotiator-0.5.3"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.8.tgz"; - name = "negotiator-0.4.8.tgz"; - sha1 = "96010b23b63c387f47a4bed96762a831cda39eab"; + url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"; + name = "negotiator-0.5.3.tgz"; + sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; }) ]; buildInputs = (self.nativeDeps."negotiator" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "negotiator" ]; }; by-spec."node-uuid"."~1.4.0" = - self.by-version."node-uuid"."1.4.1"; - by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-node-uuid-1.4.1"; + self.by-version."node-uuid"."1.4.3"; + by-version."node-uuid"."1.4.3" = lib.makeOverridable self.buildNodePackage { + name = "node-uuid-1.4.3"; + bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; - name = "node-uuid-1.4.1.tgz"; - sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"; + name = "node-uuid-1.4.3.tgz"; + sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9"; }) ]; buildInputs = (self.nativeDeps."node-uuid" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "node-uuid" ]; @@ -1040,7 +1279,8 @@ by-spec."oauth-sign"."~0.3.0" = self.by-version."oauth-sign"."0.3.0"; by-version."oauth-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-oauth-sign-0.3.0"; + name = "oauth-sign-0.3.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; @@ -1050,38 +1290,59 @@ ]; buildInputs = (self.nativeDeps."oauth-sign" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "oauth-sign" ]; }; - by-spec."on-finished"."2.1.0" = - self.by-version."on-finished"."2.1.0"; - by-version."on-finished"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-on-finished-2.1.0"; + by-spec."on-finished"."~2.2.1" = + self.by-version."on-finished"."2.2.1"; + by-version."on-finished"."2.2.1" = lib.makeOverridable self.buildNodePackage { + name = "on-finished-2.2.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz"; - name = "on-finished-2.1.0.tgz"; - sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d"; + url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz"; + name = "on-finished-2.2.1.tgz"; + sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029"; }) ]; buildInputs = (self.nativeDeps."on-finished" or []); - deps = [ - self.by-version."ee-first"."1.0.5" - ]; + deps = { + "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0"; + }; peerDependencies = [ ]; passthru.names = [ "on-finished" ]; }; - by-spec."on-finished"."~2.1.0" = - self.by-version."on-finished"."2.1.0"; + by-spec."once"."^1.3.0" = + self.by-version."once"."1.3.2"; + by-version."once"."1.3.2" = lib.makeOverridable self.buildNodePackage { + name = "once-1.3.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/once/-/once-1.3.2.tgz"; + name = "once-1.3.2.tgz"; + sha1 = "d8feeca93b039ec1dcdee7741c92bdac5e28081b"; + }) + ]; + buildInputs = + (self.nativeDeps."once" or []); + deps = { + "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "once" ]; + }; by-spec."options".">=0.0.5" = self.by-version."options"."0.0.6"; by-version."options"."0.0.6" = lib.makeOverridable self.buildNodePackage { - name = "node-options-0.0.6"; + name = "options-0.0.6"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz"; @@ -1091,8 +1352,8 @@ ]; buildInputs = (self.nativeDeps."options" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "options" ]; @@ -1100,7 +1361,8 @@ by-spec."parseurl"."~1.3.0" = self.by-version."parseurl"."1.3.0"; by-version."parseurl"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-parseurl-1.3.0"; + name = "parseurl-1.3.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"; @@ -1110,8 +1372,8 @@ ]; buildInputs = (self.nativeDeps."parseurl" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "parseurl" ]; @@ -1119,7 +1381,8 @@ by-spec."path-to-regexp"."0.1.3" = self.by-version."path-to-regexp"."0.1.3"; by-version."path-to-regexp"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-path-to-regexp-0.1.3"; + name = "path-to-regexp-0.1.3"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz"; @@ -1129,67 +1392,50 @@ ]; buildInputs = (self.nativeDeps."path-to-regexp" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "path-to-regexp" ]; }; - by-spec."proxy-addr"."~1.0.3" = - self.by-version."proxy-addr"."1.0.3"; - by-version."proxy-addr"."1.0.3" = lib.makeOverridable self.buildNodePackage { - name = "node-proxy-addr-1.0.3"; + by-spec."proxy-addr"."~1.0.8" = + self.by-version."proxy-addr"."1.0.8"; + by-version."proxy-addr"."1.0.8" = lib.makeOverridable self.buildNodePackage { + name = "proxy-addr-1.0.8"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.3.tgz"; - name = "proxy-addr-1.0.3.tgz"; - sha1 = "17d824aac844707441249da6d1ea5e889007cdd6"; + url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.8.tgz"; + name = "proxy-addr-1.0.8.tgz"; + sha1 = "db54ec878bcc1053d57646609219b3715678bafe"; }) ]; buildInputs = (self.nativeDeps."proxy-addr" or []); - deps = [ - self.by-version."forwarded"."0.1.0" - self.by-version."ipaddr.js"."0.1.3" - ]; + deps = { + "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0"; + "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1"; + }; peerDependencies = [ ]; passthru.names = [ "proxy-addr" ]; }; - by-spec."punycode".">=0.2.0" = - self.by-version."punycode"."1.3.1"; - by-version."punycode"."1.3.1" = lib.makeOverridable self.buildNodePackage { - name = "node-punycode-1.3.1"; + by-spec."qs"."2.4.2" = + self.by-version."qs"."2.4.2"; + by-version."qs"."2.4.2" = lib.makeOverridable self.buildNodePackage { + name = "qs-2.4.2"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz"; - name = "punycode-1.3.1.tgz"; - sha1 = "710afe5123c20a1530b712e3e682b9118fe8058e"; - }) - ]; - buildInputs = - (self.nativeDeps."punycode" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "punycode" ]; - }; - by-spec."qs"."2.2.4" = - self.by-version."qs"."2.2.4"; - by-version."qs"."2.2.4" = lib.makeOverridable self.buildNodePackage { - name = "node-qs-2.2.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-2.2.4.tgz"; - name = "qs-2.2.4.tgz"; - sha1 = "2e9fbcd34b540e3421c924ecd01e90aa975319c8"; + url = "http://registry.npmjs.org/qs/-/qs-2.4.2.tgz"; + name = "qs-2.4.2.tgz"; + sha1 = "f7ce788e5777df0b5010da7f7c4e73ba32470f5a"; }) ]; buildInputs = (self.nativeDeps."qs" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "qs" ]; @@ -1197,7 +1443,8 @@ by-spec."qs"."~0.6.0" = self.by-version."qs"."0.6.6"; by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage { - name = "node-qs-0.6.6"; + name = "qs-0.6.6"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; @@ -1207,8 +1454,8 @@ ]; buildInputs = (self.nativeDeps."qs" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "qs" ]; @@ -1216,7 +1463,8 @@ by-spec."range-parser"."~1.0.2" = self.by-version."range-parser"."1.0.2"; by-version."range-parser"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-range-parser-1.0.2"; + name = "range-parser-1.0.2"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"; @@ -1226,29 +1474,30 @@ ]; buildInputs = (self.nativeDeps."range-parser" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "range-parser" ]; }; - by-spec."raw-body"."1.3.0" = - self.by-version."raw-body"."1.3.0"; - by-version."raw-body"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-raw-body-1.3.0"; + by-spec."raw-body"."~2.0.1" = + self.by-version."raw-body"."2.0.1"; + by-version."raw-body"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "raw-body-2.0.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz"; - name = "raw-body-1.3.0.tgz"; - sha1 = "978230a156a5548f42eef14de22d0f4f610083d1"; + url = "http://registry.npmjs.org/raw-body/-/raw-body-2.0.1.tgz"; + name = "raw-body-2.0.1.tgz"; + sha1 = "2b70a3ffd1681c0521bae73454e0ccbc785d378e"; }) ]; buildInputs = (self.nativeDeps."raw-body" or []); - deps = [ - self.by-version."bytes"."1.0.0" - self.by-version."iconv-lite"."0.4.4" - ]; + deps = { + "bytes-2.0.1" = self.by-version."bytes"."2.0.1"; + "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8"; + }; peerDependencies = [ ]; passthru.names = [ "raw-body" ]; @@ -1256,7 +1505,8 @@ by-spec."request"."~2.34.0" = self.by-version."request"."2.34.0"; by-version."request"."2.34.0" = lib.makeOverridable self.buildNodePackage { - name = "node-request-2.34.0"; + name = "request-2.34.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz"; @@ -1266,92 +1516,96 @@ ]; buildInputs = (self.nativeDeps."request" or []); - deps = [ - self.by-version."qs"."0.6.6" - self.by-version."json-stringify-safe"."5.0.0" - self.by-version."forever-agent"."0.5.2" - self.by-version."node-uuid"."1.4.1" - self.by-version."mime"."1.2.11" - self.by-version."tough-cookie"."0.12.1" - self.by-version."form-data"."0.1.4" - self.by-version."tunnel-agent"."0.3.0" - self.by-version."http-signature"."0.10.0" - self.by-version."oauth-sign"."0.3.0" - self.by-version."hawk"."1.0.0" - self.by-version."aws-sign2"."0.5.0" - ]; + deps = { + "qs-0.6.6" = self.by-version."qs"."0.6.6"; + "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1"; + "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; + "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "tough-cookie-1.1.0" = self.by-version."tough-cookie"."1.1.0"; + "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; + "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0"; + "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; + "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0"; + "hawk-1.0.0" = self.by-version."hawk"."1.0.0"; + "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; + }; peerDependencies = [ ]; passthru.names = [ "request" ]; }; "request" = self.by-version."request"."2.34.0"; by-spec."rimraf"."2" = - self.by-version."rimraf"."2.2.8"; - by-version."rimraf"."2.2.8" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.2.8"; + self.by-version."rimraf"."2.3.4"; + by-version."rimraf"."2.3.4" = lib.makeOverridable self.buildNodePackage { + name = "rimraf-2.3.4"; + bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; - name = "rimraf-2.2.8.tgz"; - sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz"; + name = "rimraf-2.3.4.tgz"; + sha1 = "82d9bc1b2fcf31e205ac7b28138a025d08e9159a"; }) ]; buildInputs = (self.nativeDeps."rimraf" or []); - deps = [ - ]; + deps = { + "glob-4.5.3" = self.by-version."glob"."4.5.3"; + }; peerDependencies = [ ]; passthru.names = [ "rimraf" ]; }; - by-spec."send"."0.9.3" = - self.by-version."send"."0.9.3"; - by-version."send"."0.9.3" = lib.makeOverridable self.buildNodePackage { - name = "node-send-0.9.3"; + by-spec."send"."0.12.3" = + self.by-version."send"."0.12.3"; + by-version."send"."0.12.3" = lib.makeOverridable self.buildNodePackage { + name = "send-0.12.3"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.9.3.tgz"; - name = "send-0.9.3.tgz"; - sha1 = "b43a7414cd089b7fbec9b755246f7c37b7b85cc0"; + url = "http://registry.npmjs.org/send/-/send-0.12.3.tgz"; + name = "send-0.12.3.tgz"; + sha1 = "cd12dc58fde21e4f91902b39b2fda05a7a6d9bdc"; }) ]; buildInputs = (self.nativeDeps."send" or []); - deps = [ - self.by-version."debug"."2.0.0" - self.by-version."depd"."0.4.5" - self.by-version."destroy"."1.0.3" - self.by-version."escape-html"."1.0.1" - self.by-version."etag"."1.4.0" - self.by-version."fresh"."0.2.4" - self.by-version."mime"."1.2.11" - self.by-version."ms"."0.6.2" - self.by-version."on-finished"."2.1.0" - self.by-version."range-parser"."1.0.2" - ]; + deps = { + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + "depd-1.0.1" = self.by-version."depd"."1.0.1"; + "destroy-1.0.3" = self.by-version."destroy"."1.0.3"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "etag-1.6.0" = self.by-version."etag"."1.6.0"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "mime-1.3.4" = self.by-version."mime"."1.3.4"; + "ms-0.7.1" = self.by-version."ms"."0.7.1"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + }; peerDependencies = [ ]; passthru.names = [ "send" ]; }; - by-spec."serve-static"."~1.6.3" = - self.by-version."serve-static"."1.6.3"; - by-version."serve-static"."1.6.3" = lib.makeOverridable self.buildNodePackage { - name = "node-serve-static-1.6.3"; + by-spec."serve-static"."~1.9.3" = + self.by-version."serve-static"."1.9.3"; + by-version."serve-static"."1.9.3" = lib.makeOverridable self.buildNodePackage { + name = "serve-static-1.9.3"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.3.tgz"; - name = "serve-static-1.6.3.tgz"; - sha1 = "b214235d4d4516db050ea9f7b429b46212e79132"; + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.9.3.tgz"; + name = "serve-static-1.9.3.tgz"; + sha1 = "5f8da07323ad385ff3dc541f1a7917b2e436eb57"; }) ]; buildInputs = (self.nativeDeps."serve-static" or []); - deps = [ - self.by-version."escape-html"."1.0.1" - self.by-version."parseurl"."1.3.0" - self.by-version."send"."0.9.3" - self.by-version."utils-merge"."1.0.0" - ]; + deps = { + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "send-0.12.3" = self.by-version."send"."0.12.3"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + }; peerDependencies = [ ]; passthru.names = [ "serve-static" ]; @@ -1359,7 +1613,8 @@ by-spec."sntp"."0.2.x" = self.by-version."sntp"."0.2.4"; by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "node-sntp-0.2.4"; + name = "sntp-0.2.4"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; @@ -1369,9 +1624,9 @@ ]; buildInputs = (self.nativeDeps."sntp" or []); - deps = [ - self.by-version."hoek"."0.9.1" - ]; + deps = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + }; peerDependencies = [ ]; passthru.names = [ "sntp" ]; @@ -1379,7 +1634,8 @@ by-spec."tar"."~0.1.19" = self.by-version."tar"."0.1.20"; by-version."tar"."0.1.20" = lib.makeOverridable self.buildNodePackage { - name = "node-tar-0.1.20"; + name = "tar-0.1.20"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz"; @@ -1389,11 +1645,11 @@ ]; buildInputs = (self.nativeDeps."tar" or []); - deps = [ - self.by-version."block-stream"."0.0.7" - self.by-version."fstream"."0.1.31" - self.by-version."inherits"."2.0.1" - ]; + deps = { + "block-stream-0.0.8" = self.by-version."block-stream"."0.0.8"; + "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; peerDependencies = [ ]; passthru.names = [ "tar" ]; @@ -1402,7 +1658,8 @@ by-spec."tinycolor"."0.x" = self.by-version."tinycolor"."0.0.1"; by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-tinycolor-0.0.1"; + name = "tinycolor-0.0.1"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"; @@ -1412,28 +1669,28 @@ ]; buildInputs = (self.nativeDeps."tinycolor" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "tinycolor" ]; }; by-spec."tough-cookie".">=0.12.0" = - self.by-version."tough-cookie"."0.12.1"; - by-version."tough-cookie"."0.12.1" = lib.makeOverridable self.buildNodePackage { - name = "node-tough-cookie-0.12.1"; + self.by-version."tough-cookie"."1.1.0"; + by-version."tough-cookie"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "tough-cookie-1.1.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz"; - name = "tough-cookie-0.12.1.tgz"; - sha1 = "8220c7e21abd5b13d96804254bd5a81ebf2c7d62"; + url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"; + name = "tough-cookie-1.1.0.tgz"; + sha1 = "126d2490e66ae5286b6863debd4a341076915954"; }) ]; buildInputs = (self.nativeDeps."tough-cookie" or []); - deps = [ - self.by-version."punycode"."1.3.1" - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "tough-cookie" ]; @@ -1441,7 +1698,8 @@ by-spec."tunnel-agent"."~0.3.0" = self.by-version."tunnel-agent"."0.3.0"; by-version."tunnel-agent"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-tunnel-agent-0.3.0"; + name = "tunnel-agent-0.3.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; @@ -1451,29 +1709,30 @@ ]; buildInputs = (self.nativeDeps."tunnel-agent" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "tunnel-agent" ]; }; - by-spec."type-is"."~1.5.1" = - self.by-version."type-is"."1.5.2"; - by-version."type-is"."1.5.2" = lib.makeOverridable self.buildNodePackage { - name = "node-type-is-1.5.2"; + by-spec."type-is"."~1.6.2" = + self.by-version."type-is"."1.6.2"; + by-version."type-is"."1.6.2" = lib.makeOverridable self.buildNodePackage { + name = "type-is-1.6.2"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/type-is/-/type-is-1.5.2.tgz"; - name = "type-is-1.5.2.tgz"; - sha1 = "8291bbe845a904acfaffd05a41fdeb234bfa9e5f"; + url = "http://registry.npmjs.org/type-is/-/type-is-1.6.2.tgz"; + name = "type-is-1.6.2.tgz"; + sha1 = "694e83e5d110417e681cea278227f264ae406e33"; }) ]; buildInputs = (self.nativeDeps."type-is" or []); - deps = [ - self.by-version."media-typer"."0.3.0" - self.by-version."mime-types"."2.0.2" - ]; + deps = { + "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; + "mime-types-2.0.12" = self.by-version."mime-types"."2.0.12"; + }; peerDependencies = [ ]; passthru.names = [ "type-is" ]; @@ -1481,7 +1740,8 @@ by-spec."utils-merge"."1.0.0" = self.by-version."utils-merge"."1.0.0"; by-version."utils-merge"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-utils-merge-1.0.0"; + name = "utils-merge-1.0.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; @@ -1491,8 +1751,8 @@ ]; buildInputs = (self.nativeDeps."utils-merge" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "utils-merge" ]; @@ -1500,7 +1760,8 @@ by-spec."vary"."~1.0.0" = self.by-version."vary"."1.0.0"; by-version."vary"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-vary-1.0.0"; + name = "vary-1.0.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz"; @@ -1510,16 +1771,37 @@ ]; buildInputs = (self.nativeDeps."vary" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "vary" ]; }; + by-spec."wrappy"."1" = + self.by-version."wrappy"."1.0.1"; + by-version."wrappy"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "wrappy-1.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"; + name = "wrappy-1.0.1.tgz"; + sha1 = "1e65969965ccbc2db4548c6b84a6f2c5aedd4739"; + }) + ]; + buildInputs = + (self.nativeDeps."wrappy" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "wrappy" ]; + }; by-spec."ws"."~0.4.32" = self.by-version."ws"."0.4.32"; by-version."ws"."0.4.32" = lib.makeOverridable self.buildNodePackage { name = "ws-0.4.32"; + bin = true; src = [ (fetchurl { url = "http://registry.npmjs.org/ws/-/ws-0.4.32.tgz"; @@ -1529,12 +1811,12 @@ ]; buildInputs = (self.nativeDeps."ws" or []); - deps = [ - self.by-version."commander"."2.1.0" - self.by-version."nan"."1.0.0" - self.by-version."tinycolor"."0.0.1" - self.by-version."options"."0.0.6" - ]; + deps = { + "commander-2.1.0" = self.by-version."commander"."2.1.0"; + "nan-1.0.0" = self.by-version."nan"."1.0.0"; + "tinycolor-0.0.1" = self.by-version."tinycolor"."0.0.1"; + "options-0.0.6" = self.by-version."options"."0.0.6"; + }; peerDependencies = [ ]; passthru.names = [ "ws" ]; From ceea949bd09630a0dd9ef95c5946ebda877ba494 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 21 May 2015 14:38:25 -0500 Subject: [PATCH 516/615] kdeApps_15_04.okular: enable libspectre for PostScript --- pkgs/applications/kde-apps-15.04/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 5f6d7c0bb6da..9cab1775c425 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -385,6 +385,12 @@ let buildInputs = super.libksane.buildInputs ++ [scope.KDE4 saneBackends]; }; + okular = super.okular // { + nativeBuildInputs = + super.okular.nativeBuildInputs + ++ [ pkgs.pkgconfig ]; + }; + rocs = super.rocs // { buildInputs = super.rocs.buildInputs ++ (with kf5; [ kdelibs4support ]); }; From 30d9e6b1445cff3ab605e73a09bc64c8306f1551 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 20 May 2015 18:30:15 +0200 Subject: [PATCH 517/615] scribus: update from 1.4.4 to 1.4.5 --- pkgs/applications/office/scribus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index d0d6fd136efd..720a07afcfa3 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -3,11 +3,11 @@ , zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake }: stdenv.mkDerivation rec { - name = "scribus-1.4.4"; + name = "scribus-1.4.5"; src = fetchurl { - url = "mirror://sourceforge/scribus/scribus/${name}.tar.xz"; - sha256 = "1bhp09x8rgdhyq8b516226nn0p7pxd2arkfkf2vvvklca5arsfx4"; + url = "mirror://sourceforge/scribus/scribus/${name}.tar.bz2"; + sha256 = "1644ym79q7a1m5xf3xl1wf4kdk870np911jmpqdv2syjc42nyw4z"; }; enableParallelBuilding = true; From 3e06aa3aa9261fc1325811d7f813df12b89cfc6a Mon Sep 17 00:00:00 2001 From: codyopel Date: Thu, 21 May 2015 19:13:52 -0400 Subject: [PATCH 518/615] libssh: fix libsodium linking resolves pkg-config errors for anything linking against libssh --- pkgs/development/libraries/libssh/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 533cdc1a7093..e5d01f213cbc 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -35,8 +35,10 @@ stdenv.mkDerivation rec { sha256 = "0as07vz3h5qa14ysvgsddb90m1qh605p6ccv6kf1sr1k3wsbql85"; }; - nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ optHeimdal optZlib optLibsodium crypto ]; + postPatch = '' + # Fix headers to use libsodium instead of NaCl + sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c + ''; cmakeFlags = [ "-DWITH_GSSAPI=${if optHeimdal != null then "ON" else "OFF"}" @@ -56,13 +58,12 @@ stdenv.mkDerivation rec { "-DWITH_EXAMPLES=OFF" "-DWITH_NACL=${if optLibsodium != null then "ON" else "OFF"}" ] ++ stdenv.lib.optionals (optLibsodium != null) [ - "-DNACL_LIBRARY=${optLibsodium}/lib" + "-DNACL_LIBRARY=${optLibsodium}/lib/libsodium.so" "-DNACL_INCLUDE_DIR=${optLibsodium}/include" ]; - postPatch = '' - sed -i 's,nacl/,sodium/,g' include/libssh/curve25519.h src/curve25519.c - ''; + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ optHeimdal optZlib optLibsodium crypto ]; meta = with stdenv.lib; { description = "SSH client library"; From 276bd7f16efd1bd5a8c1b73f872f34115e550128 Mon Sep 17 00:00:00 2001 From: Chris Double Date: Fri, 22 May 2015 11:20:10 +1200 Subject: [PATCH 519/615] Update tor to 0.2.6.8 --- pkgs/tools/security/tor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 3e7d5e0e920c..c6a5917640e8 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libevent, openssl, zlib, torsocks }: stdenv.mkDerivation rec { - name = "tor-0.2.6.7"; + name = "tor-0.2.6.8"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "0v4yp29cxzb4zjpbqg97vs8q3qnhmk05wn9xilmb5l9faj5fhawc"; + sha256 = "0xlsc2pa7i8hm8dyilln6p4rb0pig62b9c31yp1m0hj5jqw3d2xq"; }; # Note: torsocks is specified as a dependency, as the distributed From 688e9ea04c19654e6702aba7cafb572c127f1fca Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Thu, 21 May 2015 21:02:49 -0400 Subject: [PATCH 520/615] ghcjs: bump ghcjs and ghcjs-boot fixes #7881 --- pkgs/development/compilers/ghcjs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 0547f80106be..696415f4562d 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -41,8 +41,8 @@ let version = "0.1.0"; ghcjsBoot = fetchgit { url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "19620b69257115a69306eec505a97ac843055e92"; # 7.10 branch - sha256 = "027md1glfakniccqq0z1pyrz5w4fy0myxmbl0h789rbcxz9ybv6n"; + rev = "5c3ca2db12bd3e92d3eeaead8bcb6b347174a30f"; # 7.10 branch + sha256 = "0rpfb73bd0maccg3bjf51l23byy0h2i47wph99wblmkdp8ywxkpf"; fetchSubmodules = true; }; shims = fetchgit { @@ -55,8 +55,8 @@ in mkDerivation (rec { inherit version; src = fetchgit { url = git://github.com/ghcjs/ghcjs.git; - rev = "d4322c2ae4467420b28eca99f0c0abd00caf5d4a"; # master branch - sha256 = "12mvl4l1i993j86n9wkwcs567jm13javghbxapjjsc7493xpmya5"; + rev = "15b7a34ddc11075a335e097f6109ad57ca03edab"; # master branch + sha256 = "0h6jdwd7lh3rkfsqpq3s6iavqkz1a88grzcxrcqj4rjilzdw288q"; }; isLibrary = true; isExecutable = true; From 4f943ef23720157d80084aff9646c25f4bf05a0f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 21 May 2015 19:06:03 -0700 Subject: [PATCH 521/615] nixos/lightdm: More changes --- .../services/x11/display-managers/lightdm.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index dedd0e63b5f1..f6de8c02b186 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -124,11 +124,6 @@ in config = mkIf cfg.enable { - assertions = [ { - assertion = !config.services.accounts-daemon.enable; - message = "Lightdm does not properly support gnome accountservice"; - } ]; - services.xserver.displayManager.slim.enable = false; services.xserver.displayManager.job = { @@ -148,8 +143,26 @@ in services.dbus.enable = true; services.dbus.packages = [ lightdm ]; - security.pam.services.lightdm = { allowNullPassword = true; startSession = true; }; - security.pam.services.lightdm-greeter = { allowNullPassword = true; startSession = true; }; + security.pam.services.lightdm = { + allowNullPassword = true; + startSession = true; + }; + security.pam.services.lightdm-greeter = { + allowNullPassword = true; + startSession = true; + text = '' + auth required pam_env.so + auth required pam_permit.so + + account required pam_permit.so + + password required pam_deny.so + + session required pam_env.so envfile=${config.system.build.pamEnvironment} + session required pam_unix.so + session optional ${pkgs.systemd}/lib/security/pam_systemd.so + ''; + }; users.extraUsers.lightdm = { createHome = true; From 31a273cb14cccdc3735db74597cb07db1e862704 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 21 May 2015 20:11:13 -0700 Subject: [PATCH 522/615] nixos/tinc: users are system users --- nixos/modules/services/networking/tinc.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index f9ca796ea652..2d43c3d962dd 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -154,6 +154,7 @@ in users.extraUsers = flip mapAttrs' cfg.networks (network: _: nameValuePair ("tinc.${network}") ({ description = "Tinc daemon user for ${network}"; + isSystemUser = true; }) ); From 8be00dc71dbe409447feddc42d26bdfaf38703a4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 22 May 2015 07:14:00 +0200 Subject: [PATCH 523/615] nixos/test-driver: Make tesseract OCR optional. By default this is now enabled, and it has to be explicitely enabled using "enableOCR = true". If it is set to false, any usage of getScreenText or waitForText will fail with an error suggesting to pass enableOCR. This should get rid of the rather large dependency on tesseract which we don't need for most tests. Note, that I'm using system("type -P") here to check whether tesseract is in PATH. I know it's a bashism but we already have other bashisms within the test scripts and we also run it with bash, so IMHO it's not a problem here. Signed-off-by: aszlig --- nixos/doc/manual/development/writing-nixos-tests.xml | 8 ++++++-- nixos/lib/test-driver/Machine.pm | 3 +++ nixos/lib/testing.nix | 11 +++++++++-- nixos/tests/installer.nix | 4 +++- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index 322778d1c209..b9da712b86f0 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -158,7 +158,9 @@ startAll; getScreenText Return a textual representation of what is currently visible on the machine's screen using optical character - recognition. + recognition. + This requires passing to the test + attribute set. @@ -248,7 +250,9 @@ startAll; waitForText Wait until the supplied regular expressions matches the textual contents of the screen by using optical character recognition - (see getScreenText). + (see getScreenText). + This requires passing to the test + attribute set. diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index d149634e9e62..824f23bcc4bb 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -499,6 +499,9 @@ sub screenshot { sub getScreenText { my ($self) = @_; + system("type -P tesseract &> /dev/null") == 0 + or die "getScreenText used but enableOCR is false"; + my $text; $self->nest("performing optical character recognition", sub { my $tmpbase = Cwd::abs_path(".")."/ocr"; diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 431e3de6a8ce..2039740a4578 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -27,7 +27,7 @@ rec { cp ${./test-driver/Logger.pm} $libDir/Logger.pm wrapProgram $out/bin/nixos-test-driver \ - --prefix PATH : "${qemu_kvm}/bin:${vde2}/bin:${netpbm}/bin:${coreutils}/bin:${tesseract}/bin" \ + --prefix PATH : "${qemu_kvm}/bin:${vde2}/bin:${netpbm}/bin:${coreutils}/bin" \ --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl" ''; }; @@ -68,7 +68,12 @@ rec { makeTest = - { testScript, makeCoverageReport ? false, name ? "unnamed", ... } @ t: + { testScript + , makeCoverageReport ? false + , enableOCR ? false + , name ? "unnamed" + , ... + } @ t: let testDriverName = "nixos-test-driver-${name}"; @@ -102,12 +107,14 @@ rec { vms="$(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)" wrapProgram $out/bin/nixos-test-driver \ --add-flags "$vms" \ + ${lib.optionalString enableOCR "--prefix PATH : '${tesseract}/bin'"} \ --run "testScript=\"\$(cat $out/test-script)\"" \ --set testScript '"$testScript"' \ --set VLANS '"${toString vlans}"' ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms wrapProgram $out/bin/nixos-run-vms \ --add-flags "$vms" \ + ${lib.optionalString enableOCR "--prefix PATH : '${tesseract}/bin'"} \ --set tests '"startAll; joinAll;"' \ --set VLANS '"${toString vlans}"' \ ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"} diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index f491b0460330..64f98141cc0e 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -252,12 +252,13 @@ let makeInstallerTest = name: { createPartitions, preBootCommands ? "", extraConfig ? "" , testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda" - , grubIdentifier ? "uuid" + , grubIdentifier ? "uuid", enableOCR ? false }: makeTest { inherit iso; name = "installer-" + name; nodes = if testChannel then { inherit webserver; } else { }; + inherit enableOCR; testScript = testScriptFun { inherit createPartitions preBootCommands testChannel grubVersion grubDevice grubIdentifier extraConfig; @@ -364,6 +365,7 @@ in { preLVM = true; }; ''; + enableOCR = true; preBootCommands = '' $machine->start; $machine->waitForText(qr/Enter passphrase/); From adb7581459f1351272e9a220723aa9f9db29963c Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 22 May 2015 07:45:59 +0200 Subject: [PATCH 524/615] tesseract: Allow to specify a subset of languages. Especially useful for our OCR based VM tests, where we only need the english language. By default the argument is null so all languages are included. If a list of language name is passed only those languages are enabled, for example: tesseract.override { enableLanguages = [ "eng" "spa" ]; }; To only enable support for English and Spanish languages. Signed-off-by: aszlig --- .../graphics/tesseract/default.nix | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index 83aff09e2aae..f20c868d4a0a 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -1,26 +1,31 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, leptonica, libpng, libtiff }: +{ stdenv, fetchurl, autoconf, automake, libtool, leptonica, libpng, libtiff +, enableLanguages ? null +}: + +with stdenv.lib; let majVersion = "3.02"; version = "${majVersion}.02"; - f = lang : sha256 : let - src = fetchurl { - url = "http://tesseract-ocr.googlecode.com/files/tesseract-ocr-${majVersion}.${lang}.tar.gz"; - inherit sha256; - }; - in - "tar xfvz ${src} -C $out/share/ --strip=1"; + mkLang = lang: sha256: let + src = fetchurl { + url = "http://tesseract-ocr.googlecode.com/files/tesseract-ocr-${majVersion}.${lang}.tar.gz"; + inherit sha256; + }; + in "tar xfvz ${src} -C $out/share/ --strip=1"; - extraLanguages = '' - ${f "cat" "0d1smiv1b3k9ay2s05sl7q08mb3ln4w5iiiymv2cs8g8333z8jl9"} - ${f "rus" "059336mkhsj9m3hwfb818xjlxkcdpy7wfgr62qwz65cx914xl709"} - ${f "spa" "1c9iza5mbahd9pa7znnq8yv09v5kz3gbd2sarcgcgc1ps1jc437l"} - ${f "nld" "162acxp1yb6gyki2is3ay2msalmfcsnrlsd9wml2ja05k94m6bjy"} - ${f "eng" "1y5xf794n832s3lymzlsdm2s9nlrd2v27jjjp0fd9xp7c2ah4461"} - ${f "slv" "0rqng43435cly32idxm1lvxkcippvc3xpxbfizwq5j0155ym00dr"} - ${f "jpn" "07v8pymd0iwyzh946lxylybda20gsw7p4fsb09jw147955x49gq9"} - ''; + wantLang = name: const (enableLanguages == null || elem name enableLanguages); + + extraLanguages = mapAttrsToList mkLang (filterAttrs wantLang { + cat = "0d1smiv1b3k9ay2s05sl7q08mb3ln4w5iiiymv2cs8g8333z8jl9"; + rus = "059336mkhsj9m3hwfb818xjlxkcdpy7wfgr62qwz65cx914xl709"; + spa = "1c9iza5mbahd9pa7znnq8yv09v5kz3gbd2sarcgcgc1ps1jc437l"; + nld = "162acxp1yb6gyki2is3ay2msalmfcsnrlsd9wml2ja05k94m6bjy"; + eng = "1y5xf794n832s3lymzlsdm2s9nlrd2v27jjjp0fd9xp7c2ah4461"; + slv = "0rqng43435cly32idxm1lvxkcippvc3xpxbfizwq5j0155ym00dr"; + jpn = "07v8pymd0iwyzh946lxylybda20gsw7p4fsb09jw147955x49gq9"; + }); in stdenv.mkDerivation rec { @@ -40,7 +45,7 @@ stdenv.mkDerivation rec { 'LIBLEPT_HEADERSDIR=${leptonica}/include' ''; - postInstall = extraLanguages; + postInstall = concatStrings extraLanguages; meta = { description = "OCR engine"; From f12208c5a4833b2b38fdd01cb7cfe23a7cfb79b7 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 22 May 2015 08:01:17 +0200 Subject: [PATCH 525/615] nixos/testing: Use stripped down tesseract only. Only include the English language for the VM tests, because we most likely won't need other languages. At least for now. Signed-off-by: aszlig --- nixos/lib/testing.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 2039740a4578..ee254ae187fd 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -91,6 +91,8 @@ rec { vms = map (m: m.config.system.build.vm) (lib.attrValues nodes); + ocrProg = tesseract.override { enableLanguages = [ "eng" ]; }; + # Generate onvenience wrappers for running the test driver # interactively with the specified network, and for starting the # VMs from the command line. @@ -107,14 +109,14 @@ rec { vms="$(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)" wrapProgram $out/bin/nixos-test-driver \ --add-flags "$vms" \ - ${lib.optionalString enableOCR "--prefix PATH : '${tesseract}/bin'"} \ + ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ --run "testScript=\"\$(cat $out/test-script)\"" \ --set testScript '"$testScript"' \ --set VLANS '"${toString vlans}"' ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms wrapProgram $out/bin/nixos-run-vms \ --add-flags "$vms" \ - ${lib.optionalString enableOCR "--prefix PATH : '${tesseract}/bin'"} \ + ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ --set tests '"startAll; joinAll;"' \ --set VLANS '"${toString vlans}"' \ ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"} From 2475a6a2393c2b3fd0d53a351ebc41a86c04639e Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 22 May 2015 08:10:17 +0200 Subject: [PATCH 526/615] nixos/test-driver: Fix bashism in Machine.pm. Thanks to @bjornfor for the note. Signed-off-by: aszlig --- nixos/lib/test-driver/Machine.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 824f23bcc4bb..db2c1a68692a 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -499,7 +499,7 @@ sub screenshot { sub getScreenText { my ($self) = @_; - system("type -P tesseract &> /dev/null") == 0 + system("command -v tesseract &> /dev/null") == 0 or die "getScreenText used but enableOCR is false"; my $text; From 3a507089583318a3e785d3290ce840a1e20d621b Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 21 May 2015 11:42:18 +0200 Subject: [PATCH 527/615] network-manager 1.0.0 -> 1.0.2 --- pkgs/tools/networking/network-manager-applet/default.nix | 2 +- pkgs/tools/networking/network-manager/default.nix | 9 +++++---- pkgs/tools/networking/network-manager/openconnect.nix | 2 +- pkgs/tools/networking/network-manager/openvpn.nix | 2 +- pkgs/tools/networking/network-manager/pptp.nix | 2 +- pkgs/tools/networking/network-manager/vpnc.nix | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 1ea61b0fea2b..adb1c86e4693 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz"; - sha256 = "0liia390bhkl09lvk2rplcwhmfbxpjffa1xszfawc0h00v9fivaz"; + sha256 = "1afri2zln5p59660hqzbwm2r8phx9inrm2bgp5scynzs8ddzh2kn"; }; buildInputs = [ diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 899577c6d19b..51812ff95b75 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz , udev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables , libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline -, gobjectIntrospection, modemmanager, openresolv, libndp, newt }: +, gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup }: stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/1.0/NetworkManager-${version}.tar.xz"; - sha256 = "0isrv1875whysnrf3fd1cz96xwd54nvj1rijk3fmx5qccznayris"; + sha256 = "1zq8jm1rc7n7amqa9xz1v93w2jnczg6942gyijsdpgllfiq8b4rm"; }; preConfigure = '' @@ -40,10 +40,11 @@ stdenv.mkDerivation rec { "--with-session-tracking=systemd" "--with-modem-manager-1" "--with-nmtui" + "--with-libsoup=yes" ]; buildInputs = [ wirelesstools udev libnl libuuid polkit ppp libndp - xz bluez5 gobjectIntrospection modemmanager readline newt ]; + xz bluez5 gobjectIntrospection modemmanager readline newt libsoup ]; propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ]; diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index 79e122447328..9416923c9e1e 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz"; - sha256 = "0przs8hzvb6wrf4gc0p9063x67qp9503396aknqq5f79xzw25wq6"; + sha256 = "03k05s3aaxcwrip3g3r13bx80wbg7vh5sssc7mvg27c4cdc0a2hj"; }; buildInputs = [ openconnect networkmanager libsecret ] diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index e48f4f32bf19..d4e1b50489c8 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz"; - sha256 = "1w0v3xah0wg467jy0fd3188zla8q4l1iq0zdy28bcdipin693bfh"; + sha256 = "1c2b74xhkjifc3g6n53gr2aj4s98qf0vydmqvbhl5azxqx5q4hqn"; }; buildInputs = [ openvpn networkmanager libsecret ] diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix index 782935045335..1dfce02981a3 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz"; - sha256 = "0xpflw6vp1ahvpz7mnnldqvk455wz2j7dahd9lxqs95frmjmq390"; + sha256 = "05r06f7f990z908jjnmmryrlshy28wcx7fbvnslmx9nicih7rjrp"; }; buildInputs = [ networkmanager pptp ppp libsecret ] diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix index 8e2bb2bbfc3d..1435e5ebf7c3 100644 --- a/pkgs/tools/networking/network-manager/vpnc.nix +++ b/pkgs/tools/networking/network-manager/vpnc.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz"; - sha256 = "154q6lcy99h00kyivjhsv21a2i4cw4ff35cbvh062bfd68wl3l2y"; + sha256 = "0055vshgnva969vb91k8zpdan34r9gy0ck3q3b9b616k0p2vy5ry"; }; buildInputs = [ vpnc networkmanager libsecret ] From 5d5044b2ecc98a19262fd2f37f123188363e7b73 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2015 23:52:24 +0200 Subject: [PATCH 528/615] Use mirror:// URIs for ftp.debian.org Provide a more robust experience for users with horrible network hardware (me). --- pkgs/applications/misc/xmove/default.nix | 2 +- pkgs/development/libraries/libresample/default.nix | 4 ++-- pkgs/development/tools/misc/ltrace/default.nix | 2 +- pkgs/os-specific/linux/cramfsswap/default.nix | 2 +- pkgs/tools/graphics/qrdecode/default.nix | 2 +- pkgs/tools/misc/mmv/default.nix | 4 ++-- pkgs/tools/networking/ssmtp/default.nix | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/xmove/default.nix b/pkgs/applications/misc/xmove/default.nix index 6612c22d4fee..a4427c11f6a5 100644 --- a/pkgs/applications/misc/xmove/default.nix +++ b/pkgs/applications/misc/xmove/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "xmove-2.0b2"; src = fetchurl { - url = http://ftp.debian.org/debian/pool/main/x/xmove/xmove_2.0beta2.orig.tar.gz; + url = mirror://debian/pool/main/x/xmove/xmove_2.0beta2.orig.tar.gz; sha256 = "0q310k3bi39vdk0kqqvsahnb1k6lx9hlx80iyxnkq59l6jxnhyhf"; }; diff --git a/pkgs/development/libraries/libresample/default.nix b/pkgs/development/libraries/libresample/default.nix index e8d4f98028f5..831292bf1d93 100644 --- a/pkgs/development/libraries/libresample/default.nix +++ b/pkgs/development/libraries/libresample/default.nix @@ -2,14 +2,14 @@ let patch = fetchurl { - url = http://ftp.debian.org/debian/pool/main/libr/libresample/libresample_0.1.3-3.diff.gz; + url = mirror://debian/pool/main/libr/libresample/libresample_0.1.3-3.diff.gz; sha256 = "063w8rqxw87fc89gas47vk0ll7xl8cy7d8g70gm1l62bqkkajklx"; }; in stdenv.mkDerivation { name = "libresample-0.1.3"; src = fetchurl { - url = http://ftp.debian.org/debian/pool/main/libr/libresample/libresample_0.1.3.orig.tar.gz; + url = mirror://debian/pool/main/libr/libresample/libresample_0.1.3.orig.tar.gz; sha256 = "05a8mmh1bw5afqx0kfdqzmph4x2npcs4idx0p0v6q95lwf22l8i0"; }; patches = [ patch ]; diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index 1d20d8eef456..c8f888f6dff7 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ltrace-0.7.3"; src = fetchurl { - url = ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.7.3.orig.tar.bz2; + url = mirror://debian/pool/main/l/ltrace/ltrace_0.7.3.orig.tar.bz2; sha256 = "00wmbdghqbz6x95m1mcdd3wd46l6hgcr4wggdp049dbifh3qqvqf"; }; diff --git a/pkgs/os-specific/linux/cramfsswap/default.nix b/pkgs/os-specific/linux/cramfsswap/default.nix index 6a309197dd7b..440f99b0ad6f 100644 --- a/pkgs/os-specific/linux/cramfsswap/default.nix +++ b/pkgs/os-specific/linux/cramfsswap/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "cramfsswap-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = http://ftp.debian.org/debian/pool/main/c/cramfsswap/cramfsswap_1.4.1.tar.gz; + url = mirror://debian/pool/main/c/cramfsswap/cramfsswap_1.4.1.tar.gz; sha256 = "0c6lbx1inkbcvvhh3y6fvfaq3w7d1zv7psgpjs5f3zjk1jysi9qd"; }; diff --git a/pkgs/tools/graphics/qrdecode/default.nix b/pkgs/tools/graphics/qrdecode/default.nix index edd0a96c689f..f84780ab3c39 100644 --- a/pkgs/tools/graphics/qrdecode/default.nix +++ b/pkgs/tools/graphics/qrdecode/default.nix @@ -11,7 +11,7 @@ let in rec { src = fetchurl { - url = "ftp://ftp.debian.org/debian/pool/main/libd/libdecodeqr/libdecodeqr_${version}.orig.tar.gz"; + url = "mirror://debian/pool/main/libd/libdecodeqr/libdecodeqr_${version}.orig.tar.gz"; sha256 = "1kmljwx69h7zq6zlp2j19bbpz11px45z1abw03acrxjyzz5f1f13"; }; diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix index e6e7eb505bfc..2d2d4e4a7416 100644 --- a/pkgs/tools/misc/mmv/default.nix +++ b/pkgs/tools/misc/mmv/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.01b"; src = fetchurl { - url = "http://ftp.debian.org/debian/pool/main/m/mmv/mmv_${version}.orig.tar.gz"; + url = "mirror://debian/pool/main/m/mmv/mmv_${version}.orig.tar.gz"; sha256 = "0399c027ea1e51fd607266c1e33573866d4db89f64a74be8b4a1d2d1ff1fdeef"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # Use Debian patched version, as upstream is no longer maintained and it # contains a _lot_ of fixes. (fetchurl { - url = "http://ftp.debian.org/debian/pool/main/m/mmv/mmv_${version}-15.diff.gz"; + url = "mirror://debian/pool/main/m/mmv/mmv_${version}-15.diff.gz"; sha256 = "9ad3e3d47510f816b4a18bae04ea75913588eec92248182f85dd09bc5ad2df13"; }) ]; diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix index cce44325316d..e2e0880114ff 100644 --- a/pkgs/tools/networking/ssmtp/default.nix +++ b/pkgs/tools/networking/ssmtp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "ssmtp-2.64"; src = fetchurl { - url = http://ftp.debian.org/debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2; + url = mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2; sha256 = "0dps8s87ag4g3jr6dk88hs9zl46h3790marc5c2qw7l71k4pvhr2"; }; From 87b27c9da530ffaa2aef18ccafcfd2189fa0989b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 May 2015 10:35:31 +0200 Subject: [PATCH 529/615] stress-ng 0.04.02 -> 0.04.03 --- pkgs/tools/system/stress-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index f67c556a6699..a61835dbd0c8 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, attr }: -let version = "0.04.02"; in +let version = "0.04.03"; in stdenv.mkDerivation rec { name = "stress-ng-${version}"; src = fetchurl { - sha256 = "1k7h58axycwwxbr5bqqpz1ypsqvv4k2knk2fpw402l4xx9643bqv"; + sha256 = "0slr7mk8yq9h8xsrmp6ysjhng0an30pj6p56q9ygabwymbp1a33l"; url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz"; }; From 1b76e29552bbdfcb549261e4c0971e3fbd7cc609 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 22 May 2015 10:43:03 +0200 Subject: [PATCH 530/615] README.md: add info about nixpkgs-channels repo --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 86a5568727ec..22107050e4fc 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,7 @@ [![Build Status](https://travis-ci.org/NixOS/nixpkgs.svg?branch=master)](https://travis-ci.org/NixOS/nixpkgs) [![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/pr)](http://www.issuestats.com/github/nixos/nixpkgs) [![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/issue)](http://www.issuestats.com/github/nixos/nixpkgs) -Nixpkgs is a collection of packages for [Nix](https://nixos.org/nix/) package -manager. +Nixpkgs is a collection of packages for the [Nix](https://nixos.org/nix/) package manager. It is periodically build and tested by the [hydra](http://hydra.nixos.org/) build daemon as so-called channels. To get channel information via git, add [nixpkgs-channels](https://github.com/NixOS/nixpkgs-channels.git) as a remote `git remote add nixpkgs-channels https://github.com/NixOS/nixpkgs-channels.git`. It is recommended to maintain custom changes on top of the `nixos-unstable` branch of `nixpkgs-channels`. For pull-requests, please rebase onto nixpkgs master. [NixOS](https://nixos.org/nixos/) linux distribution source code is located inside `nixos/` folder. From dfbd1ddb8beb5f49470770eb5511db1fd7e424c1 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 22 May 2015 10:55:06 +0200 Subject: [PATCH 531/615] README.md: more details for nixpkgs-channels --- README.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 22107050e4fc..1a48cd5a0733 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,20 @@ [![Build Status](https://travis-ci.org/NixOS/nixpkgs.svg?branch=master)](https://travis-ci.org/NixOS/nixpkgs) [![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/pr)](http://www.issuestats.com/github/nixos/nixpkgs) [![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/issue)](http://www.issuestats.com/github/nixos/nixpkgs) -Nixpkgs is a collection of packages for the [Nix](https://nixos.org/nix/) package manager. It is periodically build and tested by the [hydra](http://hydra.nixos.org/) build daemon as so-called channels. To get channel information via git, add [nixpkgs-channels](https://github.com/NixOS/nixpkgs-channels.git) as a remote `git remote add nixpkgs-channels https://github.com/NixOS/nixpkgs-channels.git`. It is recommended to maintain custom changes on top of the `nixos-unstable` branch of `nixpkgs-channels`. For pull-requests, please rebase onto nixpkgs master. +Nixpkgs is a collection of packages for the [Nix](https://nixos.org/nix/) package manager. It is periodically build and tested by the [hydra](http://hydra.nixos.org/) build daemon as so-called channels. To get channel information via git, add [nixpkgs-channels](https://github.com/NixOS/nixpkgs-channels.git) as a remote: + +``` +% git remote add channels git://github.com/NixOS/nixpkgs-channels.git +``` + +For stability and maximum binary package support, it is recommended to maintain custom changes on top of one of the channels, e.g. `nixos-14.12` for the latest release and `nixos-unstable` for the latest successfully build master: + +``` +% git remote update channels +% git rebase channels/nixos-14.12 +``` + +For pull-requests, please rebase onto nixpkgs `master`. [NixOS](https://nixos.org/nixos/) linux distribution source code is located inside `nixos/` folder. From 5f50f23013a62af86b211bb89e1ce60421ba9fe8 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 22 May 2015 11:23:09 +0200 Subject: [PATCH 532/615] nixos/tests/chromium: Detect popup using OCR. This will make the test a lot more reliable, because we no longer need to press ESC multiple times hoping that it will close the popup. Unfortunately in order to run this test I needed to locally revert the gyp update from a305e6855dd8723683c77635f45ae28411c8f36c. With the old gyp version however the test runs fine and it's able to properly detect the popup. Signed-off-by: aszlig --- nixos/tests/chromium.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 026433fc7ee9..2241bc9c3bca 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -9,6 +9,8 @@ import ./make-test.nix ( }: rec { name = "chromium"; + enableOCR = true; + machine.imports = [ ./common/x11.nix ]; machine.virtualisation.memorySize = 1024; @@ -106,15 +108,11 @@ import ./make-test.nix ( "ulimit -c unlimited; ". "$pkg/bin/chromium $args \"$url\" & disown" ); + $machine->waitForText(qr/Type to search or enter a URL to navigate/); $machine->waitUntilSucceeds("${xdo "check-startup" '' search --sync --onlyvisible --name "startup done" # close first start help popup 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 ''}"); From b26de392522176b9a176eb21bb5be4a5ac8d9062 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 22 May 2015 11:37:40 +0200 Subject: [PATCH 533/615] gyp: Revive old SVN version to build Chromium. Works around regression from a305e6855dd8723683c77635f45ae28411c8f36c. We're also marking it lowPrio to make sure nobody will accidentally reference it using nix-env -i. Until we have fixed #7402, we're going to build with the old gyp version to prevent being affected by https://crbug.com/462153. Signed-off-by: aszlig --- .../networking/browsers/chromium/common.nix | 2 +- pkgs/top-level/python-packages.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 247a27ca37be..3d85afef8f49 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -113,7 +113,7 @@ let glib gtk dbus_glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage - pythonPackages.gyp pythonPackages.ply pythonPackages.jinja2 + pythonPackages.gyp_svn1977 pythonPackages.ply pythonPackages.jinja2 ] ++ optional gnomeKeyringSupport libgnome_keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optional enableSELinux libselinux diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8d6e25e339e4..a6472829d231 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5833,6 +5833,28 @@ let }; }; + # Needed to build Chromium until #7402 is fixed. + gyp_svn1977 = pkgs.lowPrio (buildPythonPackage rec { + rev = "1977"; + name = "gyp-r${rev}"; + + src = pkgs.fetchsvn { + url = "http://gyp.googlecode.com/svn/trunk"; + inherit rev; + sha256 = "0vnr75yd3bidysiwl9lljvf1dv6v9m9xqdnx0hdgyl92w689n9j8"; + }; + + patches = optionals pkgs.stdenv.isDarwin [ + ../development/python-modules/gyp/no-darwin-cflags.patch + ]; + + meta = { + homepage = http://code.google.com/p/gyp; + license = stdenv.lib.licenses.bsd3; + description = "Generate Your Projects"; + }; + }); + guessit = buildPythonPackage rec { version = "0.9.4"; name = "guessit-${version}"; From 99e9710348e1d81aba86b3f81b90f945b15e76b7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 21 May 2015 14:00:42 +0200 Subject: [PATCH 534/615] thunderbird: Update to 31.7.0 Also enable parallel building, as it seems to work reliably for Firefox. --- .../networking/mailreaders/thunderbird/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 6d5dd577bf22..f2a088164d20 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -13,7 +13,7 @@ enableOfficialBranding ? false }: -let version = "31.6.0"; in +let version = "31.7.0"; in let verName = "${version}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2"; - sha1 = "147ba0f3c7da29a7814ee9ce4265fb107744559e"; + sha1 = "90e18f8ecccdaf1ee39493223a7e3ad8b3b7bede"; }; buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx @@ -84,6 +84,8 @@ stdenv.mkDerivation rec { ../mozilla/mach configure ''; + enableParallelBuilding = true; + buildPhase = "../mozilla/mach build"; installPhase = From c5fa23cb85c73c6401f45cdd2f49c327459d6ccc Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 22 May 2015 09:51:32 +0000 Subject: [PATCH 535/615] rman: add package --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c662b413caa4..3984747a51f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5427,6 +5427,8 @@ let remake = callPackage ../development/tools/build-managers/remake { }; + rman = callPackage ../development/tools/misc/rman { }; + rr = callPackage ../development/tools/analysis/rr { }; saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; From 01945507c595bf68281cf7a5b3b855d504394419 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 22 May 2015 11:43:39 +0200 Subject: [PATCH 536/615] README.md: add line breaks to make the file readable outside of Github --- README.md | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 1a48cd5a0733..9486759f468f 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,21 @@ -[logo -](https://nixos.org/nixos) +[logo](https://nixos.org/nixos) -[![Build Status](https://travis-ci.org/NixOS/nixpkgs.svg?branch=master)](https://travis-ci.org/NixOS/nixpkgs) [![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/pr)](http://www.issuestats.com/github/nixos/nixpkgs) [![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/issue)](http://www.issuestats.com/github/nixos/nixpkgs) +[![Build Status](https://travis-ci.org/NixOS/nixpkgs.svg?branch=master)](https://travis-ci.org/NixOS/nixpkgs) +[![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/pr)](http://www.issuestats.com/github/nixos/nixpkgs) +[![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/issue)](http://www.issuestats.com/github/nixos/nixpkgs) -Nixpkgs is a collection of packages for the [Nix](https://nixos.org/nix/) package manager. It is periodically build and tested by the [hydra](http://hydra.nixos.org/) build daemon as so-called channels. To get channel information via git, add [nixpkgs-channels](https://github.com/NixOS/nixpkgs-channels.git) as a remote: +Nixpkgs is a collection of packages for the [Nix](https://nixos.org/nix/) package +manager. It is periodically build and tested by the [hydra](http://hydra.nixos.org/) +build daemon as so-called channels. To get channel information via git, add +[nixpkgs-channels](https://github.com/NixOS/nixpkgs-channels.git) as a remote: ``` % git remote add channels git://github.com/NixOS/nixpkgs-channels.git ``` -For stability and maximum binary package support, it is recommended to maintain custom changes on top of one of the channels, e.g. `nixos-14.12` for the latest release and `nixos-unstable` for the latest successfully build master: +For stability and maximum binary package support, it is recommended to maintain +custom changes on top of one of the channels, e.g. `nixos-14.12` for the latest +release and `nixos-unstable` for the latest successfully build master: ``` % git remote update channels @@ -18,7 +24,8 @@ For stability and maximum binary package support, it is recommended to maintain For pull-requests, please rebase onto nixpkgs `master`. -[NixOS](https://nixos.org/nixos/) linux distribution source code is located inside `nixos/` folder. +[NixOS](https://nixos.org/nixos/) linux distribution source code is located inside +`nixos/` folder. * [NixOS installation instructions](https://nixos.org/nixos/manual/#ch-installation) * [Documentation (Nix Expression Language chapter)](https://nixos.org/nix/manual/#ch-expression-language) From e612ea59c05a6a50825bae6ffe8a2c60a096cabb Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 22 May 2015 10:04:44 +0000 Subject: [PATCH 537/615] rman: add expression --- pkgs/development/tools/misc/rman/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 pkgs/development/tools/misc/rman/default.nix diff --git a/pkgs/development/tools/misc/rman/default.nix b/pkgs/development/tools/misc/rman/default.nix new file mode 100644 index 000000000000..1d2a3cda2b6b --- /dev/null +++ b/pkgs/development/tools/misc/rman/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "rman-3.2"; + src = fetchurl { + url = mirror://sourceforge/polyglotman/3.2/rman-3.2.tar.gz; + sha256 = "0prdld6nbkdlkcgc2r1zp13h2fh8r0mlwxx423dnc695ddlk18b8"; + }; + makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/share/man"; + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/share/man + ''; + + meta = { + description = "Parse formatted man pages and man page source from most flavors of UNIX and converts them to HTML, ASCII, TkMan, DocBook, and other formats"; + license = "artistic"; + }; +} From 178c52e7adb9d8d350f5fc9843202d353be0c52d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 May 2015 13:20:42 +0200 Subject: [PATCH 538/615] Add Ubuntu 15.04 --- pkgs/build-support/vm/default.nix | 34 +++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 5aa1a9c092d2..b96ac19177a4 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1572,6 +1572,40 @@ rec { packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; + ubuntu1504i386 = { + name = "ubuntu-15.04-vivid-i386"; + fullName = "Ubuntu 15.04 Vivid (i386)"; + packagesLists = + [ (fetchurl { + url = mirror://ubuntu/dists/vivid/main/binary-i386/Packages.bz2; + sha256 = "0bf587152fa3fc3524bf3a3caaf46ea43cc640a27b2b448577232f014a3ec1e4"; + }) + (fetchurl { + url = mirror://ubuntu/dists/vivid/universe/binary-i386/Packages.bz2; + sha256 = "3452cff96eb715ca36b73d4d0cdffbf06064cbc30b1097e334a2e493b94c7fac"; + }) + ]; + urlPrefix = mirror://ubuntu; + packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; + }; + + ubuntu1504x86_64 = { + name = "ubuntu-15.04-vivid-amd64"; + fullName = "Ubuntu 15.04 Vivid (amd64)"; + packagesList = + [ (fetchurl { + url = mirror://ubuntu/dists/vivid/main/binary-amd64/Packages.bz2; + sha256 = "8f22c9bd389822702e65713e816250aa0d5829d6b3d75fd34f068de5f93de1d9"; + }) + (fetchurl { + url = mirror://ubuntu/dists/vivid/universe/binary-amd64/Packages.bz2; + sha256 = "feb88768e245a63ee04b0f3bcfc8899a1f03b2f831646dc2a59e4e58884b5cb9"; + }) + ]; + urlPrefix = mirror://ubuntu; + packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; + }; + debian40i386 = { name = "debian-4.0r9-etch-i386"; fullName = "Debian 4.0r9 Etch (i386)"; From a49afdf1743436ac07c9be9da1d27ea5461af571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Fri, 22 May 2015 14:27:00 +0200 Subject: [PATCH 539/615] idea.clion: 1.0.2 -> 1.0.3 idea.android-studio: 1.2.0.12 -> 1.2.1.1 --- pkgs/applications/editors/idea/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index c09d1447621b..9d42aecf5f0e 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -212,26 +212,26 @@ in android-studio = buildAndroidStudio rec { name = "android-studio-${version}"; - version = "1.2.0.12"; - build = "141.1890965"; + version = "1.2.1.1"; + build = "141.1903250"; description = "Android development environment based on IntelliJ IDEA"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" + "/android-studio-ide-${build}-linux.zip"; - sha256 = "01k96rql192ksnprc4yai97fcals7msf06m9bx1q7asn46887h7n"; + sha256 = "17n0hsw0655b2w7a3avj5hw6njhv4gayxnsj1bwi9p3dgzr5d5zp"; }; }; clion = buildClion rec { name = "clion-${version}"; - version = "1.0.2"; - build = "141.871"; + version = "1.0.3"; + build = "141.873"; description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/${name}.tar.gz"; - sha256 = "1b9lsgl71pbcr5br0vkr2gn09b98dl9ykdxlqwzqpwnv7ckqcb69"; + sha256 = "0ksxpml6fzj91hnzy59wlgz7q76dhc3715jalacq748y0i1jdh3f"; }; }; From 7aeab54129db66e979d85d6fa5820bef82b70a61 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Fri, 22 May 2015 09:10:47 -0400 Subject: [PATCH 540/615] Readme: Minor grammatical tweaks --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9486759f468f..672fc7495ded 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/issue)](http://www.issuestats.com/github/nixos/nixpkgs) Nixpkgs is a collection of packages for the [Nix](https://nixos.org/nix/) package -manager. It is periodically build and tested by the [hydra](http://hydra.nixos.org/) +manager. It is periodically built and tested by the [hydra](http://hydra.nixos.org/) build daemon as so-called channels. To get channel information via git, add [nixpkgs-channels](https://github.com/NixOS/nixpkgs-channels.git) as a remote: @@ -15,7 +15,7 @@ build daemon as so-called channels. To get channel information via git, add For stability and maximum binary package support, it is recommended to maintain custom changes on top of one of the channels, e.g. `nixos-14.12` for the latest -release and `nixos-unstable` for the latest successfully build master: +release and `nixos-unstable` for the latest successful build of master: ``` % git remote update channels From 86d299bc6ec739702c5c8d2aae3e2d6b2bb94b1e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 22 May 2015 14:23:21 +0200 Subject: [PATCH 541/615] nixos: add config.services.openssh.moduliFile option so that users can replace the default file from OpenSSH The man page for ssh-keygen(1) has a section "MODULI GENERATION" that describes how to generate your own moduli file. The following script might also be helpful: | #! /usr/bin/env bash | | moduliFiles=() | | generateModuli() | { | ssh-keygen -G "moduli-$1.candidates" -b "$1" | ssh-keygen -T "moduli-$1" -f "moduli-$1.candidates" | rm "moduli-$1.candidates" | } | | for (( i=0 ; i <= 16 ; ++i )); do | let bitSize="2048 + i * 128" | generateModuli "$bitSize" & | moduliFiles+=( "moduli-$bitSize" ) | done | wait | | echo >moduli "# Time Type Tests Tries Size Generator Modulus" | cat >>moduli "${moduliFiles[@]}" | rm "${moduliFiles[@]}" Note that generating moduli takes a long time, i.e. several hours on a fast machine! This patch resolves https://github.com/NixOS/nixpkgs/pull/5870. --- nixos/modules/services/networking/ssh/sshd.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 6cc86b4e4b5a..14d516ddbb66 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -268,6 +268,16 @@ in }; }; + moduliFile = mkOption { + example = "services.openssh.moduliFile = /etc/my-local-ssh-moduli;"; + type = types.path; + description = '' + Path to moduli file to install in + /etc/ssh/moduli. If this option is unset, then + the moduli file shipped with OpenSSH will be used. + ''; + }; + }; users.extraUsers = mkOption { @@ -286,8 +296,10 @@ in description = "SSH privilege separation user"; }; + services.openssh.moduliFile = mkDefault "${cfgc.package}/etc/ssh/moduli"; + environment.etc = authKeysFiles ++ [ - { source = "${cfgc.package}/etc/ssh/moduli"; + { source = cfg.moduliFile; target = "ssh/moduli"; } { text = knownHostsText; From da6567785b19de0ec934055108a6f04d177ef40e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 May 2015 15:40:25 +0200 Subject: [PATCH 542/615] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/134ac5a06c59c5385a7fe958c881515ceb8de45b with hackage2nix revision a31a6f02a9c437a93e5f13394aa2268f476433aa --- .../haskell-modules/hackage-packages.nix | 377 ++++++++++++------ 1 file changed, 253 insertions(+), 124 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 972d5d8f3829..cc084adabb27 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -19194,13 +19194,12 @@ self: { }: mkDerivation { pname = "analyze-client"; - version = "0.1.0.1"; - sha256 = "1k2x6srrf2cwiihhi2aacjy3bxyz59nczr49rnsxa0kk7gnkjngm"; + version = "0.1.0.2"; + sha256 = "12csrds628c3ff9giyc6q74jn1s2fbkdyagzbqcvnh3brnzsjvss"; buildDepends = [ base bytestring http-conduit MonadCatchIO-transformers mtl snap snap-core time ]; - jailbreak = true; homepage = "https://github.com/dbp/analyze-client"; description = "Client for analyze service"; license = stdenv.lib.licenses.bsd3; @@ -32562,8 +32561,8 @@ self: { }: mkDerivation { pname = "codex"; - version = "0.3"; - sha256 = "0sy9md1r44x0c0a9y012qc851hi5c0rj8fsbagdqy75ajlncp00s"; + version = "0.3.0.4"; + sha256 = "1fk3cw37ng80mw6nxv089sadzyf2s0m90c5rz936qpda06rqng08"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -32656,6 +32655,7 @@ self: { jailbreak = true; description = "Connector library for the coinbase exchange"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "colada" = callPackage @@ -33077,7 +33077,9 @@ self: { mkDerivation { pname = "comonad"; version = "4.2.6"; + revision = "1"; sha256 = "1dspysfyjk74di2wvv7xj8r92acqsynjl5gi3sh8m7hqb122m60i"; + editedCabalFile = "7a617c03c1147d1955930ac77cf2395f853195c2331468822aa58a5813b49556"; buildDepends = [ base containers contravariant distributive semigroups tagged transformers transformers-compat @@ -35599,8 +35601,8 @@ self: { ({ mkDerivation, array, base, containers, parallel }: mkDerivation { pname = "cpsa"; - version = "2.4.0"; - sha256 = "1xhqqrfz6jdmmil1b3awz1j7hfkcpla7vzindqdxhf99y81wd187"; + version = "2.5.0"; + sha256 = "1pdcpgfxba55sg19awcds8l6lw48waaz4dh43dlyb666hmhb2adh"; isLibrary = false; isExecutable = true; buildDepends = [ array base containers parallel ]; @@ -37036,14 +37038,13 @@ self: { ({ mkDerivation, base, GLUT, Yampa }: mkDerivation { pname = "cuboid"; - version = "0.14.1"; - sha256 = "10h14qzvv46pmqcwwsvil93da2g8ddk5cpqxwmi884v2svjvz7qm"; + version = "0.14.2"; + sha256 = "08l8qf98d5p9d5qyj3kh35rzp8fih77bd2pras4dkn7an39pmr6b"; isLibrary = false; isExecutable = true; buildDepends = [ base GLUT Yampa ]; description = "3D Yampa/GLUT Puzzle Game"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cuda" = callPackage @@ -49181,20 +49182,19 @@ self: { "flowdock" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , http-client, http-client-tls, lens, mtl, pipes, pipes-aeson - , pipes-http, pipes-parse, template-haskell, text - , unordered-containers, uuid + , http-client, http-client-tls, lens, lens-action, mtl, network + , pipes, pipes-aeson, pipes-http, pipes-parse, template-haskell + , text, unordered-containers, uuid }: mkDerivation { pname = "flowdock"; - version = "0.2.0.0"; - sha256 = "1lmjhy6cxdr86pia9v04h4q40w0401r3a2srsdhgwbgxzj3syi1r"; + version = "0.3.0.0"; + sha256 = "199n32q64gw6i381kn70x5avrh3r2al1nj3f90nibivpip886zgc"; buildDepends = [ aeson base base64-bytestring bytestring http-client http-client-tls - lens mtl pipes pipes-aeson pipes-http pipes-parse template-haskell - text unordered-containers uuid + lens lens-action mtl network pipes pipes-aeson pipes-http + pipes-parse template-haskell text unordered-containers uuid ]; - jailbreak = true; homepage = "https://github.com/brewtown/hs-flowdock"; description = "Flowdock client library for Haskell"; license = stdenv.lib.licenses.mit; @@ -49395,6 +49395,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "fold-debounce" = callPackage + ({ mkDerivation, base, data-default, hspec, stm, time }: + mkDerivation { + pname = "fold-debounce"; + version = "0.1.0.0"; + sha256 = "1g22npjhjc35n05gyqrfk9cqr3m976cgdav3f8w1f2hbwvnfbxy7"; + buildDepends = [ base data-default stm time ]; + testDepends = [ base hspec stm ]; + homepage = "https://github.com/debug-ito/fold-debounce"; + description = "Fold multiple events that happen in a given period of time"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "foldl" = callPackage ({ mkDerivation, base, bytestring, containers, mwc-random , primitive, text, transformers, vector @@ -52236,9 +52249,9 @@ self: { ({ mkDerivation, async, base, Cabal, containers, data-default , deepseq, directory, djinn-ghc, doctest, emacs, filepath, ghc , ghc-paths, ghc-syb-utils, haskell-src-exts, hlint, hspec - , io-choice, makeWrapper, monad-control, monad-journal, mtl - , old-time, pretty, process, split, syb, temporary, text, time - , transformers, transformers-base + , io-choice, monad-control, monad-journal, mtl, old-time, pretty + , process, split, syb, temporary, text, time, transformers + , transformers-base }: mkDerivation { pname = "ghc-mod"; @@ -52259,7 +52272,7 @@ self: { monad-control monad-journal mtl old-time pretty process split syb temporary text time transformers transformers-base ]; - buildTools = [ emacs makeWrapper ]; + buildTools = [ emacs ]; configureFlags = "--datasubdir=ghc-mod-5.2.1.2"; postInstall = '' cd $out/share/ghc-mod-5.2.1.2 @@ -52272,7 +52285,7 @@ self: { homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; description = "Happy Haskell Programming"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) emacs; inherit (pkgs) makeWrapper;}; + }) { inherit (pkgs) emacs;}; "ghc-mtl" = callPackage ({ mkDerivation, base, exceptions, extensible-exceptions, ghc, mtl @@ -52316,8 +52329,8 @@ self: { ({ mkDerivation, base, cpphs, ghc, happy }: mkDerivation { pname = "ghc-parser"; - version = "0.1.6.0"; - sha256 = "1j0axpzm1ysi6sv80rr2bka1wycinrnqvkpnxlb18yb3zbwijz76"; + version = "0.1.7.0"; + sha256 = "0cb0d9szrimlflxh67ad74cqfi6yc2cr1bcl17c6b23ccnyqbq73"; buildDepends = [ base ghc ]; buildTools = [ cpphs happy ]; patchPhase = '' @@ -52389,8 +52402,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ghc-prof-flamegraph"; - version = "0.1.1.0"; - sha256 = "0vc456155wsf0qgzih4m3lijzxx99rxpfa149hh8zcqsx1pgq7gm"; + version = "0.1.2.1"; + sha256 = "0nzk3h65iqnmva7n2m00kknllqbmg95xav4g5rpizhridpivg9hb"; isLibrary = true; isExecutable = true; buildDepends = [ base ]; @@ -53278,19 +53291,18 @@ self: { ({ mkDerivation, base, base16-bytestring, bytestring, conduit , conduit-combinators, containers, directory, exceptions, filepath , hashable, lifted-async, lifted-base, monad-control, monad-logger - , mtl, resourcet, semigroups, system-filepath, tagged, text, time - , transformers, unix, unordered-containers + , mtl, resourcet, semigroups, tagged, text, time, transformers + , unix, unordered-containers }: mkDerivation { pname = "gitlib"; - version = "3.1.0.1"; - sha256 = "0h6drwxb8nc3nsw9b5w6xaqpwnila0i546w4xykxb61lybjdmw2g"; + version = "3.1.0.2"; + sha256 = "05l5i2s0212sx3bzw6r9njanjv1q1gmqc7f6g1z1sy9fibyxcwah"; buildDepends = [ base base16-bytestring bytestring conduit conduit-combinators containers directory exceptions filepath hashable lifted-async lifted-base monad-control monad-logger mtl resourcet semigroups - system-filepath tagged text time transformers unix - unordered-containers + tagged text time transformers unix unordered-containers ]; description = "API library for working with Git repositories"; license = stdenv.lib.licenses.mit; @@ -53301,17 +53313,19 @@ self: { , containers, directory, exceptions, gitlib, gitlib-test, hspec , hspec-expectations, monad-control, mtl, old-locale, parsec , process-extras, shelly, system-filepath, tagged, text, time - , transformers, transformers-base, unordered-containers + , time-locale-compat, transformers, transformers-base + , unordered-containers }: mkDerivation { pname = "gitlib-cmdline"; - version = "3.1.0.1"; - sha256 = "1vsn7sz71vj79ghcn9wmzf0jnjnaiibvx0k4q8vm4q8aqnl7rvl4"; + version = "3.1.0.2"; + sha256 = "1dridps65mw06r9slza80vl21f5n1kq1if7gnwcrbagicvy45p0k"; buildDepends = [ base bytestring conduit conduit-combinators containers directory exceptions gitlib monad-control mtl old-locale parsec - process-extras shelly system-filepath tagged text time transformers - transformers-base unordered-containers + process-extras shelly system-filepath tagged text time + time-locale-compat transformers transformers-base + unordered-containers ]; testDepends = [ base gitlib gitlib-test hspec hspec-expectations system-filepath @@ -53351,8 +53365,8 @@ self: { }: mkDerivation { pname = "gitlib-libgit2"; - version = "3.1.0.4"; - sha256 = "0657m22xybk54rpyzhdv27089nh85a1n0v47w06q9h5pakq3vfv7"; + version = "3.1.0.5"; + sha256 = "1xnzks7jwl7d0xf7qgz9gmqf4n1yn3qvjrs73prla8n063kgdh95"; buildDepends = [ base bytestring conduit conduit-combinators containers directory exceptions fast-logger filepath gitlib hlibgit2 lifted-async @@ -53417,8 +53431,8 @@ self: { }: mkDerivation { pname = "gitlib-test"; - version = "3.1.0.2"; - sha256 = "0nny0fp1j3g5fsxskqnlwcqrrxn74yjxkg9avfqdgai8b585yka2"; + version = "3.1.0.3"; + sha256 = "07r970d6m15gri6xim71kl2vvml85jlb0vc51zb67gfsd6iby2py"; buildDepends = [ base bytestring conduit conduit-combinators exceptions gitlib hspec hspec-expectations HUnit monad-control tagged text time @@ -53541,6 +53555,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "glambda" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, containers, directory + , errors, haskeline, mtl, parsec, tasty, tasty-hunit + , template-haskell + }: + mkDerivation { + pname = "glambda"; + version = "1.0"; + sha256 = "01bqh7g76a02qvzqm8di6ig84k0v7crd9aljsg339h7d3y7grxhf"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + ansi-wl-pprint base containers directory errors haskeline mtl + parsec + ]; + testDepends = [ + ansi-wl-pprint base errors mtl parsec tasty tasty-hunit + template-haskell + ]; + homepage = "https://github.com/goldfirere/glambda"; + description = "A simply typed lambda calculus interpreter, written with GADTs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "glapp" = callPackage ({ mkDerivation, base, containers, GLFW-b, lens, mtl, OpenGL }: mkDerivation { @@ -63434,6 +63472,7 @@ self: { ]; description = "Hess-Smith panel code for inviscid 2-d airfoil analysis"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hfov" = callPackage @@ -65230,8 +65269,8 @@ self: { }: mkDerivation { pname = "hmatrix-gsl-stats"; - version = "0.2.1"; - sha256 = "1sfyvp5dlxcfqwpfwzqly9h8g26lm8470xaqcw6nj15dya1zl1fj"; + version = "0.3"; + sha256 = "1hwm8wm70qzhajqpxzyw652lv1hkrb0lskp3lfsmg1jsaakpckmm"; buildDepends = [ base binary hmatrix storable-complex ]; extraLibraries = [ blas lapack ]; homepage = "http://code.haskell.org/hmatrix-gsl-stats"; @@ -69525,6 +69564,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-monad-control" = callPackage + ({ mkDerivation, base, hspec-core, monad-control, transformers + , transformers-base + }: + mkDerivation { + pname = "hspec-monad-control"; + version = "0.1.0.0"; + sha256 = "07ry4nghrjbrlv6slv2a1m67r5ajdss7ifyzph0zwa96bjl1w124"; + buildDepends = [ + base hspec-core monad-control transformers transformers-base + ]; + description = "Orphan instances of MonadBase and MonadBaseControl for SpecM"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hspec-server" = callPackage ({ mkDerivation, base, containers, hspec, hspec-contrib, hspec-core , hspec-expectations, HUnit, process, regex-posix, temporary @@ -73227,8 +73281,8 @@ self: { }: mkDerivation { pname = "ihaskell"; - version = "0.6.0.0"; - sha256 = "15fsan1dxlmd7y31630rqrg9gaa205g3s89vlqnxjv0dfvs86qf0"; + version = "0.6.3.0"; + sha256 = "0apkidaa0b8xq80y8hvijpkwyv6vl3v8pq19lxjq53y3hs3nqcqm"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -73312,13 +73366,12 @@ self: { }: mkDerivation { pname = "ihaskell-charts"; - version = "0.2.0.0"; - sha256 = "0zncvhjr3nkpr80m5lhl52jq1ha8ml14bjkykkg6d2l1pqnrb3mg"; + version = "0.2.1.0"; + sha256 = "0gw737kg5sjmlf43b2wmnjq9k1p4mc5j4b5q50qa2q1n48lz8c0q"; buildDepends = [ base bytestring Chart Chart-cairo classy-prelude data-default-class directory ihaskell ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for charts types"; license = stdenv.lib.licenses.mit; @@ -73326,18 +73379,17 @@ self: { }) {}; "ihaskell-diagrams" = callPackage - ({ mkDerivation, base, bytestring, classy-prelude, diagrams + ({ mkDerivation, active, base, bytestring, classy-prelude, diagrams , diagrams-cairo, diagrams-lib, directory, ihaskell }: mkDerivation { pname = "ihaskell-diagrams"; - version = "0.2.0.0"; - sha256 = "1if010ky6raw4g0wl24iww1i8qygy4jwd4f8yi9axhxzqzknmqvi"; + version = "0.2.2.0"; + sha256 = "0nxspimzzz7pn7lbbgqfq3k83gp4kdxw3cj2c6dlzjvx1bhpqp74"; buildDepends = [ - base bytestring classy-prelude diagrams diagrams-cairo diagrams-lib - directory ihaskell + active base bytestring classy-prelude diagrams diagrams-cairo + diagrams-lib directory ihaskell ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for diagram types"; license = stdenv.lib.licenses.mit; @@ -73377,12 +73429,11 @@ self: { }: mkDerivation { pname = "ihaskell-juicypixels"; - version = "0.2.0.0"; - sha256 = "058a7wcksbmxq2nahyvpbckd24ziya5f99vmlb3l9wgy9a3i4v2k"; + version = "0.2.2.0"; + sha256 = "0c50xsdlmaq4fz92hicljjdpqwvsprw3a1z7fdfzwjdc25gkd2mr"; buildDepends = [ base bytestring classy-prelude directory ihaskell JuicyPixels ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package"; license = stdenv.lib.licenses.mit; @@ -73428,6 +73479,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ihaskell-plot" = callPackage + ({ mkDerivation, base, bytestring, classy-prelude, ihaskell, plot + }: + mkDerivation { + pname = "ihaskell-plot"; + version = "0.2.0.0"; + sha256 = "18ghf6fscqqbk3rag1g9rz3knm39r7i4mhj8sxmj195skrmkydpc"; + buildDepends = [ base bytestring classy-prelude ihaskell plot ]; + homepage = "http://www.github.com/gibiansky/ihaskell"; + description = "IHaskell display instance for Plot (from plot package)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ihaskell-rlangqq" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring , directory, filepath, ihaskell, ihaskell-blaze, Rlang-QQ, split @@ -73435,13 +73500,12 @@ self: { }: mkDerivation { pname = "ihaskell-rlangqq"; - version = "0.2.0.1"; - sha256 = "1si38n47p57kwqsmsqw9bnv4k6z3zd6n8f5kmsmmbcmjdqmi7i86"; + version = "0.2.2.0"; + sha256 = "1kjp7nmmwjh4wc2b5xqw5f8hg9jq3a8p6rdxcd61qp2iizm4r372"; buildDepends = [ 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; hydraPlatforms = stdenv.lib.platforms.none; @@ -75056,17 +75120,17 @@ self: { "ipython-kernel" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers , directory, filepath, mtl, parsec, SHA, tar, text, transformers - , unix, uuid, zeromq4-haskell + , uuid, zeromq4-haskell }: mkDerivation { pname = "ipython-kernel"; - version = "0.6.0.0"; - sha256 = "0pk49hz2ba2ikd96nymrlk7nrd5sw1fmy7xbx24hrri5izqfjjli"; + version = "0.6.1.0"; + sha256 = "1dmmrkph3myc67wp4ibx2l10dkxpkgzh7i4shbjbqag39ljb0q60"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base bytestring cereal containers directory filepath mtl - parsec SHA tar text transformers unix uuid zeromq4-haskell + parsec SHA tar text transformers uuid zeromq4-haskell ]; homepage = "http://github.com/gibiansky/IHaskell"; description = "A library for creating kernels for IPython frontends"; @@ -76435,8 +76499,8 @@ self: { }: mkDerivation { pname = "jose-jwt"; - version = "0.6"; - sha256 = "0bap7a7d984mz0ss04vva5m2qy0kly60r6plxrihvj381bnq69k4"; + version = "0.6.1"; + sha256 = "0bw7pwz4blcjwxipjy0s5y7ibkf09d6kfjpw1zmkhz6padi9pvwi"; buildDepends = [ aeson base base64-bytestring byteable bytestring cereal cipher-aes containers crypto-cipher-types crypto-numbers crypto-pubkey @@ -80047,8 +80111,8 @@ self: { }: mkDerivation { pname = "lens-action"; - version = "0.2"; - sha256 = "1paam0sk1p9cgnrg74qc08szipnb5pmp1vzq4pjaki7jrbh8fr74"; + version = "0.2.0.1"; + sha256 = "164fka3krz32zhxnhkylnkmgnx2qj4qvn6y1hfwwla4ddn0axm9n"; buildDepends = [ base comonad contravariant lens mtl profunctors semigroupoids semigroups transformers @@ -81245,6 +81309,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "line-break" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "line-break"; + version = "0.1.0.0"; + sha256 = "01w5bk58n14vni6cb8rc4ri3hpgism1c78jk605927yf2llxnc14"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base ]; + description = "Convert newlines in text"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "line2pdf" = callPackage ({ mkDerivation, base, bytestring, containers }: mkDerivation { @@ -81269,8 +81346,8 @@ self: { }: mkDerivation { pname = "linear"; - version = "1.18.1"; - sha256 = "1msj1h4mzlxj255lv085f1im7w741x4kl1v5pav4bx6ga886sp3z"; + version = "1.18.1.1"; + sha256 = "1qgpv6c3q4ljqc3223iyj49piqs9xx58zmnpvg76wkaygsnnzq9p"; buildDepends = [ adjunctions base binary bytes cereal containers deepseq distributive ghc-prim hashable lens reflection semigroupoids @@ -81281,7 +81358,6 @@ self: { base binary bytestring directory doctest filepath HUnit lens simple-reflect test-framework test-framework-hunit ]; - jailbreak = true; homepage = "http://github.com/ekmett/linear/"; description = "Linear Algebra"; license = stdenv.lib.licenses.bsd3; @@ -81377,34 +81453,33 @@ self: { }) {}; "linearscan" = callPackage - ({ mkDerivation, base, containers, mtl, transformers }: + ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }: mkDerivation { pname = "linearscan"; - version = "0.4.0.0"; - sha256 = "170dppl4hgfrxpqix19a7nf1dv46wc46s797h8ppa2j0xvcdf4xs"; - buildDepends = [ base containers mtl transformers ]; - jailbreak = true; + version = "0.5.0.0"; + sha256 = "0n8xcj5pkz50mkx4cvqh1iywlf9vrk6bk4d3lv8fa22ik88mdr15"; + buildDepends = [ base containers ghc-prim mtl transformers ]; homepage = "http://github.com/jwiegley/linearscan"; description = "Linear scan register allocator, formally verified in Coq"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linearscan-hoopl" = callPackage - ({ mkDerivation, base, containers, free, hoopl, hspec + ({ mkDerivation, base, containers, deepseq, free, hoopl, hspec , hspec-expectations, lens-family-core, linearscan, transformers }: mkDerivation { pname = "linearscan-hoopl"; - version = "0.4.0.1"; - sha256 = "0b8p1ij5rsap4z7cfs5byrn2ixm997ppl3z41m82kmk1vzsj04my"; + version = "0.5.0.0"; + sha256 = "0z8lhi4q89f1b2fk5a3vn0a9q9h4w81b0wjqdypb7bz5lisvvg0s"; buildDepends = [ base containers free hoopl linearscan transformers ]; testDepends = [ - base containers hoopl hspec hspec-expectations lens-family-core - linearscan transformers + base containers deepseq hoopl hspec hspec-expectations + lens-family-core linearscan transformers ]; - jailbreak = true; homepage = "http://github.com/jwiegley/linearscan-hoopl"; description = "Makes it easy to use the linearscan register allocator with Hoopl"; license = stdenv.lib.licenses.bsd3; @@ -81763,12 +81838,12 @@ self: { , bytestring, cmdargs, containers, deepseq, directory, filemanip , filepath, ghc-prim, hashable, intern, mtl, ocaml, parsec, pretty , process, syb, tasty, tasty-hunit, tasty-rerun, text, text-format - , transformers, unordered-containers + , transformers, unordered-containers, z3 }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.3.0.0"; - sha256 = "14hpvnf46xpw1c3jmi9v91116dv5sglsn4v0gfqxds1nabjw1c5s"; + version = "0.3.0.1"; + sha256 = "00s5ch8i96nqjy2kq6y3i25mji3ld6z8121ngpbz87zbgp3zwhaw"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -81780,13 +81855,13 @@ self: { testDepends = [ base directory filepath process tasty tasty-hunit tasty-rerun text ]; - buildTools = [ ocaml ]; + buildTools = [ ocaml z3 ]; configureFlags = [ "-fbuild-external" ]; homepage = "https://github.com/ucsd-progsys/liquid-fixpoint"; description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) ocaml;}; + }) { inherit (pkgs) ocaml; inherit (pkgs) z3;}; "liquidhaskell" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, bifunctors @@ -81795,12 +81870,12 @@ self: { , hashable, hpc, hscolour, intern, liquid-fixpoint, mtl , optparse-applicative, parsec, pretty, process, syb, tagged, tasty , tasty-hunit, tasty-rerun, template-haskell, text, time - , unordered-containers, vector + , unordered-containers, vector, z3 }: mkDerivation { pname = "liquidhaskell"; - version = "0.3.1.0"; - sha256 = "0dcrgbwchssp62n8ywkdfa70dvx186338s3gyyj7rlfvxilfqc7k"; + version = "0.4.0.1"; + sha256 = "079dj0kq1fznad34ydmqh0klhbky45c7mcyman1aqsnn7rlhh1nv"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -81814,12 +81889,12 @@ self: { base directory filepath optparse-applicative process tagged tasty tasty-hunit tasty-rerun ]; - doCheck = false; + buildTools = [ z3 ]; homepage = "http://goto.ucsd.edu/liquidhaskell"; description = "Liquid Types for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) { inherit (pkgs) z3;}; "lispparser" = callPackage ({ mkDerivation, base, parsec }: @@ -82670,8 +82745,8 @@ self: { }: mkDerivation { pname = "log"; - version = "0.1.1"; - sha256 = "0kzziark5y41ig6z3qaa66x5avibwp6k74qcs9jf38hnl9z74pfr"; + version = "0.2.0"; + sha256 = "1mm41m8vg7n6hnnrg47qy2pbhsxgykclz3wypjsf1zj5wbqdd2w0"; buildDepends = [ aeson aeson-pretty base bytestring deepseq exceptions hpqtypes monad-control monad-time mtl old-locale split stm text time @@ -83699,7 +83774,9 @@ self: { mkDerivation { pname = "machines"; version = "0.5.1"; + revision = "1"; sha256 = "1dyvyy0yv9qha1ff2nfrl304vmmbi4hd881jyj3xpqhgc3zz8ab2"; + editedCabalFile = "c50d5fcc8b1b5635539169a5da097a25c7a7b7e9b8cc582abba3703014ba2d1d"; buildDepends = [ base comonad containers free mtl pointed profunctors semigroups transformers void @@ -83716,8 +83793,8 @@ self: { }: mkDerivation { pname = "machines-directory"; - version = "0.2.0.4"; - sha256 = "059jxf636l4xy4dflp6imf2sbrb2sq5ig3mr13pjqx4s5agwcl8r"; + version = "0.2.0.6"; + sha256 = "03faha5zbxikbrz40wb0qar8qyjkzaylnk78ba925vms57dwwxva"; buildDepends = [ base directory filepath machines machines-io transformers ]; @@ -83732,8 +83809,8 @@ self: { }: mkDerivation { pname = "machines-io"; - version = "0.2.0.4"; - sha256 = "078xr6hh27ssv07vw85h5h297akvpar13m5sykf7m0rz8kzdybgk"; + version = "0.2.0.6"; + sha256 = "19xi9ia2f18nwqx58qb4l1hc2cv25jwcsl4qxd7snp4ynjyy6ln1"; buildDepends = [ base bytestring chunked-data machines transformers ]; @@ -91533,6 +91610,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-uri-static" = callPackage + ({ mkDerivation, base, doctest, network-uri, template-haskell }: + mkDerivation { + pname = "network-uri-static"; + version = "0.1.0.0"; + sha256 = "16b8jn72g76zd2gxzimnnj77l42y430y862sxzdnsclsnc7w4fn9"; + buildDepends = [ base network-uri template-haskell ]; + testDepends = [ base doctest ]; + homepage = "http://github.com/snakamura/network-uri-static"; + description = "A small utility to declare type-safe static URIs"; + license = stdenv.lib.licenses.mit; + }) {}; + "network-wai-router" = callPackage ({ mkDerivation, base, wai }: mkDerivation { @@ -92141,8 +92231,8 @@ self: { }: mkDerivation { pname = "not-gloss"; - version = "0.7.3.0"; - sha256 = "0c5i2c8z15ibdhq9czacazm8wzmngchnbw2hjyypq8vj7y8bhjs2"; + version = "0.7.4.0"; + sha256 = "11ikk8yia52qbaajcnwc7gq1jwwid12j8vzgn2v18j5d272lzwyc"; buildDepends = [ base binary bmp bytestring cereal GLUT OpenGL OpenGLRaw spatial-math time vector vector-binary-instances @@ -95434,8 +95524,8 @@ self: { }: mkDerivation { pname = "path"; - version = "0.3.0"; - sha256 = "1hxpylnbqn38biggrb18h9kva61hhpwsdsp76jbkn4kcbd3h48r4"; + version = "0.4.0"; + sha256 = "1576dlzrachkrxspsx4rnssmhmicja1pfd8z63g3zmz0m450dkpj"; buildDepends = [ base exceptions filepath template-haskell ]; testDepends = [ base hspec HUnit mtl ]; description = "Path"; @@ -97447,6 +97537,18 @@ self: { }) {}; "pipes-errors" = callPackage + ({ mkDerivation, base, errors, pipes }: + mkDerivation { + pname = "pipes-errors"; + version = "0.2.1"; + sha256 = "08i3rzqz7r5vkjfry0bdw3gpxjzhni8xmwwa6p8hdkixznjq7539"; + buildDepends = [ base errors pipes ]; + homepage = "https://github.com/jdnavarro/pipes-errors"; + description = "Integration between pipes and errors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "pipes-errors_0_3" = callPackage ({ mkDerivation, base, errors, pipes }: mkDerivation { pname = "pipes-errors"; @@ -106285,10 +106387,9 @@ self: { ({ mkDerivation, base, postgresql-simple, text }: mkDerivation { pname = "rivet-migration"; - version = "0.1.0.0"; - sha256 = "1ki6jk2shxh9r4kzpn1bsa1a7jc8vvpgigv4gg87sialr2k0f4zr"; + version = "0.1.0.1"; + sha256 = "1vg6ns5scq5nqyj2w070hswynji8pqfh654qa3zjda2xhna5mnbd"; buildDepends = [ base postgresql-simple text ]; - jailbreak = true; homepage = "https://github.com/dbp/rivet"; description = "Postgresql migration support for project management tool"; license = stdenv.lib.licenses.bsd3; @@ -109268,7 +109369,9 @@ self: { mkDerivation { pname = "semigroupoids"; version = "5.0.0.1"; + revision = "1"; sha256 = "0njand5df3ri7pr0jd12z7dfvcfw6xdm7z5ap0b4xcpy47ndcw8l"; + editedCabalFile = "30bb2d94a228945d3d719a7004d79c218479dbdf31f1e92f730378af57fd6575"; buildDepends = [ base base-orphans bifunctors comonad containers contravariant distributive semigroups tagged transformers transformers-compat @@ -109661,18 +109764,17 @@ self: { }) {}; "serf" = callPackage - ({ mkDerivation, attoparsec, attoparsec-conduit, base, conduit, mtl + ({ mkDerivation, attoparsec, base, conduit, conduit-extra, mtl , operational, process, resourcet, text }: mkDerivation { pname = "serf"; - version = "0.1.0.0"; - sha256 = "18ddr4pkr1zld49x6k3lcbrv9916s9r1mxfsi9nfrv7lbvrjmj3v"; + version = "0.1.1.0"; + sha256 = "0ry0shqmazxcsjxsh6amvz2fky2fy3wwlck7d331j8csz7fwdjfn"; buildDepends = [ - attoparsec attoparsec-conduit base conduit mtl operational process + attoparsec base conduit conduit-extra mtl operational process resourcet text ]; - jailbreak = true; homepage = "http://github.com/sanetracker/serf"; description = "Interact with Serf via Haskell"; license = stdenv.lib.licenses.mit; @@ -110388,8 +110490,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.15.1"; - sha256 = "0bdx2pclcnqbkdwv8jw6v7w21hn29dp9xbvsbfrnqjvb9f6p1my9"; + version = "0.15.2"; + sha256 = "1vjvfmscmja4f60ag619bca9xdpqlaj3ra2yacrmh1wdi5fzcrdf"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -113103,9 +113205,9 @@ self: { mkDerivation { pname = "snaplet-fay"; version = "0.3.3.11"; - revision = "1"; + revision = "2"; sha256 = "18g61qivc49g37zmb4qv2piwlgs572fmngdpsjdhjmrgqn049fjr"; - editedCabalFile = "754ad06e1c8e6fd26f362bdc3f83f0863e7f2e941ffcf8b753310aee2c1aad26"; + editedCabalFile = "6b536ac4ad158ceed55ca18802caf4e970caabce93af33d95579ac431a003e9d"; buildDepends = [ aeson base bytestring configurator directory fay filepath mtl snap snap-core transformers @@ -113662,6 +113764,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "snaplet-wordpress" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder + , bytestring, configurator, containers, data-default, either, hedis + , heist, hspec, hspec-snap, lens, map-syntax, mtl, snap, snap-core + , snaplet-redis, text, time, unordered-containers, vector, wreq + , xmlhtml + }: + mkDerivation { + pname = "snaplet-wordpress"; + version = "0.1.1.1"; + sha256 = "1l0hxv267qlih9bqa5a2mlarmy15wk5awg8pmjv7a358sm7k53kq"; + buildDepends = [ + aeson async attoparsec base blaze-builder bytestring configurator + containers data-default either hedis heist hspec hspec-snap lens + map-syntax mtl snap snap-core snaplet-redis text time + unordered-containers vector wreq xmlhtml + ]; + testDepends = [ + aeson base blaze-builder containers data-default either hedis heist + hspec hspec-snap lens mtl snap snaplet-redis text + unordered-containers xmlhtml + ]; + homepage = "https://github.com/dbp/snaplet-wordpress"; + description = "A snaplet that communicates with wordpress over its api"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "snappy" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, snappy , test-framework, test-framework-quickcheck2 @@ -119528,18 +119657,18 @@ self: { ({ mkDerivation, array, base, containers, deepseq, directory , exceptions, filepath, ghc, ghc-paths, ghc-prim, liquid-fixpoint , liquidhaskell, mtl, pretty, process, syb, tagged, tasty - , tasty-hunit, template-haskell, text, text-format, transformers - , unordered-containers, vector + , tasty-hunit, template-haskell, text, text-format, th-lift + , transformers, unordered-containers, vector }: mkDerivation { pname = "target"; - version = "0.1.1.0"; - sha256 = "1b6kbiqpx57ghi98ki4gbqclyl91rs113ayd51bx8wmwwbaag21v"; + version = "0.1.2.0"; + sha256 = "116wig7zr4x0qza1gx92b01jb962w59y716cxj5qkf78sv9pml6s"; buildDepends = [ base containers directory exceptions filepath ghc ghc-paths liquid-fixpoint liquidhaskell mtl pretty process syb tagged - template-haskell text text-format transformers unordered-containers - vector + template-haskell text text-format th-lift transformers + unordered-containers vector ]; testDepends = [ array base containers deepseq ghc ghc-prim liquid-fixpoint @@ -129210,15 +129339,15 @@ self: { }: mkDerivation { pname = "waddle"; - version = "0.1.0.2"; - sha256 = "00c6yd2ivrlgwp90q2p4s2ci4j4g40p0qsl29skg4jzw13rncchp"; + version = "0.1.0.3"; + sha256 = "1jvijw4bsg206cy8y49g1vz0y7j3p3xzq6jxz70w1gicrw5ja01c"; isLibrary = true; isExecutable = true; buildDepends = [ base binary bytestring case-insensitive containers ]; jailbreak = true; - description = "WAD file utilities"; + description = "DOOM WAD file utilities"; license = stdenv.lib.licenses.bsd3; }) {}; From 2e01d4a2b6a52f6bd4120d51078039751274d17e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 22 May 2015 11:19:11 +0200 Subject: [PATCH 543/615] haskell-pipes-errors: fix build of latest (non-default) version --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 628ffcfa4b71..b4393d7d4f0f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -837,4 +837,7 @@ self: super: { servant-jquery = dontDistribute super.servant-jquery; language-puppet = dontDistribute super.language-puppet; + # This needs the latest version of errors to compile. + pipes-errors_0_3 = super.pipes-errors_0_3.override { errors = self.errors_2_0_0; }; + } From f25d2e1a71c9eadf7429087ac640e650353850ff Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 22 May 2015 11:20:53 +0200 Subject: [PATCH 544/615] haskell-snap: drop obsolete override --- pkgs/development/haskell-modules/configuration-common.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b4393d7d4f0f..f7b039c6d6a2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -808,11 +808,6 @@ self: super: { # Obsolete for GHC versions after GHC 6.10.x. utf8-prelude = markBroken super.utf8-prelude; - # https://github.com/snapframework/snap/issues/148 - snap = overrideCabal super.snap (drv: { - patchPhase = "sed -i -e 's|attoparsec.*>=.*,|attoparsec,|' -e 's|lens.*>=.*|lens|' snap.cabal"; - }); - # https://github.com/jwiegley/gitlib/issues/46 gitlib = markBroken super.gitlib; gitlib-sample = dontDistribute super.gitlib-sample; From 791e865c3edddc57f6dbadb7fe1c2695eb91e5e6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 22 May 2015 11:31:26 +0200 Subject: [PATCH 545/615] haskell-token-bucket: disable test suite to avoid build failure because of an apparently trivial error --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f7b039c6d6a2..68302016bcf0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -835,4 +835,7 @@ self: super: { # This needs the latest version of errors to compile. pipes-errors_0_3 = super.pipes-errors_0_3.override { errors = self.errors_2_0_0; }; + # https://github.com/hvr/token-bucket/issues/3 + token-bucket = dontCheck super.token-bucket; + } From 4e3669b6eae36e7c5091881751c3ddc6fb61462a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 22 May 2015 12:06:28 +0200 Subject: [PATCH 546/615] haskell-configuration-ghc-7.10.x: update ticket URL for ghc-mod --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b1bd3fda7fe1..178a5906e6cb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -212,7 +212,7 @@ self: super: { pell = dontDistribute super.pell; quadratic-irrational = dontDistribute super.quadratic-irrational; - # https://github.com/kazu-yamamoto/ghc-mod/issues/467 + # https://github.com/kazu-yamamoto/ghc-mod/issues/437 ghc-mod = markBroken super.ghc-mod; HaRe = dontDistribute super.HaRe; ghc-imported-from = dontDistribute super.ghc-imported-from; From f3b68ea7e08853a870ed8187a599e6f06ba2eef2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 22 May 2015 13:37:44 +0200 Subject: [PATCH 547/615] haskell-gitlib has been fixed upstream. Resolves https://github.com/peti/nixpkgs/pull/6. --- pkgs/development/haskell-modules/configuration-common.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 68302016bcf0..9959f093f93e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -808,11 +808,6 @@ self: super: { # Obsolete for GHC versions after GHC 6.10.x. utf8-prelude = markBroken super.utf8-prelude; - # https://github.com/jwiegley/gitlib/issues/46 - gitlib = markBroken super.gitlib; - gitlib-sample = dontDistribute super.gitlib-sample; - gitlib-test = dontDistribute super.gitlib-test; - # https://github.com/yaccz/saturnin/issues/3 Saturnin = dontCheck super.Saturnin; From 1da49e714dcbf641d07fcad0793119cd069d89fb Mon Sep 17 00:00:00 2001 From: Boris Sukholitko Date: Fri, 22 May 2015 17:40:18 +0300 Subject: [PATCH 548/615] Upgrade to selenium 2.45 Without the upgrade, firefox driver is unusable, due to: https://code.google.com/p/selenium/issues/detail?id=8399 --- pkgs/development/tools/selenium/server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 6a009f5af09d..26435088aded 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { name = "selenium-server-standalone-${version}"; - version = "2.44.0"; + version = "2.45.0"; src = fetchurl { - url = "http://selenium-release.storage.googleapis.com/2.44/selenium-server-standalone-2.44.0.jar"; - sha256 = "1n53pyrxpmfh9lvr68d1l9rsiw7qr36farirpl3ivkyvnpm5iwm5"; + url = "http://selenium-release.storage.googleapis.com/2.45/selenium-server-standalone-2.45.0.jar"; + sha256 = "0yvmmngqff3k5si1js8v87nx3whlsx7q4p78v6ybqhsbv6idywhi"; }; unpackPhase = "true"; From e32332b9b58382a14c3c1ee809d638d153b310f3 Mon Sep 17 00:00:00 2001 From: Andrey Pavlov Date: Fri, 22 May 2015 19:11:27 +0300 Subject: [PATCH 549/615] Add python package: isort-3.9.6 --- pkgs/top-level/python-packages.nix | 98 ++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8d6e25e339e4..672a1ce6b929 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3532,6 +3532,30 @@ let }; }; + natsort = buildPythonPackage rec { + name = "natsort-4.0.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/n/natsort/${name}.tar.gz"; + md5 = "38cc0bb27c95bf549fe737d9f267f453"; + }; + + buildInputs = with self; + [ + hypothesis + pytestcov + pytestflakes + pytestpep8 + covCore + ]; + + meta = with stdenv.lib; { + description = "Natural sorting for python"; + homepage = https://github.com/SethMMorton/natsort; + license = licenses.mit; + }; + }; + logster = buildPythonPackage { name = "logster-7475c53822"; src = pkgs.fetchgit { @@ -3658,6 +3682,46 @@ let }; }; + pies = buildPythonPackage rec { + name = "pies-2.6.5"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pies/${name}.tar.gz"; + md5 = "caba1ce15d312bf68d65a5d2cf9ccff2"; + }; + + deps = if !isPy3k then [ self.pies2overrides self.enum34 ] + else if isPy33 then [ self.enum34 ] + else []; + + propagatedBuildInputs = deps; + + meta = with stdenv.lib; { + description = "The simplest way to write one program that runs on both Python 2 and Python 3"; + homepage = https://github.com/timothycrosley/pies; + license = licenses.mit; + }; + }; + + pies2overrides = pythonPackages.buildPythonPackage rec { + name = "pies2overrides-2.6.5"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pies2overrides/${name}.tar.gz"; + md5 = "e73716454a2560341edf99d8f6fe5135"; + }; + + propagatedBuildInputs = with self; [ ipaddress ]; + + meta = with stdenv.lib; { + description = "Defines override classes that should be included with pies only if running on Python2"; + homepage = https://github.com/timothycrosley/pies; + license = licenses.mit; + }; + }; + + poppler-qt4 = buildPythonPackage rec { name = "poppler-qt4-${version}"; version = "0.18.1"; @@ -6187,6 +6251,21 @@ let }; }; + ipaddress = buildPythonPackage rec { + name = "ipaddress-1.0.7"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/i/ipaddress/${name}.tar.gz"; + md5 = "5d9ecf415cced476f7781cf5b9ef70c4"; + }; + + meta = with stdenv.lib; { + description = "Port of the 3.3+ ipaddress module to 2.6, 2.7, and 3.2"; + homepage = https://github.com/phihag/ipaddress; + license = licenses.psfl; + }; + }; + ipdb = buildPythonPackage rec { name = "ipdb-0.8"; disabled = isPyPy; # setupterm: could not find terminfo database @@ -6220,6 +6299,25 @@ let }; }; + isort = buildPythonPackage rec { + name = "isort-3.9.6"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/i/isort/${name}.tar.gz"; + md5 = "c0f4a7b16fde265f2ff4842c3e1cdd05"; + }; + + buildInputs = with self; [ mock pytest ]; + + propagatedBuildInputs = with self; [ natsort pies ]; + + meta = with stdenv.lib; { + description = "A Python utility / library to sort Python imports"; + homepage = https://github.com/timothycrosley/isort; + license = licenses.mit; + }; + }; + jedi = buildPythonPackage (rec { name = "jedi-0.8.1"; From 4115f7794bdd40fe0f48da0412f57cb91cd8b282 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 22 May 2015 11:52:01 -0500 Subject: [PATCH 550/615] webkitgtk24x: update to webkitgtk-2.4.9, fix build --- pkgs/development/libraries/webkitgtk/2.4.nix | 8 +- .../libraries/webkitgtk/bug140241.patch | 59 ---- .../webkitgtk-2.4-gmutexlocker.patch | 276 ------------------ 3 files changed, 3 insertions(+), 340 deletions(-) delete mode 100644 pkgs/development/libraries/webkitgtk/bug140241.patch delete mode 100644 pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 5c868838c998..30d69a0253b8 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.4.8"; + version = "2.4.9"; meta = with stdenv.lib; { description = "Web content rendering engine, GTK+ port"; @@ -21,11 +21,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "08xxqsxpa63nzgbsz63vrdxdxgpysyiy7jdcjb57k1hprdcibwb8"; + sha256 = "0r651ar3p0f8zwl7764kyimxk5hy88cwy116pv8cl5l8hbkjkpxg"; }; - patches = [ ./webkitgtk-2.4-gmutexlocker.patch ./bug140241.patch ]; - CC = "cc"; prePatch = '' @@ -46,7 +44,7 @@ stdenv.mkDerivation rec { dontAddDisableDepTrack = true; nativeBuildInputs = [ - autoreconfHook/*bug140241.patch*/ perl python ruby bison gperf flex + autoreconfHook perl python ruby bison gperf flex pkgconfig which gettext gobjectIntrospection ]; diff --git a/pkgs/development/libraries/webkitgtk/bug140241.patch b/pkgs/development/libraries/webkitgtk/bug140241.patch deleted file mode 100644 index 8d8c1bae0be2..000000000000 --- a/pkgs/development/libraries/webkitgtk/bug140241.patch +++ /dev/null @@ -1,59 +0,0 @@ -@@ -, +, @@ - REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled - https://bugs.webkit.org/show_bug.cgi?id=140241 - Reviewed by NOBODY (OOPS!). - We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp - just when WebKit2 is enabled and we are not building for X11. - * GNUmakefile.list.am: ---- - Source/WebCore/ChangeLog | 12 ++++++++++++ - Source/WebCore/GNUmakefile.list.am | 8 ++++++++ - 2 files changed, 20 insertions(+) ---- a/Source/WebCore/ChangeLog -+++ a/Source/WebCore/ChangeLog -@@ -1,3 +1,15 @@ -+2015-01-16 Tomas Popela -+ -+ REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled -+ https://bugs.webkit.org/show_bug.cgi?id=140241 -+ -+ Reviewed by NOBODY (OOPS!). -+ -+ We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp -+ just when WebKit2 is enabled and we are not building for X11. -+ -+ * GNUmakefile.list.am: -+ - 2014-11-10 Csaba Osztrogonác - - Crash in WebCore::Node::getFlag ---- a/Source/WebCore/GNUmakefile.list.am -+++ a/Source/WebCore/GNUmakefile.list.am -@@ -6254,9 +6254,13 @@ endif # END USE_GLX - endif # END TARGET_X11 - - if TARGET_WAYLAND -+if !TARGET_X11 -+if ENABLE_WEBKIT2 - webcore_sources += \ - Source/WebCore/plugins/PluginPackageNone.cpp \ - Source/WebCore/plugins/PluginViewNone.cpp -+endif # END ENABLE_WEBKIT2 -+endif # END !TARGET_X11 - endif # END TARGET_WAYLAND - - if TARGET_X11_OR_WAYLAND -@@ -6305,9 +6309,13 @@ webcoregtk_sources += \ - endif # END TARGET_WIN32 - - if TARGET_QUARTZ -+if !TARGET_X11 -+if ENABLE_WEBKIT2 - webcore_sources += \ - Source/WebCore/plugins/PluginPackageNone.cpp \ - Source/WebCore/plugins/PluginViewNone.cpp -+endif # END ENABLE_WEBKIT2 -+endif # END !TARGET_X11 - platformgtk_sources += \ - Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \ - Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp diff --git a/pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch b/pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch deleted file mode 100644 index 1acfb87bfbcb..000000000000 --- a/pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch +++ /dev/null @@ -1,276 +0,0 @@ ---- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.orig 2015-04-13 18:39:20.763864030 +0200 -+++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2015-04-13 18:43:29.756164227 +0200 -@@ -118,7 +118,7 @@ - WebKitVideoSink* sink = reinterpret_cast(data); - WebKitVideoSinkPrivate* priv = sink->priv; - -- GMutexLocker lock(priv->bufferMutex); -+ WebCore::GMutexLocker lock(priv->bufferMutex); - GstBuffer* buffer = priv->buffer; - priv->buffer = 0; - priv->timeoutId = 0; -@@ -140,7 +140,7 @@ - WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink); - WebKitVideoSinkPrivate* priv = sink->priv; - -- GMutexLocker lock(priv->bufferMutex); -+ WebCore::GMutexLocker lock(priv->bufferMutex); - - if (priv->unlocked) - return GST_FLOW_OK; -@@ -279,7 +279,7 @@ - - static void unlockBufferMutex(WebKitVideoSinkPrivate* priv) - { -- GMutexLocker lock(priv->bufferMutex); -+ WebCore::GMutexLocker lock(priv->bufferMutex); - - if (priv->buffer) { - gst_buffer_unref(priv->buffer); -@@ -305,7 +305,7 @@ - WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv; - - { -- GMutexLocker lock(priv->bufferMutex); -+ WebCore::GMutexLocker lock(priv->bufferMutex); - priv->unlocked = false; - } - -@@ -330,7 +330,7 @@ - { - WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv; - -- GMutexLocker lock(priv->bufferMutex); -+ WebCore::GMutexLocker lock(priv->bufferMutex); - priv->unlocked = false; - return TRUE; - } ---- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.orig 2015-04-13 18:36:44.258046776 +0200 -+++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-04-13 18:44:10.004374397 +0200 -@@ -316,7 +316,7 @@ - #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS) - PassRefPtr MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper) - { -- GMutexLocker lock(m_bufferMutex); -+ WebCore::GMutexLocker lock(m_bufferMutex); - if (!m_buffer) - return nullptr; - -@@ -366,7 +366,7 @@ - g_return_if_fail(GST_IS_BUFFER(buffer)); - - { -- GMutexLocker lock(m_bufferMutex); -+ WebCore::GMutexLocker lock(m_bufferMutex); - gst_buffer_replace(&m_buffer, buffer); - } - -@@ -398,7 +398,7 @@ - if (!m_player->visible()) - return; - -- GMutexLocker lock(m_bufferMutex); -+ WebCore::GMutexLocker lock(m_bufferMutex); - if (!m_buffer) - return; - ---- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.orig 2015-04-13 18:37:20.083233858 +0200 -+++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-04-13 18:44:37.753519299 +0200 -@@ -346,7 +346,7 @@ - - switch (propID) { - case PROP_IRADIO_MODE: { -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - priv->iradioMode = g_value_get_boolean(value); - break; - } -@@ -364,7 +364,7 @@ - WebKitWebSrc* src = WEBKIT_WEB_SRC(object); - WebKitWebSrcPrivate* priv = src->priv; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - switch (propID) { - case PROP_IRADIO_MODE: - g_value_set_boolean(value, priv->iradioMode); -@@ -417,7 +417,7 @@ - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - bool seeking = priv->seekID; - -@@ -476,7 +476,7 @@ - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - priv->startID = 0; - priv->corsAccessCheck = CORSNoCheck; -@@ -573,7 +573,7 @@ - return ret; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - switch (transition) { - case GST_STATE_CHANGE_READY_TO_PAUSED: - GST_DEBUG_OBJECT(src, "READY->PAUSED"); -@@ -604,7 +604,7 @@ - gst_query_parse_duration(query, &format, NULL); - - GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format)); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (format == GST_FORMAT_BYTES && src->priv->size > 0) { - gst_query_set_duration(query, format, src->priv->size); - result = TRUE; -@@ -612,7 +612,7 @@ - break; - } - case GST_QUERY_URI: { -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - gst_query_set_uri(query, src->priv->uri); - result = TRUE; - break; -@@ -653,7 +653,7 @@ - WebKitWebSrc* src = WEBKIT_WEB_SRC(handler); - gchar* ret; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - ret = g_strdup(src->priv->uri); - return ret; - } -@@ -668,7 +668,7 @@ - return FALSE; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - g_free(priv->uri); - priv->uri = 0; -@@ -704,7 +704,7 @@ - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->needDataID) - return FALSE; -@@ -725,7 +725,7 @@ - - GST_DEBUG_OBJECT(src, "Need more data: %u", length); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (priv->needDataID || !priv->paused) { - return; - } -@@ -739,7 +739,7 @@ - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->enoughDataID) - return FALSE; -@@ -760,7 +760,7 @@ - - GST_DEBUG_OBJECT(src, "Have enough data"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (priv->enoughDataID || priv->paused) { - return; - } -@@ -774,7 +774,7 @@ - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->seekID) - return FALSE; -@@ -792,7 +792,7 @@ - WebKitWebSrcPrivate* priv = src->priv; - - GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (offset == priv->offset && priv->requestedOffset == priv->offset) - return TRUE; - -@@ -811,7 +811,7 @@ - void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player) - { - ASSERT(player); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - src->priv->player = player; - } - -@@ -841,7 +841,7 @@ - - mapGstBuffer(buffer); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - priv->buffer = adoptGRef(buffer); - locker.unlock(); - -@@ -867,7 +867,7 @@ - return; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - priv->corsAccessCheck = corsAccessCheck; - -@@ -966,7 +966,7 @@ - WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src); - WebKitWebSrcPrivate* priv = src->priv; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - GST_LOG_OBJECT(src, "Have %lld bytes of data", priv->buffer ? static_cast(gst_buffer_get_size(priv->buffer.get())) : length); - -@@ -1035,7 +1035,7 @@ - - GST_DEBUG_OBJECT(src, "Have EOS"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (!priv->seekID) { - locker.unlock(); - gst_app_src_end_of_stream(priv->appsrc); -@@ -1194,7 +1194,7 @@ - - GST_ERROR_OBJECT(src, "Request was blocked"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - uri.reset(g_strdup(src->priv->uri)); - locker.unlock(); - -@@ -1208,7 +1208,7 @@ - - GST_ERROR_OBJECT(src, "Cannot show URL"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - uri.reset(g_strdup(src->priv->uri)); - locker.unlock(); - From 06f3c4dba547835cc18228fc84814c9f53a96748 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 22 May 2015 20:41:59 +0200 Subject: [PATCH 551/615] daq: update to version 2.0.5 Fixes https://github.com/NixOS/nixpkgs/issues/7947. --- pkgs/applications/networking/ids/daq/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 287a4239c2c0..81a94ec540de 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -1,16 +1,16 @@ {stdenv, fetchurl, flex, bison, libpcap}: stdenv.mkDerivation rec { - name = "daq-2.0.4"; - + name = "daq-2.0.5"; + src = fetchurl { name = "${name}.tar.gz"; url = "http://www.snort.org/downloads/snort/${name}.tar.gz"; - sha256 = "0g15kny0s6mpqfc723jxv7mgjfh45izhwcidhjzh52fd04ysm552"; + sha256 = "0vdwb0r9kdlgj4g0i0swafbc7qik0zmks17mhqji8cl7hpdva13p"; }; - + buildInputs = [ flex bison libpcap ]; - + meta = { description = "Data AcQuisition library (DAQ), for packet I/O"; homepage = http://www.snort.org; From 177cbf7348ad74603c0dfc13503e4c02f5aaefdc Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 22 May 2015 21:46:26 +0200 Subject: [PATCH 552/615] fasd: remove pandoc dep (==haskell), update revision --- pkgs/tools/misc/fasd/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix index f34ce44633f3..aa1fa8f3c6c9 100644 --- a/pkgs/tools/misc/fasd/default.nix +++ b/pkgs/tools/misc/fasd/default.nix @@ -1,21 +1,18 @@ -{ stdenv, fetchgit, pandoc } : +{ stdenv, fetchgit } : let - rev = "287af2b80e0829b08dc6329b4fe8d8e5594d64b0"; + rev = "61ce53be996189e1c325916e45a7dc0aa89660e3"; in stdenv.mkDerivation { - name = "fasd-1.0.1"; + name = "fasd-git-2015-03-29"; src = fetchgit { url = "https://github.com/clvv/fasd.git"; inherit rev; - sha256 = "0kv9iyfdf916x0gab9fzs4vmsnkaqmb6kh4xna485nqij89xzkgs"; + sha256 = "1fd36ff065ae73de2d6b1bae2131c18c8c4dea98ca63d96b0396e8b291072b5e"; }; - # seems to be needed non-deterministically (timestamps?) - nativeBuildInputs = [ pandoc ]; - installPhase = '' PREFIX=$out make install ''; From 25a148fa196b944b3f134527da87e43d88c066f9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 22 May 2015 12:59:21 -0700 Subject: [PATCH 553/615] Refactor mkFlag / shouldUsePkg into the nixpkgs libraries --- lib/customisation.nix | 23 +++++ .../virtualization/qemu/default.nix | 93 +++++++++---------- .../libraries/kerberos/heimdal.nix | 13 +-- .../libraries/libgcrypt/default.nix | 15 +-- .../libraries/libmicrohttpd/default.nix | 10 +- pkgs/development/libraries/libssh/default.nix | 3 +- .../development/libraries/libssh2/default.nix | 10 +- .../development/libraries/libxml2/default.nix | 11 +-- .../development/libraries/ncurses/default.nix | 18 +--- .../development/libraries/nghttp2/default.nix | 15 +-- .../libraries/wiredtiger/default.nix | 12 +-- pkgs/misc/jackaudio/default.nix | 3 +- pkgs/misc/jackaudio/jack1.nix | 3 +- pkgs/os-specific/linux/ffado/default.nix | 4 +- pkgs/servers/pulseaudio/default.nix | 21 ++--- pkgs/servers/shishi/default.nix | 10 +- pkgs/stdenv/generic/default.nix | 2 + pkgs/tools/networking/curl/default.nix | 14 +-- 18 files changed, 104 insertions(+), 176 deletions(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index 91a25055df29..ca3dd4980da3 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -158,4 +158,27 @@ rec { drv' = (lib.head outputsList).value; in lib.deepSeq drv' drv'; + + /* Tests whether a derivation can be used by the current platform + Returns the derivation if true, otherwise null. */ + shouldUsePkgSystem = system: pkg_: let pkg = (builtins.tryEval pkg_).value; + in if lib.any (x: x == system) (pkg.meta.platforms or []) + then pkg + else null; + + /* Returns a configure flag string in an autotools format + trueStr: Prepended when cond is true + falseStr: Prepended when cond is false + cond: The condition for the prepended string type and value + name: The flag name + val: The value of the flag only set when cond is true */ + 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 ""}"; + + /* Flag setting helpers for autotools like packages */ + mkEnable = mkFlag "enable-" "disable-"; + mkWith = mkFlag "with-" "without-"; + mkOther = mkFlag "" "" true; } diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 5b23e36af83a..bf722431d910 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -27,65 +27,60 @@ , type ? "" }: +with stdenv; with stdenv.lib; let n = "qemu-2.3.0"; - 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; + isKvmOnly = type == "kvm-only"; + isNix = type == "nix"; - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - - optSDL2 = if type == "nix" then null else shouldUsePkg SDL2; - optGtk = if type == "nix" then null else shouldUsePkg gtk; - optLibcap = if type == "nix" then null else shouldUsePkg libcap; - optAttr = if type == "nix" then null else shouldUsePkg attr; - optGnutls = if type == "nix" then null else shouldUsePkg gnutls; - optCyrus_sasl = if type == "nix" then null else shouldUsePkg cyrus_sasl; - optLibjpeg = if type == "nix" then null else shouldUsePkg libjpeg; - optLibpng = if type == "nix" then null else shouldUsePkg libpng; - optNcurses = if type == "nix" then null else shouldUsePkg ncurses; - optCurl = if type == "nix" then null else shouldUsePkg curl; - optBluez = if type == "nix" then null else shouldUsePkg bluez; - optLibibverbs = if type == "nix" then null else shouldUsePkg libibverbs; - optLibrdmacm = if type == "nix" then null else shouldUsePkg librdmacm; - optLibuuid = if type == "nix" then null else shouldUsePkg libuuid; - optVde2 = if type == "nix" then null else shouldUsePkg vde2; + optSDL2 = if isNix then null else shouldUsePkg SDL2; + optGtk = if isNix then null else shouldUsePkg gtk; + optLibcap = if isNix then null else shouldUsePkg libcap; + optAttr = if isNix then null else shouldUsePkg attr; + optGnutls = if isNix then null else shouldUsePkg gnutls; + optCyrus_sasl = if isNix then null else shouldUsePkg cyrus_sasl; + optLibjpeg = if isNix then null else shouldUsePkg libjpeg; + optLibpng = if isNix then null else shouldUsePkg libpng; + optNcurses = if isNix then null else shouldUsePkg ncurses; + optCurl = if isNix then null else shouldUsePkg curl; + optBluez = if isNix then null else shouldUsePkg bluez; + optLibibverbs = if isNix then null else shouldUsePkg libibverbs; + optLibrdmacm = if isNix then null else shouldUsePkg librdmacm; + optLibuuid = if isNix then null else shouldUsePkg libuuid; + optVde2 = if isNix then null else shouldUsePkg vde2; optLibaio = shouldUsePkg libaio; optLibcap_ng = shouldUsePkg libcap_ng; - optSpice = if type == "nix" then null else shouldUsePkg spice; - optSpice_protocol = if type == "nix" then null else shouldUsePkg spice_protocol; - optLibceph = if type == "nix" then null else shouldUsePkg libceph; - optLibxfs = if type == "nix" then null else shouldUsePkg libxfs; - optNss = if type == "nix" then null else shouldUsePkg nss; - optNspr = if type == "nix" then null else shouldUsePkg nspr; - optLibusb = if type == "nix" then null else shouldUsePkg libusb; - optUsbredir = if type == "nix" then null else shouldUsePkg usbredir; - optMesa = if type == "nix" then null else shouldUsePkg mesa; - optLzo = if type == "nix" then null else shouldUsePkg lzo; - optSnappy = if type == "nix" then null else shouldUsePkg snappy; - optBzip2 = if type == "nix" then null else shouldUsePkg bzip2; - optLibseccomp = if type == "nix" then null else shouldUsePkg libseccomp; - optGlusterfs = if type == "nix" then null else shouldUsePkg glusterfs; - optLibssh2 = if type == "nix" then null else shouldUsePkg libssh2; - optNumactl = if type == "nix" then null else shouldUsePkg numactl; + optSpice = if isNix then null else shouldUsePkg spice; + optSpice_protocol = if isNix then null else shouldUsePkg spice_protocol; + optLibceph = if isNix then null else shouldUsePkg libceph; + optLibxfs = if isNix then null else shouldUsePkg libxfs; + optNss = if isNix then null else shouldUsePkg nss; + optNspr = if isNix then null else shouldUsePkg nspr; + optLibusb = if isNix then null else shouldUsePkg libusb; + optUsbredir = if isNix then null else shouldUsePkg usbredir; + optMesa = if isNix then null else shouldUsePkg mesa; + optLzo = if isNix then null else shouldUsePkg lzo; + optSnappy = if isNix then null else shouldUsePkg snappy; + optBzip2 = if isNix then null else shouldUsePkg bzip2; + optLibseccomp = if isNix then null else shouldUsePkg libseccomp; + optGlusterfs = if isNix then null else shouldUsePkg glusterfs; + optLibssh2 = if isNix then null else shouldUsePkg libssh2; + optNumactl = if isNix then null else shouldUsePkg numactl; hasSDLAbi = if optSDL2 != null then true else null; hasVirtfs = stdenv.isLinux && optLibcap != null && optAttr != null; - hasVnc = type != "nix"; + hasVnc = !isNix; hasVncTls = hasVnc && optGnutls != null; hasVncSasl = hasVnc && optCyrus_sasl != null; hasVncJpeg = hasVnc && optLibjpeg != null; hasVncPng = hasVnc && optLibpng != null; hasVncWs = hasVnc && optGnutls != null; - hasFdt = type != "nix"; + hasFdt = !isNix; hasRdma = optLibibverbs != null && optLibrdmacm != null; @@ -95,8 +90,8 @@ let hasNss = optNss != null && optNspr != null; - optLibpulseaudio = if type == "nix" then null else shouldUsePkg libpulseaudio; - optAlsaLib = if type == "nix" then null else shouldUsePkg alsaLib; + optLibpulseaudio = if isNix then null else shouldUsePkg libpulseaudio; + optAlsaLib = if isNix then null else shouldUsePkg alsaLib; audio = concatStringsSep "," ( optional (optSDL2 != null) "sdl" ++ optional (optLibpulseaudio != null) "pa" @@ -179,9 +174,9 @@ stdenv.mkDerivation rec { (mkEnable (optBluez != null) "bluez" null) (mkEnable stdenv.isLinux "kvm" null) (mkEnable hasRdma "rdma" null) - (mkEnable (type != "nix") "system" null) - (mkEnable (type != "kvm-only") "user" null) - (mkEnable (type != "kvm-only") "guest-base" null) + (mkEnable (!isNix) "system" null) + (mkEnable (!isKvmOnly) "user" null) + (mkEnable (!isKvmOnly) "guest-base" null) (mkEnable true "pie" null) (mkEnable (optLibuuid != null) "uuid" null) (mkEnable (optVde2 != null) "vde" null) @@ -189,7 +184,7 @@ stdenv.mkDerivation rec { (mkEnable hasLinuxAio "linux-aio" null) (mkEnable (optLibcap_ng != null) "cap-ng" null) (mkEnable (optAttr != null) "attr" null) - (mkEnable (type != "nix") "docs" null) + (mkEnable (!isNix) "docs" null) (mkEnable stdenv.isLinux "vhost-net" null) (mkEnable hasSpice "spice" null) (mkEnable (optLibceph != null) "rbd" null) @@ -212,7 +207,7 @@ stdenv.mkDerivation rec { (mkEnable (optLibuuid != null) "vhdx" null) (mkEnable (optGnutls != null) "quorum" null) (mkEnable (optNumactl != null) "numa" null) - ] ++ optionals (type == "kvm-only") [ + ] ++ optionals isKvmOnly [ (mkOther "target-list" targetList) ]; @@ -235,6 +230,6 @@ stdenv.mkDerivation rec { description = "A generic and open source machine emulator and virtualizer"; license = licenses.gpl2Plus; maintainers = with maintainers; [ viric shlevy eelco wkennington ]; - platforms = if type == "kvm-only" then platforms.linux else platforms.all; + platforms = if isKvmOnly then platforms.linux else platforms.all; }; } diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index b0de8c151460..6050891ba272 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -8,16 +8,9 @@ #, sqlite, db, ncurses, openssl, cyrus_sasl }: +with stdenv; +with stdenv.lib; 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; - - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - optOpenldap = shouldUsePkg openldap; optLibcap_ng = shouldUsePkg libcap_ng; optSqlite = shouldUsePkg sqlite; @@ -97,7 +90,7 @@ stdenv.mkDerivation rec { rmdir $out/libexec ''; - meta = with stdenv.lib; { + meta = { description = "an implementation of Kerberos 5 (and some more stuff) largely written in Sweden"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 7d327a499bcc..702d54392a6e 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -5,16 +5,9 @@ , libcap ? null, pth ? null }: +with stdenv; +with stdenv.lib; 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; - - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - optLibcap = shouldUsePkg libcap; #optPth = shouldUsePkg pth; optPth = null; # Broken as of 1.6.3 @@ -38,13 +31,13 @@ stdenv.mkDerivation rec { # Also make sure includes are fixed for callers who don't use libgpgcrypt-config postInstall = '' sed -i 's,#include ,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/gcrypt.h - '' + stdenv.lib.optionalString (!stdenv.isDarwin && optLibcap != null) '' + '' + optionalString (!stdenv.isDarwin && optLibcap != null) '' sed -i 's,\(-lcap\),-L${optLibcap}/lib \1,' $out/lib/libgcrypt.la ''; doCheck = true; - meta = with stdenv.lib; { + meta = { homepage = https://www.gnu.org/software/libgcrypt/; description = "General-pupose cryptographic library"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 9eca6bd84b99..c7892716c9d6 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -5,16 +5,8 @@ , openssl ? null, zlib ? null, libgcrypt ? null, gnutls ? null }: +with stdenv; 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; - - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - optOpenssl = shouldUsePkg openssl; optZlib = shouldUsePkg zlib; hasSpdy = optOpenssl != null && optZlib != null; diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index e5d01f213cbc..83efa5e65c95 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -7,9 +7,8 @@ , openssl ? null, libgcrypt ? null }: +with stdenv; let - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - # Prefer openssl cryptoStr = if shouldUsePkg openssl != null then "openssl" else if shouldUsePkg libgcrypt != null then "libgcrypt" diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 3434fde1a623..a8e8777f06ca 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -7,16 +7,8 @@ , openssl ? null, libgcrypt ? null }: +with stdenv; 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; - - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - # Prefer openssl cryptoStr = if shouldUsePkg openssl != null then "openssl" else if shouldUsePkg libgcrypt != null then "libgcrypt" diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 0d70a6502feb..77050a1d3b38 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -6,16 +6,8 @@ #TODO: share most stuff between python and non-python builds, perhaps via multiple-output +with stdenv; 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; - - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - optIcu = shouldUsePkg icu; optPython = shouldUsePkg python; optReadline = shouldUsePkg readline; @@ -25,6 +17,7 @@ let sitePackages = if optPython == null then null else "\${out}/lib/${python.libPrefix}/site-packages"; in +with stdenv.lib; stdenv.mkDerivation rec { name = "libxml2-${version}"; version = "2.9.2"; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index fd545e53625f..43fca875f58f 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -8,23 +8,11 @@ , unicode ? true }: +with stdenv.lib; 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; - - shouldUsePkg = pkg_: let - pkg = (builtins.tryEval pkg_).value; - in if stdenv.lib.any (x: x == stdenv.system) (pkg.meta.platforms or []) - then pkg - else null; - buildShared = !stdenv.isDarwin; - optGpm = shouldUsePkg gpm; + optGpm = stdenv.shouldUsePkg gpm; in stdenv.mkDerivation rec { name = "ncurses-5.9"; @@ -119,7 +107,7 @@ stdenv.mkDerivation rec { echo "INPUT(-lncurses)" > $out/lib/libcurses.so ''; - meta = with stdenv.lib; { + meta = { description = "Free software emulation of curses in SVR4 and more"; longDescription = '' diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index bc8c599a901f..d8fd36ecba63 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -8,16 +8,9 @@ , prefix ? "" }: +with stdenv; +with stdenv.lib; 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; - - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - isLib = prefix == "lib"; optOpenssl = if isLib then null else shouldUsePkg openssl; @@ -50,7 +43,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ optJansson optBoost optLibxml2 optJemalloc ] - ++ stdenv.lib.optionals hasApp [ optOpenssl optLibev optZlib ]; + ++ optionals hasApp [ optOpenssl optLibev optZlib ]; configureFlags = [ (mkEnable false "werror" null) @@ -68,7 +61,7 @@ stdenv.mkDerivation rec { (mkWith false "cython" null) ]; - meta = with stdenv.lib; { + meta = { homepage = http://nghttp2.org/; description = "an implementation of HTTP/2 in C"; license = licenses.mit; diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index da4dc9d6bbc3..514dcd5972af 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -5,17 +5,8 @@ , gperftools ? null, leveldb ? null }: -with stdenv.lib; +with stdenv; 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; - - shouldUsePkg = pkg: if pkg != null && any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - optLz4 = shouldUsePkg lz4; optSnappy = shouldUsePkg snappy; optZlib = shouldUsePkg zlib; @@ -24,6 +15,7 @@ let optGperftools = shouldUsePkg gperftools; optLeveldb = shouldUsePkg leveldb; in +with stdenv.lib; stdenv.mkDerivation rec { name = "wiredtiger-${version}"; version = "2.6.0"; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 47511cf58b0e..adddd3ac2116 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -9,10 +9,9 @@ , prefix ? "" }: +with stdenv; with stdenv.lib; let - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - libOnly = prefix == "lib"; optDbus = shouldUsePkg dbus; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 1c5c78548f5b..343c3af9cee7 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -4,9 +4,8 @@ , alsaLib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null }: +with stdenv; let - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - optAlsaLib = shouldUsePkg alsaLib; optDb = shouldUsePkg db; optLibuuid = shouldUsePkg libuuid; diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index b0f545b2171f..49a7d820a1cd 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -9,10 +9,8 @@ , prefix ? "" }: +with stdenv; let - - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - libOnly = prefix == "lib"; optLibjack2 = shouldUsePkg libjack2; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 8dee9a801e36..784b5a2ce94f 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -15,16 +15,8 @@ , prefix ? "" }: +with stdenv; 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; - - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - libOnly = prefix == "lib"; hasXlibs = xlibs != null; @@ -66,6 +58,7 @@ let simple = null; }.${databaseName}; in +with stdenv.lib; stdenv.mkDerivation rec { name = "${prefix}pulseaudio-${version}"; version = "6.0"; @@ -84,9 +77,9 @@ stdenv.mkDerivation rec { optLibcap valgrind optOss optCoreaudio optAlsaLib optEsound optGlib optGtk3 optGconf optAvahi optLibjack2 optLibasyncns optLirc optDbus optUdev optOpenssl optFftw optSpeexdsp optSystemd optWebrtc-audio-processing - ] ++ stdenv.lib.optionals hasXlibs (with xlibs; [ + ] ++ optionals hasXlibs (with xlibs; [ libX11 libxcb libICE libSM libXtst xextproto libXi - ]) ++ stdenv.lib.optionals (optBluez5 != null) [ optBluez5 optSbc ]; + ]) ++ optionals (optBluez5 != null) [ optBluez5 optSbc ]; preConfigure = '' # Performs and autoreconf @@ -162,7 +155,7 @@ stdenv.mkDerivation rec { # the alternative is to copy the files from /usr/include to src, but there are # probably a large number of files that would need to be copied (I stopped # after the seventh) - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin + NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-I/usr/include"; installFlags = [ @@ -170,11 +163,11 @@ stdenv.mkDerivation rec { "pulseconfdir=$(out)/etc/pulse" ]; - postInstall = stdenv.lib.optionalString libOnly '' + postInstall = optionalString libOnly '' rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}} ''; - meta = with stdenv.lib; { + meta = { description = "Sound server for POSIX and Win32 systems"; homepage = http://www.pulseaudio.org/; # Note: Practically, the server is under the GPL due to the diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index a97e6847a450..bc4e57ba116c 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -5,16 +5,8 @@ , pam ? null, libidn ? null, gnutls ? null }: +with stdenv; 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; - - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - optPam = shouldUsePkg pam; optLibidn = shouldUsePkg libidn; optGnutls = shouldUsePkg gnutls; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 7efd2ead2f8f..440e9e6b4d04 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -229,6 +229,8 @@ let || system == "armv7l-linux"; isBigEndian = system == "powerpc-linux"; + shouldUsePkg = lib.shouldUsePkgSystem system; + # Whether we should run paxctl to pax-mark binaries. needsPax = isLinux; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index ad2c9ec68970..8a101e9845a6 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -8,19 +8,12 @@ , suffix ? "" }: +with stdenv; +with stdenv.lib; 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; - - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - isLight = suffix == "light"; isFull = suffix == "full"; - nameSuffix = stdenv.lib.optionalString (suffix != "") "-${suffix}"; + nameSuffix = optionalString (suffix != "") "-${suffix}"; # Normal Depedencies optZlib = if isLight then null else shouldUsePkg zlib; @@ -35,7 +28,6 @@ let optOpenldap = if !isFull then null else shouldUsePkg openldap; optLibidn = if !isFull then null else shouldUsePkg libidn; in -with stdenv.lib; stdenv.mkDerivation rec { name = "curl${nameSuffix}-${version}"; version = "7.42.1"; From 3117e0c897522ec8431572de12449f676cc8c8be Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 22 May 2015 13:33:08 -0700 Subject: [PATCH 554/615] Refactor mkFlag out of old packages --- .../graphics/ImageMagick/default.nix | 68 +++++---- pkgs/development/libraries/lame/default.nix | 25 ++-- pkgs/development/libraries/libass/default.nix | 14 +- .../libraries/libinput/default.nix | 10 +- .../development/libraries/libwebp/default.nix | 30 ++-- pkgs/development/libraries/stxxl/default.nix | 6 +- .../development/libraries/wayland/default.nix | 6 +- pkgs/servers/mpd/default.nix | 64 ++++----- pkgs/servers/samba/4.x.nix | 12 +- pkgs/tools/filesystems/ceph/generic.nix | 7 - pkgs/tools/security/pinentry/default.nix | 15 +- pkgs/tools/system/rsyslog/default.nix | 131 +++++++++--------- 12 files changed, 173 insertions(+), 215 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 7ae24b38c01c..011e75fbc1ca 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -17,10 +17,6 @@ let else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64" else throw "ImageMagick is not supported on this platform."; - mkFlag = trueStr: falseStr: cond: val: "--${if cond then trueStr else falseStr}-${val}"; - mkWith = mkFlag "with" "without"; - mkEnable = mkFlag "enable" "disable"; - hasX11 = libX11 != null && libXext != null && libXt != null; in @@ -37,38 +33,38 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = [ - (mkEnable (libcl != null) "opencl") - (mkWith true "modules") - (mkWith true "gcc-arch=${arch}") - #(mkEnable true "hdri") This breaks some dependencies - (mkWith (perl != null) "perl") - (mkWith (jemalloc != null) "jemalloc") - (mkWith true "frozenpaths") - (mkWith (bzip2 != null) "bzlib") - (mkWith hasX11 "x") - (mkWith (zlib != null) "zlib") - (mkWith false "dps") - (mkWith (fftw != null) "fftw") - (mkWith (libfpx != null) "fpx") - (mkWith (djvulibre != null) "djvu") - (mkWith (fontconfig != null) "fontconfig") - (mkWith (freetype != null) "freetype") - (mkWith (ghostscript != null) "gslib") - (mkWith (graphviz != null) "gvc") - (mkWith (jbigkit != null) "jbig") - (mkWith (libjpeg != null) "jpeg") - (mkWith (lcms2 != null) "lcms2") - (mkWith false "lcms") - (mkWith (openjpeg != null) "openjp2") - (mkWith (liblqr1 != null) "lqr") - (mkWith (xz != null) "lzma") - (mkWith (openexr != null) "openexr") - (mkWith (pango != null) "pango") - (mkWith (libpng != null) "png") - (mkWith (librsvg != null) "rsvg") - (mkWith (libtiff != null) "tiff") - (mkWith (libwebp != null) "webp") - (mkWith (libxml2 != null) "xml") + (mkEnable (libcl != null) "opencl" null) + (mkWith true "modules" null) + (mkWith true "gcc-arch" arch) + #(mkEnable true "hdri" null) This breaks some dependencies + (mkWith (perl != null) "perl" null) + (mkWith (jemalloc != null) "jemalloc" null) + (mkWith true "frozenpaths" null) + (mkWith (bzip2 != null) "bzlib" null) + (mkWith hasX11 "x" null) + (mkWith (zlib != null) "zlib" null) + (mkWith false "dps" null) + (mkWith (fftw != null) "fftw" null) + (mkWith (libfpx != null) "fpx" null) + (mkWith (djvulibre != null) "djvu" null) + (mkWith (fontconfig != null) "fontconfig" null) + (mkWith (freetype != null) "freetype" null) + (mkWith (ghostscript != null) "gslib" null) + (mkWith (graphviz != null) "gvc" null) + (mkWith (jbigkit != null) "jbig" null) + (mkWith (libjpeg != null) "jpeg" null) + (mkWith (lcms2 != null) "lcms2" null) + (mkWith false "lcms" null) + (mkWith (openjpeg != null) "openjp2" null) + (mkWith (liblqr1 != null) "lqr" null) + (mkWith (xz != null) "lzma" null) + (mkWith (openexr != null) "openexr" null) + (mkWith (pango != null) "pango" null) + (mkWith (libpng != null) "png" null) + (mkWith (librsvg != null) "rsvg" null) + (mkWith (libtiff != null) "tiff" null) + (mkWith (libwebp != null) "webp" null) + (mkWith (libxml2 != null) "xml" null) ] ++ optional (dejavu_fonts != null) "--with-dejavu-font-dir=${dejavu_fonts}/share/fonts/truetype/" ++ optional (ghostscript != null) "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts/"; diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index 562e292791ab..4a61d188ef69 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -17,7 +17,7 @@ assert sndfileFileIOSupport -> (libsndfile != null); #assert mp3xSupport -> (analyzerHooksSupport && (gtk1 != null)); let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; + sndfileFileIO = if sndfileFileIOSupport then "sndfile" else "lame"; in with stdenv.lib; @@ -39,17 +39,18 @@ stdenv.mkDerivation rec { ++ optional sndfileFileIOSupport libsndfile; configureFlags = [ - (mkFlag nasmSupport "nasm") - (mkFlag cpmlSupport "cpml") - #(mkFlag efenceSupport "efence") - (if sndfileFileIOSupport then "--with-fileio=sndfile" else "--with-fileio=lame") - (mkFlag analyzerHooksSupport "analyzer-hooks") - (mkFlag decoderSupport "decoder") - (mkFlag frontendSupport "frontend") - (mkFlag frontendSupport "dynamic-frontends") - #(mkFlag mp3xSupport "mp3x") - (mkFlag mp3rtpSupport "mp3rtp") - (if debugSupport then "--enable-debug=alot" else "") + (mkEnable nasmSupport "nasm" null) + (mkEnable cpmlSupport "cpml" null) + #(mkEnable efenceSupport "efence" null) + (mkWith true "fileio" sndfileFileIO) + (mkEnable analyzerHooksSupport "analyzer-hooks" null) + (mkEnable decoderSupport "decoder" null) + (mkEnable frontendSupport "frontend" null) + (mkEnable frontendSupport "dynamic-frontends" null) + #(mkEnable mp3xSupport "mp3x" null) + (mkEnable mp3rtpSupport "mp3rtp" null) + ] ++ optional debugSupport [ + (mkEnable true "debug" "alot") ]; meta = { diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 2a9af50fcde9..77742c3d6259 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -13,10 +13,6 @@ assert encaSupport -> (enca != null); assert fontconfigSupport -> (fontconfig != null); assert harfbuzzSupport -> (harfbuzz != null); -let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; -in - with stdenv.lib; stdenv.mkDerivation rec { name = "libass-${version}"; @@ -28,11 +24,11 @@ stdenv.mkDerivation rec { }; configureFlags = [ - (mkFlag encaSupport "enca") - (mkFlag fontconfigSupport "fontconfig") - (mkFlag harfbuzzSupport "harfbuzz") - (mkFlag rasterizerSupport "rasterizer") - (mkFlag largeTilesSupport "large-tiles") + (mkEnable encaSupport "enca" null) + (mkEnable fontconfigSupport "fontconfig" null) + (mkEnable harfbuzzSupport "harfbuzz" null) + (mkEnable rasterizerSupport "rasterizer" null) + (mkEnable largeTilesSupport "large-tiles" null) ]; nativeBuildInputs = [ pkgconfig yasm ]; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 87d8154e5aa4..3b8b7565e779 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -9,10 +9,6 @@ assert documentationSupport -> doxygen != null && graphviz != null; assert eventGUISupport -> cairo != null && glib != null && gtk3 != null; assert testsSupport -> check != null && valgrind != null; -let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; -in - with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-0.15.0"; @@ -23,9 +19,9 @@ stdenv.mkDerivation rec { }; configureFlags = [ - (mkFlag documentationSupport "documentation") - (mkFlag eventGUISupport "event-gui") - (mkFlag testsSupport "tests") + (mkEnable documentationSupport "documentation" null) + (mkEnable eventGUISupport "event-gui" null) + (mkEnable testsSupport "tests" null) ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 6da1b00ee81f..871dff0aa8af 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -20,10 +20,6 @@ assert jpegSupport -> (libjpeg != null); assert tiffSupport -> (libtiff != null); assert gifSupport -> (giflib != null); -let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; -in - with stdenv.lib; stdenv.mkDerivation rec { name = "libwebp-${version}"; @@ -35,19 +31,19 @@ stdenv.mkDerivation rec { }; configureFlags = [ - (mkFlag threadingSupport "threading") - (mkFlag openglSupport "gl") - (mkFlag pngSupport "png") - (mkFlag jpegSupport "jpeg") - (mkFlag tiffSupport "tiff") - (mkFlag gifSupport "gif") - #(mkFlag (wicSupport && stdenv.isCygwin) "wic") - (mkFlag alignedSupport "aligned") - (mkFlag swap16bitcspSupport "swap-16bit-csp") - (mkFlag experimentalSupport "experimental") - (mkFlag libwebpmuxSupport "libwebpmux") - (mkFlag libwebpdemuxSupport "libwebpdemux") - (mkFlag libwebpdecoderSupport "libwebpdecoder") + (mkEnable threadingSupport "threading" null) + (mkEnable openglSupport "gl" null) + (mkEnable pngSupport "png" null) + (mkEnable jpegSupport "jpeg" null) + (mkEnable tiffSupport "tiff" null) + (mkEnable gifSupport "gif" null) + #(mkEnable (wicSupport && stdenv.isCygwin) "wic" null) + (mkEnable alignedSupport "aligned" null) + (mkEnable swap16bitcspSupport "swap-16bit-csp" null) + (mkEnable experimentalSupport "experimental" null) + (mkEnable libwebpmuxSupport "libwebpmux" null) + (mkEnable libwebpdemuxSupport "libwebpdemux" null) + (mkEnable libwebpdecoderSupport "libwebpdecoder" null) ]; buildInputs = [ ] diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index 9fb25aa36e0a..9ebd27e82771 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -2,10 +2,6 @@ , parallel ? true }: -let - mkFlag = optset: flag: if optset then "-D${flag}=ON" else "-D${flag}=OFF"; -in - stdenv.mkDerivation rec { name = "stxxl-${version}"; version = "1.4.1"; @@ -21,7 +17,7 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" "-DBUILD_STATIC_LIBS=OFF" "-DCMAKE_BUILD_TYPE=Release" - (mkFlag parallel "USE_GNU_PARALLEL") + "-DUSE_GNU_PARALLEL=${if parallel then "ON" else "OFF"}" ]; passthru = { diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index cdd663bf191f..00061e79fa5d 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -6,10 +6,6 @@ # Require the optional to be enabled until upstream fixes or removes the configure flag assert expat != null; -let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; -in - with stdenv.lib; stdenv.mkDerivation rec { name = "wayland-${version}"; @@ -21,7 +17,7 @@ stdenv.mkDerivation rec { }; configureFlags = [ - (mkFlag (expat != null) "scanner") + (mkEnable (expat != null) "scanner" null) ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 36b78388980e..cac346e946e4 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -25,13 +25,13 @@ , opusSupport ? true, libopus }: +with stdenv.lib; let - opt = stdenv.lib.optional; - mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; + opt = optional; major = "0.19"; minor = "9"; - -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { name = "mpd-${major}.${minor}"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz"; @@ -68,33 +68,33 @@ in stdenv.mkDerivation rec { ++ opt opusSupport libopus; configureFlags = - [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa") - (mkFlag flacSupport "flac") - (mkFlag vorbisSupport "vorbis") - (mkFlag vorbisSupport "vorbis-encoder") - (mkFlag (!stdenv.isDarwin && madSupport) "mad") - (mkFlag mikmodSupport "mikmod") - (mkFlag id3tagSupport "id3") - (mkFlag shoutSupport "shout") - (mkFlag sqliteSupport "sqlite") - (mkFlag curlSupport "curl") - (mkFlag audiofileSupport "audiofile") - (mkFlag bzip2Support "bzip2") - (mkFlag ffmpegSupport "ffmpeg") - (mkFlag fluidsynthSupport "fluidsynth") - (mkFlag zipSupport "zzip") - (mkFlag samplerateSupport "lsr") - (mkFlag mmsSupport "mms") - (mkFlag mpg123Support "mpg123") - (mkFlag aacSupport "aac") - (mkFlag pulseaudioSupport "pulse") - (mkFlag jackSupport "jack") - (mkFlag stdenv.isDarwin "osx") - (mkFlag icuSupport "icu") - (mkFlag gmeSupport "gme") - (mkFlag clientSupport "libmpdclient") - (mkFlag opusSupport "opus") - "--enable-debug" + [ (mkEnable (!stdenv.isDarwin && alsaSupport) "alsa" null) + (mkEnable flacSupport "flac" null) + (mkEnable vorbisSupport "vorbis" null) + (mkEnable vorbisSupport "vorbis-encoder" null) + (mkEnable (!stdenv.isDarwin && madSupport) "mad" null) + (mkEnable mikmodSupport "mikmod" null) + (mkEnable id3tagSupport "id3" null) + (mkEnable shoutSupport "shout" null) + (mkEnable sqliteSupport "sqlite" null) + (mkEnable curlSupport "curl" null) + (mkEnable audiofileSupport "audiofile" null) + (mkEnable bzip2Support "bzip2" null) + (mkEnable ffmpegSupport "ffmpeg" null) + (mkEnable fluidsynthSupport "fluidsynth" null) + (mkEnable zipSupport "zzip" null) + (mkEnable samplerateSupport "lsr" null) + (mkEnable mmsSupport "mms" null) + (mkEnable mpg123Support "mpg123" null) + (mkEnable aacSupport "aac" null) + (mkEnable pulseaudioSupport "pulse" null) + (mkEnable jackSupport "jack" null) + (mkEnable stdenv.isDarwin "osx" null) + (mkEnable icuSupport "icu" null) + (mkEnable gmeSupport "gme" null) + (mkEnable clientSupport "libmpdclient" null) + (mkEnable opusSupport "opus" null) + (mkEnable true "debug" null) ] ++ opt stdenv.isLinux "--with-systemdsystemunitdir=$(out)/etc/systemd/system"; @@ -103,7 +103,7 @@ in stdenv.mkDerivation rec { ${if shoutSupport then "-lshout" else ""} ''; - meta = with stdenv.lib; { + meta = { description = "A flexible, powerful daemon for playing music"; homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; license = licenses.gpl2; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index c785d76ddce7..877850f532b4 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -37,18 +37,12 @@ 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 +with stdenv.lib; stdenv.mkDerivation rec { name = "samba-4.2.1"; @@ -60,7 +54,7 @@ stdenv.mkDerivation rec { patches = [ ./4.x-no-persistent-install.patch ./4.x-fix-ctdb-deps.patch - ] ++ stdenv.lib.optional (kerberos != null) ./4.x-heimdal-compat.patch; + ] ++ optional (kerberos != null) ./4.x-heimdal-compat.patch; buildInputs = [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 @@ -162,7 +156,7 @@ stdenv.mkDerivation rec { find $out -type f -exec $SHELL -c "$SCRIPT" \; ''; - meta = with stdenv.lib; { + meta = { homepage = http://www.samba.org/; description = "The standard Windows interoperability suite of programs for Linux and Unix"; license = licenses.gpl3; diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 33d9b3dc64f3..5d4932e36b43 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -28,13 +28,6 @@ assert cryptopp != null || (nss != null && nspr != null); with stdenv.lib; 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; - hasServer = snappy != null && leveldb != null; hasMon = hasServer; hasMds = hasServer; diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 757959f53451..3849c773a3e6 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -3,9 +3,6 @@ }: let - mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}"; - mkEnable = mkFlag "enable" "disable"; - mkWith = mkFlag "with" "without"; hasX = gtk2 != null || qt4 != null; in with stdenv.lib; @@ -20,12 +17,12 @@ stdenv.mkDerivation rec { buildInputs = [ libcap gtk2 ncurses qt4 ]; configureFlags = [ - (mkWith (libcap != null) "libcap") - (mkWith (hasX) "x") - (mkEnable (ncurses != null) "pinentry-curses") - (mkEnable true "pinentry-tty") - (mkEnable (gtk2 != null) "pinentry-gtk2") - (mkEnable (qt4 != null) "pinentry-qt4") + (mkWith (libcap != null) "libcap" null) + (mkWith (hasX) "x" null) + (mkEnable (ncurses != null) "pinentry-curses" null) + (mkEnable true "pinentry-tty" null) + (mkEnable (gtk2 != null) "pinentry-gtk2" null) + (mkEnable (qt4 != null) "pinentry-qt4" null) ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index a9fdcf6fa64d..195e6bc43294 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -7,9 +7,6 @@ }: with stdenv.lib; -let - mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; -in stdenv.mkDerivation rec { name = "rsyslog-8.9.0"; @@ -26,70 +23,70 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isLinux systemd; configureFlags = [ - "--sysconfdir=/etc" - "--localstatedir=/var" - "--with-systemdsystemunitdir=\${out}/etc/systemd/system" - (mkFlag true "largefile") - (mkFlag true "regexp") - (mkFlag (krb5 != null) "gssapi-krb5") - (mkFlag true "klog") - (mkFlag true "kmsg") - (mkFlag (systemd != null) "imjournal") - (mkFlag true "inet") - (mkFlag (jemalloc != null) "jemalloc") - (mkFlag true "unlimited-select") - (mkFlag true "usertools") - (mkFlag (libmysql != null) "mysql") - (mkFlag (postgresql != null) "pgsql") - (mkFlag (libdbi != null) "libdbi") - (mkFlag (net_snmp != null) "snmp") - (mkFlag (libuuid != null) "uuid") - (mkFlag (curl != null) "elasticsearch") - (mkFlag (gnutls != null) "gnutls") - (mkFlag (libgcrypt != null) "libgcrypt") - (mkFlag true "rsyslogrt") - (mkFlag true "rsyslogd") - (mkFlag true "mail") - (mkFlag (liblognorm != null) "mmnormalize") - (mkFlag true "mmjsonparse") - (mkFlag true "mmaudit") - (mkFlag true "mmanon") - (mkFlag true "mmutf8fix") - (mkFlag true "mmcount") - (mkFlag true "mmsequence") - (mkFlag true "mmfields") - (mkFlag true "mmpstrucdata") - (mkFlag (openssl != null) "mmrfc5424addhmac") - (mkFlag (librelp != null) "relp") - (mkFlag (libgt != null) "guardtime") - (mkFlag (liblogging != null) "liblogging-stdlog") - (mkFlag (liblogging != null) "rfc3195") - (mkFlag true "imfile") - (mkFlag false "imsolaris") - (mkFlag true "imptcp") - (mkFlag true "impstats") - (mkFlag true "omprog") - (mkFlag (libnet != null) "omudpspoof") - (mkFlag true "omstdout") - (mkFlag (systemd != null) "omjournal") - (mkFlag true "pmlastmsg") - (mkFlag true "pmcisconames") - (mkFlag true "pmciscoios") - (mkFlag true "pmaixforwardedfrom") - (mkFlag true "pmsnare") - (mkFlag true "omruleset") - (mkFlag true "omuxsock") - (mkFlag true "mmsnmptrapd") - (mkFlag (hadoop != null) "omhdfs") - (mkFlag (rdkafka != null) "omkafka") - (mkFlag (libmongo-client != null) "ommongodb") - (mkFlag (czmq != null) "imzmq3") - (mkFlag (czmq != null) "imczmq") - (mkFlag (czmq != null) "omzmq3") - (mkFlag (czmq != null) "omczmq") - (mkFlag (rabbitmq-c != null) "omrabbitmq") - (mkFlag (hiredis != null) "omhiredis") - (mkFlag true "generate-man-pages") + (mkOther "sysconfdir" "/etc") + (mkOther "localstatedir" "/var") + (mkWith true "systemdsystemunitdir" "\${out}/etc/systemd/system") + (mkEnable true "largefile" null) + (mkEnable true "regexp" null) + (mkEnable (krb5 != null) "gssapi-krb5" null) + (mkEnable true "klog" null) + (mkEnable true "kmsg" null) + (mkEnable (systemd != null) "imjournal" null) + (mkEnable true "inet" null) + (mkEnable (jemalloc != null) "jemalloc" null) + (mkEnable true "unlimited-select" null) + (mkEnable true "usertools" null) + (mkEnable (libmysql != null) "mysql" null) + (mkEnable (postgresql != null) "pgsql" null) + (mkEnable (libdbi != null) "libdbi" null) + (mkEnable (net_snmp != null) "snmp" null) + (mkEnable (libuuid != null) "uuid" null) + (mkEnable (curl != null) "elasticsearch" null) + (mkEnable (gnutls != null) "gnutls" null) + (mkEnable (libgcrypt != null) "libgcrypt" null) + (mkEnable true "rsyslogrt" null) + (mkEnable true "rsyslogd" null) + (mkEnable true "mail" null) + (mkEnable (liblognorm != null) "mmnormalize" null) + (mkEnable true "mmjsonparse" null) + (mkEnable true "mmaudit" null) + (mkEnable true "mmanon" null) + (mkEnable true "mmutf8fix" null) + (mkEnable true "mmcount" null) + (mkEnable true "mmsequence" null) + (mkEnable true "mmfields" null) + (mkEnable true "mmpstrucdata" null) + (mkEnable (openssl != null) "mmrfc5424addhmac" null) + (mkEnable (librelp != null) "relp" null) + (mkEnable (libgt != null) "guardtime" null) + (mkEnable (liblogging != null) "liblogging-stdlog" null) + (mkEnable (liblogging != null) "rfc3195" null) + (mkEnable true "imfile" null) + (mkEnable false "imsolaris" null) + (mkEnable true "imptcp" null) + (mkEnable true "impstats" null) + (mkEnable true "omprog" null) + (mkEnable (libnet != null) "omudpspoof" null) + (mkEnable true "omstdout" null) + (mkEnable (systemd != null) "omjournal" null) + (mkEnable true "pmlastmsg" null) + (mkEnable true "pmcisconames" null) + (mkEnable true "pmciscoios" null) + (mkEnable true "pmaixforwardedfrom" null) + (mkEnable true "pmsnare" null) + (mkEnable true "omruleset" null) + (mkEnable true "omuxsock" null) + (mkEnable true "mmsnmptrapd" null) + (mkEnable (hadoop != null) "omhdfs" null) + (mkEnable (rdkafka != null) "omkafka" null) + (mkEnable (libmongo-client != null) "ommongodb" null) + (mkEnable (czmq != null) "imzmq3" null) + (mkEnable (czmq != null) "imczmq" null) + (mkEnable (czmq != null) "omzmq3" null) + (mkEnable (czmq != null) "omczmq" null) + (mkEnable (rabbitmq-c != null) "omrabbitmq" null) + (mkEnable (hiredis != null) "omhiredis" null) + (mkEnable true "generate-man-pages" null) ]; meta = { From 2ebe0fc88b97bcc6f9b058fee57c298a36889e30 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 22 May 2015 14:14:28 -0700 Subject: [PATCH 555/615] gtk3: Mark as linux only temporarily --- pkgs/development/libraries/gtk+/3.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 84bea07602fd..18aaa9fa2282 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; # Temporary until fixed for darwin }; } From 54963fb5b7495ad3f63baa0b6d5d75d3f7c8a874 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 22 May 2015 14:14:46 -0700 Subject: [PATCH 556/615] ceph: Now evaluate on darwin --- pkgs/tools/filesystems/ceph/generic.nix | 79 +++++++++++++++++-------- 1 file changed, 54 insertions(+), 25 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 5d4932e36b43..9dbc85a32435 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -26,32 +26,61 @@ # We must have one crypto library assert cryptopp != null || (nss != null && nspr != null); +with stdenv; with stdenv.lib; let - hasServer = snappy != null && leveldb != null; + optSnappy = shouldUsePkg snappy; + optLeveldb = shouldUsePkg leveldb; + optYasm = shouldUsePkg yasm; + optFcgi = shouldUsePkg fcgi; + optExpat = shouldUsePkg expat; + optCurl = shouldUsePkg curl; + optFuse = shouldUsePkg fuse; + optAccelio = shouldUsePkg accelio; + optLibibverbs = shouldUsePkg libibverbs; + optLibrdmacm = shouldUsePkg librdmacm; + optLibedit = shouldUsePkg libedit; + optLibatomic_ops = shouldUsePkg libatomic_ops; + optKinetic-cpp-client = shouldUsePkg kinetic-cpp-client; + optRocksdb = shouldUsePkg rocksdb; + optLibs3 = shouldUsePkg libs3; + + optJemalloc = shouldUsePkg jemalloc; + optGperftools = shouldUsePkg gperftools; + + optCryptopp = shouldUsePkg cryptopp; + optNss = shouldUsePkg nss; + optNspr = shouldUsePkg nspr; + + optLibaio = shouldUsePkg libaio; + optLibxfs = shouldUsePkg libxfs; + optZfs = shouldUsePkg zfs; + + hasServer = optSnappy != null && optLeveldb != null; hasMon = hasServer; hasMds = hasServer; hasOsd = hasServer; - hasRadosgw = fcgi != null && expat != null && curl != null && libedit != null; + hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null; hasXio = (stdenv.isLinux || stdenv.isFreeBSD) && versionAtLeast version "0.95" && - accelio != null && libibverbs != null && librdmacm != null; + optAccelio != null && optLibibverbs != null && optLibrdmacm != null; - hasRocksdb = versionAtLeast version "0.95" && rocksdb != null; + hasRocksdb = versionAtLeast version "0.95" && optRocksdb != null; # TODO: Reenable when kinetic support is fixed - hasKinetic = versionAtLeast version "0.95" && kinetic-cpp-client != null && false; + #hasKinetic = versionAtLeast version "0.95" && optKinetic-cpp-client != null; + hasKinetic = false; # Malloc implementation (can be jemalloc, tcmalloc or null) - malloc = if jemalloc != null then jemalloc else gperftools; + malloc = if optJemalloc != null then optJemalloc else optGperftools; # We prefer nss over cryptopp - cryptoStr = if nss != null && nspr != null then "nss" else - if cryptopp != null then "cryptopp" else "none"; + cryptoStr = if optNss != null && optNspr != null then "nss" else + if optCryptopp != null then "cryptopp" else "none"; cryptoLibsMap = { - nss = [ nss nspr ]; - cryptopp = [ cryptopp ]; + nss = [ optNss optNspr ]; + cryptopp = [ optCryptopp ]; none = [ ]; }; @@ -71,22 +100,22 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ]; buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [ - boost python libxml2 yasm libatomic_ops libs3 malloc pythonPackages.flask zlib + boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib ] ++ optional (versionAtLeast version "9.0.0") [ git # Used for the gitversion string pythonPackages.sphinx # Used for docs ] ++ optional stdenv.isLinux [ - linuxHeaders libuuid udev keyutils libaio libxfs zfs + linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs ] ++ optional hasServer [ - snappy leveldb + optSnappy optLeveldb ] ++ optional hasRadosgw [ - fcgi expat curl fuse libedit + optFcgi optExpat optCurl optFuse optLibedit ] ++ optional hasXio [ - accelio libibverbs librdmacm + optAccelio optLibibverbs optLibrdmacm ] ++ optional hasRocksdb [ - rocksdb + optRocksdb ] ++ optional hasKinetic [ - kinetic-cpp-client + optKinetic-cpp-client ]; postPatch = '' @@ -134,23 +163,23 @@ stdenv.mkDerivation { (mkWith false "profiler" null) (mkWith false "debug" null) (mkEnable false "coverage" null) - (mkWith (fuse != null) "fuse" null) - (mkWith (malloc == jemalloc) "jemalloc" null) - (mkWith (malloc == gperftools) "tcmalloc" null) + (mkWith (optFuse != null) "fuse" null) + (mkWith (malloc == optJemalloc) "jemalloc" null) + (mkWith (malloc == optGperftools) "tcmalloc" null) (mkEnable false "pgrefdebugging" null) (mkEnable false "cephfs-java" null) (mkEnable hasXio "xio" null) - (mkWith (libatomic_ops != null) "libatomic-ops" null) + (mkWith (optLibatomic_ops != null) "libatomic-ops" null) (mkWith true "ocf" null) (mkWith hasKinetic "kinetic" null) (mkWith hasRocksdb "librocksdb" null) (mkWith false "librocksdb-static" null) - (mkWith (libs3 != null) "system-libs3" null) + (mkWith (optLibs3 != null) "system-libs3" null) (mkWith true "rest-bench" null) ] ++ optional stdenv.isLinux [ - (mkWith (libaio != null) "libaio" null) - (mkWith (libxfs != null) "libxfs" null) - (mkWith (zfs != null) "libzfs" null) + (mkWith (optLibaio != null) "libaio" null) + (mkWith (optLibxfs != null) "libxfs" null) + (mkWith (optZfs != null) "libzfs" null) ] ++ optional (versionAtLeast version "10.0.0") [ (mkWith true "man-pages" null) (mkWith false "tcmalloc-minimal" null) From dabd9ec29c7f04fb4c656d2f43561cc3c3bfda0d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 22 May 2015 15:58:49 -0700 Subject: [PATCH 557/615] goPackages: Build on hydra --- pkgs/development/go-modules/generic/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index f747ade72f27..1d259da14152 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -129,7 +129,10 @@ go.stdenv.mkDerivation ( passthru = passthru // lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; }; - meta = meta // { + meta = { + # Add default meta information + platforms = lib.platforms.all; + } // meta // { # add an extra maintainer to every package maintainers = (meta.maintainers or []) ++ [ lib.maintainers.emery lib.maintainers.lethalman ]; From 1dc671956b97e0c2e0b6df01cb542c26490bf8a7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 22 May 2015 15:59:05 -0700 Subject: [PATCH 558/615] consul: 0.5.1 -> 0.5.2 --- pkgs/top-level/go-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index d890e88a7024..c4fc9065698e 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -417,7 +417,7 @@ let }; consul = buildGoPackage rec { - rev = "v0.5.1"; + rev = "v0.5.2"; name = "consul-${rev}"; goPackagePath = "github.com/hashicorp/consul"; @@ -425,7 +425,7 @@ let inherit rev; owner = "hashicorp"; repo = "consul"; - sha256 = "0glmvw52mgf3gwqr0f8v19ip5i6csiimv25jh30ilkig29k7027k"; + sha256 = "0p3lc1p346a5ipvkf15l94gn1ml3m7zz6bx0viark3hsv0a7iij7"; }; buildInputs = [ From 3d60104a74fa72e1fc00ed17684b134655479861 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Fri, 22 May 2015 20:04:06 -0400 Subject: [PATCH 559/615] libepoxy: enable on Darwin --- pkgs/development/libraries/epoxy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index a1b0d87cdfdc..4798c50225de 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/anholt/libepoxy; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From ffcea6546d4832d5141add56f1d6126a6fd33a5e Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Fri, 22 May 2015 20:08:22 -0400 Subject: [PATCH 560/615] gtk3: fix on Darwin --- pkgs/development/libraries/gtk+/3.x.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 18aaa9fa2282..252e52ee3b98 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -25,12 +25,13 @@ stdenv.mkDerivation rec { buildInputs = [ libxkbcommon epoxy ]; 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 ] - ++ optional stdenv.isDarwin x11 + [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ] + ++ optionals stdenv.isLinux [ wayland ] ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; + NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + # demos fail to install, no idea where's the problem preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in"; @@ -64,6 +65,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ]; - platforms = stdenv.lib.platforms.linux; # Temporary until fixed for darwin + platforms = stdenv.lib.platforms.all; }; } From 815f85edfd2818efb190f1cdd59a9d2834712b77 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sat, 23 May 2015 01:40:19 +0100 Subject: [PATCH 561/615] python-livestreamer: update to 1.12.2 --- pkgs/top-level/python-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e85b2b6ae58c..9ddbb6e2dc40 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7908,13 +7908,13 @@ let }; livestreamer = buildPythonPackage rec { - version = "1.11.1"; + version = "1.12.2"; name = "livestreamer-${version}"; disabled = isPyPy; src = pkgs.fetchurl { url = "https://github.com/chrippa/livestreamer/archive/v${version}.tar.gz"; - sha256 = "1hic3z5any64gn2b0gs1b7m34bzgzv71inr8wgjq59pwf8mbrqk9"; + sha256 = "1fp3d3z2grb1ls97smjkraazpxnvajda2d1g1378s6gzmda2jvjd"; }; buildInputs = with self; [ pkgs.makeWrapper ]; @@ -7930,6 +7930,7 @@ let services and pipes them into a video player of choice. ''; license = stdenv.lib.licenses.bsd2; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; }; From 4d867b0b08cc6a91912836a46d94b435e964b999 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sat, 23 May 2015 01:56:39 +0100 Subject: [PATCH 562/615] mpv: update to 0.9.2 --- pkgs/applications/video/mpv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 8e516fd91e32..0e0c71bd9e1b 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -59,14 +59,14 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.9.1"; + version = "0.9.2"; src = fetchurl { url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz"; - sha256 = "17hpx8wb4b6hjhc208jn71p02s0gd6665vzyyy249k6jfn2nh8sx"; + sha256 = "0la7pmy75mq92kcrawdiw5idw6a46z7d15mlkgs0axyivdaqy560"; }; - buildInputs = + buildInputs = [ python3 lua perl freetype pkgconfig ffmpeg libass docutils which libpthreadstubs lua5_sockets ] ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] ++ optional alsaSupport alsaLib From 1690c1598efc9dd06aba731f6283e64713390ad5 Mon Sep 17 00:00:00 2001 From: Sam Griffin Date: Fri, 22 May 2015 21:01:21 -0400 Subject: [PATCH 563/615] updating bitcoin to 0.10.2 --- pkgs/applications/altcoins/bitcoin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index b888b587be9d..b759b2dcb2cf 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -6,14 +6,14 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - core_version = "0.10.1"; + core_version = "0.10.2"; version = core_version; src = fetchurl { url = [ "https://bitcoin.org/bin/bitcoin-core-${core_version}/bitcoin-${version}.tar.gz" "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${core_version}/bitcoin-${version}.tar.gz" ]; - sha256 = "287873f9ba4fd49cd4e4be7eba070d2606878f1690c5be0273164d37cbf3c138"; + sha256 = "cddf96c71d0a35524fde93380981cf0cf0b51441454a3a68b9be491b9239bfec"; }; buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib From 6014752e73ba5456750cb0b611a4808e8f0f49d3 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sat, 23 May 2015 02:27:47 +0100 Subject: [PATCH 564/615] tesseract: fix postInstall We needed to separate each of the unpack commands. --- pkgs/applications/graphics/tesseract/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index f20c868d4a0a..b531c41e2d8a 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { 'LIBLEPT_HEADERSDIR=${leptonica}/include' ''; - postInstall = concatStrings extraLanguages; + postInstall = concatStringsSep "; " extraLanguages; meta = { description = "OCR engine"; From 6ad9f8e1ddb54b841fcaa011e66cb455ca8d0ba5 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 23 May 2015 12:41:07 +0200 Subject: [PATCH 565/615] mediathekview-9 --- .../video/mediathekview/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/video/mediathekview/default.nix diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix new file mode 100644 index 000000000000..be4363c8314d --- /dev/null +++ b/pkgs/applications/video/mediathekview/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, jre, unzip }: + +stdenv.mkDerivation { + name = "mediathekview-9"; + src = fetchurl { + url = "mirror://sourceforge/zdfmediathk/MediathekView_9.zip"; + sha256 = "1wff0igr33z9p1mjw7yvb6658smdwnp22dv8klz0y8qg116wx7a4"; + }; + unpackPhase = "true"; + + buildInputs = [ unzip ]; + + # Could use some more love + # Maybe we can also preconfigure locations for vlc and the others. + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/opt/mediathekview + cd $out/opt/mediathekview + unzip $src + find . -iname '*.exe' -delete + sed -i -e 's, java, ${jre}/bin/java,' MediathekView__Linux.sh + ln -s $out/opt/mediathekview/MediathekView__Linux.sh $out/bin/mediathekview + ''; + + meta = with stdenv.lib; { + homepage = http://zdfmediathk.sourceforge.net/; + license = stdenv.lib.licenses.gpl3; + maintainers = [ maintainers.chaoflow ]; + platforms = platforms.linux; # also OS X and cygwin, but not investigated, yet + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3984747a51f1..b43fb9c78961 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11558,6 +11558,8 @@ let mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; + mediathekview = callPackage ../applications/video/mediathekview { }; + meld = callPackage ../applications/version-management/meld { }; mcomix = callPackage ../applications/graphics/mcomix { }; From 42d9fe8b09768b59ac55c2a3aaeea1174eaa393a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 23 May 2015 14:30:39 +0200 Subject: [PATCH 566/615] gevent: 1.0.1 -> 1.0.2 --- .../python-modules/gevent_sslwrap.patch | 49 ------------------- pkgs/top-level/python-packages.nix | 6 +-- 2 files changed, 2 insertions(+), 53 deletions(-) delete mode 100644 pkgs/development/python-modules/gevent_sslwrap.patch diff --git a/pkgs/development/python-modules/gevent_sslwrap.patch b/pkgs/development/python-modules/gevent_sslwrap.patch deleted file mode 100644 index a9bb0eab5de9..000000000000 --- a/pkgs/development/python-modules/gevent_sslwrap.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 485cebc4d9bab2dae51cf29f91fad2f1cf157fec Mon Sep 17 00:00:00 2001 -From: Eugene Pankov -Date: Sun, 21 Sep 2014 12:04:13 +0300 -Subject: [PATCH] Work around missing sslwrap in Python 2.7.9 (fixes #477) - ---- - gevent/_ssl2.py | 28 ++++++++++++++++++++-------- - 1 file changed, 20 insertions(+), 8 deletions(-) - -diff --git a/gevent/ssl.py b/gevent/ssl.py -index 21491b7..85e6a86 100644 ---- a/gevent/ssl.py -+++ b/gevent/ssl.py -@@ -80,15 +80,27 @@ def __init__(self, sock, keyfile=None, certfile=None, - self._sslobj = None - else: - # yes, create the SSL object -- if ciphers is None: -- self._sslobj = _ssl.sslwrap(self._sock, server_side, -- keyfile, certfile, -- cert_reqs, ssl_version, ca_certs) -+ if hasattr(_ssl, 'sslwrap'): -+ if ciphers is None: -+ self._sslobj = _ssl.sslwrap(self._sock, server_side, -+ keyfile, certfile, -+ cert_reqs, ssl_version, ca_certs) -+ else: -+ self._sslobj = _ssl.sslwrap(self._sock, server_side, -+ keyfile, certfile, -+ cert_reqs, ssl_version, ca_certs, -+ ciphers) - else: -- self._sslobj = _ssl.sslwrap(self._sock, server_side, -- keyfile, certfile, -- cert_reqs, ssl_version, ca_certs, -- ciphers) -+ self.context = __ssl__.SSLContext(ssl_version) -+ self.context.verify_mode = cert_reqs -+ if ca_certs: -+ self.context.load_verify_locations(ca_certs) -+ if certfile: -+ self.context.load_cert_chain(certfile, keyfile) -+ if ciphers: -+ self.context.set_ciphers(ciphers) -+ self._sslobj = self.context._wrap_socket(self._sock, server_side=server_side, ssl_sock=self) -+ - if do_handshake_on_connect: - self.do_handshake() - self.keyfile = keyfile diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9ddbb6e2dc40..b4504ce8cc69 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5589,16 +5589,14 @@ let }; gevent = buildPythonPackage rec { - name = "gevent-1.0.1"; + name = "gevent-1.0.2"; disabled = isPy3k || isPyPy; # see https://github.com/surfly/gevent/issues/248 src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/g/gevent/${name}.tar.gz"; - sha256 = "0hyzfb0gcx9pm5c2igan8y57hqy2wixrwvdjwsaivxsqs0ay49s6"; + sha256 = "0cds7yvwdlqmd590i59vzxaviwxk4js6dkhnmdxb3p1xac7wmq9s"; }; - patches = [ ../development/python-modules/gevent_sslwrap.patch ]; - buildInputs = with self; [ pkgs.libev ]; propagatedBuildInputs = optionals (!isPyPy) [ self.greenlet ]; From 0a329f4512dcff526325b914257a55991e642ef5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 22 May 2015 16:38:02 +0200 Subject: [PATCH 567/615] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/381af77b5413dd83ee14458e874b2b0876e44500 with hackage2nix revision ca778c8501c0d2e3c44fa9016b1f79cdf6f3dcc2 --- .../haskell-modules/hackage-packages.nix | 287 +++++++++++------- 1 file changed, 180 insertions(+), 107 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index cc084adabb27..886c03b3d84f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17261,22 +17261,22 @@ self: { "aeson" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , containers, deepseq, dlist, ghc-prim, hashable, HUnit, mtl - , old-locale, QuickCheck, scientific, syb, template-haskell - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, time, transformers, unordered-containers, vector + , QuickCheck, scientific, syb, template-haskell, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, time + , transformers, unordered-containers, vector }: mkDerivation { pname = "aeson"; - version = "0.8.1.0"; - sha256 = "0dr0pnql4hlb6fxg9wvzg8a7ssjnzc89gpv0rxlkpaqrbb2hk32m"; + version = "0.8.1.1"; + sha256 = "15fdicmgkcadgqiqql3f4iv2s01aiclny8hjz3d6ryivjsch7cyh"; buildDepends = [ attoparsec base blaze-builder bytestring containers deepseq dlist ghc-prim hashable mtl scientific syb template-haskell text time transformers unordered-containers vector ]; testDepends = [ - attoparsec base bytestring containers ghc-prim HUnit old-locale - QuickCheck template-haskell test-framework test-framework-hunit + attoparsec base bytestring containers ghc-prim HUnit QuickCheck + template-haskell test-framework test-framework-hunit test-framework-quickcheck2 text time unordered-containers vector ]; homepage = "https://github.com/bos/aeson"; @@ -26789,6 +26789,7 @@ self: { jailbreak = true; description = "Simple part of speech tagger"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "broadcast-chan" = callPackage @@ -27271,15 +27272,14 @@ self: { }: mkDerivation { pname = "byline"; - version = "0.1.0.0"; - sha256 = "1w2blafifvsliz4z9lplfm73lpd95frjnp5y3jk6xzjrvsnyqahs"; + version = "0.2.0.0"; + sha256 = "1194h9bhd1n9sxc224j22mir852b9c5ww2cq0sf9x8k3vlfpm1jl"; isLibrary = true; isExecutable = true; buildDepends = [ ansi-terminal base colour containers exceptions haskeline mtl terminfo-hs text transformers ]; - jailbreak = true; homepage = "http://github.com/pjones/byline"; description = "Library for creating command-line interfaces (colors, menus, etc.)"; license = stdenv.lib.licenses.bsd2; @@ -29894,8 +29894,8 @@ self: { }: mkDerivation { pname = "cef"; - version = "0.1.0.0"; - sha256 = "0lr9yhlrp40kn8n5asw3xnz3xd28xd8nclh90y9f1ikci4i9xgxp"; + version = "0.1.1"; + sha256 = "045sh0mfpwjpr3vc7bax89hv7aq29ak0xqhmyldj2p8allcfrv24"; buildDepends = [ base bytestring text time ]; testDepends = [ base directory doctest filepath ]; homepage = "http://github.com/picussecurity/haskell-cef.git"; @@ -32304,10 +32304,8 @@ self: { }: mkDerivation { pname = "cmdargs"; - version = "0.10.12"; - revision = "1"; - sha256 = "0axn3ycw4rijh1ka5f73gz9w330s851cpxbv39ia4xnb0l95hrjy"; - editedCabalFile = "e37c92e6337ccbacd95f77938a1d0459f52cdb1a51c920a96610793cf2b5e4dc"; + version = "0.10.13"; + sha256 = "0vmz7f0ssrqlp6wzmc0mjqj4qczfgk58g0lr0yz7jamamlgpq4b6"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -37771,6 +37769,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "darkplaces-rcon" = callPackage + ({ mkDerivation, base, byteable, bytestring, cryptohash, hspec + , hspec-core, network, time + }: + mkDerivation { + pname = "darkplaces-rcon"; + version = "0.1"; + sha256 = "0ngxjb6zja7l905ixkr0cjyan21m311wc5dqdzacw5j5w7119v75"; + buildDepends = [ + base byteable bytestring cryptohash network time + ]; + testDepends = [ base bytestring hspec hspec-core ]; + jailbreak = true; + homepage = "https://github.com/bacher09/darkplaces-rcon"; + description = "Darkplaces rcon client library"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "darkplaces-text" = callPackage ({ mkDerivation, alex, ansi-terminal, array, base, bytestring, text , vector @@ -39026,6 +39042,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "datetime-sb" = callPackage + ({ mkDerivation, base, old-locale, old-time, QuickCheck, time }: + mkDerivation { + pname = "datetime-sb"; + version = "0.2.2"; + sha256 = "10c9anhlgzy7s0yvws7v0mf2ckxvwip74jl8izia76smhq9hf3sw"; + buildDepends = [ base old-locale old-time QuickCheck time ]; + homepage = "http://github.com/stackbuilders/datetime"; + description = "Utilities to make Data.Time.* easier to use."; + license = "GPL"; + }) {}; + "dawg" = callPackage ({ mkDerivation, base, binary, containers, mtl, transformers , vector, vector-binary @@ -40691,8 +40719,8 @@ self: { }: mkDerivation { pname = "diagrams-haddock"; - version = "0.3.0.2"; - sha256 = "0vm41w1cvlw1k2gp7d3iyjdi1sla91v5v0xd7d7zhfgx7cs1b6dn"; + version = "0.3.0.3"; + sha256 = "0cjl78swzsx7yx3ry2yv94gbn5mwc7gbrlldgqxxiw0ip3mbzk7r"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -42724,13 +42752,12 @@ self: { }: mkDerivation { pname = "domplate"; - version = "0.1"; - sha256 = "116ljs471cdb21sjglk53wa8270axw7zbsm6ah785q1vabczgs8p"; + version = "0.1.0.1"; + sha256 = "1njzjxz7mymjfismmv8rxkqb24m0gindbsiszbjgy1wm1lwrspb4"; buildDepends = [ base bytestring containers tagsoup text unordered-containers vector yaml ]; - jailbreak = true; homepage = "https://github.com/valderman/domplate"; description = "A simple templating library using HTML5 as its template language"; license = stdenv.lib.licenses.bsd3; @@ -48150,8 +48177,8 @@ self: { ({ mkDerivation, base, bytestring, clock, directory, zip-archive }: mkDerivation { pname = "file-collection"; - version = "0.1.1.3"; - sha256 = "19wx2z66gcmvcxjbhz96c2finzmgkynsd52dwy309af3fbpmgcn0"; + version = "0.1.1.6"; + sha256 = "12rsizcxisys6bf3z3ghmqpm2201pyqpihhyhhx2s14mgmf53l7l"; buildDepends = [ base bytestring clock directory zip-archive ]; homepage = "https://github.com/joelwilliamson/file-collection"; description = "Provide a uniform interface over file archives and directories"; @@ -48817,12 +48844,11 @@ self: { ({ mkDerivation, aeson, attoparsec, base, bytestring, text }: mkDerivation { pname = "fixedwidth-hs"; - version = "0.4.0.0"; - sha256 = "1j15yx5shwrc60k64z45lyrdif3zg5hfqyvq4b9msn1g9shxldyz"; + version = "0.4.0.1"; + sha256 = "0k4lidf95nb4a735331xdr77643b1yb15xllplxknbxxq9r2z3px"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec base bytestring text ]; - jailbreak = true; homepage = "https://github.com/michaelochurch/fixedwidth-hs"; description = "Quick parsing of fixed-width data formats"; license = stdenv.lib.licenses.mit; @@ -52839,7 +52865,7 @@ self: { , clientsession, conduit, conduit-extra, containers, crypto-api , cryptohash, curl, data-default, DAV, dbus, directory, dlist, dns , edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath - , git, gnupg1, gnutls, hamlet, hinotify, hslogger, http-client + , git, gnupg1, gnutls, hinotify, hslogger, http-client , http-conduit, http-types, IfElse, json, lsof, MissingH , monad-control, monad-logger, mtl, network, network-info , network-multicast, network-protocol-xmpp, network-uri, openssh @@ -52854,8 +52880,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "5.20150508.1"; - sha256 = "1l2rll066iwbfm2jhcp55wqsx73qksi2mjjj63wzvfng6iyk60ix"; + version = "5.20150522"; + sha256 = "0spczrg1rrg4qgyxpjqlcfpkcdph6d2m6dv1lbf77nbfc6cqh83p"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -52863,8 +52889,8 @@ self: { case-insensitive clientsession conduit conduit-extra containers crypto-api cryptohash data-default DAV dbus directory dlist dns edit-distance esqueleto exceptions fdo-notify feed filepath gnutls - hamlet hinotify hslogger http-client http-conduit http-types IfElse - json MissingH monad-control monad-logger mtl network network-info + hinotify hslogger http-client http-conduit http-types IfElse json + MissingH monad-control monad-logger mtl network network-info network-multicast network-protocol-xmpp network-uri optparse-applicative path-pieces persistent persistent-sqlite persistent-template process QuickCheck random regex-tdfa resourcet @@ -65269,8 +65295,8 @@ self: { }: mkDerivation { pname = "hmatrix-gsl-stats"; - version = "0.3"; - sha256 = "1hwm8wm70qzhajqpxzyw652lv1hkrb0lskp3lfsmg1jsaakpckmm"; + version = "0.3.0.1"; + sha256 = "0q5l82m6692isl9499q9szgmkxarkjkmwsdvg6frf7izkzrxx5l5"; buildDepends = [ base binary hmatrix storable-complex ]; extraLibraries = [ blas lapack ]; homepage = "http://code.haskell.org/hmatrix-gsl-stats"; @@ -69629,8 +69655,8 @@ self: { }: mkDerivation { pname = "hspec-snap"; - version = "0.3.2.7"; - sha256 = "0d1mmk4w82bxyi682fdmgxk5zm6ni3yhpvkps4m3i04x6gf2xyaj"; + version = "0.3.2.9"; + sha256 = "1m324bjln2i6qz7ym26m82s1qiaq0i0sq4yfscc3bh1s6p8r5vva"; buildDepends = [ base bytestring containers digestive-functors HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text transformers @@ -69644,7 +69670,6 @@ self: { homepage = "https://github.com/dbp/hspec-snap"; description = "A library for testing with Hspec and the Snap Web Framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-test-framework" = callPackage @@ -71824,6 +71849,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "huttons-razor" = callPackage + ({ mkDerivation, base, parsec, parsec-numbers }: + mkDerivation { + pname = "huttons-razor"; + version = "0.1.0.0"; + sha256 = "018br27y575crdnsn3lahklk7zmwrjqka9kan3c1g857fv2hnkq9"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base parsec parsec-numbers ]; + description = "Quick implemention of Hutton's Razor"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "huzzy" = callPackage ({ mkDerivation, base, easyplot }: mkDerivation { @@ -73088,8 +73126,8 @@ self: { }: mkDerivation { pname = "idris"; - version = "0.9.18"; - sha256 = "09bskx00lxzf7fdw66sbi55bqr7z1d92cabf9askjf2ych07k26s"; + version = "0.9.18.1"; + sha256 = "0xd4kqnjdx427l26b07rrw9bnrxb8zrsqy93wayf4rmg6l8rymj8"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -76494,18 +76532,18 @@ self: { , bytestring, cereal, cipher-aes, containers, cprng-aes , crypto-cipher-types, crypto-numbers, crypto-pubkey , crypto-pubkey-types, crypto-random, cryptohash, doctest, either - , errors, hspec, HUnit, mtl, old-locale, QuickCheck, text, time - , unordered-containers, vector + , hspec, HUnit, mtl, QuickCheck, text, time, unordered-containers + , vector }: mkDerivation { pname = "jose-jwt"; - version = "0.6.1"; - sha256 = "0bw7pwz4blcjwxipjy0s5y7ibkf09d6kfjpw1zmkhz6padi9pvwi"; + version = "0.6.2"; + sha256 = "0fw3b34ghpjpm56iln1i46kr8dcj1yv8gmalgdl7ym7n9bvgrfzq"; buildDepends = [ aeson base base64-bytestring byteable bytestring cereal cipher-aes containers crypto-cipher-types crypto-numbers crypto-pubkey - crypto-pubkey-types crypto-random cryptohash errors mtl old-locale - text time unordered-containers vector + crypto-pubkey-types crypto-random cryptohash either mtl text time + unordered-containers vector ]; testDepends = [ aeson aeson-qq base base64-bytestring bytestring cipher-aes @@ -76570,18 +76608,21 @@ self: { }) {}; "jsaddle" = callPackage - ({ mkDerivation, base, hslogger, lens, template-haskell, text - , transformers + ({ mkDerivation, base, glib, gtk3, hslogger, lens, template-haskell + , text, transformers, webkitgtk3, webkitgtk3-javascriptcore }: mkDerivation { pname = "jsaddle"; - version = "0.2.0.4"; - sha256 = "154f75lhlqixrmwrvzcdvmvmila7cj8hzgch2020yamlwyi4gnk8"; - buildDepends = [ base lens template-haskell text transformers ]; - testDepends = [ - base hslogger lens template-haskell text transformers + version = "0.2.0.5"; + sha256 = "0avl5gvq3sv2fk524hazfk1xgb9rlyqqqrvnxb63psjds7s6rxp1"; + buildDepends = [ + base lens template-haskell text transformers webkitgtk3 + webkitgtk3-javascriptcore + ]; + testDepends = [ + base glib gtk3 hslogger lens template-haskell text transformers + webkitgtk3 webkitgtk3-javascriptcore ]; - jailbreak = true; description = "High level interface for webkit-javascriptcore"; license = stdenv.lib.licenses.mit; }) {}; @@ -77135,8 +77176,8 @@ self: { }: mkDerivation { pname = "jsontsv"; - version = "0.1.4.6"; - sha256 = "05rfpzs7ln87n17dbq22g990hkiqwwr656w6l2mrqfnq10qzx8xc"; + version = "0.1.5.0"; + sha256 = "0qilhv14q51g3dzsxk0zp5fp2igy7m79lq1qsk1myrd6iyannxc5"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -77528,6 +77569,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "keera-hails-reactivevalues" = callPackage + ({ mkDerivation, base, contravariant }: + mkDerivation { + pname = "keera-hails-reactivevalues"; + version = "0.0.3.4"; + sha256 = "0qqp4ss0prl3z4bwrsd5jmbvdmhh7x3m846b58dd7ibb0bycp1pb"; + buildDepends = [ base contravariant ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Rails - Reactive Values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "keiretsu" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring , conduit, conduit-extra, directory, filepath, hslogger, network @@ -81874,8 +81927,8 @@ self: { }: mkDerivation { pname = "liquidhaskell"; - version = "0.4.0.1"; - sha256 = "079dj0kq1fznad34ydmqh0klhbky45c7mcyman1aqsnn7rlhh1nv"; + version = "0.4.1.1"; + sha256 = "1yxg6zii0mbsri5j37k2s976nyglijyjfgz9vwafiqdrca328z4s"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -85054,6 +85107,7 @@ self: { jailbreak = true; description = "Discover your (academic) ancestors!"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mathlink" = callPackage @@ -98712,8 +98766,8 @@ self: { }: mkDerivation { pname = "pontarius-xmpp"; - version = "0.4.2.0"; - sha256 = "14f20any4pasjwxq81dmcds3l9gyaabdh9rma65yapkpgrs2v56z"; + version = "0.4.2.1"; + sha256 = "14jhxmccj9ywhxz2rkd4vdwhzz6ciq070ml8vl282hz8k3dr1va9"; buildDepends = [ attoparsec base base64-bytestring binary bytestring conduit containers crypto-api crypto-random cryptohash cryptohash-cryptoapi @@ -98731,7 +98785,6 @@ self: { tasty-quickcheck tasty-th text tls transformers xml-picklers xml-types ]; - jailbreak = true; homepage = "https://github.com/pontarius/pontarius-xmpp/"; description = "An XMPP client library"; license = stdenv.lib.licenses.bsd3; @@ -99044,10 +99097,9 @@ self: { ({ mkDerivation, base, unix }: mkDerivation { pname = "posix-realtime"; - version = "0.0.0.2"; - sha256 = "1i3ag71ymmbcg1v0s6fqkpli8d1wplhj2jkalrv7alz8z666ms3h"; + version = "0.0.0.3"; + sha256 = "0g7mflyvhrypr8a5795vnqb5qlkg3w4nd3j8pnqql9dbmcbqc2aq"; buildDepends = [ base unix ]; - jailbreak = true; description = "POSIX Realtime functionality"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -108934,8 +108986,8 @@ self: { ({ mkDerivation, base, SDL2, transformers }: mkDerivation { pname = "sdl2"; - version = "1.3.0"; - sha256 = "0fi9kjf12qlp64r2pxwc1k9241s23j6xm0dmwdsc18y8f6acvqxa"; + version = "1.3.1"; + sha256 = "17d3nmiz32hccbbxx55wa2zca8xn7mq3f02rcarzynqczvi5hlyv"; buildDepends = [ base transformers ]; extraLibraries = [ SDL2 ]; pkgconfigDepends = [ SDL2 ]; @@ -109106,19 +109158,19 @@ self: { }) {}; "second-transfer" = callPackage - ({ mkDerivation, base, base16-bytestring, binary, bytestring - , conduit, containers, cpphs, exceptions, hashable, hashtables - , hslogger, http2, HUnit, lens, network, network-uri, openssl, text - , transformers + ({ mkDerivation, attoparsec, base, base16-bytestring, binary + , bytestring, conduit, containers, cpphs, exceptions, hashable + , hashtables, hslogger, http2, HUnit, lens, network, network-uri + , openssl, text, transformers }: mkDerivation { pname = "second-transfer"; - version = "0.4.0.0"; - sha256 = "1xmlfdvcic11pi8ik9pasljq4h61nsnxpykcw2c9i9pgkl6bkwj9"; + version = "0.5.0.0"; + sha256 = "16bf857l0dhd2xkb63s47f1f8r41001lf7vkfy48r0p4hfm3bqr2"; buildDepends = [ - base base16-bytestring binary bytestring conduit containers - exceptions hashable hashtables hslogger http2 lens network - network-uri text transformers + attoparsec base base16-bytestring binary bytestring conduit + containers exceptions hashable hashtables hslogger http2 lens + network network-uri text transformers ]; testDepends = [ base bytestring conduit http2 HUnit lens ]; buildTools = [ cpphs ]; @@ -109946,15 +109998,16 @@ self: { }) {}; "servant-pandoc" = callPackage - ({ mkDerivation, base, bytestring, pandoc-types, servant-docs, text - , unordered-containers + ({ mkDerivation, base, bytestring, http-media, lens, pandoc-types + , semigroupoids, servant-docs, text, unordered-containers }: mkDerivation { pname = "servant-pandoc"; - version = "0.1.0.2"; - sha256 = "0k7fb1ijnvicsrdddibcw1kzjfaq5s776znf6mrpwjgazidq6wfl"; + version = "0.4.0"; + sha256 = "07cyw1d12hg5amjrbsmk2m2ch52yav16k8c3sh83xf42f2j05avs"; buildDepends = [ - base bytestring pandoc-types servant-docs text unordered-containers + base bytestring http-media lens pandoc-types semigroupoids + servant-docs text unordered-containers ]; jailbreak = true; description = "Use Pandoc to render servant API documentation"; @@ -119658,12 +119711,12 @@ self: { , exceptions, filepath, ghc, ghc-paths, ghc-prim, liquid-fixpoint , liquidhaskell, mtl, pretty, process, syb, tagged, tasty , tasty-hunit, template-haskell, text, text-format, th-lift - , transformers, unordered-containers, vector + , transformers, unordered-containers, vector, z3 }: mkDerivation { pname = "target"; - version = "0.1.2.0"; - sha256 = "116wig7zr4x0qza1gx92b01jb962w59y716cxj5qkf78sv9pml6s"; + version = "0.1.3.0"; + sha256 = "0przmavzzcbyxkqj1wffiissxz9fdlrx2q8lpxgmsamadd46xq66"; buildDepends = [ base containers directory exceptions filepath ghc ghc-paths liquid-fixpoint liquidhaskell mtl pretty process syb tagged @@ -119675,10 +119728,11 @@ self: { liquidhaskell mtl tagged tasty tasty-hunit template-haskell unordered-containers ]; + buildTools = [ z3 ]; description = "Generate test-suites from refinement types"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) { inherit (pkgs) z3;}; "task" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers @@ -120805,8 +120859,8 @@ self: { ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck }: mkDerivation { pname = "test-invariant"; - version = "0.4.4.0"; - sha256 = "12b3m9ryfkc4gvlsw7jchy3rnqjs5j0gcknn1b3rhm2gzn66ac04"; + version = "0.4.5.0"; + sha256 = "0ck3kk7pmj1679ddmrysx5j3y27619ar1b2pny45mskz3g6vyvrh"; buildDepends = [ base QuickCheck ]; testDepends = [ base QuickCheck tasty tasty-quickcheck ]; homepage = "https://github.com/knupfer/test-invariant"; @@ -121102,21 +121156,21 @@ self: { }) {}; "text" = callPackage - ({ mkDerivation, array, base, bytestring, deepseq, directory - , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode - , random, test-framework, test-framework-hunit + ({ mkDerivation, array, base, binary, bytestring, deepseq + , directory, ghc-prim, HUnit, integer-gmp, QuickCheck + , quickcheck-unicode, random, test-framework, test-framework-hunit , test-framework-quickcheck2 }: mkDerivation { pname = "text"; - version = "1.2.0.6"; - sha256 = "0wvgynm76pb69wzlpys6l8j8ac4j43gas1anqbsg5ldlfvl85zfq"; + version = "1.2.1.0"; + sha256 = "0mpv82v853jimshff8xg2429hr23lp81vlrps76ypndz5ilxzipi"; buildDepends = [ - array base bytestring deepseq ghc-prim integer-gmp + array base binary bytestring deepseq ghc-prim integer-gmp ]; testDepends = [ - array base bytestring deepseq directory ghc-prim HUnit integer-gmp - QuickCheck quickcheck-unicode random test-framework + array base binary bytestring deepseq directory ghc-prim HUnit + integer-gmp QuickCheck quickcheck-unicode random test-framework test-framework-hunit test-framework-quickcheck2 ]; homepage = "https://github.com/bos/text"; @@ -121146,8 +121200,11 @@ self: { mkDerivation { pname = "text-binary"; version = "0.1.0"; + revision = "1"; sha256 = "0wc501j8hqspnhf4d1hyb18f1wgc4kl2qx1b5s4bkxv0dfbwrk6z"; + editedCabalFile = "73815941abe470b6d0e2287c054995c5ec59524bed9d2f6bfef2411a4397c48d"; buildDepends = [ base binary text ]; + jailbreak = true; homepage = "https://github.com/kawu/text-binary"; description = "Binary instances for text types"; license = stdenv.lib.licenses.bsd3; @@ -121527,6 +121584,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "textocat-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, http-conduit + , http-types, resourcet, tasty, tasty-hunit, text, transformers + }: + mkDerivation { + pname = "textocat-api"; + version = "0.1.0.0"; + sha256 = "0cljy3s13xqdvxffpp74iwamfvkmq7s49vpc8vpxnq2fvh6bmkx9"; + buildDepends = [ + aeson base bytestring conduit http-conduit http-types resourcet + text transformers + ]; + testDepends = [ + aeson base bytestring conduit http-conduit http-types resourcet + tasty tasty-hunit text transformers + ]; + jailbreak = true; + homepage = "https://github.com/gltronred/textocat-api-haskell"; + description = "Unofficial Haskell SDK for Textocat API -- http://textocat.com"; + license = stdenv.lib.licenses.asl20; + }) {}; + "texts" = callPackage ({ mkDerivation }: mkDerivation { @@ -121934,26 +122013,21 @@ self: { "themoviedb" = callPackage ({ 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 + , http-client, http-client-tls, http-types, mtl, tasty, tasty-hunit + , text, text-binary, time, time-locale-compat, transformers }: mkDerivation { pname = "themoviedb"; - version = "1.0.0.0"; - sha256 = "1gwvhbxmhzc5sbcfvyln84x7j8jpglknxx15q82dyr8bhccs4x0w"; + version = "1.1.0.0"; + sha256 = "0yvpijr2dk01g1ks65nalyz547l9aq97a9v1bx3lp47allihrp8k"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base binary bytestring either http-client http-client-tls - http-types mtl network network-uri old-locale text text-binary time - transformers unix + http-types mtl text text-binary time time-locale-compat + transformers ]; - testDepends = [ - aeson base bytestring network old-locale tasty tasty-hunit text - time transformers unix - ]; - jailbreak = true; + testDepends = [ base bytestring tasty tasty-hunit text time ]; homepage = "http://github.com/pjones/themoviedb"; description = "Haskell API bindings for http://themoviedb.org"; license = stdenv.lib.licenses.mit; @@ -128041,15 +128115,14 @@ self: { }: mkDerivation { pname = "vado"; - version = "0.0.4"; - sha256 = "0ndhknsqrb0vg5gba2q6dala16m7vbc8x4dga28q3ys0f14h1m6m"; + version = "0.0.5"; + sha256 = "07bqcp58hqyh5zvi6zpwwpppfzj30j60ryf6k0wqzckklibffqkj"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec base directory filepath process text ]; testDepends = [ attoparsec base directory filepath process QuickCheck text ]; - jailbreak = true; homepage = "https://github.com/hamishmack/vado"; description = "Runs commands on remote machines using ssh"; license = stdenv.lib.licenses.mit; From e281707ae9898e61b916c10f4bc9b5759f9114a5 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Fri, 22 May 2015 12:31:54 -0400 Subject: [PATCH 568/615] lens-action has been fixed. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9959f093f93e..175c1363f04f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -817,10 +817,6 @@ self: super: { # https://github.com/kkardzis/curlhs/issues/6 curlhs = dontCheck super.curlhs; - # https://github.com/ekmett/lens-action/issues/5 - lens-action = markBroken super.lens-action; - aws-kinesis-client = markBroken super.aws-kinesis-client; - # https://github.com/haskell-servant/servant-server/issues/45 servant-server = markBroken super.servant-server; servant-client = dontDistribute super.servant-client; From 58e96c79d838c5b74a2effd52c019d780b5799bc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 23 May 2015 11:18:05 +0200 Subject: [PATCH 569/615] haskell-text-binary: patch to fix build with text-1.2.1.0 or later https://github.com/kawu/text-binary/pull/1 --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 175c1363f04f..1dcb8d00abb6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -829,4 +829,10 @@ self: super: { # https://github.com/hvr/token-bucket/issues/3 token-bucket = dontCheck super.token-bucket; + # https://github.com/kawu/text-binary/issues/2 + text-binary = appendPatch super.text-binary (pkgs.fetchpatch { + url = "https://github.com/RyanGlScott/text-binary/commit/608e0ce86a9a7591dbfe83f7cbb36b8d8ebd07b8.patch"; + sha256 = "1rk5rgb5lsykpvylz77hzxyflxzlmi3fi06rf0yqg2vvrnri83f1"; + }); + } From 18a6e7171e5f0238c50876198648dd7808cfc6e2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 23 May 2015 11:45:05 +0200 Subject: [PATCH 570/615] haskell-hbro-contrib: missing dependency hbro has been fixed upstream --- pkgs/development/haskell-modules/configuration-common.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1dcb8d00abb6..b27b43c12be1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -168,7 +168,6 @@ self: super: { ASN1 = dontDistribute super.ASN1; # NewBinary frame-markdown = dontDistribute super.frame-markdown; # frame hails-bin = dontDistribute super.hails-bin; # Hails - hbro-contrib = dontDistribute super.hbro-contrib; # hbro lss = markBrokenVersion "0.1.0.0" super.lss; # https://github.com/dbp/lss/issues/2 snaplet-lss = markBrokenVersion "0.1.0.0" super.snaplet-lss; # https://github.com/dbp/lss/issues/2 From 70a7f7c14da197968a381a5890a5000656934a01 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 23 May 2015 12:49:42 +0200 Subject: [PATCH 571/615] haskell-configuration-common: use overrideScope on cabal-install instead of override This patch works around https://github.com/NixOS/nixpkgs/issues/7953 so that we can use overrideScope on this attribute in the GHC 7.6.x package set (see next commit). --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b27b43c12be1..5adc679f0ec0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -8,8 +8,8 @@ self: super: { Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6; Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3; Cabal_1_22_3_0 = dontCheck super.Cabal_1_22_3_0; - cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_3_0; zlib = self.zlib_0_5_4_2; }); - cabal-install_1_18_1_0 = dontCheck (super.cabal-install_1_18_1_0.override { Cabal = self.Cabal_1_18_1_6; zlib = self.zlib_0_5_4_2; }); + cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_3_0; zlib = self.zlib_0_5_4_2; }); + cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; zlib = self.zlib_0_5_4_2; }); # Break infinite recursions. Dust-crypto = dontCheck super.Dust-crypto; From e25b42d852f950b5c54e9b0e6de91c23f3263fa7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 23 May 2015 13:05:07 +0200 Subject: [PATCH 572/615] cabal-install: avoid inconsistent 'binary' versions on ghc-7.4.x and ghc-7.6.x --- pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index 88fa300e2e7f..2bad8d8b97d1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -40,6 +40,9 @@ self: super: { # https://github.com/haskell/cabal/issues/2322 Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_0; }; + # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. + cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_4_0; }); + # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; 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 2ee401054398..a90c5f99173a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -42,6 +42,9 @@ self: super: { # https://github.com/haskell/cabal/issues/2322 Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_0; }; + # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. + cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_4_0; }); + # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; From c32c742a82fc29474b8cd12601cdfa0006a90bf8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 23 May 2015 15:12:20 +0200 Subject: [PATCH 573/615] haskell-textocat-api: test suite tries to access the network --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5adc679f0ec0..e71fc5910f4f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -311,6 +311,7 @@ self: super: { scotty-binding-play = dontCheck super.scotty-binding-play; slack-api = dontCheck super.slack-api; # https://github.com/mpickering/slack-api/issues/5 stackage = dontCheck super.stackage; # http://hydra.cryp.to/build/501867/nixlog/1/raw + textocat-api = dontCheck super.textocat-api; # http://hydra.cryp.to/build/887011/log/raw warp = dontCheck super.warp; # http://hydra.cryp.to/build/501073/nixlog/5/raw wreq = dontCheck super.wreq; # http://hydra.cryp.to/build/501895/nixlog/1/raw wreq-sb = dontCheck super.wreq-sb; # http://hydra.cryp.to/build/783948/log/raw From f0311f9b8cd142a83ffcf738138fa51d0064e115 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 23 May 2015 15:16:31 +0200 Subject: [PATCH 574/615] haskell-lzma-enumerator: test suite is broken (and has been for quite a while) --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e71fc5910f4f..1432b9361dbb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -835,4 +835,7 @@ self: super: { sha256 = "1rk5rgb5lsykpvylz77hzxyflxzlmi3fi06rf0yqg2vvrnri83f1"; }); + # https://github.com/alphaHeavy/lzma-enumerator/issues/3 + lzma-enumerator = dontCheck super.lzma-enumerator; + } From 6276ebafaea30797d338ddeee1134fe889251507 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 23 May 2015 22:42:37 +0300 Subject: [PATCH 575/615] Update Query-FS (and CL-Fuse-Meta-FS) --- pkgs/development/lisp-modules/lisp-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 5b24c7043623..91c08419e706 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -226,14 +226,14 @@ let lispPackages = rec { query-fs = buildLispPackage rec { baseName = "query-fs"; - version = "git-20141113"; + version = "git-20150523"; description = "High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries"; deps = [bordeaux-threads cl-fuse cl-fuse-meta-fs cl-ppcre command-line-arguments iterate trivial-backtrace]; # Source type: git src = pkgs.fetchgit { url = ''https://github.com/fb08af68/query-fs''; - sha256 = "4ed66f255e50d2c9ea9f0b3fbaa92bde9b8acf6a5fafb0d7f12b254be9de99e9"; - rev = ''831f0180967f09b1dd345fef82144f48334279c3''; + sha256 = "19h6hscza7p93bc7jvb6ya7ghg96dr1c1v4imlxpjqfdhhdpxsq6"; + rev = ''0f28e3f31a4cd3636a8edb346230482e68af86c2''; }; overrides = x: { linkedSystems = []; @@ -319,14 +319,14 @@ let lispPackages = rec { cl-fuse-meta-fs = buildLispPackage rec { baseName = "cl-fuse-meta-fs"; - version = "git-20141113"; + version = "git-20150523"; description = "CFFI bindings to FUSE (Filesystem in user space)"; deps = [bordeaux-threads cl-fuse iterate pcall]; # Source type: git src = pkgs.fetchgit { url = ''https://github.com/fb08af68/cl-fuse-meta-fs''; - sha256 = "259303effea61baf293ffc5d080cb071ef15bed8fa1c76f0c1631f68d2aa3c85"; - rev = ''d3d332471ce9330e3eaebf9d6cecdd2014c3599b''; + sha256 = "0cpxwsc0ma1ypl54n3n37wbgdxhz5j67h28q6rhghjn96dgy4ac9"; + rev = ''6ab92ebbb8e6f1f69d179214032915e3744d8c03''; }; }; From 59ab07351b87ad1fbaf234f1a1109f82bee4e03e Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Sat, 23 May 2015 13:46:48 -0700 Subject: [PATCH 576/615] emacs-packages: update swiper to 0.5.0 --- pkgs/top-level/emacs-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 40bfb245f39d..1f3386aa9cb3 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -1093,14 +1093,14 @@ let self = _self // overrides; swiper = melpaBuild rec { pname = "swiper"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = pname; rev = version; - sha256 = "1skgw84j5a59ds86bpdcaf3c8iq2m0fz720chjh91ixhkavvdd87"; + sha256 = "1a28vignwpcn62xk46w5p5wjfrbcmvs0gz1jgn4ba7ibmn4cmnnm"; }; - fileSpecs = [ "swiper.el" "ivy.el" "colir.el" ]; + fileSpecs = [ "swiper.el" "ivy.el" "colir.el" "counsel.el" ]; meta = { license = gpl3Plus; }; }; From c95e489149897cb1c34fae3a6e5910519018a488 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Sat, 23 May 2015 13:48:54 -0700 Subject: [PATCH 577/615] fish: dont demand man-db on darwin since we cant build it --- pkgs/shells/fish/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index d7d69c00c5fe..119a3593cec8 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { # Required binaries during execution # Python: Autocompletion generated from manpages and config editing - propagatedBuildInputs = [ python which groff gettext man_db bc ]; + propagatedBuildInputs = [ python which groff gettext ] + ++ stdenv.lib.optional (!stdenv.isDarwin) man_db + ++ [ bc ]; postInstall = '' sed -i "s|bc|${bc}/bin/bc|" "$out/share/fish/functions/seq.fish" @@ -22,7 +24,9 @@ stdenv.mkDerivation rec { sed -e "s|gettext |${gettext}/bin/gettext |" \ -e "s|which |${which}/bin/which |" \ -i "$out/share/fish/functions/_.fish" + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' sed -i "s|Popen(\['manpath'|Popen(\['${man_db}/bin/manpath'|" "$out/share/fish/tools/create_manpage_completions.py" + '' + '' sed -i "s|/sbin /usr/sbin||" \ "$out/share/fish/functions/__fish_complete_subcommand_root.fish" ''; From 7d2ce8e70753118878c0b88d6587c9d4eec0a805 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 23 May 2015 23:03:38 +0200 Subject: [PATCH 578/615] qfsm: update to version 0.54.0 --- pkgs/applications/science/electronics/qfsm/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix index 160c530e722e..8b09b7dd37d6 100644 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ b/pkgs/applications/science/electronics/qfsm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qt4, cmake, graphviz, pkgconfig }: stdenv.mkDerivation rec { - name = "qfsm-0.53.0"; + name = "qfsm-0.54.0"; src = fetchurl { url = "mirror://sourceforge/qfsm/${name}-Source.tar.bz2"; - sha256 = "1fx99dyai8zhs8s6mbr1i1467mnv1pf0ymh6mr0jm68mzj2jyzx4"; + sha256 = "0rl7bc5cr29ng67yij4akciyid9z7npal812ys4c3m229vjvflrb"; }; buildInputs = [ qt4 cmake graphviz pkgconfig ]; @@ -18,6 +18,5 @@ stdenv.mkDerivation rec { description = "Graphical editor for finite state machines"; homepage = "http://qfsm.sourceforge.net/"; license = stdenv.lib.licenses.gpl3Plus; - broken = true; }; } From 85276267789f35ede13152ad8e598a2d0199594d Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 23 May 2015 23:59:13 +0200 Subject: [PATCH 579/615] fix build ir.lv2: add fftw --- pkgs/applications/audio/ir.lv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix index 2b808c3b0153..804d6e7d4e41 100644 --- a/pkgs/applications/audio/ir.lv2/default.nix +++ b/pkgs/applications/audio/ir.lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, lv2, libsamplerate, libsndfile, pkgconfig, zita-convolver }: +{ stdenv, fetchurl, fftw, gtk, lv2, libsamplerate, libsndfile, pkgconfig, zita-convolver }: stdenv.mkDerivation rec { name = "ir.lv2-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "17a6h2mv9xv41jpbx6bdakkngin4kqzh2v67l4076ddq609k5a7v"; }; - buildInputs = [ gtk lv2 libsamplerate libsndfile pkgconfig zita-convolver ]; + buildInputs = [ fftw gtk lv2 libsamplerate libsndfile pkgconfig zita-convolver ]; buildPhase = '' make From b2de6ccc8ed72194d1999e21eea7e7bfde77d396 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 23 May 2015 16:23:24 -0700 Subject: [PATCH 580/615] Update prometheus and its various helper packages Updates to: - prometheus - prometheus-alertmanager - prometheus-cli - prometheus-mesos-exporter - prometheus-node-exporter - prometheus-pushgateway - prometheus-statsd-bridge --- .../prometheus/alertmanager/default.nix | 14 ++++++-------- .../monitoring/prometheus/cli/default.nix | 8 +++++--- pkgs/servers/monitoring/prometheus/default.nix | 18 ++++++++++-------- .../prometheus/mesos_exporter/default.nix | 6 +++--- .../prometheus/node_exporter/default.nix | 7 ++++--- .../prometheus/pushgateway/default.nix | 12 ++++-------- .../prometheus/statsd_bridge/default.nix | 10 +++++----- pkgs/top-level/go-packages.nix | 14 ++++++++++++++ 8 files changed, 51 insertions(+), 38 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix index 06dfc1ef1c97..56fcee762786 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix @@ -1,23 +1,21 @@ { stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }: -with goPackages; - -buildGoPackage rec { +goPackages.buildGoPackage rec { name = "prometheus-alertmanager-${version}"; - version = "0.1.0"; + version = "0.0.1"; goPackagePath = "github.com/prometheus/alertmanager"; src = fetchFromGitHub { owner = "prometheus"; repo = "alertmanager"; - rev = "942cd35dea6dc406b106d7a57ffe7adbb3b978a5"; - sha256 = "1c14vgn9s0dn322ss8fs5b47blw1g8cxy9w4yjn0f7x2sdwplx1i"; + rev = "2b6c5caf89a492b013204e8d7db99fbb78c5dcd4"; + sha256 = "13rdqnvmx11ks305dlnzv9gwf8c4zjyi5fkwcd69xgjfars2m4f3"; }; buildInputs = [ goPackages.glog goPackages.protobuf - goPackages.fsnotify.v1 + goPackages.fsnotify.v0 goPackages.httprouter goPackages.prometheus.client_golang goPackages.pushover @@ -31,7 +29,7 @@ buildGoPackage rec { -X main.buildBranch master -X main.buildUser nix@nixpkgs -X main.buildDate 20150101-00:00:00 - -X main.goVersion ${lib.getVersion go} + -X main.goVersion ${lib.getVersion goPackages.go} ''; preBuild = '' diff --git a/pkgs/servers/monitoring/prometheus/cli/default.nix b/pkgs/servers/monitoring/prometheus/cli/default.nix index f1f5ef9975c5..701ee46d4981 100644 --- a/pkgs/servers/monitoring/prometheus/cli/default.nix +++ b/pkgs/servers/monitoring/prometheus/cli/default.nix @@ -1,13 +1,15 @@ { stdenv, lib, goPackages, fetchFromGitHub }: goPackages.buildGoPackage rec { - name = "prometheus-cli-0.2.0"; + name = "prometheus-cli-${rev}"; + rev = "0.3.0"; goPackagePath = "github.com/prometheus/prometheus_cli"; + src = fetchFromGitHub { owner = "prometheus"; repo = "prometheus_cli"; - rev = "b36c21d2301cf686bff81953573a29a6d5a0a883"; - sha256 = "190dlc6fyrfgxab4xj3gaz4jwx33jhzg57d8h36xjx56gbvp7iyk"; + inherit rev; + sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn"; }; buildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 6e181c6ec9e4..8180d24aa9ee 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,23 +1,25 @@ { stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }: -with goPackages; - -buildGoPackage rec { +goPackages.buildGoPackage rec { name = "prometheus-${version}"; - version = "0.12.0"; + version = "0.13.4"; goPackagePath = "github.com/prometheus/prometheus"; - rev = "55dcb55498b43bafe94915a4de7907d6d66b4427"; + rev = "612da96c46f0b7ea6cc28a3fc614f14eae0189d0"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "prometheus"; - sha256 = "17bbdk9axr91m2947ddbnzqwaap2vrzsbknbrlpdsmlsjhc8h7cb"; + sha256 = "1r3pcnxs1cdh18lmqd60r3nh614cw543wzd4slkr2nzr73pn5x4j"; }; buildInputs = [ - dns glog goleveldb prometheus.client_golang + goPackages.dns + goPackages.glog goPackages.protobuf + goPackages.goleveldb + goPackages.net + goPackages.prometheus.client_golang protobuf # the non-golang package, for protoc vim # for xxd, used in embed-static.sh ]; @@ -30,7 +32,7 @@ buildGoPackage rec { -X main.buildBranch master -X main.buildUser nix@nixpkgs -X main.buildDate 20150101-00:00:00 - -X main.goVersion ${lib.getVersion go} + -X main.goVersion ${lib.getVersion goPackages.go} ''; preBuild = '' diff --git a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix index e816f346e53b..5a62a46823bc 100644 --- a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix @@ -1,15 +1,15 @@ { stdenv, lib, goPackages, fetchFromGitHub }: goPackages.buildGoPackage rec { - name = "prometheus-mesos-exporter-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "a4a6638d6db6b5137e130cd4903b30dd82b78e9a"; + name = "prometheus-mesos-exporter-${rev}"; + rev = "0.1.0"; goPackagePath = "github.com/prometheus/mesos_exporter"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "mesos_exporter"; - sha256 = "1h4yxfcr8l9i2m1s5ygk3slhxdrs4mvmpn3sq8m5s205abvp891q"; + sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm"; }; buildInputs = [ goPackages.mesos-stats ]; diff --git a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix index 97169a0e298b..c60985d3aa73 100644 --- a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix @@ -3,14 +3,15 @@ with goPackages; buildGoPackage rec { - name = "prometheus-node-exporter-0.8.0"; + name = "prometheus-node-exporter-${rev}"; + rev = "0.8.1"; goPackagePath = "github.com/prometheus/node_exporter"; src = fetchFromGitHub { owner = "prometheus"; repo = "node_exporter"; - rev = "aaf01e52e25883671fd67234b415df7abd0e4eac"; - sha256 = "0j1qvgsc2hcv50l9lyfivkzsyjkjp3w1yyqvd1gzfybk7hi59dya"; + inherit rev; + sha256 = "15vp88w0b7h6sryy61qk369yjr3p4qvpch1nbxd9rm51bdgsqyys"; }; buildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix index c16cb7a9408e..ae1e1e38902f 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix @@ -3,16 +3,15 @@ with goPackages; buildGoPackage rec { - name = "prometheus-pushgateway-${version}"; - version = "0.1.0"; + name = "prometheus-pushgateway-${rev}"; + rev = "0.1.1"; goPackagePath = "github.com/prometheus/pushgateway"; - rev = "3f1d42dade342ddb88381607358bae61a0a6b6c7"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "pushgateway"; - sha256 = "1wqxbl9rlnxszp9ylvdbx6f5lyj2z0if3x099fnjahbqmz8yhnf4"; + sha256 = "17q5z9msip46wh3vxcsq9lvvhbxg75akjjcr2b29zrky8bp2m230"; }; buildInputs = [ @@ -25,7 +24,7 @@ buildGoPackage rec { buildFlagsArray = '' -ldflags= - -X main.buildVersion ${version} + -X main.buildVersion ${rev} -X main.buildRev ${rev} -X main.buildBranch master -X main.buildUser nix@nixpkgs @@ -37,9 +36,6 @@ buildGoPackage rec { ( cd "go/src/$goPackagePath" go-bindata ./resources/ - ${govers}/bin/govers -d -m github.com/matttproud/golang_protobuf_extensions/ext github.com/matttproud/golang_protobuf_extensions/pbutil - substituteInPlace handler/push.go \ - --replace ext.ReadDelimited pbutil.ReadDelimited ) ''; diff --git a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix index b6548b90f299..31acf79c8139 100644 --- a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix +++ b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix @@ -1,19 +1,19 @@ { stdenv, lib, goPackages, fetchFromGitHub }: goPackages.buildGoPackage rec { - name = "prometheus-statsd-bridge-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "9715b183150c7bed8a10affb23d33fb55c597180"; + name = "prometheus-statsd-bridge-${version}"; + version = "0.1.0"; goPackagePath = "github.com/prometheus/statsd_bridge"; src = fetchFromGitHub { - inherit rev; + rev = version; owner = "prometheus"; repo = "statsd_bridge"; - sha256 = "119024xb08qjwbhplpl5d94bjdfhn92w4ffn4kxr7aviri1gynfz"; + sha256 = "1fndpmd1k0a3ar6f7zpisijzc60f2dng5399nld1i1cbmd8jybjr"; }; buildInputs = with goPackages; [ - fsnotify.v1 + fsnotify.v0 prometheus.client_golang ]; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index c4fc9065698e..a205cb7f8fb1 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -598,6 +598,20 @@ let }; }; + fsnotify.v0 = buildGoPackage rec { + rev = "v0.9.3"; + name = "fsnotify.v0-${rev}"; + goPackagePath = "gopkg.in/fsnotify.v0"; + goPackageAliases = [ "github.com/howeyc/fsnotify" ]; + + src = fetchFromGitHub { + inherit rev; + owner = "go-fsnotify"; + repo = "fsnotify"; + sha256 = "15wqjpkfzsxnaxbz6y4r91hw6812g3sc4ipagxw1bya9klbnkdc9"; + }; + }; + fsnotify.v1 = buildGoPackage rec { rev = "v1.2.0"; name = "fsnotify.v1-${rev}"; From 34ad0a304a12062642a58eb3a49a1b8358c15367 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 23 May 2015 17:51:00 -0700 Subject: [PATCH 581/615] riemann: update to 0.2.9 --- pkgs/servers/monitoring/riemann/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index f8cd73605ca9..132275a56e09 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "riemann-${version}"; - version = "0.2.8"; + version = "0.2.9"; src = fetchurl { url = "http://aphyr.com/riemann/${name}.tar.bz2"; - sha256 = "1p2pdkxy2xc5zlj6kadf4z8l0f0r4bvdgipqf52193l7rdm6dfzm"; + sha256 = "10zz92sg9ak8g7xsfc05p4kic6hzwj7nqpkjgsd8f7f3slvfjqw3"; }; phases = [ "unpackPhase" "installPhase" ]; From f9963065278719422475c6c38ea761c2f7ec5c2b Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 23 May 2015 18:01:51 -0700 Subject: [PATCH 582/615] riemann-c-client: update to 1.7.0 --- pkgs/tools/misc/riemann-c-client/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index efdc21ad9b79..5dde592aade2 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -1,13 +1,16 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, protobufc }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, file +, protobufc }: stdenv.mkDerivation rec { name = "riemann-c-client-${version}"; - version = "1.2.1"; + version = "1.7.0"; - src = fetchurl { - url = "https://github.com/algernon/riemann-c-client/archive/${name}.tar.gz"; - sha256 = "132yd1m523inmv17sd48xf7xdqb7jj36v7is1xw7w9nny6qxkzwm"; + src = fetchFromGitHub { + owner = "algernon"; + repo = "riemann-c-client"; + rev = "54f4a656793d6c5ca0bf1ff2388693fb6b2b82a7"; + sha256 = "0jc2bbw7sp2gr4cswx78srs0p1kp81prcarq4ivqpfw4bmzg6xg4"; }; buildInputs = [ autoconf automake libtool pkgconfig file protobufc ]; @@ -15,7 +18,7 @@ stdenv.mkDerivation rec { preConfigure = "autoreconf -i"; meta = with stdenv.lib; { - homepage = "https://github.com/algernon/riemann-c-client"; + homepage = https://github.com/algernon/riemann-c-client; description = "A C client library for the Riemann monitoring system"; license = licenses.gpl3; maintainers = [ maintainers.rickynils ]; From ec027fbb424f3dc258853ea9110c84b427cf075e Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 23 May 2015 18:14:56 -0700 Subject: [PATCH 583/615] riemann-dash: update to 0.2.11 --- pkgs/servers/monitoring/riemann-dash/Gemfile | 2 +- .../monitoring/riemann-dash/Gemfile.lock | 14 +++---- .../monitoring/riemann-dash/gemset.nix | 40 +++++++++---------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile b/pkgs/servers/monitoring/riemann-dash/Gemfile index 496302e76435..6b770b708185 100644 --- a/pkgs/servers/monitoring/riemann-dash/Gemfile +++ b/pkgs/servers/monitoring/riemann-dash/Gemfile @@ -1,3 +1,3 @@ source 'https://rubygems.org' -gem "riemann-dash", "0.2.9" +gem "riemann-dash", "0.2.11" diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile.lock b/pkgs/servers/monitoring/riemann-dash/Gemfile.lock index cd0ace470e20..a5445b953c47 100644 --- a/pkgs/servers/monitoring/riemann-dash/Gemfile.lock +++ b/pkgs/servers/monitoring/riemann-dash/Gemfile.lock @@ -3,25 +3,25 @@ GEM specs: erubis (2.7.0) multi_json (1.3.6) - rack (1.5.2) + rack (1.6.1) rack-protection (1.5.3) rack - riemann-dash (0.2.9) + riemann-dash (0.2.11) erubis (>= 2.7.0) multi_json (= 1.3.6) sass (>= 3.1.14) sinatra (~> 1.4.5) webrick (~> 1.3.1) - sass (3.4.8) - sinatra (1.4.5) + sass (3.4.14) + sinatra (1.4.6) rack (~> 1.4) rack-protection (~> 1.4) - tilt (~> 1.3, >= 1.3.4) - tilt (1.4.1) + tilt (>= 1.3, < 3) + tilt (2.0.1) webrick (1.3.1) PLATFORMS ruby DEPENDENCIES - riemann-dash (= 0.2.9) + riemann-dash (= 0.2.11) diff --git a/pkgs/servers/monitoring/riemann-dash/gemset.nix b/pkgs/servers/monitoring/riemann-dash/gemset.nix index f2e80e9aca43..b98fd452f1af 100644 --- a/pkgs/servers/monitoring/riemann-dash/gemset.nix +++ b/pkgs/servers/monitoring/riemann-dash/gemset.nix @@ -1,26 +1,26 @@ { - erubis = { + "erubis" = { version = "2.7.0"; source = { type = "gem"; sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; }; }; - multi_json = { + "multi_json" = { version = "1.3.6"; source = { type = "gem"; sha256 = "0q2zjfvd2ibds9g9nzf2p1b47fc1wqliwfywv5pw85w15lmy91yr"; }; }; - rack = { - version = "1.5.2"; + "rack" = { + version = "1.6.1"; source = { type = "gem"; - sha256 = "19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6"; + sha256 = "0f73v6phkwczl1sfv0wgdwsnlsg364bhialbnfkg2dnxhh57l0gl"; }; }; - rack-protection = { + "rack-protection" = { version = "1.5.3"; source = { type = "gem"; @@ -30,11 +30,11 @@ "rack" ]; }; - riemann-dash = { - version = "0.2.9"; + "riemann-dash" = { + version = "0.2.11"; source = { type = "gem"; - sha256 = "0ws5wmjbv8w9lcr3i2mdinj2qm91p6c85k6c067i67cf0p90jxq3"; + sha256 = "1vzb75hf1xy7ssil7fp9z7z51vh79ba22x56ific7f1kcb21lzk7"; }; dependencies = [ "erubis" @@ -44,18 +44,18 @@ "webrick" ]; }; - sass = { - version = "3.4.8"; + "sass" = { + version = "3.4.14"; source = { type = "gem"; - sha256 = "1ianyj2figwk314h10fkzpjql2xxi5l4njv1h0w8iyzjda85rqlp"; + sha256 = "0x2mg6pid87s4ddvv6xnxfzwgy72pjmkm461pav92ngqnngx2ggk"; }; }; - sinatra = { - version = "1.4.5"; + "sinatra" = { + version = "1.4.6"; source = { type = "gem"; - sha256 = "0qyna3wzlnvsz69d21lxcm3ixq7db08mi08l0a88011qi4qq701s"; + sha256 = "1hhmwqc81ram7lfwwziv0z70jh92sj1m7h7s9fr0cn2xq8mmn8l7"; }; dependencies = [ "rack" @@ -63,18 +63,18 @@ "tilt" ]; }; - tilt = { - version = "1.4.1"; + "tilt" = { + version = "2.0.1"; source = { type = "gem"; - sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir"; + sha256 = "1qc1k2r6whnb006m10751dyz3168cq72vj8mgp5m2hpys8n6xp3k"; }; }; - webrick = { + "webrick" = { version = "1.3.1"; source = { type = "gem"; sha256 = "0s42mxihcl2bx0h9q0v2syl70qndydfkl39a06h9il17p895ya8g"; }; }; -} +} \ No newline at end of file From 50cb206cd5401710b7479b32d8849cb0c523dc54 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 23 May 2015 18:28:03 -0700 Subject: [PATCH 584/615] awscli: update to 1.7.29 Includes updates to bcdoc and botocore. --- pkgs/tools/admin/awscli/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index d924ae0b7d52..c846de708525 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonPackage rec { name = "awscli-${version}"; - version = "1.7.21"; + version = "1.7.29"; namePrefix = ""; src = fetchzip { url = "https://github.com/aws/aws-cli/archive/${version}.tar.gz"; - sha256 = "1hm2m5ycsyn4lap8549d6glryp9b9mvar9xwbpmpdcf698lcxzsj"; + sha256 = "0r0w5qldimdp2d2ykw7pmppn8chbhh6cm48famhldqnyrh3vrf02"; }; propagatedBuildInputs = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b4504ce8cc69..4aaded395e30 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -837,14 +837,14 @@ let }; bcdoc = buildPythonPackage rec { - name = "bcdoc-0.13.0"; + name = "bcdoc-0.14.0"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/b/bcdoc/bcdoc-0.13.0.tar.gz"; - md5 = "819882458be7b642e00ddc9846073d89"; + url = "https://pypi.python.org/packages/source/b/bcdoc/${name}.tar.gz"; + sha256 = "1s2kdqs1n2mj7wq3w0pq30zs7vxq0l3abik2clqnc4hm2j7crbk8"; }; - buildInputs = with self; [ self.docutils self.six ]; + buildInputs = with self; [ docutils six ]; meta = { homepage = https://github.com/botocore/bcdoc; @@ -1331,12 +1331,12 @@ let }; botocore = buildPythonPackage rec { - version = "0.102.0"; + version = "1.0.0a1"; name = "botocore-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz"; - sha256 = "1266hwkcchzr9r2z1q1150zmk20p3d4a75p6nppi6w9bhsywxhnr"; + sha256 = "0fybr48l0fvpc57n71khynpb4j0ibzn35bzybw6g1q9063xfwnxm"; }; propagatedBuildInputs = @@ -6399,17 +6399,17 @@ let jmespath = buildPythonPackage rec { - name = "jmespath-0.6.1"; + name = "jmespath-0.7.1"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/j/jmespath/${name}.tar.gz"; - sha256 = "1f7nxk62yifh6zwhf34w4fgwxvyls8x2daphljgrg4lh0i2sgwgr"; + sha256 = "1lazbx65imassd7h24z49za001rvx1lmx8r0l21h4izs7pp14nnd"; }; propagatedBuildInputs = with self; [ ply ]; meta = { - homepage = "https://github.com/boto/jmespath"; + homepage = https://github.com/boto/jmespath; description = "JMESPath allows you to declaratively specify how to extract elements from a JSON document"; license = "BSD"; }; From c078890a1962831955a3814ee70b795bf2e40f06 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 May 2015 13:49:45 -0700 Subject: [PATCH 585/615] postgres: Cleanup meta --- pkgs/servers/sql/postgresql/8.4.x.nix | 9 +++++---- pkgs/servers/sql/postgresql/9.0.x.nix | 9 +++++---- pkgs/servers/sql/postgresql/9.1.x.nix | 9 +++++---- pkgs/servers/sql/postgresql/9.2.x.nix | 9 +++++---- pkgs/servers/sql/postgresql/9.3.x.nix | 9 +++++---- pkgs/servers/sql/postgresql/9.4.x.nix | 11 ++++++----- 6 files changed, 31 insertions(+), 25 deletions(-) diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index d77a539cb5d9..4c72dbfd4484 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -20,11 +20,12 @@ stdenv.mkDerivation rec { passthru = { inherit readline; }; - meta = { + meta = with stdenv.lib; { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; - license = stdenv.lib.licenses.postgresql; - maintainers = [ stdenv.lib.maintainers.ocharles ]; - hydraPlatforms = stdenv.lib.platforms.linux; + license = licenses.postgresql; + maintainers = with maintaiers; [ ocharles ]; + platforms = platforms.unix; + hydraPlatforms = platforms.linux; }; } diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index 340307c01f90..a27bc012b6ed 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -23,11 +23,12 @@ stdenv.mkDerivation rec { psqlSchema = "9.0"; }; - meta = { + meta = with stdenv.lib; { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; - license = stdenv.lib.licenses.postgresql; - maintainers = [ stdenv.lib.maintainers.ocharles ]; - hydraPlatforms = stdenv.lib.platforms.linux; + license = licenses.postgresql; + maintainers = with maintaiers; [ ocharles ]; + platforms = platforms.unix; + hydraPlatforms = platforms.linux; }; } diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 5b0774d6229c..87ed9abe6901 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -31,11 +31,12 @@ stdenv.mkDerivation rec { psqlSchema = "9.1"; }; - meta = { + meta = with stdenv.lib; { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; - license = stdenv.lib.licenses.postgresql; - maintainers = [ stdenv.lib.maintainers.ocharles ]; - hydraPlatforms = stdenv.lib.platforms.linux; + license = licenses.postgresql; + maintainers = with maintaiers; [ ocharles ]; + platforms = platforms.unix; + hydraPlatforms = platforms.linux; }; } diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index d09cde5b995f..3c21a96e9b27 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -29,11 +29,12 @@ stdenv.mkDerivation rec { psqlSchema = "9.2"; }; - meta = { + meta = with stdenv.lib; { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; - license = stdenv.lib.licenses.postgresql; - maintainers = [ stdenv.lib.maintainers.ocharles ]; - hydraPlatforms = stdenv.lib.platforms.linux; + license = licenses.postgresql; + maintainers = with maintaiers; [ ocharles ]; + platforms = platforms.unix; + hydraPlatforms = platforms.linux; }; } diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index 6467ce80af1e..4406aecaa897 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -33,11 +33,12 @@ stdenv.mkDerivation rec { psqlSchema = "9.3"; }; - meta = { + meta = with stdenv.lib; { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; - license = stdenv.lib.licenses.postgresql; - maintainers = [ stdenv.lib.maintainers.ocharles ]; - hydraPlatforms = stdenv.lib.platforms.linux; + license = licenses.postgresql; + maintainers = with maintaiers; [ ocharles ]; + platforms = platforms.unix; + hydraPlatforms = platforms.linux; }; } diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix index 6649975d7902..73f416912a2a 100644 --- a/pkgs/servers/sql/postgresql/9.4.x.nix +++ b/pkgs/servers/sql/postgresql/9.4.x.nix @@ -33,11 +33,12 @@ stdenv.mkDerivation rec { psqlSchema = "9.4"; }; - meta = { - homepage = http://www.postgresql.org/ ; + meta = with stdenv.lib; { + homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; - license = stdenv.lib.licenses.postgresql; - maintainers = with stdenv.lib.maintainers; [ aristid ocharles ]; - hydraPlatforms = stdenv.lib.platforms.linux; + license = licenses.postgresql; + maintainers = with maintaiers; [ ocharles ]; + platforms = platforms.unix; + hydraPlatforms = platforms.linux; }; } From 3f4f90b58ba4d09352111c98a3e99019673ff64f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 May 2015 16:00:02 -0700 Subject: [PATCH 586/615] e2fsprogs: 1.14.12 -> 1.14.13 --- pkgs/tools/filesystems/e2fsprogs/default.nix | 66 +++++++++++++++----- 1 file changed, 49 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 7617e82f1a8a..c4b44b824f06 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,34 +1,66 @@ -{ stdenv, fetchurl, pkgconfig, libuuid }: +{ stdenv, fetchurl, pkgconfig +# Optional Dependencies +, libuuid +}: + +with stdenv; +let + optLibuuid = shouldUsePkg libuuid; +in +with stdenv.lib; stdenv.mkDerivation rec { - name = "e2fsprogs-1.42.12"; + name = "e2fsprogs-1.42.13"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "0v0qcfyls0dlrjy8gx9m3s2wbkp5z3lbsr5hb7x8kp8f3bclcy71"; + sha256 = "1m72lk90b5i3h9qnmss6aygrzyn8x2avy3hyaq2fb0jglkrkz6ar"; }; - buildInputs = [ pkgconfig libuuid ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ optLibuuid ]; - crossAttrs = { - preConfigure = '' - export CC=$crossConfig-gcc - ''; - }; - - # libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency). - configureFlags = "--enable-elf-shlibs --disable-libuuid --disable-libblkid --disable-uuidd --disable-fsck --enable-symlink-install"; + configureFlags = [ + (mkEnable true "symlink-install" null) + (mkEnable true "relative-symlinks" null) + (mkEnable true "symlink-relative-symlinks" null) + (mkEnable false "compression" null) + (mkEnable true "htree" null) + (mkEnable true "elf-shlibs" null) + (mkEnable false "profile" null) + (mkEnable false "gcov" null) + (mkEnable false "jbd-debug" null) + (mkEnable false "blkid-debug" null) + (mkEnable false "testio-debug" null) + (mkEnable (optLibuuid == null) "libuuid" null) + (mkEnable (optLibuuid == null) "libblkid" null) + (mkEnable true "quota" null) + (mkEnable false "backtrace" null) + (mkEnable false "debugfs" null) + (mkEnable true "imager" null) + (mkEnable true "resizer" null) + (mkEnable true "defrag" null) + (mkEnable true "fsck" null) + (mkEnable false "e2initrd-helper" null) + (mkEnable true "tls" null) + (mkEnable false "uuidd" null) # Build is broken in 1.42.13 + ]; enableParallelBuilding = true; - preInstall = "installFlagsArray=('LN=ln -s')"; + installFlags = [ + "LN=ln -s" + ]; - postInstall = "make install-libs"; + postInstall = '' + make install-libs + ''; - meta = { + meta = with stdenv.lib; { homepage = http://e2fsprogs.sourceforge.net/; description = "Tools for creating and checking ext2/ext3/ext4 filesystems"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ eelco wkennington ]; }; } From d5ca9c017cc7cce7be49b24a63e18ad7d4b01dca Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 May 2015 16:06:17 -0700 Subject: [PATCH 587/615] idnkit: Add derivation --- pkgs/development/libraries/idnkit/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/idnkit/default.nix diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix new file mode 100644 index 000000000000..25c8d7e561b6 --- /dev/null +++ b/pkgs/development/libraries/idnkit/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, libiconv }: + +stdenv.mkDerivation rec { + name = "idnkit-1.0"; + + src = fetchurl { + url = "http://www.nic.ad.jp/ja/idn/idnkit/download/sources/${name}-src.tar.gz"; + sha256 = "1z4i6fmyv67sflmjg763ymcxrcv84rbj1kv15im0s655h775zk8n"; + }; + + buildInputs = [ libiconv ]; + + meta = with stdenv.lib; { + homepage = https://www.nic.ad.jp/ja/idn/idnkit; + description = "provides functionalities about i18n domain name processing"; + license = "idnkit-2 license"; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b43fb9c78961..88a9cca63028 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6782,6 +6782,8 @@ let libidn = callPackage ../development/libraries/libidn { }; + idnkit = callPackage ../development/libraries/idnkit { }; + libiec61883 = callPackage ../development/libraries/libiec61883 { }; libinfinity = callPackage ../development/libraries/libinfinity { From 0a06b99d69000e5da2b6dc33abf91ab73961f1cf Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 May 2015 16:43:27 -0700 Subject: [PATCH 588/615] bind: Modify build --- pkgs/servers/dns/bind/default.nix | 118 +++++++++++++++++++++++++----- 1 file changed, 98 insertions(+), 20 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index fbfa2d8d9b7d..b60998ce6aae 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,7 +1,37 @@ -{ stdenv, fetchurl, openssl, libtool, perl, libxml2 }: +{ stdenv, fetchurl, libtool, docbook5_xsl -let version = "9.10.2"; in +# Optional Dependencies +, libseccomp ? null, python ? null, kerberos ? null, openssl ? null +, libxml2 ? null, json_c ? null, readline ? null, libcap ? null, idnkit ? null +, libiconv ? null +# Optional DLZ Modules +, postgresql ? null, libmysql ? null, db ? null, openldap ? null +}: + +assert postgresql != null; +with stdenv; +let + version = "9.10.2"; + + optLibseccomp = shouldUsePkg libseccomp; + optPython = shouldUsePkg python; + optKerberos = shouldUsePkg kerberos; + optOpenssl = shouldUsePkg openssl; + optLibxml2 = shouldUsePkg libxml2; + optJson_c = shouldUsePkg json_c; + optReadline = shouldUsePkg readline; + optLibcap = if !stdenv.isLinux then null else shouldUsePkg libcap; + optIdnkit = shouldUsePkg idnkit; + optLibiconv = shouldUsePkg libiconv; + + optPostgresql = shouldUsePkg postgresql; + optLibmysql = shouldUsePkg libmysql; + optDb = shouldUsePkg db; + optOpenldap = shouldUsePkg openldap; +in +assert optPostgresql != null; +with stdenv.lib; stdenv.mkDerivation rec { name = "bind-${version}"; @@ -14,30 +44,78 @@ stdenv.mkDerivation rec { sed -i 's/^\t.*run/\t/' Makefile.in ''; - buildInputs = [ openssl libtool perl libxml2 ]; + nativeBuildInputs = [ optPython libtool docbook5_xsl ]; + buildInputs = [ + optLibseccomp optPython optKerberos optOpenssl optLibxml2 optJson_c + optReadline optLibcap optIdnkit optLibiconv optPostgresql optLibmysql + optDb optOpenldap + ]; configureFlags = [ - "--localstatedir=/var" - "--with-libtool" - "--with-libxml2=${libxml2}" - "--with-openssl=${openssl}" - "--without-atf" - "--without-dlopen" - "--without-docbook-xsl" - "--without-gssapi" - "--without-idn" - "--without-idnlib" - "--without-pkcs11" - "--without-purify" - "--without-python" + (mkOther "localstatedir" "/var") + (mkOther "sysconfdir" "/etc") + (mkEnable (optLibseccomp != null) "seccomp" null) + (mkWith (optPython != null) "python" "${optPython}/bin/python") + (mkEnable true "kqueue" null) + (mkEnable true "epoll" null) + (mkEnable true "devpoll" null) + (mkWith false "geoip" null) # TODO(wkennington): GeoDNS support + (mkWith (optKerberos != null) "gssapi" optKerberos) + (mkWith true "libtool" null) + (mkEnable (optOpenssl == null) "native-pkcs11" null) + (mkWith (optOpenssl != null) "openssl" optOpenssl) + (mkWith true "pkcs11" null) + (mkWith true "ecdsa" null) + (mkWith false "gost" null) # Insecure cipher + (mkWith true "aes" null) + (mkEnable (optOpenssl != null) "openssl-hash" null) + (mkEnable true "sit" null) + (mkWith true "sit-alg" "aes") + (mkWith (optLibxml2 != null) "libxml2" optLibxml2) + (mkWith (optJson_c != null) "libjson" optJson_c) + (mkEnable true "largefile" null) + (mkWith false "purify" null) + (mkWith false "gperftools-profiler" null) + (mkEnable false "backtrace" null) + (mkEnable false "symtable" null) + (mkEnable true "ipv6" null) + (mkWith false "kame" null) + (mkWith (optReadline != null) "readline" null) + (mkEnable (optKerberos == null) "isc-spnego" null) + (mkEnable true "chroot" null) + (mkEnable (optLibcap != null) "linux-caps" null) + (mkEnable true "atomic" null) + (mkEnable false "fixed-rrset" null) + (mkEnable true "rpz-nsip" null) + (mkEnable true "rpz-nsdname" null) + (mkEnable true "filter-aaaa" null) + (mkWith true "docbook-xsl" "${docbook5_xsl}/share/xsl/docbook") + (mkWith (optIdnkit != null) "idn" optIdnkit) + (mkWith (optLibiconv != null) "libiconv" optLibiconv) + (mkWith false "atf" null) + (mkWith true "tuning" "large") + (mkWith true "dlopen" null) + (mkWith false "make-clean" null) + (mkEnable true "full-report" null) + (mkWith (optPostgresql != null) "dlz-postgres" optPostgresql) + (mkWith (optLibmysql != null) "dlz-mysql" optLibmysql) + (mkWith (optDb != null) "dlz-bdb" optDb) + (mkWith true "dlz-filesystem" null) + (mkWith (optOpenldap != null) "dlz-ldap" optOpenldap) + (mkWith false "dlz-odbc" null) + (mkWith true "dlz-stub" null) + ]; + + installFlags = [ + "sysconfdir=\${out}/etc" + "localstatedir=\${TMPDIR}" ]; meta = { homepage = "http://www.isc.org/software/bind"; description = "Domain name server"; - license = stdenv.lib.licenses.isc; - - maintainers = with stdenv.lib.maintainers; [viric simons]; - platforms = with stdenv.lib.platforms; unix; + license = licenses.isc; + maintainers = with maintainers; [ viric simons wkennington ]; + platforms = platforms.unix; }; } From 9c6d4533d04e4cf4995e7be9ecc513519f31bc86 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 May 2015 18:32:53 -0700 Subject: [PATCH 589/615] mariadb: 10.0.18 -> 10.0.19 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index fe7c70ced2d0..21ccd50e3ef5 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mariadb-${version}"; - version = "10.0.18"; + version = "10.0.19"; src = fetchurl { url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "1xcs391cm0vnl9bvx1470v8z4d77zqv16n6iaqi12jm0ma8fwvv8"; + sha256 = "0cm1j4805ypbmrhajn4ar5rqsis1p5haxs7c04b6k540gmfmxgrg"; }; buildInputs = [ cmake ncurses openssl zlib pcre libxml2 boost judy bison libevent ] From 3ede091d56a6dead4e961cd9e2df8ac937ee856d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 May 2015 18:33:09 -0700 Subject: [PATCH 590/615] ossp-uuid: Meta fixup --- pkgs/development/libraries/libossp-uuid/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix index 7f6335f64965..119f41116668 100644 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256= "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"; }; - meta = { + meta = with stdenv.lib; { homepage = http://www.ossp.org/pkg/lib/uuid/; description = "OSSP uuid ISO-C and C++ shared library"; longDescription = @@ -35,6 +35,7 @@ stdenv.mkDerivation { short lifetime and to reliably identifying very persistent objects across a network. ''; - license = stdenv.lib.licenses.bsd2; + license = licenses.bsd2; + platforms = platforms.all; }; -} \ No newline at end of file +} From 1bb67e514b2514b9267919784524821952cd73b3 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 May 2015 18:36:00 -0700 Subject: [PATCH 591/615] postgresql: Refactor 8.4 into generic --- pkgs/servers/sql/postgresql/8.4.x.nix | 31 ++------- pkgs/servers/sql/postgresql/generic.nix | 92 +++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 26 deletions(-) create mode 100644 pkgs/servers/sql/postgresql/generic.nix diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index 4c72dbfd4484..66933f2ad420 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,31 +1,10 @@ -{ stdenv, fetchurl, zlib, ncurses, readline, openssl }: +{ callPackage, fetchurl, ... } @ args: -let version = "8.4.22"; in - -stdenv.mkDerivation rec { - name = "postgresql-${version}"; +callPackage ./generic.nix (args // rec { + version = "8.4.22"; src = fetchurl { - url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; + url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw"; }; - - buildInputs = [ zlib ncurses readline openssl ]; - - LC_ALL = "C"; - - configureFlags = [ "--with-openssl" ]; - - patches = [ ./less-is-more.patch ]; - - passthru = { inherit readline; }; - - meta = with stdenv.lib; { - homepage = http://www.postgresql.org/; - description = "A powerful, open source object-relational database system"; - license = licenses.postgresql; - maintainers = with maintaiers; [ ocharles ]; - platforms = platforms.unix; - hydraPlatforms = platforms.linux; - }; -} +}) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix new file mode 100644 index 000000000000..d7fd28ccb689 --- /dev/null +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -0,0 +1,92 @@ +{ stdenv, bison, flex +, gettext + +# Optional Dependencies +, kerberos ? null, pam ? null, openldap ? null, openssl ? null, readline ? null +, libossp_uuid ? null, libxml2 ? null, libxslt ? null, zlib ? null + +# Extra Arguments +, blockSizeKB ? 8, segmentSizeGB ? 1 +, walBlockSizeKB ? 8, walSegmentSizeMB ? 16 + +# Version specific arguments +, version, src +, ... +}: + +with stdenv; +let + optKerberos = shouldUsePkg kerberos; + optPam = shouldUsePkg pam; + optOpenldap = shouldUsePkg openldap; + optOpenssl = shouldUsePkg openssl; + optReadline = shouldUsePkg readline; + optLibossp_uuid = shouldUsePkg libossp_uuid; + optLibxml2 = shouldUsePkg libxml2; + optLibxslt = shouldUsePkg libxslt; + optZlib = shouldUsePkg zlib; +in +with stdenv.lib; +stdenv.mkDerivation rec { + name = "postgresql-${version}"; + + inherit src; + + patches = [ ./less-is-more.patch ]; + + nativeBuildInputs = [ bison flex ]; + buildInputs = [ + gettext optKerberos optPam optOpenldap optOpenssl optReadline + optLibossp_uuid optLibxml2 optLibxslt optZlib + ]; + + #LC_ALL = "C"; + + configureFlags = [ + (mkOther "sysconfdir" "/etc") + (mkOther "localstatedir" "/var") + (mkEnable true "integer-datetimes" null) + (mkEnable true "nls" null) + (mkWith true "pgport" "5432") + (mkEnable true "shared" null) + (mkEnable true "rpath" null) + (mkEnable true "spinlocks" null) + (mkEnable false "debug" null) + (mkEnable false "profiling" null) + (mkEnable false "coverage" null) + (mkEnable false "dtrace" null) + (mkWith true "blocksize" (toString blockSizeKB)) + (mkWith true "segsize" (toString segmentSizeGB)) + (mkWith true "wal-blocksize" (toString walBlockSizeKB)) + (mkWith true "wal-segsize" (toString walSegmentSizeMB)) + (mkEnable true "autodepend" null) + (mkEnable false "cassert" null) + (mkEnable true "thread-safety" null) + (mkWith false "tcl" null) # Maybe enable some day + (mkWith false "perl" null) # Maybe enable some day + (mkWith false "python" null) # Maybe enable some day + (mkWith (optKerberos != null) "gssapi" null) + (mkWith false "krb5" null) + (mkWith (optPam != null) "pam" null) + (mkWith (optOpenldap != null) "ldap" null) + (mkWith false "bonjour" null) + (mkWith (optOpenssl != null) "openssl" null) + (mkWith (optReadline != null) "readline" null) + (mkWith false "libedit-preferred" null) + (mkWith (optLibossp_uuid != null) "ossp-uuid" null) + (mkWith (optLibxml2 != null) "libxml" null) + (mkWith (optLibxslt != null) "libxslt" null) + (mkWith (optZlib != null) "zlib" null) + ]; + + meta = with stdenv.lib; { + homepage = http://www.postgresql.org/; + description = "A powerful, open source object-relational database system"; + license = licenses.postgresql; + maintainers = with maintaiers; [ ocharles ]; + platforms = platforms.unix; + hydraPlatforms = platforms.linux; + }; + + passthru = { inherit readline; }; +} From 8c99f2e3d65add9bca5df66f7f2f3014ea337c85 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 May 2015 19:02:22 -0700 Subject: [PATCH 592/615] postgresql: 9.0.19 -> 9.0.20 --- pkgs/servers/sql/postgresql/9.0.x.nix | 36 +++------------- pkgs/servers/sql/postgresql/generic.nix | 56 ++++++++++++------------- 2 files changed, 34 insertions(+), 58 deletions(-) diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index a27bc012b6ed..6c24e6aa4c45 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,34 +1,10 @@ -{ stdenv, fetchurl, zlib, readline, openssl }: +{ callPackage, fetchurl, ... } @ args: -let version = "9.0.19"; in - -stdenv.mkDerivation rec { - name = "postgresql-${version}"; +callPackage ./generic.nix (args // rec { + version = "9.0.20"; src = fetchurl { - url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "1h45jdbzdcvprdsi9gija81s3ny46h3faf9f007gza4vm6y15bak"; + url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; + sha256 = "0vxa90d1ghv6vg4c6kxvm2skypahvlq4sd968q7l9ff3dl145z02"; }; - - buildInputs = [ zlib readline openssl ]; - - LC_ALL = "C"; - - configureFlags = [ "--with-openssl" ]; - - patches = [ ./less-is-more.patch ]; - - passthru = { - inherit readline; - psqlSchema = "9.0"; - }; - - meta = with stdenv.lib; { - homepage = http://www.postgresql.org/; - description = "A powerful, open source object-relational database system"; - license = licenses.postgresql; - maintainers = with maintaiers; [ ocharles ]; - platforms = platforms.unix; - hydraPlatforms = platforms.linux; - }; -} +}) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index d7fd28ccb689..b2af6dd53316 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -43,34 +43,34 @@ stdenv.mkDerivation rec { #LC_ALL = "C"; configureFlags = [ - (mkOther "sysconfdir" "/etc") - (mkOther "localstatedir" "/var") - (mkEnable true "integer-datetimes" null) - (mkEnable true "nls" null) - (mkWith true "pgport" "5432") - (mkEnable true "shared" null) - (mkEnable true "rpath" null) - (mkEnable true "spinlocks" null) - (mkEnable false "debug" null) - (mkEnable false "profiling" null) - (mkEnable false "coverage" null) - (mkEnable false "dtrace" null) - (mkWith true "blocksize" (toString blockSizeKB)) - (mkWith true "segsize" (toString segmentSizeGB)) - (mkWith true "wal-blocksize" (toString walBlockSizeKB)) - (mkWith true "wal-segsize" (toString walSegmentSizeMB)) - (mkEnable true "autodepend" null) - (mkEnable false "cassert" null) - (mkEnable true "thread-safety" null) - (mkWith false "tcl" null) # Maybe enable some day - (mkWith false "perl" null) # Maybe enable some day - (mkWith false "python" null) # Maybe enable some day - (mkWith (optKerberos != null) "gssapi" null) - (mkWith false "krb5" null) - (mkWith (optPam != null) "pam" null) - (mkWith (optOpenldap != null) "ldap" null) - (mkWith false "bonjour" null) - (mkWith (optOpenssl != null) "openssl" null) + (mkOther "sysconfdir" "/etc") + (mkOther "localstatedir" "/var") + (mkEnable true "integer-datetimes" null) + (mkEnable true "nls" null) + (mkWith true "pgport" "5432") + (mkEnable true "shared" null) + (mkEnable true "rpath" null) + (mkEnable true "spinlocks" null) + (mkEnable false "debug" null) + (mkEnable false "profiling" null) + (mkEnable false "coverage" null) + (mkEnable false "dtrace" null) + (mkWith true "blocksize" (toString blockSizeKB)) + (mkWith true "segsize" (toString segmentSizeGB)) + (mkWith true "wal-blocksize" (toString walBlockSizeKB)) + (mkWith true "wal-segsize" (toString walSegmentSizeMB)) + (mkEnable true "depend" null) + (mkEnable false "cassert" null) + (mkEnable true "thread-safety" null) + (mkWith false "tcl" null) # Maybe enable some day + (mkWith false "perl" null) # Maybe enable some day + (mkWith false "python" null) # Maybe enable some day + (mkWith (optKerberos != null) "gssapi" null) + (mkWith false "krb5" null) + (mkWith (optPam != null) "pam" null) + (mkWith (optOpenldap != null) "ldap" null) + (mkWith false "bonjour" null) + (mkWith (optOpenssl != null) "openssl" null) (mkWith (optReadline != null) "readline" null) (mkWith false "libedit-preferred" null) (mkWith (optLibossp_uuid != null) "ossp-uuid" null) From be94d4bc25e27583ee36024dd9b45ead29c7f796 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 May 2015 19:03:27 -0700 Subject: [PATCH 593/615] postgresql: 9.1.15 -> 9.1.16 --- pkgs/servers/sql/postgresql/9.1.x.nix | 44 ++++--------------------- pkgs/servers/sql/postgresql/generic.nix | 2 ++ 2 files changed, 8 insertions(+), 38 deletions(-) diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 87ed9abe6901..b481f292ec54 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,42 +1,10 @@ -{ stdenv, fetchurl, zlib, readline, openssl }: +{ callPackage, fetchurl, ... } @ args: -let version = "9.1.15"; in - -stdenv.mkDerivation rec { - name = "postgresql-${version}"; +callPackage ./generic.nix (args // rec { + version = "9.1.16"; src = fetchurl { - url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0pyyw0cy91z9wkqf8qzkwsy8cyjps0s94c9czz6mzhyd2npxxmk7"; + url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; + sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b"; }; - - buildInputs = [ zlib readline openssl ]; - - enableParallelBuilding = true; - - LC_ALL = "C"; - - configureFlags = [ "--with-openssl" ]; - - patches = [ ./less-is-more.patch ]; - - postInstall = - '' - mkdir -p $out/share/man - cp -rvd doc/src/sgml/man1 $out/share/man - ''; - - passthru = { - inherit readline; - psqlSchema = "9.1"; - }; - - meta = with stdenv.lib; { - homepage = http://www.postgresql.org/; - description = "A powerful, open source object-relational database system"; - license = licenses.postgresql; - maintainers = with maintaiers; [ ocharles ]; - platforms = platforms.unix; - hydraPlatforms = platforms.linux; - }; -} +}) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index b2af6dd53316..06e6d1e79d69 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -77,6 +77,8 @@ stdenv.mkDerivation rec { (mkWith (optLibxml2 != null) "libxml" null) (mkWith (optLibxslt != null) "libxslt" null) (mkWith (optZlib != null) "zlib" null) + ] ++ optionals (versionAtLeast version "9.1.0") [ + (mkWith false "selinux" null) ]; meta = with stdenv.lib; { From 243dc10b0b54fbc840ebae39bcb224d9e0717add Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 May 2015 19:06:29 -0700 Subject: [PATCH 594/615] postgresql: Add schema version --- pkgs/servers/sql/postgresql/8.4.x.nix | 3 ++- pkgs/servers/sql/postgresql/9.0.x.nix | 3 ++- pkgs/servers/sql/postgresql/9.1.x.nix | 3 ++- pkgs/servers/sql/postgresql/generic.nix | 6 ++++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index 66933f2ad420..0254bbe951d6 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,7 +1,8 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "8.4.22"; + psqlSchema = "8.4"; + version = "${psqlSchema}.22"; src = fetchurl { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index 6c24e6aa4c45..dba42e4fb110 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,7 +1,8 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "9.0.20"; + psqlSchema = "9.0"; + version = "${psqlSchema}.20"; src = fetchurl { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index b481f292ec54..138bc4a30232 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,7 +1,8 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "9.1.16"; + psqlSchema = "9.1"; + version = "${psqlSchema}.16"; src = fetchurl { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 06e6d1e79d69..721a3b6323f3 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -10,7 +10,7 @@ , walBlockSizeKB ? 8, walSegmentSizeMB ? 16 # Version specific arguments -, version, src +, version, src, psqlSchema , ... }: @@ -90,5 +90,7 @@ stdenv.mkDerivation rec { hydraPlatforms = platforms.linux; }; - passthru = { inherit readline; }; + passthru = { + inherit readline psqlSchema; + }; } From e9d0c395d1e9e1616ae07fa9eacbbfc9df52d4a8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 May 2015 19:07:36 -0700 Subject: [PATCH 595/615] postgresql: Add myself as maintainer --- pkgs/servers/sql/postgresql/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 721a3b6323f3..74c7b2906b4a 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; - maintainers = with maintaiers; [ ocharles ]; + maintainers = with maintaiers; [ ocharles wkennington ]; platforms = platforms.unix; hydraPlatforms = platforms.linux; }; From 601e713bb84a9c4f27a38d7d4595b49301b98dcc Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 May 2015 19:18:26 -0700 Subject: [PATCH 596/615] postgresql: 9.2.10 -> 9.2.11 --- pkgs/servers/sql/postgresql/8.4.x.nix | 2 ++ pkgs/servers/sql/postgresql/9.0.x.nix | 2 ++ pkgs/servers/sql/postgresql/9.1.x.nix | 2 ++ pkgs/servers/sql/postgresql/9.2.x.nix | 43 +++++-------------------- pkgs/servers/sql/postgresql/generic.nix | 10 +++--- 5 files changed, 20 insertions(+), 39 deletions(-) diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index 0254bbe951d6..f946f9fc1459 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -8,4 +8,6 @@ callPackage ./generic.nix (args // rec { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw"; }; + + patches = [ ./disable-resolve_symlinks.patch ]; }) diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index dba42e4fb110..b2a53bfc4b1f 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -8,4 +8,6 @@ callPackage ./generic.nix (args // rec { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; sha256 = "0vxa90d1ghv6vg4c6kxvm2skypahvlq4sd968q7l9ff3dl145z02"; }; + + patches = [ ./disable-resolve_symlinks.patch ]; }) diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 138bc4a30232..1debe457e1fd 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -8,4 +8,6 @@ callPackage ./generic.nix (args // rec { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b"; }; + + patches = [ ./disable-resolve_symlinks.patch ]; }) diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 3c21a96e9b27..477bb9d2484d 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -1,40 +1,13 @@ -{ stdenv, fetchurl, zlib, readline, openssl }: +{ callPackage, fetchurl, ... } @ args: -let version = "9.2.10"; in - -stdenv.mkDerivation rec { - name = "postgresql-${version}"; +callPackage ./generic.nix (args // rec { + psqlSchema = "9.2"; + version = "${psqlSchema}.11"; src = fetchurl { - url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "1bbkinqzb3c8i0vfzcy2g7djrq0kxz63jgvzda9p0vylxazmnm1m"; + url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; + sha256 = "1k5i73ninqyz76zzpi06ajj5qawf30zwr16x8wrgq6swzvsgbck5"; }; - buildInputs = [ zlib readline openssl ]; - - enableParallelBuilding = true; - - makeFlags = [ "world" ]; - - configureFlags = [ "--with-openssl" ]; - - patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ]; - - installTargets = [ "install-world" ]; - - LC_ALL = "C"; - - passthru = { - inherit readline; - psqlSchema = "9.2"; - }; - - meta = with stdenv.lib; { - homepage = http://www.postgresql.org/; - description = "A powerful, open source object-relational database system"; - license = licenses.postgresql; - maintainers = with maintaiers; [ ocharles ]; - platforms = platforms.unix; - hydraPlatforms = platforms.linux; - }; -} + patches = [ ./disable-resolve_symlinks.patch ]; +}) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 74c7b2906b4a..40c5ff660ced 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -10,7 +10,7 @@ , walBlockSizeKB ? 8, walSegmentSizeMB ? 16 # Version specific arguments -, version, src, psqlSchema +, psqlSchema , version, src, patches ? [ ] , ... }: @@ -25,6 +25,8 @@ let optLibxml2 = shouldUsePkg libxml2; optLibxslt = shouldUsePkg libxslt; optZlib = shouldUsePkg zlib; + + patches' = [ ./less-is-more.patch ] ++ patches; in with stdenv.lib; stdenv.mkDerivation rec { @@ -32,7 +34,7 @@ stdenv.mkDerivation rec { inherit src; - patches = [ ./less-is-more.patch ]; + patches = patches'; nativeBuildInputs = [ bison flex ]; buildInputs = [ @@ -40,8 +42,6 @@ stdenv.mkDerivation rec { optLibossp_uuid optLibxml2 optLibxslt optZlib ]; - #LC_ALL = "C"; - configureFlags = [ (mkOther "sysconfdir" "/etc") (mkOther "localstatedir" "/var") @@ -81,6 +81,8 @@ stdenv.mkDerivation rec { (mkWith false "selinux" null) ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; From d9efd0676fec01fe0161b882a5f84f23b1c89f87 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 May 2015 19:23:54 -0700 Subject: [PATCH 597/615] postgresql: Correct propagated readline --- pkgs/servers/sql/postgresql/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 40c5ff660ced..b7b2e3014ce4 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -93,6 +93,7 @@ stdenv.mkDerivation rec { }; passthru = { - inherit readline psqlSchema; + inherit psqlSchema; + readline = optReadline; }; } From 7174391e5bff8206025d4c7c7107d11487c534f7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 May 2015 19:21:42 -0700 Subject: [PATCH 598/615] postgresql: Consolidate patches --- pkgs/servers/sql/postgresql/8.4.x.nix | 2 -- pkgs/servers/sql/postgresql/9.0.x.nix | 2 -- pkgs/servers/sql/postgresql/9.1.x.nix | 2 -- pkgs/servers/sql/postgresql/9.2.x.nix | 2 -- pkgs/servers/sql/postgresql/generic.nix | 12 ++++++++---- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index f946f9fc1459..0254bbe951d6 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw"; }; - - patches = [ ./disable-resolve_symlinks.patch ]; }) diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index b2a53bfc4b1f..dba42e4fb110 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; sha256 = "0vxa90d1ghv6vg4c6kxvm2skypahvlq4sd968q7l9ff3dl145z02"; }; - - patches = [ ./disable-resolve_symlinks.patch ]; }) diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 1debe457e1fd..138bc4a30232 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b"; }; - - patches = [ ./disable-resolve_symlinks.patch ]; }) diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 477bb9d2484d..9517b4e803cc 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; sha256 = "1k5i73ninqyz76zzpi06ajj5qawf30zwr16x8wrgq6swzvsgbck5"; }; - - patches = [ ./disable-resolve_symlinks.patch ]; }) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index b7b2e3014ce4..46d2030224d8 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -10,7 +10,7 @@ , walBlockSizeKB ? 8, walSegmentSizeMB ? 16 # Version specific arguments -, psqlSchema , version, src, patches ? [ ] +, psqlSchema , version, src , ... }: @@ -25,8 +25,6 @@ let optLibxml2 = shouldUsePkg libxml2; optLibxslt = shouldUsePkg libxslt; optZlib = shouldUsePkg zlib; - - patches' = [ ./less-is-more.patch ] ++ patches; in with stdenv.lib; stdenv.mkDerivation rec { @@ -34,7 +32,13 @@ stdenv.mkDerivation rec { inherit src; - patches = patches'; + patches = [ + ./less-is-more.patch + ] ++ optionals (versionOlder version "9.4.0") [ + ./disable-resolve_symlinks.patch + ] ++ optionals (versionAtLeast version "9.4.0") [ + ./disable-resolve_symlinks-94.patch + ]; nativeBuildInputs = [ bison flex ]; buildInputs = [ From 5486c08dc27c5cdc7b251adf6d50d306501ba3b1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 May 2015 19:34:28 -0700 Subject: [PATCH 599/615] postgresql: 9.3.6 -> 9.3.7 --- pkgs/servers/sql/postgresql/9.3.x.nix | 47 ++++--------------------- pkgs/servers/sql/postgresql/generic.nix | 3 +- 2 files changed, 9 insertions(+), 41 deletions(-) diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index 4406aecaa897..9671c316832d 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -1,44 +1,11 @@ -{ stdenv, fetchurl, zlib, readline, libossp_uuid, openssl}: +{ callPackage, fetchurl, ... } @ args: -with stdenv.lib; - -let version = "9.3.6"; in - -stdenv.mkDerivation rec { - name = "postgresql-${version}"; +callPackage ./generic.nix (args // rec { + psqlSchema = "9.3"; + version = "${psqlSchema}.7"; src = fetchurl { - url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "056ass7nnfyv7blv02anv795kgpz77gipdpxggd835cdwrhwns13"; + url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; + sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw"; }; - - buildInputs = [ zlib readline openssl ] - ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; - - enableParallelBuilding = true; - - makeFlags = [ "world" ]; - - configureFlags = [ "--with-openssl" ] - ++ optional (!stdenv.isDarwin) "--with-ossp-uuid"; - - patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ]; - - installTargets = [ "install-world" ]; - - LC_ALL = "C"; - - passthru = { - inherit readline; - psqlSchema = "9.3"; - }; - - meta = with stdenv.lib; { - homepage = http://www.postgresql.org/; - description = "A powerful, open source object-relational database system"; - license = licenses.postgresql; - maintainers = with maintaiers; [ ocharles ]; - platforms = platforms.unix; - hydraPlatforms = platforms.linux; - }; -} +}) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 46d2030224d8..88e2b77cf83c 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -52,7 +52,6 @@ stdenv.mkDerivation rec { (mkEnable true "integer-datetimes" null) (mkEnable true "nls" null) (mkWith true "pgport" "5432") - (mkEnable true "shared" null) (mkEnable true "rpath" null) (mkEnable true "spinlocks" null) (mkEnable false "debug" null) @@ -83,6 +82,8 @@ stdenv.mkDerivation rec { (mkWith (optZlib != null) "zlib" null) ] ++ optionals (versionAtLeast version "9.1.0") [ (mkWith false "selinux" null) + ] ++ optionals (versionOlder version "9.3.0") [ + (mkEnable true "shared" null) ]; enableParallelBuilding = true; From 6775c0696f9e8b2c148f9be382f30bce7a4ec4a0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 May 2015 19:38:34 -0700 Subject: [PATCH 600/615] postgresql: 9.4.1 -> 9.4.2 --- pkgs/servers/sql/postgresql/9.4.x.nix | 47 ++++--------------------- pkgs/servers/sql/postgresql/generic.nix | 8 +++-- 2 files changed, 13 insertions(+), 42 deletions(-) diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix index 73f416912a2a..0d8b573dcc56 100644 --- a/pkgs/servers/sql/postgresql/9.4.x.nix +++ b/pkgs/servers/sql/postgresql/9.4.x.nix @@ -1,44 +1,11 @@ -{ stdenv, fetchurl, zlib, readline, libossp_uuid, openssl }: +{ callPackage, fetchurl, ... } @ args: -with stdenv.lib; - -let version = "9.4.1"; in - -stdenv.mkDerivation rec { - name = "postgresql-${version}"; +callPackage ./generic.nix (args // rec { + psqlSchema = "9.4"; + version = "${psqlSchema}.2"; src = fetchurl { - url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "19n3i14bhmw8dacd2kl3n1wzj362qv3fjmal5vsvi580h9ybgp99"; + url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; + sha256 = "04adpfg2f7ip96rh3jjygx5cpgasrrp1dl2wswjivfk5q68s3zc1"; }; - - buildInputs = [ zlib readline openssl ] - ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; - - enableParallelBuilding = true; - - makeFlags = [ "world" ]; - - configureFlags = [ "--with-openssl" ] - ++ optional (!stdenv.isDarwin) "--with-ossp-uuid"; - - patches = [ ./disable-resolve_symlinks-94.patch ./less-is-more.patch ]; - - installTargets = [ "install-world" ]; - - LC_ALL = "C"; - - passthru = { - inherit readline; - psqlSchema = "9.4"; - }; - - meta = with stdenv.lib; { - homepage = http://www.postgresql.org/; - description = "A powerful, open source object-relational database system"; - license = licenses.postgresql; - maintainers = with maintaiers; [ ocharles ]; - platforms = platforms.unix; - hydraPlatforms = platforms.linux; - }; -} +}) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 88e2b77cf83c..f8d1ad0a4754 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -69,14 +69,12 @@ stdenv.mkDerivation rec { (mkWith false "perl" null) # Maybe enable some day (mkWith false "python" null) # Maybe enable some day (mkWith (optKerberos != null) "gssapi" null) - (mkWith false "krb5" null) (mkWith (optPam != null) "pam" null) (mkWith (optOpenldap != null) "ldap" null) (mkWith false "bonjour" null) (mkWith (optOpenssl != null) "openssl" null) (mkWith (optReadline != null) "readline" null) (mkWith false "libedit-preferred" null) - (mkWith (optLibossp_uuid != null) "ossp-uuid" null) (mkWith (optLibxml2 != null) "libxml" null) (mkWith (optLibxslt != null) "libxslt" null) (mkWith (optZlib != null) "zlib" null) @@ -84,6 +82,12 @@ stdenv.mkDerivation rec { (mkWith false "selinux" null) ] ++ optionals (versionOlder version "9.3.0") [ (mkEnable true "shared" null) + ] ++ optionals (versionAtLeast version "9.4.0") [ + (mkEnable false "tap-tests" null) + (mkWith (optLibossp_uuid != null) "uuid" "ossp") + ] ++ optionals (versionOlder version "9.4.0") [ + (mkWith false "krb5" null) + (mkWith (optLibossp_uuid != null) "ossp-uuid" null) ]; enableParallelBuilding = true; From adcf1c7a90b48eda3eec707f164c64b38af27e41 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 May 2015 19:39:21 -0700 Subject: [PATCH 601/615] postgresql: Fix sha256 for 9.3.7 --- pkgs/servers/sql/postgresql/9.3.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index 9671c316832d..fabc6dbc1ded 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix (args // rec { src = fetchurl { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; - sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw"; + sha256 = "0ggz0i91znv053zx9qas7pjf93s5by3dk84z1jxbjkg8yyrnlx4b"; }; }) From e74b5704a854ad796b0df36d0d38f1ec1ba2da4e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 May 2015 20:07:47 -0700 Subject: [PATCH 602/615] bind: Enable parallel building --- pkgs/servers/dns/bind/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index b60998ce6aae..bb4e1a0f8d43 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -111,6 +111,8 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; + enableParallelBuilding = true; + meta = { homepage = "http://www.isc.org/software/bind"; description = "Domain name server"; From 3440c4c8e469a6d42b846f57042a2b457e22641f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 23 May 2015 17:38:55 +0200 Subject: [PATCH 603/615] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/a4032345e08c60e54f4ac992c1586ad5f385d17e with hackage2nix revision ca778c8501c0d2e3c44fa9016b1f79cdf6f3dcc2 --- .../haskell-modules/hackage-packages.nix | 120 ++++++++++++++---- 1 file changed, 97 insertions(+), 23 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 886c03b3d84f..74bf90112314 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -36604,6 +36604,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cryptonite" = callPackage + ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim + , integer-gmp, memory, tasty, tasty-hunit, tasty-kat + , tasty-quickcheck + }: + mkDerivation { + pname = "cryptonite"; + version = "0.1"; + sha256 = "10rcz9547igjpg908cbgk5aws011g861ywprgf3x5yspml1nc6z5"; + buildDepends = [ + base bytestring deepseq ghc-prim integer-gmp memory + ]; + testDepends = [ + base byteable bytestring memory tasty tasty-hunit tasty-kat + tasty-quickcheck + ]; + homepage = "https://github.com/vincenthz/cryptonite"; + description = "Cryptography Primitives sink"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cryptsy-api" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, either , http-client, http-client-tls, old-locale, pipes-attoparsec @@ -37754,7 +37775,9 @@ self: { mkDerivation { pname = "darkplaces-demo"; version = "0.1"; + revision = "1"; sha256 = "0map78fnnqm2nlh92xrxmg3fs9q2hb4pl87hyara41v2dvwlsj3f"; + editedCabalFile = "d16b0f7e29060476084a0457d38e524e1965b05e591af570197f287d574a8d01"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -37787,17 +37810,48 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "darkplaces-rcon-util" = callPackage + ({ mkDerivation, base, bytestring, ConfigFile, containers + , darkplaces-rcon, darkplaces-text, directory, filepath, haskeline + , HostAndPort, hspec, hspec-core, mtl, old-locale + , optparse-applicative, text, time, utf8-string + }: + mkDerivation { + pname = "darkplaces-rcon-util"; + version = "0.1"; + revision = "3"; + sha256 = "0accwwwifhmlnrc5rqb9kc44mcrpbfibakip8pwi2aqs7xvchavr"; + editedCabalFile = "c26b82e362cada670c0edc2c27c5c571f1898edb5ec29ab4c35d913c537b264d"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bytestring ConfigFile containers darkplaces-rcon + darkplaces-text directory filepath haskeline HostAndPort mtl + old-locale optparse-applicative text time utf8-string + ]; + testDepends = [ + base bytestring darkplaces-rcon darkplaces-text hspec hspec-core + text + ]; + jailbreak = true; + homepage = "https://github.com/bacher09/darkplaces-rcon"; + description = "Darplaces rcon utility"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "darkplaces-text" = callPackage - ({ mkDerivation, alex, ansi-terminal, array, base, bytestring, text - , vector + ({ mkDerivation, alex, ansi-terminal, array, base, bytestring + , hspec, QuickCheck, text, utf8-string, vector }: mkDerivation { pname = "darkplaces-text"; - version = "0.1"; - sha256 = "08zqrivqz57r0ifjpgksm5l8h19zmsxcicwf97h3andds62v05lf"; - buildDepends = [ ansi-terminal array base bytestring text vector ]; + version = "0.2.1"; + sha256 = "12nsr005pk0v1nril61javh6nrjhqcvlif11mfhch8bvvcaiy4rm"; + buildDepends = [ + ansi-terminal array base bytestring text utf8-string vector + ]; + testDepends = [ base bytestring hspec QuickCheck ]; buildTools = [ alex ]; - jailbreak = true; homepage = "https://github.com/bacher09/darkplaces-text"; description = "Parser for darkplaces colorful text"; license = stdenv.lib.licenses.gpl2; @@ -63488,8 +63542,8 @@ self: { }: mkDerivation { pname = "hfoil"; - version = "0.2.0.1"; - sha256 = "0y8amvxx77368z48gdg414iwhp1fkhdscn6gzvwb4i3vga98mga4"; + version = "0.2.0.2"; + sha256 = "0jwnyfl1rcd2439738jgs0rgl0p09d1j877z84g0ax3xh7cm4zj1"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -71853,11 +71907,12 @@ self: { ({ mkDerivation, base, parsec, parsec-numbers }: mkDerivation { pname = "huttons-razor"; - version = "0.1.0.0"; - sha256 = "018br27y575crdnsn3lahklk7zmwrjqka9kan3c1g857fv2hnkq9"; + version = "0.1.0.1"; + sha256 = "0iq377pbz3rpxj8zibavnjjck9f3xkl2ar2hy8jpj265rzm6lr7m"; isLibrary = false; isExecutable = true; buildDepends = [ base parsec parsec-numbers ]; + homepage = "https://github.com/steshaw/huttons-razor"; description = "Quick implemention of Hutton's Razor"; license = stdenv.lib.licenses.bsd2; }) {}; @@ -86128,6 +86183,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "midi-music-box" = callPackage + ({ mkDerivation, base, containers, diagrams-lib + , diagrams-postscript, event-list, midi, non-empty + , optparse-applicative, utility-ht + }: + mkDerivation { + pname = "midi-music-box"; + version = "0.0"; + sha256 = "0hnlnjgn378mkrhky8fvpzs6i34s3n6lx81mf3hnxmb1vgwy2nmf"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base containers diagrams-lib diagrams-postscript event-list midi + non-empty optparse-applicative utility-ht + ]; + homepage = "http://hub.darcs.net/thielema/midi-music-box"; + description = "Convert MIDI file to music box punch tape"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "midi-util" = callPackage ({ mkDerivation, base, containers, event-list, midi, non-negative }: @@ -86594,8 +86669,8 @@ self: { }: mkDerivation { pname = "miniutter"; - version = "0.4.4.1"; - sha256 = "1raq5dq6mx56ddyq5hnh9r2yflry6prcjf17p15ds1w5r8cp8yx1"; + version = "0.4.4.2"; + sha256 = "1nr08cm6qrww01sqxvr4bmkhxxihcl9sm8077gl25alj1s3gq21s"; buildDepends = [ base binary containers ghc-prim minimorph text ]; testDepends = [ base containers HUnit test-framework test-framework-hunit text @@ -109161,21 +109236,20 @@ self: { ({ mkDerivation, attoparsec, base, base16-bytestring, binary , bytestring, conduit, containers, cpphs, exceptions, hashable , hashtables, hslogger, http2, HUnit, lens, network, network-uri - , openssl, text, transformers + , openssl, text, time, transformers }: mkDerivation { pname = "second-transfer"; - version = "0.5.0.0"; - sha256 = "16bf857l0dhd2xkb63s47f1f8r41001lf7vkfy48r0p4hfm3bqr2"; + version = "0.5.2.2"; + sha256 = "0zch87psqszg42rxwjd3px80j867xjqz06lgvndrd01sqzadw18g"; buildDepends = [ attoparsec base base16-bytestring binary bytestring conduit containers exceptions hashable hashtables hslogger http2 lens - network network-uri text transformers + network network-uri text time transformers ]; testDepends = [ base bytestring conduit http2 HUnit lens ]; buildTools = [ cpphs ]; extraLibraries = [ openssl ]; - jailbreak = true; homepage = "https://www.httptwo.com/second-transfer/"; description = "Second Transfer HTTP/2 web server"; license = stdenv.lib.licenses.bsd3; @@ -113820,14 +113894,14 @@ self: { "snaplet-wordpress" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder , bytestring, configurator, containers, data-default, either, hedis - , heist, hspec, hspec-snap, lens, map-syntax, mtl, snap, snap-core - , snaplet-redis, text, time, unordered-containers, vector, wreq - , xmlhtml + , heist, hspec, hspec-core, hspec-snap, lens, map-syntax, mtl, snap + , snap-core, snaplet-redis, text, time, unordered-containers + , vector, wreq, xmlhtml }: mkDerivation { pname = "snaplet-wordpress"; - version = "0.1.1.1"; - sha256 = "1l0hxv267qlih9bqa5a2mlarmy15wk5awg8pmjv7a358sm7k53kq"; + version = "0.1.1.2"; + sha256 = "1vmkywrd0vfyd028d0pvfglywgbv1m26j1shwy9wmnr581vx9pab"; buildDepends = [ aeson async attoparsec base blaze-builder bytestring configurator containers data-default either hedis heist hspec hspec-snap lens @@ -113836,7 +113910,7 @@ self: { ]; testDepends = [ aeson base blaze-builder containers data-default either hedis heist - hspec hspec-snap lens mtl snap snaplet-redis text + hspec hspec-core hspec-snap lens mtl snap snaplet-redis text unordered-containers xmlhtml ]; homepage = "https://github.com/dbp/snaplet-wordpress"; From da2aef368559a6991f1a455fd1cb383409505006 Mon Sep 17 00:00:00 2001 From: Stephen Weinberg Date: Tue, 5 May 2015 17:09:40 -0400 Subject: [PATCH 604/615] Add the google-cloud-sdk package --- lib/maintainers.nix | 1 + pkgs/tools/admin/google-cloud-sdk/default.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 54 insertions(+) create mode 100644 pkgs/tools/admin/google-cloud-sdk/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d4fda831d594..efb0363c5bd2 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -195,6 +195,7 @@ smironov = "Sergey Mironov "; sprock = "Roger Mason "; spwhitt = "Spencer Whitt "; + stephenmw = "Stephen Weinberg "; sztupi = "Attila Sztupak "; tailhook = "Paul Colomiets "; taktoa = "Remy Goldschmidt "; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix new file mode 100644 index 000000000000..d2c22b055be6 --- /dev/null +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -0,0 +1,51 @@ +{stdenv, fetchurl, python27, python27Packages, makeWrapper}: + +stdenv.mkDerivation rec { + version = "0.9.58"; + name = "google-cloud-sdk-${version}"; + + src = fetchurl { + url = "https://dl.google.com/dl/cloudsdk/release/packages/google-cloud-sdk-coretools-linux-static-20150429151447.tar.gz"; + sha256 = "0sak1fmm7z7ry1k2r67a13mpgi55rbnx81s0y0xhd86dm5aw4f48"; + }; + + buildInputs = [python27 makeWrapper]; + + phases = [ "installPhase" "fixupPhase" ]; + + installPhase = '' + mkdir -p "$out" + tar -xzf "$src" -C "$out" google-cloud-sdk + + # create wrappers with correct env + for program in gcloud bq gsutil git-credential-gcloud.sh; do + programPath="$out/google-cloud-sdk/bin/$program" + wrapper="$out/bin/$program" + makeWrapper "$programPath" "$wrapper" \ + --set CLOUDSDK_PYTHON "${python27}/bin/python" \ + --prefix PYTHONPATH : "$(toPythonPath ${python27Packages.crcmod})" + done + + # install man pages + mv "$out/google-cloud-sdk/help/man" "$out" + + # setup bash completion + mkdir -p "$out/etc/bash_completion.d/" + mv "$out/google-cloud-sdk/completion.bash.inc" "$out/etc/bash_completion.d/gcloud.inc" + + # This directory contains compiled mac binaries. We used crcmod from + # nixpkgs instead. + rm -r $out/google-cloud-sdk/platform/gsutil/third_party/crcmod + ''; + + meta = { + description = "Tools for the google cloud platform"; + longDescription = "The Google Cloud SDK. This package has the programs: gcloud, gsutil, and bq"; + version = version; + # This package contains vendored dependencies. All have free licenses. + license = stdenv.lib.licenses.free; + homepage = "https://cloud.google.com/sdk/"; + maintainers = with stdenv.lib.maintainers; [stephenmw]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c15f9ce0a41..cbcc13616604 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1553,6 +1553,8 @@ let googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { }; + google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { }; + gource = callPackage ../applications/version-management/gource { }; gparted = callPackage ../tools/misc/gparted { }; From bb6ac771c40342d578aa5959d81454b3676b0e49 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 May 2015 22:26:02 -0700 Subject: [PATCH 605/615] dnsutils: Add smaller derivation of bind --- pkgs/servers/dns/bind/default.nix | 35 ++++++++++++++++++++++--------- pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index bb4e1a0f8d43..70d88b2a9689 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -7,15 +7,19 @@ # Optional DLZ Modules , postgresql ? null, libmysql ? null, db ? null, openldap ? null + +# Extra arguments +, suffix ? "" }: -assert postgresql != null; with stdenv; let version = "9.10.2"; + toolsOnly = suffix == "tools"; + optLibseccomp = shouldUsePkg libseccomp; - optPython = shouldUsePkg python; + optPython = if toolsOnly then null else shouldUsePkg python; optKerberos = shouldUsePkg kerberos; optOpenssl = shouldUsePkg openssl; optLibxml2 = shouldUsePkg libxml2; @@ -25,18 +29,19 @@ let optIdnkit = shouldUsePkg idnkit; optLibiconv = shouldUsePkg libiconv; - optPostgresql = shouldUsePkg postgresql; - optLibmysql = shouldUsePkg libmysql; - optDb = shouldUsePkg db; - optOpenldap = shouldUsePkg openldap; + optPostgresql = if toolsOnly then null else shouldUsePkg postgresql; + optLibmysql = if toolsOnly then null else shouldUsePkg libmysql; + optDb = if toolsOnly then null else shouldUsePkg db; + optOpenldap = if toolsOnly then null else shouldUsePkg openldap; + + pythonBin = if optPython == null then null else "${optPython}/bin/python"; in -assert optPostgresql != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "bind-${version}"; + name = "bind${optionalString (suffix != "") "-${suffix}"}-${version}"; src = fetchurl { - url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; + url = "http://ftp.isc.org/isc/bind9/${version}/bind-${version}.tar.gz"; sha256 = "163s8pvqj4lyryvfzkc6acbys7gw1by5dqwilggiwp54ia8bg6vg"; }; @@ -55,7 +60,7 @@ stdenv.mkDerivation rec { (mkOther "localstatedir" "/var") (mkOther "sysconfdir" "/etc") (mkEnable (optLibseccomp != null) "seccomp" null) - (mkWith (optPython != null) "python" "${optPython}/bin/python") + (mkWith (optPython != null) "python" pythonBin) (mkEnable true "kqueue" null) (mkEnable true "epoll" null) (mkEnable true "devpoll" null) @@ -109,8 +114,18 @@ stdenv.mkDerivation rec { installFlags = [ "sysconfdir=\${out}/etc" "localstatedir=\${TMPDIR}" + ] ++ optionals toolsOnly [ + "DESTDIR=\${TMPDIR}" ]; + postInstall = optionalString toolsOnly '' + mkdir -p $out/{bin,etc,lib,share/man/man1} + install -m 0755 $TMPDIR/$out/bin/{dig,nslookup,nsupdate} $out/bin + install -m 0644 $TMPDIR/$out/etc/bind.keys $out/etc + install -m 0644 $TMPDIR/$out/lib/*.so.* $out/lib + install -m 0644 $TMPDIR/$out/share/man/man1/{dig,nslookup,nsupdate}.1 $out/share/man/man1 + ''; + enableParallelBuilding = true; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b0c09f2974c..339563fddf19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8502,6 +8502,9 @@ let sabnzbd = callPackage ../servers/sabnzbd { }; bind = callPackage ../servers/dns/bind { }; + dnsutils = bind.override { + suffix = "tools"; + }; bird = callPackage ../servers/bird { }; From e8392bb33f087912d6602b239fa836b05741c9b8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 May 2015 22:26:16 -0700 Subject: [PATCH 606/615] postgres: Fix maintainers --- pkgs/servers/sql/postgresql/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index f8d1ad0a4754..ded9247f42a1 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; - maintainers = with maintaiers; [ ocharles wkennington ]; + maintainers = with maintainers; [ ocharles wkennington ]; platforms = platforms.unix; hydraPlatforms = platforms.linux; }; From 6e41581809b6c96b2094240b383598b60370610d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 24 May 2015 01:52:12 -0700 Subject: [PATCH 607/615] feh: 2.12.1 -> 2.13 --- pkgs/applications/graphics/feh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index ad6367722372..49c7870b2123 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -2,11 +2,11 @@ , libXinerama, curl, libexif }: stdenv.mkDerivation rec { - name = "feh-2.12.1"; + name = "feh-2.13"; src = fetchurl { url = "http://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "18b6yjk88ybqxsa5knk6qwi2xy7fclbzl5cpzwg0wmkr3phfq9lh"; + sha256 = "06fa9zh1zpi63l90kw3l9a0sfavf424j7ksi396ifg9669gx35gn"; }; buildInputs = [ makeWrapper x11 imlib2 libjpeg libpng libXinerama curl libexif ]; From 1efd5f0fdf0c4c485eeefceeb8f6d3332fb0b455 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 24 May 2015 01:53:14 -0700 Subject: [PATCH 608/615] ccid: 1.4.18 -> 1.4.19 --- pkgs/tools/security/ccid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index c9a261ba97a8..21de5705e4f4 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: stdenv.mkDerivation rec { - version = "1.4.18"; + version = "1.4.19"; name = "ccid-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/c/ccid/ccid_${version}.orig.tar.bz2"; - sha256 = "1aj14lkmfaxkhk5swqfgn2x18j7fijxs0jnxnx9cdc9f5mxaknsz"; + sha256 = "1q9lx5ci8kikwk9mhbjl6m3zk4id209zfna5wgpqjrp5nhmjrjyc"; }; patchPhase = '' From 1592c81d542ee823c167ea47c509d53d5b64ccc4 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 24 May 2015 02:00:18 -0700 Subject: [PATCH 609/615] redis: 3.0.0-rc3 -> 3.0.1 --- pkgs/servers/nosql/redis/3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/redis/3.0.nix b/pkgs/servers/nosql/redis/3.0.nix index 049639ad684f..0e7a7d0f2507 100644 --- a/pkgs/servers/nosql/redis/3.0.nix +++ b/pkgs/servers/nosql/redis/3.0.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.0.0-rc3"; + version = "3.0.1"; name = "redis-${version}"; src = fetchurl { url = "https://github.com/antirez/redis/archive/${version}.tar.gz"; - sha256 = "1695fa532eafc14c95f45add5d8a71d07e0e87b5c8f06c29dfa06313322d27b7"; + sha256 = "1m34s60qvj1xyqw7x7ar0graw52wypx47dhvfb0br67vfb62l8sl"; }; makeFlags = "PREFIX=$(out)"; From 5f557885313088a235762d3cb7fd76ec0b1e6547 Mon Sep 17 00:00:00 2001 From: Allen Nelson Date: Sun, 24 May 2015 04:55:24 -0500 Subject: [PATCH 610/615] adding docs to python wrap.sh --- .../python-modules/generic/wrap.sh | 57 +++++++++++++------ 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 220ddf26b30f..45f86df4dcff 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -1,51 +1,74 @@ +# Wrapper around wrapPythonProgramsIn, below. The $pythonPath +# variable is passed in from the buildPythonPackage function. wrapPythonPrograms() { wrapPythonProgramsIn $out "$out $pythonPath" } +# Transforms any binaries generated by the setup.py script, replacing them +# with an executable shell script which will set some environment variables +# and then call into the original binary (which has been given a .wrapped +# suffix). wrapPythonProgramsIn() { local dir="$1" local pythonPath="$2" local python="@executable@" - local i + local path + local f + # Create an empty table of python paths (see doc on _addToPythonPath + # for how this is used). Build up the program_PATH and program_PYTHONPATH + # variables. declare -A pythonPathsSeen=() program_PYTHONPATH= program_PATH= - for i in $pythonPath; do - _addToPythonPath $i + for path in $pythonPath; do + _addToPythonPath $path done - for i in $(find "$dir" -type f -perm +0100); do + # Find all regular files in the output directory that are executable. + for f in $(find "$dir" -type f -perm +0100); do # Rewrite "#! .../env python" to "#! /nix/store/.../python". - if head -n1 "$i" | grep -q '#!.*/env.*\(python\|pypy\)'; then - sed -i "$i" -e "1 s^.*/env[ ]*\(python\|pypy\)^#! $python^" + if head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'; then + sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)^#! $python^" fi - + # catch /python and /.python-wrapped - if head -n1 "$i" | grep -q '/\.\?\(python\|pypy\)'; then + if head -n1 "$f" | grep -q '/\.\?\(python\|pypy\)'; then # dont wrap EGG-INFO scripts since they are called from python - if echo "$i" | grep -v EGG-INFO/scripts; then - echo "wrapping \`$i'..." - sed -i "$i" -re '@magicalSedExpression@' - wrapProgram "$i" \ - --prefix PYTHONPATH ":" $program_PYTHONPATH \ - --prefix PATH ":" $program_PATH + if echo "$f" | grep -qv EGG-INFO/scripts; then + echo "wrapping \`$f'..." + sed -i "$f" -re '@magicalSedExpression@' + # wrapProgram creates the executable shell script described + # above. The script will set PYTHONPATH and PATH variables.! + # (see pkgs/build-support/setup-hooks/make-wrapper.sh) + wrapProgram $f \ + --prefix PYTHONPATH ':' $program_PYTHONPATH \ + --prefix PATH ':' $program_PATH fi fi done } +# Adds the lib and bin directories to the PYTHONPATH and PATH variables, +# respectively. Recurses on any paths declared in +# `propagated-native-build-inputs`, while avoiding duplicating paths by +# flagging the directories it has visited in `pythonPathsSeen`. _addToPythonPath() { local dir="$1" + # Stop if we've already visited here. if [ -n "${pythonPathsSeen[$dir]}" ]; then return; fi pythonPathsSeen[$dir]=1 + # addToSearchPath is defined in stdenv/generic/setup.sh. It will have + # the effect of calling `export program_X=$dir/...:$program_X`. addToSearchPath program_PYTHONPATH $dir/lib/@libPrefix@/site-packages addToSearchPath program_PATH $dir/bin + + # Inspect the propagated inputs (if they exist) and recur on them. local prop="$dir/nix-support/propagated-native-build-inputs" if [ -e $prop ]; then - local i - for i in $(cat $prop); do - _addToPythonPath $i + local new_path + for new_path in $(cat $prop); do + _addToPythonPath $new_path done fi } From c918903381e0aa2c48c5f40e9270148324bb476a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 May 2015 18:55:26 +0200 Subject: [PATCH 611/615] python: 2.7.9 -> 2.7.10 --- pkgs/development/interpreters/python/2.7/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index cfc52dabc5b6..2b9e3c3736ba 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -19,11 +19,11 @@ with stdenv.lib; let majorVersion = "2.7"; - version = "${majorVersion}.9"; + version = "${majorVersion}.10"; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; - sha256 = "05j9in7yygfgl6nml0rixfvj1bbip982w3l54q05f0vyx8a7xllh"; + sha256 = "1h7zbrf9pkj29hlm18b10548ch9757f75m64l47sy75rh43p7lqw"; }; patches = From 50be522a517b406cc11ef1f2d2ba7996498c648f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 May 2015 18:55:47 +0200 Subject: [PATCH 612/615] libvterm: set platforms --- pkgs/development/libraries/libvterm/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix index 20433ab14588..cc2fd268ae6b 100644 --- a/pkgs/development/libraries/libvterm/default.nix +++ b/pkgs/development/libraries/libvterm/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, pkgconfig, glib, ncurses}: +{ stdenv, fetchurl, pkgconfig, glib, ncurses }: + stdenv.mkDerivation rec { name = "libvterm-0.99.7"; @@ -21,6 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libvterm.sourceforge.net/; description = "Terminal emulator library to mimic both vt100 and rxvt"; - license="GPLv2+"; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; }; } From 2e9bc4aee3e14bdb749925b59f715d620c9ad7cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 24 May 2015 12:17:43 +0200 Subject: [PATCH 613/615] goffice: update Some update(s) were lost during GNOME-3.12 drop 25f9555599. I hope there weren't much else lost. @lethalman: do you think it's good to have goffice inside gnome3? Nothing from inside refers to it, and it doesn't seem to be follow gnome's release cycle. In fact it rather seems tied to gnumeric instead. --- pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix index fd16d2d4985f..517836f4d633 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix @@ -2,11 +2,11 @@ , libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }: stdenv.mkDerivation rec { - name = "goffice-0.10.12"; + name = "goffice-0.10.22"; src = fetchurl { url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; - sha256 = "0vh0sdig5n8sxzh4xx82lm8y8d0jcdhc2ipb1kq02qs142zs74ff"; + sha256 = "0206a87a323b52a874dc54491374245f9e1c5f62e93a2ce4a02fb444a26b0e28"; }; nativeBuildInputs = [ pkgconfig intltool ]; From c75590fa6fe5ecc34fce69e8b47a2cc4d87fb65a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 24 May 2015 19:36:36 +0200 Subject: [PATCH 614/615] libgsf: small update It was needed for gnumeric update. /cc maintainer @lovek323. --- pkgs/development/libraries/libgsf/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 0479343a8f55..d08e4c231f5a 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,24 +1,26 @@ { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 -, python, gdk_pixbuf, libiconv, libintlOrEmpty }: +, python, perl, gdk_pixbuf, libiconv, libintlOrEmpty }: with { inherit (stdenv.lib) optionals; }; stdenv.mkDerivation rec { - name = "libgsf-1.14.30"; + name = "libgsf-1.14.32"; src = fetchurl { url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; - sha256 = "0w2v1a9sxsymd1mcy4mwsz4r6za9iwq69rj86nb939p41d4c6j6b"; + sha256 = "13bf38b848c01e20eb89a48150b6f864434ee4dfbb6301ddf6f4080a36cd99e9"; }; nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ gettext bzip2 zlib python ]; + buildInputs = [ gettext bzip2 zlib python ] + ++ stdenv.lib.optional doCheck perl; propagatedBuildInputs = [ libxml2 glib gdk_pixbuf libiconv ] ++ libintlOrEmpty; doCheck = true; + preCheck = "patchShebangs ./tests/"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; From c505b8ac287aac0d5fecfc3b8e91f5cdc22ed649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 24 May 2015 19:52:57 +0200 Subject: [PATCH 615/615] gnumeric: fix build, minor update, enableParallelBuilding --- pkgs/applications/office/gnumeric/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 14e130ba1ffc..02a78a2b2d1f 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -3,15 +3,13 @@ }: stdenv.mkDerivation rec { - name = "gnumeric-1.12.18"; + name = "gnumeric-1.12.20"; src = fetchurl { url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz"; - sha256 = "402224f858cfa4e91503ab1be0491fa3322713dabe56b6eae171def8b736d9e9"; + sha256 = "1k915ks55a32fpqrr0rx6j8ml9bw0a07f11350qc1bvkx53i2jad"; }; - preConfigure = ''sed -i 's/\(SUBDIRS.*\) doc/\1/' Makefile.in''; # fails when installing docs - configureFlags = "--disable-component"; # ToDo: optional libgda, python, introspection? @@ -20,13 +18,14 @@ stdenv.mkDerivation rec { gnome3.goffice gtk3 makeWrapper gnome3.defaultIconTheme ]; + enableParallelBuilding = true; + preFixup = '' for f in "$out"/bin/gnumeric-*; do wrapProgram $f \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" done - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; {