diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md index bedda76a306..aa6a7d65410 100644 --- a/doc/languages-frameworks/rust.md +++ b/doc/languages-frameworks/rust.md @@ -20,7 +20,7 @@ For daily builds (beta and nightly) use either rustup from nixpkgs or use the [Rust nightlies overlay](#using-the-rust-nightlies-overlay). -## Packaging Rust applications +## Compiling Rust applications with Cargo Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`: @@ -56,6 +56,167 @@ checksum can be then take from the failed build. To install crates with nix there is also an experimental project called [nixcrates](https://github.com/fractalide/nixcrates). +## Compiling Rust crates using Nix instead of Cargo + +When run, `cargo build` produces a file called `Cargo.lock`, +containing pinned versions of all dependencies. Nixpkgs contains a +tool called `carnix` (`nix-env -iA nixos.carnix`), which can be used +to turn a `Cargo.lock` into a Nix expression. + +That Nix expression calls `rustc` directly (hence bypassing Cargo), +and can be used to compile a crate and all its dependencies. Here is +an example for a minimal `hello` crate: + + + $ cargo new hello + $ cd hello + $ cargo build + Compiling hello v0.1.0 (file:///tmp/hello) + Finished dev [unoptimized + debuginfo] target(s) in 0.20 secs + $ carnix -o hello.nix --src ./. Cargo.lock --standalone + $ nix-build hello.nix + +Now, the file produced by the call to `carnix`, called `hello.nix`, looks like: + +``` +with import {}; +let kernel = buildPlatform.parsed.kernel.name; + # ... (content skipped) + hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "hello"; + version = "0.1.0"; + authors = [ "Authorname " ]; + src = ./.; + inherit dependencies buildDependencies features; + }; +in +rec { + hello_0_1_0 = hello_0_1_0_ rec {}; +} +``` + +In particular, note that the argument given as `--src` is copied +verbatim to the source. If we look at a more complicated +dependencies, for instance by adding a single line `libc="*"` to our +`Cargo.toml`, we first need to run `cargo build` to update the +`Cargo.lock`. Then, `carnix` needs to be run again, and produces the +following nix file: + +``` +with import {}; +let kernel = buildPlatform.parsed.kernel.name; + # ... (content skipped) + hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "hello"; + version = "0.1.0"; + authors = [ "Jörg Thalheim " ]; + src = ./.; + inherit dependencies buildDependencies features; + }; + libc_0_2_34_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.34"; + authors = [ "The Rust Project Developers" ]; + sha256 = "11jmqdxmv0ka10ay0l8nzx0nl7s2lc3dbrnh1mgbr2grzwdyxi2s"; + inherit dependencies buildDependencies features; + }; +in +rec { + hello_0_1_0 = hello_0_1_0_ rec { + dependencies = [ libc_0_2_34 ]; + }; + libc_0_2_34_features."default".from_hello_0_1_0__default = true; + libc_0_2_34 = libc_0_2_34_ rec { + features = mkFeatures libc_0_2_34_features; + }; + libc_0_2_34_features."use_std".self_default = hasDefault libc_0_2_34_features; +} +``` + +Here, the `libc` crate has no `src` attribute, so `buildRustCrate` +will fetch it from [crates.io](https://crates.io). A `sha256` +attribute is still needed for Nix purity. + +Some crates require external libraries. For crates from +[crates.io](https://crates.io), such libraries can be specified in +`defaultCrateOverrides` package in nixpkgs itself. + +Starting from that file, one can add more overrides, to add features +or build inputs by overriding the hello crate in a seperate file. + +``` +with import {}; +(import ./hello.nix).hello_0_1_0.override { + crateOverrides = defaultCrateOverrides // { + hello = attrs: { buildInputs = [ openssl ]; }; + }; +} +``` + +Here, `crateOverrides` is expected to be a attribute set, where the +key is the crate name without version number and the value a function. +The function gets all attributes passed to `buildRustCrate` as first +argument and returns a set that contains all attribute that should be +overwritten. + +For more complicated cases, such as when parts of the crate's +derivation depend on the the crate's version, the `attrs` argument of +the override above can be read, as in the following example, which +patches the derivation: + +``` +with import {}; +(import ./hello.nix).hello_0_1_0.override { + crateOverrides = defaultCrateOverrides // { + hello = attrs: lib.optionalAttrs (lib.versionAtLeast attrs.version "1.0") { + postPatch = '' + substituteInPlace lib/zoneinfo.rs \ + --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + ''; + }; + }; +} +``` + +Another situation is when we want to override a nested +dependency. This actually works in the exact same way, since the +`crateOverrides` parameter is forwarded to the crate's +dependencies. For instance, to override the build inputs for crate +`libc` in the example above, where `libc` is a dependency of the main +crate, we could do: + +``` +with import {}; +(import hello.nix).hello_0_1_0.override { + crateOverrides = defaultCrateOverrides // { + libc = attrs: { buildInputs = []; }; + }; +} +``` + +Three more parameters can be overridden: + +- The version of rustc used to compile the crate: + + ``` + hello_0_1_0.override { rust = pkgs.rust; }; + ``` + +- Whether to build in release mode or debug mode (release mode by + default): + + ``` + hello_0_1_0.override { release = false; }; + ``` + +- Whether to print the commands sent to rustc when building + (equivalent to `--verbose` in cargo: + + ``` + hello_0_1_0.override { verbose = false; }; + ``` + + ## Using the Rust nightlies overlay Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope. diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 38c65354606..26989071011 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -433,6 +433,7 @@ mog = "Matthew O'Gorman "; montag451 = "montag451 "; moosingin3space = "Nathan Moos "; + moredread = "André-Patrick Bubel "; moretea = "Maarten Hoogendoorn "; mornfall = "Petr Ročkai "; MostAwesomeDude = "Corbin Simpson "; @@ -516,6 +517,7 @@ plcplc = "Philip Lykke Carlsen "; plumps = "Maksim Bronsky must be set to true. + + + The option is now 127.0.0.1 by default. + Previously the default behaviour was to listen on all interfaces. + + diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index bf25e0cab25..d67ca0e527e 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -150,8 +150,6 @@ in pkgs.vmTools.runInLinuxVM ( } '' ${if partitioned then '' - . /sys/class/block/vda1/uevent - mknod /dev/vda1 b $MAJOR $MINOR rootDisk=/dev/vda1 '' else '' rootDisk=/dev/vda diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 321fb9a2030..131c779b1ab 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,5 +1,6 @@ { - x86_64-linux = "/nix/store/b4s1gxiis1ryvybnjhdjvgc5sr1nq0ys-nix-1.11.15"; - i686-linux = "/nix/store/kgb5hs7qw13bvb6icramv1ry9dard3h9-nix-1.11.15"; - x86_64-darwin = "/nix/store/dgwz3dxdzs2wwd7pg7cdhvl8rv0qpnbj-nix-1.11.15"; + x86_64-linux = "/nix/store/gy4yv67gv3j6in0lalw37j353zdmfcwm-nix-1.11.16"; + i686-linux = "/nix/store/ifmyq5ryfxhhrzh62hiq65xyz1fwffga-nix-1.11.16"; + aarch64-linux = "/nix/store/y9mfv3sx75mbfibf1zna1kq9v98fk2nb-nix-1.11.16"; + x86_64-darwin = "/nix/store/hwpp7kia2f0in5ns2hiw41q38k30jpj2-nix-1.11.16"; } diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index b4abd2cd7e5..28d89a7463a 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -103,7 +103,7 @@ in listenAddress = mkOption { type = types.str; - default = "0.0.0.0"; + default = "127.0.0.1"; description = "Address on which to start webserver."; }; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index d9ac4b0f274..62afbf32c2f 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -241,6 +241,19 @@ in { A list of scripts which will be executed in response to network events. ''; }; + + enableStrongSwan = mkOption { + type = types.bool; + default = false; + description = '' + Enable the StrongSwan plugin. + + If you enable this option the + networkmanager_strongswan plugin will be added to + the option + so you don't need to to that yourself. + ''; + }; }; }; @@ -335,7 +348,11 @@ in { security.polkit.extraConfig = polkitConf; - services.dbus.packages = cfg.packages; + networking.networkmanager.packages = + mkIf cfg.enableStrongSwan [ pkgs.networkmanager_strongswan ]; + + services.dbus.packages = + optional cfg.enableStrongSwan pkgs.strongswanNM ++ cfg.packages; services.udev.packages = cfg.packages; }; diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index e68bfd86060..4038454b2d2 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -726,6 +726,11 @@ in networking.dhcpcd.denyInterfaces = [ "ve-*" "vb-*" ]; + services.udev.extraRules = optionalString config.networking.networkmanager.enable '' + # Don't manage interfaces created by nixos-container. + ENV{INTERFACE}=="v[eb]-*", ENV{NM_UNMANAGED}="1" + ''; + environment.systemPackages = [ pkgs.nixos-container ]; }); } diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix index f694fc75ef7..8ac0639c6a8 100644 --- a/nixos/tests/radicale.nix +++ b/nixos/tests/radicale.nix @@ -20,7 +20,7 @@ let ''; }; # WARNING: DON'T DO THIS IN PRODUCTION! - # This puts secrets (albeit hashed) directly into the Nix store for ease of testing. + # This puts unhashed secrets directly into the Nix store for ease of testing. environment.etc."radicale/htpasswd".source = pkgs.runCommand "htpasswd" {} '' ${pkgs.apacheHttpd}/bin/htpasswd -bcB "$out" ${user} ${password} ''; diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 15fca59deee..82c32903bd8 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { name = "calf-${version}"; - version = "0.0.60"; + version = "0.90.0"; src = fetchurl { url = "http://calf-studio-gear.org/files/${name}.tar.gz"; - sha256 = "019fwg00jv217a5r767z7szh7vdrarybac0pr2sk26xp81kibrx9"; + sha256 = "0dijv2j7vlp76l10s4v8gbav26ibaqk8s24ci74vrc398xy00cib"; }; - buildInputs = [ + buildInputs = [ cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH libglade lv2 pkgconfig ]; diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index a80cc36b216..a6a7ad22fa1 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -2,12 +2,12 @@ , libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }: stdenv.mkDerivation rec { - name = "distrho-ports-unstable-2017-08-04"; + name = "distrho-ports-unstable-2017-10-10"; src = fetchgit { url = "https://github.com/DISTRHO/DISTRHO-Ports.git"; - rev = "f591a1066cd3929536699bb516caa4b5efd9d025"; - sha256 = "1qjnmpmwbq2zpwn8v1dmqn3bjp2ykj5p89fkjax7idgpx1cg7pp9"; + rev = "e11e2b204c14b8e370a0bf5beafa5f162fedb8e9"; + sha256 = "1nd542iian9kr2ldaf7fkkgf900ryzqigks999d1jhms6p0amvfv"; }; patchPhase = '' @@ -37,12 +37,12 @@ stdenv.mkDerivation rec { description = "A collection of cross-platform audio effects and plugins"; longDescription = '' Includes: - Dexed drowaudio-distortion drowaudio-distortionshaper drowaudio-flanger - drowaudio-reverb drowaudio-tremolo drumsynt EasySSP eqinox - JuceDemoPlugin klangfalter LUFSMeter luftikus obxd pitchedDelay - stereosourceseparation TAL-Dub-3 TAL-Filter TAL-Filter-2 TAL-NoiseMaker - TAL-Reverb TAL-Reverb-2 TAL-Reverb-3 TAL-Vocoder-2 TheFunction - ThePilgrim Vex Wolpertinger + Dexed drowaudio-distortion drowaudio-distortionshaper drowaudio-flanger + drowaudio-reverb drowaudio-tremolo drumsynth EasySSP eqinox HiReSam + JuceDemoPlugin KlangFalter LUFSMeter LUFSMeterMulti Luftikus Obxd + PitchedDelay ReFine StereoSourceSeparation TAL-Dub-3 TAL-Filter + TAL-Filter-2 TAL-NoiseMaker TAL-Reverb TAL-Reverb-2 TAL-Reverb-3 + TAL-Vocoder-2 TheFunction ThePilgrim Vex Wolpertinger ''; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/applications/audio/mod-distortion/default.nix index a1837287079..c66f7837322 100644 --- a/pkgs/applications/audio/mod-distortion/default.nix +++ b/pkgs/applications/audio/mod-distortion/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, lv2 }: stdenv.mkDerivation rec { - name = "mod-distortion-${version}"; - version = "git-2015-05-18"; + name = "mod-distortion-git-${version}"; + version = "2016-08-19"; src = fetchFromGitHub { owner = "portalmod"; repo = "mod-distortion"; - rev = "0cdf186abc2a9275890b57057faf5c3f6d86d84a"; - sha256 = "1wmxgpcdcy9m7j78yq85824if0wz49wv7mw13bj3sw2s87dcmw19"; + rev = "e672d5feb9d631798e3d56eb96e8958c3d2c6821"; + sha256 = "005wdkbhn9dgjqv019cwnziqg86yryc5vh7j5qayrzh9v446dw34"; }; buildInputs = [ lv2 ]; - installFlags = [ "LV2_PATH=$(out)/lib/lv2" ]; + installFlags = [ "INSTALL_PATH=$(out)/lib/lv2" ]; meta = with stdenv.lib; { homepage = https://github.com/portalmod/mod-distortion; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 973e7f88e80..98e2c0e3f7d 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.7-9"; - sha256 = "0p0879chcfrghcamwgxxcmaaj04xv0z91ris7hxi37qdw8c7836w"; + version = "7.0.7-14"; + sha256 = "04hpc9i6fp09iy0xkidlfhfqr7zg45izqqj5fx93n3dxalq65xqw"; patches = []; }; in diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 4e0ddfa8def..e3500a621cb 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.9-23"; - sha256 = "0cd6zcbcfvznf0i3q4xz1c4wm4cfplg4zc466lvlb1w8qbn25948"; + version = "6.9.9-26"; + sha256 = "10rcq7b9hhz50m4yqnm4g3iai7lr9jkglb7sm49ycw59arrkmwnw"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index c8c9ac8f26e..11a2b3a8c8b 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -2,14 +2,14 @@ , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }: -let version = "1.3.26"; in +let version = "1.3.27"; in stdenv.mkDerivation { name = "graphicsmagick-${version}"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "122zgs96dqrys62mnh8x5yvfff6km4d3yrnvaxzg3mg5sprib87v"; + sha256 = "0rq35p3rml10cxz2z4s7xcfsilhhk19mmy094g3ivz0fg797hcnh"; }; patches = [ diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 8de837991aa..a339770ba58 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchurl, python2Packages }: +{ stdenv, fetchurl, python3, python3Packages }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "2.9.3"; + version = "3.0.3"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0d0fzb653g7b8ka3x90nl21md4g3n1fv11czdxpdq3s9yr6js6f2"; + sha256 = "09h3s1mbkliwh8758prbdk3sm19bnma7wy3k10pl9q9fkarbhp75"; }; - propagatedBuildInputs = with python2Packages; [ + propagatedBuildInputs = with python3Packages; [ dnspython ecdsa - jsonrpclib + jsonrpclib-pelix matplotlib pbkdf2 protobuf pyaes pycrypto - pyqt4 + pyqt5 pysocks qrcode requests @@ -35,7 +35,7 @@ python2Packages.buildPythonApplication rec { preBuild = '' sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py - pyrcc4 icons.qrc -o gui/qt/icons_rc.py + pyrcc5 icons.qrc -o gui/qt/icons_rc.py # Recording the creation timestamps introduces indeterminism to the build sed -i '/Created: .*/d' gui/qt/icons_rc.py ''; @@ -43,13 +43,15 @@ python2Packages.buildPythonApplication rec { postInstall = '' # Despite setting usr_share above, these files are installed under # $out/nix ... - mv $out/lib/python2.7/site-packages/nix/store"/"*/share $out - rm -rf $out/lib/python2.7/site-packages/nix + mv $out/${python3.sitePackages}/nix/store"/"*/share $out + rm -rf $out/${python3.sitePackages}/nix substituteInPlace $out/share/applications/electrum.desktop \ --replace "Exec=electrum %u" "Exec=$out/bin/electrum %u" ''; + doCheck = false; + doInstallCheck = true; installCheckPhase = '' $out/bin/electrum help >/dev/null diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix new file mode 100644 index 00000000000..e5a419f6a8c --- /dev/null +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -0,0 +1,38 @@ +{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl +, opencl-headers, ocl-icd, hwloc, cudatoolkit +, devDonationLevel ? "0.0" +, cudaSupport ? false # doesn't work currently +}: + +stdenv.mkDerivation rec { + name = "xmr-stak-${version}"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "fireice-uk"; + repo = "xmr-stak"; + rev = "v${version}"; + sha256 = "1gsp5d2qmc8qwbfm87c2vnak6ks6y9csfjbsi0570pdciapaf8vs"; + }; + + NIX_CFLAGS_COMPILE = "-O3"; + + cmakeFlags = lib.optional (!cudaSupport) "-DCUDA_ENABLE=OFF"; + + nativeBuildInputs = [ cmake ]; + buildInputs = + [ libmicrohttpd openssl opencl-headers ocl-icd hwloc ] + ++ lib.optional cudaSupport cudatoolkit; + + postPatch = '' + substituteInPlace xmrstak/donate-level.hpp \ + --replace 'fDevDonationLevel = 2.0' 'fDevDonationLevel = ${devDonationLevel}' + ''; + + meta = with lib; { + description = "Unified All-in-one Monero miner"; + homepage = "https://github.com/fireice-uk/xmr-stak"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index e0f2844bd53..aeae471ce5b 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -135,6 +135,9 @@ stdenv.mkDerivation (rec { "--with-libclang-path=${llvmPackages.clang-unwrapped}/lib" "--with-clang-path=${llvmPackages.clang}/bin/clang" ] + ++ lib.optionals (stdenv.lib.versionAtLeast version "57") [ + "--enable-webrender=build" + ] # TorBrowser patches these ++ lib.optionals (!isTorBrowserLike) [ diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 1fce0695bfd..a7c5bf4046b 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -98,8 +98,8 @@ in { }); terraform_0_11 = pluggable (generic { - version = "0.11.0"; - sha256 = "0qsydg6bn7k6d68pd1y4j5iys9i66c690yq21axcpnjfibxgqyff"; + version = "0.11.1"; + sha256 = "04qyhlif3b3kjs3m6c3mx45sgr5r13x55aic638zzlrhbpmqiih1"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 23a5d91f0d2..a32623c1c84 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -4,7 +4,7 @@ let - version = "2.9.0"; + version = "3.0.0"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -46,7 +46,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "1ddfvsy4lr7hcnzxbk4crczylj1qwm9av02xms4w2p0k0c8nhvvc"; + sha256 = "17hq31x9k03rvj2sdsdfj6j75v30yrywlsbca4d56a0qsdzysxkw"; } else throw "Slack is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 15292ab768a..079e1b7927c 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { description = "Mail indexer"; homepage = https://notmuchmail.org/; license = licenses.gpl3; - maintainers = with maintainers; [ chaoflow garbas ]; + maintainers = with maintainers; [ chaoflow garbas the-kenny ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix deleted file mode 100644 index 968ea74e296..00000000000 --- a/pkgs/applications/science/logic/coq/HEAD.nix +++ /dev/null @@ -1,81 +0,0 @@ -# - coqide compilation can be disabled by setting buildIde to false; -# - The csdp program used for the Micromega tactic is statically referenced. -# However, coq can build without csdp by setting it to null. -# In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found. - -{stdenv, fetchgit, writeText, pkgconfig, ocamlPackages_4_02, ncurses, buildIde ? true, csdp ? null}: - -let - version = "2017-02-03"; - coq-version = "8.6"; - ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages_4_02.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; - csdpPatch = if csdp != null then '' - substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" - substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" - '' else ""; - ocaml = ocamlPackages_4_02.ocaml; - findlib = ocamlPackages_4_02.findlib; - lablgtk = ocamlPackages_4_02.lablgtk; - camlp5 = ocamlPackages_4_02.camlp5_transitional; -in - -stdenv.mkDerivation { - name = "coq-unstable-${version}"; - - inherit coq-version; - inherit ocaml camlp5 findlib; - - src = fetchgit { - url = git://scm.gforge.inria.fr/coq/coq.git; - rev = "078598d029792a3d9a54fae9b9ac189b75bc3b06"; - sha256 = "0sflrpp6x0ada0bjh67q1x65g88d179n3cawpwkp1pm4kw76g8x7"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ]; - - postPatch = '' - UNAME=$(type -tp uname) - RM=$(type -tp rm) - substituteInPlace configure --replace "/bin/uname" "$UNAME" - substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" - substituteInPlace configure.ml --replace "\"Darwin\"; \"FreeBSD\"; \"OpenBSD\"" "\"Darwinx\"; \"FreeBSD\"; \"OpenBSD\"" - ${csdpPatch} - ''; - - setupHook = writeText "setupHook.sh" '' - addCoqPath () { - if test -d "''$1/lib/coq/${coq-version}/user-contrib"; then - export COQPATH="''${COQPATH}''${COQPATH:+:}''$1/lib/coq/${coq-version}/user-contrib/" - fi - } - - envHooks=(''${envHooks[@]} addCoqPath) - ''; - - preConfigure = '' - configureFlagsArray=( - -opt - ${ideFlags} - ) - ''; - - prefixKey = "-prefix "; - - buildFlags = "revision coq coqide"; - - meta = with stdenv.lib; { - description = "Coq proof assistant"; - longDescription = '' - Coq is a formal proof management system. It provides a formal language - to write mathematical definitions, executable algorithms and theorems - together with an environment for semi-interactive development of - machine-checked proofs. - ''; - homepage = http://coq.inria.fr; - license = licenses.lgpl21; - branch = coq-version; - maintainers = with maintainers; [ roconnor thoughtpolice vbgl ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index ba74bc38a35..09e7de898d5 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -208,9 +208,9 @@ rec { # https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits docker_17_09 = dockerGen rec { - version = "17.09.0-ce"; - rev = "afdb6d44a80f777069885a9ee0e0f86cf841b1bb"; # git commit - sha256 = "03g0imdcxqx9y4hhyymxqzvm8bqg4cqrmb7sjbxfdgrhzh9kcn1p"; + version = "17.09.1-ce"; + rev = "19e2cf6259bd7f027a3fff180876a22945ce4ba8"; # git commit + sha256 = "10glpbaw7bg2acgf1nmfn79is2b3xsm4shz67rp72dmpzzaavb42"; runcRev = "3f2f8b84a77f73d38244dd690525642a72156c64"; runcSha256 = "0vaagmav8443kmyxac2y1y5l2ipcs1c7gdmsnvj48y9bafqx72rq"; containerdRev = "06b9cb35161009dcb7123345749fef02f7cea8e0"; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 3b8d0a7cf63..68ee06953a3 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -25,8 +25,12 @@ stdenv.mkDerivation rec { buildInputs = [ glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared_mime_info libvirt yajl gsettings_desktop_schemas makeWrapper libvirt-glib - libcap_ng numactl libapparmor xen - ] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm ]; + libcap_ng numactl libapparmor + ] ++ optionals stdenv.isx86_64 [ + xen + ] ++ optionals spiceSupport [ + spice_gtk spice_protocol libcap gdbm + ]; postInstall = '' for f in "$out"/bin/*; do diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index 308913adf89..ec3fe9ccf22 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -230,6 +230,12 @@ callPackage (import ./generic.nix (rec { XSA_243_45 XSA_244_45 XSA_245 + XSA_246_45 + XSA_247_45 + XSA_248_45 + XSA_249 + XSA_250_45 + XSA_251_45 ]; # Fix build on Glibc 2.24. diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index 259dd72a960..6eedca18960 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -158,6 +158,12 @@ callPackage (import ./generic.nix (rec { XSA_243_48 XSA_244 XSA_245 + XSA_246 + XSA_247_48 + XSA_248_48 + XSA_249 + XSA_250 + XSA_251_48 ]; # Fix build on Glibc 2.24. diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix index fd85c85f22b..8f8cc459a24 100644 --- a/pkgs/applications/virtualization/xen/xsa-patches.nix +++ b/pkgs/applications/virtualization/xen/xsa-patches.nix @@ -771,4 +771,97 @@ in rec { sha256 = "1k6z5r7wnrswsczn2j3a1mc4nvxqm4ydj6n6rvgqizk2pszdkqg8"; }) ]; + + # 4.5 - 4.7 + XSA_246_45 = [ + (xsaPatch { + name = "246-4.7"; + sha256 = "13rad4k8z3bq15d67dhgy96kdbrjiq9sy8px0jskbpx9ygjdahkn"; + }) + ]; + + # 4.8 - 4.9 + XSA_246 = [ + (xsaPatch { + name = "246-4.9"; + sha256 = "0z68vm0z5zvv9gm06pxs9kxq2q9fdbl0l0cm71ggzdplg1vw0snz"; + }) + ]; + + # 4.8 + XSA_247_48 = [ + (xsaPatch { + name = "247-4.8/0001-p2m-Always-check-to-see-if-removing-a-p2m-entry-actu"; + sha256 = "0kvjrk90n69s721c2qj2df5raml3pjk6bg80aig353p620w6s3xh"; + }) + (xsaPatch { + name = "247-4.8/0002-p2m-Check-return-value-of-p2m_set_entry-when-decreas"; + sha256 = "1s9kv6h6dd8psi5qf5l5gpk9qhq8blckwhl76cjbldcgi6imb3nr"; + }) + ]; + + # 4.5 + XSA_247_45 = [ + (xsaPatch { + name = "247-4.5/0001-p2m-Always-check-to-see-if-removing-a-p2m-entry-actu"; + sha256 = "0h1mp5s9si8aw2gipds317f27h9pi7bgnhj0bcmw11p0ch98sg1m"; + }) + (xsaPatch { + name = "247-4.5/0002-p2m-Check-return-value-of-p2m_set_entry-when-decreas"; + sha256 = "0vjjybxbcm4xl26wbqvcqfiyvvlayswm4f98i1fr5a9abmljn5sb"; + }) + ]; + + # 4.5 + XSA_248_45 = [ + (xsaPatch { + name = "248-4.5"; + sha256 = "0csxg6h492ddsa210b45av28iqf7cn2dfdqk4zx10zwf1pv2shyn"; + }) + ]; + + # 4.8 + XSA_248_48 = [ + (xsaPatch { + name = "248-4.8"; + sha256 = "1ycw29q22ymxg18kxpr5p7vhpmp8klssbp5gq77hspxzz2mb96q1"; + }) + ]; + + # 4.5 .. 4.9 + XSA_249 = [ + (xsaPatch { + name = "249"; + sha256 = "0v6ngzqhkz7yv4n83xlpxfbkr2qyg5b1cds7ikkinm86hiqy6agl"; + }) + ]; + # 4.5 + XSA_250_45 = [ + (xsaPatch { + name = "250-4.5"; + sha256 = "0pqldl6qnl834gvfp90z247q9xcjh3835s2iffnajz7jhjb2145d"; + }) + ]; + # 4.8 ... + XSA_250 = [ + (xsaPatch { + name = "250"; + sha256 = "1wpigg8kmha57sspqqln3ih9nbczsw6rx3v72mc62lh62qvwd7x8"; + }) + ]; + # 4.5 + XSA_251_45 = [ + (xsaPatch { + name = "251-4.5"; + sha256 = "0lc94cx271z09r0mhxaypyd9d4740051p28idf5calx5228dqjgm"; + }) + ]; + # 4.8 + XSA_251_48 = [ + (xsaPatch { + name = "251-4.8"; + sha256 = "079wi0j6iydid2zj7k584w2c393kgh588w7sjz2nn4039qn8k9mq"; + }) + ]; + } diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 22521cc6da8..a7b9a77b3db 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -41,6 +41,8 @@ python27Packages.buildPythonApplication rec { --run 'export QTILE_SAVED_PATH=$PATH' ''; + doCheck = false; # Requires X server. + meta = with stdenv.lib; { homepage = http://www.qtile.org/; license = licenses.mit; @@ -49,4 +51,3 @@ python27Packages.buildPythonApplication rec { maintainers = with maintainers; [ kamilchm ]; }; } - diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix new file mode 100644 index 00000000000..72bb3b80492 --- /dev/null +++ b/pkgs/build-support/rust/build-rust-crate.nix @@ -0,0 +1,382 @@ +# Code for buildRustCrate, a Nix function that builds Rust code, just +# like Cargo, but using Nix instead. +# +# This can be useful for deploying packages with NixOps, and to share +# binary dependencies between projects. + +{ lib, buildPlatform, stdenv, defaultCrateOverrides, fetchCrate, ncurses, rustc }: + +let buildCrate = { crateName, crateVersion, crateAuthors, buildDependencies, + dependencies, completeDeps, completeBuildDeps, + crateFeatures, libName, build, release, libPath, + crateType, metadata, crateBin, finalBins, + verbose, colors }: + + let depsDir = lib.concatStringsSep " " dependencies; + completeDepsDir = lib.concatStringsSep " " completeDeps; + completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps; + makeDeps = dependencies: + (lib.concatMapStringsSep " " (dep: + let extern = lib.strings.replaceStrings ["-"] ["_"] dep.libName; in + (if dep.crateType == "lib" then + " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}.rlib" + else + " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}${buildPlatform.extensions.sharedLibrary}") + ) dependencies); + deps = makeDeps dependencies; + buildDeps = makeDeps buildDependencies; + optLevel = if release then 3 else 0; + rustcOpts = (if release then "-C opt-level=3" else "-C debuginfo=2"); + rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; + version_ = lib.splitString "-" crateVersion; + versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1; + version = lib.splitString "." (lib.head version_); + authors = lib.concatStringsSep ":" crateAuthors; + in '' + norm="" + bold="" + green="" + boldgreen="" + if [[ "${colors}" -eq "always" ]]; then + norm="$(printf '\033[0m')" #returns to "normal" + bold="$(printf '\033[0;1m')" #set bold + green="$(printf '\033[0;32m')" #set green + boldgreen="$(printf '\033[0;1;32m')" #set bold, and set green. + fi + + echo_build_heading() { + start="" + end="" + if [[ x"${colors}" -eq x"always" ]]; then + start="$(printf '\033[0;1;32m')" #set bold, and set green. + end="$(printf '\033[0m')" #returns to "normal" + fi + if (( $# == 1 )); then + echo "$start""Building $1""$end" + else + echo "$start""Building $1 ($2)""$end" + fi + } + + noisily() { + start="" + end="" + if [[ x"${colors}" -eq x"always" ]]; then + start="$(printf '\033[0;1;32m')" #set bold, and set green. + end="$(printf '\033[0m')" #returns to "normal" + fi + ${lib.optionalString verbose '' + echo -n "$start"Running "$end" + echo $@ + ''} + $@ + } + + symlink_dependency() { + # $1 is the nix-store path of a dependency + i=$1 + dest=target/deps + if [ ! -z $2 ]; then + if [ "$2" = "--buildDep" ]; then + dest=target/buildDeps + fi + fi + ln -s -f $i/lib/*.rlib $dest #*/ + ln -s -f $i/lib/*.so $i/lib/*.dylib $dest #*/ + if [ -e "$i/lib/link" ]; then + cat $i/lib/link >> target/link + cat $i/lib/link >> target/link.final + fi + if [ -e $i/env ]; then + source $i/env + fi + } + + build_lib() { + lib_src=$1 + echo_build_heading $lib_src ${libName} + + noisily rustc --crate-name $CRATE_NAME $lib_src --crate-type ${crateType} \ + ${rustcOpts} ${rustcMeta} ${crateFeatures} --out-dir target/lib \ + --emit=dep-info,link -L dependency=target/deps ${deps} --cap-lints allow \ + $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} + + EXTRA_LIB=" --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-${metadata}.rlib" + if [ -e target/deps/lib$CRATE_NAME-${metadata}${buildPlatform.extensions.sharedLibrary} ]; then + EXTRA_LIB="$EXTRA_LIB --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-${metadata}${buildPlatform.extensions.sharedLibrary}" + fi + } + + build_bin() { + crate_name=$1 + crate_name_=$(echo $crate_name | sed -e "s/-/_/g") + main_file="" + if [[ ! -z $2 ]]; then + main_file=$2 + fi + echo_build_heading $@ + noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\ + ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \ + $LINK ${deps}$EXTRA_LIB --cap-lints allow \ + $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} + if [ "$crate_name_" -ne "$crate_name" ]; then + mv target/bin/$crate_name_ target/bin/$crate_name + fi + } + + runHook preBuild + mkdir -p target/{deps,lib,build,buildDeps} + chmod uga+w target -R + for i in ${completeDepsDir}; do + symlink_dependency $i + done + for i in ${completeBuildDepsDir}; do + symlink_dependency $i --buildDep + done + if [ -e target/link ]; then + sort -u target/link > target/link.sorted + mv target/link.sorted target/link + sort -u target/link.final > target/link.final.sorted + mv target/link.final.sorted target/link.final + tr '\n' ' ' < target/link > target/link_ + fi + EXTRA_BUILD="" + BUILD_OUT_DIR="" + export CARGO_PKG_NAME=${crateName} + export CARGO_PKG_VERSION=${crateVersion} + export CARGO_PKG_AUTHORS="${authors}" + export CARGO_CFG_TARGET_ARCH=${buildPlatform.parsed.cpu.name} + export CARGO_CFG_TARGET_OS=${buildPlatform.parsed.kernel.name} + + export CARGO_CFG_TARGET_ENV="gnu" + export CARGO_MANIFEST_DIR="." + export DEBUG="${toString (!release)}" + export OPT_LEVEL="${toString optLevel}" + export TARGET="${buildPlatform.config}" + export HOST="${buildPlatform.config}" + export PROFILE=${if release then "release" else "debug"} + export OUT_DIR=$(pwd)/target/build/${crateName}.out + export CARGO_PKG_VERSION_MAJOR=${builtins.elemAt version 0} + export CARGO_PKG_VERSION_MINOR=${builtins.elemAt version 1} + export CARGO_PKG_VERSION_PATCH=${builtins.elemAt version 2} + if [ -n "${versionPre}" ]; then + export CARGO_PKG_VERSION_PRE="${versionPre}" + fi + + BUILD="" + if [[ ! -z "${build}" ]] ; then + BUILD=${build} + elif [[ -e "build.rs" ]]; then + BUILD="build.rs" + fi + if [[ ! -z "$BUILD" ]] ; then + echo_build_heading "$BUILD" ${libName} + mkdir -p target/build/${crateName} + EXTRA_BUILD_FLAGS="" + if [ -e target/link_ ]; then + EXTRA_BUILD_FLAGS=$(cat target/link_) + fi + if [ -e target/link.build ]; then + EXTRA_BUILD_FLAGS="$EXTRA_BUILD_FLAGS $(cat target/link.build)" + fi + noisily rustc --crate-name build_script_build $BUILD --crate-type bin ${rustcOpts} \ + ${crateFeatures} --out-dir target/build/${crateName} --emit=dep-info,link \ + -L dependency=target/buildDeps ${buildDeps} --cap-lints allow $EXTRA_BUILD_FLAGS --color ${colors} + + mkdir -p target/build/${crateName}.out + export RUST_BACKTRACE=1 + BUILD_OUT_DIR="-L $OUT_DIR" + mkdir -p $OUT_DIR + target/build/${crateName}/build_script_build > target/build/${crateName}.opt + set +e + EXTRA_BUILD=$(sed -n "s/^cargo:rustc-flags=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ') + EXTRA_FEATURES=$(sed -n "s/^cargo:rustc-cfg=\(.*\)/--cfg \1/p" target/build/${crateName}.opt | tr '\n' ' ') + EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ') + EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ') + CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/") + grep -P "^cargo:(?!(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \ + | sed -e "s/cargo:\([^=]*\)=\(.*\)/export DEP_$(echo $CRATENAME)_\U\1\E=\2/" > target/env + + set -e + if [ -n "$(ls target/build/${crateName}.out)" ]; then + + if [ -e "${libPath}" ] ; then + cp -r target/build/${crateName}.out/* $(dirname ${libPath}) #*/ + else + cp -r target/build/${crateName}.out/* src #*/ + fi + fi + fi + + EXTRA_LIB="" + CRATE_NAME=$(echo ${libName} | sed -e "s/-/_/g") + + if [ -e target/link_ ]; then + EXTRA_BUILD="$(cat target/link_) $EXTRA_BUILD" + fi + + if [ -e "${libPath}" ] ; then + build_lib ${libPath} + elif [ -e src/lib.rs ] ; then + build_lib src/lib.rs + elif [ -e src/${libName}.rs ] ; then + build_lib src/${libName}.rs + fi + + echo "$EXTRA_LINK_SEARCH" | while read i; do + if [ ! -z "$i" ]; then + for lib in $i; do + echo "-L $lib" >> target/link + L=$(echo $lib | sed -e "s#$(pwd)/target/build#$out/lib#") + echo "-L $L" >> target/link.final + done + fi + done + echo "$EXTRA_LINK" | while read i; do + if [ ! -z "$i" ]; then + for lib in $i; do + echo "-l $lib" >> target/link + echo "-l $lib" >> target/link.final + done + fi + done + + if [ -e target/link ]; then + sort -u target/link.final > target/link.final.sorted + mv target/link.final.sorted target/link.final + sort -u target/link > target/link.sorted + mv target/link.sorted target/link + + tr '\n' ' ' < target/link > target/link_ + LINK=$(cat target/link_) + fi + + mkdir -p target/bin + echo "${crateBin}" | sed -n 1'p' | tr ',' '\n' | while read BIN; do + if [ ! -z "$BIN" ]; then + build_bin $BIN + fi + done + ${lib.optionalString (crateBin == "") '' + if [[ -e src/main.rs ]]; then + build_bin ${crateName} src/main.rs + fi + for i in src/bin/*.rs; do #*/ + build_bin "$(basename $i .rs)" "$i" + done + ''} + # Remove object files to avoid "wrong ELF type" + find target -type f -name "*.o" -print0 | xargs -0 rm -f + runHook postBuild + '' + finalBins; + + installCrate = crateName: '' + mkdir -p $out + if [ -s target/env ]; then + cp target/env $out/env + fi + if [ -s target/link.final ]; then + mkdir -p $out/lib + cp target/link.final $out/lib/link + fi + if [ "$(ls -A target/lib)" ]; then + mkdir -p $out/lib + cp target/lib/* $out/lib #*/ + fi + if [ "$(ls -A target/build)" ]; then # */ + mkdir -p $out/lib + cp -r target/build/* $out/lib # */ + fi + if [ "$(ls -A target/bin)" ]; then + mkdir -p $out/bin + cp -P target/bin/* $out/bin # */ + fi + ''; +in + +crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, crateOverrides }: + +let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverrides crate_); + buildInputs_ = buildInputs; +in +stdenv.mkDerivation rec { + + inherit (crate) crateName; + + src = if lib.hasAttr "src" crate then + crate.src + else + fetchCrate { inherit (crate) crateName version sha256; }; + name = "rust_${crate.crateName}-${crate.version}"; + buildInputs = [ rust ncurses ] ++ (crate.buildInputs or []) ++ buildInputs_; + dependencies = + builtins.map + (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; }) + (crate.dependencies or []); + + buildDependencies = + builtins.map + (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; }) + (crate.buildDependencies or []); + + completeDeps = lib.lists.unique (dependencies ++ lib.lists.concatMap (dep: dep.completeDeps) dependencies); + completeBuildDeps = lib.lists.unique ( + buildDependencies + ++ lib.lists.concatMap (dep: dep.completeBuildDeps ++ dep.completeDeps) buildDependencies + ); + + crateFeatures = if crate ? features then + lib.concatMapStringsSep " " (f: "--cfg feature=\\\"${f}\\\"") (crate.features ++ features) + else ""; + + libName = if crate ? libName then crate.libName else crate.crateName; + libPath = if crate ? libPath then crate.libPath else ""; + + metadata = builtins.substring 0 10 (builtins.hashString "sha256" (crateName + "-" + crateVersion)); + + crateBin = if crate ? crateBin then + builtins.foldl' (bins: bin: + let name = + lib.strings.replaceStrings ["-"] ["_"] + (if bin ? name then bin.name else crateName); + path = if bin ? path then bin.path else "src/main.rs"; + in + bins + (if bin == "" then "" else ",") + "${name} ${path}" + + ) "" crate.crateBin + else ""; + + finalBins = if crate ? crateBin then + builtins.foldl' (bins: bin: + let name = lib.strings.replaceStrings ["-"] ["_"] + (if bin ? name then bin.name else crateName); + new_name = if bin ? name then bin.name else crateName; + in + if name == new_name then bins else + (bins + "mv target/bin/${name} target/bin/${new_name};") + + ) "" crate.crateBin + else ""; + + build = if crate ? build then crate.build else ""; + crateVersion = crate.version; + crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else []; + crateType = + if lib.attrByPath ["procMacro"] false crate then "proc-macro" else + if lib.attrByPath ["plugin"] false crate then "dylib" else "lib"; + colors = lib.attrByPath [ "colors" ] "always" crate; + buildPhase = buildCrate { + inherit crateName dependencies buildDependencies completeDeps completeBuildDeps + crateFeatures libName build release libPath crateType crateVersion + crateAuthors metadata crateBin finalBins verbose colors; + }; + installPhase = installCrate crateName; + +}) { + rust = rustc; + release = true; + verbose = true; + features = []; + buildInputs = []; + crateOverrides = defaultCrateOverrides; +} diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix new file mode 100644 index 00000000000..80c0903369a --- /dev/null +++ b/pkgs/build-support/rust/carnix.nix @@ -0,0 +1,875 @@ +# Generated by carnix 0.5.0: carnix -o carnix.nix --src ./. Cargo.lock +{ lib, buildPlatform, buildRustCrate, fetchgit }: +let kernel = buildPlatform.parsed.kernel.name; + abi = buildPlatform.parsed.abi.name; + hasFeature = feature: + lib.lists.any + (originName: feature.${originName}) + (builtins.attrNames feature); + + hasDefault = feature: + let defaultFeatures = builtins.attrNames (feature."default" or {}); in + (defaultFeatures == []) + || (lib.lists.any (originName: feature."default".${originName}) defaultFeatures); + + mkFeatures = feat: lib.lists.foldl (features: featureName: + if featureName != "" && hasFeature feat.${featureName} then + [ featureName ] ++ features + else + features + ) (if hasDefault feat then [ "default" ] else []) (builtins.attrNames feat); + aho_corasick_0_6_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "aho-corasick"; + version = "0.6.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "1cpqzf6acj8lm06z3f1cg41wn6c2n9l3v49nh0dvimv4055qib6k"; + libName = "aho_corasick"; + crateBin = [ { name = "aho-corasick-dot"; } ]; + inherit dependencies buildDependencies features; + }; + ansi_term_0_10_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ansi_term"; + version = "0.10.2"; + authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " "Josh Triplett " ]; + sha256 = "07k0hfmlhv43lihyxb9d81l5mq5zlpqvv30dkfd3knmv2ginasn9"; + inherit dependencies buildDependencies features; + }; + atty_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "atty"; + version = "0.2.3"; + authors = [ "softprops " ]; + sha256 = "0zl0cjfgarp5y78nd755lpki5bbkj4hgmi88v265m543yg29i88f"; + inherit dependencies buildDependencies features; + }; + backtrace_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "backtrace"; + version = "0.3.4"; + authors = [ "Alex Crichton " "The Rust Project Developers" ]; + sha256 = "1caba8w3rqd5ghr88ghyz5wgkf81dgx18bj1llkax6qmianc6gk7"; + inherit dependencies buildDependencies features; + }; + backtrace_sys_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "backtrace-sys"; + version = "0.1.16"; + authors = [ "Alex Crichton " ]; + sha256 = "1cn2c8q3dn06crmnk0p62czkngam4l8nf57wy33nz1y5g25pszwy"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.7.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; + inherit dependencies buildDependencies features; + }; + bitflags_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "1.0.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0p4b3nr0s5nda2qmm7xdhnvh4lkqk3xd8l9ffmwbvqw137vx7mj1"; + inherit dependencies buildDependencies features; + }; + carnix_0_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "carnix"; + version = "0.5.0"; + authors = [ "pe@pijul.org " ]; + sha256 = "0mrprfa9l6q351ci77zr305jk5wdii8gamaphd2iars4xwn26lj4"; + inherit dependencies buildDependencies features; + }; + cc_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cc"; + version = "1.0.3"; + authors = [ "Alex Crichton " ]; + sha256 = "193pwqgh79w6k0k29svyds5nnlrwx44myqyrw605d5jj4yk2zmpr"; + inherit dependencies buildDependencies features; + }; + cfg_if_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cfg-if"; + version = "0.1.2"; + authors = [ "Alex Crichton " ]; + sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi"; + inherit dependencies buildDependencies features; + }; + clap_2_28_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "clap"; + version = "2.28.0"; + authors = [ "Kevin K. " ]; + sha256 = "0m0rj9xw6mja4gdhqmaldv0q5y5jfsfzbyzfd70mm3857aynq03k"; + inherit dependencies buildDependencies features; + }; + dbghelp_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dbghelp-sys"; + version = "0.2.0"; + authors = [ "Peter Atashian " ]; + sha256 = "0ylpi3bbiy233m57hnisn1df1v0lbl7nsxn34b0anzsgg440hqpq"; + libName = "dbghelp"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + dtoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dtoa"; + version = "0.4.2"; + authors = [ "David Tolnay " ]; + sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw"; + inherit dependencies buildDependencies features; + }; + either_1_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "either"; + version = "1.4.0"; + authors = [ "bluss" ]; + sha256 = "04kpfd84lvyrkb2z4sljlz2d3d5qczd0sb1yy37fgijq2yx3vb37"; + inherit dependencies buildDependencies features; + }; + env_logger_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "env_logger"; + version = "0.4.3"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0nrx04p4xa86d5kc7aq4fwvipbqji9cmgy449h47nc9f1chafhgg"; + inherit dependencies buildDependencies features; + }; + error_chain_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "error-chain"; + version = "0.11.0"; + authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ]; + sha256 = "19nz17q6dzp0mx2jhh9qbj45gkvvgcl7zq9z2ai5a8ihbisfj6d7"; + inherit dependencies buildDependencies features; + }; + fuchsia_zircon_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fuchsia-zircon"; + version = "0.2.1"; + authors = [ "Raph Levien " ]; + sha256 = "0yd4rd7ql1vdr349p6vgq2dnwmpylky1kjp8g1zgvp250jxrhddb"; + inherit dependencies buildDependencies features; + }; + fuchsia_zircon_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fuchsia-zircon-sys"; + version = "0.2.0"; + authors = [ "Raph Levien " ]; + sha256 = "1yrqsrjwlhl3di6prxf5xmyd82gyjaysldbka5wwk83z11mpqh4w"; + inherit dependencies buildDependencies features; + }; + itertools_0_7_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "itertools"; + version = "0.7.3"; + authors = [ "bluss" ]; + sha256 = "128a69cnmgpj38rs6lcwzya773d2vx7f9y7012iycjf9yi2pyckj"; + inherit dependencies buildDependencies features; + }; + itoa_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "itoa"; + version = "0.3.4"; + authors = [ "David Tolnay " ]; + sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9"; + inherit dependencies buildDependencies features; + }; + kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "kernel32-sys"; + version = "0.2.2"; + authors = [ "Peter Atashian " ]; + sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; + libName = "kernel32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + lazy_static_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "0.2.11"; + authors = [ "Marvin Löbel " ]; + sha256 = "1x6871cvpy5b96yv4c7jvpq316fp5d4609s9py7qk6cd6x9k34vm"; + inherit dependencies buildDependencies features; + }; + libc_0_2_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.33"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1l7synziccnvarsq2kk22vps720ih6chmn016bhr2bq54hblbnl1"; + inherit dependencies buildDependencies features; + }; + libsqlite3_sys_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libsqlite3-sys"; + version = "0.9.0"; + authors = [ "John Gallagher " ]; + sha256 = "1pnx3i9h85si6cs4nhazfb28hsvk7dn0arnfvpdzpjdnj9z38q57"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + linked_hash_map_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "linked-hash-map"; + version = "0.4.2"; + authors = [ "Stepan Koltsov " "Andrew Paseltiner " ]; + sha256 = "04da208h6jb69f46j37jnvsw2i1wqplglp4d61csqcrhh83avbgl"; + inherit dependencies buildDependencies features; + }; + log_0_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "log"; + version = "0.3.8"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1c43z4z85sxrsgir4s1hi84558ab5ic7jrn5qgmsiqcv90vvn006"; + inherit dependencies buildDependencies features; + }; + lru_cache_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lru-cache"; + version = "0.1.1"; + authors = [ "Stepan Koltsov " ]; + sha256 = "1hl6kii1g54sq649gnscv858mmw7a02xj081l4vcgvrswdi2z8fw"; + inherit dependencies buildDependencies features; + }; + memchr_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "memchr"; + version = "1.0.2"; + authors = [ "Andrew Gallant " "bluss" ]; + sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7"; + inherit dependencies buildDependencies features; + }; + nom_3_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "nom"; + version = "3.2.1"; + authors = [ "contact@geoffroycouprie.com" ]; + sha256 = "1vcllxrz9hdw6j25kn020ka3psz1vkaqh1hm3yfak2240zrxgi07"; + inherit dependencies buildDependencies features; + }; + num_traits_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-traits"; + version = "0.1.40"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw"; + inherit dependencies buildDependencies features; + }; + pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "pkg-config"; + version = "0.3.9"; + authors = [ "Alex Crichton " ]; + sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; + inherit dependencies buildDependencies features; + }; + quote_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "quote"; + version = "0.3.15"; + authors = [ "David Tolnay " ]; + sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg"; + inherit dependencies buildDependencies features; + }; + rand_0_3_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rand"; + version = "0.3.18"; + authors = [ "The Rust Project Developers" ]; + sha256 = "15d7c3myn968dzjs0a2pgv58hzdavxnq6swgj032lw2v966ir4xv"; + inherit dependencies buildDependencies features; + }; + redox_syscall_0_1_32_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "redox_syscall"; + version = "0.1.32"; + authors = [ "Jeremy Soller " ]; + sha256 = "1axxj8x6ngh6npkzqc5h216fajkcyrdxdgb7m2f0n5xfclbk47fv"; + libName = "syscall"; + inherit dependencies buildDependencies features; + }; + redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "redox_termios"; + version = "0.1.1"; + authors = [ "Jeremy Soller " ]; + sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + regex_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "regex"; + version = "0.2.2"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1f1zrrynfylg0vcfyfp60bybq4rp5g1yk2k7lc7fyz7mmc7k2qr7"; + inherit dependencies buildDependencies features; + }; + regex_syntax_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "regex-syntax"; + version = "0.4.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "01yrsm68lj86ad1whgg1z95c2pfsvv58fz8qjcgw7mlszc0c08ls"; + inherit dependencies buildDependencies features; + }; + rusqlite_0_13_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rusqlite"; + version = "0.13.0"; + authors = [ "John Gallagher " ]; + sha256 = "1hj2464ar2y4324sk3jx7m9byhkcp60krrrs1v1i8dlhhlnkb9hc"; + inherit dependencies buildDependencies features; + }; + rustc_demangle_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc-demangle"; + version = "0.1.5"; + authors = [ "Alex Crichton " ]; + sha256 = "096kkcx9j747700fhxj1s4rlwkj21pqjmvj64psdj6bakb2q13nc"; + inherit dependencies buildDependencies features; + }; + serde_1_0_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde"; + version = "1.0.21"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "10almq7pvx8s4ryiqk8gf7fj5igl0yq6dcjknwc67rkmxd8q50w3"; + inherit dependencies buildDependencies features; + }; + serde_derive_1_0_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_derive"; + version = "1.0.21"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "0r20qyimm9scfaz7lc0swnhik9d045zklmbidd0zzpd4b2f3jsqm"; + procMacro = true; + inherit dependencies buildDependencies features; + }; + serde_derive_internals_0_17_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_derive_internals"; + version = "0.17.0"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "1g1j3v6pj9wbcz3v3w4smjpwrcdwjicmf6yd5cbai04as9iwhw74"; + inherit dependencies buildDependencies features; + }; + serde_json_1_0_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_json"; + version = "1.0.6"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "1kacyc59splwbg8gr7qs32pp9smgy1khq0ggnv07yxhs7h355vjz"; + inherit dependencies buildDependencies features; + }; + strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "strsim"; + version = "0.6.0"; + authors = [ "Danny Guo " ]; + sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; + inherit dependencies buildDependencies features; + }; + syn_0_11_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "syn"; + version = "0.11.11"; + authors = [ "David Tolnay " ]; + sha256 = "0yw8ng7x1dn5a6ykg0ib49y7r9nhzgpiq2989rqdp7rdz3n85502"; + inherit dependencies buildDependencies features; + }; + synom_0_11_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "synom"; + version = "0.11.3"; + authors = [ "David Tolnay " ]; + sha256 = "1l6d1s9qjfp6ng2s2z8219igvlv7gyk8gby97sdykqc1r93d8rhc"; + inherit dependencies buildDependencies features; + }; + tempdir_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tempdir"; + version = "0.3.5"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0rirc5prqppzgd15fm8ayan349lgk2k5iqdkrbwrwrv5pm4znsnz"; + inherit dependencies buildDependencies features; + }; + termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "termion"; + version = "1.5.1"; + authors = [ "ticki " "gycos " "IGI-111 " ]; + sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; + inherit dependencies buildDependencies features; + }; + textwrap_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "textwrap"; + version = "0.9.0"; + authors = [ "Martin Geisler " ]; + sha256 = "18jg79ndjlwndz01mlbh82kkr2arqm658yn5kwp65l5n1hz8w4yb"; + inherit dependencies buildDependencies features; + }; + thread_local_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "thread_local"; + version = "0.3.4"; + authors = [ "Amanieu d'Antras " ]; + sha256 = "1y6cwyhhx2nkz4b3dziwhqdvgq830z8wjp32b40pjd8r0hxqv2jr"; + inherit dependencies buildDependencies features; + }; + time_0_1_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "time"; + version = "0.1.38"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1ws283vvz7c6jfiwn53rmc6kybapr4pjaahfxxrz232b0qzw7gcp"; + inherit dependencies buildDependencies features; + }; + toml_0_4_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "toml"; + version = "0.4.5"; + authors = [ "Alex Crichton " ]; + sha256 = "06zxqhn3y58yzjfaykhcrvlf7p2dnn54kn3g4apmja3cn5b18lkk"; + inherit dependencies buildDependencies features; + }; + unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-width"; + version = "0.1.4"; + authors = [ "kwantam " ]; + sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; + inherit dependencies buildDependencies features; + }; + unicode_xid_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-xid"; + version = "0.0.4"; + authors = [ "erick.tryzelaar " "kwantam " ]; + sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v"; + inherit dependencies buildDependencies features; + }; + unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unreachable"; + version = "1.0.0"; + authors = [ "Jonathan Reem " ]; + sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf"; + inherit dependencies buildDependencies features; + }; + utf8_ranges_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "utf8-ranges"; + version = "1.0.0"; + authors = [ "Andrew Gallant " ]; + sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0"; + inherit dependencies buildDependencies features; + }; + vcpkg_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "vcpkg"; + version = "0.2.2"; + authors = [ "Jim McGrath " ]; + sha256 = "1fl5j0ksnwrnsrf1b1a9lqbjgnajdipq0030vsbhx81mb7d9478a"; + inherit dependencies buildDependencies features; + }; + vec_map_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "vec_map"; + version = "0.8.0"; + authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ]; + sha256 = "07sgxp3cf1a4cxm9n3r27fcvqmld32bl2576mrcahnvm34j11xay"; + inherit dependencies buildDependencies features; + }; + void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "void"; + version = "1.0.2"; + authors = [ "Jonathan Reem " ]; + sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; + inherit dependencies buildDependencies features; + }; + winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi"; + version = "0.2.8"; + authors = [ "Peter Atashian " ]; + sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + inherit dependencies buildDependencies features; + }; + winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-build"; + version = "0.1.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; + libName = "build"; + inherit dependencies buildDependencies features; + }; + +in +rec { + aho_corasick_0_6_3 = aho_corasick_0_6_3_ rec { + dependencies = [ memchr_1_0_2 ]; + }; + memchr_1_0_2_features."default".from_aho_corasick_0_6_3__default = true; + ansi_term_0_10_2 = ansi_term_0_10_2_ rec {}; + atty_0_2_3 = atty_0_2_3_ rec { + dependencies = (if kernel == "redox" then [ termion_1_5_1 ] else []) + ++ (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_33 ] else []) + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + }; + termion_1_5_1_features."default".from_atty_0_2_3__default = true; + libc_0_2_33_features."default".from_atty_0_2_3__default = false; + kernel32_sys_0_2_2_features."default".from_atty_0_2_3__default = true; + winapi_0_2_8_features."default".from_atty_0_2_3__default = true; + backtrace_0_3_4 = backtrace_0_3_4_ rec { + dependencies = [ cfg_if_0_1_2 rustc_demangle_0_1_5 ] + ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then [ backtrace_sys_0_1_16 ] + ++ (if lib.lists.any (x: x == "backtrace-sys") features then [backtrace_sys_0_1_16] else []) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_33 ] else []) + ++ (if kernel == "windows" then [ dbghelp_sys_0_2_0 kernel32_sys_0_2_2 winapi_0_2_8 ] + ++ (if lib.lists.any (x: x == "dbghelp-sys") features then [dbghelp_sys_0_2_0] else []) ++ (if lib.lists.any (x: x == "kernel32-sys") features then [kernel32_sys_0_2_2] else []) ++ (if lib.lists.any (x: x == "winapi") features then [winapi_0_2_8] else []) else []); + features = mkFeatures backtrace_0_3_4_features; + }; + backtrace_0_3_4_features."".self = true; + backtrace_0_3_4_features."kernel32-sys".self_dbghelp = hasFeature (backtrace_0_3_4_features."dbghelp" or {}); + backtrace_0_3_4_features."winapi".self_dbghelp = hasFeature (backtrace_0_3_4_features."dbghelp" or {}); + backtrace_0_3_4_features."dbghelp-sys".self_dbghelp = hasFeature (backtrace_0_3_4_features."dbghelp" or {}); + backtrace_0_3_4_features."libunwind".self_default = hasDefault backtrace_0_3_4_features; + backtrace_0_3_4_features."libbacktrace".self_default = hasDefault backtrace_0_3_4_features; + backtrace_0_3_4_features."coresymbolication".self_default = hasDefault backtrace_0_3_4_features; + backtrace_0_3_4_features."dladdr".self_default = hasDefault backtrace_0_3_4_features; + backtrace_0_3_4_features."dbghelp".self_default = hasDefault backtrace_0_3_4_features; + backtrace_0_3_4_features."addr2line".self_gimli-symbolize = hasFeature (backtrace_0_3_4_features."gimli-symbolize" or {}); + backtrace_0_3_4_features."findshlibs".self_gimli-symbolize = hasFeature (backtrace_0_3_4_features."gimli-symbolize" or {}); + backtrace_0_3_4_features."backtrace-sys".self_libbacktrace = hasFeature (backtrace_0_3_4_features."libbacktrace" or {}); + backtrace_0_3_4_features."rustc-serialize".self_serialize-rustc = hasFeature (backtrace_0_3_4_features."serialize-rustc" or {}); + backtrace_0_3_4_features."serde".self_serialize-serde = hasFeature (backtrace_0_3_4_features."serialize-serde" or {}); + backtrace_0_3_4_features."serde_derive".self_serialize-serde = hasFeature (backtrace_0_3_4_features."serialize-serde" or {}); + addr2line_0_0_0_features."default".from_backtrace_0_3_4__default = true; + cfg_if_0_1_2_features."default".from_backtrace_0_3_4__default = true; + cpp_demangle_0_0_0_features."default".from_backtrace_0_3_4__default = false; + findshlibs_0_0_0_features."default".from_backtrace_0_3_4__default = true; + rustc_demangle_0_1_5_features."default".from_backtrace_0_3_4__default = true; + rustc_serialize_0_0_0_features."default".from_backtrace_0_3_4__default = true; + serde_0_0_0_features."default".from_backtrace_0_3_4__default = true; + serde_derive_0_0_0_features."default".from_backtrace_0_3_4__default = true; + backtrace_sys_0_1_16_features."default".from_backtrace_0_3_4__default = true; + libc_0_2_33_features."default".from_backtrace_0_3_4__default = true; + dbghelp_sys_0_2_0_features."default".from_backtrace_0_3_4__default = true; + kernel32_sys_0_2_2_features."default".from_backtrace_0_3_4__default = true; + winapi_0_2_8_features."default".from_backtrace_0_3_4__default = true; + backtrace_sys_0_1_16 = backtrace_sys_0_1_16_ rec { + dependencies = [ libc_0_2_33 ]; + buildDependencies = [ cc_1_0_3 ]; + }; + libc_0_2_33_features."default".from_backtrace_sys_0_1_16__default = true; + bitflags_0_7_0 = bitflags_0_7_0_ rec {}; + bitflags_1_0_1 = bitflags_1_0_1_ rec { + features = mkFeatures bitflags_1_0_1_features; + }; + bitflags_1_0_1_features."example_generated".self_default = hasDefault bitflags_1_0_1_features; + carnix_0_5_0 = carnix_0_5_0_ rec { + dependencies = [ clap_2_28_0 env_logger_0_4_3 error_chain_0_11_0 itertools_0_7_3 log_0_3_8 nom_3_2_1 regex_0_2_2 rusqlite_0_13_0 serde_1_0_21 serde_derive_1_0_21 serde_json_1_0_6 tempdir_0_3_5 toml_0_4_5 ]; + }; + clap_2_28_0_features."default".from_carnix_0_5_0__default = true; + env_logger_0_4_3_features."default".from_carnix_0_5_0__default = true; + error_chain_0_11_0_features."default".from_carnix_0_5_0__default = true; + itertools_0_7_3_features."default".from_carnix_0_5_0__default = true; + log_0_3_8_features."default".from_carnix_0_5_0__default = true; + nom_3_2_1_features."default".from_carnix_0_5_0__default = true; + regex_0_2_2_features."default".from_carnix_0_5_0__default = true; + rusqlite_0_13_0_features."default".from_carnix_0_5_0__default = true; + serde_1_0_21_features."default".from_carnix_0_5_0__default = true; + serde_derive_1_0_21_features."default".from_carnix_0_5_0__default = true; + serde_json_1_0_6_features."default".from_carnix_0_5_0__default = true; + tempdir_0_3_5_features."default".from_carnix_0_5_0__default = true; + toml_0_4_5_features."default".from_carnix_0_5_0__default = true; + cc_1_0_3 = cc_1_0_3_ rec { + dependencies = []; + features = mkFeatures cc_1_0_3_features; + }; + cc_1_0_3_features."rayon".self_parallel = hasFeature (cc_1_0_3_features."parallel" or {}); + rayon_0_0_0_features."default".from_cc_1_0_3__default = true; + cfg_if_0_1_2 = cfg_if_0_1_2_ rec {}; + clap_2_28_0 = clap_2_28_0_ rec { + dependencies = [ ansi_term_0_10_2 atty_0_2_3 bitflags_1_0_1 strsim_0_6_0 textwrap_0_9_0 unicode_width_0_1_4 vec_map_0_8_0 ] + ++ (if lib.lists.any (x: x == "ansi_term") features then [ansi_term_0_10_2] else []) ++ (if lib.lists.any (x: x == "atty") features then [atty_0_2_3] else []) ++ (if lib.lists.any (x: x == "strsim") features then [strsim_0_6_0] else []) ++ (if lib.lists.any (x: x == "vec_map") features then [vec_map_0_8_0] else []); + features = mkFeatures clap_2_28_0_features; + }; + clap_2_28_0_features."".self = true; + clap_2_28_0_features."ansi_term".self_color = hasFeature (clap_2_28_0_features."color" or {}); + clap_2_28_0_features."atty".self_color = hasFeature (clap_2_28_0_features."color" or {}); + clap_2_28_0_features."suggestions".self_default = hasDefault clap_2_28_0_features; + clap_2_28_0_features."color".self_default = hasDefault clap_2_28_0_features; + clap_2_28_0_features."vec_map".self_default = hasDefault clap_2_28_0_features; + clap_2_28_0_features."yaml".self_doc = hasFeature (clap_2_28_0_features."doc" or {}); + clap_2_28_0_features."clippy".self_lints = hasFeature (clap_2_28_0_features."lints" or {}); + clap_2_28_0_features."strsim".self_suggestions = hasFeature (clap_2_28_0_features."suggestions" or {}); + clap_2_28_0_features."term_size".self_wrap_help = hasFeature (clap_2_28_0_features."wrap_help" or {}); + clap_2_28_0_features."yaml-rust".self_yaml = hasFeature (clap_2_28_0_features."yaml" or {}); + ansi_term_0_10_2_features."default".from_clap_2_28_0__default = true; + atty_0_2_3_features."default".from_clap_2_28_0__default = true; + bitflags_1_0_1_features."default".from_clap_2_28_0__default = true; + clippy_0_0_0_features."default".from_clap_2_28_0__default = true; + strsim_0_6_0_features."default".from_clap_2_28_0__default = true; + term_size_0_0_0_features."default".from_clap_2_28_0__default = true; + textwrap_0_9_0_features."term_size".from_clap_2_28_0__wrap_help = hasFeature (clap_2_28_0_features."wrap_help" or {}); + textwrap_0_9_0_features."default".from_clap_2_28_0__default = true; + unicode_width_0_1_4_features."default".from_clap_2_28_0__default = true; + vec_map_0_8_0_features."default".from_clap_2_28_0__default = true; + yaml_rust_0_0_0_features."default".from_clap_2_28_0__default = true; + dbghelp_sys_0_2_0 = dbghelp_sys_0_2_0_ rec { + dependencies = [ winapi_0_2_8 ]; + buildDependencies = [ winapi_build_0_1_1 ]; + }; + winapi_0_2_8_features."default".from_dbghelp_sys_0_2_0__default = true; + dtoa_0_4_2 = dtoa_0_4_2_ rec {}; + either_1_4_0 = either_1_4_0_ rec { + dependencies = []; + features = mkFeatures either_1_4_0_features; + }; + either_1_4_0_features."use_std".self_default = hasDefault either_1_4_0_features; + serde_0_0_0_features."derive".from_either_1_4_0 = true; + serde_0_0_0_features."default".from_either_1_4_0__default = true; + env_logger_0_4_3 = env_logger_0_4_3_ rec { + dependencies = [ log_0_3_8 regex_0_2_2 ] + ++ (if lib.lists.any (x: x == "regex") features then [regex_0_2_2] else []); + features = mkFeatures env_logger_0_4_3_features; + }; + env_logger_0_4_3_features."".self = true; + env_logger_0_4_3_features."regex".self_default = hasDefault env_logger_0_4_3_features; + log_0_3_8_features."default".from_env_logger_0_4_3__default = true; + regex_0_2_2_features."default".from_env_logger_0_4_3__default = true; + error_chain_0_11_0 = error_chain_0_11_0_ rec { + dependencies = [ backtrace_0_3_4 ] + ++ (if lib.lists.any (x: x == "backtrace") features then [backtrace_0_3_4] else []); + features = mkFeatures error_chain_0_11_0_features; + }; + error_chain_0_11_0_features."".self = true; + error_chain_0_11_0_features."backtrace".self_default = hasDefault error_chain_0_11_0_features; + error_chain_0_11_0_features."example_generated".self_default = hasDefault error_chain_0_11_0_features; + backtrace_0_3_4_features."default".from_error_chain_0_11_0__default = true; + fuchsia_zircon_0_2_1 = fuchsia_zircon_0_2_1_ rec { + dependencies = [ fuchsia_zircon_sys_0_2_0 ]; + }; + fuchsia_zircon_sys_0_2_0_features."default".from_fuchsia_zircon_0_2_1__default = true; + fuchsia_zircon_sys_0_2_0 = fuchsia_zircon_sys_0_2_0_ rec { + dependencies = [ bitflags_0_7_0 ]; + }; + bitflags_0_7_0_features."default".from_fuchsia_zircon_sys_0_2_0__default = true; + itertools_0_7_3 = itertools_0_7_3_ rec { + dependencies = [ either_1_4_0 ]; + features = mkFeatures itertools_0_7_3_features; + }; + itertools_0_7_3_features."use_std".self_default = hasDefault itertools_0_7_3_features; + either_1_4_0_features."default".from_itertools_0_7_3__default = false; + itoa_0_3_4 = itoa_0_3_4_ rec { + features = mkFeatures itoa_0_3_4_features; + }; + itoa_0_3_4_features."".self = true; + kernel32_sys_0_2_2 = kernel32_sys_0_2_2_ rec { + dependencies = [ winapi_0_2_8 ]; + buildDependencies = [ winapi_build_0_1_1 ]; + }; + winapi_0_2_8_features."default".from_kernel32_sys_0_2_2__default = true; + lazy_static_0_2_11 = lazy_static_0_2_11_ rec { + dependencies = []; + features = mkFeatures lazy_static_0_2_11_features; + }; + lazy_static_0_2_11_features."compiletest_rs".self_compiletest = hasFeature (lazy_static_0_2_11_features."compiletest" or {}); + lazy_static_0_2_11_features."nightly".self_spin_no_std = hasFeature (lazy_static_0_2_11_features."spin_no_std" or {}); + lazy_static_0_2_11_features."spin".self_spin_no_std = hasFeature (lazy_static_0_2_11_features."spin_no_std" or {}); + compiletest_rs_0_0_0_features."default".from_lazy_static_0_2_11__default = true; + spin_0_0_0_features."default".from_lazy_static_0_2_11__default = true; + libc_0_2_33 = libc_0_2_33_ rec { + features = mkFeatures libc_0_2_33_features; + }; + libc_0_2_33_features."use_std".self_default = hasDefault libc_0_2_33_features; + libsqlite3_sys_0_9_0 = libsqlite3_sys_0_9_0_ rec { + dependencies = (if abi == "msvc" then [] else []); + buildDependencies = [ pkg_config_0_3_9 ] + ++ (if lib.lists.any (x: x == "pkg-config") features then [pkg_config_0_3_9] else []); + features = mkFeatures libsqlite3_sys_0_9_0_features; + }; + libsqlite3_sys_0_9_0_features."bindgen".self_buildtime_bindgen = hasFeature (libsqlite3_sys_0_9_0_features."buildtime_bindgen" or {}); + libsqlite3_sys_0_9_0_features."pkg-config".self_buildtime_bindgen = hasFeature (libsqlite3_sys_0_9_0_features."buildtime_bindgen" or {}); + libsqlite3_sys_0_9_0_features."vcpkg".self_buildtime_bindgen = hasFeature (libsqlite3_sys_0_9_0_features."buildtime_bindgen" or {}); + libsqlite3_sys_0_9_0_features."cc".self_bundled = hasFeature (libsqlite3_sys_0_9_0_features."bundled" or {}); + libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_8".self_default = hasDefault libsqlite3_sys_0_9_0_features; + libsqlite3_sys_0_9_0_features."pkg-config".self_min_sqlite_version_3_6_11 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_11" or {}); + libsqlite3_sys_0_9_0_features."vcpkg".self_min_sqlite_version_3_6_11 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_11" or {}); + libsqlite3_sys_0_9_0_features."pkg-config".self_min_sqlite_version_3_6_23 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_23" or {}); + libsqlite3_sys_0_9_0_features."vcpkg".self_min_sqlite_version_3_6_23 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_23" or {}); + libsqlite3_sys_0_9_0_features."pkg-config".self_min_sqlite_version_3_6_8 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_8" or {}); + libsqlite3_sys_0_9_0_features."vcpkg".self_min_sqlite_version_3_6_8 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_8" or {}); + libsqlite3_sys_0_9_0_features."pkg-config".self_min_sqlite_version_3_7_16 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_16" or {}); + libsqlite3_sys_0_9_0_features."vcpkg".self_min_sqlite_version_3_7_16 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_16" or {}); + libsqlite3_sys_0_9_0_features."pkg-config".self_min_sqlite_version_3_7_3 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_3" or {}); + libsqlite3_sys_0_9_0_features."vcpkg".self_min_sqlite_version_3_7_3 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_3" or {}); + libsqlite3_sys_0_9_0_features."pkg-config".self_min_sqlite_version_3_7_4 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_4" or {}); + libsqlite3_sys_0_9_0_features."vcpkg".self_min_sqlite_version_3_7_4 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_4" or {}); + linked_hash_map_0_4_2 = linked_hash_map_0_4_2_ rec { + dependencies = []; + features = mkFeatures linked_hash_map_0_4_2_features; + }; + linked_hash_map_0_4_2_features."heapsize".self_heapsize_impl = hasFeature (linked_hash_map_0_4_2_features."heapsize_impl" or {}); + linked_hash_map_0_4_2_features."serde".self_serde_impl = hasFeature (linked_hash_map_0_4_2_features."serde_impl" or {}); + linked_hash_map_0_4_2_features."serde_test".self_serde_impl = hasFeature (linked_hash_map_0_4_2_features."serde_impl" or {}); + clippy_0_0_0_features."default".from_linked_hash_map_0_4_2__default = true; + heapsize_0_0_0_features."default".from_linked_hash_map_0_4_2__default = true; + serde_0_0_0_features."default".from_linked_hash_map_0_4_2__default = true; + serde_test_0_0_0_features."default".from_linked_hash_map_0_4_2__default = true; + log_0_3_8 = log_0_3_8_ rec { + features = mkFeatures log_0_3_8_features; + }; + log_0_3_8_features."use_std".self_default = hasDefault log_0_3_8_features; + lru_cache_0_1_1 = lru_cache_0_1_1_ rec { + dependencies = [ linked_hash_map_0_4_2 ]; + features = mkFeatures lru_cache_0_1_1_features; + }; + lru_cache_0_1_1_features."heapsize".self_heapsize_impl = hasFeature (lru_cache_0_1_1_features."heapsize_impl" or {}); + heapsize_0_0_0_features."default".from_lru_cache_0_1_1__default = true; + linked_hash_map_0_4_2_features."heapsize_impl".from_lru_cache_0_1_1__heapsize_impl = hasFeature (lru_cache_0_1_1_features."heapsize_impl" or {}); + linked_hash_map_0_4_2_features."default".from_lru_cache_0_1_1__default = true; + memchr_1_0_2 = memchr_1_0_2_ rec { + dependencies = [ libc_0_2_33 ] + ++ (if lib.lists.any (x: x == "libc") features then [libc_0_2_33] else []); + features = mkFeatures memchr_1_0_2_features; + }; + memchr_1_0_2_features."".self = true; + memchr_1_0_2_features."use_std".self_default = hasDefault memchr_1_0_2_features; + memchr_1_0_2_features."libc".self_default = hasDefault memchr_1_0_2_features; + memchr_1_0_2_features."libc".self_use_std = hasFeature (memchr_1_0_2_features."use_std" or {}); + libc_0_2_33_features."use_std".from_memchr_1_0_2__use_std = hasFeature (memchr_1_0_2_features."use_std" or {}); + libc_0_2_33_features."default".from_memchr_1_0_2__default = false; + nom_3_2_1 = nom_3_2_1_ rec { + dependencies = [ memchr_1_0_2 ]; + features = mkFeatures nom_3_2_1_features; + }; + nom_3_2_1_features."std".self_default = hasDefault nom_3_2_1_features; + nom_3_2_1_features."stream".self_default = hasDefault nom_3_2_1_features; + nom_3_2_1_features."compiler_error".self_nightly = hasFeature (nom_3_2_1_features."nightly" or {}); + nom_3_2_1_features."regex".self_regexp = hasFeature (nom_3_2_1_features."regexp" or {}); + nom_3_2_1_features."regexp".self_regexp_macros = hasFeature (nom_3_2_1_features."regexp_macros" or {}); + nom_3_2_1_features."lazy_static".self_regexp_macros = hasFeature (nom_3_2_1_features."regexp_macros" or {}); + compiler_error_0_0_0_features."default".from_nom_3_2_1__default = true; + lazy_static_0_0_0_features."default".from_nom_3_2_1__default = true; + memchr_1_0_2_features."use_std".from_nom_3_2_1__std = hasFeature (nom_3_2_1_features."std" or {}); + memchr_1_0_2_features."default".from_nom_3_2_1__default = false; + regex_0_0_0_features."default".from_nom_3_2_1__default = true; + num_traits_0_1_40 = num_traits_0_1_40_ rec {}; + pkg_config_0_3_9 = pkg_config_0_3_9_ rec {}; + quote_0_3_15 = quote_0_3_15_ rec {}; + rand_0_3_18 = rand_0_3_18_ rec { + dependencies = [ libc_0_2_33 ] + ++ (if kernel == "fuchsia" then [ fuchsia_zircon_0_2_1 ] else []); + features = mkFeatures rand_0_3_18_features; + }; + rand_0_3_18_features."i128_support".self_nightly = hasFeature (rand_0_3_18_features."nightly" or {}); + libc_0_2_33_features."default".from_rand_0_3_18__default = true; + fuchsia_zircon_0_2_1_features."default".from_rand_0_3_18__default = true; + redox_syscall_0_1_32 = redox_syscall_0_1_32_ rec {}; + redox_termios_0_1_1 = redox_termios_0_1_1_ rec { + dependencies = [ redox_syscall_0_1_32 ]; + }; + redox_syscall_0_1_32_features."default".from_redox_termios_0_1_1__default = true; + regex_0_2_2 = regex_0_2_2_ rec { + dependencies = [ aho_corasick_0_6_3 memchr_1_0_2 regex_syntax_0_4_1 thread_local_0_3_4 utf8_ranges_1_0_0 ]; + features = mkFeatures regex_0_2_2_features; + }; + regex_0_2_2_features."simd".self_simd-accel = hasFeature (regex_0_2_2_features."simd-accel" or {}); + aho_corasick_0_6_3_features."default".from_regex_0_2_2__default = true; + memchr_1_0_2_features."default".from_regex_0_2_2__default = true; + regex_syntax_0_4_1_features."default".from_regex_0_2_2__default = true; + simd_0_0_0_features."default".from_regex_0_2_2__default = true; + thread_local_0_3_4_features."default".from_regex_0_2_2__default = true; + utf8_ranges_1_0_0_features."default".from_regex_0_2_2__default = true; + regex_syntax_0_4_1 = regex_syntax_0_4_1_ rec {}; + rusqlite_0_13_0 = rusqlite_0_13_0_ rec { + dependencies = [ bitflags_1_0_1 libsqlite3_sys_0_9_0 lru_cache_0_1_1 time_0_1_38 ]; + features = mkFeatures rusqlite_0_13_0_features; + }; + rusqlite_0_13_0_features."".self = true; + bitflags_1_0_1_features."default".from_rusqlite_0_13_0__default = true; + chrono_0_0_0_features."default".from_rusqlite_0_13_0__default = true; + libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_11".from_rusqlite_0_13_0__backup = hasFeature (rusqlite_0_13_0_features."backup" or {}); + libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_4".from_rusqlite_0_13_0__blob = hasFeature (rusqlite_0_13_0_features."blob" or {}); + libsqlite3_sys_0_9_0_features."buildtime_bindgen".from_rusqlite_0_13_0__buildtime_bindgen = hasFeature (rusqlite_0_13_0_features."buildtime_bindgen" or {}); + libsqlite3_sys_0_9_0_features."bundled".from_rusqlite_0_13_0__bundled = hasFeature (rusqlite_0_13_0_features."bundled" or {}); + libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_3".from_rusqlite_0_13_0__functions = hasFeature (rusqlite_0_13_0_features."functions" or {}); + libsqlite3_sys_0_9_0_features."sqlcipher".from_rusqlite_0_13_0__sqlcipher = hasFeature (rusqlite_0_13_0_features."sqlcipher" or {}); + libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_23".from_rusqlite_0_13_0__trace = hasFeature (rusqlite_0_13_0_features."trace" or {}); + libsqlite3_sys_0_9_0_features."default".from_rusqlite_0_13_0__default = true; + lru_cache_0_1_1_features."default".from_rusqlite_0_13_0__default = true; + serde_json_0_0_0_features."default".from_rusqlite_0_13_0__default = true; + time_0_1_38_features."default".from_rusqlite_0_13_0__default = true; + rustc_demangle_0_1_5 = rustc_demangle_0_1_5_ rec {}; + serde_1_0_21 = serde_1_0_21_ rec { + dependencies = []; + features = mkFeatures serde_1_0_21_features; + }; + serde_1_0_21_features."unstable".self_alloc = hasFeature (serde_1_0_21_features."alloc" or {}); + serde_1_0_21_features."std".self_default = hasDefault serde_1_0_21_features; + serde_1_0_21_features."serde_derive".self_derive = hasFeature (serde_1_0_21_features."derive" or {}); + serde_1_0_21_features."serde_derive".self_playground = hasFeature (serde_1_0_21_features."playground" or {}); + serde_derive_0_0_0_features."default".from_serde_1_0_21__default = true; + serde_derive_1_0_21 = serde_derive_1_0_21_ rec { + dependencies = [ quote_0_3_15 serde_derive_internals_0_17_0 syn_0_11_11 ]; + }; + quote_0_3_15_features."default".from_serde_derive_1_0_21__default = true; + serde_derive_internals_0_17_0_features."default".from_serde_derive_1_0_21__default = false; + syn_0_11_11_features."visit".from_serde_derive_1_0_21 = true; + syn_0_11_11_features."default".from_serde_derive_1_0_21__default = true; + serde_derive_internals_0_17_0 = serde_derive_internals_0_17_0_ rec { + dependencies = [ syn_0_11_11 synom_0_11_3 ]; + }; + syn_0_11_11_features."parsing".from_serde_derive_internals_0_17_0 = true; + syn_0_11_11_features."default".from_serde_derive_internals_0_17_0__default = false; + synom_0_11_3_features."default".from_serde_derive_internals_0_17_0__default = true; + serde_json_1_0_6 = serde_json_1_0_6_ rec { + dependencies = [ dtoa_0_4_2 itoa_0_3_4 num_traits_0_1_40 serde_1_0_21 ]; + features = mkFeatures serde_json_1_0_6_features; + }; + serde_json_1_0_6_features."linked-hash-map".self_preserve_order = hasFeature (serde_json_1_0_6_features."preserve_order" or {}); + dtoa_0_4_2_features."default".from_serde_json_1_0_6__default = true; + itoa_0_3_4_features."default".from_serde_json_1_0_6__default = true; + linked_hash_map_0_0_0_features."default".from_serde_json_1_0_6__default = true; + num_traits_0_1_40_features."default".from_serde_json_1_0_6__default = true; + serde_1_0_21_features."default".from_serde_json_1_0_6__default = true; + strsim_0_6_0 = strsim_0_6_0_ rec {}; + syn_0_11_11 = syn_0_11_11_ rec { + dependencies = [ quote_0_3_15 synom_0_11_3 unicode_xid_0_0_4 ] + ++ (if lib.lists.any (x: x == "quote") features then [quote_0_3_15] else []) ++ (if lib.lists.any (x: x == "synom") features then [synom_0_11_3] else []) ++ (if lib.lists.any (x: x == "unicode-xid") features then [unicode_xid_0_0_4] else []); + features = mkFeatures syn_0_11_11_features; + }; + syn_0_11_11_features."".self = true; + syn_0_11_11_features."parsing".self_default = hasDefault syn_0_11_11_features; + syn_0_11_11_features."printing".self_default = hasDefault syn_0_11_11_features; + syn_0_11_11_features."unicode-xid".self_parsing = hasFeature (syn_0_11_11_features."parsing" or {}); + syn_0_11_11_features."synom".self_parsing = hasFeature (syn_0_11_11_features."parsing" or {}); + syn_0_11_11_features."quote".self_printing = hasFeature (syn_0_11_11_features."printing" or {}); + quote_0_3_15_features."default".from_syn_0_11_11__default = true; + synom_0_11_3_features."default".from_syn_0_11_11__default = true; + unicode_xid_0_0_4_features."default".from_syn_0_11_11__default = true; + synom_0_11_3 = synom_0_11_3_ rec { + dependencies = [ unicode_xid_0_0_4 ]; + }; + unicode_xid_0_0_4_features."default".from_synom_0_11_3__default = true; + tempdir_0_3_5 = tempdir_0_3_5_ rec { + dependencies = [ rand_0_3_18 ]; + }; + rand_0_3_18_features."default".from_tempdir_0_3_5__default = true; + termion_1_5_1 = termion_1_5_1_ rec { + dependencies = (if !(kernel == "redox") then [ libc_0_2_33 ] else []) + ++ (if kernel == "redox" then [ redox_syscall_0_1_32 redox_termios_0_1_1 ] else []); + }; + libc_0_2_33_features."default".from_termion_1_5_1__default = true; + redox_syscall_0_1_32_features."default".from_termion_1_5_1__default = true; + redox_termios_0_1_1_features."default".from_termion_1_5_1__default = true; + textwrap_0_9_0 = textwrap_0_9_0_ rec { + dependencies = [ unicode_width_0_1_4 ]; + }; + hyphenation_0_0_0_features."default".from_textwrap_0_9_0__default = true; + term_size_0_0_0_features."default".from_textwrap_0_9_0__default = true; + unicode_width_0_1_4_features."default".from_textwrap_0_9_0__default = true; + thread_local_0_3_4 = thread_local_0_3_4_ rec { + dependencies = [ lazy_static_0_2_11 unreachable_1_0_0 ]; + }; + lazy_static_0_2_11_features."default".from_thread_local_0_3_4__default = true; + unreachable_1_0_0_features."default".from_thread_local_0_3_4__default = true; + time_0_1_38 = time_0_1_38_ rec { + dependencies = [ libc_0_2_33 ] + ++ (if kernel == "redox" then [ redox_syscall_0_1_32 ] else []) + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + }; + libc_0_2_33_features."default".from_time_0_1_38__default = true; + rustc_serialize_0_0_0_features."default".from_time_0_1_38__default = true; + redox_syscall_0_1_32_features."default".from_time_0_1_38__default = true; + kernel32_sys_0_2_2_features."default".from_time_0_1_38__default = true; + winapi_0_2_8_features."default".from_time_0_1_38__default = true; + toml_0_4_5 = toml_0_4_5_ rec { + dependencies = [ serde_1_0_21 ]; + }; + serde_1_0_21_features."default".from_toml_0_4_5__default = true; + unicode_width_0_1_4 = unicode_width_0_1_4_ rec { + features = mkFeatures unicode_width_0_1_4_features; + }; + unicode_width_0_1_4_features."".self = true; + unicode_xid_0_0_4 = unicode_xid_0_0_4_ rec { + features = mkFeatures unicode_xid_0_0_4_features; + }; + unicode_xid_0_0_4_features."".self = true; + unreachable_1_0_0 = unreachable_1_0_0_ rec { + dependencies = [ void_1_0_2 ]; + }; + void_1_0_2_features."default".from_unreachable_1_0_0__default = false; + utf8_ranges_1_0_0 = utf8_ranges_1_0_0_ rec {}; + vcpkg_0_2_2 = vcpkg_0_2_2_ rec {}; + vec_map_0_8_0 = vec_map_0_8_0_ rec { + dependencies = []; + features = mkFeatures vec_map_0_8_0_features; + }; + vec_map_0_8_0_features."serde".self_eders = hasFeature (vec_map_0_8_0_features."eders" or {}); + vec_map_0_8_0_features."serde_derive".self_eders = hasFeature (vec_map_0_8_0_features."eders" or {}); + serde_0_0_0_features."default".from_vec_map_0_8_0__default = true; + serde_derive_0_0_0_features."default".from_vec_map_0_8_0__default = true; + void_1_0_2 = void_1_0_2_ rec { + features = mkFeatures void_1_0_2_features; + }; + void_1_0_2_features."std".self_default = hasDefault void_1_0_2_features; + winapi_0_2_8 = winapi_0_2_8_ rec {}; + winapi_build_0_1_1 = winapi_build_0_1_1_ rec {}; +} diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix new file mode 100644 index 00000000000..c074d46a7f7 --- /dev/null +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -0,0 +1,10 @@ +{ pkgconfig, sqlite, openssl, ... }: + +{ + libsqlite3-sys = attrs: { + buildInputs = [ pkgconfig sqlite ]; + }; + openssl-sys = attrs: { + buildInputs = [ pkgconfig openssl ]; + }; +} diff --git a/pkgs/build-support/rust/fetchcrate.nix b/pkgs/build-support/rust/fetchcrate.nix new file mode 100644 index 00000000000..95dfd38b12a --- /dev/null +++ b/pkgs/build-support/rust/fetchcrate.nix @@ -0,0 +1,35 @@ +{ lib, fetchurl, unzip }: + +{ crateName +, version +, sha256 +, ... } @ args: + +lib.overrideDerivation (fetchurl ({ + + name = "${crateName}-${version}.tar.gz"; + url = "https://crates.io/api/v1/crates/${crateName}/${version}/download"; + recursiveHash = true; + + downloadToTemp = true; + + postFetch = + '' + export PATH=${unzip}/bin:$PATH + + unpackDir="$TMPDIR/unpack" + mkdir "$unpackDir" + cd "$unpackDir" + + renamed="$TMPDIR/${crateName}-${version}.tar.gz" + mv "$downloadedFile" "$renamed" + unpackFile "$renamed" + fn=$(cd "$unpackDir" && echo *) + if [ -f "$unpackDir/$fn" ]; then + mkdir $out + fi + mv "$unpackDir/$fn" "$out" + ''; +} // removeAttrs args [ "crateName" "version" ])) +# Hackety-hack: we actually need unzip hooks, too +(x: {nativeBuildInputs = x.nativeBuildInputs++ [unzip];}) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index baaa150b5a0..e31f513c666 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -60,21 +60,6 @@ rec { ''; # */ - createDeviceNodes = dev: - '' - mknod -m 666 ${dev}/null c 1 3 - mknod -m 666 ${dev}/zero c 1 5 - mknod -m 666 ${dev}/full c 1 7 - mknod -m 666 ${dev}/random c 1 8 - mknod -m 666 ${dev}/urandom c 1 9 - mknod -m 666 ${dev}/tty c 5 0 - mknod -m 666 ${dev}/ttyS0 c 4 64 - mknod ${dev}/rtc c 254 0 - . /sys/class/block/${hd}/uevent - mknod ${dev}/${hd} b $MAJOR $MINOR - ''; - - stage1Init = writeScript "vm-run-stage1" '' #! ${initrdUtils}/bin/ash -e @@ -109,8 +94,7 @@ rec { insmod $i done - mount -t tmpfs none /dev - ${createDeviceNodes "/dev"} + mount -t devtmpfs devtmpfs /dev ifconfig lo up @@ -302,7 +286,6 @@ rec { touch /mnt/.debug mkdir /mnt/proc /mnt/dev /mnt/sys - ${createDeviceNodes "/mnt/dev"} ''; @@ -353,7 +336,6 @@ rec { ${kmod}/bin/modprobe iso9660 ${kmod}/bin/modprobe ufs ${kmod}/bin/modprobe cramfs - mknod /dev/loop0 b 7 0 mkdir -p $out mkdir -p tmp @@ -377,8 +359,6 @@ rec { ${kmod}/bin/modprobe mtdblock ${kmod}/bin/modprobe jffs2 ${kmod}/bin/modprobe zlib - mknod /dev/mtd0 c 90 0 - mknod /dev/mtdblock0 b 31 0 mkdir -p $out mkdir -p tmp @@ -1980,22 +1960,22 @@ rec { }; debian8i386 = { - name = "debian-8.9-jessie-i386"; - fullName = "Debian 8.9 Jessie (i386)"; + name = "debian-8.10-jessie-i386"; + fullName = "Debian 8.10 Jessie (i386)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz; - sha256 = "3c78bdf3b693f2f37737c52d6a7718b3a545956f2a853da79f04a2d15541e811"; + sha256 = "b3aa33bfe0256f72b7aad07b6c714b790d9a20d86c1a448a6f36b35652a82ff0"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian8x86_64 = { - name = "debian-8.9-jessie-amd64"; - fullName = "Debian 8.9 Jessie (amd64)"; + name = "debian-8.10-jessie-amd64"; + fullName = "Debian 8.10 Jessie (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz; - sha256 = "0605589ae7a63c690f37bd2567dc12e02a2eb279d9dc200a7310072ad3593e53"; + sha256 = "689e77cdf5334a3fffa5ca504e8131ee9ec88a7616f12c9ea5a3d5ac3100a710"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index a1e90244f80..1951429fa90 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "zeal-${version}"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "zealdocs"; repo = "zeal"; rev = "v${version}"; - sha256 = "1mfcw843g4slr79bvidb5s88m7a3swr9by6srdn233b88j8mqwzl"; + sha256 = "14gm9n2zmqgig4nz5i3089dhn0a7c175g1szr0zg9yzr9j2hk0mr"; }; # while ads can be disabled from the user settings, by default they are not so @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; homepage = http://zealdocs.org/; license = licenses.gpl3; - maintainers = with maintainers; [ skeidel ]; + maintainers = with maintainers; [ skeidel peterhoeg ]; platforms = platforms.linux; }; } diff --git a/pkgs/data/documentation/zeal/remove_ads.patch b/pkgs/data/documentation/zeal/remove_ads.patch index 7f163376865..1c0b3c081f1 100644 --- a/pkgs/data/documentation/zeal/remove_ads.patch +++ b/pkgs/data/documentation/zeal/remove_ads.patch @@ -1,13 +1,16 @@ diff --git a/src/app/resources/browser/welcome.html b/src/app/resources/browser/welcome.html -index afe9e2a..490a0fb 100644 +index 22e6278..ec09771 100644 --- a/src/app/resources/browser/welcome.html +++ b/src/app/resources/browser/welcome.html -@@ -34,9 +34,6 @@ +@@ -35,12 +35,6 @@
--
-- +-
+-
+- +-
-

diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index d16a57dbc42..651b7cff226 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { doCheck = true; + # https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021 # https://bugzilla.gnome.org/show_bug.cgi?id=784236 # https://github.com/mesonbuild/meson/issues/1994 enableParallelBuilding = false; diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 3abd5c8c82a..6c523ebb4f1 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -3,11 +3,11 @@ , withContrib ? true }: let - versionPkg = "0.3.0" ; + versionPkg = "0.3.7" ; contrib = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ; - sha256 = "1s4yscisn9gsr692jmh4y5mz03012pv84cm7l5n51v83wc08fks0" ; + sha256 = "1w59ir9ij5bvvnxj6fb1rvzycfqa57i31wmpwawxbsb10bqwzyr6"; }; postInstallContrib = stdenv.lib.optionalString withContrib @@ -31,11 +31,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "1knf03r8a5sis7n8rw54flf1lxfbr3prywxb1czcdp6hsbcd1v1d"; + sha256 = "19nxyi39fn42sp38kl14a6pvbxq9wr8y405wx0zz7mqb77r0m0h5"; }; - patches = [ ./install-postiats-contrib.patch ]; - buildInputs = [ gmp ]; setupHook = with stdenv.lib; diff --git a/pkgs/development/compilers/ats2/install-postiats-contrib.patch b/pkgs/development/compilers/ats2/install-postiats-contrib.patch deleted file mode 100644 index cb280d028b5..00000000000 --- a/pkgs/development/compilers/ats2/install-postiats-contrib.patch +++ /dev/null @@ -1,19 +0,0 @@ -Install the parts of the contrib that have been moved to Postiats. -diff -Naur ATS2-Postiats-0.3.0-upstream/Makefile_dist ATS2-Postiats-0.3.0/Makefile_dist ---- ATS2-Postiats-0.3.0-upstream/Makefile_dist 2017-01-20 10:23:54.000000000 -0400 -+++ ATS2-Postiats-0.3.0/Makefile_dist 2017-01-21 13:14:27.614723335 -0400 -@@ -124,12 +124,12 @@ - cd "$(abs_top_srcdir)" && \ - $(MKDIR_P) $(PATSLIBHOME2)/bin && \ - if [ ! -d $(bindir2) ] ; then $(MKDIR_P) $(bindir2) ; fi && \ -- for x in share ccomp prelude libc libats ; do \ -+ for x in share ccomp prelude libc libats contrib atscntrb ; do \ - find "$$x" -type d -exec $(MKDIR_P) $(PATSLIBHOME2)/\{} \; -print; \ - done - - install_files_0: install_dirs ; \ -- for x in share ccomp/runtime prelude libc libats ; do \ -+ for x in share ccomp/runtime prelude libc libats contrib atscntrb ; do \ - cd "$(abs_top_srcdir)" && \ - $(INSTALL) -d $(PATSLIBHOME2)/"$$x" && \ - find "$$x" -type l -exec cp -d \{} $(PATSLIBHOME2)/\{} \; -print && \ diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 704d9d5be64..e646debd9d7 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -8,10 +8,10 @@ stdenv, fetchurl let s = rec { - version = "1.6"; - versionSuffix = ".0-0"; + version = "1.8.0"; + versionSuffix = ""; url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}${versionSuffix}.tar.gz"; - sha256 = "1a1w9yibi0rsr51bl7csnq6mr59x0934850kiabs80nr3sz05knb"; + sha256 = "0i58ngrr1vjyazirfmz0cgikglc02z1m0gcrsfw9awpi3ax8h21j"; name = "lazarus-${version}"; }; buildInputs = [ diff --git a/pkgs/development/compilers/mono/5.0.nix b/pkgs/development/compilers/mono/5.0.nix index 911ba0ae02a..d10d6e3e605 100644 --- a/pkgs/development/compilers/mono/5.0.nix +++ b/pkgs/development/compilers/mono/5.0.nix @@ -4,4 +4,5 @@ callPackage ./generic-cmake.nix (rec { inherit Foundation libobjc; version = "5.0.1.1"; sha256 = "064pgsmanpybpbhpam9jv9n8aicx6mlyb7a91yzh3kcksmqsxmj8"; + enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65820147 }) diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index af7ef8001d3..a65dad54661 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -2,12 +2,6 @@ let param = { - "8.4" = { - version = "20160529"; - rev = "a9e89f1d4246a787bf1d8873072077a319635c3e"; - sha256 = "14ng71p890q12xvsj00si2a3fjcbsap2gy0r8sxpw4zndnlq74wa"; - }; - "8.5" = { version = "20170512"; rev = "31eb050ae5ce57ab402db9726fb7cd945a0b4d03"; diff --git a/pkgs/development/coq-modules/bedrock/default.nix b/pkgs/development/coq-modules/bedrock/default.nix deleted file mode 100644 index fc3c16d0049..00000000000 --- a/pkgs/development/coq-modules/bedrock/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{stdenv, fetchurl, coq}: - -stdenv.mkDerivation rec { - - name = "coq-bedrock-${coq.coq-version}-${version}"; - version = "20140722"; - - src = fetchurl { - url = "http://plv.csail.mit.edu/bedrock/bedrock-${version}.tgz"; - sha256 = "0aaa98q42rsy9hpsxji21bqznizfvf6fplsw6jq42h06j0049k80"; - }; - - buildInputs = [ coq.ocaml coq.camlp5 ]; - propagatedBuildInputs = [ coq ]; - - enableParallelBuilding = true; - - 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 = '' - COQLIB=$out/lib/coq/${coq.coq-version}/ - mkdir -p $COQLIB/user-contrib/Bedrock - cp -pR src/* $COQLIB/user-contrib/Bedrock - ''; - - meta = with stdenv.lib; { - homepage = http://plv.csail.mit.edu/bedrock/; - description = "A library that turns Coq into a tool much like classical verification systems"; - maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - -} diff --git a/pkgs/development/coq-modules/contribs/all.nix b/pkgs/development/coq-modules/contribs/all.nix deleted file mode 100644 index d2ef82c5587..00000000000 --- a/pkgs/development/coq-modules/contribs/all.nix +++ /dev/null @@ -1,163 +0,0 @@ -{ -AACTactics = "0v18kf7xjys4g3z8m2sfiyipyn6mz75wxl2zgqk7nv1jr8i03min"; -ABP = "06cn70lbdivn1hxnlsqpiibq9nlwl6dggcn967q6n3nph37m4pdp"; -AILS = "1g0hc27kizrwm6x35j3w721cllfl4rvhiqifn3ljy868mwxwsiva"; -AMM11262 = "15rxr5bzyswxfznml4vij3pflqm3v2bl1xzg9m1p5gmd0385zh6l"; -ATBR = "1xfhc70m9qm51gwi7cls8znx37y5cp1m0wak1h0r51g1d2lxr7a6"; -Additions = "0bhl1wqbqigq0m6zj1yhdm5j0rsn75xy510kz9qy4dv5277wc7ab"; -Algebra = "061szlbg5zh5h0ksgmw34hqrvqy6794p3r1ijg0xi8mqa2wpbjd8"; -Angles = "1grqx88mibz4lg7k9ba89vpg4kwrm3s87wy0ls39i3d3wgx18n97"; -AreaMethod = "07d86p5xbnhbrily18hda0hymf3zx8yhw905plmrqyfbcc6x5531"; -Automata = "0g75gjdj79ysiq1pwqk658jxs2z1l8pk702iz69008vkjzbzkhvm"; -AxiomaticABP = "19x16dgsqyw2pflza8cgv29585a6yy3r8pz4z8ns3r7qhpp1449b"; -BDDs = "0s5a67w9v1lklph8dm4d9bkd6f9qzfb377gvisr3hslacn9ya8zy"; -Bertrand = "05i6xw9gi5ad78rsw5pfhiqllw9x4q4phfi4ddzlxpsgshiw7d0k"; -Buchberger = "1v7zi62ar4inncbcphalsyaggx8im02j81b0fnpvx2x3kyv2pr94"; -CCS = "1na7902k05z19a727wa7rz0dbf1fhcl53r4zxvcgvg5dasvwfc97"; -CFGV = "13gk597r9n2wcgcbhribsqrp9wb8mmr3qd4zbv2ig8469kng0j4m"; -CTLTCTL = "0il1hhizvd2zvh2bhjaa2f43q1qz5sjfdin00yx5l1a8867wjs05"; -CanonBDDs = "1l9yqj0dfqkq49acsy17cvz4rjj86wjbhsdbr4qw2qvn4shllc23"; -Cantor = "1ys81ivigsbsg5cfx9jvm0qprdwc3jm69xm3whq5v9b6skn958yp"; -CatsInZFC = "06rkhns5gz397mafxina52h9z35r0n5bpryk5yfja0kfiyjvp4cr"; -Checker = "0hvfmpy3w4jj4zi3bm9q2yy4361q0lg0znqa22n5l7hzvi28q796"; -Chinese = "191c1bcslxrjxcxvpcz0mzklrl1cwh0lzkd2nq5m0ch3vxar6rq4"; -Circuits = "1a091g5vvmg579mmbfbvhj0scv7zw4n5brmj8dmiwfayfscdh5vg"; -ClassicalRealizability = "1zgivy679rl3ay9mf5ahs0lzrwfg19pcmz5nqm9hq0dpfn9avd6a"; -CoLoR = "05x1drvvhrspj2wzh8v1abblmb9fxy0yx6gg9y4nldkc24widjr7"; -CoRN = "1wv8y67bm2072bd6i3gbvy4sc665sci5kzd1zwv9n2ffxzhy0l5j"; -Coalgebras = "1wzwadfii9mm11bifjbg6f23qbab1ix3valysgq2b4myxlnpwdfz"; -CoinductiveExamples = "1iw6jsxvshsmn52xac3dspkw8f95214f0dcx0y6gi13ln02h8njy"; -CoinductiveReals = "149nsygwlb80s2805qgn85a6mcp7rxifbicbr84l3nyzilfyr6lk"; -ConCaT = "0537r0lamfz657llarxjl030qw29dnya7rb73kx0bdbyphxszr71"; -ConstructiveGeometry = "0cfz64yciyma6jrskc37md4mnv2vbx9hw7y69vyxzy7xdax55j64"; -Containers = "07pjbnzhh418ypppvfkls2x0ycslgl274a913xwi3rb1wrg6q84g"; -Continuations = "0l35xl9kvmq8l9gx3rmcx11p22inw76m1s18y0dnhc6qnhhkq1qg"; -CoqInCoq = "0d5m71xq66rfaa6xr51bsv9hykzfv4dwpclxpnqc7a7ss1q9ccqz"; -Coqoban = "1xp6wblg31asbqbkvbha94lbzn6xnhl0v5y0f3qh4nbmv6hslc54"; -Counting = "150la62c1j4yg8myr7nrp1qwp4z15rfg788j9vraz5q6f2n8c8ph"; -CoursDeCoq = "1qgc03ngzyd138s2cmcwrwrmyq0lf3z3vwhiaq5p371al34fk0d9"; -#Dblib = "00704xi5348fbw9bc0cy5bqx5w4a7aqwpcwdd3740i15ihk60mrl"; -Demos = "0j5ndysvhsj57971yz7xz5mmnzwymgigr3b9mr6nh9iids98g9vy"; -DescenteInfinie = "0is6kclxhfd9n4sdpfkzm4kcc740ifkylg11b8z90frwq79a8yzb"; -Dictionaries = "13zhjvgl20f0hj2pp0zkczm9pwdgh174248jgbqj87rn5alyr2iy"; -DistributedReferenceCounting = "1kw6fb7rvkkrh5rz1839jwf9hrpnrsdnhjlpx3634d5a5kbbdj6a"; -DomainTheory = "1g39bgyxfj9r51vrmrxhrq1xqr36j5q8x0zgz2a12b0k3fj8bswn"; -Ergo = "0xkza35n3f05gkfywaisnis70zsrkh1kwq5idsb2k0rw8m4hq9ki"; -EuclideanGeometry = "11n8877zksgksdfcj7arjx0zcfhsrvg83lcp6yb2bynvfp80gyzb"; -EulerFormula = "1nhh49rf6wza2m5qmz5l5m24m299qn3v80wqzvf51lybadzll2h6"; -ExactRealArithmetic = "1p32g13sx2z5rj3q6390ym8902gvl5x16wdhgz5i75y44s6kmkb1"; -Exceptions = "0w2b16nr80f70dxllmhbqwfr1aw26rcfbak5bdyc0fna8hqp4q3p"; -FOUnify = "1vwp5rwvs5ng4d13l9jjh4iljasfqmc5jpla8rga4v968bp84nw6"; -FSSecModel = "0fi78vqfrw4vrmdw215ic08rw8y6aia901wqs4f1s9z2idd6m8qy"; -FSets = "1n54s2vr6snh31jnvr79q951vyk0w0w6jrnwnlz9d3vyw47la9js"; -Fairisle = "0gg9x69qr0zflaryniqnl8d34kjdij0i55fcb1f1i5hmrwn2sqn6"; -Fermat4 = "0d5lkkrw3vqw6dip1mrgn8imq861xaipirzwpd35jgdkamds802v"; -FingerTree = "1kzfv97mc9sbprgg76lb5lk71gr4a5q10q8yaj57qw3m5hvmdhmw"; -FiringSquad = "0y2dy75j97x0592dxcbcd00ffwnf61f92yiap68xszv3dixl9i9x"; -Float = "1xmskkfd9w3j0bynlmadsrv997988k17bcs0r3zxaazm7vvw2sci"; -FreeGroups = "00pskmp0kfnnafldzcw8vak5v2n0nsjl9pfbw8qkj1xzzbvym2wk"; -FunctionsInZFC = "1vfs27m5f2cx0q2qjlxj3nim1bv53mk241pqz9mpj4plcj0g838l"; -FundamentalArithmetics = "1vvgl5c7rcg3bxizcjdix0fn20vdqy73ixcvm714llb8p986lan5"; -GC = "11kwn43nm58bv7v3p8xg2ih4x0gvgigz26gzh8l8w3lgmriqmzx0"; -GenericEnvironments = "1w05ysx0rl17fgxq3fc0p7p3h70c94qxa6yq88ppyhwm1cqqgihw"; -Goedel = "0b1dfmxp9q5z2l59yz5bn37m0zz4307kq94a7fs8s0lbbwrgyhrf"; -GraphBasics = "1f2bsfkhlyzjvy6ln62sf6hpy9dh8azrnlfpjq6jn667nfb7cbf6"; -Graphs = "0smhsas27llkmfkn4vs8ygb9w19ci2q4ps0f2q969xv8n8n0bj4z"; -GroupTheory = "141w3zbf7jczbk1lrpz6dnpk8yh1vr4f7kw55siawwaai11bh7c1"; -Groups = "00zmn1q9lz7dz8p5wk34svwki9xwn62xkgnhw4bcx8awlbx1pw3a"; -Hardware = "1bp9bnvlv54ksngmgzyxaqw1idxw5snmwrcifqcd6088w6hd9w1n"; -Hedges = "1abbf8v0i8akmhbi2hmb1l9wxvql275c9mxf0r5lzxigwmf0qrbv"; -HighSchoolGeometry = "09n70n0sb1dxnss9xz7xj2z1070gzxs4ap1h0kjcrfkiqss11fpy"; -HigmanCF = "05qg4ci8bvd6s9nmj80imj3b9kfwy4xzfy8ckr5870505mkzxyxv"; -HigmanNW = "0i3mmyh20iib7pglalf4l2p62qyqa6w0mz557n53aa2zx6l0dw18"; -HigmanS = "1c9db1jrpwzqw0arsiljskx3pcxpc1flkdql87fn55lgypbfz5gk"; -HistoricalExamples = "16alm4cv9hj59jyn1rnmb1dnbwp488wpzbnkq6hrnl5drr78gx08"; -HoareTut = "1mazqhb0hclknnzbr4ka1aafkk36hl6n4vixkf5kfvyymr094d0a"; -Huffman = "1h14qdbmawjn9hw813hsywxz0az80nx620rr35mb9wg8hy4xw7jj"; -IEEE754 = "06xrpzg2q9x2bzm7h16k0czm56sgsdn1rxpdgcl44743q3mvpi5p"; -IPC = "1xcgrln8nn2h98qyqz36d0zszjs33kcclv9vamz8mc163agk6jxy"; -IZF = "12inbpihh35hbrh4prs93r4avxlgsj5019n7bndi4fgn09m839bm"; -Icharate = "0giak87mv7g0312i05r7v06wb8wmfkrd2ai54r4c80497f72d17l"; -IdxAssoc = "0gdaxnwyw8phi97izx0wfbpccql73yjdzqqygc4i6nfw4lwanx38"; -IntMap = "1zmlcqv2mz488vpxa6iwbi6sqcljkmb55mywb5pabjjwjj745jhx"; -JProver = "0vz07sclzx0izwm5klwmd0amxhzqly6aknh876vvh3033jp62ik0"; -JordanCurveTheorem = "0varv6ib4f0l3jjq71rafb071ivzcnyxjb5ri8bf6vbjl4fqr335"; -Karatsuba = "02190l3dl0k6qxi3djr2imy4h31kcr5kj94l2ys3xqg1kjjajcmj"; -Kildall = "0lbby3gd3pwivkhr6v8c73915cswmvh50nj3ch10f0zix8lsxrpa"; -LTL = "0bk4232pa6mkbmxjazknfbnmzh2pcjccr68dkf8a2ndd06yfaii1"; -Lambda = "1wy9r95acwf7srs54y5kgmgl9d48j8b871n4z26xpbhdi2pvv9a4"; -Lambek = "0f6nd3fsxsaij9wypwd3cxmgn3larkxg4xww9c0yvjqxpgc5s552"; -LesniewskiMereology = "11wgw93fxwnbvwmpnscvgg9caakhr3wbvqwzqkk1p8wfslpvf7pj"; -LinAlg = "0gl081rx0iikhaghjny3g04aaqgiv0wq6r6c34qpcr5jc6i40mdr"; -MapleMode = "0a50dx473mmg7ksmghbjqs2rg4334dqdd2rkydicw8fl406z19ab"; -Markov = "06aacr8ghycjm68r36hip4rjhwfnbz7az2k8pa92pakjm0am78lq"; -MathClasses = "1gj6dznlc2ma5b5qn9mlinavlrl4xq18dilzd0l9j8jrxfdk1q7n"; -Maths = "15qbv7dxj4ygmw38gnmyf2kwdmy75a21yf991c8lw6fzx334b4dv"; -Matrices = "1q3683xvsgjqlav6kfxx7y05lvr5gp60hpbx4ypwa0hsl6w14mn0"; -#Micromega = "0h2ybdlbdvy30l5kzkfvp5kwsf236fxd3xi87pl4pl3dzylzsbh4"; -MiniC = "1gg9jinay9i3jbsi8bbwxzr9584wycdadf02c5al5yv281ywjar0"; -MiniCompiler = "0yq0k8c0rp120pfssdwfpmz017vq2w8s0rzk9gls476gywjmdvgf"; -MiniML = "1fd4k6rzn5cr24d11dnyy9jp2wf3n8d8l7q7bxk94lbrj6lhrzw2"; -ModRed = "1khg29cm83npasxqlm13bv2w2kfkn9hrvf5q2wch9l1l4ghys4rk"; -Multiplier = "07bj7j4agq2cvhfbkwgrvg39jlzlj1mzlm0ykqjwljd7hi4f6yv9"; -MutualExclusion = "1j3fmf0zvnxg0yzj956jfpjqccnk9l2393q6as80a5gfqhlb3rcr"; -Nfix = "1mpn1fbx15naa2d5lbcxl88xsgp1p88xx4g94f8cjzhg6kdnz7cc"; -OrbStab = "06gg3d2f9qybs2c49mm7srzqx5r9dxail92bcxdi6lr0k74y75ml"; -OtwayRees = "1d39yxppnpzpn5yxdk6rinrgxwgsnr348cggyhwjmgyjm8mr9gcp"; -PAutomata = "0hlzvdi9kb291g36lgyy3vlpn7i8rphpwjisy3wh19j4yqqc7ddf"; -PTS = "12y9niiks4rzpvzzvgfwc1z37480c4l9nvsmh4wx6gsvpnjqvyl3"; -PTSATR = "10jsfbsdaiqrdgp9vnc84wwkxjyfin35kr1qckbax6599xgyk7vj"; -PTSF = "0yz7sh2d4ldcqblnvb96yyimsb4351qqjl8di1cy785mnxa1zfla"; -Paradoxes = "03b22vhkra038z3nfbv9wpbr63x984qyrfvrg58lwqq87s5kgv1d"; -ParamPi = "1p64yj2pqqvyx5b5xm0pv0pm9lqp7hc5hb3wjnwvzi3qchqf7hwi"; -PersistentUnionFind = "1ljdnsm6h3zfn43vla13ibx42kfvgmy6n9qyfn7cgkcw5yv4fh6m"; -PiCalc = "1af8ws86mqs55dldcpm7x4qhk11k0f8l88z2bv6hylfvy6fpbpiy"; -Pocklington = "18zx1ca3pn3vn763smmrnfi395007ddzicrr0cydrph6g4agdw3g"; -Presburger = "1n3nqrplgx1r2vvpcbp91l02c7zc297fkpsqgx1x1msqrldnac9y"; -Prfx = "1nyh134hlh6cdxpys9kv0ngiiibgigh2mifwf8rdz6aj6xj7dgyv"; -ProjectiveGeometry = "01x409rbh3rqxyz53v0kdixnqqv7b890va04a21862g8bml7ls6k"; -QArith = "0xvkw3d3kgiyw6b255f6zbkali1023a9wmn12ga3bgak24jsa8lg"; -QArithSternBrocot = "1kvzww76nxgq7b3b3v2wrjxaxskfrzk55zpg6mj1jjcpgydfqwjr"; -QuicksortComplexity = "0c5gj65rxnxydspc4jqq20c8v9mjbnjrkjkk220yxymbv5n3nqd1"; -RSA = "0b56ipivbbdwc0w7bp4v4lwl0fhhb73k2b62ybmb3x7alc599mc0"; -RailroadCrossing = "0z5cnw1d8jbg30lc9p1hsgrnjwjc4yhpxl74m2pcjscrrnr01zsf"; -Ramsey = "0sd3cihzfx7mn7wcsng15y4jqvp1ql49fy1ch997wfbchp6515ld"; -Random = "0b7gwz38fbk9j5sfa76c2n4781kcb18r65v9vzz8qigx37gm89w4"; -Rational = "0v1zjcf22ij9daxharmaavwp2msgl77y5ad46lskshpypd1ysrsc"; -RecursiveDefinition = "1y4gy2ksxkvmz16zrnblwd1axi7gdjw171n8xfw4f8400my1qhm0"; -ReflexiveFirstOrder = "156a6kmds25kc645w6kkhn3a4bvryp307b76ghz5m5wv2wsajgrn"; -RegExp = "0gya2kckr6325hykd12vwpbwwf7cf04yyjrr2dvmcc81dkygrwxb"; -RelationAlgebra = "1nrhkvypkk7k48gb18c2q9cwbgy02ldfg6s3j74f5rgff1i6c9in"; -RelationExtraction = "1g6hvmsfal17pppqf9v8zh2i1dph0lj5a1r3xiszqr4biiig09ch"; -ReleasedSsreflect = "17wirznfsizmw6gjb54vk9bp97a3bc1l2sb4gdxfbzvxmabx1a9l"; -Rem = "03559q60ibf4dr1np82341xfrw134d27dx8dim84q9fszr4gy8sx"; -RulerCompassGeometry = "02vm80xvvw22pdxrag3pv5zrhqf8726i9jqsiv4bnjqavj5z2hdr"; -SMC = "0ca3ar1y9nyj5147r18babqsbg2q2ywws8fdi91xb5z9m3i97nv1"; -Schroeder = "0mfbjmw4a48758k88yv01494wnywcp5yamkl394axvvbbna9h8b6"; -SearchTrees = "1jyps6ddm8klmxjm50p2j9i014ij7imy3229pwz3dkzg54gxzzxb"; -Semantics = "157db1y5zgxs9shl7rmqg89gxfa4cqxwlf6qys0jh3j0wsxs8580"; -Shuffle = "14v1m4s9k49w30xrnyncjzgqjcckiga8wd2vnnzy8axrwr9zq7iq"; -SquareMatrices = "07dlykg3w59crc54qqdqxq6hf8rmzvwwfr1g8z8v2l8h4yvfnhfl"; -Ssreflect = "07hv0ixv68d8vrpf9s6gxazxaz5fwpmhqrd6cqw7xp8m8gspxifz"; -Stalmarck = "0vcbkzappq1si4hxbnb9bjkfk82j3jklb8g8ia83h1mdhzr7xdpz"; -Streams = "1spcqnvwayahk12fd13vzh922ypzrjkcmws9gcy12qdqp04h8bnc"; -String = "1wy7g66yq9y8m8y3gq29q7whfdm98g3cj9jxm5yibdzfahfdzzni"; -Subst = "1wxscjhz2y2jv5rdga80ldx2kc954sklip4jsbsd2fim5gwxzl23"; -Sudoku = "0f9h8gwzrdzk5j76nhvlnvpll81zar3pk84r2bf1xfav4yvj8sj7"; -SumOfTwoSquare = "1lxf9wdmvpi0vz4d21p6v9h2vvkk9v8113mvr2cdxd0j43l4ra18"; -Tait = "0bwxl894isndwadbbc3664j51haj3c0i57zmmycnxmhnmsx5pnjj"; -TarskiGeometry = "1vkznrjla943wcyddzyq0pqraiklgn62n1720msxp7cs13ckzpy0"; -ThreeGap = "01nj27xs348126ynsnva1jnvk0nin61xzyi6hwcybj5n46r7nlcv"; -Topology = "1kchddfiksjnkvwdr2ffpqcvmqkd6gf359r09yngf340sa15p5wk"; -TortoiseHareAlgorithm = "1ldm1z48j59lxz60szpy64d0928j4fmygp5npfksvwkvghijchq8"; -TreeAutomata = "0jzfa6rxv7lw1nzrqaxv08h9mpyvc2g4cbdc09ncyhazincrix0z"; -TreeDiameter = "0xdansrbmxrwicvqjjr9ivgs0255nd4ic6jkfv37m1c10vxcjq2n"; -WeakUpTo = "1baaapciaqhyjx8bqa4l04l1vwycyy1bvjr2arrc9myqacifmnpp"; -ZChinese = "0v7gffmcj9yazbbssb2i2iha1dr82b4bl8df9g021s40da49k09k"; -ZF = "0am15lgpn127pzx6ghm76axy75w7m9a8wqa26msgkczjk4x497ni"; -ZFC = "0s11g9rzacng2xg9ygx9lxyqv2apxyirnf7cg3iz95531n46ppn2"; -ZSearchTrees = "1lh6jlzm53jnsg91aa60f6gir6bsx77hg8xwl24771jg8a9b9mcl"; -ZornsLemma = "0dxizjfjx4qsdwc60k6k9fnq8hj4m13vi0llsv9xk3lj3izhpil1"; -lazyPCF = "0wzpv41nv3gdd07g9pr7wydfjv1wxz8kylzmyn07ab38kahhhzh9"; -lc = "05zr0y2ivznmf1ijszq249v4rw6kvdx6jz4s2hhnaiqvx35g4cqg"; -} diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix deleted file mode 100644 index 289a4d75921..00000000000 --- a/pkgs/development/coq-modules/contribs/default.nix +++ /dev/null @@ -1,261 +0,0 @@ -contribs: - -let - mkContrib = import ./mk-contrib.nix; - all = import ./all.nix; - overrides = { - Additions = self: { - patchPhase = '' - for p in binary_strat dicho_strat generation log2_implementation shift - do - substituteInPlace $p.v \ - --replace 'Require Import Euclid.' 'Require Import Coq.Arith.Euclid.' - done - ''; - }; - BDDs = self: { - buildInputs = self.buildInputs ++ [ contribs.IntMap ]; - patchPhase = '' - patch Make < -custom "\$(CAMLOPTLINK) -pp 'camlp5o' -o unif unif.mli unif.ml main.ml" unif.ml unif - EOF - coq_makefile -f Make -o Makefile - ''; - postInstall = '' - mkdir -p $out/bin - cp unif $out/bin/ - ''; - }; - Goedel = self: { - buildInputs = self.buildInputs ++ [ contribs.Pocklington ]; - patchPhase = '' - patch Make < interp.mli - EOF - ''; - configurePhase = '' - coq_makefile -f Make -o Makefile - make extract_interpret.vo - rm -f str_little.ml.d - ''; - }; - SMC = self: { - buildInputs = self.buildInputs ++ [ contribs.IntMap ]; - patchPhase = '' - patch Make < -R . CoqEAL - EOF - ''; - - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; - - meta = with stdenv.lib; { - homepage = http://www.maximedenes.fr/content/coqeal-coq-effective-algebra-library; - description = "A Coq library for effective algebra, by which is meant formally verified computer algebra algorithms that can be run inside Coq on concrete inputs"; - maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - -} diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index 84f95d4ddea..7f5111462bd 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -1,27 +1,11 @@ { stdenv, fetchurl, which, coq, ssreflect }: -let param = - let - v2_1_1 = { - version = "2.1.1"; - url = https://gforge.inria.fr/frs/download.php/file/35429/coquelicot-2.1.1.tar.gz; - sha256 = "1wxds73h26q03r2xiw8shplh97rsbim2i2s0r7af0fa490bp44km"; - }; - v3_0_1 = { - version = "3.0.1"; +stdenv.mkDerivation { + name = "coq${coq.coq-version}-coquelicot-3.0.1"; + src = fetchurl { url = "https://gforge.inria.fr/frs/download.php/file/37045/coquelicot-3.0.1.tar.gz"; sha256 = "0hsyhsy2lwqxxx2r8xgi5csmirss42lp9bkb9yy35mnya0w78c8r"; }; - in { - "8.4" = v2_1_1; - "8.5" = v3_0_1; - "8.6" = v3_0_1; - "8.7" = v3_0_1; -}."${coq.coq-version}"; in - -stdenv.mkDerivation { - name = "coq${coq.coq-version}-coquelicot-${param.version}"; - src = fetchurl { inherit (param) url sha256; }; nativeBuildInputs = [ which ]; buildInputs = [ coq ]; diff --git a/pkgs/development/coq-modules/domains/darcs_context b/pkgs/development/coq-modules/domains/darcs_context deleted file mode 100644 index 5dac711c0c0..00000000000 --- a/pkgs/development/coq-modules/domains/darcs_context +++ /dev/null @@ -1,809 +0,0 @@ - -Context: - -[additional facts about limits on cuts -robdockins@fastmail.fm**20140818025955 - Ignore-this: 6f9c952db425df6ae9d2a14139a8a3d1 -] - -[work on limits -robdockins@fastmail.fm**20140817221707 - Ignore-this: 9811e0cd669b48f3beb7a56d47cbe3c3 -] - -[finish proving that Q field ops commute with injq -robdockins@fastmail.fm**20140817060600 - Ignore-this: a1f6c62b39983e6f6f01d28aca5f8534 -] - -[split up realdom.v and perform associated code motion -robdockins@fastmail.fm**20140817030034 - Ignore-this: 24c74cd459d2ab15dcd3d83ba06f7081 -] - -[recip is canonical and converges -robdockins@fastmail.fm**20140725211947 - Ignore-this: c100dbd94114cca9576b2a3f46c9ddc7 -] - -[improve the proof that 1 is a unit for multiplication -robdockins@fastmail.fm**20140724150124 - Ignore-this: c5ec976f8a9858a7ba1f704b4e84d02e -] - -[complete proof the interval multiplication converges; other minor stuff -robdockins@fastmail.fm**20140724015132 - Ignore-this: bc717baa4c8f9ec31b821c5cfae5b499 -] - -[further progress in realdom.v -robdockins@fastmail.fm**20140723004023 - Ignore-this: f33e18d22ae69c9b6209e28151d18017 -] - -[unmessify rational_intervals patch -robdockins@fastmail.fm**20140721123718 - Ignore-this: 4a125b192a9964a508a1063845e9f160 -] - -[messy updates to rational_intervals.v -robdockins@fastmail.fm**20140721015810 - Ignore-this: 858dac9c55426167c6f397a71ef3fda5 -] - -[implicit arguments for "fixes" -robdockins@fastmail.fm**20140721015739 - Ignore-this: 229ecdd48265fc855319141e399bc522 -] - -[metadata -robdockins@fastmail.fm**20140714201441 - Ignore-this: aa16faaf09c1c404bdc6eaf0d0c39912 -] - -[further beautification -robdockins@fastmail.fm**20140714200516 - Ignore-this: 47d74c51d9fe130a5ac12706b1ddb1d4 -] - -[start working on the recripricol function -robdockins@fastmail.fm**20140714180055 - Ignore-this: c7f93cea17f46daa78a1ea14e86dfcaf -] - -[tweaks to the lambda models -robdockins@fastmail.fm**20140714180031 - Ignore-this: 219788fe70f42f0f6e60176cab464f19 -] - -[beauty edits in st_lam* -robdockins@fastmail.fm**20140714180006 - Ignore-this: a40aa7ae00ed27595ee04073918bd028 -] - -[move stuff to rational_intervals.v / define real_mult and prove some properties -robdockins@fastmail.fm**20140712053232 - Ignore-this: 398c5c03aac9ff37526d4d7c9e1a82c0 -] - -[finish correctness proof for interval multiplication -robdockins@fastmail.fm**20140711191547 - Ignore-this: c9ab138a0ca43fe0b133b208419bbcc4 -] - -[break out facts about rational intervals -robdockins@fastmail.fm**20140711012320 - Ignore-this: b7fe6e9377629a89b5debe3019ae1aa -] - -[updates to ideal completion -robdockins@fastmail.fm**20140707053800 - Ignore-this: 90d1efbd0e5833d8c83f0df056d7a74c -] - -[a pile of additional properties in realdom.v -robdockins@fastmail.fm**20140707053519 - Ignore-this: 7edba1e72a1856f297ef11e698ed989f -] - -[some properties of converging prereals -robdockins@fastmail.fm**20140706041401 - Ignore-this: 273bfbb245302becd7ff402831827ffb -] - -[make realdom compile -robdockins@fastmail.fm**20140630015439 - Ignore-this: 8bfc8eaeed4a1596450b0bb9ddef9aaa -] - -[renaming -robdockins@fastmail.fm**20140630011639 - Ignore-this: a287e083af095790cbf2b48df7a58739 -] - -[reorganize some code -robdockins@fastmail.fm**20140630011446 - Ignore-this: f1375b9e7ad822cb92f0c83d4001eddd -] - -[build the retract for realdom -robdockins@fastmail.fm**20140630001245 - Ignore-this: 4eb9da621588417d1b7b2fc980c7bf70 -] - -[fill out lemmas about cPLT -robdockins@fastmail.fm**20140630001140 - Ignore-this: add9e45c14621e3d6328684098bf8461 -] - -[more facts about cPLT -robdockins@fastmail.fm**20140628073731 - Ignore-this: 101a131ed114902924a1707eff7ebc70 -] - -[continuous domains as retracts of bifinite domains -robdockins@fastmail.fm**20140628035522 - Ignore-this: 5e7c61d49cf8424412b0d94f5fcb5ee6 -] - -[start implementing arithmetic operations in RealDom -robdockins@fastmail.fm**20140620003249 - Ignore-this: c28479b8a933cba263765bdddb112264 -] - -[define the domain of rational intervals -robdockins@fastmail.fm**20140619040809 - Ignore-this: 6cbe1a9cc690e5a9d77f37ee299154b - this domain is useful for describing the semantics of exact real arithmetic. -] - -[show that every effective CUSL is Plotkin -robdockins@fastmail.fm**20140619034433 - Ignore-this: d529a4b1d6d698f79572caa805072394 -] - -[fix notation for octothorpe -robdockins@fastmail.fm**20140614222130 - Ignore-this: 3dc815825f11ceaf4f4f53e4668e6382 -] - -[fix for coq 8.4pl4 -robdockins@fastmail.fm**20140614222049 - Ignore-this: 9745904845aaf54e5569df982fc93d65 -] - -[move swelling lemma into finsets -robdockins@fastmail.fm**20140504080535 - Ignore-this: ffa560e9aa4e4f8b15a55c1f9b1da72e -] - -[documentation improvements and code motion -robdockins@fastmail.fm**20140504070008 - Ignore-this: da7847f82403990342732a8ce226315c -] - -[replace the old finprod -robdockins@fastmail.fm**20140504005534 - Ignore-this: 606cf44422f68d66c8d2d90049e67b93 -] - -[remove the old finprod -robdockins@fastmail.fm**20140504005137 - Ignore-this: 38bd54e16c87d27bbede08496c37bfba -] - -[update st_lam_fix to use the new finprod -robdockins@fastmail.fm**20140504003627 - Ignore-this: 95d0a66e99ccead89bdfef09a1c8c109 -] - -[update st_lam to use the new termmodel -robdockins@fastmail.fm**20140503230854 - Ignore-this: c3d6b2155674b414c5c2e14b85b13760 -] - -[new version of finprod with a better term model -robdockins@fastmail.fm**20140503222035 - Ignore-this: db63e3a063bdb6f2f579644c7b63bd1b -] - -[a few more (hopefully final) lemmas about union -robdockins@fastmail.fm**20140422223924 - Ignore-this: 7b95c75abef9b0d45863b5e33d1c5a37 -] - -[finish proofs about union -robdockins@fastmail.fm**20140422065034 - Ignore-this: 2929c3cdb013c028a48022b0293b2f18 -] - -[powerdomain progress -robdockins@fastmail.fm**20140421064325 - Ignore-this: 592f9c6046f05a27897b460edb2efe10 - Show that powerdomains are endofunctors on PLT. Further, they are monads with - the 'singleton' and 'join' operations. Also make some progress on the additive - portion of the theory, dealing with emptyset and union. -] - -[tweak makefile -robdockins@fastmail.fm**20140420031337 - Ignore-this: d5954b26f731bfed3d79cefacab322fb -] - -[show that semvalue is the weakest condition allowing beta-reduction of strict functions -robdockins@fastmail.fm**20140420020447 - Ignore-this: 16a7ed23f04879f1fb324bdac8a2ffaf -] - -[some additional operations relating to the PLT adjunction -robdockins@fastmail.fm**20140420020351 - Ignore-this: db8eec6e3f74cce3acb67d2b660b104e -] - -[finish building power domain fmap -robdockins@fastmail.fm**20140420020217 - Ignore-this: 556e1cb87576de36cb26f8add3a1b163 -] - -[fix up st_lam.v -robdockins@fastmail.fm**20140329015058 - Ignore-this: 1c31d674b759fbd0cc74fb3125579f96 -] - -[push some proofs into finprod -robdockins@fastmail.fm**20140329000401 - Ignore-this: 49070fdd951e49473e60d3cd0ec431c6 -] - -[documentation and aesthetic changeds -robdockins@fastmail.fm**20140327043141 - Ignore-this: be27b24b78ea6af722a307117e59f5b3 -] - -[finish the st_lam_fix example -robdockins@fastmail.fm**20140322011153 - Ignore-this: e702f564b6eab2f8c11ab16bcb62504b -] - -[clarafications re: countable choice; remove unfinished example from build order -robdockins@fastmail.fm**20140321212852 - Ignore-this: 2a9d5c79c05ba088e1815feab99a5f6c -] - -[break the "fixes" operator into a separate file and prove some facts about it -robdockins@fastmail.fm**20140318013247 - Ignore-this: 80c506cef0719a974a049a1f5870f676 -] - -[minor fix to skiy.v -robdockins@fastmail.fm**20140317054057 - Ignore-this: ffef6fcaf5fa7f8cea80d2808caf4f4c -] - -[add the fixpoint operator; admit proofs -robdockins@fastmail.fm**20140317044648 - Ignore-this: 97ca18e980cdf46a9b40c8252badef14 -] - -[remove the evaluation case for variables -robdockins@fastmail.fm**20140317032932 - Ignore-this: e46d634e735e5b21a18518a48777168d -] - -[start on STLC with fixpoints -- but without fixpoints for now -robdockins@fastmail.fm**20140317031953 - Ignore-this: 3458bc18c73d967bef58418bc73e06cb -] - -[add the eliminator for booleans to st_lam; other additional utility lemmas -robdockins@fastmail.fm**20140317031753 - Ignore-this: 369dd375755cbd9ae5e3c969f3ef6ec -] - -[some minor code motion -robdockins@fastmail.fm**20140228064927 - Ignore-this: 804828472ddb0c5fafc72460fce8387b -] - -[plug final holes in st_lam and add to build order -robdockins@fastmail.fm**20140228044729 - Ignore-this: 3edc7f36bfa97775ba33ffa27c80df59 -] - -[reduce st_lam.v to facts I believe about fresh variables -robdockins@fastmail.fm**20140228010832 - Ignore-this: bde3e73291ddd32337d6fb999e4b1c02 -] - -[fix breakages -robdockins@fastmail.fm**20140226073930 - Ignore-this: 9be54f5255f8ed9d53a79260e9bdf565 -] - -[more work on lambdas -robdockins@fastmail.fm**20140226043753 - Ignore-this: 7f7452670221e2643067a3c7cc180998 -] - -[use new finprod implementation -robdockins@fastmail.fm**20140226043700 - Ignore-this: c9e05df5fcfd31254ed7318fe693490c -] - -[remove old finprod -robdockins@fastmail.fm**20140226043642 - Ignore-this: 2705703a2c782da21a152fbb27c8a972 -] - -[rearrange the interfact to finprod -robdockins@fastmail.fm**20140226043541 - Ignore-this: c44d7c478948f42b188eb8d06469abbf -] - -[fill remaining holes in finprod2 -robdockins@fastmail.fm**20140225205242 - Ignore-this: 1eeb9b8beef92790c28918292f2a9cf4 -] - -[rework some stuff dealing with semidecidable predicates -robdockins@fastmail.fm**20140225092149 - Ignore-this: 32b5ccb2927e08979ea92b9ef67c40f4 -] - -[lots of work on alpha-congrunce in lambdas -robdockins@fastmail.fm**20140225035601 - Ignore-this: fbbec9dac4cb328ff4e0b25df646e0c7 -] - -[terminate is universal in PLT -robdockins@fastmail.fm**20140225035538 - Ignore-this: abc6cd1a60578c435bf9ca596d8d0922 -] - -[new attack on nominal finite products -robdockins@fastmail.fm**20140225035516 - Ignore-this: 3875e713acc6aa5193696612f3ede76d -] - -[push forward a little on lambdas -robdockins@fastmail.fm**20140221095249 - Ignore-this: c690a1b03075702e3fd84aac7e268211 -] - -[update finprod for various changes -robdockins@fastmail.fm**20140221095230 - Ignore-this: a6d787930ed356ae2b0a003af1f4d44 -] - -[better discrete cases lemma -robdockins@fastmail.fm**20140219051301 - Ignore-this: f0ec88e8207257e7657ced933cf687e7 -] - -[start working on simply-typed lambdas -robdockins@fastmail.fm**20140219051238 - Ignore-this: 69bea345376ea39cd1addc0849a43077 -] - -[more messing about with advanced category theory stuff -robdockins@fastmail.fm**20140211095003 - Ignore-this: 9cd3c9d961349e8797f109f716c5f678 -] - -[minor rearrangements and code motion -robdockins@fastmail.fm**20140211041724 - Ignore-this: 642ad6f1395fde7ecd81e5a905fd5428 -] - -[some basic bicategory theory -robdockins@fastmail.fm**20140210083634 - Ignore-this: f47a898fa045a397d3ee70e1512b8baa -] - -[even more notation futzing -robdockins@fastmail.fm**20140209072416 - Ignore-this: d2061652cb3e80f6994f567a9e677b32 -] - -[additional notational futzing -robdockins@fastmail.fm**20140209043308 - Ignore-this: ac42cbbc94df227e6d5e70b96ae65fd3 -] - -[futz around with notations, various other cleanup activities -robdockins@fastmail.fm**20140209005551 - Ignore-this: 3f41a52650aadd956ac490b62e59c1c3 -] - -[complete adequacy for SKI+Y -robdockins@fastmail.fm**20140206050414 - Ignore-this: f730587ac7a42f3e35740976a1439f2e -] - -[minor changes in cpo -robdockins@fastmail.fm**20140206014745 - Ignore-this: 95244704faf1e6c336d62dc7912f9022 -] - -[push through most of SKI+Y adequacy -robdockins@fastmail.fm**20140205214805 - Ignore-this: dc998ef45f2e919e9373bfa21a5ef8c7 -] - -[major simplification of the adequacy proof for SKI -robdockins@fastmail.fm**20140205185605 - Ignore-this: f1f0dc46274db05f3393038dfe2775e2 -] - -[push forward on SKI+Y -robdockins@fastmail.fm**20140205044216 - Ignore-this: daf255aa940b42c1c68ba947a356370d -] - -[continue futzing with the LR statement -robdockins@fastmail.fm**20140203055601 - Ignore-this: f5ef9f06d3b1a11d76317b52cec691ab -] - -[start pushing on adequacy for SKI+Y -robdockins@fastmail.fm**20140202085948 - Ignore-this: 956844809340fad0c13c19e9fa729b5c -] - -[mostly finish soundness for SKI+Y -robdockins@fastmail.fm**20140202060633 - Ignore-this: 4c75fd9eeefa1d6dad6866662abea0fd -] - -[start working on a CCL example -robdockins@fastmail.fm**20140202020748 - Ignore-this: 44c5d7854cc19b0f90414c2be6b3df68 -] - -[make id(A) a parsing-only notation -robdockins@fastmail.fm**20140202020724 - Ignore-this: 68f51f754c0b89e2e815da47b901e4b1 -] - -[the PLT adjunction is strong monodial -robdockins@fastmail.fm**20140202020637 - Ignore-this: 7b29b9a6a5e8efa07440c528ec12d7bd -] - -[fix my broken version of lfp and fixup proofs -robdockins@fastmail.fm**20140202020615 - Ignore-this: 3ac283481318622cbf38378e815a4f09 -] - -[more work on SKI + Y -robdockins@fastmail.fm**20140202020516 - Ignore-this: d1f63e2ef610c6f93d03806c5426cfa5 -] - -[start work on SKI + Y -robdockins@fastmail.fm**20140201085039 - Ignore-this: fb7a405830cf90526cddd8ce37f4da40 -] - -[doc corrections -robdockins@fastmail.fm**20140130015908 - Ignore-this: bca4c04267bfdac8cb202651a0960d92 -] - -[lots of additional inline documentation -robdockins@fastmail.fm**20140129234834 - Ignore-this: ab2c59add5514f44a898de1f0eece98b -] - -[powerdomains form continuous functors in EMBED -robdockins@fastmail.fm**20140126234115 - Ignore-this: d2ee08902f0bdb52efd7f7ce2c594469 -] - -[complete the powerdomain constructions; build some operations -robdockins@fastmail.fm**20140125225202 - Ignore-this: 9c8f2632df05e84fc3794a338ff8720d -] - -[construct the basic powerdomains--still some holes left -robdockins@fastmail.fm**20140125064541 - Ignore-this: c3206d2e1e925096b3e9ff49afacef2f -] - -[generalize the lfp construction to a generic chain_sup operation -robdockins@fastmail.fm**20140124183103 - Ignore-this: 4cc2c1011b9f79365dcb7c76784fbfa6 -] - -[update makefile -robdockins@fastmail.fm**20140124073734 - Ignore-this: a0b7db8383262caa314c21b99e146222 -] - -[new file for recursive lambda domains -robdockins@fastmail.fm**20140124070023 - Ignore-this: 300c02b4da83b6ebd734aa2ccb21cd2d -] - -[more lemmas about antistrict homs -robdockins@fastmail.fm**20140124065953 - Ignore-this: 483c7b350dc3cab59c8ff50e1ac73b8c -] - -[fix breakage related to implicit arguments -robdockins@fastmail.fm**20140124065805 - Ignore-this: 561693d3280851299c6a49a2a34546b3 -] - -[notation tweaks in cpo.v -robdockins@fastmail.fm**20140124053800 - Ignore-this: 83e92d8c14568448074a940ceafbe2c9 -] - -[add if/then/else to the SKI system -robdockins@fastmail.fm**20140124023630 - Ignore-this: 37a9737932a05393a6338380226ca346 -] - -[case analysis for finite types -robdockins@fastmail.fm**20140124012505 - Ignore-this: 6ec1076b2a74f5832501a105a28a6dba -] - -[finish adequacy proof for SKI -robdockins@fastmail.fm**20140123211322 - Ignore-this: 1fe3e626e33431c27e2aa186b3bf91d2 -] - -[additional lemmas about domains -robdockins@fastmail.fm**20140123090037 - Ignore-this: fcad2dd816f805b8b5e7d1be3df60db8 -] - -[most of a proof of adequacy for SKI -robdockins@fastmail.fm**20140123085839 - Ignore-this: d1595c02a6387297018e7f316a3e751 -] - -[more work on finite products -robdockins@fastmail.fm**20140121061158 - Ignore-this: c2f8212e041478104dd4c81c225b42d5 -] - -[begin work on a more flexible "finprod" domain -robdockins@fastmail.fm**20140119021653 - Ignore-this: 249718a2c31964733171b21c84d2effb -] - -[mess with implicit arguments in categories.v -robdockins@fastmail.fm**20140113041450 - Ignore-this: 314cad9207f706e949bd686aaa5c5e1b -] - -[products for CPO, uniformity of lfp -robdockins@fastmail.fm**20140113041421 - Ignore-this: e533abe995e634c732a35e71d66ddb6a -] - -[define the LFP in pointed CPOs, prove the Scott induction principle -robdockins@fastmail.fm**20140112231843 - Ignore-this: 2014174b1c6914bef376d614f34d073f -] - -[build the forgetful functor from EMBED to PLT -robdockins@fastmail.fm**20140110014909 - Ignore-this: 1dacbfc0383e48f4ab35fe0a5fd11cec -] - -[notation changes, prove sum_cases and curry preserve order and equality -robdockins@fastmail.fm**20140110014820 - Ignore-this: d1c6a1d0346a9eba14f3529ac30b5e2f -] - -[prove addl facts about pairs, tweak implicit arguments -robdockins@fastmail.fm**20140110010319 - Ignore-this: 9f0af8abc268b2b22d8b5450d6a4136 -] - -[make 'ob' a coercion -robdockins@fastmail.fm**20140110010204 - Ignore-this: 467c0b0a8b086a7f44bf98875a4380d6 -] - -[copyright notices -robdockins@fastmail.fm**20140106232333 - Ignore-this: f59bafa0ec99e259bd9b4319f2cdbc67 -] - -[add ord_dec coercion -robdockins@fastmail.fm**20140104052750 - Ignore-this: 4ed1cacfd27979f0fe518862be5ac27c -] - -[define the model for CBV lambda calculus -robdockins@fastmail.fm**20140104050626 - Ignore-this: 88ca796d4697bfebb044d3fae27d6129 -] - -[proof a fixpoint lemma for unpointed domains -robdockins@fastmail.fm**20140103231818 - Ignore-this: 4939eb02d09b6a4eecf145c887c64393 -] - -[prove that the adjoint functors between PLT and PPLT extend to continuous functors in EMBED -robdockins@fastmail.fm**20140103000915 - Ignore-this: 54da0101f581731ebe512ed514e0603e -] - -[notation changes for PLT -robdockins@fastmail.fm**20140102234446 - Ignore-this: ad1f82f22d1bf0e057f11c3508a81716 -] - -[move embeddings into their own file; pull TPLT and PPLT into profinite.v -robdockins@fastmail.fm**20140102234424 - Ignore-this: 3704996af47ae32415ba3e539d67cf5c -] - -[Show that PLT is cocartesian; rearrange proof that EMBED(true) is terminated -robdockins@fastmail.fm**20140102213805 - Ignore-this: 3470df6910e7a3e4bda478c0c6ecea62 -] - -[remove unnecessary "inh" hypothesis in the definition of Plotkin order; fixup the fallout -robdockins@fastmail.fm**20140102213646 - Ignore-this: b6a5ad59296f938b377d71852120d48b -] - -[move proofs that empty and unit preorders are effective plotkin -robdockins@fastmail.fm**20140102205530 - Ignore-this: 7324843510fd938d356aa82003c9ec68 -] - -[make epi/mono/iso morphisms into categories -robdockins@fastmail.fm**20131228082442 - Ignore-this: ee75a2b6eb1f3d6fa47f17d6734e5015 -] - -[define the cocartesian and distributive categories -robdockins@fastmail.fm**20131226001612 - Ignore-this: 11e9d8a88bef42bcb800b31d85d28d16 -] - -[remove uses of maximally implict arguments -robdockins@fastmail.fm**20131226001536 - Ignore-this: c0d93a5398aea58cbcc4fbbca3b59b17 -] - -[fixpoints and binary sums for NOMINAL -robdockins@fastmail.fm**20131121092931 - Ignore-this: 8a660dfe2ab16a8208ae559dcf2b7ed0 -] - -[modify bilimit.v to use the general construction from cont_functors.v -robdockins@fastmail.fm**20131120075848 - Ignore-this: 17ea36107ade1646eab5c99aec3561a9 -] - -[generic fixpoint construction for categories with initial objects and directed colimits -robdockins@fastmail.fm**20131119092522 - Ignore-this: 25674dff855a1cecdb4ee919f8bf3a5d -] - -[remove some irritating unit parameters, fix doc typos -robdockins@fastmail.fm**20131118093204 - Ignore-this: 38342d58567d8a13471620d5b7c2b7d4 -] - -[improvements to categories; complete some constructions in nominal -robdockins@fastmail.fm**20131118085737 - Ignore-this: e58cb49a01d0210dabdb021250910adb -] - -[build fixes -robdockins@fastmail.fm**20131113004305 - Ignore-this: 5abffcd1d6b44f816749c5e0cfd5b6e9 -] - -[Documentation additions -robdockins@fastmail.fm**20131113004254 - Ignore-this: 79a913d3a8652866f3fdc64891f6304d -] - -[lots of inline documentation additions -robdockins@fastmail.fm**20131112192736 - Ignore-this: 6aa38112c10ceed3bf43e35dbda98312 -] - -[update makefiles -robdockins@fastmail.fm**20131112192706 - Ignore-this: d834beaa532cdf994cfa0a0b5a562e4f -] - -[continuous functors for binary sum and products -robdockins@fastmail.fm**20131112192605 - Ignore-this: 61520e6e315df909465a02f854816366 -] - -[add the category of nominal types -robdockins@fastmail.fm**20131112192520 - Ignore-this: f0351c5eb0bdacdfe192a6863d9c0bc6 -] - -[split the proof that expF is a continuous functor into a separate file; rearrange some defintions -robdockins@fastmail.fm**20130924013328 - Ignore-this: 4eacee37bb6474d1bdfffe416b98b4c1 -] - -[rearrange definitions of continuous functors. Prove enough plumbing to build the model: D = D->D -robdockins@fastmail.fm**20130924002837 - Ignore-this: a66f9e8833601e244048b70e8bfaab96 -] - -[show that the function space is a continuous functor; other junk -robdockins@fastmail.fm**20130923060521 - Ignore-this: d8f406450688c633ebc1fe1eb0343c91 -] - -[some name changes, other cosmetic fixes -robdockins@fastmail.fm**20130909043234 - Ignore-this: cdd24d1c96a34fb3573c1806153df9fb -] - -[additional cosmetic changes and rearrangements -robdockins@fastmail.fm**20130909020137 - Ignore-this: 77d28bc9452f6c93915194033118dab7 -] - -[reorganize profinite code -robdockins@fastmail.fm**20130909011437 - Ignore-this: 8511bf92ca6998ff8c69d5537624bdb8 -] - -[cosmetic changes -robdockins@fastmail.fm**20130908183909 - Ignore-this: e19039701e58fd26ca4eab79d7b49d14 -] - -[complete the bilimit construction, show how to take fixpoints of continuous functors -robdockins@fastmail.fm**20130908175228 - Ignore-this: 82feab8fdc0c944f13d91605c6a8e571 -] - -[find a MUCH easier path to a bilimit construction -robdockins@fastmail.fm**20130907012151 - Ignore-this: fcc72ad140b045ef37e4b03ad38a8fb0 -] - -[lots of progress, mostly on defining bilimits -robdockins@fastmail.fm**20130905204959 - Ignore-this: abf4bcf03a49fa009f9fb2200ee3abf2 -] - -[start working on the theory of finite preorders, which form a basis for plokin orders -robdockins@fastmail.fm**20130812054451 - Ignore-this: 5be36257a8fdf486bcc31f587d93c457 -] - -[parameterize plotkin orders, build category PPLT -robdockins@fastmail.fm**20130811063623 - Ignore-this: 3f273841bc72098acee0fd618627dbd5 -] - -[complete the details showing PLT is cartesian closed -robdockins@fastmail.fm**20130809230336 - Ignore-this: 13fd1b5a8172dd263cf655421f7584f7 -] - -[add files missed in the first import -robdockins@fastmail.fm**20130809080742 - Ignore-this: 6b59cce866a486d70559f7c80fe99053 -] - -[initial import of development -robdockins@fastmail.fm**20130809080409 - Ignore-this: 44cb5a0df2f1643d289f07dcd4227cbf - First major steps toward a fully effective and usable formalized - domain theory. We formalize the plotkin preorders and show that - they form a cartesian closed category. -] diff --git a/pkgs/development/coq-modules/domains/default.nix b/pkgs/development/coq-modules/domains/default.nix deleted file mode 100644 index 975260c839b..00000000000 --- a/pkgs/development/coq-modules/domains/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{stdenv, fetchdarcs, coq}: - -stdenv.mkDerivation rec { - - name = "coq-domains-${coq.coq-version}-${version}"; - version = "ce1a9806"; - - src = fetchdarcs { - url = http://hub.darcs.net/rdockins/domains; - context = ./darcs_context; - sha256 = "0zdqiw08b453i8gdxwbk7nia2dv2r3pncmxsvgr0kva7f3dn1rnc"; - }; - - buildInputs = [ coq.ocaml coq.camlp5 ]; - propagatedBuildInputs = [ coq ]; - - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; - - meta = with stdenv.lib; { - homepage = http://rwd.rdockins.name/domains/; - description = "A Coq library for domain theory"; - maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - -} diff --git a/pkgs/development/coq-modules/fiat/default.nix b/pkgs/development/coq-modules/fiat/default.nix deleted file mode 100644 index e084497cbf8..00000000000 --- a/pkgs/development/coq-modules/fiat/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{stdenv, fetchurl, coq}: - -stdenv.mkDerivation rec { - - name = "coq-fiat-${coq.coq-version}-${version}"; - version = "20141031"; - - src = fetchurl { - url = "http://plv.csail.mit.edu/fiat/releases/fiat-${version}.tar.gz"; - sha256 = "0c5jrcgbpdj0gfzg2q4naqw7frf0xxs1f451fnic6airvpaj0d55"; - }; - - buildInputs = [ coq.ocaml coq.camlp5 ]; - propagatedBuildInputs = [ coq ]; - - enableParallelBuilding = false; - doCheck = !stdenv.isi686; - - unpackPhase = '' - mkdir fiat - cd fiat - tar xvzf ${src} - ''; - - buildPhase = "make -j$NIX_BUILD_CORES sources"; - checkPhase = "make -j$NIX_BUILD_CORES examples"; - - installPhase = '' - COQLIB=$out/lib/coq/${coq.coq-version}/ - mkdir -p $COQLIB/user-contrib/Fiat - cp -pR src/* $COQLIB/user-contrib/Fiat - ''; - - meta = with stdenv.lib; { - homepage = http://plv.csail.mit.edu/fiat/; - description = "A library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications"; - maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - -} diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index 683ab80b36b..5faf8093b15 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -1,24 +1,12 @@ { stdenv, fetchurl, which, coq, coquelicot, flocq, mathcomp , bignums ? null }: -let param = - if stdenv.lib.versionAtLeast coq.coq-version "8.5" - then { - version = "3.3.0"; - url = "https://gforge.inria.fr/frs/download.php/file/37077/interval-3.3.0.tar.gz"; - sha256 = "08fdcf3hbwqphglvwprvqzgkg0qbimpyhnqsgv3gac4y1ap0f903"; - } else { - version = "3.1.1"; - url = "https://gforge.inria.fr/frs/download.php/file/36723/interval-3.1.1.tar.gz"; - sha256 = "1sqsf075c7s98mwi291bhnrv5fgd7brrqrzx51747394hndlvfw3"; - }; -in - stdenv.mkDerivation { - name = "coq${coq.coq-version}-interval-${param.version}"; + name = "coq${coq.coq-version}-interval-3.3.0"; src = fetchurl { - inherit (param) url sha256; + url = "https://gforge.inria.fr/frs/download.php/file/37077/interval-3.3.0.tar.gz"; + sha256 = "08fdcf3hbwqphglvwprvqzgkg0qbimpyhnqsgv3gac4y1ap0f903"; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 48cb2c4d33f..79bced9ad0e 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -2,12 +2,6 @@ let param = { - "8.4" = { - version = "1.6.1"; - url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; - sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; - }; - "8.5" = { version = "1.6.1"; url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix index 35c23842158..3b53a2831e8 100644 --- a/pkgs/development/coq-modules/ssreflect/default.nix +++ b/pkgs/development/coq-modules/ssreflect/default.nix @@ -2,12 +2,6 @@ let param = { - "8.4" = { - version = "1.6.1"; - url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; - sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; - }; - "8.5" = { version = "1.6.1"; url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix deleted file mode 100644 index 2d30db5a80d..00000000000 --- a/pkgs/development/coq-modules/tlc/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{stdenv, fetchsvn, coq}: - -stdenv.mkDerivation { - - name = "coq-tlc-${coq.coq-version}"; - - src = fetchsvn { - url = svn://scm.gforge.inria.fr/svn/tlc/branches/v3.1; - rev = 240; - sha256 = "0mjnb6n9wzb13y2ix9cvd6irzd9d2gj8dcm2x71wgan0jcskxadm"; - }; - - buildInputs = [ coq.ocaml coq.camlp5 ]; - propagatedBuildInputs = [ coq ]; - - preConfigure = '' - patch Makefile < \$(COQC) -R . Tlc \$< - EOF - ''; - - installPhase = '' - COQLIB=$out/lib/coq/${coq.coq-version}/ - mkdir -p $COQLIB/user-contrib/Tlc - cp -p *.vo $COQLIB/user-contrib/Tlc - ''; - - meta = with stdenv.lib; { - homepage = http://www.chargueraud.org/softs/tlc/; - description = "A general purpose Coq library that provides an alternative to Coq's standard library"; - maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - -} diff --git a/pkgs/development/coq-modules/unimath/default.nix b/pkgs/development/coq-modules/unimath/default.nix deleted file mode 100644 index 8bd6cf5a84d..00000000000 --- a/pkgs/development/coq-modules/unimath/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{stdenv, fetchgit, coq}: - -stdenv.mkDerivation rec { - - name = "coq-unimath-${coq.coq-version}-${version}"; - version = "a2714eca"; - - src = fetchgit { - url = git://github.com/UniMath/UniMath.git; - rev = "a2714eca29444a595cd280ea961ec33d17712009"; - sha256 = "0v7dlyipr6bhwgp9v366nxdan018acafh13pachnjkgzzpsjnr7g"; - }; - - buildInputs = [ coq.ocaml coq.camlp5 ]; - propagatedBuildInputs = [ coq ]; - - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; - - meta = with stdenv.lib; { - homepage = https://github.com/UniMath/UniMath; - description = "A formalization of a substantial body of mathematics using the univalent point of view"; - maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - -} diff --git a/pkgs/development/coq-modules/ynot/default.nix b/pkgs/development/coq-modules/ynot/default.nix deleted file mode 100644 index d83e2c5c790..00000000000 --- a/pkgs/development/coq-modules/ynot/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, fetchgit, coq}: - -stdenv.mkDerivation rec { - - name = "coq-ynot-${coq.coq-version}-${version}"; - version = "ce1a9806"; - - src = fetchgit { - url = git://github.com/Ptival/ynot.git; - rev = "ce1a9806c26ffc6e7def41da50a9aac1433cb2f8"; - sha256 = "1pcmcl5zamiimkcg1xvynxnfbv439y02vg1mnz79hqq9mnjyfnpw"; - }; - - buildInputs = [ coq.ocaml coq.camlp5 ]; - propagatedBuildInputs = [ coq ]; - - preBuild = "cd src"; - - installPhase = '' - COQLIB=$out/lib/coq/${coq.coq-version}/ - mkdir -p $COQLIB/user-contrib/Ynot - cp -pR coq/*.vo $COQLIB/user-contrib/Ynot - ''; - - meta = with stdenv.lib; { - homepage = http://ynot.cs.harvard.edu/; - description = "A library for writing and verifying imperative programs"; - maintainers = with maintainers; [ jwiegley ]; - platforms = coq.meta.platforms; - }; - -} diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 59ae8533214..e807988f23f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -509,6 +509,21 @@ self: super: { preConfigure = "sed -i -e 's,time .* < 1.6,time >= 1.5,' -e 's,haddock-library >= 1.1 && < 1.3,haddock-library >= 1.1,' pandoc.cabal"; }); + # pandoc 2 dependency resolution + hslua_0_9_3 = super.hslua_0_9_3.override { lua5_1 = pkgs.lua5_3; }; + hslua-module-text = super.hslua-module-text.override { hslua = self.hslua_0_9_3; }; + texmath_0_10 = super.texmath_0_10.override { pandoc-types = self.pandoc-types_1_17_3; }; + pandoc_2_0_4 = super.pandoc_2_0_4.override { + doctemplates = self.doctemplates_0_2_1; + pandoc-types = self.pandoc-types_1_17_3; + skylighting = self.skylighting_0_4_4_1; + texmath = self.texmath_0_10; + }; + pandoc-citeproc_0_12_1 = super.pandoc-citeproc_0_12_1.override { + pandoc = self.pandoc_2_0_4; + pandoc-types = self.pandoc-types_1_17_3; + }; + # https://github.com/tych0/xcffib/issues/37 xcffib = dontCheck super.xcffib; @@ -984,4 +999,21 @@ self: super: { libraryToolDepends = drv.libraryToolDepends or [] ++ [pkgs.postgresql]; testToolDepends = drv.testToolDepends or [] ++ [pkgs.procps]; }); + + # Newer hpack's needs newer HUnit, but we cannot easily override the version + # used in the build, so we take the easy way out and disable the test suite. + hpack_0_20_0 = dontCheck super.hpack_0_20_0; + hpack_0_21_0 = dontCheck super.hpack_0_21_0; + + # Stack 1.6.1 needs newer versions than LTS-9 provides. + stack = super.stack.overrideScope (self: super: { + ansi-terminal = self.ansi-terminal_0_7_1_1; + ansi-wl-pprint = self.ansi-wl-pprint_0_6_8_1; + extra = dontCheck super.extra_1_6_2; + hpack = super.hpack_0_20_0; + path = dontCheck super.path_0_6_1; + path-io = self.path-io_1_3_3; + unliftio = self.unliftio_0_2_0_0; + }); + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 1c141dfaf75..f625ad5f656 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -62,4 +62,7 @@ self: super: { # This builds needs the latest Cabal version. cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_1; }); + # Add appropriate Cabal library to build this code. + stack = addSetupDepend super.stack self.Cabal_2_0_1_1; + } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c512bb0fcd8..46a220b1a3c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 9.16 + # LTS Haskell 9.17 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -1299,6 +1299,7 @@ default-package-overrides: - language-javascript ==0.6.0.10 - language-lua2 ==0.1.0.5 - language-puppet ==1.3.8.1 + - language-python ==0.5.4 - language-thrift ==0.10.0.0 - largeword ==1.2.5 - latex ==0.1.0.3 @@ -2271,8 +2272,8 @@ default-package-overrides: - union-find ==0.2 - uniplate ==1.6.12 - uniq-deep ==1.1.0.0 - - unique ==0 - Unique ==0.4.7.1 + - unique ==0 - unit-constraint ==0.0.0 - units ==2.4 - units-defs ==2.0.1.1 @@ -2538,7 +2539,8 @@ extra-packages: - haddock-library == 1.2.* # required for haddock-api-2.16.x - happy <1.19.6 # newer versions break Agda - haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support - - haskell-src-exts == 1.18.* # required by hoogle-5.0.4 + - haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode + - hpack == 0.20.* # required by stack-1.6.1 - language-c == 0.7.0 # required by c2hs hack to work around https://github.com/haskell/c2hs/issues/192. - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms @@ -2888,10 +2890,12 @@ dont-distribute-packages: angel: [ i686-linux, x86_64-linux, x86_64-darwin ] angle: [ i686-linux, x86_64-linux, x86_64-darwin ] Animas: [ i686-linux, x86_64-linux, x86_64-darwin ] + animate-example: [ i686-linux, x86_64-linux, x86_64-darwin ] animate: [ i686-linux, x86_64-linux, x86_64-darwin ] annah: [ i686-linux, x86_64-linux, x86_64-darwin ] Annotations: [ i686-linux, x86_64-linux, x86_64-darwin ] anonymous-sums-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + ansi-escape-codes: [ i686-linux, x86_64-linux, x86_64-darwin ] antagonist: [ i686-linux, x86_64-linux, x86_64-darwin ] antfarm: [ i686-linux, x86_64-linux, x86_64-darwin ] anticiv: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3455,6 +3459,7 @@ dont-distribute-packages: clash: [ i686-linux, x86_64-linux, x86_64-darwin ] ClassLaws: [ i686-linux, x86_64-linux, x86_64-darwin ] classy-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] + classyplate: [ i686-linux, x86_64-linux, x86_64-darwin ] ClassyPrelude: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-dot-com: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3610,6 +3615,7 @@ dont-distribute-packages: console-program: [ i686-linux, x86_64-linux, x86_64-darwin ] const-math-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] constrained-monads: [ i686-linux, x86_64-linux, x86_64-darwin ] + constraint: [ i686-linux, x86_64-linux, x86_64-darwin ] ConstraintKinds: [ i686-linux, x86_64-linux, x86_64-darwin ] constructive-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] consul-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3687,6 +3693,7 @@ dont-distribute-packages: craze: [ i686-linux, x86_64-linux, x86_64-darwin ] crc16: [ i686-linux, x86_64-linux, x86_64-darwin ] crc: [ i686-linux, x86_64-linux, x86_64-darwin ] + crdt: [ i686-linux, x86_64-linux, x86_64-darwin ] creatur: [ i686-linux, x86_64-linux, x86_64-darwin ] credential-store: [ i686-linux, x86_64-linux, x86_64-darwin ] credentials-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3943,6 +3950,7 @@ dont-distribute-packages: discordian-calendar: [ i686-linux, x86_64-linux, x86_64-darwin ] DiscussionSupportSystem: [ i686-linux, x86_64-linux, x86_64-darwin ] Dish: [ i686-linux, x86_64-linux, x86_64-darwin ] + disjoint-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] disjoint-set: [ i686-linux, x86_64-linux, x86_64-darwin ] diskhash: [ "x86_64-darwin" ] Dist: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3979,6 +3987,7 @@ dont-distribute-packages: doc-review: [ i686-linux, x86_64-linux, x86_64-darwin ] doccheck: [ i686-linux, x86_64-linux, x86_64-darwin ] docidx: [ i686-linux, x86_64-linux, x86_64-darwin ] + docker-build-cacher: [ i686-linux, x86_64-linux, x86_64-darwin ] docker: [ i686-linux, x86_64-linux, x86_64-darwin ] dockercook: [ i686-linux, x86_64-linux, x86_64-darwin ] doctest-discover-configurator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4090,6 +4099,7 @@ dont-distribute-packages: eigen: [ i686-linux, x86_64-linux, x86_64-darwin ] EitherT: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-log: [ i686-linux, x86_64-linux, x86_64-darwin ] + ekg-prometheus-adapter: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-push: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-rrd: [ i686-linux, x86_64-linux, x86_64-darwin ] elerea-examples: [ "x86_64-darwin" ] @@ -4290,6 +4300,7 @@ dont-distribute-packages: Finance-Treasury: [ i686-linux, x86_64-linux, x86_64-darwin ] find-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] FiniteMap: [ i686-linux, x86_64-linux, x86_64-darwin ] + firefly-example: [ i686-linux, x86_64-linux, x86_64-darwin ] first-and-last: [ i686-linux, x86_64-linux, x86_64-darwin ] firstify: [ i686-linux, x86_64-linux, x86_64-darwin ] FirstOrderTheory: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4331,6 +4342,8 @@ dont-distribute-packages: flower: [ i686-linux, x86_64-linux, x86_64-darwin ] flowlocks-framework: [ i686-linux, x86_64-linux, x86_64-darwin ] flowsim: [ i686-linux, x86_64-linux, x86_64-darwin ] + fluffy-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + fluffy: [ i686-linux, x86_64-linux, x86_64-darwin ] fluidsynth: [ i686-linux, x86_64-linux, x86_64-darwin ] FM-SBLEX: [ i686-linux, x86_64-linux, x86_64-darwin ] fmark: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5098,6 +5111,7 @@ dont-distribute-packages: heukarya: [ i686-linux, x86_64-linux, x86_64-darwin ] hevolisa-dph: [ i686-linux, x86_64-linux, x86_64-darwin ] hevolisa: [ i686-linux, x86_64-linux, x86_64-darwin ] + hexchat: [ i686-linux, x86_64-linux, x86_64-darwin ] hexif: [ i686-linux, x86_64-linux, x86_64-darwin ] hexml-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpat-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5262,6 +5276,7 @@ dont-distribute-packages: hobbes: [ i686-linux, x86_64-linux, x86_64-darwin ] hobbits: [ i686-linux, x86_64-linux, x86_64-darwin ] hocilib: [ i686-linux, x86_64-linux, x86_64-darwin ] + hocker: [ i686-linux, x86_64-linux, x86_64-darwin ] hodatime: [ i686-linux, x86_64-linux, x86_64-darwin ] HODE: [ i686-linux, x86_64-linux, x86_64-darwin ] Hoed: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5387,6 +5402,7 @@ dont-distribute-packages: hsbencher-codespeed: [ i686-linux, x86_64-linux, x86_64-darwin ] hsbencher-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] hsbencher: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-auditor: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-data: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-db: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5459,6 +5475,7 @@ dont-distribute-packages: hspec-jenkins: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-monad-control: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-pg-transact: [ i686-linux, x86_64-linux, x86_64-darwin ] + hspec-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-test-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5611,6 +5628,7 @@ dont-distribute-packages: idempotent: [ i686-linux, x86_64-linux, x86_64-darwin ] idiii: [ i686-linux, x86_64-linux, x86_64-darwin ] idna2008: [ i686-linux, x86_64-linux, x86_64-darwin ] + idris: [ i686-linux, x86_64-linux, x86_64-darwin ] IDynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] ieee-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] iException: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5932,6 +5950,7 @@ dont-distribute-packages: language-c-comments: [ i686-linux, x86_64-linux, x86_64-darwin ] language-c-inline: [ i686-linux, x86_64-linux, x86_64-darwin ] language-conf: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-dockerfile: [ i686-linux, x86_64-linux, x86_64-darwin ] language-eiffel: [ i686-linux, x86_64-linux, x86_64-darwin ] language-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] language-gcl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5995,6 +6014,7 @@ dont-distribute-packages: lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] lensref: [ i686-linux, x86_64-linux, x86_64-darwin ] lenz-template: [ i686-linux, x86_64-linux, x86_64-darwin ] + lenz: [ i686-linux, x86_64-linux, x86_64-darwin ] Level0: [ i686-linux, x86_64-linux, x86_64-darwin ] leveldb-haskell-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] leveldb-haskell: [ "x86_64-darwin" ] @@ -6099,6 +6119,7 @@ dont-distribute-packages: llvm-general-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-general-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-general: [ i686-linux, x86_64-linux, x86_64-darwin ] + llvm-hs-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-hs: [ "x86_64-darwin" ] llvm-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6106,6 +6127,7 @@ dont-distribute-packages: llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] lmdb-high-level: [ "x86_64-darwin" ] lmdb-simple: [ "x86_64-darwin" ] + lmdb-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] lmdb: [ "x86_64-darwin" ] lmonad-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] lmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6285,6 +6307,7 @@ dont-distribute-packages: mercury-api: [ i686-linux, x86_64-linux, x86_64-darwin ] merge-bash-history: [ i686-linux, x86_64-linux, x86_64-darwin ] merkle-patricia-db: [ i686-linux, x86_64-linux, x86_64-darwin ] + merkle-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] messente: [ i686-linux, x86_64-linux, x86_64-darwin ] meta-misc: [ i686-linux, x86_64-linux, x86_64-darwin ] meta-par-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6306,6 +6329,7 @@ dont-distribute-packages: microformats2-types: [ i686-linux, x86_64-linux, x86_64-darwin ] microlens-each: [ i686-linux, x86_64-linux, x86_64-darwin ] micrologger: [ i686-linux, x86_64-linux, x86_64-darwin ] + microsoft-translator: [ i686-linux, x86_64-linux, x86_64-darwin ] MicrosoftTranslator: [ i686-linux, x86_64-linux, x86_64-darwin ] mida: [ i686-linux, x86_64-linux, x86_64-darwin ] midair: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6820,6 +6844,7 @@ dont-distribute-packages: peakachu: [ i686-linux, x86_64-linux, x86_64-darwin ] PeanoWitnesses: [ i686-linux, x86_64-linux, x86_64-darwin ] pec: [ i686-linux, x86_64-linux, x86_64-darwin ] + pedersen-commitment: [ i686-linux, x86_64-linux, x86_64-darwin ] peg: [ i686-linux, x86_64-linux, x86_64-darwin ] peggy: [ i686-linux, x86_64-linux, x86_64-darwin ] pell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6970,6 +6995,7 @@ dont-distribute-packages: posix-waitpid: [ i686-linux, x86_64-linux, x86_64-darwin ] postcodes: [ i686-linux, x86_64-linux, x86_64-darwin ] postgres-embedded: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgres-websockets: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-named: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-query: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6985,6 +7011,9 @@ dont-distribute-packages: postmark-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] postmark: [ i686-linux, x86_64-linux, x86_64-darwin ] potato-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] + potoki-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] + potoki-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + potoki: [ i686-linux, x86_64-linux, x86_64-darwin ] powermate: [ "x86_64-darwin" ] powerpc: [ i686-linux, x86_64-linux, x86_64-darwin ] powerqueue-levelmem: [ "x86_64-darwin" ] @@ -7027,6 +7056,7 @@ dont-distribute-packages: procrastinating-variable: [ i686-linux, x86_64-linux, x86_64-darwin ] procstat: [ i686-linux, x86_64-linux, x86_64-darwin ] producer: [ i686-linux, x86_64-linux, x86_64-darwin ] + product: [ i686-linux, x86_64-linux, x86_64-darwin ] prof2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] prof2pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] progress: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7039,6 +7069,7 @@ dont-distribute-packages: prolog-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] prolog: [ i686-linux, x86_64-linux, x86_64-darwin ] prologue: [ i686-linux, x86_64-linux, x86_64-darwin ] + prometheus: [ i686-linux, x86_64-linux, x86_64-darwin ] promise: [ i686-linux, x86_64-linux, x86_64-darwin ] propane: [ i686-linux, x86_64-linux, x86_64-darwin ] Proper: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7089,6 +7120,7 @@ dont-distribute-packages: pyffi: [ i686-linux, x86_64-linux, x86_64-darwin ] pyfi: [ i686-linux, x86_64-linux, x86_64-darwin ] python-pickle: [ i686-linux, x86_64-linux, x86_64-darwin ] + q4c12-twofinger: [ i686-linux, x86_64-linux, x86_64-darwin ] qc-oi-testgenerator: [ i686-linux, x86_64-linux, x86_64-darwin ] qd-vec: [ i686-linux, x86_64-linux, x86_64-darwin ] qd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7118,6 +7150,7 @@ dont-distribute-packages: quick-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] QuickAnnotate: [ i686-linux, x86_64-linux, x86_64-darwin ] quickbooks: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickcheck-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-poly: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-property-comb: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-property-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7370,6 +7403,7 @@ dont-distribute-packages: RNAFoldProgs: [ i686-linux, x86_64-linux, x86_64-darwin ] RNAwolf: [ i686-linux, x86_64-linux, x86_64-darwin ] rncryptor: [ i686-linux, x86_64-linux, x86_64-darwin ] + rob: [ i686-linux, x86_64-linux, x86_64-darwin ] robot: [ i686-linux, x86_64-linux, x86_64-darwin ] robots-txt: [ i686-linux, x86_64-linux, x86_64-darwin ] roc-cluster-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7560,6 +7594,7 @@ dont-distribute-packages: servant-github: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-haxl-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-jquery: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-match: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-matrix-param: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8158,6 +8193,7 @@ dont-distribute-packages: time-exts: [ "x86_64-darwin" ] time-http: [ i686-linux, x86_64-linux, x86_64-darwin ] time-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] time-patterns: [ i686-linux, x86_64-linux, x86_64-darwin ] time-recurrence: [ i686-linux, x86_64-linux, x86_64-darwin ] time-series: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8438,6 +8474,7 @@ dont-distribute-packages: views: [ i686-linux, x86_64-linux, x86_64-darwin ] vigilance: [ i686-linux, x86_64-linux, x86_64-darwin ] Villefort: [ i686-linux, x86_64-linux, x86_64-darwin ] + vimeta: [ i686-linux, x86_64-linux, x86_64-darwin ] vimus: [ i686-linux, x86_64-linux, x86_64-darwin ] vintage-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] vinyl-json: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8656,6 +8693,8 @@ dont-distribute-packages: xml-tydom-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] xml2json: [ i686-linux, x86_64-linux, x86_64-darwin ] xml2x: [ i686-linux, x86_64-linux, x86_64-darwin ] + xmlbf-xeno: [ i686-linux, x86_64-linux, x86_64-darwin ] + xmlbf-xmlhtml: [ i686-linux, x86_64-linux, x86_64-darwin ] xmlhtml: [ i686-linux, x86_64-linux, x86_64-darwin ] XmlHtmlWriter: [ i686-linux, x86_64-linux, x86_64-darwin ] xmltv: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8779,6 +8818,8 @@ dont-distribute-packages: york-lava: [ i686-linux, x86_64-linux, x86_64-darwin ] yql: [ i686-linux, x86_64-linux, x86_64-darwin ] yst: [ i686-linux, x86_64-linux, x86_64-darwin ] + yu-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + yu-launch: [ i686-linux, x86_64-linux, x86_64-darwin ] yuiGrid: [ i686-linux, x86_64-linux, x86_64-darwin ] yuuko: [ i686-linux, x86_64-linux, x86_64-darwin ] zabt: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d29bcbf2813..7446fdeb129 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -873,22 +873,23 @@ self: { "Allure" = callPackage ({ mkDerivation, async, base, containers, enummapset-th, filepath - , LambdaHack, random, template-haskell, text, zlib + , LambdaHack, optparse-applicative, random, template-haskell, text + , zlib }: mkDerivation { pname = "Allure"; - version = "0.6.2.0"; - sha256 = "1va5xpyw2plq1f82q2zk64xyrdvkprjzv5p6zycircgc2ficz5a1"; + version = "0.7.0.0"; + sha256 = "1i4lj4ixs9p6c9l3y57cws6hirwkabc6hwn8cjbzc7xqcmz8xrxg"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - async base containers enummapset-th filepath LambdaHack random - template-haskell text zlib + async base containers enummapset-th filepath LambdaHack + optparse-applicative random template-haskell text zlib ]; testHaskellDepends = [ - base containers enummapset-th filepath LambdaHack random - template-haskell text zlib + base containers enummapset-th filepath LambdaHack + optparse-applicative random template-haskell text zlib ]; homepage = "http://allureofthestars.com"; description = "Near-future Sci-Fi roguelike and tactical squad game"; @@ -5828,20 +5829,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Frames_0_2_1_1" = callPackage + "Frames_0_3_0_2" = callPackage ({ mkDerivation, base, criterion, directory, ghc-prim, hspec, htoml - , HUnit, pipes, pretty, primitive, readable, regex-applicative - , template-haskell, temporary, text, transformers - , unordered-containers, vector, vinyl + , HUnit, pipes, pipes-bytestring, pipes-group, pipes-parse + , pipes-safe, pipes-text, pretty, primitive, readable + , regex-applicative, template-haskell, temporary, text + , transformers, unordered-containers, vector, vinyl }: mkDerivation { pname = "Frames"; - version = "0.2.1.1"; - sha256 = "19sgkra9i5mn8nbys1h17vhl2j1yhd43hhg4bjr35nz9hj1cjfjs"; + version = "0.3.0.2"; + sha256 = "1a0dq3dfiqj5nmqk5ivn07ds7k51rf24k5kcbk19m8nwy4hvi896"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base ghc-prim pipes primitive readable template-haskell text + base ghc-prim pipes pipes-bytestring pipes-group pipes-parse + pipes-safe pipes-text primitive readable template-haskell text transformers vector vinyl ]; testHaskellDepends = [ @@ -6135,8 +6138,8 @@ self: { }: mkDerivation { pname = "GLUtil"; - version = "0.9.2"; - sha256 = "04k0i27igqzvxmyp2yy5gvd9agymmxwxnnkqxkiv0qjhk1kj8p8r"; + version = "0.9.3"; + sha256 = "045wdcxm8ink7q86f6c4p47i1vmjyndk8xahabb0zic4yf3mdr76"; libraryHaskellDepends = [ array base bytestring containers directory filepath hpp JuicyPixels linear OpenGL OpenGLRaw transformers vector @@ -10734,6 +10737,8 @@ self: { pname = "JuicyPixels"; version = "3.2.9.1"; sha256 = "1g31zgsg7gq5ac9r5aizghvrg7jwn1a0qs4qwnfillqn4wkw6y5b"; + revision = "1"; + editedCabalFile = "04llw8m0s7bqz1d1vymhnzr51y9y6r9vwn4acwch1a10kq02kkpg"; libraryHaskellDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -11188,41 +11193,59 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "LambdaDesigner" = callPackage + ({ mkDerivation, aeson, base, bytestring, bytestring-trie + , containers, hosc, lens, lens-aeson, matrix, text, transformers + , vector + }: + mkDerivation { + pname = "LambdaDesigner"; + version = "0.1.0.0"; + sha256 = "1lgplxb546f7bdrwnmivb8zwix4rqhkrhv83ni90hzf4nx5fpjcy"; + libraryHaskellDepends = [ + aeson base bytestring bytestring-trie containers hosc lens + lens-aeson matrix text transformers vector + ]; + homepage = "https://github.com/ulyssesp/LambdaDesigner#readme"; + description = "A type-safe EDSL for TouchDesigner written in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "LambdaHack" = callPackage ({ mkDerivation, assert-failure, async, base, base-compat, binary , bytestring, containers, deepseq, directory, enummapset-th - , filepath, ghc-prim, hashable, hsini, keys, miniutter, pretty-show - , random, sdl2, sdl2-ttf, stm, template-haskell, text, time - , transformers, unordered-containers, vector - , vector-binary-instances, zlib + , filepath, ghc-prim, hashable, hsini, keys, miniutter + , optparse-applicative, pretty-show, random, sdl2, sdl2-ttf, stm + , template-haskell, text, time, transformers, unordered-containers + , vector, vector-binary-instances, zlib }: mkDerivation { pname = "LambdaHack"; - version = "0.6.2.0"; - sha256 = "15fa4kwaa7dzdrppjzkpm8dhazsb5cw372ksfl3smsfxiz8z4af9"; + version = "0.7.0.0"; + sha256 = "1f20d0533lxx6ag54752xvvbigp4mkw7b7iklm7cxxpijvbfjcqv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ assert-failure async base base-compat binary bytestring containers deepseq directory enummapset-th filepath ghc-prim hashable hsini - keys miniutter pretty-show random sdl2 sdl2-ttf stm text time - transformers unordered-containers vector vector-binary-instances - zlib + keys miniutter optparse-applicative pretty-show random sdl2 + sdl2-ttf stm text time transformers unordered-containers vector + vector-binary-instances zlib ]; executableHaskellDepends = [ assert-failure async base base-compat binary bytestring containers deepseq directory enummapset-th filepath ghc-prim hashable hsini - keys miniutter pretty-show random stm template-haskell text time - transformers unordered-containers vector vector-binary-instances - zlib + keys miniutter optparse-applicative pretty-show random stm + template-haskell text time transformers unordered-containers vector + vector-binary-instances zlib ]; testHaskellDepends = [ assert-failure async base base-compat binary bytestring containers deepseq directory enummapset-th filepath ghc-prim hashable hsini - keys miniutter pretty-show random stm template-haskell text time - transformers unordered-containers vector vector-binary-instances - zlib + keys miniutter optparse-applicative pretty-show random stm + template-haskell text time transformers unordered-containers vector + vector-binary-instances zlib ]; homepage = "https://lambdahack.github.io"; description = "A game engine library for roguelike dungeon crawlers"; @@ -11589,6 +11612,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ListT" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "ListT"; + version = "0.1.0.0"; + sha256 = "0x2xzasxgrvybyz4ksr41ary5k9l0qccbk2wh71kpwk9nhp4ybx0"; + libraryHaskellDepends = [ base transformers ]; + description = "List transformer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ListTree" = callPackage ({ mkDerivation, base, directory, filepath, List, transformers }: mkDerivation { @@ -15661,6 +15695,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) SDL;}; + "SDL_0_6_6_0" = callPackage + ({ mkDerivation, base, SDL }: + mkDerivation { + pname = "SDL"; + version = "0.6.6.0"; + sha256 = "0wpddhq5vwm2m1q8ja1p6draz4f40p1snmdshxwqnyyj3nchqz0z"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ SDL ]; + description = "Binding to libSDL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) SDL;}; + "SDL-gfx" = callPackage ({ mkDerivation, base, SDL, SDL_gfx }: mkDerivation { @@ -16338,8 +16386,8 @@ self: { }: mkDerivation { pname = "ShellCheck"; - version = "0.4.6"; - sha256 = "1g5ihsma3zgb7q89n2j4772f504nnhfn065xdz6bqgrnjhkrpsqi"; + version = "0.4.7"; + sha256 = "0z0dlx4s0j5v627cvns5qdq1r6kcka5nif8g62hdria29lk5aj8q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21398,13 +21446,13 @@ self: { "aern2-real" = callPackage ({ mkDerivation, aern2-mp, aeson, base, bytestring, containers - , convertible, elm-bridge, hspec, lens, mixed-types-num, QuickCheck - , random, stm, transformers + , convertible, hspec, lens, mixed-types-num, QuickCheck, random + , stm, transformers }: mkDerivation { pname = "aern2-real"; - version = "0.1.0.2"; - sha256 = "1bm0w1wvyga97ahg9p31w3lj7rhq8q0bz2my0g0n7vrlm98jv8v0"; + version = "0.1.1.0"; + sha256 = "1sq2s20vwhm0avdzqg2vb5ck6rj7aw16kcfkdyhda0dl6s2l5q15"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21412,7 +21460,7 @@ self: { mixed-types-num QuickCheck stm transformers ]; executableHaskellDepends = [ - aern2-mp base elm-bridge mixed-types-num QuickCheck random + aern2-mp base mixed-types-num QuickCheck random ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/michalkonecny/aern2"; @@ -22603,7 +22651,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "airship_0_9_1" = callPackage + "airship_0_9_2" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder , bytestring, bytestring-trie, case-insensitive, containers , cryptohash, directory, either, filepath, http-date, http-media @@ -22614,8 +22662,8 @@ self: { }: mkDerivation { pname = "airship"; - version = "0.9.1"; - sha256 = "09kjgb3zv03n0h1brw61xccrs37219pdphah3cwa397vhlncmlgq"; + version = "0.9.2"; + sha256 = "02r607yqvr5w6i6hba0ifbc02fshxijd4g46ygird9lsarcr2svp"; libraryHaskellDepends = [ attoparsec base base64-bytestring blaze-builder bytestring bytestring-trie case-insensitive containers cryptohash directory @@ -22778,8 +22826,8 @@ self: { }: mkDerivation { pname = "aivika-gpss"; - version = "0.4"; - sha256 = "0yrpbq0ppck1z9d7whzfknia16sac6jpr80mi8bw6g65hjcg3z1g"; + version = "0.5"; + sha256 = "1szf6xaq7lk3l473rm8pls5s23nk08dwdzf875hx96i0m7kxmp6p"; libraryHaskellDepends = [ aivika aivika-transformers base containers hashable mtl unordered-containers @@ -27928,6 +27976,7 @@ self: { homepage = "https://github.com/jxv/animate#readme"; description = "Animation for sprites"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "anki-tools" = callPackage @@ -28025,6 +28074,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ansi-escape-codes" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ansi-escape-codes"; + version = "0.1.0.0"; + sha256 = "0cd8nllv5p3jxm8cshfimkqwxhcnws7qyrgd8mc0hm4a55k5vhpd"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/joegesualdo/ansi-escape-codes"; + description = "Haskell package to generate ANSI escape codes for styling strings in the terminal"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ansi-pretty" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, array, base, bytestring , containers, generics-sop, nats, scientific, semigroups, tagged @@ -28377,8 +28439,8 @@ self: { }: mkDerivation { pname = "apecs"; - version = "0.2.4.6"; - sha256 = "0alf0sxsnsr1a2g7wv08jm1vh3s2kbvkn0s4a0h9ya2rjyz7dp7f"; + version = "0.2.4.7"; + sha256 = "0hqx0q52688zd7hdy6bcmbhycscy1laxggy8fvswglbfdm9m9n8s"; libraryHaskellDepends = [ async base containers mtl template-haskell vector ]; @@ -29693,8 +29755,8 @@ self: { pname = "arithmoi"; version = "0.6.0.0"; sha256 = "14kcv5n9rm48f9vac333cbazy4hlpb0wqgb4fbv97ivxnjs7g22m"; - revision = "1"; - editedCabalFile = "0408asx3296s0rwpzjmsllfjavdnh9h2rnmbvz908xs7qc5njixd"; + revision = "2"; + editedCabalFile = "1n2aqkcz2glzcmpiv6wi29pgvgkhqp5gwv134slhz9v3jj4ji1j3"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base containers exact-pi ghc-prim integer-gmp @@ -30997,6 +31059,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "atomic-primops_0_8_1_1" = callPackage + ({ mkDerivation, base, ghc-prim, primitive }: + mkDerivation { + pname = "atomic-primops"; + version = "0.8.1.1"; + sha256 = "0wi18i3k5mjmyd13n1kly7021084rjm4wfpcf70zzzss1z37kxch"; + libraryHaskellDepends = [ base ghc-prim primitive ]; + homepage = "https://github.com/rrnewton/haskell-lockfree/wiki"; + description = "A safe approach to CAS and other atomic ops in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "atomic-primops-foreign" = callPackage ({ mkDerivation, base, bits-atomic, HUnit, test-framework , test-framework-hunit, time @@ -33541,12 +33616,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "base_4_10_0_0" = callPackage + "base_4_10_1_0" = callPackage ({ mkDerivation, ghc-prim, invalid-cabal-flag-settings, rts }: mkDerivation { pname = "base"; - version = "4.10.0.0"; - sha256 = "06sgjlf3v3yyp0rdyi3f7qlp5iqw7kg0zrwml9lmccdy93pahclv"; + version = "4.10.1.0"; + sha256 = "0hnzhqdf2bxz9slia67sym6s0hi5szh8596kcckighchs9jzl9wx"; libraryHaskellDepends = [ ghc-prim invalid-cabal-flag-settings rts ]; @@ -33919,6 +33994,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "basic-prelude_0_7_0" = callPackage + ({ mkDerivation, base, bytestring, containers, filepath, hashable + , text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "basic-prelude"; + version = "0.7.0"; + sha256 = "0yckmnvm6i4vw0mykj4fzl4ldsf67v8d2h0vp1bakyj84n4myx8h"; + libraryHaskellDepends = [ + base bytestring containers filepath hashable text transformers + unordered-containers vector + ]; + homepage = "https://github.com/snoyberg/basic-prelude#readme"; + description = "An enhanced core prelude; a common foundation for alternate preludes"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "basic-sop" = callPackage ({ mkDerivation, base, deepseq, generics-sop, QuickCheck, text }: mkDerivation { @@ -34083,14 +34176,15 @@ self: { }) {}; "bbdb" = callPackage - ({ mkDerivation, base, mtl, parsec }: + ({ mkDerivation, base, hspec, parsec }: mkDerivation { pname = "bbdb"; - version = "0.5"; - sha256 = "13pf760i1iwgfnbh33cgmrri2i87rqlnszcnsq8gwn16h23cr883"; - libraryHaskellDepends = [ base mtl parsec ]; - homepage = "http://www.nadineloveshenry.com/haskell/database-bbdb.html"; - description = "Ability to read, write, and examine BBDB files"; + version = "0.6.1"; + sha256 = "03fnm2xffpf1ldry6wc7haqy40zqfsjswhdwynmnnhbjn7mr5py7"; + libraryHaskellDepends = [ base parsec ]; + testHaskellDepends = [ base hspec parsec ]; + homepage = "https://github.com/henrylaxen/bbdb"; + description = "Ability to read, write, and modify BBDB files"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -34235,12 +34329,14 @@ self: { }) {}; "bearriver" = callPackage - ({ mkDerivation, base, dunai, mtl, transformers }: + ({ mkDerivation, base, dunai, MonadRandom, mtl, transformers }: mkDerivation { pname = "bearriver"; - version = "0.10.4.1"; - sha256 = "19jq8azrknjir2zd97graa7qx8i0gxw0wyhfcq00y33w1qq6172c"; - libraryHaskellDepends = [ base dunai mtl transformers ]; + version = "0.10.4.2"; + sha256 = "1y8ha8kllp0s6v89q8kyzhmlchrldf9rahdk3sx9qygwbq36fg09"; + libraryHaskellDepends = [ + base dunai MonadRandom mtl transformers + ]; homepage = "keera.co.uk"; description = "A replacement of Yampa based on Monadic Stream Functions"; license = stdenv.lib.licenses.bsd3; @@ -34751,6 +34847,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bifunctors_5_5" = callPackage + ({ mkDerivation, base, base-orphans, comonad, containers, hspec + , QuickCheck, semigroups, tagged, template-haskell, th-abstraction + , transformers, transformers-compat + }: + mkDerivation { + pname = "bifunctors"; + version = "5.5"; + sha256 = "0a5y85p1dhcvkagpdci6ah5kczc2jpwsj7ywkd9cg0nqcyzq3icj"; + libraryHaskellDepends = [ + base base-orphans comonad containers semigroups tagged + template-haskell th-abstraction transformers transformers-compat + ]; + testHaskellDepends = [ + base hspec QuickCheck template-haskell transformers + transformers-compat + ]; + homepage = "http://github.com/ekmett/bifunctors/"; + description = "Bifunctors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bighugethesaurus" = callPackage ({ mkDerivation, base, HTTP, split }: mkDerivation { @@ -35570,6 +35689,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bindings-DSL_1_0_24" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "bindings-DSL"; + version = "1.0.24"; + sha256 = "03n8z5qxrrq4l6h2f3xyav45f5v2gr112g4l4r4jw8yfvr8qyk93"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/jwiegley/bindings-dsl/wiki"; + description = "FFI domain specific language, on top of hsc2hs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bindings-EsounD" = callPackage ({ mkDerivation, base, bindings-audiofile, bindings-DSL, esound }: mkDerivation { @@ -36660,8 +36792,8 @@ self: { }: mkDerivation { pname = "bisect-binary"; - version = "0.1"; - sha256 = "1mqhxxs6jzgizyx0j86y1ha5v7hfrww7rz9sc7vblmld37861dpj"; + version = "0.1.0.1"; + sha256 = "000dydglclgk65ryb2n2zdrwp1rnzv7phmh2vi8s1gpp67b5l5ad"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -37897,8 +38029,8 @@ self: { }: mkDerivation { pname = "ble"; - version = "0.4.1"; - sha256 = "1ascfscxg24crc2bv1vsgdp72gg3lql2pabg66zhv8vcvqcrlcah"; + version = "0.4.2"; + sha256 = "0vpmz66qg4kqkg6rqwpnp21d36yzywxvlcxxfbqrpv2kdy8pm3pb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -38959,8 +39091,8 @@ self: { pname = "bound"; version = "2.0.1"; sha256 = "0xmvkwambzmji1czxipl9cms5l3v98765b9spmb3wn5n6dpj0ji9"; - revision = "1"; - editedCabalFile = "0hqs7k5xyfpfcrfms342jj81gzrgxkrkvrl68061nkmsc5xrm4ix"; + revision = "2"; + editedCabalFile = "1ls2p35png3wjbldvgknkpsg1xsgxzgkb1mmvzjpbbgxhfhk8x68"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph @@ -39268,7 +39400,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_29" = callPackage + "brick_0_29_1" = callPackage ({ mkDerivation, base, config-ini, containers, contravariant , data-clist, deepseq, dlist, microlens, microlens-mtl , microlens-th, stm, template-haskell, text, text-zipper @@ -39276,8 +39408,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.29"; - sha256 = "05zwp8rrb9iyfcp36pczxr8l035wsi5nnmc4dwv1d5vn7rcbiipw"; + version = "0.29.1"; + sha256 = "1jslqfsqgrg379x4zi44f5xxn2jh0syqd4zbnfg07y3zgy5i399z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39334,35 +39466,35 @@ self: { "brittany" = callPackage ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs - , containers, czipwith, data-tree-print, deepseq, directory, either - , extra, filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths - , hspec, monad-memo, mtl, multistate, neat-interpolation, parsec - , pretty, safe, semigroups, strict, syb, text, transformers - , uniplate, unsafe, yaml + , containers, czipwith, data-tree-print, deepseq, directory, extra + , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec + , monad-memo, mtl, multistate, neat-interpolation, parsec, pretty + , safe, semigroups, strict, syb, text, transformers, uniplate + , unsafe, yaml }: mkDerivation { pname = "brittany"; - version = "0.8.0.3"; - sha256 = "0a468lq4gnhax4kfrwi2ligc4mjbrs0jqxgh1f4j86ql53k4mpg9"; + version = "0.9.0.0"; + sha256 = "0fi87p8ybibwhsmbh35xhipfkdg3kdwqb6n3y5ynql7603kssgc1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base butcher bytestring cmdargs containers czipwith - data-tree-print deepseq directory either extra ghc ghc-boot-th + data-tree-print deepseq directory extra ghc ghc-boot-th ghc-exactprint ghc-paths monad-memo mtl multistate neat-interpolation pretty safe semigroups strict syb text transformers uniplate unsafe yaml ]; executableHaskellDepends = [ aeson base butcher bytestring cmdargs containers czipwith - data-tree-print deepseq directory either extra filepath ghc - ghc-boot-th ghc-exactprint ghc-paths hspec monad-memo mtl - multistate neat-interpolation pretty safe semigroups strict syb - text transformers uniplate unsafe yaml + data-tree-print deepseq directory extra filepath ghc ghc-boot-th + ghc-exactprint ghc-paths hspec monad-memo mtl multistate + neat-interpolation pretty safe semigroups strict syb text + transformers uniplate unsafe yaml ]; testHaskellDepends = [ aeson base butcher bytestring cmdargs containers czipwith - data-tree-print deepseq directory either extra ghc ghc-boot-th + data-tree-print deepseq directory extra filepath ghc ghc-boot-th ghc-exactprint ghc-paths hspec monad-memo mtl multistate neat-interpolation parsec pretty safe semigroups strict syb text transformers uniplate unsafe yaml @@ -39911,6 +40043,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bunz" = callPackage + ({ mkDerivation, base, cmdargs, doctest, hspec, text, unix }: + mkDerivation { + pname = "bunz"; + version = "0.0.2"; + sha256 = "1n19bsa1sgjjd3c45wvyr9bpdrmj0qjr8nm50h1q4a9lf0fy66wv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text ]; + executableHaskellDepends = [ base cmdargs unix ]; + testHaskellDepends = [ base doctest hspec ]; + homepage = "https://github.com/sendyhalim/bunz"; + description = "CLI tool to beautify JSON string"; + license = stdenv.lib.licenses.mit; + }) {}; + "burnt-explorer" = callPackage ({ mkDerivation, aeson, base, bitcoin-script, bytestring, process , scientific @@ -40875,19 +41023,26 @@ self: { }) {}; "c2hsc" = callPackage - ({ mkDerivation, base, cmdargs, containers, directory, filepath - , HStringTemplate, language-c, mtl, pretty, split, transformers + ({ mkDerivation, base, cmdargs, containers, data-default, directory + , filepath, here, hspec, HStringTemplate, language-c, logging + , monad-logger, mtl, pretty, split, temporary, text, transformers }: mkDerivation { pname = "c2hsc"; - version = "0.6.5"; - sha256 = "0c5hzi4nw9n3ir17swbwymkymnpiw958z8r2hw6656ijwqkxvzgd"; - isLibrary = false; + version = "0.7.1"; + sha256 = "02z6bfnhsngl5l4shnyw81alhsw9vhl1lbvy04azlg54fgm9sg9x"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ - base cmdargs containers directory filepath HStringTemplate - language-c mtl pretty split transformers + libraryHaskellDepends = [ + base containers data-default directory filepath HStringTemplate + language-c logging mtl pretty split temporary text transformers ]; + executableHaskellDepends = [ + base cmdargs containers data-default directory filepath + HStringTemplate language-c logging pretty split temporary text + transformers + ]; + testHaskellDepends = [ base here hspec logging monad-logger text ]; homepage = "https://github.com/jwiegley/c2hsc"; description = "Convert C API header files to .hsc and .hsc.helper.c files"; license = stdenv.lib.licenses.bsd3; @@ -41131,6 +41286,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-doctest_1_0_4" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath }: + mkDerivation { + pname = "cabal-doctest"; + version = "1.0.4"; + sha256 = "03sawamkp95jycq9sah72iw525pdndb3x4h489zf4s3ir9avds3d"; + libraryHaskellDepends = [ base Cabal directory filepath ]; + homepage = "https://github.com/phadej/cabal-doctest"; + description = "A Setup.hs helper for doctests running"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-file-th" = callPackage ({ mkDerivation, base, Cabal, directory, pretty, template-haskell }: @@ -41264,8 +41432,8 @@ self: { pname = "cabal-install"; version = "2.0.0.1"; sha256 = "16ax1lx89jdgf9pqka423h2bf8dblkra48n4y3icg8fs79py74gr"; - revision = "1"; - editedCabalFile = "1c2ylvdb808swxwin243bz3ma55mg6q0l767dhwjcjimaz5f4gk7"; + revision = "3"; + editedCabalFile = "148rq7hcbl8rq7pkywn1hk3l7lv442flf6b0wamfixxzxk74fwlj"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal filepath process ]; @@ -43677,10 +43845,8 @@ self: { ({ mkDerivation, alg, base }: mkDerivation { pname = "category"; - version = "0.1.1.0"; - sha256 = "1jfwcxbyd12ykfff2113i39d47bp0d5ikj2sj69mxz137d2lqhlq"; - revision = "1"; - editedCabalFile = "0rv05qfjx61lh2cf1dir3k3w1sjxlcbdypi2bjd35dj19vxg5hvl"; + version = "0.1.2.0"; + sha256 = "0f3ik57gc9x7ppxgbc487jazpj8wd14aaiwpnkqxkf9142kqv8nj"; libraryHaskellDepends = [ alg base ]; description = "Categorical types and classes"; license = stdenv.lib.licenses.bsd3; @@ -44833,26 +44999,27 @@ self: { "chatwork" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection , data-default-class, hspec, http-api-data, http-client - , http-client-tls, http-types, req, servant-server, text, warp + , http-client-tls, http-types, req, retry, servant-server, text + , warp }: mkDerivation { pname = "chatwork"; - version = "0.1.1.5"; - sha256 = "1r3sayix8lid0hxx8xl424q4zcff89c5gdln7zs17jg3rb9a9x57"; + version = "0.1.2.0"; + sha256 = "1qgb5b8y99rh243x1mz0n12lv59l73vnhczxzq8s2h5lzcay3bps"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing base bytestring connection data-default-class - http-api-data http-client http-client-tls http-types req text + http-api-data http-client http-client-tls http-types req retry text ]; executableHaskellDepends = [ aeson aeson-casing base bytestring connection data-default-class - http-api-data http-client http-client-tls http-types req text + http-api-data http-client http-client-tls http-types req retry text ]; testHaskellDepends = [ aeson aeson-casing base bytestring connection data-default-class hspec http-api-data http-client http-client-tls http-types req - servant-server text warp + retry servant-server text warp ]; homepage = "https://github.com/matsubara0507/chatwork#readme"; description = "The ChatWork API in Haskell"; @@ -46366,7 +46533,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "classy-prelude_1_3_0" = callPackage + "classy-prelude_1_3_1" = callPackage ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim , hashable, hspec, lifted-async, lifted-base, monad-unlift @@ -46378,8 +46545,8 @@ self: { }: mkDerivation { pname = "classy-prelude"; - version = "1.3.0"; - sha256 = "048h2pcp0i2xzd92f6w48hhk5zpic040prmddcf4jp725l1ziid5"; + version = "1.3.1"; + sha256 = "0rk1h0kipmpk94ny2i389l6kjv7j4a55vabpm938rxv5clja2wyd"; libraryHaskellDepends = [ async base basic-prelude bifunctors bytestring chunked-data containers deepseq dlist exceptions ghc-prim hashable lifted-async @@ -46392,7 +46559,7 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck transformers unordered-containers ]; - homepage = "https://github.com/snoyberg/mono-traversable"; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; description = "A typeclass-based Prelude"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -46419,15 +46586,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "classy-prelude-conduit_1_3_0" = callPackage + "classy-prelude-conduit_1_3_1" = callPackage ({ mkDerivation, base, bytestring, classy-prelude, conduit , conduit-combinators, hspec, monad-control, QuickCheck, resourcet , transformers, void }: mkDerivation { pname = "classy-prelude-conduit"; - version = "1.3.0"; - sha256 = "09ibih4k72j0k9bv8yhs7lwdg1ic3gbwqfml0wnvmykpqcl2ff0g"; + version = "1.3.1"; + sha256 = "0n76c6bg45zcvy1jid3lrn6cr4iz3la7dd1ym7nffvqvgrfp0r2j"; libraryHaskellDepends = [ base bytestring classy-prelude conduit conduit-combinators monad-control resourcet transformers void @@ -46435,7 +46602,7 @@ self: { testHaskellDepends = [ base bytestring conduit hspec QuickCheck transformers ]; - homepage = "https://github.com/snoyberg/mono-traversable"; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; description = "classy-prelude together with conduit functions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -46460,21 +46627,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "classy-prelude-yesod_1_3_0" = callPackage + "classy-prelude-yesod_1_3_1" = callPackage ({ mkDerivation, aeson, base, classy-prelude , classy-prelude-conduit, data-default, http-conduit, http-types , persistent, yesod, yesod-newsfeed, yesod-static }: mkDerivation { pname = "classy-prelude-yesod"; - version = "1.3.0"; - sha256 = "1hnb0kfjly8l08v1krmcxgk6pc1xh1lg85mbkbz34pkhjx0rf7s6"; + version = "1.3.1"; + sha256 = "1yzkwp4gbl1jqv8r95kvbiqgf2sr9wy5ddkqdz3413y0rvwccr9x"; libraryHaskellDepends = [ aeson base classy-prelude classy-prelude-conduit data-default http-conduit http-types persistent yesod yesod-newsfeed yesod-static ]; - homepage = "https://github.com/snoyberg/mono-traversable"; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; description = "Provide a classy prelude including common Yesod functionality"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -46492,6 +46659,7 @@ self: { benchmarkHaskellDepends = [ base criterion parallel uniplate ]; description = "Fuseable type-class based generics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clay" = callPackage @@ -47190,6 +47358,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "closed" = callPackage + ({ mkDerivation, aeson, base, cassava, deepseq, hashable, hspec + , markdown-unlit, QuickCheck, vector + }: + mkDerivation { + pname = "closed"; + version = "0.1.0"; + sha256 = "0x87s852xfsyxnwj88kw38wmpzrj52hd7r87xx73r4ffv0lp6kh4"; + libraryHaskellDepends = [ + aeson base cassava deepseq hashable QuickCheck + ]; + testHaskellDepends = [ + aeson base cassava deepseq hashable hspec markdown-unlit QuickCheck + vector + ]; + homepage = "https://github.com/frontrowed/closed#readme"; + description = "Integers bounded by a closed interval"; + license = stdenv.lib.licenses.mit; + }) {}; + "closure" = callPackage ({ mkDerivation, base, hashable, unordered-containers }: mkDerivation { @@ -49802,30 +49990,35 @@ self: { "computational-algebra" = callPackage ({ mkDerivation, algebra, algebraic-prelude, arithmoi, base - , constraints, containers, control-monad-loop, convertible - , criterion, deepseq, dlist, entropy, equational-reasoning - , ghc-typelits-knownnat, hashable, heaps, hmatrix, hspec, HUnit - , hybrid-vectors, lazysmallcheck, lens, matrix, monad-loops - , MonadRandom, mono-traversable, monomorphic, mtl, parallel, primes - , process, QuickCheck, quickcheck-instances, random, reflection - , semigroups, singletons, sized, smallcheck, tagged - , template-haskell, test-framework, test-framework-hunit, text - , transformers, type-natural, unamb, unordered-containers, vector + , constraint, constraints, containers, control-monad-loop + , convertible, criterion, deepseq, dlist, entropy + , equational-reasoning, ghc-typelits-knownnat + , ghc-typelits-natnormalise, ghc-typelits-presburger, hashable + , heaps, hmatrix, hspec, HUnit, hybrid-vectors, integer-logarithms + , lazysmallcheck, lens, ListLike, matrix, monad-loops, MonadRandom + , mono-traversable, monomorphic, mtl, parallel, primes, process + , QuickCheck, quickcheck-instances, random, reflection, semigroups + , singletons, sized, smallcheck, tagged, template-haskell + , test-framework, test-framework-hunit, text, transformers + , type-natural, unamb, unordered-containers, vector + , vector-algorithms }: mkDerivation { pname = "computational-algebra"; - version = "0.5.0.0"; - sha256 = "0jfsgzjzg5ci2pr5rsdamz062yjykwkl85z9h81i5vzwgiak3rpw"; + version = "0.5.1.0"; + sha256 = "1ivhfw60gv1gxv6fl8z2n3a468dkvrwff8kg1brypaixzwp589gx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ algebra algebraic-prelude arithmoi base constraints containers control-monad-loop convertible deepseq dlist entropy - equational-reasoning ghc-typelits-knownnat hashable heaps hmatrix - hybrid-vectors lens matrix monad-loops MonadRandom mono-traversable - monomorphic mtl parallel primes reflection semigroups singletons - sized tagged template-haskell text type-natural unamb - unordered-containers vector + equational-reasoning ghc-typelits-knownnat + ghc-typelits-natnormalise ghc-typelits-presburger hashable heaps + hmatrix hybrid-vectors integer-logarithms lens ListLike matrix + monad-loops MonadRandom mono-traversable monomorphic mtl parallel + primes reflection semigroups singletons sized tagged + template-haskell text type-natural unamb unordered-containers + vector vector-algorithms ]; executableHaskellDepends = [ algebra algebraic-prelude base constraints convertible criterion @@ -49841,13 +50034,13 @@ self: { test-framework-hunit text transformers type-natural vector ]; benchmarkHaskellDepends = [ - algebra base constraints containers criterion deepseq + algebra base constraint constraints containers criterion deepseq equational-reasoning hspec HUnit lens matrix MonadRandom monomorphic parallel process QuickCheck quickcheck-instances random reflection singletons sized smallcheck tagged test-framework test-framework-hunit transformers type-natural vector ]; - homepage = "https://github.com/konn/computational-algebra"; + homepage = "https://konn.github.com/computational-algebra"; description = "Well-kinded computational algebra library, currently supporting Groebner basis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -50008,36 +50201,43 @@ self: { }) {}; "concrete-haskell" = callPackage - ({ mkDerivation, base, binary, bytestring, bzlib - , concrete-haskell-autogen, containers, directory, filepath - , hashable, megaparsec, monad-extras, mtl, network + ({ mkDerivation, base, binary, bytestring, bzlib, bzlib-conduit + , concrete-haskell-autogen, conduit, conduit-combinators + , conduit-extra, containers, cryptohash-conduit, deepseq, directory + , filepath, hashable, lens, megaparsec, monad-extras, mtl, network , optparse-generic, path, path-io, process, QuickCheck, scientific - , stm, tar, text, thrift, time, unordered-containers, uuid, vector - , zip, zlib + , stm, tar, tar-conduit, text, thrift, time, unordered-containers + , uuid, vector, zip, zip-conduit, zlib }: mkDerivation { pname = "concrete-haskell"; - version = "0.1.0.15"; - sha256 = "1g6nqr82gr5937irjs2h6ybp024k6gzpmpx1lsri8yw70kxgryjl"; + version = "0.1.0.16"; + sha256 = "1bjdbvsi7saqrlxybrzi35x47a08b01nlghvz9r6l04dkikjy2xc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring bzlib concrete-haskell-autogen containers - directory filepath hashable megaparsec monad-extras mtl network - optparse-generic path path-io process QuickCheck scientific stm tar - text thrift time unordered-containers uuid vector zip zlib + base binary bytestring bzlib bzlib-conduit concrete-haskell-autogen + conduit conduit-combinators conduit-extra containers + cryptohash-conduit deepseq directory filepath hashable lens + megaparsec monad-extras mtl network optparse-generic path path-io + process QuickCheck scientific stm tar tar-conduit text thrift time + unordered-containers uuid vector zip zip-conduit zlib ]; executableHaskellDepends = [ - base binary bytestring bzlib concrete-haskell-autogen containers - directory filepath hashable megaparsec monad-extras mtl network - optparse-generic path path-io process QuickCheck scientific stm tar - text thrift time unordered-containers uuid vector zip zlib + base binary bytestring bzlib bzlib-conduit concrete-haskell-autogen + conduit conduit-combinators conduit-extra containers + cryptohash-conduit deepseq directory filepath hashable lens + megaparsec monad-extras mtl network optparse-generic path path-io + process QuickCheck scientific stm tar tar-conduit text thrift time + unordered-containers uuid vector zip zip-conduit zlib ]; testHaskellDepends = [ - base binary bytestring bzlib concrete-haskell-autogen containers - directory filepath hashable megaparsec monad-extras mtl network - optparse-generic path path-io process QuickCheck scientific stm tar - text thrift time unordered-containers uuid vector zip zlib + base binary bytestring bzlib bzlib-conduit concrete-haskell-autogen + conduit conduit-combinators conduit-extra containers + cryptohash-conduit deepseq directory filepath hashable lens + megaparsec monad-extras mtl network optparse-generic path path-io + process QuickCheck scientific stm tar tar-conduit text thrift time + unordered-containers uuid vector zip zip-conduit zlib ]; homepage = "https://github.com/hltcoe"; description = "Library for the Concrete data format"; @@ -50615,6 +50815,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-combinators_1_1_2" = callPackage + ({ mkDerivation, base, base16-bytestring, base64-bytestring + , bytestring, chunked-data, conduit, conduit-extra, containers + , directory, filepath, hspec, monad-control, mono-traversable, mtl + , mwc-random, primitive, QuickCheck, resourcet, safe, silently + , text, transformers, transformers-base, unix, unix-compat, vector + , void + }: + mkDerivation { + pname = "conduit-combinators"; + version = "1.1.2"; + sha256 = "0f31iphdi31m7cfd2szq06x3xdag1kkv2vbxh6bm2ax37k9sw2w4"; + libraryHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring chunked-data + conduit conduit-extra filepath monad-control mono-traversable + mwc-random primitive resourcet text transformers transformers-base + unix unix-compat vector void + ]; + testHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring chunked-data + conduit containers directory filepath hspec mono-traversable mtl + mwc-random QuickCheck safe silently text transformers vector + ]; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; + description = "Commonly used conduit functions, for both chunked and unchunked data"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-connection" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, HUnit , network, resourcet, test-framework, test-framework-hunit @@ -50666,21 +50895,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "conduit-extra_1_2_0" = callPackage + "conduit-extra_1_2_1" = callPackage ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring , bytestring-builder, conduit, criterion, directory, exceptions , filepath, hspec, monad-control, network, primitive, process , QuickCheck, resourcet, stm, streaming-commons, text, transformers - , transformers-base + , transformers-base, typed-process, unliftio-core }: mkDerivation { pname = "conduit-extra"; - version = "1.2.0"; - sha256 = "0f13r6ypch3px7qfh6a2qj2y5yhdzwy53v0f6bxyc9xl0hxf49yq"; + version = "1.2.1"; + sha256 = "10sdnnjwk9wmj7fsjdnz4isbqibdhws54igy420c2q5m4alkzsgk"; libraryHaskellDepends = [ async attoparsec base blaze-builder bytestring conduit directory exceptions filepath monad-control network primitive process resourcet stm streaming-commons text transformers transformers-base + typed-process unliftio-core ]; testHaskellDepends = [ async attoparsec base blaze-builder bytestring bytestring-builder @@ -51491,6 +51721,7 @@ self: { libraryHaskellDepends = [ base category ]; description = "Reified constraints"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constraint-classes" = callPackage @@ -53583,6 +53814,7 @@ self: { homepage = "https://github.com/cblp/crdt#readme"; description = "Conflict-free replicated data types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "creatur" = callPackage @@ -53815,7 +54047,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "criterion_1_2_5_0" = callPackage + "criterion_1_2_6_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat, binary , bytestring, cassava, code-page, containers, deepseq, directory , exceptions, filepath, Glob, HUnit, js-flot, js-jquery @@ -53826,8 +54058,8 @@ self: { }: mkDerivation { pname = "criterion"; - version = "1.2.5.0"; - sha256 = "15yh0kmxgi8873b3k9ic3gnp594r9bg5zqdbgm7617yrn42ifvi8"; + version = "1.2.6.0"; + sha256 = "0a9pjmy74cd3yirihyabavsfa6b9rrrgav86qdagw5nwjw7as1bc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -56048,6 +56280,8 @@ self: { pname = "darcs"; version = "2.12.5"; sha256 = "0lrm0sal5pl453mkqn8b9fc9l7lwinc140iqihya9g17bk408nrm"; + revision = "1"; + editedCabalFile = "0if3ww0xhi8k5c8a9yb687gjjdp2k4q2896qn7vgwwzg360slx8n"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; @@ -57928,6 +58162,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-serializer_0_3_2" = callPackage + ({ mkDerivation, base, binary, bytestring, cereal, data-endian + , parsers, semigroups, split, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "data-serializer"; + version = "0.3.2"; + sha256 = "055a4kqwg6cqx9a58i7m59jp70s4mmm2q73wa78jzp87lnh2646l"; + libraryHaskellDepends = [ + base binary bytestring cereal data-endian parsers semigroups split + ]; + testHaskellDepends = [ + base binary bytestring cereal tasty tasty-quickcheck + ]; + homepage = "https://github.com/mvv/data-serializer"; + description = "Common API for serialization libraries"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-size" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, text }: mkDerivation { @@ -59737,14 +59991,14 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "dejafu_0_9_1_0" = callPackage + "dejafu_0_9_1_1" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, exceptions , leancheck, random, ref-fd, transformers, transformers-base }: mkDerivation { pname = "dejafu"; - version = "0.9.1.0"; - sha256 = "0s3acf1dggp6bc5140k0hbbfcwrbhl35g80qfs33nbjdbjjsfakj"; + version = "0.9.1.1"; + sha256 = "0ipi2i80xkprrmvapm9z4pfs7r05zk408fg7npcxq4i8k77rvz8z"; libraryHaskellDepends = [ base concurrency containers deepseq exceptions leancheck random ref-fd transformers transformers-base @@ -60308,6 +60562,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "deriving-compat_0_4" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , ghc-boot-th, ghc-prim, hspec, QuickCheck, tagged + , template-haskell, th-abstraction, transformers + , transformers-compat + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.4"; + sha256 = "1jza92p1x3dbm4gx891miaihq3ly30mlz20ddwdsz0xyk7c1wk15"; + libraryHaskellDepends = [ + base containers ghc-boot-th ghc-prim template-haskell + th-abstraction transformers transformers-compat + ]; + testHaskellDepends = [ + base base-compat base-orphans hspec QuickCheck tagged + template-haskell transformers transformers-compat + ]; + homepage = "https://github.com/haskell-compat/deriving-compat"; + description = "Backports of GHC deriving extensions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "derp" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -61182,8 +61460,8 @@ self: { }: mkDerivation { pname = "diagrams-rubiks-cube"; - version = "0.2.0.1"; - sha256 = "14l5qc74hp9ngjh9ndz7ily1nhf5z0swv8brv5yp77a80dzlxxgq"; + version = "0.3.0.0"; + sha256 = "10j9zag6b5mlhhmd3j0p2vxpm26rhm74ihs8xjcwh77xkywbfi7z"; libraryHaskellDepends = [ adjunctions base data-default-class diagrams-lib distributive lens ]; @@ -62453,6 +62731,7 @@ self: { homepage = "https://github.com/andrewthad/disjoint-containers#readme"; description = "Disjoint containers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "disjoint-set" = callPackage @@ -63235,8 +63514,8 @@ self: { pname = "distributive"; version = "0.5.3"; sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi"; - revision = "1"; - editedCabalFile = "0hsq03i0qa0jvw7kaaqic40zvfkzhkd25dgvbdg6hjzylf1k1gax"; + revision = "2"; + editedCabalFile = "02j27xvlj0jw3b2jpfg6wbysj0blllin792wj6qnrgnrvd4haj7v"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans tagged transformers transformers-compat @@ -63746,6 +64025,7 @@ self: { ]; description = "Builds a services with docker and caches all of its intermediate stages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dockercook" = callPackage @@ -65283,12 +65563,15 @@ self: { }) {}; "dunai" = callPackage - ({ mkDerivation, base, transformers, transformers-base }: + ({ mkDerivation, base, MonadRandom, transformers, transformers-base + }: mkDerivation { pname = "dunai"; - version = "0.3.0.0"; - sha256 = "0ncznc3khbanqsq4ab0n246sx30slq13awclafln5bjxvi1cx3yl"; - libraryHaskellDepends = [ base transformers transformers-base ]; + version = "0.4.0.0"; + sha256 = "05xqhbz0x7wzfka4wl2wvfhzr242nx4ci4r3zvm89mcyxn9q7x6n"; + libraryHaskellDepends = [ + base MonadRandom transformers transformers-base + ]; homepage = "https://github.com/ivanperez-keera/dunai"; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; license = stdenv.lib.licenses.bsd3; @@ -65972,18 +66255,15 @@ self: { }) {}; "easyrender" = callPackage - ({ mkDerivation, base, bytestring, containers, mtl, superdoc, zlib + ({ mkDerivation, base, bytestring, Cabal, containers, mtl, superdoc + , zlib }: mkDerivation { pname = "easyrender"; - version = "0.1.1.2"; - sha256 = "05m65ap055kayi9jj6c0z6csh0kq9pzk889q4zyrmgh504qmyg9h"; - revision = "1"; - editedCabalFile = "0gpx9gx2swmvkgddsnqncyy80gqjvnl9hwkqzmv72gc0dswkkki6"; - setupHaskellDepends = [ base superdoc ]; - libraryHaskellDepends = [ - base bytestring containers mtl superdoc zlib - ]; + version = "0.1.1.3"; + sha256 = "105s3d5yz7qz9cv5jq005kzd7jfdn2fccnc4s1xgkszk46y83qbx"; + setupHaskellDepends = [ base Cabal superdoc ]; + libraryHaskellDepends = [ base bytestring containers mtl zlib ]; homepage = "http://www.mathstat.dal.ca/~selinger/easyrender/"; description = "User-friendly creation of EPS, PostScript, and PDF files"; license = stdenv.lib.licenses.gpl3; @@ -66986,6 +67266,7 @@ self: { homepage = "https://github.com/adinapoli/ekg-prometheus-adapter#readme"; description = "Easily expose your EKG metrics to Prometheus"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-push" = callPackage @@ -68852,15 +69133,21 @@ self: { }) {}; "errors-ext" = callPackage - ({ mkDerivation, base, errors, exceptions, HUnit, transformers }: + ({ mkDerivation, base, errors, exceptions, HUnit, monad-control + , mtl, transformers + }: mkDerivation { pname = "errors-ext"; - version = "0.2.1"; - sha256 = "0qdx8km48zzwwhzz0ah15299klmlmbjk7bp2xwbm4jb0nspkdxgx"; - libraryHaskellDepends = [ base errors exceptions transformers ]; - testHaskellDepends = [ base errors exceptions HUnit transformers ]; + version = "0.4.1"; + sha256 = "1xly8pgkbqkm4mb1zg9bga08gx5fj4nrmidzj5p8anqdksq7ib5h"; + libraryHaskellDepends = [ + base errors exceptions monad-control mtl transformers + ]; + testHaskellDepends = [ + base errors exceptions HUnit monad-control mtl transformers + ]; homepage = "https://github.com/A1-Triard/errors-ext#readme"; - description = "Bracket-like functions for ExceptT over IO monad"; + description = "`bracket`-like functions for `ExceptT` over `IO` monad"; license = stdenv.lib.licenses.asl20; }) {}; @@ -71060,20 +71347,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "extra_1_6_1" = callPackage + "extra_1_6_2" = callPackage ({ mkDerivation, base, clock, directory, filepath, process , QuickCheck, time, unix }: mkDerivation { pname = "extra"; - version = "1.6.1"; - sha256 = "0x2byc1k8lznrq226pg1xrd48q6x9l7id6b2cdah0b6xigr0mya2"; + version = "1.6.2"; + sha256 = "1l8l8724g3kd3f01pq429y7czr1bnhbrq2y0lii1hi767sjxgnz4"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; - testHaskellDepends = [ - base clock directory filepath QuickCheck unix - ]; + testHaskellDepends = [ base directory filepath QuickCheck unix ]; homepage = "https://github.com/ndmitchell/extra#readme"; description = "Extra functions I use"; license = stdenv.lib.licenses.bsd3; @@ -72252,6 +72537,23 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "fedora-haskell-tools_0_4" = callPackage + ({ mkDerivation, base, directory, filepath, process, time, unix }: + mkDerivation { + pname = "fedora-haskell-tools"; + version = "0.4"; + sha256 = "0105i1klks1f0gcq9fyv1pbfrm3mfiwp14pdac0xb8hm1fbhbs70"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath process time unix + ]; + homepage = "https://github.com/fedora-haskell/fedora-haskell-tools"; + description = "Building and managing tools for Fedora Haskell"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fedora-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hlint , HsOpenSSL, hspec, http-streams, io-streams, lens, text @@ -73624,6 +73926,7 @@ self: { homepage = "https://github.com/ChrisPenner/Firefly#readme"; description = "A simple example using Firefly"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "first-and-last" = callPackage @@ -74354,15 +74657,17 @@ self: { }) {}; "flay" = callPackage - ({ mkDerivation, base, constraints, tasty, tasty-quickcheck }: + ({ mkDerivation, base, constraints, ghc-prim, tasty + , tasty-quickcheck + }: mkDerivation { pname = "flay"; - version = "0.1"; - sha256 = "18wdvidn1d4cnxcl11nfabqjqx5dpgvijim46wvp3dfvh8lc8kn4"; - libraryHaskellDepends = [ base constraints ]; + version = "0.2"; + sha256 = "1sdwcjjsgq0ba84474pdnvppg66vmqsqn6frb97ricdnyy78lg11"; + libraryHaskellDepends = [ base constraints ghc-prim ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; homepage = "https://github.com/k0001/flay"; - description = "Work on your datatype without knowing its shape nor its contents"; + description = "Work generically on your datatype without knowing its shape nor its contents"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -74912,6 +75217,7 @@ self: { ]; description = "A simple web application as a online practice website for XDU SE 2017 fall SPM"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fluffy-parser" = callPackage @@ -74927,6 +75233,7 @@ self: { ]; description = "The parser for fluffy to parsec the question bank in .docx type"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fluid-idl" = callPackage @@ -76695,6 +77002,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "freer-simple" = callPackage + ({ mkDerivation, base, criterion, extensible-effects, free, mtl + , natural-transformation, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, transformers-base + }: + mkDerivation { + pname = "freer-simple"; + version = "1.0.0.0"; + sha256 = "11nh0majlmn6aw5qzv5jfs6jx9vxk7jn72568frmryvymn2aqax8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base natural-transformation transformers-base + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base criterion extensible-effects free mtl + ]; + homepage = "https://github.com/lexi-lambda/freer-simple#readme"; + description = "Implementation of a friendly effect system for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "freesect" = callPackage ({ mkDerivation, array, base, cpphs, directory, mtl, parallel , pretty, random, syb @@ -78940,6 +79273,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-deriving_1_12" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec + , template-haskell + }: + mkDerivation { + pname = "generic-deriving"; + version = "1.12"; + sha256 = "09nl2c2b54ngqv4rgv3avvallyvfnv5jfld0wk2v90srl3x6p5vk"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + testHaskellDepends = [ base hspec template-haskell ]; + homepage = "https://github.com/dreixel/generic-deriving"; + description = "Generic programming library for generalised deriving"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generic-enum" = callPackage ({ mkDerivation, array, base, bytestring, hspec }: mkDerivation { @@ -78953,15 +79304,15 @@ self: { }) {}; "generic-lens" = callPackage - ({ mkDerivation, base, criterion, deepseq, inspection-testing, lens - , profunctors, QuickCheck + ({ mkDerivation, base, criterion, deepseq, doctest + , inspection-testing, lens, profunctors, QuickCheck, tagged }: mkDerivation { pname = "generic-lens"; - version = "0.4.1.0"; - sha256 = "1nlizrgnfivabc35199aizahv0za9wvp7dhsqmvhafkjj0sr5113"; - libraryHaskellDepends = [ base profunctors ]; - testHaskellDepends = [ base inspection-testing ]; + version = "0.5.0.0"; + sha256 = "0jp6qy45j7cg251pxq5x4ygg6m7gc6v57nd8ky26r18g9wn9f7w3"; + libraryHaskellDepends = [ base profunctors tagged ]; + testHaskellDepends = [ base doctest inspection-testing ]; benchmarkHaskellDepends = [ base criterion deepseq lens QuickCheck ]; @@ -79137,8 +79488,8 @@ self: { pname = "generic-xmlpickler"; version = "0.1.0.5"; sha256 = "1brnlgnbys811qy64aps2j03ks2p0rkihaqzaszfwl80cpsn05ym"; - revision = "3"; - editedCabalFile = "17z1kfyshlqr8ayljs5f2jbahvc58kqyd272afcpqvs7kq1c0aja"; + revision = "4"; + editedCabalFile = "0zcrn8n12fk36iacg0c429ras6pbr96c1zxjbnf5jiq7ajwnd8ri"; libraryHaskellDepends = [ base generic-deriving hxt text ]; testHaskellDepends = [ base hxt hxt-pickle-utils tasty tasty-hunit tasty-th @@ -80107,16 +80458,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot_8_2_1" = callPackage + "ghc-boot_8_2_2" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath , ghc-boot-th }: mkDerivation { pname = "ghc-boot"; - version = "8.2.1"; - sha256 = "1v9cdbhxsx7pbig4c3gq5gdp46fwq0blq6zn89x4fpq1vl1kcr6h"; - revision = "1"; - editedCabalFile = "0826xd0ccr77v7zqjml266g067qj2bd3mb7d7d8mipqv42j7cy8y"; + version = "8.2.2"; + sha256 = "0fwpfsdx584mcvavj1m961rnaryif9a0yibhlw0b2i59g3ca8f6g"; libraryHaskellDepends = [ base binary bytestring directory filepath ghc-boot-th ]; @@ -80125,12 +80474,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot-th_8_2_1" = callPackage + "ghc-boot-th_8_2_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "8.2.1"; - sha256 = "18gmrfxyqqv0gchpn35bqsk66if1q8yy4amajdz2kh9v8jz4yfz4"; + version = "8.2.2"; + sha256 = "0pdgimqqn1w04qw504bgcji74wj5wmxpwgj5w3wdrid47sr2d3kc"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the @template-haskell@ library"; license = stdenv.lib.licenses.bsd3; @@ -80969,15 +81318,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghci_8_2_1" = callPackage + "ghci_8_2_2" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, filepath, ghc-boot, ghc-boot-th, template-haskell , transformers, unix }: mkDerivation { pname = "ghci"; - version = "8.2.1"; - sha256 = "1nxcqnfnggpg8a04496nk59p4jmvxsjqi7425g6h970cinh2lm5f"; + version = "8.2.2"; + sha256 = "0j6aq2scjv0fpr5b60ac46r1n2hrcgbkrhv31yfnallwlwyqz5zn"; libraryHaskellDepends = [ array base binary bytestring containers deepseq filepath ghc-boot ghc-boot-th template-haskell transformers unix @@ -81817,6 +82166,30 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {gtk3 = pkgs.gnome3.gtk;}; + "gi-gtk_3_0_18" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject + , gi-pango, gtk3, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gtk"; + version = "3.0.18"; + sha256 = "1fp84dba8hg6pvkdy0mip2pz9npx0kwp492gx8p1bgf119rqqfl1"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf + gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtk3 ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Gtk bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {gtk3 = pkgs.gnome3.gtk;}; + "gi-gtk-hs" = callPackage ({ mkDerivation, base, base-compat, containers, gi-gdk , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl @@ -82913,6 +83286,8 @@ self: { pname = "github"; version = "0.18"; sha256 = "0i4cs6d95ik5c8zs2508nmhjh2v30a0qjyxfqyxhjsz48p9h5p1i"; + revision = "1"; + editedCabalFile = "1krz0plxhm1q1k7bb0wzl969zd5fqkgqcgfr6rmqw60njpwrdsrp"; libraryHaskellDepends = [ aeson aeson-compat base base-compat base16-bytestring binary binary-orphans byteable bytestring containers cryptohash deepseq @@ -82998,6 +83373,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "github-release_1_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client + , http-client-tls, http-types, mime-types, optparse-generic, text + , unordered-containers, uri-templater + }: + mkDerivation { + pname = "github-release"; + version = "1.1.0"; + sha256 = "1a3a7pil5k0danybcfk19b4rql5s4alrlbprgq9053npb2369js2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring http-client http-client-tls http-types + mime-types optparse-generic text unordered-containers uri-templater + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/tfausak/github-release#readme"; + description = "Upload files to GitHub releases"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "github-tools" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, github , groom, html, http-client, http-client-tls, monad-parallel @@ -84363,8 +84760,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.3.24"; - sha256 = "18m2mw0pzry3hkq0w3gcky45na5z600wkni856k3fc97w050qym3"; + version = "0.3.25"; + sha256 = "1ps3jjlf9igqmllyapqznzxjkf7291i7zv8w86p2fnm6wxsd73q9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87898,6 +88295,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "groundhog-th_0_8_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, groundhog + , template-haskell, text, time, unordered-containers, yaml + }: + mkDerivation { + pname = "groundhog-th"; + version = "0.8.0.2"; + sha256 = "13rxdmnbmsivp608xclkvjnab0dzhzyqc8zjrpm7ml9d5yc8v596"; + libraryHaskellDepends = [ + aeson base bytestring containers groundhog template-haskell text + time unordered-containers yaml + ]; + description = "Type-safe datatype-database mapping library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "group-by-date" = callPackage ({ mkDerivation, base, explicit-exception, filemanip, hsshellscript , pathtype, time, transformers, unix-compat, utility-ht @@ -88738,6 +89152,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gym-http-api" = callPackage + ({ mkDerivation, aeson, base, exceptions, http-client, servant + , servant-client, servant-lucid, text, unordered-containers + }: + mkDerivation { + pname = "gym-http-api"; + version = "0.1.0.0"; + sha256 = "0id8npw9ziqibm0j5fqkjw7r75la2cd4zlyzsk90rpx2xf5xy20p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base servant servant-client servant-lucid text + unordered-containers + ]; + executableHaskellDepends = [ + base exceptions http-client servant-client + ]; + homepage = "https://github.com/stites/gym-http-api#readme"; + description = "REST client to the gym-http-api project"; + license = stdenv.lib.licenses.mit; + }) {}; + "h-booru" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , http-conduit, hxt, mtl, stm, template-haskell, transformers @@ -91999,6 +92435,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hapistrano_0_3_5_0" = callPackage + ({ mkDerivation, aeson, async, base, directory, filepath, hspec + , mtl, optparse-applicative, path, path-io, process, stm, temporary + , time, transformers, yaml + }: + mkDerivation { + pname = "hapistrano"; + version = "0.3.5.0"; + sha256 = "15cjssws55awwq8j0xz8f4dd0y826f99zdv6mpxfxq97fah7zlcc"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base filepath mtl path process time transformers + ]; + executableHaskellDepends = [ + aeson async base optparse-applicative path path-io stm yaml + ]; + testHaskellDepends = [ + base directory filepath hspec mtl path path-io process temporary + ]; + 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 ({ mkDerivation, array, base, bytestring, containers, glib, gtk , gtk2hs-buildtools, libappindicator-gtk2, mtl @@ -93756,14 +94219,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskeline_0_7_4_1" = callPackage + "haskeline_0_7_4_2" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , process, stm, terminfo, transformers, unix }: mkDerivation { pname = "haskeline"; - version = "0.7.4.1"; - sha256 = "0ck87j20314m8rq9is96r012h377r6rdlnw0g741sb3vcypada2a"; + version = "0.7.4.2"; + sha256 = "1sxhdhy9asinxn0gvd4zandbk6xkb04vy1y7lmh66f9jv66fqhsm"; configureFlags = [ "-fterminfo" ]; libraryHaskellDepends = [ base bytestring containers directory filepath process stm terminfo @@ -94301,6 +94764,18 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "haskell-holes-th" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "haskell-holes-th"; + version = "1.0.0.0"; + sha256 = "13xyxck9f15mwi641zs9zw77cnrgh30p2771f66haby96k8wx9jf"; + libraryHaskellDepends = [ base template-haskell ]; + homepage = "https://github.com/8084/haskell-holes-th"; + description = "Infer haskell code by given type"; + license = stdenv.lib.licenses.mit; + }) {}; + "haskell-igraph" = callPackage ({ mkDerivation, base, binary, bytestring, bytestring-lexing, c2hs , colour, data-default-class, data-ordlist, hashable, hxt, igraph @@ -94846,6 +95321,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-src-exts_1_20_0" = callPackage + ({ mkDerivation, array, base, containers, cpphs, directory + , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck + , tasty, tasty-golden, tasty-smallcheck + }: + mkDerivation { + pname = "haskell-src-exts"; + version = "1.20.0"; + sha256 = "0fsbcrjf4m8zd759hsqjm29mnarmkf44aln903g7ipj7rkxyl8lx"; + libraryHaskellDepends = [ array base cpphs ghc-prim pretty ]; + libraryToolDepends = [ happy ]; + testHaskellDepends = [ + base containers directory filepath mtl pretty-show smallcheck tasty + tasty-golden tasty-smallcheck + ]; + doCheck = false; + homepage = "https://github.com/haskell-suite/haskell-src-exts"; + description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-src-exts-observe" = callPackage ({ mkDerivation, base, haskell-src-exts, Hoed }: mkDerivation { @@ -95012,14 +95509,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-ast_1_0_0_0" = callPackage + "haskell-tools-ast_1_0_0_1" = callPackage ({ mkDerivation, base, ghc, mtl, references, template-haskell , uniplate }: mkDerivation { pname = "haskell-tools-ast"; - version = "1.0.0.0"; - sha256 = "174xh6a0p43kb0cia3z1n18kqhpsnbf51299l0rbn2makvn68zk4"; + version = "1.0.0.1"; + sha256 = "0i84hv1hvsf7z9jl11m0ic0ja6m46dw58zjrdmllmmravnfw5j5g"; libraryHaskellDepends = [ base ghc mtl references template-haskell uniplate ]; @@ -95101,15 +95598,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-backend-ghc_1_0_0_0" = callPackage + "haskell-tools-backend-ghc_1_0_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th , haskell-tools-ast, mtl, references, safe, split, template-haskell , transformers, uniplate }: mkDerivation { pname = "haskell-tools-backend-ghc"; - version = "1.0.0.0"; - sha256 = "09jhc2i7ypfcgpdmjfg7bacf9a0nlxrvbz99zh86kgbrjh1xjr8f"; + version = "1.0.0.1"; + sha256 = "1cfwy1qcvk72pspvgf9yq3i8z0n2payhir9f2spvqyxxd6pgyvsa"; libraryHaskellDepends = [ base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl references safe split template-haskell transformers uniplate @@ -95130,8 +95627,8 @@ self: { }: mkDerivation { pname = "haskell-tools-builtin-refactorings"; - version = "1.0.0.0"; - sha256 = "0mhigqzivx1r04gi9v4jb7cvzirly8bbm3nckib170yws884gcba"; + version = "1.0.0.1"; + sha256 = "0c3gnf8chg6c7cprx148x2h10miysq0d4m0q1snhhhnqpd9vxws0"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -95182,7 +95679,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-tools-cli_1_0_0_0" = callPackage + "haskell-tools-cli_1_0_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , directory, filepath, ghc, ghc-paths, Glob , haskell-tools-builtin-refactorings, haskell-tools-daemon @@ -95191,8 +95688,8 @@ self: { }: mkDerivation { pname = "haskell-tools-cli"; - version = "1.0.0.0"; - sha256 = "1y0jlgp3b8bxgrs406c32drdphblnn5c7rsqj2n9gvmhmdj01iwc"; + version = "1.0.0.1"; + sha256 = "0qh0fsrqxlc6bqsz2c11isywd451l0nxndk5p4s6hkq88m6yrkic"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95246,7 +95743,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-daemon_1_0_0_0" = callPackage + "haskell-tools-daemon_1_0_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , deepseq, Diff, directory, filepath, fswatch, ghc, ghc-paths, Glob , haskell-tools-builtin-refactorings, haskell-tools-prettyprint @@ -95256,8 +95753,8 @@ self: { }: mkDerivation { pname = "haskell-tools-daemon"; - version = "1.0.0.0"; - sha256 = "0pgpir9p693wym1krw2pyk17aq0dv10xbypw44ik6syzmy8j1zla"; + version = "1.0.0.1"; + sha256 = "0hjafm57619xsfzzcqsyj2ksbhg70m011vv9q2w5rpbzk5jzrlk8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95303,7 +95800,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-debug_1_0_0_0" = callPackage + "haskell-tools-debug_1_0_0_1" = callPackage ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings , haskell-tools-prettyprint, haskell-tools-refactor, references @@ -95311,8 +95808,8 @@ self: { }: mkDerivation { pname = "haskell-tools-debug"; - version = "1.0.0.0"; - sha256 = "0jbiid1plb2y2sfpi5m46kl6waap8xhk8bqk5q9km2w7np0fv5dc"; + version = "1.0.0.1"; + sha256 = "1j0v0hdkmd01cg4pk1as27ws8krgvpswmqfcj06dzkx81f0a4fn3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95358,7 +95855,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-demo_1_0_0_0" = callPackage + "haskell-tools-demo_1_0_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings @@ -95368,8 +95865,8 @@ self: { }: mkDerivation { pname = "haskell-tools-demo"; - version = "1.0.0.0"; - sha256 = "0kyf83wg514yl795k63wlklrdlz3fnnxl9qjkcwv5fxkxxixxf07"; + version = "1.0.0.1"; + sha256 = "121dggqzhv8w80xh8cjl8hqds511sgp8ai86fjfrqcvs3zwy16da"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95400,8 +95897,8 @@ self: { }: mkDerivation { pname = "haskell-tools-experimental-refactorings"; - version = "1.0.0.0"; - sha256 = "1k3grr8jca4samw0hqm1yrq8yjg4nw0z4gwx366anjpvwb1chr9a"; + version = "1.0.0.1"; + sha256 = "1rpyzl22jiwvjp2k3w7pg51i5n6idr9d29xqll25h17h56lzqa2j"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -95439,14 +95936,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-prettyprint_1_0_0_0" = callPackage + "haskell-tools-prettyprint_1_0_0_1" = callPackage ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl , references, split, text, uniplate }: mkDerivation { pname = "haskell-tools-prettyprint"; - version = "1.0.0.0"; - sha256 = "1f27xziimiz81sjns8hia6xsk94zm3yjpcdvihaqr0g0dq1mkfwl"; + version = "1.0.0.1"; + sha256 = "1jdrzwr8gc878s3nkqhqhcwpp4kadi1mi7wk704qn4lls61q59ia"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast mtl references split text uniplate @@ -95487,7 +95984,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-refactor_1_0_0_0" = callPackage + "haskell-tools-refactor_1_0_0_1" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc , haskell-tools-prettyprint, haskell-tools-rewrite, mtl, references @@ -95495,8 +95992,8 @@ self: { }: mkDerivation { pname = "haskell-tools-refactor"; - version = "1.0.0.0"; - sha256 = "0s3mdwpsla79ppcsl7n3r1yjbi0db0w6yk2zf143p5ngbhj08rs4"; + version = "1.0.0.1"; + sha256 = "1d9w811n8dhnsgpvvh3v7wm0fywiv7qmd1652kjn4cazc4sfzyn5"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -95531,15 +96028,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-tools-rewrite_1_0_0_0" = callPackage + "haskell-tools-rewrite_1_0_0_1" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , haskell-tools-ast, haskell-tools-prettyprint, mtl, references , tasty, tasty-hunit }: mkDerivation { pname = "haskell-tools-rewrite"; - version = "1.0.0.0"; - sha256 = "0zm7bdlfda29md86s0bz40y3ml1pb6x8fvp4br8gxj7r3j1l8852"; + version = "1.0.0.1"; + sha256 = "1sv6z3qm6vyjpm7mh1clyikcvzgq3x9l1clgqi4vrs0lcr3npand"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl references @@ -97147,8 +97644,8 @@ self: { }: mkDerivation { pname = "hasql-optparse-applicative"; - version = "0.2.4"; - sha256 = "0gdbwhzcfjriq2yah5kfn9r1anc77f1iyay86zsdgq4z8qi6asvr"; + version = "0.3"; + sha256 = "05i9hij1z67l1sc53swwcmd88544dypc3qkzkh8f4n6nlmv82190"; libraryHaskellDepends = [ base-prelude hasql hasql-pool optparse-applicative ]; @@ -98994,6 +99491,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedgehog_0_5_1" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring + , concurrent-output, containers, directory, exceptions + , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive + , random, resourcet, stm, template-haskell, text, th-lift, time + , transformers, transformers-base, unix, wl-pprint-annotated + }: + mkDerivation { + pname = "hedgehog"; + version = "0.5.1"; + sha256 = "0fx3dq45azxrhihhq6hlb89zkj3y8fmnfdrsz1wbvih9a3dhiwx7"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring concurrent-output containers + directory exceptions lifted-async mmorph monad-control mtl + pretty-show primitive random resourcet stm template-haskell text + th-lift time transformers transformers-base unix + wl-pprint-annotated + ]; + testHaskellDepends = [ + base containers pretty-show text transformers + ]; + homepage = "https://hedgehog.qa"; + description = "Hedgehog will eat all your bugs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedgehog-quickcheck" = callPackage ({ mkDerivation, base, hedgehog, QuickCheck, transformers }: mkDerivation { @@ -100101,14 +100625,13 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "hexchat"; - version = "0.0.1.0"; - sha256 = "15wzndvxc0v187gl0bwhlfqfwxs0l3p6wqwf9zx0acfw4471yn4v"; - revision = "1"; - editedCabalFile = "0jfnmiyp2lzs3msh479h0bdsqzhjra998bwmgwybk60p83nlvw1p"; + version = "0.0.2.0"; + sha256 = "1bx49z3ycc24bsn0x0617x0gmgapan6qnwnwq6v0w06gjrahr4r4"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/mniip/hexchat-haskell"; description = "Haskell scripting interface for HexChat"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexdump" = callPackage @@ -100366,8 +100889,8 @@ self: { }: mkDerivation { pname = "heyefi"; - version = "2.0.0.0"; - sha256 = "1m1r9fnjf2i60nwqwcbyqm6nrmyipwn4nm7klgq0ykaghpag3kw8"; + version = "2.0.0.1"; + sha256 = "08lry3bxppnxr1mqpsbplq041nf2c5aaaim4iqhrapvqwwca7n5v"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -100447,10 +100970,8 @@ self: { ({ mkDerivation, base, containers, template-haskell, text }: mkDerivation { pname = "hflags"; - version = "0.4.2"; - sha256 = "1i9c1xszaymiqxh3ss7601cw8m8zpzvzg3k92jvdj4a0gxihvlrc"; - revision = "1"; - editedCabalFile = "1kasg8y0ia3q2iy6vmjvwwn9dyxzy59s6s9chwxhdgsvncx38ra1"; + version = "0.4.3"; + sha256 = "0lmjgwgfp1s2ag2fbi6n8yryafb5qz87yb0p122lxzm3487sf98h"; libraryHaskellDepends = [ base containers template-haskell text ]; homepage = "http://github.com/errge/hflags"; description = "Command line flag parser, very similar to Google's gflags"; @@ -102733,8 +103254,8 @@ self: { pname = "hledger-ui"; version = "1.4"; sha256 = "0rm6091nlpijhi6k74dg35g38a7ly22mqfnb0mvjp8pyxb4phq33"; - revision = "5"; - editedCabalFile = "0lplgg7xffpjk6qjzvjp2klmb178bc06wnyq0qlh6fm29g8d18yp"; + revision = "6"; + editedCabalFile = "0diprhzbql32yvbby4fz9lx4i8khd553s18vsfk537zkjrcsalbc"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -103670,8 +104191,8 @@ self: { }: mkDerivation { pname = "hnormalise"; - version = "0.5.0.0"; - sha256 = "01xiqkm94amm7kdwvdgcm3f4slylmvc04qxkbddh2xsm8wz4c9a2"; + version = "0.5.1.0"; + sha256 = "11p207fmkfkc6jimnq9y30xj3l1msc5r090qvg1klmyvmhjkh702"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103911,6 +104432,7 @@ self: { homepage = "https://github.com/awakesecurity/hocker#readme"; description = "Interact with the docker registry and generate nix build instructions"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hodatime" = callPackage @@ -105419,6 +105941,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hpack_0_21_0" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, cryptonite, deepseq, directory, filepath, Glob, hspec + , HUnit, interpolate, mockery, pretty, QuickCheck, temporary, text + , transformers, unordered-containers, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.21.0"; + sha256 = "004n0p3ljvaindaxjnadija16fwkjfv6s80acpps2ky2frnfbplp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob pretty text transformers + unordered-containers yaml + ]; + executableHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob pretty text transformers + unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob hspec HUnit interpolate mockery + pretty QuickCheck temporary text transformers unordered-containers + yaml + ]; + homepage = "https://github.com/sol/hpack#readme"; + description = "An alternative format for Haskell packages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hpack-convert" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, containers, deepseq, directory, filepath, Glob, hspec @@ -105838,6 +106394,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hpp_0_5_1" = callPackage + ({ mkDerivation, base, bytestring, bytestring-trie, directory + , filepath, ghc-prim, time, transformers + }: + mkDerivation { + pname = "hpp"; + version = "0.5.1"; + sha256 = "0bdx85k9c9cb5wkp91fi1sb0dahg6f4fknyddfh92wcywa485q9b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring bytestring-trie directory filepath ghc-prim time + transformers + ]; + executableHaskellDepends = [ base directory filepath time ]; + testHaskellDepends = [ base bytestring transformers ]; + homepage = "https://github.com/acowley/hpp"; + description = "A Haskell pre-processor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hpqtypes" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , data-default-class, exceptions, HUnit, lifted-base, monad-control @@ -105877,8 +106455,8 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.4.0.0"; - sha256 = "0hfs4i1h2pfy8hd2c24ig4zd1fw6v9wmm39616a0ipb7vgalra6b"; + version = "1.5.0.0"; + sha256 = "1hp9nn49a8kg58y8cywsiwcy64zq65c1hnsn2xi5ajk71hag8b8c"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions fields-json hpqtypes lifted-base log-base monad-control mtl safe @@ -107227,6 +107805,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-auditor"; description = "Haskell SuperCollider Auditor"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-cairo" = callPackage @@ -107923,14 +108502,14 @@ self: { }) {}; "hsemail-ns" = callPackage - ({ mkDerivation, base, mtl, old-time, parsec }: + ({ mkDerivation, base, doctest, hspec, mtl, old-time, parsec }: mkDerivation { pname = "hsemail-ns"; - version = "1.3.2"; - sha256 = "03d0pnsba7yj5x7zrg8b80kxsnqn5g40vd2i717s1dnn3bd3vz4s"; - enableSeparateDataOutput = true; + version = "1.7.7"; + sha256 = "01vnlcv5gj7zj33b6m8mc4n6n8d15casywgicn1lr699hkh287hg"; libraryHaskellDepends = [ base mtl old-time parsec ]; - homepage = "http://patch-tag.com/r/hsemail-ns/home"; + testHaskellDepends = [ base doctest hspec old-time parsec ]; + homepage = "https://github.com/phlummox/hsemail-ns/tree/hsemail-ns"; description = "Internet Message Parsers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -108379,15 +108958,15 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_1;}; - "hslua_0_9_2" = callPackage + "hslua_0_9_3" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, fail , lua5_1, mtl, QuickCheck, quickcheck-instances, tasty , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "hslua"; - version = "0.9.2"; - sha256 = "1n1fw2ak3xk4llv3d3bbpcayjd6h2a83n06i96m2k30lzanbg0ys"; + version = "0.9.3"; + sha256 = "1ml64f8faz17qfp0wm9fqgribcf8fvyhazjk9a1385fsjy96ks8m"; configureFlags = [ "-fsystem-lua" ]; libraryHaskellDepends = [ base bytestring containers exceptions fail mtl text @@ -109027,15 +109606,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hspec-golden-aeson_0_3_1_0" = callPackage + "hspec-golden-aeson_0_4_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , filepath, hspec, hspec-core, QuickCheck, quickcheck-arbitrary-adt , random, silently, transformers }: mkDerivation { pname = "hspec-golden-aeson"; - version = "0.3.1.0"; - sha256 = "13f8cchzgnwijx91frcvg3vj1cqvs8flng0xxjaszffnbysh52fr"; + version = "0.4.0.0"; + sha256 = "03gsw9jamkjwj5vhlhg9xz7214d71py94qx0daym7gjiq4zpw1gk"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring directory filepath hspec QuickCheck quickcheck-arbitrary-adt random transformers @@ -109266,6 +109845,7 @@ self: { homepage = "https://github.com/yamadapc/haskell-hspec-setup"; description = "Add an hspec test-suite in one command"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-shouldbe" = callPackage @@ -109903,12 +110483,12 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "hsshellscript_3_4_4" = callPackage + "hsshellscript_3_4_5" = callPackage ({ mkDerivation, base, c2hs, directory, parsec, random, unix }: mkDerivation { pname = "hsshellscript"; - version = "3.4.4"; - sha256 = "0093zl8lfyldn8r1mi53glf286606m36fmxj6nc0pak68ibmkdwv"; + version = "3.4.5"; + sha256 = "0d66gsm7s2j4f60cjca6fsddg4i1m3l6rcyq29ywskifhfaxbgvx"; libraryHaskellDepends = [ base directory parsec random unix ]; libraryToolDepends = [ c2hs ]; homepage = "http://www.volker-wysk.de/hsshellscript/"; @@ -110353,8 +110933,8 @@ self: { }: mkDerivation { pname = "hsyslog-tcp"; - version = "0.2.0.0"; - sha256 = "1zbp8l5lj2xb6yczijd76dhdbxfzxpl7han1b01bc8qfw7pkj4g9"; + version = "0.2.1.0"; + sha256 = "09kr9mcjd41xl5an8ddfrcyx8dc1fgfq70mkw6m96dvcmhryf0gv"; libraryHaskellDepends = [ base bytestring hsyslog hsyslog-udp network text time ]; @@ -110370,8 +110950,8 @@ self: { }: mkDerivation { pname = "hsyslog-udp"; - version = "0.1.2"; - sha256 = "1bm4pbvyqjpfr55l0rzfdq76bsfx1g2bzd83c01scl4i0cc1svhs"; + version = "0.2.0"; + sha256 = "0z4jpgdp5brfpzw5xawwxx7i239xjxgr1rjvrv2fyd6d6ixg3gwl"; libraryHaskellDepends = [ base bytestring hsyslog network text time unix ]; @@ -111206,6 +111786,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-conduit_2_2_4" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring + , case-insensitive, conduit, conduit-extra, connection, cookie + , data-default-class, exceptions, hspec, http-client + , http-client-tls, http-types, HUnit, lifted-base, monad-control + , mtl, network, resourcet, streaming-commons, temporary, text, time + , transformers, utf8-string, wai, wai-conduit, warp, warp-tls + }: + mkDerivation { + pname = "http-conduit"; + version = "2.2.4"; + sha256 = "1wcl3lpg4v1ylq9j77j9fmf6l9qbmp8dmj3a9829q19q6bbgza7l"; + libraryHaskellDepends = [ + aeson base bytestring conduit conduit-extra exceptions http-client + http-client-tls http-types lifted-base monad-control mtl resourcet + transformers + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive conduit + conduit-extra connection cookie data-default-class hspec + http-client http-types HUnit lifted-base network resourcet + streaming-commons temporary text time transformers utf8-string wai + wai-conduit warp warp-tls + ]; + doCheck = false; + homepage = "http://www.yesodweb.com/book/http-conduit"; + description = "HTTP client package with conduit interface and HTTPS support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-conduit-browser" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , case-insensitive, conduit, containers, cookie, data-default @@ -111725,6 +112336,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-streams_0_8_5_5" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base + , base64-bytestring, blaze-builder, bytestring, Cabal + , case-insensitive, directory, ghc-prim, HsOpenSSL, hspec + , hspec-expectations, http-common, HUnit, io-streams, lifted-base + , mtl, network, network-uri, openssl-streams, snap-core + , snap-server, system-fileio, system-filepath, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "http-streams"; + version = "0.8.5.5"; + sha256 = "1g2ygxyfq2x923df5q83wkrwhy2631r33zvffgj3fn0zwr024hhf"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-builder bytestring + case-insensitive directory HsOpenSSL http-common io-streams mtl + network network-uri openssl-streams text transformers + unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty attoparsec base base64-bytestring blaze-builder + bytestring case-insensitive directory ghc-prim HsOpenSSL hspec + hspec-expectations http-common HUnit io-streams lifted-base mtl + network network-uri openssl-streams snap-core snap-server + system-fileio system-filepath text transformers + unordered-containers + ]; + homepage = "http://github.com/afcowie/http-streams/"; + description = "An HTTP client using io-streams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-test" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client, lens , lens-aeson, mtl, tasty, tasty-hunit, text, time, wreq @@ -112930,8 +113575,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "2.1.3"; - sha256 = "006lkyjwjsn1npznzv9ysqsap2f7w3gsxn8rimlpv0manvk8h5bg"; + version = "2.2.0"; + sha256 = "1wc6vngnjgpmkhiq4zfn1plqf0q636nsr5nkvmq20rzlg35w8az9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114936,6 +115581,7 @@ 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) gmp;}; "ieee" = callPackage @@ -116815,15 +117461,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "inline-java_0_7_0" = callPackage + "inline-java_0_7_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath, ghc , hspec, jni, jvm, language-java, mtl, process, template-haskell , temporary, text }: mkDerivation { pname = "inline-java"; - version = "0.7.0"; - sha256 = "12lzh63wg0nk1lcn9627mbyf251ijlcc65iasmmnwljkxg0qrkf7"; + version = "0.7.1"; + sha256 = "000qzhjg2qah379dlhshgxqzm4mslcv6d5cwqycvx8q3hxginv08"; libraryHaskellDepends = [ base bytestring Cabal directory filepath ghc jni jvm language-java mtl process template-haskell temporary text @@ -117168,14 +117814,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "integer-gmp_1_0_0_1" = callPackage + "integer-gmp_1_0_1_0" = callPackage ({ mkDerivation, ghc-prim }: mkDerivation { pname = "integer-gmp"; - version = "1.0.0.1"; - sha256 = "08f1qcp57aj5mjy26dl3bi3lcg0p8ylm0qw4c6zbc1vhgnmxl4gg"; + version = "1.0.1.0"; + sha256 = "1xrdqksharn0jg8m1d7zm8nhbsq3abw2k25kzw0z7m0zm14n1nlw"; revision = "1"; - editedCabalFile = "1mfl651b2v82qhm5h279mjhq4ilzf6x1yydi3npa10ja6isifvb1"; + editedCabalFile = "02xp5ldq3xxx1qdxg7gbs2zcqpf1dxbdrvrzizxnjwhpiqxcigy3"; libraryHaskellDepends = [ ghc-prim ]; description = "Integer library based on GMP"; license = stdenv.lib.licenses.bsd3; @@ -117602,8 +118248,8 @@ self: { }: mkDerivation { pname = "intrinsic-superclasses"; - version = "0.1.0.0"; - sha256 = "0vvkh65fdm6sgx3m5irk6l96krg99f14h3z45lz19z6xj57627y5"; + version = "0.2.0.0"; + sha256 = "0bx8igqwpyhs1q8rhyxhc5389nx49ynfq08bis30x9gdq209dqih"; libraryHaskellDepends = [ base containers haskell-src-meta mtl template-haskell ]; @@ -117741,6 +118387,30 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "invariant_0_5" = callPackage + ({ mkDerivation, array, base, bifunctors, comonad, containers + , contravariant, ghc-prim, hspec, profunctors, QuickCheck + , semigroups, StateVar, stm, tagged, template-haskell + , th-abstraction, transformers, transformers-compat + , unordered-containers + }: + mkDerivation { + pname = "invariant"; + version = "0.5"; + sha256 = "1zz9a5irmpma5qchvvp7qin1s7cfnhvpg3b452xxysgbxvmcmfw0"; + libraryHaskellDepends = [ + array base bifunctors comonad containers contravariant ghc-prim + profunctors semigroups StateVar stm tagged template-haskell + th-abstraction transformers transformers-compat + unordered-containers + ]; + testHaskellDepends = [ base hspec QuickCheck template-haskell ]; + homepage = "https://github.com/nfrisby/invariant-functors"; + description = "Haskell98 invariant functors"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "invertible" = callPackage ({ mkDerivation, base, haskell-src-meta, invariant, lens , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell @@ -120320,6 +120990,8 @@ self: { pname = "jose-jwt"; version = "0.7.7"; sha256 = "07mq4w4gvak8gahxdx3rwykwqqisxma8faxi4k0xfk6jcpai0snl"; + revision = "1"; + editedCabalFile = "1qphrj2fb11kv79j92818lcdzvcldm18gfd85fmlrqmfjmig34wq"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal containers cryptonite either memory mtl text time unordered-containers vector @@ -120334,6 +121006,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "jose-jwt_0_7_8" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal + , containers, criterion, cryptonite, doctest, either, hspec, HUnit + , memory, mtl, QuickCheck, text, time, transformers + , transformers-compat, unordered-containers, vector + }: + mkDerivation { + pname = "jose-jwt"; + version = "0.7.8"; + sha256 = "0azkqllqc35hp2d2q50cwk472amhf0q5fkqs04a4kpnj50z6kqfk"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring cereal containers cryptonite + either memory mtl text time transformers transformers-compat + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring cryptonite doctest either hspec HUnit memory + mtl QuickCheck text unordered-containers vector + ]; + benchmarkHaskellDepends = [ base bytestring criterion cryptonite ]; + 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 ({ mkDerivation, base, mtl }: mkDerivation { @@ -121093,8 +121791,8 @@ self: { pname = "json-schema"; version = "0.7.4.1"; sha256 = "15kwgpkryd865nls9zm6ya6jzmiygsb537ij7ps39dzasqbnl3an"; - revision = "9"; - editedCabalFile = "0g7hyapnlzid4ix7nrw3rxgn1vcd63hb34blyj5ldmzwz76qqp0b"; + revision = "10"; + editedCabalFile = "03h9hh2bmplgz62hsh5zk6i1i39k51jxifkcb2j8kgpbf85wb4gv"; libraryHaskellDepends = [ aeson base containers generic-aeson generic-deriving mtl scientific text time unordered-containers vector @@ -121551,8 +122249,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.3"; - sha256 = "0fpzbijv73drgk79rf8qyr2w4kfvxbpysbi9y9v2qx5na9y3krci"; + version = "0.3.1"; + sha256 = "0dg54vbn9cxcskyc92grz39zp863ki6da8kwdz0nfkfm5xzsxlrs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121658,15 +122356,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "jvm_0_3_0" = callPackage + "jvm_0_4_0_1" = callPackage ({ mkDerivation, base, bytestring, choice, constraints, criterion , deepseq, distributed-closure, exceptions, hspec, jni, singletons , text, vector }: mkDerivation { pname = "jvm"; - version = "0.3.0"; - sha256 = "1fjaanz7h3z5py71kq880wc140jp48khs18chx3gzwas22cpw9ap"; + version = "0.4.0.1"; + sha256 = "0zazz893fxzh8hdc2k2irg0l5ic2v2h7z2cb60ngiarvrr07hpvl"; libraryHaskellDepends = [ base bytestring choice constraints distributed-closure exceptions jni singletons text vector @@ -121736,14 +122434,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "jvm-streaming_0_2_1" = callPackage + "jvm-streaming_0_2_2" = callPackage ({ mkDerivation, base, distributed-closure, hspec, inline-java, jni , jvm, singletons, streaming }: mkDerivation { pname = "jvm-streaming"; - version = "0.2.1"; - sha256 = "06n660fa5xbmw20064gyjp2sx3mvqs1cx12s77w7wn1cfk0ckair"; + version = "0.2.2"; + sha256 = "1s0bla6yhw1ic637h2ss8f3aihc26ca5bndhsi5g02fn0gzw644m"; libraryHaskellDepends = [ base distributed-closure inline-java jni jvm singletons streaming ]; @@ -124898,6 +125596,7 @@ self: { homepage = "https://github.com/beijaflor-io/language-dockerfile#readme"; description = "Dockerfile linter, parser, pretty-printer and embedded DSL"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-dot" = callPackage @@ -127144,6 +127843,7 @@ self: { ]; description = "Van Laarhoven lenses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lenz-template" = callPackage @@ -128284,6 +128984,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lift-generics_0_1_2" = callPackage + ({ mkDerivation, base, base-compat, generic-deriving, ghc-prim + , hspec, template-haskell + }: + mkDerivation { + pname = "lift-generics"; + version = "0.1.2"; + sha256 = "0kk05dp6n93jgxq4x1lrckjrca6lrwa7qklr3vpzc6iyrlbvv7qf"; + libraryHaskellDepends = [ + base generic-deriving ghc-prim template-haskell + ]; + testHaskellDepends = [ + base base-compat generic-deriving hspec template-haskell + ]; + homepage = "https://github.com/RyanGlScott/lift-generics"; + description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lifted-async" = callPackage ({ mkDerivation, async, base, constraints, criterion, deepseq , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit @@ -130278,6 +130998,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {llvm-config = null;}; + "llvm-hs-pretty" = callPackage + ({ mkDerivation, array, base, bytestring, directory, filepath + , llvm-hs, llvm-hs-pure, mtl, pretty-show, tasty, tasty-golden + , tasty-hspec, tasty-hunit, text, transformers, wl-pprint-text + }: + mkDerivation { + pname = "llvm-hs-pretty"; + version = "0.1.0.0"; + sha256 = "1p16vhxx7w1hdb130c9mls45rwyq8hix1grnwdj92rbrqbjwk7l3"; + libraryHaskellDepends = [ + array base bytestring llvm-hs-pure text wl-pprint-text + ]; + testHaskellDepends = [ + base directory filepath llvm-hs llvm-hs-pure mtl pretty-show tasty + tasty-golden tasty-hspec tasty-hunit text transformers + ]; + homepage = "https://github.com/llvm-hs/llvm-hs-pretty"; + description = "Pretty printer for LLVM IR"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "llvm-hs-pure" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, mtl , tasty, tasty-hunit, tasty-quickcheck, template-haskell @@ -130495,7 +131237,7 @@ self: { homepage = "https://github.com/verement/lmdb-simple#readme"; description = "Simple API for LMDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lmonad" = callPackage @@ -130993,8 +131735,8 @@ self: { }: mkDerivation { pname = "log-warper"; - version = "1.7.2"; - sha256 = "1qf1686wbad3hr908spd1g5q7n00dg3z8ql4aradkl4lb965dn02"; + version = "1.7.4"; + sha256 = "0jhlf35h4db34ggq5gm53m71wbr3pddy6b3bbvmy9cd22d58nr6r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135655,6 +136397,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mega-sdist_0_3_0_5" = callPackage + ({ mkDerivation, base, bytestring, classy-prelude-conduit + , conduit-extra, directory, filepath, http-conduit, optparse-simple + , tar-conduit, temporary, text, typed-process, yaml + }: + mkDerivation { + pname = "mega-sdist"; + version = "0.3.0.5"; + sha256 = "1rdx74bxiwrcp0k8h8028b65nbcmgcbpg7jnzli91y8nzr2qql6c"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring classy-prelude-conduit conduit-extra directory + filepath http-conduit optparse-simple tar-conduit temporary text + typed-process yaml + ]; + homepage = "https://github.com/snoyberg/mega-sdist#readme"; + description = "Handles uploading to Hackage from mega repos"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "megaparsec" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , exceptions, hspec, hspec-expectations, mtl, QuickCheck @@ -136071,6 +136835,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "memory_0_14_10" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, foundation + , ghc-prim, tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "memory"; + version = "0.14.10"; + sha256 = "01i1nx83n5lspwdhkhhjxxcp9agf9y70547dzs5m8zl043jmd0z4"; + libraryHaskellDepends = [ + base basement bytestring deepseq foundation ghc-prim + ]; + testHaskellDepends = [ + base foundation tasty tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/vincenthz/hs-memory"; + description = "memory and related abstraction stuff"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "memorypool" = callPackage ({ mkDerivation, base, containers, transformers, unsafe, vector }: mkDerivation { @@ -136178,6 +136962,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "merkle-tree" = callPackage + ({ mkDerivation, base, bytestring, cereal, cryptonite, memory + , protolude, QuickCheck, random, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "merkle-tree"; + version = "0.1.0"; + sha256 = "0k9ifkl8ywp0svn83rlczrq2s1aamwri2vx25cs42f64bgxr7ics"; + revision = "1"; + editedCabalFile = "1ibsr79qmzykn2i7p8zvzp8v79lsr54gc3zdqmfgk2cjx1x8k6dz"; + libraryHaskellDepends = [ + base bytestring cereal cryptonite memory protolude random + ]; + testHaskellDepends = [ + base bytestring cereal cryptonite memory protolude QuickCheck + random tasty tasty-quickcheck + ]; + homepage = "https://github.com/adjoint-io/merkle-tree#readme"; + description = "An implementation of a Merkle Tree and merkle tree proofs"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mersenne-random" = callPackage ({ mkDerivation, base, old-time }: mkDerivation { @@ -136744,6 +137551,7 @@ self: { ]; description = "Bindings to the Microsoft Translator API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microspec" = callPackage @@ -136960,8 +137768,8 @@ self: { }: mkDerivation { pname = "midimory"; - version = "0.0.1"; - sha256 = "051zk3k1qiap75xf4s50jcn9sr030mxrhdrpiv12swdqqm9brk3h"; + version = "0.0.2.1"; + sha256 = "07p0f7a0nm7h8li8rl6adrszrz7hhzn19mfy0vgkw8axdaira66r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -137797,14 +138605,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mixed-types-num_0_3_1_3" = callPackage + "mixed-types-num_0_3_1_4" = callPackage ({ mkDerivation, base, convertible, hspec, hspec-smallcheck , QuickCheck, smallcheck, template-haskell }: mkDerivation { pname = "mixed-types-num"; - version = "0.3.1.3"; - sha256 = "0945zl9g1lpvpgqmaqm168zx6l1zydw9waivh7nm4alfr8awys60"; + version = "0.3.1.4"; + sha256 = "0061in4wv9hs5d8bvq5ycv8x176z3fz8fcfymwghmbjybbmgzzy4"; libraryHaskellDepends = [ base convertible hspec hspec-smallcheck QuickCheck smallcheck template-haskell @@ -137923,8 +138731,8 @@ self: { }: mkDerivation { pname = "mmark"; - version = "0.0.1.1"; - sha256 = "06i95kjr7vhab5g6m8rypm31yxqk9lim5117n100cc19vk85fyqp"; + version = "0.0.2.0"; + sha256 = "0d5rvdb81239k8a6fyccad5mvlzq1k485dad2waxkidihakj6fk1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class deepseq email-validate @@ -137947,8 +138755,8 @@ self: { }: mkDerivation { pname = "mmark-ext"; - version = "0.0.1.0"; - sha256 = "0psjpz22brhav2qpp3vwiai0hnp9i0rlhmpilqll8c467sk4lysl"; + version = "0.0.1.1"; + sha256 = "0wsilw9mlh77qvxgpzay09b8xfsjz3dbrabd1wvw0whwf2cnzpp7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base data-default-class foldl lucid mmark modern-uri text @@ -138120,15 +138928,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "model_0_4_2" = callPackage + "model_0_4_4" = callPackage ({ mkDerivation, base, containers, convertible, deepseq, doctest , either, filemanip, ghc-prim, pretty, tasty, tasty-hunit , tasty-quickcheck, transformers }: mkDerivation { pname = "model"; - version = "0.4.2"; - sha256 = "0ynv6fwns4ix0nhz8b3aqsw6q9avn7n60spakhpa30lya9asinjb"; + version = "0.4.4"; + sha256 = "1mmv1m78ychgqp0mblm56fszfmnxap3jwvxviy0h06s6wl2adq24"; libraryHaskellDepends = [ base containers convertible deepseq either pretty transformers ]; @@ -138459,16 +139267,16 @@ self: { }) {}; "monad-abort-fd" = callPackage - ({ mkDerivation, base, monad-control, mtl, transformers - , transformers-abort, transformers-base + ({ mkDerivation, base, mtl, transformers, transformers-abort + , transformers-base, transformers-compat }: mkDerivation { pname = "monad-abort-fd"; - version = "0.5"; - sha256 = "1yyqbs2zq6rkz0rk36k1c4p7d4f2r6jkf1pzg3a0wbjdqk01ayb7"; + version = "0.6"; + sha256 = "0a9ykj8cp817qlzvz7l5502zmwhiqa5236xvnsf93x38h34xwx5m"; libraryHaskellDepends = [ - base monad-control mtl transformers transformers-abort - transformers-base + base mtl transformers transformers-abort transformers-base + transformers-compat ]; homepage = "https://github.com/mvv/monad-abort-fd"; description = "A better error monad transformer"; @@ -138743,8 +139551,8 @@ self: { pname = "monad-http"; version = "0.1.0.0"; sha256 = "14ki66l60la1mmm544vvzn930liaygj6zrql10nr192shf3v0cx3"; - revision = "6"; - editedCabalFile = "0xnh69yfpgz1i43x2695gyrxar1582m02cwrzmvfymzvvqbkcwld"; + revision = "7"; + editedCabalFile = "19qsjwcdg39is6ipwl6hgr42c7gyc7p1cs5f8isxy90hb4xjghrh"; libraryHaskellDepends = [ base base-compat bytestring exceptions http-client http-client-tls http-types monad-logger monadcryptorandom MonadRandom mtl text @@ -138896,6 +139704,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger_0_3_26" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, conduit + , conduit-extra, exceptions, fast-logger, lifted-base + , monad-control, monad-loops, mtl, resourcet, stm, stm-chans + , template-haskell, text, transformers, transformers-base + , transformers-compat, unliftio-core + }: + mkDerivation { + pname = "monad-logger"; + version = "0.3.26"; + sha256 = "0p7mdiv0n4wizcam2lw143szs584yzs0bq9lfrn90pgvz0q7k1ia"; + libraryHaskellDepends = [ + base blaze-builder bytestring conduit conduit-extra exceptions + fast-logger lifted-base monad-control monad-loops mtl resourcet stm + stm-chans template-haskell text transformers transformers-base + transformers-compat unliftio-core + ]; + homepage = "https://github.com/kazu-yamamoto/logger"; + description = "A class of monads which can log messages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-logger-json" = callPackage ({ mkDerivation, aeson, base, monad-logger, template-haskell, text }: @@ -139536,8 +140367,8 @@ self: { ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "monad-var"; - version = "0.1.1.1"; - sha256 = "1j9ydl29a4cqhkackcpzlp7amiwk0ifvyxdcmi2vka7m1d98jc6z"; + version = "0.1.2.0"; + sha256 = "1nj10lhijwvim7js2vl9b9qq7x55dx7bk6q4jmvpz99c2vqfhyy5"; libraryHaskellDepends = [ base stm transformers ]; homepage = "https://github.com/effectfully/monad-var#readme"; description = "Generic operations over variables"; @@ -140049,6 +140880,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mono-traversable_1_0_5_0" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, foldl + , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split + , text, transformers, unordered-containers, vector + , vector-algorithms + }: + mkDerivation { + pname = "mono-traversable"; + version = "1.0.5.0"; + sha256 = "1zrn7wp938di4mdc8q0z4imgg2hky7ap98ralzf8rdgqfrrvfpa6"; + libraryHaskellDepends = [ + base bytestring containers hashable split text transformers + unordered-containers vector vector-algorithms + ]; + testHaskellDepends = [ + base bytestring containers foldl hspec HUnit QuickCheck semigroups + text transformers unordered-containers vector + ]; + benchmarkHaskellDepends = [ base criterion mwc-random vector ]; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; + description = "Type classes for mapping, folding, and traversing monomorphic containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mono-traversable-instances" = callPackage ({ mkDerivation, base, comonad, containers, dlist, dlist-instances , mono-traversable, semigroupoids, semigroups, transformers @@ -142624,6 +143480,8 @@ self: { pname = "myanimelist-export"; version = "0.2.0.0"; sha256 = "1d9fqna5qavp1lzpsg8yg816m3smybdsx25gafqr9wc2555rj1gg"; + revision = "1"; + editedCabalFile = "1ni5bmhfra2rlxlv55iah865shyibz7bwl2zz6161v4s35bs68dj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144751,17 +145609,22 @@ self: { }) {}; "network-dns" = callPackage - ({ mkDerivation, base, binary, bytestring, cereal, containers - , data-textual, hashable, network-ip, parsers, tagged, text-latin1 - , text-printer + ({ mkDerivation, base, bytestring, containers, data-serializer + , data-textual, hashable, network-ip, parsers, posix-socket + , text-latin1, text-printer, type-hint }: mkDerivation { pname = "network-dns"; - version = "1.0.0.1"; - sha256 = "0gg1g1gnbi6dzw5anz3dam2gh09q948d3k7q84agkswa64c0azn8"; + version = "1.1.0.1"; + sha256 = "0q709qfhph93k8yni6047yr2zhswmc3cvizyyk63vmh3h2dwfmgs"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base binary bytestring cereal containers data-textual hashable - network-ip parsers tagged text-latin1 text-printer + base bytestring containers data-serializer data-textual hashable + network-ip parsers text-latin1 text-printer type-hint + ]; + executableHaskellDepends = [ + base data-serializer data-textual network-ip posix-socket ]; homepage = "https://github.com/mvv/network-dns"; description = "Domain Name System data structures"; @@ -144833,6 +145696,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-info_0_2_0_9" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "network-info"; + version = "0.2.0.9"; + sha256 = "0rmajccwhkf0p4inb8jjj0dzsksgn663w90km00xvf4mq3pkjab3"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/jystic/network-info"; + description = "Access the local computer's basic network configuration"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-interfacerequest" = callPackage ({ mkDerivation, base, bytestring, ioctl, network }: mkDerivation { @@ -146054,6 +146930,20 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) nix;}; + "nix-paths_1_0_1" = callPackage + ({ mkDerivation, base, nix, nix-hash, process }: + mkDerivation { + pname = "nix-paths"; + version = "1.0.1"; + sha256 = "1y09wl1ihxmc9p926g595f70pdcsx78r3q5n5rna23lpq8xicdxb"; + libraryHaskellDepends = [ base process ]; + libraryToolDepends = [ nix nix-hash ]; + homepage = "https://github.com/peti/nix-paths"; + description = "Knowledge of Nix's installation directories"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) nix; nix-hash = null;}; + "nixfromnpm" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring , classy-prelude, containers, curl, data-default, data-fix @@ -146532,6 +147422,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nonce_1_0_5" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, entropy, text + , transformers, unliftio, unliftio-core + }: + mkDerivation { + pname = "nonce"; + version = "1.0.5"; + sha256 = "15gbgfmby1mlk95c1q7qd38yc5xr4z7l58b3y59aixlsp4qspind"; + libraryHaskellDepends = [ + base base64-bytestring bytestring entropy text transformers + unliftio unliftio-core + ]; + homepage = "https://github.com/prowdsponsor/nonce"; + description = "Generate cryptographic nonces"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nondeterminism" = callPackage ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }: mkDerivation { @@ -149719,10 +150627,10 @@ self: { }: mkDerivation { pname = "optparse-applicative-simple"; - version = "1.0.1"; - sha256 = "05zr4wcqln1vq2v1vaq4bfjiz5b7fmmjmzbnm6drplr5scsy9igm"; + version = "1.0.2"; + sha256 = "0kn740shja07mpaj9hy5blw1bcgy6ncpfyz3rqy3cglh2fzswsk2"; libraryHaskellDepends = [ - attoparsec base-prelude optparse-applicative text + attoparsec attoparsec-data base-prelude optparse-applicative text ]; testHaskellDepends = [ attoparsec-data rerebase ]; homepage = "https://github.com/nikita-volkov/optparse-applicative-simple"; @@ -152561,12 +153469,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "parser-combinators_0_2_0" = callPackage + "parser-combinators_0_2_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "parser-combinators"; - version = "0.2.0"; - sha256 = "1gz3kh56471924y12vvmrc5w4bx85a53qrp2j8fp33nn78bvx8v8"; + version = "0.2.1"; + sha256 = "1iai2i4kr7f8fbvvm4xw4hqcwnv26g0gaglpcim9r36jmzhf2yna"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/mrkkrp/parser-combinators"; description = "Lightweight package providing commonly useful parser combinators"; @@ -153933,6 +154841,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pedersen-commitment" = callPackage + ({ mkDerivation, base, bytestring, containers, cryptonite, memory + , mtl, protolude, QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , text + }: + mkDerivation { + pname = "pedersen-commitment"; + version = "0.1.0"; + sha256 = "10flwinxxs1vg2giqqyazcgxrykqsj6m0kgd62b8f4wzmygws4r1"; + libraryHaskellDepends = [ + base bytestring containers cryptonite memory mtl protolude text + ]; + testHaskellDepends = [ + base bytestring containers cryptonite memory mtl protolude + QuickCheck tasty tasty-hunit tasty-quickcheck text + ]; + homepage = "https://github.com/adjoint-io/pedersen-commitment#readme"; + description = "An implementation of Pedersen commitment schemes"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "peg" = callPackage ({ mkDerivation, base, containers, filepath, haskeline, logict, mtl , parsec @@ -155188,8 +156118,8 @@ self: { }: mkDerivation { pname = "pg-store"; - version = "0.4.3"; - sha256 = "1qqy79yqhwjw094p8i4qanmjwlvym7lndnqiw10mgp0xn63rznid"; + version = "0.5.0"; + sha256 = "0f81jqs5k6gb2rnpqhawc5g2z3dziksjxrncjc844xlq3ybmr5an"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring hashable haskell-src-meta mtl postgresql-libpq scientific tagged @@ -159034,12 +159964,29 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; + "posix-socket" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, data-flags + , network-ip, transformers-base, unix + }: + mkDerivation { + pname = "posix-socket"; + version = "0.2"; + sha256 = "0ivgvpdjwiwniw7xbmlab7myhy5a631liq4864plhkrkm3hcp44y"; + libraryHaskellDepends = [ + base bytestring data-default-class data-flags network-ip + transformers-base unix + ]; + homepage = "https://github.com/mvv/posix-socket"; + description = "Bindings to the POSIX socket API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "posix-timer" = callPackage ({ mkDerivation, base, transformers-base, unix }: mkDerivation { pname = "posix-timer"; - version = "0.3"; - sha256 = "0z4j98pb46gzhi5i5pvxxm7an7am5i757p43cp2jv8pirx33k8zd"; + version = "0.3.0.1"; + sha256 = "01s9hd23xcgdnryi72vj635435ccryv98a911l0zipxmvq4d8ri8"; libraryHaskellDepends = [ base transformers-base unix ]; homepage = "https://github.com/mvv/posix-timer"; description = "Bindings to POSIX clock and timer functions"; @@ -159163,6 +160110,7 @@ self: { homepage = "https://github.com/diogob/postgres-websockets#readme"; description = "Middleware to map LISTEN/NOTIFY messages to Websockets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-binary" = callPackage @@ -159380,6 +160328,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "postgresql-schema_0_1_14" = callPackage + ({ mkDerivation, base, basic-prelude, optparse-applicative + , postgresql-simple, shelly, text, time + }: + mkDerivation { + pname = "postgresql-schema"; + version = "0.1.14"; + sha256 = "0wnmhh8pzs9hzsmqkvr89jbdbbd1j87fnly2c80rsd7wr5qcrpkk"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base basic-prelude postgresql-simple shelly text + ]; + executableHaskellDepends = [ + base basic-prelude optparse-applicative shelly text time + ]; + homepage = "https://github.com/mfine/postgresql-schema"; + description = "PostgreSQL Schema Management"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-simple" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, bytestring-builder, case-insensitive, containers @@ -159819,6 +160790,68 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "potoki" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring + , directory, foldl, hashable, potoki-core, profunctors, QuickCheck + , quickcheck-instances, random, rerebase, tasty, tasty-hunit + , tasty-quickcheck, text, unagi-chan, unordered-containers, vector + }: + mkDerivation { + pname = "potoki"; + version = "0.6.2"; + sha256 = "12smxfa1s0i018cg8py9q8yzkirnvpfzygkzc8ck9d464gm82psv"; + libraryHaskellDepends = [ + attoparsec base base-prelude bug bytestring directory foldl + hashable potoki-core profunctors text unagi-chan + unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec QuickCheck quickcheck-instances random rerebase tasty + tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/nikita-volkov/potoki"; + description = "Simple streaming in IO"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "potoki-cereal" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, cereal, potoki + , potoki-core, text + }: + mkDerivation { + pname = "potoki-cereal"; + version = "0.1"; + sha256 = "04qfs8j2kgvavacpz7x9zdza0yfl4yw56g0bca28wh7q837y073y"; + libraryHaskellDepends = [ + base base-prelude bytestring cereal potoki potoki-core text + ]; + homepage = "https://github.com/nikita-volkov/potoki-cereal"; + description = "Streaming serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "potoki-core" = callPackage + ({ mkDerivation, base, deque, profunctors, QuickCheck + , quickcheck-instances, rerebase, stm, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "potoki-core"; + version = "1.2"; + sha256 = "06d9hs15r6gr5yj9rcpw4klj3lxfjdd09nc0zwvmg1h3klqrqfxy"; + libraryHaskellDepends = [ base deque profunctors stm ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "https://github.com/nikita-volkov/potoki-core"; + description = "Low-level components of \"potoki\""; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "potrace" = callPackage ({ mkDerivation, base, bindings-potrace, bytestring, containers , data-default, JuicyPixels, vector @@ -160089,20 +161122,20 @@ self: { "preamble" = callPackage ({ mkDerivation, aeson, base, basic-prelude, exceptions - , fast-logger, lens, monad-control, monad-logger, MonadRandom, mtl - , network, resourcet, safe, shakers, template-haskell, text - , text-manipulate, time, transformers-base, unordered-containers - , uuid + , fast-logger, lens, lifted-base, monad-control, monad-logger + , MonadRandom, mtl, network, resourcet, safe, shakers + , template-haskell, text, text-manipulate, time, transformers-base + , unordered-containers, uuid }: mkDerivation { pname = "preamble"; - version = "0.0.56"; - sha256 = "0bwn4ixhgfrbjf12ahvw2hnkvx4p3818775wxnqfh72r50q54c0l"; + version = "0.0.57"; + sha256 = "04hc8cywmwwjxcgj0h26ahlnxj56awq9jnvpdgxgw5rvw4q4qqb3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base basic-prelude exceptions fast-logger lens monad-control - monad-logger MonadRandom mtl network resourcet safe + aeson base basic-prelude exceptions fast-logger lens lifted-base + monad-control monad-logger MonadRandom mtl network resourcet safe template-haskell text text-manipulate time transformers-base unordered-containers uuid ]; @@ -160685,6 +161718,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pretty-show_1_6_14" = callPackage + ({ mkDerivation, array, base, filepath, ghc-prim, happy + , haskell-lexer, pretty + }: + mkDerivation { + pname = "pretty-show"; + version = "1.6.14"; + sha256 = "1izjjcf185hdl1fsh9j6idcdghan6dzgd8a5x0k5xqx1i24yrpb2"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base filepath ghc-prim haskell-lexer pretty + ]; + libraryToolDepends = [ happy ]; + executableHaskellDepends = [ base ]; + homepage = "http://wiki.github.com/yav/pretty-show"; + description = "Tools for working with derived `Show` instances and generic inspection of values"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pretty-simple" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers , criterion, doctest, Glob, mtl, parsec, text, transformers @@ -161207,15 +162262,15 @@ self: { }) {}; "privileged-concurrency" = callPackage - ({ mkDerivation, base, contravariant, lifted-base, monad-control - , stm, transformers-base + ({ mkDerivation, base, contravariant, lifted-base, stm, unliftio + , unliftio-core }: mkDerivation { pname = "privileged-concurrency"; - version = "0.6.2"; - sha256 = "10s1xnh523aibphb895wpigg6pl97c98n48ax346d27ji5w3m3dv"; + version = "0.7.0"; + sha256 = "0yapp7imds78rqb59rdr8bx82c6iifabf3x59n937srxiws55dik"; libraryHaskellDepends = [ - base contravariant lifted-base monad-control stm transformers-base + base contravariant lifted-base stm unliftio unliftio-core ]; description = "Provides privilege separated versions of the concurrency primitives"; license = stdenv.lib.licenses.bsd3; @@ -161617,6 +162672,7 @@ self: { libraryHaskellDepends = [ base category ]; description = "Product category"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "product-isomorphic" = callPackage @@ -162081,6 +163137,7 @@ self: { homepage = "http://github.com/bitnomial/prometheus"; description = "Prometheus Haskell Client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prometheus-client" = callPackage @@ -162870,6 +163927,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "proxy-mapping" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "proxy-mapping"; + version = "0.1.0.1"; + sha256 = "12lwn64znci7l5l7sa3g7hm0rmnjvykci7k65mz5c2zdwx3zgvdd"; + libraryHaskellDepends = [ base ]; + description = "Mapping of Proxy Types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "psc-ide" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , edit-distance, either, filepath, fsnotify, hspec, http-client @@ -164146,6 +165214,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "q4c12-twofinger" = callPackage + ({ mkDerivation, base, bifunctors, Cabal, cabal-doctest, deepseq + , doctest, lens, QuickCheck, semigroupoids, streams + , template-haskell + }: + mkDerivation { + pname = "q4c12-twofinger"; + version = "0.0.0.2"; + sha256 = "036c02x5vph24a43vr58acrwny9vidmmv7536sw5b9fiynfkd343"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base bifunctors deepseq QuickCheck semigroupoids streams + ]; + testHaskellDepends = [ + base doctest lens QuickCheck streams template-haskell + ]; + homepage = "https://github.com/quasicomputational/mega/tree/master/packages/twofinger"; + description = "Efficient alternating finger trees"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "qc-oi-testgenerator" = callPackage ({ mkDerivation, base, fclabels, QuickCheck, template-haskell }: mkDerivation { @@ -164498,15 +165588,16 @@ self: { }) {}; "quantification" = callPackage - ({ mkDerivation, aeson, base, ghc-prim, hashable, path-pieces, text - , vector + ({ mkDerivation, aeson, base, containers, ghc-prim, hashable + , path-pieces, text, unordered-containers, vector }: mkDerivation { pname = "quantification"; - version = "0.2"; - sha256 = "13mvhhg7j47ff741zrbnr11f5x2bv4gqdz02g2h8rr116shb31ia"; + version = "0.3"; + sha256 = "0hljd4m55254kmcrp3iar8ya7ky5a73vk3vrmgandmb15fsp2wvy"; libraryHaskellDepends = [ - aeson base ghc-prim hashable path-pieces text vector + aeson base containers ghc-prim hashable path-pieces text + unordered-containers vector ]; homepage = "https://github.com/andrewthad/quantification#readme"; description = "Rage against the quantification"; @@ -164781,8 +165872,8 @@ self: { ({ mkDerivation, aeson, base, prim-array, primitive, QuickCheck }: mkDerivation { pname = "quickcheck-classes"; - version = "0.1"; - sha256 = "0fjr4fagl9wblw6998675pljhgwr554kxfahpjfk46kiknghqic1"; + version = "0.2"; + sha256 = "03j2647wnmp7fyxbjk80rrfc0k8i530dnyl1zlgkq11xwlyn54sr"; libraryHaskellDepends = [ aeson base prim-array primitive QuickCheck ]; @@ -164790,6 +165881,7 @@ self: { homepage = "https://github.com/andrewthad/quickcheck-classes#readme"; description = "QuickCheck common typeclasses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-combinators" = callPackage @@ -165742,20 +166834,22 @@ self: { }) {}; "rails-session" = callPackage - ({ mkDerivation, base, base-compat, base64-bytestring, bytestring - , cryptonite, filepath, http-types, pbkdf, ruby-marshal - , string-conv, tasty, tasty-hspec, transformers, vector + ({ mkDerivation, base, base-compat, base16-bytestring + , base64-bytestring, bytestring, containers, cryptonite, filepath + , http-types, pbkdf, ruby-marshal, semigroups, string-conv, tasty + , tasty-hspec, transformers, vector }: mkDerivation { pname = "rails-session"; - version = "0.1.1.0"; - sha256 = "1y4822g316wx04nsjc3pai1zmgy5c961jwqjc7c3c6glcvscd6qx"; + version = "0.1.2.0"; + sha256 = "0r1jiy7x7497zk1gvg1zbpqx2vh2i0j9x7gzscgx6gylkjkkppir"; libraryHaskellDepends = [ - base base-compat base64-bytestring bytestring cryptonite http-types - pbkdf ruby-marshal string-conv vector + base base-compat base16-bytestring base64-bytestring bytestring + containers cryptonite http-types pbkdf ruby-marshal string-conv + vector ]; testHaskellDepends = [ - base bytestring filepath ruby-marshal tasty tasty-hspec + base bytestring filepath ruby-marshal semigroups tasty tasty-hspec transformers vector ]; homepage = "http://github.com/iconnect/rails-session#readme"; @@ -165891,8 +166985,8 @@ self: { }: mkDerivation { pname = "rakuten"; - version = "0.1.0.3"; - sha256 = "1l09lw0cr32vizzad7rgmwgfz7yy535n4fawikdr8lm8yzs0nr6d"; + version = "0.1.0.4"; + sha256 = "0nxnw5b0qhjzb0zwak74x84f081p1giyzbvpinhx527ph4j96aqf"; libraryHaskellDepends = [ aeson base bytestring connection constraints data-default-class extensible http-api-data http-client http-client-tls http-types @@ -166045,6 +167139,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "random-class" = callPackage + ({ mkDerivation, base, primitive, transformers, util }: + mkDerivation { + pname = "random-class"; + version = "0.2.0.2"; + sha256 = "11nda6dgi0f3b3bzy2wahdsadf382c06xrz1dx2gnq89ym7k7qbp"; + libraryHaskellDepends = [ base primitive transformers util ]; + description = "Class of random value generation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "random-derive" = callPackage ({ mkDerivation, base, random, template-haskell }: mkDerivation { @@ -166725,12 +167830,12 @@ self: { }) {}; "rate-limit" = callPackage - ({ mkDerivation, base, stm, time-units }: + ({ mkDerivation, base, stm, time, time-units }: mkDerivation { pname = "rate-limit"; - version = "1.2.0"; - sha256 = "0djjs18ca41z1mx7a6j2cbaryq895qa7wjhyqpzl38l9d2a54p7f"; - libraryHaskellDepends = [ base stm time-units ]; + version = "1.4.0"; + sha256 = "0p0bnfnn790kkpgj6v6646fbczznf28a65zsf92xyiab00jw6ilb"; + libraryHaskellDepends = [ base stm time time-units ]; homepage = "http://github.com/acw/rate-limit"; description = "A basic library for rate-limiting IO actions"; license = stdenv.lib.licenses.bsd3; @@ -167876,7 +168981,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rebase_1_2_1" = callPackage + "rebase_1_2_2" = callPackage ({ mkDerivation, base, base-prelude, bifunctors, bytestring , containers, contravariant, contravariant-extras, deepseq, dlist , either, fail, hashable, mtl, profunctors, scientific @@ -167885,8 +168990,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.2.1"; - sha256 = "12qnx9psnq9ici4k58mwlf3g976gyhy53csllihxji71hsfjsaj3"; + version = "1.2.2"; + sha256 = "11p4wg2xissj4xzw80dww2srj2ylgw3wlnapykizy2fwjl1az9k4"; libraryHaskellDepends = [ base base-prelude bifunctors bytestring containers contravariant contravariant-extras deepseq dlist either fail hashable mtl @@ -170031,8 +171136,8 @@ self: { }: mkDerivation { pname = "relational-record-examples"; - version = "0.4.1.0"; - sha256 = "121qd6l167mm90wfzf9x4hvxflkzjq3m7k11ijaii89rb61496wj"; + version = "0.5.0.0"; + sha256 = "0p49sb8ssvhbhmq4wicj7b46q53vibw686rr3xfy6iz82j64mklb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170890,16 +171995,16 @@ self: { }) {}; "reprinter" = callPackage - ({ mkDerivation, base, bytestring, mtl, syb, syz, transformers - , uniplate + ({ mkDerivation, base, mtl, syb, syz, text, transformers, uniplate }: mkDerivation { pname = "reprinter"; - version = "0.1.0.0"; - sha256 = "0l2vz9h5y9p10kqlg2fm5fvkg5vmrs4d8kyz8ami978ic9fv6fig"; + version = "0.2.0.0"; + sha256 = "1b3hdz7qq9qk7pbx0ny4ziagjm9hi9wfi9rl0aq0b8p70zzyjiq1"; libraryHaskellDepends = [ - base bytestring mtl syb syz transformers uniplate + base mtl syb syz text transformers uniplate ]; + homepage = "https://github.com/camfort/reprinter#readme"; description = "Scrap Your Reprinter"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -171072,12 +172177,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rerebase_1_2" = callPackage + "rerebase_1_2_1" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.2"; - sha256 = "1plmy1fcvkx621cnn6dg6k61nkzsg9wrb9vf0jhc2s1vd4yfn3kw"; + version = "1.2.1"; + sha256 = "02j119pabivn2x23mvvmzlkypxwi31p7s2fpakavhqfs6bmbnb2a"; libraryHaskellDepends = [ rebase ]; homepage = "https://github.com/nikita-volkov/rerebase"; description = "Reexports from \"base\" with a bunch of other standard libraries"; @@ -171340,6 +172445,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "resourcet_1_1_10" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, lifted-base + , mmorph, monad-control, mtl, transformers, transformers-base + , transformers-compat, unliftio-core + }: + mkDerivation { + pname = "resourcet"; + version = "1.1.10"; + sha256 = "1hhw9w85nj8i2azzj5sxixffdvciq96b0jhl0zz24038bij66cyl"; + libraryHaskellDepends = [ + base containers exceptions lifted-base mmorph monad-control mtl + transformers transformers-base transformers-compat unliftio-core + ]; + testHaskellDepends = [ base hspec lifted-base transformers ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Deterministic allocation and freeing of scarce resources"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "respond" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, containers , data-default-class, exceptions, fast-logger, formatting, HList @@ -171794,6 +172919,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "retry_0_7_5_0" = callPackage + ({ mkDerivation, base, data-default-class, exceptions, ghc-prim + , hspec, HUnit, mtl, QuickCheck, random, stm, time, transformers + }: + mkDerivation { + pname = "retry"; + version = "0.7.5.0"; + sha256 = "1rganxc2lhbg5pch58bi29cv4m7zsddgwnkkjry8spwp3y8sh46p"; + libraryHaskellDepends = [ + base data-default-class exceptions ghc-prim random transformers + ]; + testHaskellDepends = [ + base data-default-class exceptions ghc-prim hspec HUnit mtl + QuickCheck random stm time transformers + ]; + homepage = "http://github.com/Soostone/retry"; + description = "Retry combinators for monadic actions that may fail"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "retryer" = callPackage ({ mkDerivation, base, optparse-applicative, process }: mkDerivation { @@ -171968,8 +173114,8 @@ self: { }: mkDerivation { pname = "rfc"; - version = "0.0.0.3"; - sha256 = "0068sckjcgcacjlj7xp0z02q60qghkji9l4frjagjsxxsskkksvc"; + version = "0.0.0.4"; + sha256 = "1zsbgq8f2a0sr575lkz6r5n0vq8jyn32q1sjxkw7d1zqkmzx1f0b"; libraryHaskellDepends = [ aeson aeson-diff async base blaze-html classy-prelude containers data-default exceptions hedis http-api-data http-client-tls @@ -172039,8 +173185,8 @@ self: { }: mkDerivation { pname = "rhine"; - version = "0.3.0.0"; - sha256 = "0isah99dzklp8igmapygwy39la03brjvvz2sqw4l3fbja6arpw3l"; + version = "0.4.0.0"; + sha256 = "18fav38bd2ysk8y5s24xxc6v381mag3g2lqpb9qayvcfj2zndx1x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172056,12 +173202,13 @@ self: { ({ mkDerivation, base, dunai, gloss, rhine }: mkDerivation { pname = "rhine-gloss"; - version = "0.3.0.0"; - sha256 = "048f9azvkd1jqak3514h9b8jsrqxnig0xpxqhan7hy4bryfnfhdb"; + version = "0.4.0.0"; + sha256 = "1sidp1f3is889g0kgdcbzpjrqndrvwvq6k713daqlkzarg9wngnj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base dunai gloss rhine ]; executableHaskellDepends = [ base ]; + description = "Wrapper to run reactive programs written in Rhine with Gloss as backend"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -172097,8 +173244,8 @@ self: { }: mkDerivation { pname = "riak"; - version = "1.1.2.1"; - sha256 = "090cvjskm7s2r2999x56ddi1iq4dcib6axqsym6v9xaii60r7qg7"; + version = "1.1.2.3"; + sha256 = "1s1ivg8l2k7mg3qd5hvgdbqp7mhczfkrwcmsnybh1yq276hhj15n"; libraryHaskellDepends = [ aeson async attoparsec base bifunctors binary blaze-builder bytestring containers data-default-class deepseq @@ -172125,12 +173272,12 @@ self: { }: mkDerivation { pname = "riak-protobuf"; - version = "0.22.0.0"; - sha256 = "06b9b9xv9y5kjrzkbycmzq9xyqxynk45qvl000ccrgwpjql7dd9j"; + version = "0.23.0.0"; + sha256 = "0cyarnp2yqlj98zdbd51krpz3ls75vcl8am6h4wf98b6vdmx1jsx"; libraryHaskellDepends = [ array base parsec protocol-buffers protocol-buffers-descriptor ]; - homepage = "http://github.com/markhibberd/riak-haskell-client"; + homepage = "http://github.com/riak-haskell-client/riak-haskell-client"; description = "Haskell types for the Riak protocol buffer API"; license = "unknown"; }) {}; @@ -172141,8 +173288,8 @@ self: { }: mkDerivation { pname = "riak-protobuf-lens"; - version = "0.22.0.0"; - sha256 = "1skb7yinin9brd55g4kwywrqhln7g32pharad3pfwjjp3xyz7qx1"; + version = "0.23.0.0"; + sha256 = "0i01p6ix5304hd9alahq5bpmcf1rzc9k2qqy6n7c002fmnwsw2zw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172673,6 +173820,7 @@ self: { homepage = "https://github.com/gianlucaguarini/rob#readme"; description = "Simple projects generator"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "robin" = callPackage @@ -175747,8 +176895,8 @@ self: { pname = "scientific"; version = "0.3.5.2"; sha256 = "0msnjz7ml0zycw9bssslxbg0nigziw7vs5km4q3vjbs8jpzpkr2w"; - revision = "1"; - editedCabalFile = "1gnz52yrd9bnq4qvd4v9kd00clx0sfbh64phafdq5g2hbk9yrg0v"; + revision = "2"; + editedCabalFile = "0wsrd213480p3pqrd6i650fr092yv7dhla7a85p8154pn5gvbr0a"; libraryHaskellDepends = [ base binary bytestring containers deepseq hashable integer-gmp integer-logarithms primitive text @@ -177213,8 +178361,8 @@ self: { pname = "semigroupoids"; version = "5.2.1"; sha256 = "006jys6kvckkmbnhf4jc51sh64hamkz464mr8ciiakybrfvixr3r"; - revision = "2"; - editedCabalFile = "049j2jl6f5mxqnavi1aadx37j4bk5xksvkxsl43hp4rg7n53p11z"; + revision = "3"; + editedCabalFile = "0wzcnpz8pyjk823vqnq5s8krsb8i6cw573hcschpd9x5ynq4li70"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant @@ -178063,8 +179211,8 @@ self: { }: mkDerivation { pname = "servant-aeson-specs"; - version = "0.5.2.0"; - sha256 = "1pgj44hi9akj7irrbzr6f96pih7g9pb35jrhnwx4483rgj4ywa17"; + version = "0.5.3.0"; + sha256 = "13xakmbr0qykff695cj631g97nlcjmmzki68c2gg5sn9jl63yq1q"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring directory filepath hspec hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt random @@ -178840,13 +179988,17 @@ self: { }) {}; "servant-generic" = callPackage - ({ mkDerivation, base, servant, servant-server, text, warp }: + ({ mkDerivation, base, network-uri, servant, servant-server, text + , warp + }: mkDerivation { pname = "servant-generic"; - version = "0.1.0.0"; - sha256 = "03gh879j9qdm666lvl2j2xiqyrgclfg2k4f1l4lslby5y81r4lv6"; + version = "0.1.0.1"; + sha256 = "1zgw5j3wx4fyb9nhifslzsbfla3iagkvix86vb1x3d9fyz117wif"; libraryHaskellDepends = [ base servant servant-server ]; - testHaskellDepends = [ base servant servant-server text warp ]; + testHaskellDepends = [ + base network-uri servant servant-server text warp + ]; description = "Specify Servant APIs with records"; license = stdenv.lib.licenses.mit; }) {}; @@ -179001,8 +180153,8 @@ self: { }: mkDerivation { pname = "servant-kotlin"; - version = "0.1.0.1"; - sha256 = "1bv6chggrpil6332nal8blnchnn6ahiblcf5q7syray7wkkmgpjk"; + version = "0.1.0.2"; + sha256 = "0dwm9aia14hr2gblcak7vyh7jgs1mnfwqq131rxyygf9d11wpx41"; libraryHaskellDepends = [ base containers directory formatting lens servant servant-foreign text time wl-pprint-text @@ -179034,6 +180186,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-match" = callPackage + ({ mkDerivation, base, bytestring, hspec, http-types, network-uri + , servant, text, utf8-string + }: + mkDerivation { + pname = "servant-match"; + version = "0.1.1"; + sha256 = "1jh817sflbkqmv38rpd20jfz5nbpyxz1n0gqx7446n745jnc2ga0"; + libraryHaskellDepends = [ + base bytestring http-types network-uri servant text utf8-string + ]; + testHaskellDepends = [ base hspec network-uri servant text ]; + homepage = "https://github.com/cocreature/servant-match#readme"; + description = "Standalone implementation of servant’s dispatching mechanism"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-matrix-param" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, doctest , hspec, http-client, http-types, servant, servant-aeson-specs @@ -180912,16 +182082,16 @@ self: { "shakers" = callPackage ({ mkDerivation, base, basic-prelude, deepseq, directory - , regex-compat, shake + , lifted-base, regex-compat, shake }: mkDerivation { pname = "shakers"; - version = "0.0.36"; - sha256 = "1l2dn9s1pijh84l0difw7sb2b3id49p64fn235lj5qybww60ijhw"; + version = "0.0.38"; + sha256 = "08wnf9cv4qsrnx2m3l1nfh74q6i14ng2js4h7gj3z5dv1ki3xwm9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base basic-prelude deepseq directory regex-compat shake + base basic-prelude deepseq directory lifted-base regex-compat shake ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/swift-nav/shakers"; @@ -181387,7 +182557,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "shelly_1_6_8_7" = callPackage + "shelly_1_7_0" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , enclosed-exceptions, exceptions, hspec, HUnit, lifted-async , lifted-base, monad-control, mtl, process, system-fileio @@ -181396,8 +182566,8 @@ self: { }: mkDerivation { pname = "shelly"; - version = "1.6.8.7"; - sha256 = "10i9n4mmrfn6v02i320f4g3wak7yyjgijaj5kf9m2qpvw6wf95mj"; + version = "1.7.0"; + sha256 = "0jscygg381hzb4mjknrwsfw0q3j4sf1w4qrz1mf4k38794axx21q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182599,6 +183769,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-sendfile_0_2_26" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , directory, hspec, HUnit, network, process, resourcet, unix + }: + mkDerivation { + pname = "simple-sendfile"; + version = "0.2.26"; + sha256 = "0z2r971bjy9wwv9rhnzh0ldd0z9zvqwyrq9yhz7m4lnf0k0wqq6z"; + libraryHaskellDepends = [ base bytestring network unix ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra directory hspec HUnit network + process resourcet unix + ]; + description = "Cross platform library for the sendfile system call"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-server" = callPackage ({ mkDerivation, base, bytestring, concurrent-extra, containers , hashtables, network, time, unbounded-delays @@ -182835,6 +184023,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "simplemesh" = callPackage + ({ mkDerivation, base, linear }: + mkDerivation { + pname = "simplemesh"; + version = "0.1.0.0"; + sha256 = "1cq8h96kr1qnxqma7if3pmxcw05nrirpnw703r4cba75xwgwlqcl"; + libraryHaskellDepends = [ base linear ]; + homepage = "https://github.com/jonascarpay/simplemesh#readme"; + description = "Generators for primitive meshes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simplenote" = callPackage ({ mkDerivation, base, bytestring, curl, dataenc, download-curl , HTTP, json, time, utf8-string @@ -183271,6 +184471,8 @@ self: { pname = "size-based"; version = "0.1.0.0"; sha256 = "1h791s39nr057w5f2fr4v7p1czw9jm0dk5qrhr26qyw97j4ysngx"; + revision = "1"; + editedCabalFile = "089942604ikg40v4nl25c4j856bylmmm06py4k2spz3y2z4k49rb"; libraryHaskellDepends = [ base dictionary-sharing template-haskell testing-type-modifiers ]; @@ -183559,7 +184761,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_4_4_1" = callPackage + "skylighting_0_5" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary , blaze-html, bytestring, case-insensitive, containers, criterion , Diff, directory, filepath, HUnit, hxt, mtl, pretty-show, random @@ -183568,8 +184770,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.4.4.1"; - sha256 = "1zvq31nbswidkr52fx91z5g326h4wnfk5sij3przgha117pl3v2j"; + version = "0.5"; + sha256 = "1as4rdzn69jyn3lmzk257j6q208a8z695jsc82jwmlsdyva1m3ic"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185995,6 +187197,8 @@ self: { pname = "soap"; version = "0.2.3.5"; sha256 = "01xprcrgy0galalh27by3csbm8m2m9dxlw3y83s4qnassv8zf2xs"; + revision = "1"; + editedCabalFile = "0ki4g5520i7bam1gmammbb0nh8ibmjskqfv7kw2qjzzg4i9q3x95"; libraryHaskellDepends = [ base bytestring conduit configurator data-default exceptions http-client http-types iconv mtl resourcet text @@ -186017,6 +187221,8 @@ self: { pname = "soap-openssl"; version = "0.1.0.2"; sha256 = "03w389yhybzvc06gpxigibqga9mr7m41rkg1ki3n686j9xzm8210"; + revision = "1"; + editedCabalFile = "1b3aivn9jfaax00id7x4cqvpmd6lgynslchlry0qsmq1lj466cdf"; libraryHaskellDepends = [ base configurator data-default HsOpenSSL http-client http-client-openssl soap text @@ -186035,6 +187241,8 @@ self: { pname = "soap-tls"; version = "0.1.1.2"; sha256 = "0xnzwzmhh2i5nci7xbnkr28hxm376fbmgjcwz7svk46k1vxvlfp4"; + revision = "1"; + editedCabalFile = "0h6jgiifrphdphxfvgk95and4a86xp6afxi90v0b93cs2zyi0vsy"; libraryHaskellDepends = [ base configurator connection data-default http-client http-client-tls soap text tls x509 x509-store x509-validation @@ -186775,7 +187983,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "sparkle_0_6" = callPackage + "sparkle_0_7" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, choice , distributed-closure, filepath, inline-java, jni, jvm , jvm-streaming, process, regex-tdfa, singletons, streaming, text @@ -186783,8 +187991,8 @@ self: { }: mkDerivation { pname = "sparkle"; - version = "0.6"; - sha256 = "11i0bk9yl8ba84xm2hfxlnspygfafdannafg42iqfg1q6f8h2y7w"; + version = "0.7"; + sha256 = "01w4b2r4pdlip4nkyc0gwh9322a8046bf1hjprj4y51f209skb7z"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -188500,69 +189708,86 @@ self: { "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async - , attoparsec, base, base-compat, base64-bytestring, binary - , binary-tagged, blaze-builder, bytestring, Cabal, clock, conduit - , conduit-extra, containers, cryptonite, cryptonite-conduit - , deepseq, directory, echo, either, errors, exceptions, extra - , fast-logger, file-embed, filelock, filepath, fsnotify - , generic-deriving, ghc-prim, gitrev, hackage-security, hashable - , hastache, hpack, hpc, hspec, http-client, http-client-tls - , http-conduit, http-types, lifted-async, lifted-base, memory - , microlens, microlens-mtl, mintty, monad-control, monad-logger - , monad-unlift, mono-traversable, mtl, neat-interpolation - , network-uri, open-browser, optparse-applicative, optparse-simple - , path, path-io, persistent, persistent-sqlite, persistent-template - , pid1, pretty, process, project-template, QuickCheck - , regex-applicative-text, resourcet, retry, safe, safe-exceptions - , semigroups, smallcheck, split, stm, store, store-core - , streaming-commons, tar, template-haskell, temporary, text - , text-binary, text-metrics, th-reify-many, time, tls, transformers - , transformers-base, unicode-transforms, unix, unix-compat - , unordered-containers, vector, vector-binary-instances, yaml - , zip-archive, zlib + , attoparsec, base, base64-bytestring, bindings-uname + , blaze-builder, bytestring, Cabal, clock, conduit, conduit-extra + , containers, cryptonite, cryptonite-conduit, deepseq, directory + , echo, exceptions, extra, fast-logger, file-embed, filelock + , filepath, fsnotify, generic-deriving, gitrev, hackage-security + , hashable, hastache, hpack, hpc, hspec, http-client + , http-client-tls, http-conduit, http-types, memory, microlens + , microlens-mtl, mintty, monad-logger, mono-traversable, mtl + , neat-interpolation, network-uri, open-browser + , optparse-applicative, optparse-simple, path, path-io, persistent + , persistent-sqlite, persistent-template, pid1, pretty, primitive + , process, project-template, QuickCheck, regex-applicative-text + , resourcet, retry, semigroups, smallcheck, split, stm, store + , store-core, streaming-commons, tar, template-haskell, temporary + , text, text-metrics, th-reify-many, time, tls, transformers + , unicode-transforms, unix, unix-compat, unliftio + , unordered-containers, vector, yaml, zip-archive, zlib }: mkDerivation { pname = "stack"; - version = "1.5.1"; - sha256 = "1hw8lwk4dxfzw27l64g2z7gscpnp7adw5cc8kplldazj0y2cnf6x"; + version = "1.6.1"; + sha256 = "0mf95h83qrgidkfvwm47w262fprsh8g5rf9mzkc1v2ifbn9b93v9"; revision = "1"; - editedCabalFile = "1ywghpdjnwzk1m67fg5hzz16hxf7pqf5wayyzk1xjbnnl989gll6"; + editedCabalFile = "103w999pac6337idj241iil52rssjp4vn5r5bvgl72sn64wxkm4x"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal async attoparsec base - base-compat base64-bytestring binary binary-tagged blaze-builder - bytestring Cabal clock conduit conduit-extra containers cryptonite - cryptonite-conduit deepseq directory echo either errors exceptions - extra fast-logger file-embed filelock filepath fsnotify - generic-deriving ghc-prim hackage-security hashable hastache hpack - hpc http-client http-client-tls http-conduit http-types - lifted-async lifted-base memory microlens microlens-mtl mintty - monad-control monad-logger monad-unlift mtl network-uri - open-browser optparse-applicative path path-io persistent - persistent-sqlite persistent-template pid1 pretty process - project-template regex-applicative-text resourcet retry safe - safe-exceptions semigroups split stm store store-core - streaming-commons tar template-haskell temporary text text-binary - text-metrics time tls transformers transformers-base - unicode-transforms unix unix-compat unordered-containers vector - vector-binary-instances yaml zip-archive zlib + base64-bytestring bindings-uname blaze-builder bytestring Cabal + clock conduit conduit-extra containers cryptonite + cryptonite-conduit deepseq directory echo exceptions extra + fast-logger file-embed filelock filepath fsnotify generic-deriving + hackage-security hashable hastache hpack hpc http-client + http-client-tls http-conduit http-types memory microlens + microlens-mtl mintty monad-logger mono-traversable mtl + neat-interpolation network-uri open-browser optparse-applicative + path path-io persistent persistent-sqlite persistent-template pid1 + pretty primitive process project-template regex-applicative-text + resourcet retry semigroups split stm store store-core + streaming-commons tar template-haskell temporary text text-metrics + th-reify-many time tls transformers unicode-transforms unix + unix-compat unliftio unordered-containers vector yaml zip-archive + zlib ]; executableHaskellDepends = [ - base bytestring Cabal conduit containers directory either filelock - filepath gitrev hpack http-client lifted-base microlens - monad-control monad-logger mtl optparse-applicative optparse-simple - path path-io split text transformers + aeson annotated-wl-pprint ansi-terminal async attoparsec base + base64-bytestring bindings-uname blaze-builder bytestring Cabal + clock conduit conduit-extra containers cryptonite + cryptonite-conduit deepseq directory echo exceptions extra + fast-logger file-embed filelock filepath fsnotify generic-deriving + gitrev hackage-security hashable hastache hpack hpc http-client + http-client-tls http-conduit http-types memory microlens + microlens-mtl mintty monad-logger mono-traversable mtl + neat-interpolation network-uri open-browser optparse-applicative + optparse-simple path path-io persistent persistent-sqlite + persistent-template pid1 pretty primitive process project-template + regex-applicative-text resourcet retry semigroups split stm store + store-core streaming-commons tar template-haskell temporary text + text-metrics th-reify-many time tls transformers unicode-transforms + unix unix-compat unliftio unordered-containers vector yaml + zip-archive zlib ]; testHaskellDepends = [ - async attoparsec base bytestring Cabal conduit conduit-extra - containers cryptonite directory exceptions filepath hashable hspec - http-client-tls http-conduit monad-logger mono-traversable - neat-interpolation optparse-applicative path path-io process - QuickCheck resourcet retry smallcheck store template-haskell - temporary text th-reify-many transformers unix-compat - unordered-containers vector yaml + aeson annotated-wl-pprint ansi-terminal async attoparsec base + base64-bytestring bindings-uname blaze-builder bytestring Cabal + clock conduit conduit-extra containers cryptonite + cryptonite-conduit deepseq directory echo exceptions extra + fast-logger file-embed filelock filepath fsnotify generic-deriving + hackage-security hashable hastache hpack hpc hspec http-client + http-client-tls http-conduit http-types memory microlens + microlens-mtl mintty monad-logger mono-traversable mtl + neat-interpolation network-uri open-browser optparse-applicative + path path-io persistent persistent-sqlite persistent-template pid1 + pretty primitive process project-template QuickCheck + regex-applicative-text resourcet retry semigroups smallcheck split + stm store store-core streaming-commons tar template-haskell + temporary text text-metrics th-reify-many time tls transformers + unicode-transforms unix unix-compat unliftio unordered-containers + vector yaml zip-archive zlib ]; doCheck = false; preCheck = "export HOME=$TMPDIR"; @@ -188707,6 +189932,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stack-yaml" = callPackage + ({ mkDerivation, base, bytestring, directory, doctest, filepath + , Glob, text, yaml + }: + mkDerivation { + pname = "stack-yaml"; + version = "0.1.0.0"; + sha256 = "14cs9mds6xfy39nzyariisqxkzpkzi0r86ldb0kw60g4wgy9m6m5"; + libraryHaskellDepends = [ + base bytestring directory filepath text yaml + ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/phlummox/stack-yaml"; + description = "Parse a stack.yaml file"; + license = stdenv.lib.licenses.mit; + }) {}; + "stack2nix" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers , data-fix, directory, filepath, Glob, hnix, monad-parallel @@ -190619,15 +191861,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stratosphere_0_13_0" = callPackage + "stratosphere_0_14_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable , hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.13.0"; - sha256 = "15b7s0jgsqrpsjh4l4i39k45qx9m0k4xsbhhm6ffzxlqi2ivkayz"; + version = "0.14.0"; + sha256 = "11y97l0qsyab8hk126qi4lj8a8d13wp8zhk2qsqwy31rcmjipr0s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190842,6 +192084,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "streaming_0_2_0_0" = callPackage + ({ mkDerivation, base, containers, exceptions, ghc-prim, mmorph + , mtl, transformers, transformers-base + }: + mkDerivation { + pname = "streaming"; + version = "0.2.0.0"; + sha256 = "08l7x3cbska45pv754nnkms1m6jmgi0qv4apsvdmc2mni4cb5jkn"; + libraryHaskellDepends = [ + base containers exceptions ghc-prim mmorph mtl transformers + transformers-base + ]; + homepage = "https://github.com/haskell-streaming/streaming"; + description = "an elementary streaming prelude and general stream type"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "streaming-binary" = callPackage ({ mkDerivation, base, binary, bytestring, hspec, streaming , streaming-bytestring @@ -191145,6 +192405,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "streamly" = callPackage + ({ mkDerivation, atomic-primops, base, containers, criterion + , exceptions, hspec, lifted-base, lockfree-queue, monad-control + , mtl, stm, transformers, transformers-base + }: + mkDerivation { + pname = "streamly"; + version = "0.1.0"; + sha256 = "1apw961n69rix4vvb7bsdald0w1qnal1vawi66nw64cyn696sbzi"; + revision = "1"; + editedCabalFile = "0cx4s17r2nn6xwa9lpcn7scvbqqxi6ihxyb20axhj5rim8iz94hm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + atomic-primops base containers exceptions lifted-base + lockfree-queue monad-control mtl stm transformers transformers-base + ]; + testHaskellDepends = [ base containers hspec ]; + benchmarkHaskellDepends = [ atomic-primops base criterion mtl ]; + homepage = "https://github.com/composewell/streamly"; + description = "Beautiful Streaming, Concurrent and Reactive Composition"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "streamproc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -191183,8 +192467,8 @@ self: { }: mkDerivation { pname = "strelka"; - version = "2.0.1"; - sha256 = "12bmfbsrgplyd42scppp74d5zck0a7vakc5jjz07lpvw0qahvxr4"; + version = "2.0.2"; + sha256 = "1lrp6llvl0g469gjgl7rl67qj8zn1ssbg61n6qwkb8lqqqpq03mq"; libraryHaskellDepends = [ attoparsec attoparsec-data base base-prelude base64-bytestring bifunctors bytestring bytestring-tree-builder hashable http-media @@ -192304,13 +193588,13 @@ self: { }) {}; "subzero" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, containers, hspec }: mkDerivation { pname = "subzero"; - version = "0.1.0.3"; - sha256 = "0va9j5vh3a4rsj7hcgq38ij7dsi08rhm43s3jsymx38q8kxhv6f8"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; + version = "0.1.0.8"; + sha256 = "0vf5crr60nixklxndpay1lp9yvhxjzmza8g5b5gz97hkyqicaid7"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers hspec ]; homepage = "https://github.com/code5hot/subzero#readme"; description = "Helps when going \"seed values\" -> alternatives and optional -> answers"; license = stdenv.lib.licenses.gpl2; @@ -196063,6 +197347,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-rerun_1_1_8" = callPackage + ({ mkDerivation, base, containers, mtl, optparse-applicative + , reducers, split, stm, tagged, tasty, transformers + }: + mkDerivation { + pname = "tasty-rerun"; + version = "1.1.8"; + sha256 = "0yg8cicfn3qaazvp4rbanzy3dyk95k3y1kkd4bykvkl9v4076788"; + libraryHaskellDepends = [ + base containers mtl optparse-applicative reducers split stm tagged + tasty transformers + ]; + homepage = "http://github.com/ocharles/tasty-rerun"; + description = "Run tests by filtering the test tree depending on the result of previous test runs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-silver" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process @@ -196592,8 +197894,8 @@ self: { }: mkDerivation { pname = "telegram-api"; - version = "0.6.3.0"; - sha256 = "0fp8ryh9pdpfycyknd9d1r9z1v0p06r87nf19x7azv4i1yl5msia"; + version = "0.7.0.0"; + sha256 = "0y9kscqn5pg99q9672l6axcnkbxjxahr7azlcw8mjwix46g5chsn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring http-api-data http-client http-media @@ -197947,6 +199249,8 @@ self: { pname = "testing-feat"; version = "0.4.0.3"; sha256 = "1kh7ak9qlxsr34hxccfgyz1ga90xxiaxqndk3jaln1f495w9rjil"; + revision = "1"; + editedCabalFile = "05j5i1sfg1k94prhwmg6z50w0flb9k181nhabwr3m9gkrrqzb4b4"; libraryHaskellDepends = [ base mtl QuickCheck tagshare template-haskell ]; @@ -198072,8 +199376,8 @@ self: { }: mkDerivation { pname = "texbuilder"; - version = "0.1.1.3"; - sha256 = "06ms5ffkrb0ray3mfix12wd2kxyh9g8dwqfzh68fxsg3r4n17gpw"; + version = "0.1.2.0"; + sha256 = "076im75jx1g37cvhvfc6a7my6m81rcgdww6y97p0ldwjbv88gsk3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -198798,7 +200102,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "text-show_3_6_2" = callPackage + "text-show_3_7" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors , bytestring, bytestring-builder, containers, contravariant , criterion, deepseq, deriving-compat, generic-deriving @@ -198808,8 +200112,8 @@ self: { }: mkDerivation { pname = "text-show"; - version = "3.6.2"; - sha256 = "1wqzdpa7wxnqaa62mmw9fqklg12i9gyiaahj6xqy2h3rdw7r5qz2"; + version = "3.7"; + sha256 = "11wnvnc87rrzg949b00vbx3pbcxskrapdy9dklh6szq6pcc38irr"; libraryHaskellDepends = [ array base base-compat bifunctors bytestring bytestring-builder containers contravariant generic-deriving ghc-boot-th ghc-prim @@ -199882,8 +201186,8 @@ self: { pname = "these"; version = "0.7.4"; sha256 = "0jl8ippnsy5zmy52cvpn252hm2g7xqp1zb1xcrbgr00pmdxpvwyw"; - revision = "1"; - editedCabalFile = "15vrym6g4vh4fbji8zxy1kxajnickmg6bq83m4hcy5bfv7rf9y39"; + revision = "2"; + editedCabalFile = "0mxl547dy7pp95kh3bvmdhsfcrmxcx8rzc94nnmcs3ahrbyw1nl1"; libraryHaskellDepends = [ aeson base bifunctors binary containers data-default-class deepseq hashable keys mtl profunctors QuickCheck semigroupoids transformers @@ -200574,14 +201878,34 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "tidal_0_9_5" = callPackage + ({ mkDerivation, base, colour, containers, hashable, hosc + , mersenne-random-pure64, mtl, parsec, safe, tasty, tasty-hunit + , text, time, websockets + }: + mkDerivation { + pname = "tidal"; + version = "0.9.5"; + sha256 = "1p288qc8g6jxf8l1d1wkcq4aqgyx2wpv7fn7ff9mikgj1xjixhqc"; + libraryHaskellDepends = [ + base colour containers hashable hosc mersenne-random-pure64 mtl + parsec safe text time websockets + ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "http://tidalcycles.org/"; + description = "Pattern language for improvised music"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tidal-midi" = callPackage ({ mkDerivation, base, containers, PortMidi, tidal, time , transformers }: mkDerivation { pname = "tidal-midi"; - version = "0.9.4"; - sha256 = "09np70rmkm75g246bm5wl2f52618ri3kd66hqhwawq586mmjj1hv"; + version = "0.9.5.2"; + sha256 = "0yjbrsg2lwj6x32ly0j6b4ms6i1s447jk2b7c6qp85pblaanmzqc"; libraryHaskellDepends = [ base containers PortMidi tidal time transformers ]; @@ -200932,6 +202256,7 @@ self: { homepage = "https://github.com/y-taka-23/time-machine#readme"; description = "A library to mock the current time"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-out" = callPackage @@ -201969,6 +203294,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tls-session-manager_0_0_0_2" = callPackage + ({ mkDerivation, auto-update, base, clock, psqueues, tls }: + mkDerivation { + pname = "tls-session-manager"; + version = "0.0.0.2"; + sha256 = "0rvmln545vghsx8zhxp44f0f6pzma8cylarmfhhysy55ipywr1n5"; + libraryHaskellDepends = [ auto-update base clock psqueues tls ]; + description = "In-memory TLS session manager"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tmapchan" = callPackage ({ mkDerivation, base, containers, hashable, stm , unordered-containers @@ -205846,6 +207183,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "typed-process_0_2_0_0" = callPackage + ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec + , process, stm, temporary, transformers + }: + mkDerivation { + pname = "typed-process"; + version = "0.2.0.0"; + sha256 = "1vc6ig5r5ajdr9d28fk1q0cb4p7nahbknn9fkzli4n9l9bk4xhdf"; + libraryHaskellDepends = [ + async base bytestring process stm transformers + ]; + testHaskellDepends = [ + async base base64-bytestring bytestring hspec process stm temporary + transformers + ]; + homepage = "https://haskell-lang.org/library/typed-process"; + description = "Run external processes, with strong typing of streams"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "typed-spreadsheet" = callPackage ({ mkDerivation, async, base, diagrams-cairo, diagrams-gtk , diagrams-lib, foldl, gtk, microlens, stm, text, transformers @@ -207197,8 +208555,8 @@ self: { pname = "union"; version = "0.1.1.2"; sha256 = "10nkcmql6ryh3vp02yxk3i1f6fbxdcsjk6s5ani89qa05448xqkw"; - revision = "1"; - editedCabalFile = "17n6f3bpw7zwa9kgfpk6sa9bwg0gsi840kkzifwmp9lakykjf0cw"; + revision = "2"; + editedCabalFile = "088dcgyg9bzm5qczcddssjfwywk9lsj10lq7byh4f9rnsf0jppna"; libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ]; benchmarkHaskellDepends = [ base criterion deepseq lens ]; description = "Extensible type-safe unions"; @@ -207679,12 +209037,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "unix-compat_0_5" = callPackage + "unix-compat_0_5_0_1" = callPackage ({ mkDerivation, base, unix }: mkDerivation { pname = "unix-compat"; - version = "0.5"; - sha256 = "0jx7r35q83sx0h46khl39azjg3zplpvgf3aiz4r4qmp3x50hwy98"; + version = "0.5.0.1"; + sha256 = "1gdf3h2knbymkivm784vq51mbcyj5y91r480awyxj5cw8gh9kwn2"; libraryHaskellDepends = [ base unix ]; homepage = "http://github.com/jystic/unix-compat"; description = "Portable POSIX-compatibility layer"; @@ -207853,6 +209211,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "unliftio_0_2_0_0" = callPackage + ({ mkDerivation, async, base, deepseq, directory, filepath + , transformers, unix, unliftio-core + }: + mkDerivation { + pname = "unliftio"; + version = "0.2.0.0"; + sha256 = "03bbhm91n0xlc207n8zzlnxp2cifr1zrcnqdys6884l062bh1xig"; + libraryHaskellDepends = [ + async base deepseq directory filepath transformers unix + unliftio-core + ]; + homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme"; + description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unliftio-core" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -209037,8 +210413,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "util"; - version = "0.1.0.0"; - sha256 = "10n0c7yxvyzf7j4i3mlkxcz1xpc7vdll80rd4pwrs7rhqmd94viw"; + version = "0.1.2.1"; + sha256 = "1m0ljqgfbs5f45mi25h1hv4q2svhjlq17xprvmaq042334cbim0s"; libraryHaskellDepends = [ base ]; description = "Utilities"; license = stdenv.lib.licenses.bsd3; @@ -210036,8 +211412,8 @@ self: { }: mkDerivation { pname = "vault-tool"; - version = "0.0.0.1"; - sha256 = "1s7q6xsq5y0hkxkb47hgnxhgy6545fvxdwsziybcsz9fbvhv7qvb"; + version = "0.0.0.3"; + sha256 = "0gs6qjahb3xl59cpbwcaqxsbzg28yw80fjyziqfd0s3vca4c9abm"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-types text unordered-containers @@ -210053,8 +211429,8 @@ self: { }: mkDerivation { pname = "vault-tool-server"; - version = "0.0.0.1"; - sha256 = "03gmjna82v1ir2iafchvkc32gndcfnw3skvyl7s5cilc75igrrnd"; + version = "0.0.0.3"; + sha256 = "07j25ksqk5fnyp3gnp79jj4l3ax3y5wf29s2kwkq9r2pjb8577g4"; libraryHaskellDepends = [ aeson async base bytestring filepath http-client process temporary text vault-tool @@ -211111,6 +212487,7 @@ self: { homepage = "http://github.com/pjones/vimeta"; description = "Frontend for video metadata tagging tools"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vimus" = callPackage @@ -211182,15 +212559,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "vinyl_0_6_0" = callPackage + "vinyl_0_7_0" = callPackage ({ mkDerivation, base, criterion, doctest, ghc-prim, hspec, lens , linear, mwc-random, primitive, should-not-typecheck, singletons , vector }: mkDerivation { pname = "vinyl"; - version = "0.6.0"; - sha256 = "1gig8ki9v4spxy4x8irhfvjb55shsd9a7a9g37v2r0hfl6k3yc4b"; + version = "0.7.0"; + sha256 = "1gch1cx10466j2cyj7q4x0s3g9sjy35l5j9mvq4sfnf4sql1cfps"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base doctest hspec lens should-not-typecheck singletons @@ -211210,8 +212587,8 @@ self: { }: mkDerivation { pname = "vinyl-gl"; - version = "0.3.1"; - sha256 = "0rnwsz9ad7sxpk68qfmav05d6pkv8w2wg7ax31v090nd9bgwhv6a"; + version = "0.3.2"; + sha256 = "1g81dbcarbllij1h197j0g1x65jb4pcd8qwfwza9i4jn4sfmgps1"; libraryHaskellDepends = [ base containers GLUtil linear OpenGL tagged transformers vector vinyl @@ -212903,7 +214280,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "wai-middleware-rollbar_0_6_0" = callPackage + "wai-middleware-rollbar_0_7_0" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , containers, hostname, hspec, hspec-golden-aeson, http-client , http-conduit, http-types, lens, lens-aeson, network, QuickCheck @@ -212911,8 +214288,8 @@ self: { }: mkDerivation { pname = "wai-middleware-rollbar"; - version = "0.6.0"; - sha256 = "1vfykph1vszap8gbv3jr5a2mr8n0hhf2v2r39f27dg9yh8f6hq4q"; + version = "0.7.0"; + sha256 = "0vs03d3xm8hmahd72znkk4zw0fz33mbs5pvqins6kyizcgi4j5f5"; libraryHaskellDepends = [ aeson base bytestring case-insensitive hostname http-client http-conduit http-types network text time unordered-containers uuid @@ -213357,6 +214734,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wai-session-postgresql_0_2_1_2" = callPackage + ({ mkDerivation, base, bytestring, cereal, cookie, data-default + , entropy, postgresql-simple, resource-pool, text, time + , transformers, wai, wai-session + }: + mkDerivation { + pname = "wai-session-postgresql"; + version = "0.2.1.2"; + sha256 = "10xc34a1l6g2lr8b4grvv17281689gdb8q1vh3kkip5lk7fp1m9r"; + libraryHaskellDepends = [ + base bytestring cereal cookie data-default entropy + postgresql-simple resource-pool text time transformers wai + wai-session + ]; + testHaskellDepends = [ + base bytestring data-default postgresql-simple text wai-session + ]; + homepage = "https://github.com/hce/postgresql-session#readme"; + description = "PostgreSQL backed Wai session store"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-session-tokyocabinet" = callPackage ({ mkDerivation, base, bytestring, cereal, errors , tokyocabinet-haskell, transformers, wai-session @@ -215015,6 +216415,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "weeder_0_1_9" = callPackage + ({ mkDerivation, aeson, base, bytestring, cmdargs, deepseq + , directory, extra, filepath, foundation, hashable, process, text + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "weeder"; + version = "0.1.9"; + sha256 = "1k5q34zyw2ajy7k5imxygs86q0a245ax5ch4kgff12pfpyz0jmz7"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring cmdargs deepseq directory extra filepath + foundation hashable process text unordered-containers vector yaml + ]; + homepage = "https://github.com/ndmitchell/weeder#readme"; + description = "Detect dead code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "weigh" = callPackage ({ mkDerivation, base, bytestring-trie, containers, deepseq, mtl , process, random, split, template-haskell, temporary @@ -216373,8 +217794,8 @@ self: { }: mkDerivation { pname = "wrecker"; - version = "1.2.2.0"; - sha256 = "03iw04jg3lmar97l9mhgd5kabfjps1dh84s7r5p9cbc6rsy5knsh"; + version = "1.2.3.0"; + sha256 = "138a8az5500ys2yvwif17vbmsmisd0r3q4yc8azfrd09y359ndlq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -218619,6 +220040,7 @@ self: { homepage = "https://gitlab.com/k0001/xmlbf"; description = "xeno backend support for the xmlbf library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmlbf-xmlhtml" = callPackage @@ -218641,6 +220063,7 @@ self: { homepage = "https://gitlab.com/k0001/xmlbf"; description = "xmlhtml backend support for the xmlbf library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmlgen" = callPackage @@ -220173,6 +221596,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-auth_1_4_21" = callPackage + ({ mkDerivation, aeson, authenticate, base, base16-bytestring + , base64-bytestring, binary, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, conduit, conduit-extra + , containers, cryptonite, data-default, email-validate, file-embed + , http-client, http-conduit, http-types, lifted-base, memory + , mime-mail, network-uri, nonce, persistent, persistent-template + , random, resourcet, safe, shakespeare, template-haskell, text + , time, transformers, unordered-containers, wai, yesod-core + , yesod-form, yesod-persistent + }: + mkDerivation { + pname = "yesod-auth"; + version = "1.4.21"; + sha256 = "1qqwg9l65m9q3l8z0r1bnihqb5rbbp2c2w6gbk49kx9127rf4488"; + libraryHaskellDepends = [ + aeson authenticate base base16-bytestring base64-bytestring binary + blaze-builder blaze-html blaze-markup byteable bytestring conduit + conduit-extra containers cryptonite data-default email-validate + file-embed http-client http-conduit http-types lifted-base memory + mime-mail network-uri nonce persistent persistent-template random + resourcet safe shakespeare template-haskell text time transformers + unordered-containers wai yesod-core yesod-form yesod-persistent + ]; + homepage = "http://www.yesodweb.com/"; + description = "Authentication for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -223076,6 +224529,7 @@ self: { homepage = "https://github.com/Qinka/Yu"; description = "The core of Yu"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yu-launch" = callPackage @@ -223092,6 +224546,7 @@ self: { homepage = "https://github.com/Qinka/Yu"; description = "The launcher for Yu"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yu-tool" = callPackage diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index da8318890f6..c38ab12ec96 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; - sha256 = "0bi0f487949k9xnl1r6ngysgaibmmswwgdqcrchg0dixnnbm9isr"; + sha256 = "0xjz8r0wbzc0kwi9q8akv7w71ii1n2y2dmb0q2p5k4h78382ybh3"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 10df09b0a68..2ccf3b2f6f6 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"; - sha256 = "0fhncs27hcdcnb9a4prkxlyvr883hnzsx148zzk7lg2b8zh19ir3"; + sha256 = "0kbl2c4zv004qwhm9mc0jlhz2pc3dqrng2vwj68a81lnzpcazkgl"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index d2c26b60757..47eeb3d3284 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-validate/${name}.tar.xz"; - sha256 = "1pgycs35bwmp4aicyxwyzlfy1i5l2rzmh2a8ivhgy21azp8jaykb"; + sha256 = "17j812pkzgbyn9ys3b305yl5mrf9nbm8whwj4iqdskr742fr8fai"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index fcd884f0a41..ca9aa8fc36e 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -1,22 +1,83 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, unzip, jre }: -stdenv.mkDerivation { - name = "saxon-6.5.3"; - builder = ./unzip-builder.sh; - src = fetchurl { - url = mirror://sourceforge/saxon/saxon6_5_3.zip; - sha256 = "0l5y3y2z4wqgh80f26dwwxwncs8v3nkz3nidv14z024lmk730vs3"; +let + common = { pname, version, src, description + , prog ? null, jar ? null, license ? stdenv.lib.licenses.mpl20 }: + stdenv.mkDerivation { + name = "${pname}-${version}"; + inherit pname version src; + + nativeBuildInputs = [ unzip ]; + + buildCommand = let + prog' = if prog == null then pname else prog; + jar' = if jar == null then pname else jar; + in '' + unzip $src -d $out + mkdir -p $out/bin $out/share $out/share/java + cp -s "$out"/*.jar "$out/share/java/" # */ + rm -rf $out/notices + mv $out/doc $out/share + cat > $out/bin/${prog'} < or it will break stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "3.8.0"; + version = "3.10.0"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "1y83z4jb2by6ara0nw4sivh7svqcrw97yfhqwdscxl4y10saisvk"; + sha256 = "03kb37iv3dvvdlslznlc0njvjpmq082lczmsslz5p4fcwb50kwfz"; }; patches = [ ./build-on-bsd.patch ]; @@ -27,9 +27,11 @@ stdenv.mkDerivation rec { libxslt xhtml1 perlPackages.XMLXPath curl libpcap ] ++ optionals stdenv.isLinux [ libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs - libapparmor libcap_ng numactl xen attr parted + libapparmor libcap_ng numactl attr parted + ] ++ optionals (stdenv.isLinux && stdenv.isx86_64) [ + xen ] ++ optionals stdenv.isDarwin [ - libiconv gmp + libiconv gmp ]; preConfigure = optionalString stdenv.isLinux '' diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 27a9860c868..d2d8b686f35 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }: +{ lib, stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }: stdenv.mkDerivation rec { name = "openexr-${lib.getVersion ilmbase}"; @@ -8,6 +8,18 @@ stdenv.mkDerivation rec { sha256 = "0ca2j526n4wlamrxb85y2jrgcv0gf21b3a19rr0gh4rjqkv1581n"; }; + patches = [ + ./bootstrap.patch + (fetchpatch { + # https://github.com/openexr/openexr/issues/232 + # https://github.com/openexr/openexr/issues/238 + name = "CVE-2017-12596.patch"; + url = "https://github.com/openexr/openexr/commit/f09f5f26c1924.patch"; + sha256 = "1d014da7c8cgbak5rgr4mq6wzm7kwznb921pr7nlb52vlfvqp4rs"; + stripLen = 1; + }) + ]; + outputs = [ "bin" "dev" "out" "doc" ]; preConfigure = '' @@ -20,8 +32,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ ./bootstrap.patch ]; - meta = with stdenv.lib; { homepage = http://www.openexr.com/; license = licenses.bsd3; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 7edc39c11f5..82f51bffa8e 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -20,6 +20,14 @@ let USE_OPENMP = "1"; }; + aarch64-linux = { + BINARY = "64"; + TARGET = "ARMV8"; + DYNAMIC_ARCH = "1"; + CC = "gcc"; + USE_OPENMP = "1"; + }; + i686-linux = { BINARY = "32"; TARGET = "P2"; diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 4039d165a4f..393d00a8176 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { "${meta.homepage}/src/gst-python/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "0iwy0v2k27wd3957ich6j5f0f04b0wb2mb175ypf2lx68snk5k7l"; + sha256 = "19rb06x2m7103zwfm0plxx95gb8bp01ng04h4q9k6ii9q7g2kxf3"; }; patches = [ ./different-path-with-pygobject.patch ]; diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix new file mode 100644 index 00000000000..b331279042c --- /dev/null +++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage +, fetchPypi +, lib +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "jsonrpclib-pelix"; + version = "0.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qs95vxplxwspbrqy8bvc195s58iy43qkf75yrjfql2sim8b25sl"; + }; + + meta = with lib; { + description = "JSON RPC client library - Pelix compatible fork"; + homepage = https://pypi.python.org/pypi/jsonrpclib-pelix/; + license = lib.licenses.asl20; + maintainers = with maintainers; [ moredread ]; + }; +} diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix new file mode 100644 index 00000000000..f5392202d4d --- /dev/null +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + version = "1.3.5"; + pname = "kafka-python"; + + src = fetchPypi { + inherit pname version; + sha256 = "19m9fdckxqngrgh0www7g8rgi7z0kq13wkhcqy1r8aa4sxad0f5j"; + }; + + checkInputs = [ pytest six mock ]; + + checkPhase = '' + py.test + ''; + + # Upstream uses tox but we don't on Nix. Running tests manually produces however + # from . import unittest + # E ImportError: cannot import name 'unittest' + doCheck = false; + + meta = with stdenv.lib; { + description = "Pure Python client for Apache Kafka"; + homepage = https://github.com/dpkp/kafka-python; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix new file mode 100644 index 00000000000..b81cc132a2d --- /dev/null +++ b/pkgs/development/python-modules/lark-parser/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: + +buildPythonPackage rec { + pname = "lark-parser"; # PyPI name + version = "2017-12-10"; + + src = fetchFromGitHub { + owner = "erezsh"; + repo = "lark"; + rev = "852607b978584ecdec68ac115dd8554cdb0a2305"; + sha256 = "1clzmvbp1b4zamcm6ldak0hkw46n3lhw4b28qq9xdl0n4va6zig7"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest + ''; + + doCheck = false; # Requires js2py + + meta = { + description = "A modern parsing library for Python, implementing Earley & LALR(1) and an easy interface"; + homepage = https://github.com/erezsh/lark; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix new file mode 100644 index 00000000000..5dc33d2d93e --- /dev/null +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchurl, python, pkgconfig, lxml, libvirt, nose }: + +buildPythonPackage rec { + pname = "libvirt"; + version = "3.10.0"; + + src = assert version == libvirt.version; fetchurl { + url = "http://libvirt.org/sources/python/${pname}-python-${version}.tar.gz"; + sha256 = "1l0fgqjnx76pzkhq540x9sf5fgzlrn0dpay90j2m4iq8nkclcbpw"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libvirt lxml ]; + + checkInputs = [ nose ]; + checkPhase = '' + nosetests + ''; + + meta = with stdenv.lib; { + homepage = http://www.libvirt.org/; + description = "libvirt Python bindings"; + license = licenses.lgpl2; + maintainers = [ maintainers.fpletz ]; + }; +} diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index fbbca9a0cfe..bea20863e7f 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which, curl, makeWrapper }: +{ stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk }: let rev = "77686b3dfa20a34270cc52377c8e37c3a461e484"; @@ -21,9 +21,12 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin + + substituteInPlace bin/sbt --replace 'declare java_cmd="java"' 'declare java_cmd="${jdk}/bin/java"' + install bin/sbt $out/bin - wrapProgram $out/bin/sbt --prefix PATH : ${stdenv.lib.makeBinPath [ which curl]} + wrapProgram $out/bin/sbt --prefix PATH : ${stdenv.lib.makeBinPath [ which curl ]} ''; meta = { diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 904e070e511..d09f06623a7 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -4,7 +4,7 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.02"; let - version = "3.0.3"; + version = "3.0.5"; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz"; - sha256 = "19gz9vcdna84xcm2b53m6b5g4c7ppb61j05fnvry3shvjiz2p58p"; + sha256 = "06h0klzzvb62rzb6m0pq8aa207fz7z54mjr05vky4wv8195bbjiy"; }; buildInputs = [ ocaml findlib yojson ] diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index f96b7888db0..d11278f4d29 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -9,11 +9,11 @@ assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; stdenv.mkDerivation rec { name = "ocp-indent-${version}"; - version = "1.6.0"; + version = "1.6.1"; src = fetchzip { url = "https://github.com/OCamlPro/ocp-indent/archive/${version}.tar.gz"; - sha256 = "1h9y597s3ag8w1z32zzv4dfk3ppq557s55bnlfw5a5wqwvia911f"; + sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw"; }; nativeBuildInputs = [ ocpBuild opam ]; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index dbb3e7c32e2..698d2924bfe 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -4,13 +4,13 @@ }: let - dfVersion = "0.43.05"; - version = "${dfVersion}-r2"; + dfVersion = "0.44.02"; + version = "${dfVersion}-alpha1"; rev = "refs/tags/${version}"; - sha256 = "18zbxri5rch750m431pdmlk4xi7nc14iif3i7glxrgy2h5nfaw5c"; + sha256 = "1cdp2jwhxl54ym92jm58xyrz942ajp6idl31qrmzcqzawp2fl620"; # revision of library/xml submodule - xmlRev = "3322beb2e7f4b28ff8e573e9bec738c77026b8e9"; + xmlRev = "e2e256066cc4a5c427172d9d27db25b7823e4e86"; arch = if stdenv.system == "x86_64-linux" then "64" diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index e7ef9a02eb7..c330471f430 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -2,15 +2,13 @@ stdenv.mkDerivation rec { name = "dwarf-therapist-original-${version}"; - version = "37.0.0-Hello71"; + version = "39.0.0"; src = fetchFromGitHub { - ## We use `Hello71`'s fork for 43.05 support - # owner = "splintermind"; - owner = "Hello71"; + owner = "Dwarf-Therapist"; repo = "Dwarf-Therapist"; - rev = "42ccaa71f6077ebdd41543255a360c3470812b97"; - sha256 = "0f6mlfck7q31jl5cb6d6blf5sb7cigvvs2rn31k16xc93hsdgxaz"; + rev = "8ae293a6b45333bbf30644d11d1987651e53a307"; + sha256 = "0p1127agr2a97gp5chgdkaa0wf02hqgx82yid1cvqpyj8amal6yg"; }; outputs = [ "out" "layouts" ]; @@ -33,9 +31,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool to manage dwarves in in a running game of Dwarf Fortress"; - maintainers = with maintainers; [ the-kenny abbradar ]; + maintainers = with maintainers; [ the-kenny abbradar bendlas ]; license = licenses.mit; platforms = platforms.linux; - homepage = https://github.com/splintermind/Dwarf-Therapist; + homepage = https://github.com/Dwarf-Therapist/Dwarf-Therapist; }; } diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index 3a1a52d44cd..6debf0bb0b2 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -1,9 +1,11 @@ -{ symlinkJoin, lib, dwarf-therapist-original, dwarf-fortress-original, makeWrapper }: +{ stdenv, symlinkJoin, lib, dwarf-therapist-original, dwarf-fortress-original, makeWrapper }: let df = dwarf-fortress-original; dt = dwarf-therapist-original; - inifile = "linux/v0.${df.baseVersion}.${df.patchVersion}.ini"; + platformSlug = if stdenv.targetPlatform.is32bit then + "linux32" else "linux64"; + inifile = "linux/v0.${df.baseVersion}.${df.patchVersion}_${platformSlug}.ini"; dfHashFile = "${df}/hash.md5"; in symlinkJoin { diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 740125bf442..54666e86cc1 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -3,8 +3,8 @@ }: let - baseVersion = "43"; - patchVersion = "05"; + baseVersion = "44"; + patchVersion = "02"; dfVersion = "0.${baseVersion}.${patchVersion}"; libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc dwarf-fortress-unfuck SDL ]; platform = @@ -12,8 +12,8 @@ let else if stdenv.system == "i686-linux" then "linux32" else throw "Unsupported platform"; sha256 = - if stdenv.system == "x86_64-linux" then "1r0b96yrdf24m9476k5x7rmp3faxr0kfwwdf35agpvlb1qbi6v45" - else if stdenv.system == "i686-linux" then "16l1lydpkbnl3zhz4i2snmjk7pps8vmw3zv0bjgr8dncbsrycd03" + if stdenv.system == "x86_64-linux" then "1w2b6sxjxb5cvmv15fxmzfkxvby4kdcf4kj4w35687filyg0skah" + else if stdenv.system == "i686-linux" then "1yqzkgyl1adwysqskc2v4wlp1nkgxc7w6m37nwllghgwfzaiqwnh" else throw "Unsupported platform"; in diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix index c87f42d58c0..17448d87f40 100644 --- a/pkgs/games/dwarf-fortress/soundsense.nix +++ b/pkgs/games/dwarf-fortress/soundsense.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "2016-1_196"; - dfVersion = "0.43.05"; + dfVersion = "0.44.02"; inherit soundPack; name = "soundsense-${version}"; src = fetchzip { diff --git a/pkgs/games/dwarf-fortress/themes/cla.nix b/pkgs/games/dwarf-fortress/themes/cla.nix index 7d1f26e9aab..78ebd430727 100644 --- a/pkgs/games/dwarf-fortress/themes/cla.nix +++ b/pkgs/games/dwarf-fortress/themes/cla.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "cla-theme-${version}"; - version = "43.05-v23"; + version = "44.01-v24"; src = fetchFromGitHub { owner = "DFgraphics"; repo = "CLA"; rev = version; - sha256 = "1i74lyz7mpfrvh5g7rajxldhw7zddc2kp8f6bgfr3hl5l8ym5ci9"; + sha256 = "1lyazrls2vr8z58vfk5nvaffyv048j5xkr4wjvp6vrqxxvrxyrfd"; }; installPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp -r data raw $out ''; - passthru.dfVersion = "0.43.05"; + passthru.dfVersion = "0.44.02"; preferLocalBuild = true; diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix index 07bbde9f148..57881686eaa 100644 --- a/pkgs/games/dwarf-fortress/themes/phoebus.nix +++ b/pkgs/games/dwarf-fortress/themes/phoebus.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "phoebus-theme-${version}"; - version = "43.05c"; + version = "44.02a"; src = fetchFromGitHub { owner = "DFgraphics"; repo = "Phoebus"; rev = version; - sha256 = "0wiz9rd5ypibgh8854h5n2xwksfxylaziyjpbp3p1rkm3r7kr4fd"; + sha256 = "10qd8fbn75fvhkyxqljn4w52kbhfp9xh1ybanjzc57bz79sdzvfp"; }; installPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp -r data raw $out ''; - passthru.dfVersion = "0.43.05"; + passthru.dfVersion = "0.44.02"; preferLocalBuild = true; diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 105da5a5731..3b0df3ce28c 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -3,14 +3,16 @@ , ncurses, glib, gtk2, libsndfile, zlib }: +let dfVersion = "0.44.02"; in + stdenv.mkDerivation { - name = "dwarf_fortress_unfuck-2016-07-13"; + name = "dwarf_fortress_unfuck-${dfVersion}"; src = fetchFromGitHub { owner = "svenstaro"; repo = "dwarf_fortress_unfuck"; - rev = "d6a4ee67e7b41bec1caa87548640643db35a6080"; - sha256 = "17p7jzmwd5z54wn6bxmic0i8y8mma3q359zcy3r9x2mp2wv1yd7p"; + rev = dfVersion; + sha256 = "0gfchfqrzx0h59mdv01hik8q2a2yx170q578agfck0nv39yhi6i5"; }; cmakeFlags = [ @@ -33,7 +35,7 @@ stdenv.mkDerivation { # Breaks dfhack because of inlining. hardeningDisable = [ "fortify" ]; - passthru.dfVersion = "0.43.05"; + passthru = { inherit dfVersion; }; meta = with stdenv.lib; { description = "Unfucked multimedia layer for Dwarf Fortress"; diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 05e851db6f8..3d904d006e4 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -38,11 +38,11 @@ let }; in -assert lib.all (x: x.dfVersion == dwarf-fortress-original.dfVersion) pkgs; - stdenv.mkDerivation rec { name = "dwarf-fortress-${dwarf-fortress-original.dfVersion}"; + compatible = lib.all (x: assert (x.dfVersion == dwarf-fortress-original.dfVersion); true) pkgs; + dfInit = substituteAll { name = "dwarf-fortress-init"; src = ./dwarf-fortress-init.in; diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 02f6026371f..9ea23423673 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -4,7 +4,7 @@ let # Choose your "paksets" of objects, images, text, music, etc. - paksets = config.simutrans.paksets or "pak64 pak128"; + paksets = config.simutrans.paksets or "pak64 pak64.japan pak128 pak128.britain pak128.german"; result = with stdenv.lib; withPaks ( if paksets == "*" then attrValues pakSpec # taking all @@ -12,15 +12,15 @@ let ); ver1 = "120"; - ver2 = "1"; - ver3 = "1"; + ver2 = "2"; + ver3 = "2"; version = "${ver1}.${ver2}.${ver3}"; ver_dash = "${ver1}-${ver2}-${ver3}"; ver2_dash = "${ver1}-${ver2}"; binary_src = fetchurl { url = "mirror://sourceforge/simutrans/simutrans/${ver_dash}/simutrans-src-${ver_dash}.zip"; - sha256 = "00cyxbn17r9p1f08jvx1wrhydxknkrxj5wk6ld912yicfql998r0"; + sha256 = "1yi6rwbrnfd65qfz63cncw2n56pbypvg6cllwh71mgvs6x2c28kz"; }; @@ -29,22 +29,21 @@ let (pakName: attrs: mkPak (attrs // {inherit pakName;})) { pak64 = { - # No release for 120.1 yet! - srcPath = "120-0/simupak64-120-0-1"; - sha256 = "0y5v1ncpjyhjkkznqmk13kg5d0slhjbbvg1y8q5jxhmhlkghk9q2"; + srcPath = "120-2/simupak64-120-2"; + sha256 = "1s310pssar4s1nf6gi9cizbx4m75avqm2qk039ha5rk8jk4lzkmk"; }; "pak64.japan" = { - # No release for 120.1 yet! + # No release for 120.2 yet! srcPath = "120-0/simupak64.japan-120-0-1"; sha256 = "14swy3h4ij74bgaw7scyvmivfb5fmp21nixmhlpk3mav3wr3167i"; }; pak128 = { - srcPath = "pak128%20for%20ST%20120%20%282.5.3%2C%20minor%20changes%29/pak128-2.5.3--ST120"; - sha256 = "19c66wvfg6rn7s9awi99cfp83hs9d8dmsjlmgn8m91a19fp9isdh"; + srcPath = "pak128%20for%20ST%20120.2.2%20%282.7%2C%20minor%20changes%29/pak128"; + sha256 = "1x6g6yfv1hvjyh3ciccly1i2k2n2b63dw694gdg4j90a543rmclg"; }; "pak128.britain" = { - srcPath = "pak128.Britain%20for%20${ver2_dash}/pak128.Britain.1.17-${ver2_dash}"; + srcPath = "pak128.Britain%20for%20120-1/pak128.Britain.1.17-120-1"; sha256 = "1nviwqizvch9n3n826nmmi7c707dxv0727m7lhc1n2zsrrxcxlr5"; }; "pak128.cs" = { # note: it needs pak128 to work @@ -53,8 +52,8 @@ let }; "pak128.german" = { url = "mirror://sourceforge/simutrans/PAK128.german/" - + "PAK128.german_0.8_${ver1}.x/PAK128.german_0.8.0_${ver1}.x.zip"; - sha256 = "1a8pc88vi59zlvff9i1f8nphdmisqmgg03qkdvrf5ks46aw8j6s5"; + + "PAK128.german_0.10.x_for_ST_120.x/PAK128.german_0.10.3_for_ST_120.x.zip"; + sha256 = "1379zcviyf3v0wsli33sqa509k6zlw6fkk57vahc44mrnhka5fpb"; }; /* This release contains accented filenames that prevent unzipping. diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 199e4bd896d..7580fd9d5bb 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -20,6 +20,10 @@ let }; patches = [ + (fetchpatch { + url = https://github.com/dezgeg/u-boot/commit/cbsize-2017-11.patch; + sha256 = "08rqsrj78aif8vaxlpwiwwv1jwf0diihbj0h88hc0mlp0kmyqxwm"; + }) (fetchpatch { url = https://github.com/dezgeg/u-boot/commit/rpi-2017-11-patch1.patch; sha256 = "067yq55vv1slv4xy346px7h329pi14abdn04chg6s1s6hmf6c1x9"; @@ -118,12 +122,24 @@ in rec { filesToInstall = ["u-boot-dtb.bin"]; }; + ubootOrangePiPc = buildUBoot rec { + defconfig = "orangepi_pc_defconfig"; + targetPlatforms = ["armv7l-linux"]; + filesToInstall = ["u-boot-sunxi-with-spl.bin"]; + }; + ubootPcduino3Nano = buildUBoot rec { defconfig = "Linksprite_pcDuino3_Nano_defconfig"; targetPlatforms = ["armv7l-linux"]; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootQemuArm = buildUBoot rec { + defconfig = "qemu_arm_defconfig"; + targetPlatforms = ["armv7l-linux"]; + filesToInstall = ["u-boot.bin"]; + }; + ubootRaspberryPi = buildUBoot rec { defconfig = "rpi_defconfig"; targetPlatforms = ["armv6l-linux"]; diff --git a/pkgs/os-specific/darwin/insert_dylib/default.nix b/pkgs/os-specific/darwin/insert_dylib/default.nix index 293572655b9..b3790b8c87c 100644 --- a/pkgs/os-specific/darwin/insert_dylib/default.nix +++ b/pkgs/os-specific/darwin/insert_dylib/default.nix @@ -15,4 +15,5 @@ stdenv.mkDerivation mkdir -p $out/bin install -m755 $prog $out/bin ''; + meta.platforms = stdenv.lib.platforms.darwin; } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 862bf028cc2..8d07fdb6462 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; import ./generic.nix (args // rec { - version = "4.14.4"; + version = "4.14.5"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ import ./generic.nix (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "17m7ws3yp6f7ivi8n4gw0i10wf77bb37r7s6jbijg6nsj3vvz49a"; + sha256 = "1nkm54h6sr9bwhm67iy8jk3vklkgxs1sxjpj9wyxb69l0fya72fm"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index cfaac832ac4..5956d197836 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.67"; + version = "4.9.68"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0zazyxn3q8bpinqvxjqkxg721vgzyk9agfbgr6hdyxvqq7fagfkz"; + sha256 = "0462cs1n04mw3df216q4qqxjgrhn76rdrnsdnf8myiccgmin0zyv"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index 365f6ce54a0..c8514ea208d 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.14.4"; + version = "4.14.5"; revision = "a"; - sha256 = "1h99nhm3yd528gj0wg71lzi8v314r6r00m8zh2cw2sz82k7fds4w"; + sha256 = "1ahh4rc0w9fnd03x6wm8s8ar9c1spw1apph8lvlfr0x1x2kh2wqh"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 7268ed30eff..c785ad4a4f7 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.15-rc2"; - modDirVersion = "4.15.0-rc2"; + version = "4.15-rc3"; + modDirVersion = "4.15.0-rc3"; extraMeta.branch = "4.15"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1i79gkjipj1q7w0d4zjz2hj43r12jicgznxk0wz0la2d8a4d3lcq"; + sha256 = "1rbyh5phx6mfr3wrz3q33gj8bgw2r76hvbzhvq1ya7fw54jjnz98"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index 4cbb83cf00c..c4d2bf04d7a 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation { ${if cross != null then stdenv.lib.attrByPath [ "uclibc" "extraConfig" ] "" cross else ""} $extraCrossConfig EOF - make oldconfig lua5_1 != null; assert enableMysql -> mysql != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.45"; + name = "lighttpd-1.4.48"; src = fetchurl { url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "0grsqh7pdqnjx6xicd96adsx84vryb7c4n21dnxfygm3xrfj55qw"; + sha256 = "0djgsx06x3p22rjvzml5klq7gqd9nk88qzlxifa7p7ajqymdb2hg"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 7b6be5ec39e..c92507b4167 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { name = "postfix-${version}"; - version = "3.2.3"; + version = "3.2.4"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "1gs025smgynrlsg44cypjam99ds92mc9q46l5085d9sy0xfrf2sv"; + sha256 = "1xn782bvzbrdwkz04smkq8ns89wbnqz11vnmz0m7jr545amfnmgc"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 0dcaa49487d..8aa14220250 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, zlib, gd, texinfo4, makeWrapper, readline +{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, texinfo +, cairo, gd, libcerf, pango, readline, zlib , withTeXLive ? false, texlive , withLua ? false, lua , emacs ? null @@ -8,13 +9,11 @@ , libXaw ? null , aquaterm ? false , withWxGTK ? false, wxGTK ? null -, pango ? null -, cairo ? null -, pkgconfig ? null , fontconfig ? null , gnused ? null , coreutils ? null -, withQt ? false, qt }: +, withQt ? false, qttools, qtbase, qtsvg +}: assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); let @@ -28,19 +27,26 @@ stdenv.mkDerivation rec { sha256 = "18diyy7aib9mn098x07g25c7jij1x7wbfpicz0z8gwxx08px45m4"; }; + nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools; + buildInputs = - [ zlib gd texinfo4 readline pango cairo pkgconfig makeWrapper ] + [ cairo gd libcerf pango readline zlib ] ++ lib.optional withTeXLive (texlive.combine { inherit (texlive) scheme-small; }) ++ lib.optional withLua lua ++ lib.optionals withX [ libX11 libXpm libXt libXaw ] - ++ lib.optional withQt qt - # compiling with wxGTK causes a malloc (double free) error on darwin - ++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK; + ++ lib.optionals withQt [ qtbase qtsvg ] + ++ lib.optional withWxGTK wxGTK; - configureFlags = - (if withX then ["--with-x"] else ["--without-x"]) - ++ (if withQt then ["--enable-qt"] else ["--disable-qt"]) - ++ (if aquaterm then ["--with-aquaterm"] else ["--without-aquaterm"]); + postPatch = '' + # lrelease is in qttools, not in qtbase. + substituteInPlace configure --replace '$'{QT5LOC}/lrelease lrelease + ''; + + configureFlags = [ + (if withX then "--with-x" else "--without-x") + (if withQt then "--with-qt=qt5" else "--without-qt") + (if aquaterm then "--with-aquaterm" else "--without-aquaterm") + ]; postInstall = lib.optionalString withX '' wrapProgram $out/bin/gnuplot \ @@ -50,6 +56,8 @@ stdenv.mkDerivation rec { --run '. ${./set-gdfontpath-from-fontconfig.sh}' ''; + enableParallelBuilding = true; + meta = with lib; { homepage = http://www.gnuplot.info/; description = "A portable command-line driven graphing utility for many platforms"; diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix new file mode 100644 index 00000000000..d4ee1661801 --- /dev/null +++ b/pkgs/tools/misc/calamares/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore +, kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase +, qtquickcontrols, qtsvg, qttools, qtwebengine, utillinux, glibc, tzdata +, ckbcomp, xkeyboard_config +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "calamares"; + version = "3.1.10"; + + # release including submodule + src = fetchurl { + url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz"; + sha256 = "12phmirx0fgvykvkl8frv5agxqi7n04sxf5bpwjwq12mydq2x7kc"; + }; + + buildInputs = [ + boost cmake extra-cmake-modules kparts.dev kpmcore.out kservice.dev + libatasmart libxcb libyamlcpp parted polkit-qt python qtbase + qtquickcontrols qtsvg qttools qtwebengine.dev utillinux + ]; + + enableParallelBuilding = false; + + cmakeFlags = [ + "-DPYTHON_LIBRARY=${python}/lib/libpython${python.majorVersion}m.so" + "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m" + "-DCMAKE_VERBOSE_MAKEFILE=True" + "-DCMAKE_BUILD_TYPE=Release" + "-DWITH_PYTHONQT:BOOL=ON" + ]; + + POLKITQT-1_POLICY_FILES_INSTALL_DIR = "$(out)/share/polkit-1/actions"; + + patchPhase = '' + sed -e "s,/usr/bin/calamares,$out/bin/calamares," \ + -i calamares.desktop \ + -i com.github.calamares.calamares.policy + + sed -e 's,/usr/share/zoneinfo,${tzdata}/share/zoneinfo,' \ + -i src/modules/locale/timezonewidget/localeconst.h \ + -i src/modules/locale/SetTimezoneJob.cpp + + sed -e 's,/usr/share/i18n/locales,${glibc.out}/share/i18n/locales,' \ + -i src/modules/locale/timezonewidget/localeconst.h + + sed -e 's,/usr/share/X11/xkb/rules/base.lst,${xkeyboard_config}/share/X11/xkb/rules/base.lst,' \ + -i src/modules/keyboard/keyboardwidget/keyboardglobal.h + + sed -e 's,"ckbcomp","${ckbcomp}/bin/ckbcomp",' \ + -i src/modules/keyboard/keyboardwidget/keyboardpreview.cpp + + sed "s,\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR},''${out}/share/polkit-1/actions," \ + -i CMakeLists.txt + ''; + + meta = with stdenv.lib; { + description = "Distribution-independent installer framework"; + license = licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ manveru ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 18176ff370d..6a7c2cc095d 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,28 +2,23 @@ rustPlatform.buildRustPackage rec { name = "fd-${version}"; - version = "6.0.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "1pzb6ha9c89zq6nxx0zsyv24diix4z23p8lf7113bfili3as3k5q"; + sha256 = "1md6k531ymsg99zc6y8lni4cpfz4rcklwgibq1i5xdam3hs1n2jg"; }; - cargoSha256 = "0y4svzv1y94baciiy08byhywwfshdfqn3nx0c4z23i7ashy8yhnf"; - - buildPhase = '' - # do not pass --frozen - cargo build --release - ''; + cargoSha256 = "00n2j0mjmd4lrfygnv90mixv3hfv1z56zyqcm957cwq08qavqzf1"; preFixup = '' mkdir -p "$out/man/man1" cp "$src/doc/fd.1" "$out/man/man1" mkdir -p "$out/share/"{bash-completion/completions,fish/completions,zsh/site-functions} - cp target/release/build/fd-find-*/out/fd.bash-completion "$out/share/bash-completion/completions/" + cp target/release/build/fd-find-*/out/fd.bash "$out/share/bash-completion/completions/" cp target/release/build/fd-find-*/out/fd.fish "$out/share/fish/completions/" cp target/release/build/fd-find-*/out/_fd "$out/share/zsh/site-functions/" ''; diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index cf26ec61139..d66ff70180a 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -27,10 +27,10 @@ let wrapper = stdenv.mkDerivation rec { in stdenv.mkDerivation rec { - name = "i2p-0.9.31"; + name = "i2p-0.9.32"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "1v2my5jqcj8zidxij34h0lpa533rr6ianzz8yld01sxi6gg41w28"; + sha256 = "1c82yckwzp51wqrr8qhww3sifm1a9nzrymsf9qv99ngsxq4n5l6i"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix index 91b4a5e8957..b40afa605e3 100644 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-l2tp"; - version = "1.2.4"; + version = "1.2.8"; src = fetchFromGitHub { owner = "nm-l2tp"; repo = "network-manager-l2tp"; rev = "${version}"; - sha256 = "1mvn0z1vl4j9drl3dsw2dv0pppqvj29d2m07487dzzi8cbxrqj36"; + sha256 = "110157dpamgr7r5kb8aidi0a2ap9z2m52bff94fb4nhxacz69yv8"; }; buildInputs = [ networkmanager ppp libsecret ] @@ -31,13 +31,18 @@ stdenv.mkDerivation rec { intltoolize -f ''; - configureFlags = - if withGnome then "--with-gnome" else "--without-gnome"; + configureFlags = [ + "--with-gnome=${if withGnome then "yes" else "no"}" + "--localstatedir=/var" + "--sysconfdir=$(out)/etc" + ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "L2TP plugin for NetworkManager"; inherit (networkmanager.meta) platforms; - homepage = https://github.com/seriyps/NetworkManager-l2tp; + homepage = https://github.com/nm-l2tp/network-manager-l2tp; license = licenses.gpl2; maintainers = with maintainers; [ abbradar obadz ]; }; diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index 9d26a84d6f2..f2657187464 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, procps +{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM, procps , gnome3, libgnome_keyring, libsecret }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sed -i "s,nm_libexecdir=.*,nm_libexecdir=$out/libexec," "configure" ''; - buildInputs = [ networkmanager libsecret ] + buildInputs = [ networkmanager strongswanNM libsecret ] ++ (with gnome3; [ gtk libgnome_keyring networkmanagerapplet ]); nativeBuildInputs = [ intltool pkgconfig ]; @@ -26,9 +26,10 @@ stdenv.mkDerivation rec { --replace "/sbin/sysctl" "${procps}/bin/sysctl" ''; + configureFlags = [ "--with-charon=${strongswanNM}/libexec/ipsec/charon-nm" ]; + meta = { description = "NetworkManager's strongswan plugin"; inherit (networkmanager.meta) platforms; }; } - diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 77409f6fc3e..eff498a174e 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -1,7 +1,14 @@ -{ stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook -, curl, trousers, sqlite, iptables, libxml2, openresolv -, ldns, unbound, pcsclite, openssl, systemd, pam -, enableTNC ? false }: +{ stdenv, fetchurl +, pkgconfig, autoreconfHook +, gmp, python, iptables, ldns, unbound, openssl, pcsclite +, openresolv +, systemd, pam + +, enableTNC ? false, curl, trousers, sqlite, libxml2 +, enableNetworkManager ? false, networkmanager +}: + +with stdenv.lib; stdenv.mkDerivation rec { name = "strongswan-${version}"; @@ -17,8 +24,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ gmp python iptables ldns unbound openssl pcsclite ] - ++ stdenv.lib.optionals enableTNC [ curl trousers sqlite libxml2 ] - ++ stdenv.lib.optionals stdenv.isLinux [ systemd.dev pam ]; + ++ optionals enableTNC [ curl trousers sqlite libxml2 ] + ++ optionals stdenv.isLinux [ systemd.dev pam ] + ++ optionals enableNetworkManager [ networkmanager ]; patches = [ ./ext_auth-path.patch @@ -54,9 +62,9 @@ stdenv.mkDerivation rec { "--enable-forecast" "--enable-connmark" "--enable-acert" "--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound" "--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly" ] - ++ stdenv.lib.optional stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ] - ++ stdenv.lib.optional (stdenv.system == "i686-linux") "--enable-padlock" - ++ stdenv.lib.optionals enableTNC [ + ++ optionals stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ] + ++ optional (stdenv.system == "i686-linux") "--enable-padlock" + ++ optionals enableTNC [ "--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf" "--enable-curl" "--enable-eap-tnc" "--enable-eap-ttls" "--enable-eap-dynamic" "--enable-tnccs-20" @@ -65,14 +73,15 @@ stdenv.mkDerivation rec { "--enable-tnc-ifmap" "--enable-tnc-imc" "--enable-tnc-imv" "--with-tss=trousers" "--enable-aikgen" - "--enable-sqlite" ]; + "--enable-sqlite" ] + ++ optional enableNetworkManager "--enable-nm"; NIX_LDFLAGS = "-lgcc_s" ; meta = { description = "OpenSource IPsec-based VPN Solution"; homepage = https://www.strongswan.org; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2Plus; + platforms = platforms.all; }; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ac7aefd1643..e52a9ed9ceb 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -152,10 +152,10 @@ in rec { nix = nixStable; nixStable = (common rec { - name = "nix-1.11.15"; + name = "nix-1.11.16"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "d20f20e45d519f54fae5c61d55eadcf53e6d7cdbde9870eeec80d499f9805165"; + sha256 = "0ca5782fc37d62238d13a620a7b4bff6a200bab1bd63003709249a776162357c"; }; }) // { perl-bindings = nixStable; }; diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix new file mode 100644 index 00000000000..435b1f151a0 --- /dev/null +++ b/pkgs/tools/security/libmodsecurity/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, doxygen, perl, valgrind +, curl, geoip, libxml2, lmdb, lua, pcre, yajl }: + +stdenv.mkDerivation rec { + name = "libmodsecurity-${version}"; + version = "3.0.0-2017-11-17"; + + src = fetchFromGitHub { + owner = "SpiderLabs"; + repo = "ModSecurity"; + fetchSubmodules = true; + rev = "81e1cdced3c0266d4b02a68e5f99c30a9c992303"; + sha256 = "120bpvjq6ws2lv4vw98rx2s0c9yn0pfhlaphlgfv2rxqm3q7yhrr"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ doxygen perl valgrind curl geoip libxml2 lmdb lua pcre yajl]; + + configureFlags = [ + "--enable-static" + "--with-curl=${curl.dev}" + "--with-libxml=${libxml2.dev}" + "--with-pcre=${pcre.dev}" + "--with-yajl=${yajl}" + ]; + + meta = with stdenv.lib; { + description = '' + Libmodsecurity is one component of the ModSecurity v3 project. + ''; + longDescription = '' + Libmodsecurity is one component of the ModSecurity v3 project. The + library codebase serves as an interface to ModSecurity Connectors taking + in web traffic and applying traditional ModSecurity processing. In + general, it provides the capability to load/interpret rules written in + the ModSecurity SecRules format and apply them to HTTP content provided + by your application via Connectors. + ''; + homepage = https://modsecurity.org/; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ izorkin ]; + }; +} + diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index caea7c21c91..60ccc0f4724 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -31,6 +31,10 @@ in pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ cheetah jinja2 prettytable oauthlib pyserial configobj pyyaml requests jsonpatch ]; + checkInputs = with pythonPackages; [ contextlib2 httpretty mock unittest2 ]; + + doCheck = false; + meta = { homepage = http://cloudinit.readthedocs.org; description = "Provides configuration and customization of cloud instance"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31c627832b1..fa8f2ee8f54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -202,6 +202,8 @@ with pkgs; fetchzip = callPackage ../build-support/fetchzip { }; + fetchCrate = callPackage ../build-support/rust/fetchcrate.nix { }; + fetchFromGitHub = { owner, repo, rev, name ? "source", fetchSubmodules ? false, private ? false, @@ -856,6 +858,12 @@ with pkgs; caddy = callPackage ../servers/caddy { }; traefik = callPackage ../servers/traefik { }; + calamares = libsForQt59.callPackage ../tools/misc/calamares { + python = python3; + boost = pkgs.boost.override { python = python3; }; + libyamlcpp = callPackage ../development/libraries/libyaml-cpp { inherit boost; }; + }; + capstone = callPackage ../development/libraries/capstone { }; unicorn-emu = callPackage ../development/libraries/unicorn-emu { }; @@ -2342,7 +2350,7 @@ with pkgs; }; gnupg = gnupg22; - gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; }; + gnuplot = libsForQt5.callPackage ../tools/graphics/gnuplot { }; gnuplot_qt = gnuplot.override { withQt = true; }; @@ -4616,9 +4624,9 @@ with pkgs; preCheck = "export PATH=dist/build/stutter:$PATH"; }); - strongswan = callPackage ../tools/networking/strongswan { }; - - strongswanTNC = callPackage ../tools/networking/strongswan { enableTNC=true; }; + strongswan = callPackage ../tools/networking/strongswan { }; + strongswanTNC = callPackage ../tools/networking/strongswan { enableTNC = true; }; + strongswanNM = callPackage ../tools/networking/strongswan { enableNetworkManager = true; }; su = shadow.su; @@ -6312,6 +6320,12 @@ with pkgs; rust = callPackage ../development/compilers/rust { }; inherit (rust) cargo rustc; + buildRustCrate = callPackage ../build-support/rust/build-rust-crate.nix { }; + + carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix_0_5_0; + + defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { }; + rustPlatform = recurseIntoAttrs (makeRustPlatform rust); makeRustPlatform = rust: lib.fix (self: @@ -9023,6 +9037,8 @@ with pkgs; libcello = callPackage ../development/libraries/libcello {}; + libcerf = callPackage ../development/libraries/libcerf {}; + libcdaudio = callPackage ../development/libraries/libcdaudio { }; libcddb = callPackage ../development/libraries/libcddb { }; @@ -11342,9 +11358,13 @@ with pkgs; mockobjects = callPackage ../development/libraries/java/mockobjects { }; - saxon = callPackage ../development/libraries/java/saxon { }; + saxonb = saxonb_8_8; - saxonb = callPackage ../development/libraries/java/saxon/default8.nix { }; + inherit (callPackages ../development/libraries/java/saxon { }) + saxon + saxonb_8_8 + saxonb_9_1 + saxon-he; smack = callPackage ../development/libraries/java/smack { }; @@ -11767,6 +11787,8 @@ with pkgs; modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders nginxModules.shibboleth ]; }; + libmodsecurity = callPackage ../tools/security/libmodsecurity { }; + ngircd = callPackage ../servers/irc/ngircd { }; nix-binary-cache = callPackage ../servers/http/nix-binary-cache {}; @@ -13170,7 +13192,9 @@ with pkgs; ubootBeagleboneBlack ubootJetsonTK1 ubootOdroidXU3 + ubootOrangePiPc ubootPcduino3Nano + ubootQemuArm ubootRaspberryPi ubootRaspberryPi2 ubootRaspberryPi3_32bit @@ -15799,6 +15823,8 @@ with pkgs; monero = callPackage ../applications/misc/monero { }; + xmr-stak = callPackage ../applications/misc/xmr-stak { }; + monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; monkeysphere = callPackage ../tools/security/monkeysphere { }; @@ -18813,39 +18839,6 @@ with pkgs; coq_8_7 = callPackage ../applications/science/logic/coq { version = "8.7.0"; }; - coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {}; - - mkCoqPackages_8_4 = self: let callPackage = newScope self; in { - inherit callPackage; - coq = coq_8_4; - coqPackages = coqPackages_8_4; - - contribs = - let contribs = - import ../development/coq-modules/contribs - contribs - callPackage { }; - in - recurseIntoAttrs contribs; - - bedrock = callPackage ../development/coq-modules/bedrock {}; - coqExtLib = callPackage ../development/coq-modules/coq-ext-lib {}; - coqeal = callPackage ../development/coq-modules/coqeal {}; - coquelicot = callPackage ../development/coq-modules/coquelicot {}; - domains = callPackage ../development/coq-modules/domains {}; - fiat = callPackage ../development/coq-modules/fiat {}; - fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; - flocq = callPackage ../development/coq-modules/flocq {}; - heq = callPackage ../development/coq-modules/heq {}; - interval = callPackage ../development/coq-modules/interval {}; - mathcomp = callPackage ../development/coq-modules/mathcomp {}; - paco = callPackage ../development/coq-modules/paco {}; - QuickChick = callPackage ../development/coq-modules/QuickChick {}; - ssreflect = callPackage ../development/coq-modules/ssreflect {}; - tlc = callPackage ../development/coq-modules/tlc {}; - unimath = callPackage ../development/coq-modules/unimath {}; - ynot = callPackage ../development/coq-modules/ynot {}; - }; mkCoqPackages = self: coq: let callPackage = newScope self; in rec { inherit callPackage coq; @@ -18873,7 +18866,6 @@ with pkgs; equations = callPackage ../development/coq-modules/equations { }; }; - coqPackages_8_4 = mkCoqPackages_8_4 coqPackages_8_4; coqPackages_8_5 = mkCoqPackages coqPackages_8_5 coq_8_5; coqPackages_8_6 = mkCoqPackages coqPackages_8_6 coq_8_6; coqPackages_8_7 = mkCoqPackages coqPackages_8_7 coq_8_7; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d47d95aee90..46e9298de90 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2847,6 +2847,8 @@ in { confluent-kafka = callPackage ../development/python-modules/confluent-kafka {}; + kafka-python = callPackage ../development/python-modules/kafka-python {}; + construct = callPackage ../development/python-modules/construct {}; consul = buildPythonPackage (rec { @@ -5935,6 +5937,8 @@ in { }; }; + jsonrpclib-pelix = callPackage ../development/python-modules/jsonrpclib-pelix {}; + jsonwatch = buildPythonPackage rec { name = "jsonwatch-0.2.0"; @@ -6777,8 +6781,8 @@ in { }; propagatedBuildInputs = with self; [ python-axolotl-curve25519 protobuf pycrypto ]; - # IV == 0 in tests is not supported by pycrytpodom (our pycrypto drop-in) - doCheck = !isPy3k; + # IV == 0 in tests is not supported by pycryptodome (our pycrypto drop-in) + doCheck = false; meta = { homepage = "https://github.com/tgalal/python-axolotl"; @@ -10262,6 +10266,8 @@ in { }; }; + lark-parser = callPackage ../development/python-modules/lark-parser { }; + lazy-object-proxy = buildPythonPackage rec { name = "lazy-object-proxy-${version}"; version = "1.2.1"; @@ -19514,6 +19520,7 @@ in { }; propagatedBuildInputs = with self; [ six pillow pymaging_png ]; + checkInputs = [ self.mock ]; meta = { description = "Quick Response code generation for Python"; @@ -21887,29 +21894,8 @@ EOF }; }; - libvirt = let - version = "3.8.0"; - in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec { - name = "libvirt-python-${version}"; - - src = pkgs.fetchurl { - url = "http://libvirt.org/sources/python/${name}.tar.gz"; - sha256 = "02spx8kfcsnqwsshd7bk2plyic2lbpwzg16sf3csh0avck5akjsz"; - }; - - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with self; [ python pkgs.libvirt lxml ]; - - buildPhase = "${python.interpreter} setup.py build"; - - installPhase = "${python.interpreter} setup.py install --prefix=$out"; - - meta = { - homepage = http://www.libvirt.org/; - description = "libvirt Python bindings"; - license = licenses.lgpl2; - maintainers = [ maintainers.fpletz ]; - }; + libvirt = callPackage ../development/python-modules/libvirt { + inherit (pkgs) libvirt; }; rpdb = buildPythonPackage rec {