From c5ce5db6445e67b6db1108d15ddf5e23572b7041 Mon Sep 17 00:00:00 2001 From: Default email Date: Sat, 26 Dec 2020 04:20:00 +0000 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: 84917aa00bf23c88e5874c683abe05edb0ba4078 --- .../nixpkgs/maintainers/maintainer-list.nix | 38 +- .../applications/audio/gpodder/default.nix | 4 +- .../pkgs/applications/audio/mopidy/iris.nix | 4 +- .../applications/audio/sonata/default.nix | 4 +- .../blockchains/zcash/default.nix | 60 +- .../zcash/librustzcash/default.nix | 33 - .../applications/editors/glow/default.nix | 7 +- .../applications/misc/obsidian/default.nix | 4 +- .../networking/browsers/firefox/common.nix | 4 + .../instant-messengers/neochat/default.nix | 41 + .../applications/office/zanshin/default.nix | 11 +- .../pkgs/data/misc/hackage/default.nix | 4 +- .../gnome-3/misc/gnome-tweaks/default.nix | 4 +- .../pkgs/development/compilers/ghc/8.10.3.nix | 256 +++ .../pkgs/development/compilers/ocaml/4.12.nix | 6 +- .../haskell-modules/configuration-common.nix | 11 +- .../configuration-ghc-8.10.x.nix | 6 + .../configuration-hackage2nix.yaml | 31 +- .../haskell-modules/configuration-nix.nix | 26 +- .../haskell-modules/hackage-packages.nix | 1428 +++++++++++++---- .../libraries/KQuickImageEdit/default.nix | 22 + .../development/libraries/inih/default.nix | 30 + .../ocaml-modules/ounit2/default.nix | 9 +- .../azure-mgmt-hdinsight/default.nix | 4 +- .../python-modules/globus-sdk/default.nix | 4 +- .../google_cloud_resource_manager/default.nix | 4 +- .../python-modules/jupyterlab-git/default.nix | 4 +- .../python-modules/mpd2/default.nix | 6 +- .../py-air-control-exporter/default.nix | 4 +- .../python-modules/pygame/default.nix | 4 +- .../python-modules/runway-python/default.nix | 4 +- .../tools/build-managers/sbt/default.nix | 4 +- .../development/tools/go-minimock/default.nix | 26 + .../tools/purescript/spago/default.nix | 4 + .../tools/purescript/spago/spago.nix | 33 +- .../nixpkgs/pkgs/games/augustus/default.nix | 7 +- .../misc/cups/drivers/kyodialog3/default.nix | 2 +- .../pkgs/misc/drivers/epkowa/default.nix | 34 + .../pkgs/misc/emulators/yuzu/default.nix | 47 + .../pkgs/tools/misc/code-minimap/default.nix | 25 + .../pkgs/tools/misc/nix-direnv/default.nix | 4 +- .../tools/networking/httpstat/default.nix | 4 +- .../package-management/nix-update/default.nix | 4 +- .../tools/package-management/rpm/default.nix | 26 +- .../tools/typesetting/bibclean/default.nix | 1 + .../nixpkgs/pkgs/top-level/all-packages.nix | 48 +- .../pkgs/top-level/haskell-packages.nix | 15 + 47 files changed, 1855 insertions(+), 506 deletions(-) delete mode 100644 third_party/nixpkgs/pkgs/applications/blockchains/zcash/librustzcash/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/KQuickImageEdit/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/inih/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/go-minimock/default.nix create mode 100644 third_party/nixpkgs/pkgs/misc/emulators/yuzu/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 0fa804c1f9..cef2e8f4de 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -817,6 +817,10 @@ github = "aszlig"; githubId = 192147; name = "aszlig"; + keys = [{ + longkeyid = "ed25519/0x684089CE67EBB691"; + fingerprint = "DD52 6BC7 767D BA28 16C0 95E5 6840 89CE 67EB B691"; + }]; }; atemu = { name = "Atemu"; @@ -1366,12 +1370,12 @@ keys = [ # compare with https://keybase.io/cab404 { - longkeyid = "1BB96810926F4E715DEF567E6BA7C26C3FDF7BB3"; - fingerprint = "rsa3072/0xCBDECF658C38079E"; + fingerprint = "1BB96810926F4E715DEF567E6BA7C26C3FDF7BB3"; + longkeyid = "rsa3072/0xCBDECF658C38079E"; } { - longkeyid = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A"; - fingerprint = "ed25519/0xB7EFFC271D55DB8A"; + fingerprint = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A"; + longkeyid = "ed25519/0xB7EFFC271D55DB8A"; } ]; }; @@ -5227,16 +5231,10 @@ github = "lovesegfault"; githubId = 7243783; name = "Bernardo Meurer"; - keys = [ - { - longkeyid = "rsa2048/0xE421C74191EA186C"; - fingerprint = "5894 12CE 19DF 582A E10A 3320 E421 C741 91EA 186C"; - } - { - longkeyid = "rsa2048/0x4A6D87A0E7475769"; - fingerprint = "56A8 E164 E834 290C 4AC0 EE3E 4A6D 87A0 E747 5769"; - } - ]; + keys = [{ + longkeyid = "rsa4096/0xF4C0D53B8D14C246"; + fingerprint = "F193 7596 57D5 6DA4 CCD4 786B F4C0 D53B 8D14 C246"; + }]; }; lowfatcomputing = { email = "andreas.wagner@lowfatcomputing.org"; @@ -8573,6 +8571,12 @@ githubId = 1040871; name = "Mathis Antony"; }; + svrana = { + email = "shaw@vranix.com"; + github = "svrana"; + githubId = 850665; + name = "Shaw Vrana"; + }; svsdep = { email = "svsdep@gmail.com"; github = "svsdep"; @@ -9089,6 +9093,12 @@ githubId = 10110; name = "Travis B. Hartwell"; }; + TredwellGit = { + email = "tredwell@tutanota.com"; + github = "TredwellGit"; + githubId = 61860346; + name = "Tredwell"; + }; treemo = { email = "matthieu.chevrier@treemo.fr"; github = "treemo"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix index 4a21868f09..b153298d97 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "gpodder"; - version = "3.10.16"; + version = "3.10.17"; format = "other"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0pbpaasd7kj6y25nm45y1qyb9sxd4570f7g6zkfcpf6pa3nx7qkq"; + sha256 = "0wrk8d4q6ricbcjzlhk10vrk1qg9hi323kgyyd0c8nmh7a82h8pd"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix index 48f955fd71..a8530a3045 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.50.0"; + version = "3.54.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "04miwf0dqb8jir9g7xkfnn3l62bdn74ap03kqzz2v3byg64f1p0g"; + sha256 = "0qnshn77dv7fl6smwnpnbq67mbc1vic9gf85skiqnqy8v8w5829f"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/sonata/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sonata/default.nix index cf3f173a09..afb0276896 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sonata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sonata/default.nix @@ -5,13 +5,13 @@ let inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools; in buildPythonApplication rec { pname = "sonata"; - version = "1.7b1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "multani"; repo = "sonata"; rev = "v${version}"; - sha256 = "1npbxlrg6k154qybfd250nq2p96kxdsdkj9wwnp93gljnii3g8wh"; + sha256 = "0rl8w7s2asff626clzfvyz987l2k4ml5dg417mqp9v8a962q0v2x"; }; disabled = !isPy3k; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix index 9cccbd7b7e..6a8bebf617 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix @@ -1,39 +1,55 @@ -{ stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost17x -, zlib, gtest, gmock, callPackage, gmp, qt4, util-linux, protobuf, qrencode, libevent }: - -let librustzcash = callPackage ./librustzcash {}; -in -with stdenv.lib; -stdenv.mkDerivation rec { +{ rust, rustPlatform, stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper +, cargo, pkg-config +, bash, curl, coreutils, boost17x, db62, libsodium, libevent, utf8cpp, util-linux +}: +rustPlatform.buildRustPackage rec { pname = "zcash"; - version = "2.1.1-1"; + version = "4.1.1"; src = fetchFromGitHub { owner = "zcash"; repo = "zcash"; rev = "v${version}"; - sha256 = "1g5zlfzfp31my8w8nlg5fncpr2y95iv9fm04x57sjb93rgmjdh5n"; + sha256 = "185zrw276g545np0niw5hlhlppkjbf5a1r4rwhnbaimdjdii2dil"; }; - patchPhase = '' - sed -i"" 's,-fvisibility=hidden,,g' src/Makefile.am + cargoSha256 = "0qxr6asf8zsya0f1ri39z2cnfpjk96hgwjchz2c7j87vibbvg6dc"; + + nativeBuildInputs = [ autoreconfHook cargo makeWrapper pkg-config ]; + buildInputs = [ bash boost17x db62 libevent libsodium utf8cpp ]; + + # Use the stdenv default phases (./configure; make) instead of the + # ones from buildRustPackage. + configurePhase = "configurePhase"; + buildPhase = "buildPhase"; + checkPhase = "checkPhase"; + installPhase = "installPhase"; + + postPatch = '' + # Have to do this here instead of in preConfigure because + # cargoDepsCopy gets unset after postPatch. + configureFlagsArray+=("RUST_VENDORED_SOURCES=$NIX_BUILD_TOP/$cargoDepsCopy") ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ gtest gmock gmp openssl wget db62 boost17x zlib - protobuf libevent libsodium librustzcash ] - ++ optionals stdenv.isLinux [ util-linux ]; - - configureFlags = [ "--with-boost-libdir=${boost17x.out}/lib" ]; - - postInstall = '' - cp zcutil/fetch-params.sh $out/bin/zcash-fetch-params - ''; + configureFlags = [ + "--disable-tests" + "--with-boost-libdir=${lib.getLib boost17x}/lib" + "CXXFLAGS=-I${lib.getDev utf8cpp}/include/utf8cpp" + "RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}" + ]; enableParallelBuilding = true; - meta = { + # Requires hundreds of megabytes of zkSNARK parameters. + doCheck = false; + + postInstall = '' + wrapProgram $out/bin/zcash-fetch-params \ + --set PATH ${lib.makeBinPath [ coreutils curl util-linux ]} + ''; + + meta = with lib; { description = "Peer-to-peer, anonymous electronic cash system"; homepage = "https://z.cash/"; maintainers = with maintainers; [ rht tkerber ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/zcash/librustzcash/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/zcash/librustzcash/default.nix deleted file mode 100644 index 526adc715d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/blockchains/zcash/librustzcash/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "librustzcash"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "zcash"; - repo = "librustzcash"; - rev = version; - sha256 = "0d28k29sgzrg9clynz29kpw50kbkp0a4dfdayqhmpjmsh05y6261"; - }; - - cargoSha256 = "1wzyrcmcbrna6rjzw19c4lq30didzk4w6fs6wmvxp0xfg4qqdlax"; - - installPhase = '' - mkdir -p $out/lib - cp $releaseDir/librustzcash.a $out/lib/ - mkdir -p $out/include - cp librustzcash/include/librustzcash.h $out/include/ - ''; - - # The tests do pass, but they take an extremely long time to run. - doCheck = false; - - meta = with stdenv.lib; { - description = "Rust-language assets for Zcash"; - homepage = "https://github.com/zcash/librustzcash"; - maintainers = with maintainers; [ rht tkerber ]; - license = with licenses; [ mit asl20 ]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix b/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix index d941c85e2c..06013b50d6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glow"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "glow"; rev = "v${version}"; - sha256 = "1jf9d8zwhvg9pc5g29lwz2r0lc59h1smwb5mjswxlvljpgbj7jwh"; + sha256 = "1y5cdqmyc2z2qk74l0r2c4mnw0jfibrf2ry7qcnmh96nhalq9m7j"; }; - vendorSha256 = "1p50qr7hbc8vyifa23z7xr43b4fpmwdzg7hqs503c124kpbpk45z"; + vendorSha256 = "11x6hshbqg1a39a1hwpfivgrhyk7ykw2aqylira3dqv039b1f639"; doCheck = false; @@ -20,6 +20,7 @@ buildGoModule rec { meta = with lib; { description = "Render markdown on the CLI, with pizzazz!"; homepage = "https://github.com/charmbracelet/glow"; + changelog = "https://github.com/charmbracelet/glow/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne penguwin ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix index b6fd295ba8..b33c091a58 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.9.20"; + version = "0.9.22"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "19yhmqaz5mynl879q38g338q4w8mwx75fnl25bhwrvy7yy3aa23l"; + sha256 = "kIqNptt5fl3YORQ7iDqQ5d6Exu+P/nAvVCVgXMRQvpQ="; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index 3e1bd2fbc0..70fde21823 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -347,6 +347,10 @@ buildStdenv.mkDerivation ({ }/lib:$(patchelf --print-rpath "$out"/lib/${binaryName}*/libxul.so)" \ "$out"/lib/${binaryName}*/libxul.so patchelf --add-needed ${xorg.libXScrnSaver.out}/lib/libXss.so $out/lib/${binaryName}/${binaryName} + ${lib.optionalString (pipewireSupport && lib.versionAtLeast ffversion "83") '' + patchelf --add-needed "${lib.getLib pipewire}/lib/libpipewire-0.3.so" \ + "$out"/lib/${binaryName}/${binaryName} + ''} ''; doInstallCheck = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix new file mode 100644 index 0000000000..141b887ef9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix @@ -0,0 +1,41 @@ +{ mkDerivation, stdenv, fetchFromGitLab +, pkgconfig, wrapQtAppsHook +, cmake +, qtbase, qttools, qtquickcontrols2, qtmultimedia, qtkeychain +, libpulseaudio +# Not mentioned but seems needed +, qtgraphicaleffects +, qtdeclarative +, qtmacextras +, olm, libsecret, cmark, extra-cmake-modules, kirigami2, ki18n, knotifications, kdbusaddons, kconfig, libquotient +, KQuickImageEdit, kitemmodels +}: + +let +qtkeychain-qt5 = qtkeychain.override { + inherit qtbase qttools; + withQt5 = true; +}; + +in mkDerivation rec { + pname = "neochat"; + version = "v1.0"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "network"; + repo = pname; + rev = version; + sha256 = "1r9n83kvc5v215lzmzh6hyc5q9i3w6znbf508qk0mdwdzxz4zry9"; + }; + + nativeBuildInputs = [ pkgconfig cmake extra-cmake-modules wrapQtAppsHook ]; + buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm libsecret cmark kirigami2 ki18n knotifications kdbusaddons kconfig libquotient KQuickImageEdit kitemmodels libpulseaudio ]; + + meta = with stdenv.lib; { + description = "A client for matrix, the decentralized communication protocol."; + homepage = "https://apps.kde.org/en/neochat"; + license = licenses.gpl3; + platforms = with platforms; linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/zanshin/default.nix b/third_party/nixpkgs/pkgs/applications/office/zanshin/default.nix index e3b9408ed9..843e7ec014 100644 --- a/third_party/nixpkgs/pkgs/applications/office/zanshin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/zanshin/default.nix @@ -1,6 +1,7 @@ { mkDerivation , lib , fetchurl +, fetchpatch , extra-cmake-modules , qtbase , boost @@ -24,6 +25,15 @@ mkDerivation rec { sha256 = "0b316ddcd46sawva84x5d8nsp19v66gbm83djrra7fv3k8nkv4xh"; }; + patches = [ + # Build with kontactinterface >= 5.14.42. + # Remove after next release. + (fetchpatch { + url = "https://invent.kde.org/pim/zanshin/-/commit/4850c08998b33b37af99c3312d193b063b3e8174.diff"; + sha256 = "sha256:0lh0a035alhmws3zyfnkb814drq5cqxvzpwl4g1g5d435gy8k4ps"; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules ]; @@ -48,6 +58,5 @@ mkDerivation rec { maintainers = with maintainers; [ zraexy ]; platforms = platforms.linux; license = licenses.gpl2Plus; - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix b/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix index c94efd4c3e..351ca123df 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/13d33ba1a0ce6acd583dee6a8a2c7e7398fa30cd.tar.gz"; - sha256 = "0ggm1iv2ilxj39icqjx4dk9p3sbndvrf90v2qssz9h49xsv9w0j7"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/f20dd1d767313d653d6f0c6dd9a82f92d36ecb4c.tar.gz"; + sha256 = "1prawfbp6390dlgfvd3hxvgdab7rfkr88j35m5cbk3a4hxghkyj3"; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index a042ce134a..b6a12fca13 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -20,13 +20,13 @@ python3Packages.buildPythonApplication rec { pname = "gnome-tweaks"; - version = "3.34.0"; + version = "3.34.1"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0l2j42ba7v866iknygamnkiq7igh0fjvq92r93cslvvfnkx2ccq0"; + sha256 = "19y62dj4n5i6v4zpjllxl51dch6ndy8xs45v5aqmmq9xyfrqk5yq"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix new file mode 100644 index 0000000000..c24b72fb43 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix @@ -0,0 +1,256 @@ +{ stdenv, pkgsBuildTarget, targetPackages + +# build-tools +, bootPkgs +, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx +, bash + +, libiconv ? null, ncurses + +, # GHC can be built with system libffi or a bundled one. + libffi ? null + +, useLLVM ? !stdenv.targetPlatform.isx86 +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. + enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + + # aarch64 outputs otherwise exceed 2GB limit +, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64 + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt + +, # Whether to build terminfo. + enableTerminfo ? !stdenv.targetPlatform.isWindows + +, # What flavour to build. An empty string indicates no + # specific flavour and falls back to ghc default values. + ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + (if useLLVM then "perf-cross" else "perf-cross-ncg") + +, # Whether to disable the large address space allocator + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 +}: + +assert !enableIntegerSimple -> gmp != null; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + HADDOCK_DOCS = NO + BUILD_SPHINX_HTML = NO + BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString (!enableProfiledLibs) '' + GhcLibWays = "v dyn" + '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC + GhcRtsHcOpts += -fPIC + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: stdenv.lib.optional enableTerminfo ncurses + ++ [libffi] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + + # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; + +in +stdenv.mkDerivation (rec { + version = "8.10.3"; + name = "${targetPrefix}ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "0cdrdvs5qnqr93cr9zvrlfjv2xr671kjjghnsw4afa4hahcq7p6c"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + patches = stdenv.lib.optionals stdenv.isDarwin [ + # Make Block.h compile with c++ compilers. Remove with the next release + (fetchpatch { + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch"; + sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5"; + }) + ]; + + postPatch = "patchShebangs ."; + + # GHC is a bit confused on its cross terminology. + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + + echo -n "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + stdenv.lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ stdenv.lib.optionals (libffi != null) [ + "--with-system-libffi" + "--with-ffi-includes=${targetPackages.libffi.dev}/include" + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ + "--with-gmp-includes=${targetPackages.gmp.dev}/include" + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + "--with-iconv-includes=${libiconv}/include" + "--with-iconv-libraries=${libiconv}/lib" + ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ stdenv.lib.optionals useLdGold [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatibility. + strictDeps = true; + + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 sphinx + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + + propagatedBuildInputs = [ targetPackages.stdenv.cc ] + ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + + depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + done + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + }; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; + inherit (ghc.meta) license platforms; + }; + +} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix b/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix index 444d332817..16649f0986 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix @@ -1,9 +1,9 @@ import ./generic.nix { major_version = "4"; minor_version = "12"; - patch_version = "0-alpha2"; + patch_version = "0-alpha3"; src = fetchTarball { - url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~alpha2.tar.xz"; - sha256 = "148vgjcfajjvrvh0q9kb2y7fszqd02cikb5wyznz7kjxka6xxyn9"; + url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~alpha3.tar.xz"; + sha256 = "1hqlf9fi5gmvb6r13z5819rg6k813bw9ihgbbji67hhh4q361wlw"; }; } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 30a9420b2b..aa3a7386fc 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -1164,8 +1164,10 @@ self: super: { # $HOME, which we don't have in our build sandbox. cabal-install-parsers = dontCheck super.cabal-install-parsers; - # gitit is unbroken in the latest release - gitit = markUnbroken super.gitit; + # version constraints break the build, so we jailbreak + # can be removed at a new release which also fixes + # https://github.com/jgm/gitit/issues/665 + gitit = doJailbreak super.gitit; # Test suite requires database persistent-mysql = dontCheck super.persistent-mysql; @@ -1541,4 +1543,9 @@ self: super: { # https://github.com/yesodweb/yesod/issues/1714 yesod-core = dontCheck super.yesod-core; + # Add ApplicationServices on darwin + # use 0.4.5 instead of 0.4.4 to fix build with glibc >= 2.32 + apecs-physics = addPkgconfigDepends super.apecs-physics_0_4_5 + (pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.ApplicationServices); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 60d3f42324..8e53303e9f 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -83,6 +83,12 @@ self: super: { sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; }); + # Version 4.7.2 is broken by the bytestring library shipped by ghc-8.10.3. + ListLike = appendPatch super.ListLike (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/ListLike-4.7.2.patch"; + sha256 = "1v392a74w0sxyn6x0bqixpmjbgla0i2b5hxzkcn1vaa3gaya7ag4"; + }); + # hnix 0.9.0 does not provide an executable for ghc < 8.10, so define completions here for now. hnix = generateOptparseApplicativeCompletion "hnix" (overrideCabal super.hnix (drv: { diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 9ffe8dff34..95dce67b4b 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1,29 +1,29 @@ # pkgs/development/haskell-modules/configuration-hackage2nix.yaml -compiler: ghc-8.10.2 +compiler: ghc-8.10.3 core-packages: - array-0.5.4.0 - base-4.14.1.0 - binary-0.8.8.0 - - bytestring-0.10.10.0 - - Cabal-3.2.0.0 + - bytestring-0.10.12.0 + - Cabal-3.2.1.0 - containers-0.6.2.1 - deepseq-1.4.4.0 - directory-1.3.6.0 - exceptions-0.10.4 - filepath-1.4.2.1 - - ghc-8.10.2 - - ghc-boot-8.10.2 - - ghc-boot-th-8.10.2 + - ghc-8.10.3 + - ghc-boot-8.10.3 + - ghc-boot-th-8.10.3 - ghc-compact-0.1.0.0 - - ghc-heap-8.10.2 + - ghc-heap-8.10.3 - ghc-prim-0.6.1 - - ghci-8.10.2 + - ghci-8.10.3 - haskeline-0.8.0.1 - hpc-0.6.1.0 - integer-gmp-1.0.3.0 - - libiserv-8.10.2 + - libiserv-8.10.3 - mtl-2.2.2 - parsec-3.1.14.0 - pretty-1.1.3.6 @@ -32,7 +32,7 @@ core-packages: - stm-2.5.0.0 - template-haskell-2.16.0.0 - terminfo-0.4.1.4 - - text-1.2.3.2 + - text-1.2.4.1 - time-1.9.3 - transformers-0.5.6.2 - unix-2.7.2.2 @@ -3150,9 +3150,6 @@ broken-packages: - aos-signature - aosd - apart - - apecs-gloss - - apecs-physics - - apecs-physics-gloss - apecs-stm - apelsin - api-builder @@ -5091,7 +5088,9 @@ broken-packages: - fei-base - fei-cocoapi - fei-dataiter + - fei-datasets - fei-examples + - fei-modelzoo - fei-nn - feldspar-compiler - feldspar-language @@ -5178,7 +5177,6 @@ broken-packages: - flamethrower - flamingra - flashblast - - flat - flat-maybe - flatbuffers - flay @@ -5541,7 +5539,6 @@ broken-packages: - github-webhook-handler-snap - githud - gitignore - - gitit - gitlab-api - gitlib - gitlib-cmdline @@ -5700,7 +5697,6 @@ broken-packages: - gray-code - greencard - greencard-lib - - greenclip - greg-client - gremlin-haskell - Grempa @@ -7712,6 +7708,7 @@ broken-packages: - mahoro - maid - mail-pool + - mail-reports - mailchimp - mailchimp-subscribe - MailchimpSimple @@ -10394,7 +10391,6 @@ broken-packages: - Tablify - tabloid - tabs - - taffybar - tag-bits - tag-stream - tagged-exception-core @@ -11516,6 +11512,7 @@ broken-packages: - yxdb-utils - Z-Data - Z-IO + - Z-YAML - z3-encoding - z85 - zabt diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 530e2707a2..edf463d360 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -662,33 +662,9 @@ self: super: builtins.intersectAttrs super { spago = let - # Spago needs a small patch to work with the latest versions of rio. - # https://github.com/purescript/spago/pull/647 - spagoWithPatches = overrideCabal (appendPatch super.spago ( - # Spago-0.17 needs a small patch to work with the latest version of dhall. - # This can probably be removed with Spago-0.18. - # https://github.com/purescript/spago/pull/695 - pkgs.fetchpatch { - url = "https://github.com/purescript/spago/commit/6258ac601480e776c215c989cc5faae46d5ca9f7.patch"; - sha256 = "02zy4jf24qlqz9fkcs2rqg64ijd8smncmra8s5yp2mln4dmmii1k"; - } - )) (old: { - # The above patch contains a completely new spago.cabal file, but our - # source tree from Hackage already contains a cabal file. Delete the - # local cabal file and just take the one from the patch. - # - # WARNING: The empty line above the `rm` needs to be kept. - prePatch = old.prePatch or "" + '' - - rm spago.cabal - ''; - # The above patch also adds a dependency on the stringsearch package. - libraryHaskellDepends = old.libraryHaskellDepends or [] ++ [ self.stringsearch ]; - }); - # spago requires an older version of megaparsec, but it appears to work # fine with newer versions. - spagoWithOverrides = doJailbreak spagoWithPatches; + spagoWithOverrides = doJailbreak super.spago; # This defines the version of the purescript-docs-search release we are using. # This is defined in the src/Spago/Prelude.hs file in the spago source. diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 678be15b86..01ecb36270 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -800,7 +800,7 @@ self: { , filepath, geniplate-mirror, ghc-compact, gitrev, happy, hashable , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process , regex-tdfa, split, stm, strict, template-haskell, text, time - , transformers, unordered-containers, uri-encode, zlib + , unordered-containers, uri-encode, zlib }: mkDerivation { pname = "Agda"; @@ -815,7 +815,7 @@ self: { containers data-hash deepseq directory edit-distance equivalence exceptions filepath geniplate-mirror ghc-compact gitrev hashable hashtables haskeline ieee754 mtl murmur-hash pretty process - regex-tdfa split stm strict template-haskell text time transformers + regex-tdfa split stm strict template-haskell text time unordered-containers uri-encode zlib ]; libraryToolDepends = [ alex happy ]; @@ -9248,17 +9248,18 @@ self: { }) {}; "HSmarty" = callPackage - ({ mkDerivation, aeson, attoparsec, attoparsec-expr, base, HTF - , HTTP, mtl, scientific, text, unordered-containers, vector + ({ mkDerivation, aeson, attoparsec, attoparsec-expr, base + , bytestring, filepath, Glob, HTF, HTTP, mtl, scientific, text + , unordered-containers, vector }: mkDerivation { pname = "HSmarty"; - version = "0.2.0.3"; - sha256 = "07m7xpwv565cf78qyqkd6babpl2b7jnq88psv55jclzdqlsvv0rq"; + version = "0.4.1"; + sha256 = "1rfpghc9wl1b4zs5q2k4ndkvxhf6bc5qkm6vfvlfy64c79q96mq3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson attoparsec attoparsec-expr base HTTP mtl scientific text - unordered-containers vector + aeson attoparsec attoparsec-expr base bytestring filepath Glob HTTP + mtl scientific text unordered-containers vector ]; testHaskellDepends = [ aeson attoparsec base HTF text ]; description = "Small template engine"; @@ -9395,8 +9396,8 @@ self: { pname = "HTTP"; version = "4000.3.15"; sha256 = "150m5v125s4jrxzl85jhnh69kp4mjyzhkqp0c1k087008f73csqd"; - revision = "1"; - editedCabalFile = "1nqwz6ns014z23n96567bf6a27if9ss5bj53grcdlmry6lrjad1v"; + revision = "2"; + editedCabalFile = "1rkazrbxfpx7bhp6fhgx97j58i4ccyp8bxjgdhr33cpv1b2cza9b"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -10082,18 +10083,17 @@ self: { }) {}; "HaskellNet" = callPackage - ({ mkDerivation, array, base, base64-string, bytestring, cryptohash - , mime-mail, mtl, network, old-time, pretty, text + ({ mkDerivation, array, base, base64-string, bytestring + , cryptohash-md5, mime-mail, mtl, network, network-bsd, old-time + , pretty, text }: mkDerivation { pname = "HaskellNet"; - version = "0.5.1"; - sha256 = "0f581izyh6bdk85i0g07xdp3fdzdfdfjiqpnl89r17vgswdd6i9j"; - revision = "1"; - editedCabalFile = "12p3v58jhr54yzsmqgza3rbrp19w2iq5m43g568hcx20n7zwzwjk"; + version = "0.5.3"; + sha256 = "0x3radqf6bbqijic8wsnwjlnrkij335rgg41f8jvxif11bn3rlns"; libraryHaskellDepends = [ - array base base64-string bytestring cryptohash mime-mail mtl - network old-time pretty text + array base base64-string bytestring cryptohash-md5 mime-mail mtl + network network-bsd old-time pretty text ]; description = "Client support for POP3, SMTP, and IMAP"; license = stdenv.lib.licenses.bsd3; @@ -21881,6 +21881,24 @@ self: { broken = true; }) {}; + "Z-YAML" = callPackage + ({ mkDerivation, base, primitive, scientific, transformers + , unordered-containers, Z-Data, Z-IO + }: + mkDerivation { + pname = "Z-YAML"; + version = "0.1.0.0"; + sha256 = "0jw8mzw1xnyzagx5d6i532r4isr63g1mq00bhfp3mvhc75hf9ghr"; + libraryHaskellDepends = [ + base primitive scientific transformers unordered-containers Z-Data + Z-IO + ]; + description = "YAML tools"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ZEBEDDE" = callPackage ({ mkDerivation, base, vect }: mkDerivation { @@ -26190,6 +26208,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "algebraic-graphs-io" = callPackage + ({ mkDerivation, algebraic-graphs, attoparsec, base, binary + , binary-conduit, bytestring, conduit, conduit-extra, containers + , csv-conduit, dot, exceptions, filepath, hspec, http-conduit + , matrix-market-attoparsec, megaparsec, parser-combinators + , primitive, QuickCheck, tar-conduit, text, vector + }: + mkDerivation { + pname = "algebraic-graphs-io"; + version = "0.1.5.1"; + sha256 = "03hiwyqfkd1s4r7w3cbw64333clpbpxpbppskjvk5knkv8r2mx78"; + libraryHaskellDepends = [ + algebraic-graphs attoparsec base binary binary-conduit bytestring + conduit conduit-extra containers csv-conduit dot exceptions + filepath http-conduit matrix-market-attoparsec megaparsec + parser-combinators primitive tar-conduit text vector + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "I/O utilities and datasets for algebraic-graphs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "algebraic-prelude" = callPackage ({ mkDerivation, algebra, base, basic-prelude, lens, semigroups }: mkDerivation { @@ -30735,8 +30775,6 @@ self: { ]; description = "Simple gloss renderer for apecs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "apecs-physics" = callPackage @@ -30753,8 +30791,23 @@ self: { ]; description = "2D physics for apecs"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "apecs-physics_0_4_5" = callPackage + ({ mkDerivation, apecs, base, Cabal, containers, inline-c, linear + , template-haskell, vector + }: + mkDerivation { + pname = "apecs-physics"; + version = "0.4.5"; + sha256 = "1ksxx5x998csgi3lr2yl18mk5sjccin20b15swyx1g9k7fsm7nx5"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + apecs base containers inline-c linear template-haskell vector + ]; + description = "2D physics for apecs"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "apecs-physics-gloss" = callPackage @@ -30766,8 +30819,6 @@ self: { libraryHaskellDepends = [ apecs apecs-physics base gloss ]; description = "Gloss rendering for apecs-physics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "apecs-stm" = callPackage @@ -30850,6 +30901,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "api-maker" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, http-client + , http-client-tls, http-types, lens, monad-control, mtl, req, text + , transformers, transformers-base + }: + mkDerivation { + pname = "api-maker"; + version = "0.1.0.0"; + sha256 = "02rkmyq1zrjklklfqpj1413j3fb0c61y28pwj06z24i71d5nmy6r"; + libraryHaskellDepends = [ + aeson base bytestring containers http-client http-client-tls + http-types lens monad-control mtl req text transformers + transformers-base + ]; + testHaskellDepends = [ + aeson base bytestring containers http-client http-client-tls + http-types lens monad-control mtl req text transformers + transformers-base + ]; + description = "Package to make APIs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "api-monobank" = callPackage ({ mkDerivation, aeson, base, bytestring, hs-coindesk-api , http-client, http-client-tls, http-conduit, servant @@ -31988,30 +32062,31 @@ self: { "arch-hs" = callPackage ({ mkDerivation, aeson, algebraic-graphs, base, bytestring, Cabal - , colourista, conduit, conduit-extra, containers, deepseq - , directory, filepath, hackage-db, megaparsec, microlens - , microlens-th, neat-interpolation, optparse-applicative, polysemy - , req, split, tar-conduit, template-haskell, text + , conduit, conduit-extra, containers, deepseq, Diff, directory + , filepath, hackage-db, megaparsec, microlens, microlens-th + , neat-interpolation, optparse-applicative, polysemy, prettyprinter + , prettyprinter-ansi-terminal, req, split, tar-conduit + , template-haskell, text }: mkDerivation { pname = "arch-hs"; - version = "0.5.0.0"; - sha256 = "04w0b8ivwrm1g0qg0pym7qap4ggzv6ng9x6jy5k2nnbmpck07597"; + version = "0.6.1.0"; + sha256 = "0ps8mxgy5cgrpcr0dy55biqj5a3j2bj44x6cfxx63fyv2j06lgdv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson algebraic-graphs base bytestring Cabal colourista conduit - conduit-extra containers deepseq directory filepath hackage-db - megaparsec microlens microlens-th neat-interpolation - optparse-applicative polysemy req split tar-conduit - template-haskell text + aeson algebraic-graphs base bytestring Cabal conduit conduit-extra + containers deepseq Diff directory filepath hackage-db megaparsec + microlens microlens-th neat-interpolation optparse-applicative + polysemy prettyprinter prettyprinter-ansi-terminal req split + tar-conduit template-haskell text ]; executableHaskellDepends = [ - aeson algebraic-graphs base bytestring Cabal colourista conduit - conduit-extra containers deepseq directory filepath hackage-db - megaparsec microlens microlens-th neat-interpolation - optparse-applicative polysemy req split tar-conduit - template-haskell text + aeson algebraic-graphs base bytestring Cabal conduit conduit-extra + containers deepseq Diff directory filepath hackage-db megaparsec + microlens microlens-th neat-interpolation optparse-applicative + polysemy prettyprinter prettyprinter-ansi-terminal req split + tar-conduit template-haskell text ]; description = "Distribute hackage packages to archlinux"; license = stdenv.lib.licenses.mit; @@ -32981,8 +33056,8 @@ self: { ({ mkDerivation, base, parsec, split, tagsoup }: mkDerivation { pname = "arxiv"; - version = "0.0.2"; - sha256 = "0lzmw35fry16zv8fbnqw3k5wv4d6vh9f0fz2yv9kph7zgs5sqgwh"; + version = "0.0.3"; + sha256 = "1rvzxbknmjcgx1209v265d4zar75y9637zi6alk1y3dg5lhbgm89"; libraryHaskellDepends = [ base parsec split tagsoup ]; description = "A client for the Arxiv API"; license = "LGPL"; @@ -34238,27 +34313,27 @@ self: { }) {}; "atom-conduit" = callPackage - ({ mkDerivation, base-noprelude, blaze-builder, conduit - , data-default, filepath, generic-random, microlens, microlens-th - , parsers, pretty-simple, prettyprinter, QuickCheck - , quickcheck-instances, refined, relude, resourcet, safe-exceptions - , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text, time - , timerep, uri-bytestring, xml-conduit, xml-types + ({ mkDerivation, base, blaze-builder, conduit, data-default + , filepath, generic-random, microlens, microlens-th, parsers + , pretty-simple, prettyprinter, QuickCheck, quickcheck-instances + , refined, relude, resourcet, safe-exceptions, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, text, time, timerep + , uri-bytestring, xml-conduit, xml-types }: mkDerivation { pname = "atom-conduit"; - version = "0.9.0.0"; - sha256 = "0kjdw3x5jsa5hjb36zq93xyp3ac1s4j5vpb52969hckcghmyrabm"; + version = "0.9.0.1"; + sha256 = "1fbvs522x9ldpmp1qr57vsanbdhqfi4m4cs2gk3pm5vmnnqqpqb4"; libraryHaskellDepends = [ - base-noprelude blaze-builder conduit microlens microlens-th parsers + base blaze-builder conduit microlens microlens-th parsers prettyprinter refined relude safe-exceptions text time timerep uri-bytestring xml-conduit xml-types ]; testHaskellDepends = [ - base-noprelude conduit data-default filepath generic-random - microlens pretty-simple QuickCheck quickcheck-instances refined - relude resourcet tasty tasty-golden tasty-hunit tasty-quickcheck - text time uri-bytestring xml-conduit xml-types + base conduit data-default filepath generic-random microlens + pretty-simple QuickCheck quickcheck-instances refined relude + resourcet tasty tasty-golden tasty-hunit tasty-quickcheck text time + uri-bytestring xml-conduit xml-types ]; description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; license = stdenv.lib.licenses.cc0; @@ -37816,19 +37891,16 @@ self: { }) {}; "base62" = callPackage - ({ mkDerivation, base, byteslice, doctest, natural-arithmetic - , primitive, small-bytearray-builder, tasty, tasty-hunit + ({ mkDerivation, base, bytebuild, byteslice, doctest + , natural-arithmetic, primitive, tasty, tasty-hunit , tasty-quickcheck, wide-word }: mkDerivation { pname = "base62"; - version = "0.1.0.0"; - sha256 = "1ns8hr9xjmrlq5lgi47630gpn8xdglk33ncqw4kjvdrb1x90iz0p"; - revision = "2"; - editedCabalFile = "0i1ipcawbnjf0mjdva4q8s2kw4hd4lfnygmvc81sjxd9crlwy4vm"; + version = "0.1.0.1"; + sha256 = "0jfxbg9il8wiaaxdxjkp5kk6jph2b12qi9aiilb1y23h67lxmh2h"; libraryHaskellDepends = [ - base byteslice natural-arithmetic primitive small-bytearray-builder - wide-word + base bytebuild byteslice natural-arithmetic primitive wide-word ]; testHaskellDepends = [ base byteslice doctest primitive tasty tasty-hunit tasty-quickcheck @@ -39464,15 +39536,16 @@ self: { }: mkDerivation { pname = "bglib"; - version = "2.0.0.0"; - sha256 = "1h9ql3xz5yciwk2hd1mljql0avrqv66fswdl8bll0xpga7jnpvr8"; + version = "3.0.0.0"; + sha256 = "1v82kj5ccznky4v4pffnjqzvai54wn2lcfkb2gnzxrn6gzn261a9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary bytestring monad-loops mtl serialport stm ]; executableHaskellDepends = [ - async base bytestring mtl optparse-applicative serialport stm + async base binary bytestring monad-loops mtl optparse-applicative + serialport stm ]; description = "Implementation of the BGAPI serial protocol"; license = stdenv.lib.licenses.mit; @@ -41807,8 +41880,8 @@ self: { }: mkDerivation { pname = "bishbosh"; - version = "0.0.0.6"; - sha256 = "0gax0q1i86m0zb3gwfwmy59z8jnpri96dd9y73xbjyy4cjnwc32m"; + version = "0.0.0.7"; + sha256 = "1ihnq7smjk0d18gmkgl70qzqwljmb5nr9hhzwfmkakh3p2x24g3i"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -45142,6 +45215,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "brick_0_58" = callPackage + ({ mkDerivation, base, bytestring, config-ini, containers + , contravariant, data-clist, deepseq, directory, dlist, exceptions + , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm + , template-haskell, text, text-zipper, transformers, unix, vector + , vty, word-wrap + }: + mkDerivation { + pname = "brick"; + version = "0.58"; + sha256 = "1rrx8pmffpsgajwmvm8w0kriwhncfih2j2vkla3nqq1vr0kn8518"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring config-ini containers contravariant data-clist + deepseq directory dlist exceptions filepath microlens microlens-mtl + microlens-th stm template-haskell text text-zipper transformers + unix vector vty word-wrap + ]; + testHaskellDepends = [ + base containers microlens QuickCheck vector + ]; + description = "A declarative terminal user interface library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "brick-dropdownmenu" = callPackage ({ mkDerivation, base, brick, containers, microlens, microlens-ghc , microlens-th, pointedlist, vector, vty @@ -53191,20 +53291,22 @@ self: { "cherry-core-alpha" = callPackage ({ mkDerivation, async, base, base64-bytestring, binary, bytestring - , case-insensitive, cherry-core, containers, ghc-prim, hspec - , hspec-discover, http-client, http-client-tls, http-types, mtl - , network, safe-exceptions, scientific, stm, text-utf8, time, unix - , utf8-string, vector, wai, wai-extra, wai-middleware-static, warp + , case-insensitive, cherry-core, containers, directory, ghc-prim + , hspec, hspec-discover, http-client, http-client-tls, http-types + , mtl, network, safe-exceptions, scientific, stm, text-utf8, time + , unix, utf8-string, vector, wai, wai-extra, wai-middleware-static + , warp }: mkDerivation { pname = "cherry-core-alpha"; - version = "0.1.0.0"; - sha256 = "1fzvgabln3zpmzzmzvmd2b3b0fkzz3gm3jyyz405563ifaqrjnal"; + version = "0.2.0.0"; + sha256 = "1bbf47n263bx9szfxxl0sg158nj4rm04742p0parbh2i4ia2gwmn"; libraryHaskellDepends = [ async base base64-bytestring binary bytestring case-insensitive - containers ghc-prim http-client http-client-tls http-types mtl - network safe-exceptions scientific stm text-utf8 time unix - utf8-string vector wai wai-extra wai-middleware-static warp + containers directory ghc-prim http-client http-client-tls + http-types mtl network safe-exceptions scientific stm text-utf8 + time unix utf8-string vector wai wai-extra wai-middleware-static + warp ]; testHaskellDepends = [ base cherry-core containers hspec text-utf8 @@ -53217,15 +53319,16 @@ self: { }) {cherry-core = null;}; "chessIO" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring, containers - , directory, extra, file-embed, haskeline, megaparsec, MonadRandom - , mtl, o-clock, optparse-applicative, parallel, prettyprinter - , process, random, stm, text, time, unordered-containers, vector + ({ mkDerivation, attoparsec, base, binary, brick, bytestring + , containers, directory, extra, file-embed, filepath, haskeline + , megaparsec, microlens, microlens-th, MonadRandom, mtl, o-clock + , optparse-applicative, parallel, prettyprinter, process, random + , rosezipper, stm, text, time, unordered-containers, vector, vty }: mkDerivation { pname = "chessIO"; - version = "0.5.0.0"; - sha256 = "14di8x8r7q2sjwipx8crgr0bcy3qhr58knf6paqkfqsxc3iynr0h"; + version = "0.6.0.0"; + sha256 = "0lc0bif9bp4h0131cy9rss90qv026mlknr16ayxlvfn3ynyarqv8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53234,10 +53337,10 @@ self: { text unordered-containers vector ]; executableHaskellDepends = [ - attoparsec base binary bytestring containers extra file-embed - haskeline megaparsec MonadRandom mtl o-clock optparse-applicative - prettyprinter process random stm text time unordered-containers - vector + attoparsec base binary brick bytestring containers extra file-embed + filepath haskeline megaparsec microlens microlens-th MonadRandom + mtl o-clock optparse-applicative prettyprinter process random + rosezipper stm text time unordered-containers vector vty ]; testHaskellDepends = [ attoparsec base binary bytestring containers directory extra @@ -54247,22 +54350,18 @@ self: { }) {}; "circular" = callPackage - ({ mkDerivation, aeson, base, criterion, hspec, hspec-discover - , primitive, QuickCheck, quickcheck-instances, vector + ({ mkDerivation, aeson, base, criterion, hspec, primitive + , QuickCheck, quickcheck-instances, vector }: mkDerivation { pname = "circular"; - version = "0.3.1"; - sha256 = "14fyhqyqv08yml0bsxpjqv3x1alnwdsp9yx5f035vwp9p1mh7rll"; + version = "0.3.1.1"; + sha256 = "0m3hw2w9hrxz7qi4vcqfbvqck6k7rzwv49r3il0i69xkxzr1dcgk"; libraryHaskellDepends = [ aeson base primitive vector ]; testHaskellDepends = [ - aeson base hspec hspec-discover primitive QuickCheck - quickcheck-instances vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - aeson base criterion primitive vector + aeson base hspec primitive QuickCheck quickcheck-instances vector ]; + benchmarkHaskellDepends = [ base criterion vector ]; description = "Circular fixed-sized mutable vectors"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -54340,8 +54439,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.3"; - sha256 = "0y4k06cqsqj85wv6k7ji6nyfr7k9m3rbbvly4xrzwqz9p1jrvdv9"; + version = "0.3.0.1"; + sha256 = "1jw8277z1qzq9dxb3z9yz18fd1rc4wrwc6hbqigyfr4a17h8psgs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63532,8 +63631,8 @@ self: { }: mkDerivation { pname = "countable-inflections"; - version = "0.2.0"; - sha256 = "0va96lgcm6brgv063jvlxq12f4z89y2yw4y0v99z3fy2wgn2ps8y"; + version = "0.3.0"; + sha256 = "1imi7csng0q6qmwz2ii4j33nwcmiyzi072nvgh36a3lgi0ja6q9x"; libraryHaskellDepends = [ base bytestring exceptions pcre-utils regex-pcre-builtin text ]; @@ -64418,16 +64517,17 @@ self: { }) {}; "crdt-event-fold" = callPackage - ({ mkDerivation, base, binary, containers, data-default-class - , data-dword, hspec, mtl, transformers + ({ mkDerivation, aeson, base, binary, containers + , data-default-class, data-dword, hspec, monad-logger, mtl + , transformers }: mkDerivation { pname = "crdt-event-fold"; - version = "1.2.1.1"; - sha256 = "0qwc72j2v3kdvh3iq6vn0anwicpqpx59in6q9yvc5jbk4f24zpl2"; + version = "1.3.0.0"; + sha256 = "0zpbn7rx9zywrfhpaj7lji0is0sb61al7q8fddrxy8vvirvhbb85"; libraryHaskellDepends = [ - base binary containers data-default-class data-dword mtl - transformers + aeson base binary containers data-default-class data-dword + monad-logger mtl transformers ]; testHaskellDepends = [ base hspec ]; description = "Garbage collected event folding CRDT"; @@ -69489,6 +69589,22 @@ self: { broken = true; }) {}; + "data-vector-growable" = callPackage + ({ mkDerivation, async, atomic-primops, base, exceptions, primitive + , vector + }: + mkDerivation { + pname = "data-vector-growable"; + version = "0.0.1"; + sha256 = "0mix8k8b4ry9szfigw8jm0x2cxw1xykknccp3zqrznslrp5wn7n6"; + libraryHaskellDepends = [ + atomic-primops base exceptions primitive vector + ]; + testHaskellDepends = [ async base vector ]; + description = "Dynamic growable resizable mutable generic vector"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "database-id-class" = callPackage ({ mkDerivation, aeson, base }: mkDerivation { @@ -75153,6 +75269,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dirichlet_0_1_0_2" = callPackage + ({ mkDerivation, base, hspec, log-domain, math-functions + , mwc-random, primitive, vector + }: + mkDerivation { + pname = "dirichlet"; + version = "0.1.0.2"; + sha256 = "1xppfdz3s31md41848awahfipv5g6yhglkw2l5l3q0jc5wsc1vvw"; + libraryHaskellDepends = [ + base log-domain math-functions mwc-random primitive vector + ]; + testHaskellDepends = [ base hspec log-domain mwc-random vector ]; + description = "Multivariate Dirichlet distribution"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dirstream" = callPackage ({ mkDerivation, base, directory, pipes, pipes-safe, system-fileio , system-filepath, unix @@ -80789,8 +80922,8 @@ self: { }: mkDerivation { pname = "effet"; - version = "0.3.0.2"; - sha256 = "1yy8hpq74bp4ffz7b5h7j9ja6akizl7d3b9n7n42c0iwlzr1hi4s"; + version = "0.4.0.0"; + sha256 = "0k3m3dmm5ddvick5qm2cvz3vmzyn2jg4r7sskr13l73dnh5is5f0"; libraryHaskellDepends = [ base containers monad-control template-haskell transformers transformers-base @@ -81141,8 +81274,8 @@ self: { }: mkDerivation { pname = "ejdb2-binding"; - version = "0.3.0.0"; - sha256 = "06zqdnycpzpaymfnimz87v1rc5a8xlnr8mcd49a90ivza967vmmr"; + version = "0.3.0.1"; + sha256 = "0rwqwjdcx3rb8v4riqawbjblmhmi6d2h9gzsyhdaafpm9z9z2ymz"; libraryHaskellDepends = [ aeson base bytestring mtl unordered-containers ]; @@ -82108,6 +82241,24 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {}; + "elynx_0_5_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, elynx-tools + , optparse-applicative, slynx, tlynx + }: + mkDerivation { + pname = "elynx"; + version = "0.5.0.1"; + sha256 = "1rglf080hx4c8nai07ghh2wf6j79x9hfx2mjzbqc588y0rpj7kmj"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring elynx-tools optparse-applicative slynx tlynx + ]; + description = "Validate and (optionally) redo ELynx analyses"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elynx-markov" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, containers , elynx-seq, elynx-tools, hmatrix, hspec, integration @@ -82130,6 +82281,29 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {}; + "elynx-markov_0_5_0_1" = callPackage + ({ mkDerivation, async, attoparsec, base, bytestring, containers + , elynx-seq, elynx-tools, hmatrix, hspec, integration + , math-functions, mwc-random, parallel, primitive, statistics + , vector + }: + mkDerivation { + pname = "elynx-markov"; + version = "0.5.0.1"; + sha256 = "0m24kzayvhc2mhhk2glpw82kmdbgk38vl2d0xdkkdnnbqag8mbqa"; + libraryHaskellDepends = [ + async attoparsec base bytestring containers elynx-seq hmatrix + integration math-functions mwc-random parallel primitive statistics + vector + ]; + testHaskellDepends = [ + base containers elynx-tools hmatrix hspec mwc-random vector + ]; + description = "Simulate molecular sequences along trees"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elynx-nexus" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { @@ -82142,6 +82316,19 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {}; + "elynx-nexus_0_5_0_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, hspec }: + mkDerivation { + pname = "elynx-nexus"; + version = "0.5.0.1"; + sha256 = "0jh5j4f8awallrjbgrgdjl6jdzk2lswr28xjryqdapwf4licfkk2"; + libraryHaskellDepends = [ attoparsec base bytestring ]; + testHaskellDepends = [ base hspec ]; + description = "Import and export Nexus files"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elynx-seq" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , elynx-tools, hspec, matrices, mwc-random, parallel, primitive @@ -82162,6 +82349,27 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {}; + "elynx-seq_0_5_0_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , elynx-tools, hspec, matrices, mwc-random, parallel, primitive + , vector, vector-th-unbox, word8 + }: + mkDerivation { + pname = "elynx-seq"; + version = "0.5.0.1"; + sha256 = "0b5jih0jgcf0rbcbwj18l269wbgf31i9125gx3rz6w7ydapmr7wr"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers matrices mwc-random + parallel primitive vector vector-th-unbox word8 + ]; + testHaskellDepends = [ + base bytestring elynx-tools hspec matrices vector + ]; + description = "Handle molecular sequences"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elynx-tools" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, cryptohash-sha256, deepseq, directory, fast-logger @@ -82184,6 +82392,29 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {}; + "elynx-tools_0_5_0_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, cryptohash-sha256, deepseq, directory, fast-logger + , hmatrix, monad-control, monad-logger, mwc-random + , optparse-applicative, primitive, template-haskell, text, time + , transformers, transformers-base, vector, zlib + }: + mkDerivation { + pname = "elynx-tools"; + version = "0.5.0.1"; + sha256 = "0lq5jv9dwyi0plkx1n270dan8nfxac9q7rhcdq95mzhgar8daink"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring + cryptohash-sha256 deepseq directory fast-logger hmatrix + monad-control monad-logger mwc-random optparse-applicative + primitive template-haskell text time transformers transformers-base + vector zlib + ]; + description = "Tools for ELynx"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elynx-tree" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad , containers, criterion, deepseq, double-conversion, elynx-nexus @@ -82210,6 +82441,32 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {}; + "elynx-tree_0_5_0_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad + , containers, criterion, deepseq, double-conversion, elynx-nexus + , elynx-tools, hspec, math-functions, microlens, mwc-random + , parallel, primitive, QuickCheck, statistics + }: + mkDerivation { + pname = "elynx-tree"; + version = "0.5.0.1"; + sha256 = "1pzam7qg7qihim50iyxw2fsy58xakzjvzskaa4vhzg9cghmjjva8"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring comonad containers deepseq + double-conversion elynx-nexus math-functions mwc-random parallel + primitive statistics + ]; + testHaskellDepends = [ + attoparsec base bytestring containers elynx-tools hspec QuickCheck + ]; + benchmarkHaskellDepends = [ + base criterion elynx-tools microlens mwc-random parallel + ]; + description = "Handle phylogenetic trees"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "emacs-keys" = callPackage ({ mkDerivation, base, doctest, split, tasty, tasty-hspec , tasty-quickcheck, template-haskell, th-lift, xkbcommon @@ -86264,8 +86521,8 @@ self: { }: mkDerivation { pname = "experimenter"; - version = "0.1.0.1"; - sha256 = "1cd4vwvagm0ajr35rs7kpcdv15nv5ps0f5l1ykv0hsgparls5kv7"; + version = "0.1.0.2"; + sha256 = "1qk0ss8z476q4p6agi55yzs72vc01lgl19jqdyjind119vv62840"; libraryHaskellDepends = [ aeson base bytestring cereal cereal-vector conduit containers deepseq directory esqueleto filepath HaTeX hostname lens matrix @@ -86894,6 +87151,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extra_1_7_9" = callPackage + ({ mkDerivation, base, clock, directory, filepath, process + , QuickCheck, quickcheck-instances, time, unix + }: + mkDerivation { + pname = "extra"; + version = "1.7.9"; + sha256 = "17fzmxwrv0w7inhq7kia36prc2nsx845r9v56sihqvr17fk2cvpn"; + libraryHaskellDepends = [ + base clock directory filepath process time unix + ]; + testHaskellDepends = [ + base directory filepath QuickCheck quickcheck-instances unix + ]; + description = "Extra functions I use"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "extract-dependencies" = callPackage ({ mkDerivation, async, base, Cabal, containers , package-description-remote @@ -88758,26 +89034,28 @@ self: { }) {}; "fei-base" = callPackage - ({ mkDerivation, base, c2hs, c2hs-extra, constraints, directory - , filepath, haskell-src-exts, hslogger, mtl, mxnet - , optparse-applicative, repa, text, tuple-ops, vector + ({ mkDerivation, attoparsec, base, c2hs, constraints, deepseq + , haskell-src-exts, hslogger, lens, mxnet, optparse-applicative + , repa, rio, store, tuple-ops, vector }: mkDerivation { pname = "fei-base"; - version = "0.2.0.0"; - sha256 = "0blgzr1iy7d2cp370rankkldakkryysikh1rd039s7anq5l21rsg"; + version = "1.0.0"; + sha256 = "0lpf217v6sddg7w4lsqnpmyqih3sjsyqmdskxdds39dhylvhax71"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base c2hs-extra constraints repa tuple-ops vector + attoparsec base constraints deepseq lens repa rio store tuple-ops + vector ]; librarySystemDepends = [ mxnet ]; libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ - base directory filepath haskell-src-exts hslogger mtl - optparse-applicative text + base deepseq haskell-src-exts hslogger lens optparse-applicative + rio tuple-ops ]; executableSystemDepends = [ mxnet ]; + executableToolDepends = [ c2hs ]; description = "FFI to MXNet"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -88785,28 +89063,27 @@ self: { }) {inherit (pkgs) mxnet;}; "fei-cocoapi" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, c2hs, conduit - , containers, criterion, directory, exceptions, fei-base - , fei-dataiter, filepath, JuicyPixels, JuicyPixels-extra - , JuicyPixels-repa, lens, mtl, random-fu, repa, storable-tuple - , store, time, transformers-base, vector + ({ mkDerivation, aeson, attoparsec, base, c2hs, colour, conduit + , conduit-concurrent-map, FontyFruity, formatting, hip, JuicyPixels + , lens, optparse-applicative, palette, random-fu, Rasterific, repa + , resourcet, rio, storable-tuple, store, time, transformers-base + , unliftio-core, vector }: mkDerivation { pname = "fei-cocoapi"; - version = "0.2.0"; - sha256 = "0sk3h94vlykq6x4nk25scb7jwhgi9rlk66xhy09wbz1a1n398j5z"; + version = "1.0.0"; + sha256 = "1zn9dz0k3py0k85nhbp3hj3nzyggygxpqa5wcf1b7jgm0hagw8kc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - exceptions fei-base fei-dataiter filepath JuicyPixels - JuicyPixels-extra JuicyPixels-repa lens mtl random-fu repa - storable-tuple store time transformers-base vector + aeson attoparsec base conduit conduit-concurrent-map hip lens + random-fu repa resourcet rio storable-tuple store time + transformers-base unliftio-core vector ]; libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ - aeson base bytestring containers criterion JuicyPixels - JuicyPixels-repa lens repa store vector + aeson base colour FontyFruity formatting hip JuicyPixels lens + optparse-applicative palette Rasterific repa rio store ]; description = "Cocodataset with cocoapi"; license = stdenv.lib.licenses.bsd3; @@ -88842,22 +89119,52 @@ self: { broken = true; }) {inherit (pkgs) mxnet;}; + "fei-datasets" = callPackage + ({ mkDerivation, aeson, attoparsec, base, conduit + , conduit-concurrent-map, criterion, fei-base, fei-cocoapi, fei-nn + , FontyFruity, hexpat, hip, JuicyPixels, JuicyPixels-extra + , JuicyPixels-repa, lens, optparse-applicative, random-fu + , random-source, Rasterific, repa, resourcet, rio, stm-conduit + , storable-tuple, store, transformers-base, vector + }: + mkDerivation { + pname = "fei-datasets"; + version = "1.0.0"; + sha256 = "177ny2z5psj4f61v4k7ijaxbawxs6ba18ax05f8fllfiyyx440wf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base conduit conduit-concurrent-map fei-base + fei-cocoapi fei-nn hexpat hip lens random-fu random-source repa + resourcet rio storable-tuple store transformers-base vector + ]; + executableHaskellDepends = [ + attoparsec base conduit criterion fei-base fei-nn FontyFruity hip + JuicyPixels JuicyPixels-extra JuicyPixels-repa lens + optparse-applicative random-source Rasterific repa resourcet rio + stm-conduit vector + ]; + description = "Some datasets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "fei-examples" = callPackage - ({ mkDerivation, attoparsec, base, conduit, directory, fei-base - , fei-cocoapi, fei-dataiter, fei-nn, lens, mtl - , optparse-applicative, random-fu, repa, text, unordered-containers - , vector + ({ mkDerivation, attoparsec, base, conduit, fei-base, fei-cocoapi + , fei-datasets, fei-modelzoo, fei-nn, formatting, JuicyPixels, lens + , optparse-applicative, random-source, repa, resourcet, rio, store }: mkDerivation { pname = "fei-examples"; - version = "0.3.0"; - sha256 = "1yplcfls0c22h1808ky64ifdxswq60dq5l0qw0kmg452517xb2yx"; + version = "1.0.0"; + sha256 = "0jgv67rx8vdqri4zsl8z0y62g1xh02l4rq29v1h6jj2xpw9b87a6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - attoparsec base conduit directory fei-base fei-cocoapi fei-dataiter - fei-nn lens mtl optparse-applicative random-fu repa text - unordered-containers vector + attoparsec base conduit fei-base fei-cocoapi fei-datasets + fei-modelzoo fei-nn formatting JuicyPixels lens + optparse-applicative random-source repa resourcet rio store ]; description = "fei examples"; license = stdenv.lib.licenses.bsd3; @@ -88865,26 +89172,40 @@ self: { broken = true; }) {}; + "fei-modelzoo" = callPackage + ({ mkDerivation, attoparsec, base, fei-base, fei-nn, formatting + , lens, random-fu, repa, rio, text, transformers-base, vector + }: + mkDerivation { + pname = "fei-modelzoo"; + version = "1.0.0"; + sha256 = "0ly8lc7dpjs6i5idyi16ghkva1nhm6d1lp2zgyl3mwsapz2mn1ga"; + libraryHaskellDepends = [ + attoparsec base fei-base fei-nn formatting lens random-fu repa rio + text transformers-base vector + ]; + description = "A collection of standard models"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "fei-nn" = callPackage - ({ mkDerivation, aeson, attoparsec, attoparsec-binary, base - , bytestring, containers, exceptions, fei-base, ghc-prim, graphviz - , lens, mmorph, mtl, resourcet, template-haskell, text, time - , transformers-base, unordered-containers, vector + ({ mkDerivation, aeson, base, conduit, conduit-combinators + , containers, fei-base, FontyFruity, formatting, graphviz + , JuicyPixels, lens, Rasterific, repa, resourcet, rio, stm-conduit + , streaming, template-haskell, time, transformers-base + , type-combinators, uuid, wl-pprint-text }: mkDerivation { pname = "fei-nn"; - version = "0.2.0"; - sha256 = "08zdp0h87cddrwb7wrbk341k7v8hhriqp1jhgf6nmkjgqlwspk0m"; - isLibrary = true; - isExecutable = true; + version = "1.0.0"; + sha256 = "03j9j270qcbdylkxh6z7jkyzdm3mjh8p33a63igqcgvcm5r27ipl"; libraryHaskellDepends = [ - aeson base bytestring containers exceptions fei-base graphviz lens - mtl resourcet template-haskell text time transformers-base - unordered-containers vector - ]; - executableHaskellDepends = [ - attoparsec attoparsec-binary base bytestring exceptions fei-base - ghc-prim mmorph mtl resourcet unordered-containers vector + aeson base conduit conduit-combinators containers fei-base + FontyFruity formatting graphviz JuicyPixels lens Rasterific repa + resourcet rio stm-conduit streaming template-haskell time + transformers-base type-combinators uuid wl-pprint-text ]; description = "Train a neural network with MXNet in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -91132,8 +91453,6 @@ self: { ]; description = "Principled and efficient bit-oriented binary serialization"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "flat-maybe" = callPackage @@ -99650,6 +99969,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-lib_8_10_3_20201220" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy + , hpc, pretty, process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib"; + version = "8.10.3.20201220"; + sha256 = "04df1j997m48vjxkfcp07d9vsxgpqi315zvfri1y1qxdg5g4vlmb"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + ghc-lib-parser ghc-prim hpc pretty process time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-lib-parser" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty @@ -99669,6 +100008,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-lib-parser_8_10_3_20201220" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty + , process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib-parser"; + version = "8.10.3.20201220"; + sha256 = "0k68w2v5x68sxqcd7xm94khmr4gqxbj4jdsaac3m1wcy66bjriir"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + ghc-prim hpc pretty process time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-lib-parser-ex" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit @@ -99689,6 +100048,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-lib-parser-ex_8_10_0_17" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, extra + , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit + , uniplate + }: + mkDerivation { + pname = "ghc-lib-parser-ex"; + version = "8.10.0.17"; + sha256 = "16qbyvczncdb25g7mjdvxsn7m3j98649jy1pnv90vmyrn8l4m897"; + libraryHaskellDepends = [ + base bytestring containers ghc ghc-boot ghc-boot-th uniplate + ]; + testHaskellDepends = [ + base directory extra filepath ghc ghc-boot ghc-boot-th tasty + tasty-hunit uniplate + ]; + description = "Algorithms on GHC parse trees"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-make" = callPackage ({ mkDerivation, base, process, shake, unordered-containers }: mkDerivation { @@ -103200,8 +103580,6 @@ self: { ]; description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gitlab-api" = callPackage @@ -103241,6 +103619,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gitlab-haskell_0_2_4" = callPackage + ({ mkDerivation, aeson, base, bytestring, connection, http-conduit + , http-types, tasty, tasty-hunit, temporary, text, time + , transformers, unix, unliftio, unliftio-core + }: + mkDerivation { + pname = "gitlab-haskell"; + version = "0.2.4"; + sha256 = "1p2sgxnr5xgh0wz3q5vf6xqy827nrplfbcpfwa6kgqxiqgsfsdv2"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring connection http-conduit http-types temporary + text time transformers unix unliftio unliftio-core + ]; + testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; + description = "A Haskell library for the GitLab web API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gitlib" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, conduit , conduit-combinators, containers, directory, exceptions, filepath @@ -104133,8 +104531,8 @@ self: { }: mkDerivation { pname = "gloss-export"; - version = "0.1.0.2"; - sha256 = "0i2x1bbygacrgvi9rvmpq0ddi24vh8dza6hisvif708a8yh6plpr"; + version = "0.1.0.3"; + sha256 = "1m1fxv516kfqx4y684xcd1x0vvzirgv1acawiam5nm26hqvxcf85"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108816,8 +109214,8 @@ self: { }: mkDerivation { pname = "graphula"; - version = "2.0.0.1"; - sha256 = "1sd89mkbqflyzvsszmiddcssnkjn27dgh5dpp082xqla4b7grhml"; + version = "2.0.0.2"; + sha256 = "1fqrjfr9pl9619fhrkl3khpb2lg3svzp644hvzn0bpcnxqj5p41z"; libraryHaskellDepends = [ base containers directory generics-eot HUnit mtl persistent QuickCheck random semigroups temporary text transformers unliftio @@ -108826,8 +109224,8 @@ self: { testHaskellDepends = [ aeson base bytestring containers hspec http-api-data markdown-unlit monad-logger path-pieces persistent persistent-sqlite - persistent-template QuickCheck resourcet semigroups text - transformers unliftio-core uuid + persistent-template QuickCheck resourcet text transformers + unliftio-core uuid ]; testToolDepends = [ markdown-unlit ]; description = "A declarative library for describing dependencies between data"; @@ -109052,8 +109450,6 @@ self: { executablePkgconfigDepends = [ libXau xcb xdmcp xlibsWrapper ]; description = "Simple clipboard manager to be integrated with rofi"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null; inherit (pkgs) xlibsWrapper;}; @@ -112217,31 +112613,33 @@ self: { , cryptohash-sha256, deepseq, directory, doctest, ed25519 , extensible-exceptions, filepath, ghc-prim, hashable, hspec , hspec-discover, HTTP, lukko, mtl, network, network-uri - , old-locale, parsec, pretty, process, QuickCheck, random, split - , stm, tar, template-haskell, text, time, transformers, unix, xml - , zlib + , old-locale, parallel, parsec, pretty, process, QuickCheck, random + , split, stm, tar, template-haskell, text, time, transformers, unix + , xml, zlib }: mkDerivation { pname = "hackport"; - version = "0.6.6"; - sha256 = "0cdwcrk8cqfbfi2kg074zmiq3j5fv3790inwc4hxwhrhv34hz437"; + version = "0.6.7"; + sha256 = "1n7njjw7mc7c460zy3gfdk5x5xbmvna5f6ivc3qakabsh7n1l5d1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array async base base16-bytestring base64-bytestring binary bytestring containers cryptohash-sha256 deepseq directory ed25519 extensible-exceptions filepath ghc-prim hashable HTTP lukko mtl - network network-uri old-locale parsec pretty process random split - stm tar template-haskell text time transformers unix xml zlib + network network-uri old-locale parallel parsec pretty process + random split stm tar template-haskell text time transformers unix + xml zlib ]; testHaskellDepends = [ array base binary bytestring containers deepseq directory doctest - extensible-exceptions filepath hspec mtl parsec pretty process - QuickCheck split template-haskell text time transformers unix xml + extensible-exceptions filepath hspec mtl network-uri parsec pretty + process QuickCheck split template-haskell text time transformers + unix xml ]; testToolDepends = [ hspec-discover ]; description = "Hackage and Portage integration tool"; - license = stdenv.lib.licenses.gpl3; + license = "GPL"; }) {}; "hactor" = callPackage @@ -113214,6 +113612,8 @@ self: { pname = "hakyll-convert"; version = "0.3.0.3"; sha256 = "0i5g4xs0az8znisl8vm60r3m2y3s9dhh8cdb0bl8c5ikqcrlscjf"; + revision = "1"; + editedCabalFile = "1qp2lr6pq6xiw5g7srr2bkg4nj7zrywgrdhly2alk91ix0vxqrmp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115435,8 +115835,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.1.4"; - sha256 = "1zamnp80sncy6fw8j1nsnzcima2f99n1jpcs2vrqyfg1z6n04qhc"; + version = "0.0.1.5"; + sha256 = "0cd686g2v0fvyfhvvsjh0fdz8m5wks7bqncfn008vnccykdq3dfx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123108,6 +123508,8 @@ self: { pname = "hedn-functor"; version = "0.1.0.0"; sha256 = "1s90az6akimfq6jwiyicns7v34ryp8riymj0ski1sl4ljjm4r4fi"; + revision = "1"; + editedCabalFile = "08laj7hmykpq83f525agra0qw9xwwpba26fskhm70zhmiz417fqr"; libraryHaskellDepends = [ base containers hedn recursion-schemes text vector ]; @@ -123195,8 +123597,8 @@ self: { pname = "heist"; version = "1.1.0.1"; sha256 = "1j4h9fwny4hl2m5lgsd257lvm9057fb0hmnaqjw8a9k4hyx7hmqq"; - revision = "3"; - editedCabalFile = "0a456cq72fgdy3wvk6db6yqk3mpib85h7kmwrvdjl7p637dvpxzh"; + revision = "4"; + editedCabalFile = "1jwdn5l0iwcrbramfs6h60w0i6hgp2ixii89db8b0xvcbyb8h4hj"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -126305,6 +126707,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hinit" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, exceptions + , fused-effects, generic-lens, Glob, haskeline, lens, megaparsec + , mustache, optparse-applicative, parser-combinators, path, path-io + , prettyprinter, prettyprinter-ansi-terminal, process + , quickcheck-text, spdx-license, string-interpolate, text, time + , tomland + }: + mkDerivation { + pname = "hinit"; + version = "0.2.0"; + sha256 = "1iklwj1kzv7nbb4bnrj0idfb0k26jjpw51mkbib73j4jpciah01v"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base Cabal containers directory exceptions fused-effects + generic-lens Glob haskeline lens megaparsec mustache + optparse-applicative parser-combinators path path-io prettyprinter + prettyprinter-ansi-terminal process spdx-license string-interpolate + text time tomland + ]; + executableHaskellDepends = [ base fused-effects path-io ]; + testHaskellDepends = [ + base fused-effects path-io quickcheck-text + ]; + description = "Generic project initialization tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hinotify_0_3_9" = callPackage ({ mkDerivation, async, base, containers, directory, unix }: mkDerivation { @@ -132462,8 +132894,8 @@ self: { }: mkDerivation { pname = "hs-speedscope"; - version = "0.2"; - sha256 = "119s4da40zjf42s7fyjm4b78vciiv5r2f67l8ki9gqr933ir6mpb"; + version = "0.2.1"; + sha256 = "1qzmcn718mbg5pckvbcw2n36srmbixkyp45hrkdcdnqcsvf5agln"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134948,8 +135380,8 @@ self: { }: mkDerivation { pname = "hspec-expectations-json"; - version = "1.0.0.1"; - sha256 = "1k0rlf2l6bq7lmpnwssgnjxbddrssdqf2m5wnpklsrxaxdrvi05g"; + version = "1.0.0.2"; + sha256 = "1jv0mi0hdbxx75yygd3184kqpi50ysjp82vyr1di7dcz0ffyxhmb"; libraryHaskellDepends = [ aeson aeson-pretty base Diff HUnit scientific text unordered-containers vector @@ -139102,8 +139534,8 @@ self: { }: mkDerivation { pname = "hurl"; - version = "1.4.2.1"; - sha256 = "158p0fnlvz03vj29q4b5lzv4070d3l64wa1zsg9v2xlcrr6lrp87"; + version = "1.5.0.0"; + sha256 = "1fzy2zzwn5x420xz91fj64h6g0vzlam4058pymb2pdmg4x801j42"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143281,35 +143713,34 @@ self: { }) {}; "imm" = callPackage - ({ mkDerivation, aeson, aeson-pretty, async, atom-conduit - , base-noprelude, beam-core, beam-sqlite, blaze-html, blaze-markup - , bytestring, chronos, co-log, conduit, containers, dhall - , directory, filepath, http-client, http-types, microlens - , mime-mail, monad-time, optparse-applicative, parsec, parsers - , pipes, pipes-bytestring, pipes-http, prettyprinter - , prettyprinter-ansi-terminal, refined, relude, rss-conduit, safe - , safe-exceptions, sqlite-simple, stm, stm-chans, streamly, text - , time, timerep, typed-process, typerep-map, uri-bytestring - , xml-conduit, xml-types + ({ mkDerivation, aeson, aeson-pretty, async, atom-conduit, base + , beam-core, beam-sqlite, blaze-html, blaze-markup, bytestring + , chronos, co-log, conduit, containers, dhall, directory, filepath + , http-client, http-types, microlens, mime-mail, monad-time + , optparse-applicative, parsec, parsers, pipes, pipes-bytestring + , pipes-http, prettyprinter, prettyprinter-ansi-terminal, refined + , relude, rss-conduit, safe, safe-exceptions, sqlite-simple, stm + , stm-chans, streamly, text, time, timerep, typed-process + , typerep-map, uri-bytestring, xml-conduit, xml-types }: mkDerivation { pname = "imm"; - version = "2.0.0.0"; - sha256 = "1qkq80iiv1yql59a8vly1nv36isnh2wkdzxgawjh22xqn9xn0csd"; + version = "2.1.0.0"; + sha256 = "01jpwxqp2c5ih9cw38w4j7x1dff0z7z1d43yx1rri83w8shpjbl3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson aeson-pretty atom-conduit base-noprelude conduit containers - dhall directory filepath http-client microlens parsec parsers pipes + aeson aeson-pretty atom-conduit base conduit containers dhall + directory filepath http-client microlens parsec parsers pipes pipes-bytestring prettyprinter prettyprinter-ansi-terminal refined relude rss-conduit safe safe-exceptions text time timerep typed-process uri-bytestring xml-conduit xml-types ]; executableHaskellDepends = [ - aeson async base-noprelude beam-core beam-sqlite blaze-html - blaze-markup bytestring chronos co-log conduit containers dhall - directory filepath http-types microlens mime-mail monad-time + aeson async base beam-core beam-sqlite blaze-html blaze-markup + bytestring chronos co-log conduit containers dhall directory + filepath http-types microlens mime-mail monad-time optparse-applicative pipes pipes-bytestring pipes-http prettyprinter prettyprinter-ansi-terminal refined relude safe safe-exceptions sqlite-simple stm stm-chans streamly text time @@ -143911,6 +144342,30 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "incremental-parser_0_5_0_1" = callPackage + ({ mkDerivation, base, bytestring, checkers, criterion, deepseq + , input-parsers, monoid-subclasses, parsers, QuickCheck + , rank2classes, tasty, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "incremental-parser"; + version = "0.5.0.1"; + sha256 = "1j0x52rwp44wdjdyxw3jh6m61vhwa2bf80dfxhqi6iniyc8qzm68"; + libraryHaskellDepends = [ + base input-parsers monoid-subclasses parsers rank2classes + transformers + ]; + testHaskellDepends = [ + base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq monoid-subclasses text + ]; + description = "Generic parser library capable of providing partial results from partial input"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "incremental-sat-solver" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -145834,22 +146289,21 @@ self: { "intricacy" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , crypto-api, crypto-pubkey-types, cryptohash, directory, filepath - , hscurses, mtl, ncurses, network-fancy, random, RSA, safe, SDL - , SDL-gfx, SDL-mixer, SDL-ttf, stm, time, transformers, vector + , cryptonite, directory, exceptions, filepath, hscurses, memory + , mtl, ncurses, network-fancy, random, safe, SDL, SDL-gfx + , SDL-mixer, SDL-ttf, stm, time, transformers, vector }: mkDerivation { pname = "intricacy"; - version = "0.7.2.3"; - sha256 = "1651ivbk4iiwhy5hwwhc8s2dgfxdm9f4hswfxkdb06yp7i6y2pyj"; + version = "0.8.0.1"; + sha256 = "0kyhswgg8iyxvicgpf0f5rn3gk4k620crk02xd4bn797xws5bzzs"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - array base binary bytestring containers crypto-api - crypto-pubkey-types cryptohash directory filepath hscurses mtl - network-fancy random RSA safe SDL SDL-gfx SDL-mixer SDL-ttf stm - time transformers vector + array base binary bytestring containers cryptonite directory + exceptions filepath hscurses memory mtl network-fancy random safe + SDL SDL-gfx SDL-mixer SDL-ttf stm time transformers vector ]; executablePkgconfigDepends = [ ncurses ]; description = "A game of competitive puzzle-design"; @@ -146639,6 +147093,8 @@ self: { pname = "iproute"; version = "1.7.10"; sha256 = "0libq5v22cm6bj1lga1rrkgww50bhnpns7rz7da90yycqv2k7d5m"; + revision = "1"; + editedCabalFile = "02nh8r0c1p8gzq2y82q8n210y3bs146kjv2v7mr8z0m3k0sh5qqs"; libraryHaskellDepends = [ appar base byteorder bytestring containers network ]; @@ -152457,8 +152913,8 @@ self: { }: mkDerivation { pname = "kempe"; - version = "0.1.1.0"; - sha256 = "1vxk9a0vjkg1mcb0mhvrkh2cjgb0g42bxh6rwih8q6nh2gs7q55h"; + version = "0.1.1.1"; + sha256 = "0mianbsn02vzbb0fr6pgxsij0jrpnhmbah9n2fcl3fj9xzcb6ac7"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -152675,6 +153131,17 @@ self: { broken = true; }) {}; + "keylayouts" = callPackage + ({ mkDerivation, base, bytestring, containers, text, xeno }: + mkDerivation { + pname = "keylayouts"; + version = "0.1.0.2"; + sha256 = "0hf7lmx8bgl5lh1i71x56nfbgnp8xrqfza3s5acq9i16g21ri292"; + libraryHaskellDepends = [ base bytestring containers text xeno ]; + description = "Tools for macOS .keylayout files"; + license = stdenv.lib.licenses.mit; + }) {}; + "keyring" = callPackage ({ mkDerivation, base, udbus }: mkDerivation { @@ -152835,16 +153302,14 @@ self: { }) {}; "ki" = callPackage - ({ mkDerivation, base, concurrency, containers, dejafu, stm }: + ({ mkDerivation, base, containers, stm }: mkDerivation { pname = "ki"; - version = "0.1.0.1"; - sha256 = "16hw0y7r76gqhn3qnr8ac49yr1xq33g6rcfh8zxgkg59zf5bl35a"; - revision = "1"; - editedCabalFile = "03j64ya9n2ck6ddqk3dsvghnnqq6pfc6l9q4xj9ir8ry5cgxhrqp"; + version = "0.2.0.1"; + sha256 = "1nxmgv4kxh2whdsmj659iypf8gfjrqzyxzyzghapg1fmpffjpcyr"; libraryHaskellDepends = [ base containers stm ]; - testHaskellDepends = [ base concurrency dejafu stm ]; - description = "A lightweight, structured concurrency library"; + testHaskellDepends = [ base stm ]; + description = "A lightweight, structured-concurrency library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -154978,17 +155443,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "language-c_0_9" = callPackage + "language-c_0_9_0_1" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers, deepseq - , directory, filepath, happy, mtl, pretty, process, syb + , directory, filepath, happy, mtl, pretty, process }: mkDerivation { pname = "language-c"; - version = "0.9"; - sha256 = "0a2z97ajdbql583jcganadi9frqj09cidqb1hlh0gl6w6aj82kii"; + version = "0.9.0.1"; + sha256 = "01yj353n85qcv9zvaf19f1260rip26h6gxqahplkx9fy7ybbnk6l"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath mtl - pretty process syb + pretty process ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base directory filepath process ]; @@ -163504,8 +163969,8 @@ self: { }: mkDerivation { pname = "logstash"; - version = "0.1.0.0"; - sha256 = "0cxdrp7snp1pvz63127spi4m5zb04w549fkwhariyj5ql7lcbdn6"; + version = "0.1.0.1"; + sha256 = "1hi77m4iijrkyg3v2g6m0yqh1vga35sbh9nq22g9mdflsv353ffi"; libraryHaskellDepends = [ aeson async base bytestring data-default-class exceptions monad-control mtl network resource-pool resourcet retry stm @@ -164830,8 +165295,8 @@ self: { }: mkDerivation { pname = "lumberjack"; - version = "0.1.0.3"; - sha256 = "03y9v9ajh89ffacmnq0zfb83dyk6gd72msln7kksb69kkgcizd96"; + version = "1.0.0.0"; + sha256 = "1avv2qsncq10dfx3kqvd7q9dzwk1wmf39a61zw2cr8a8jpg89mfi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166032,6 +166497,25 @@ self: { broken = true; }) {}; + "mail-reports" = callPackage + ({ mkDerivation, aeson, base, bytestring, mtl, resourcet, streaming + , streaming-bytestring, streaming-utils, text, time, xml + , zip-archive + }: + mkDerivation { + pname = "mail-reports"; + version = "0.2.0.0"; + sha256 = "1g3jazpcyhsmiz9i9vx0n784n2n9nqzrbbnjhjlzji2si9gnkg9z"; + libraryHaskellDepends = [ + aeson base bytestring mtl resourcet streaming streaming-bytestring + streaming-utils text time xml zip-archive + ]; + description = "A parser library for DMARC and SMTP TLS reports"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "mailbox-count" = callPackage ({ mkDerivation, base, cmdargs, configurator, containers, directory , doctest, filemanip, filepath, HDBC, HDBC-postgresql, HDBC-sqlite3 @@ -167507,6 +167991,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "massiv_0_5_9_0" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, deepseq + , doctest, exceptions, mersenne-random-pure64, primitive + , QuickCheck, random, scheduler, splitmix, template-haskell + , unliftio-core, vector + }: + mkDerivation { + pname = "massiv"; + version = "0.5.9.0"; + sha256 = "11i527mnyznpyqwr61cr3jhx4xs3y8m7948mqp6rwkis6lnvl2ms"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq exceptions primitive + scheduler unliftio-core vector + ]; + testHaskellDepends = [ + base doctest mersenne-random-pure64 QuickCheck random splitmix + template-haskell + ]; + description = "Massiv (Массив) is an Array Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "massiv-io" = callPackage ({ mkDerivation, base, bytestring, Color, data-default-class , deepseq, doctest, exceptions, filepath, hspec, JuicyPixels @@ -167573,6 +168080,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "massiv-test_0_1_6" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec + , massiv, mwc-random, primitive, QuickCheck, scheduler, unliftio + , vector + }: + mkDerivation { + pname = "massiv-test"; + version = "0.1.6"; + sha256 = "1cg41rkk19jyvkkx3nkd10lq738cg5kv29nrzwxqcm5v308av38i"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq exceptions hspec massiv + primitive QuickCheck scheduler unliftio vector + ]; + testHaskellDepends = [ + base bytestring containers data-default deepseq genvalidity-hspec + hspec massiv mwc-random primitive QuickCheck scheduler vector + ]; + description = "Library that contains generators, properties and tests for Massiv Array Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "master-plan" = callPackage ({ mkDerivation, base, diagrams, diagrams-lib, diagrams-rasterific , hspec, megaparsec, mtl, optparse-applicative, QuickCheck @@ -168584,6 +169114,34 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {}; + "mcmc_0_4_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, circular, containers + , criterion, data-default, deepseq, directory, dirichlet + , double-conversion, hspec, log-domain, microlens, monad-parallel + , mwc-random, pretty-show, primitive, statistics, time + , transformers, vector, zlib + }: + mkDerivation { + pname = "mcmc"; + version = "0.4.0.0"; + sha256 = "1wfp73qis73xmzxwbxx3r9z55x6ydk5c6j0daf81zyllkv4mw9v4"; + libraryHaskellDepends = [ + aeson base bytestring circular containers data-default deepseq + directory dirichlet double-conversion log-domain microlens + monad-parallel mwc-random pretty-show primitive statistics time + transformers vector zlib + ]; + testHaskellDepends = [ + base hspec log-domain mwc-random statistics + ]; + benchmarkHaskellDepends = [ + base criterion log-domain microlens mwc-random + ]; + description = "Sample from a posterior using Markov chain Monte Carlo"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mcmc-samplers" = callPackage ({ mkDerivation, base, containers, hakaru, hmatrix, mwc-random , primitive, statistics @@ -172535,8 +173093,8 @@ self: { }: mkDerivation { pname = "mmsyn6ukr-array"; - version = "0.1.0.0"; - sha256 = "10ljcy283938aq3r90k325mplpiwikpwzm9wci4yrvsf8v7wvdsd"; + version = "0.2.1.0"; + sha256 = "0hjpygn10k6d554nkkrmdxv6p8m2aalgs0m33j2gn7myfnzj39fl"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -180559,32 +181117,33 @@ self: { "neptune-backend" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , case-insensitive, containers, deepseq, envy, exceptions, hspec - , http-api-data, http-client, http-client-tls, http-media - , http-types, iso8601-time, jwt, katip, lens, lens-aeson, microlens - , modern-uri, mtl, network, QuickCheck, random, req, rio - , safe-exceptions, semigroups, text, time, transformers - , unordered-containers, uuid, vector + , case-insensitive, concurrent-extra, containers, deepseq, envy + , exceptions, hspec, http-api-data, http-client, http-client-tls + , http-media, http-types, iso8601-time, jwt, katip, lens + , lens-aeson, microlens, modern-uri, mtl, network, QuickCheck + , random, req, rio, safe-exceptions, semigroups, text, time + , transformers, unordered-containers, uuid, vector }: mkDerivation { pname = "neptune-backend"; - version = "0.1.1"; - sha256 = "12qvnkixx53a0a4n88ywh3q6has8h2p3cclk6lfkz9l0p4f7qy42"; + version = "0.1.2"; + sha256 = "0a7x9z584ckm20v2crpif56fyd0y3lr17b617wyd7ig1al51z3ri"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base base64-bytestring bytestring case-insensitive containers - deepseq envy exceptions http-api-data http-client http-client-tls - http-media http-types iso8601-time jwt katip lens lens-aeson - microlens modern-uri mtl network random req rio safe-exceptions - text time transformers unordered-containers uuid vector + aeson base base64-bytestring bytestring case-insensitive + concurrent-extra containers deepseq envy exceptions http-api-data + http-client http-client-tls http-media http-types iso8601-time jwt + katip lens lens-aeson microlens modern-uri mtl network random req + rio safe-exceptions text time transformers unordered-containers + uuid vector ]; executableHaskellDepends = [ base mtl rio ]; testHaskellDepends = [ aeson base bytestring containers hspec iso8601-time mtl QuickCheck semigroups text time transformers unordered-containers vector ]; - description = "Auto-generated neptune-backend API Client"; + description = "Neptune Client"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -183602,8 +184161,8 @@ self: { }: mkDerivation { pname = "nix-tree"; - version = "0.1.2.0"; - sha256 = "0indbvsjsl0m325f0vhzhllrhkq27agnbrmhzz7k0klprssf1hsn"; + version = "0.1.3.0"; + sha256 = "03ih8gz26rpkipd46zbrkpr9lp23q0nnq8ks6j80d32096n7q59i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -185374,16 +185933,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "numhask_0_7_0_0" = callPackage + "numhask_0_7_1_0" = callPackage ({ mkDerivation, base, bifunctors, doctest, mmorph, protolude , QuickCheck, random, text, transformers }: mkDerivation { pname = "numhask"; - version = "0.7.0.0"; - sha256 = "03rf8yk30kqbmq4jdvm3jnqdfx09nmki0kd7y9g2v7g07j2y1qx9"; - revision = "1"; - editedCabalFile = "1n1kilds4c98swbjrybl18d7z82bq4m56nlv03an7b9002wv8xn4"; + version = "0.7.1.0"; + sha256 = "1qkrmbz72zmmpn5mpqvz0k46b5yvkhwbiwkx8z06291xyz3qn9cx"; libraryHaskellDepends = [ base bifunctors mmorph protolude random text transformers ]; @@ -185503,15 +186060,16 @@ self: { "numhask-space" = callPackage ({ mkDerivation, adjunctions, base, containers, distributive - , doctest, numhask, semigroupoids, tdigest, text, time + , doctest, numhask, random, semigroupoids, tdigest, text, time + , vector }: mkDerivation { pname = "numhask-space"; - version = "0.7.0.0"; - sha256 = "1vvm6px9wlqm07sc2p2df100x1pg2rgy363c59v1c910120lpdjd"; + version = "0.7.1.0"; + sha256 = "1wn4fi2778dxmqfimwx9favwd6v507vzpwms04w2bk5gn1fxgcdg"; libraryHaskellDepends = [ - adjunctions base containers distributive numhask semigroupoids - tdigest text time + adjunctions base containers distributive numhask random + semigroupoids tdigest text time vector ]; testHaskellDepends = [ base doctest numhask ]; description = "Numerical spaces"; @@ -190387,8 +190945,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.11.3"; - sha256 = "186bync51lknmfmganz0lvid6rrrlmydf6x4b65dnhz5xjng98xq"; + version = "2.11.3.1"; + sha256 = "1qh81rninlhdynkjphbvfl78hp3kk9kjwr3bh3yvwkaip57gjmz9"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -190486,10 +191044,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.8.4"; - sha256 = "098xp2n6rmg2vhaip8yyvrr534cllb1s6kj9p6r4iqqv4w3nc2sb"; - revision = "1"; - editedCabalFile = "1p1gkq4sgyxnfnna1avjmbw4ifrsmw920qhnaa4nkmbpgmccdca2"; + version = "0.3.9.0"; + sha256 = "18hxvzrl4b9y3343nissbcxrl4g8x82yrinyir9ifgmpz5ikg248"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -190812,14 +191368,14 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "1.0.0.0"; - sha256 = "1vls3xvj8zijl6sd698f8jljqslm4jnk07v8vzlm0s2gab2lcgmj"; + version = "1.0.1.0"; + sha256 = "0p7sfsi70vbwkxwknl5k31qsvnkwvhdjr8c2q7y0pjz3xz9zdrjq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers data-default directory filepath hashable lifted-async lifted-base mtl pandoc pandoc-types shakespeare - tagsoup text typed-process yaml + tagsoup template-haskell text typed-process yaml ]; executableHaskellDepends = [ base containers directory filepath githash optparse-applicative @@ -190991,8 +191547,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.3.2"; - sha256 = "1dj07dnljy1b7m9sq5dlxvvl8rbla8cf129s2wcw24x31j3ga96b"; + version = "0.3.3"; + sha256 = "16jaq5q0b2q230iwhfhs2p1fmmqb38zssr7zbgjmry2045ya2dhh"; description = "A box of patterns and paradigms"; license = stdenv.lib.licenses.mit; }) {}; @@ -193423,6 +193979,20 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {}; + "pava_0_1_1_0" = callPackage + ({ mkDerivation, base, criterion, hspec, mwc-random, vector }: + mkDerivation { + pname = "pava"; + version = "0.1.1.0"; + sha256 = "0zb5zp90ld4g2zlm11ns603q7jymx23n110vrm74f842xdxffkfs"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ base hspec vector ]; + benchmarkHaskellDepends = [ base criterion mwc-random vector ]; + description = "Greatest convex majorants and least concave minorants"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "paymill" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -193822,22 +194392,22 @@ self: { "pcre2" = callPackage ({ mkDerivation, base, containers, criterion, hspec , microlens-platform, mtl, pcre-light, regex-pcre-builtin - , template-haskell, text, transformers + , streaming, template-haskell, text }: mkDerivation { pname = "pcre2"; - version = "1.1.0"; - sha256 = "0vj8c8yis5gdsbg5ifn8fpya989ikavglyvqasic029ffr6cskfb"; + version = "1.1.2"; + sha256 = "1wpf87sm4r3q1aizxjb2ahvhw6kfy9x4ynlibqcfyjl1h5w3fffy"; libraryHaskellDepends = [ - base containers mtl template-haskell text transformers + base containers mtl streaming template-haskell text ]; testHaskellDepends = [ - base containers hspec microlens-platform mtl template-haskell text - transformers + base containers hspec microlens-platform mtl streaming + template-haskell text ]; benchmarkHaskellDepends = [ base containers criterion microlens-platform mtl pcre-light - regex-pcre-builtin template-haskell text transformers + regex-pcre-builtin streaming template-haskell text ]; description = "Regular expressions via the PCRE2 C library (included)"; license = stdenv.lib.licenses.asl20; @@ -209009,6 +209579,8 @@ self: { pname = "quantification"; version = "0.5.1"; sha256 = "1abr0rb3q13klrz6199gpl4d07s5y8j56i8gvpy8nqgyi7awznx9"; + revision = "1"; + editedCabalFile = "1q18l6wv57d0386p75ykkcpc18cdnzpbxdxbr5bdx02wj5v4vq8f"; libraryHaskellDepends = [ aeson base binary containers ghc-prim hashable path-pieces text unordered-containers vector @@ -212014,6 +212586,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ratelimiter" = callPackage + ({ mkDerivation, base, containers, extra, mtl, time, timespan + , vector + }: + mkDerivation { + pname = "ratelimiter"; + version = "0.1.0"; + sha256 = "00nx1zpyyhfviakhdvyys1m32jq45ryxyxisbyzp81mk1ddhq9qf"; + libraryHaskellDepends = [ + base containers extra mtl time timespan vector + ]; + testHaskellDepends = [ + base containers extra mtl time timespan vector + ]; + description = "In-memory rate limiter"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rating-chgk-info" = callPackage ({ mkDerivation, aeson, base-noprelude, bytestring, cassava , containers, directory, gauge, http-client, http-client-tls, iconv @@ -212127,8 +212717,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "9.3.0"; - sha256 = "1y18pqh7lwl87rq6j2ghkiipmq7yc8m0jn9krx2mkf1krglcnxb1"; + version = "9.3.2"; + sha256 = "06mb7z1w56hvwl9gbkmbbib01760ix93x03bdl0ybpb6hhffq7r3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -212136,16 +212726,8 @@ self: { filepath http-client http-client-tls scientific template-haskell text transformers ]; - executableHaskellDepends = [ - aeson aeson-pretty base binary bytestring caerbannog containers - filepath http-client http-client-tls scientific template-haskell - text transformers - ]; - testHaskellDepends = [ - aeson aeson-pretty base binary bytestring caerbannog containers - filepath http-client http-client-tls HUnit scientific - template-haskell temporary text transformers - ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base bytestring filepath HUnit temporary ]; description = "Parse and generate Rocket League replays"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -219776,8 +220358,8 @@ self: { }: mkDerivation { pname = "rob"; - version = "0.0.4"; - sha256 = "0ds0psp28fb5y21ycsxva1jqrbcvia94g3rk1b5p356php7zahsm"; + version = "0.0.5"; + sha256 = "0f3c4mv6h2cw51r2bw6xlg6aqkbpf2z8wi06pxvzc5ghn0s2k4n7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221901,6 +222483,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "safe-json_1_1_1_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dlist + , generic-arbitrary, hashable, quickcheck-instances, scientific + , tasty, tasty-hunit, tasty-quickcheck, temporary, text, time + , unordered-containers, uuid, uuid-types, vector + }: + mkDerivation { + pname = "safe-json"; + version = "1.1.1.1"; + sha256 = "0wp955ak673jjcjwqmliwv3dk723kf0nl4rwvzqmlgfg9c57n2j3"; + libraryHaskellDepends = [ + aeson base bytestring containers dlist hashable scientific tasty + tasty-hunit tasty-quickcheck text time unordered-containers + uuid-types vector + ]; + testHaskellDepends = [ + aeson base bytestring containers dlist generic-arbitrary hashable + quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck + temporary text time unordered-containers uuid uuid-types vector + ]; + description = "Automatic JSON format versioning"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "safe-lazy-io" = callPackage ({ mkDerivation, base, extensible-exceptions, parallel, strict-io }: @@ -232390,6 +232997,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-cmd_0_2_3" = callPackage + ({ mkDerivation, base, directory, extra, filepath, process, unix }: + mkDerivation { + pname = "simple-cmd"; + version = "0.2.3"; + sha256 = "1r8rnv8zzp8jfvgrjls3zjdx235s9gh2kr3sv4w08dndq1rakxjv"; + libraryHaskellDepends = [ + base directory extra filepath process unix + ]; + description = "Simple String-based process commands"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-cmd-args" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -234744,6 +235365,29 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {}; + "slynx_0_5_0_1" = callPackage + ({ mkDerivation, async, attoparsec, base, bytestring, containers + , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix + , monad-logger, mwc-random, optparse-applicative, statistics, text + , transformers, vector + }: + mkDerivation { + pname = "slynx"; + version = "0.5.0.1"; + sha256 = "013ck07xgna42a5vlk6a323z3x1jrggbjw7jr2ww8mpgvpw2wp8r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async attoparsec base bytestring containers elynx-markov elynx-seq + elynx-tools elynx-tree hmatrix monad-logger mwc-random + optparse-applicative statistics text transformers vector + ]; + executableHaskellDepends = [ base ]; + description = "Handle molecular sequences"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "small-bytearray-builder" = callPackage ({ mkDerivation, base, bytebuild, byteslice }: mkDerivation { @@ -238474,6 +239118,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "spdx-license" = callPackage + ({ mkDerivation, base, containers, directory, hspec, megaparsec + , regex-tdfa, string-interpolate, text + }: + mkDerivation { + pname = "spdx-license"; + version = "0.1.0"; + sha256 = "17ksd29w4qv4vpk6wcah4xr15sjx1fcz7mcwqb6r7kqqmw7jqp7y"; + libraryHaskellDepends = [ + base containers megaparsec regex-tdfa string-interpolate text + ]; + testHaskellDepends = [ base directory hspec megaparsec text ]; + description = "SPDX license templates"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "spe" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -242829,6 +243489,55 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "store_0_7_9" = callPackage + ({ mkDerivation, array, async, base, base-orphans + , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector + , clock, containers, contravariant, criterion, cryptohash, deepseq + , directory, filepath, free, ghc-prim, hashable, hspec + , hspec-smallcheck, integer-gmp, lifted-base, monad-control + , mono-traversable, nats, network, primitive, resourcet, safe + , smallcheck, store-core, syb, template-haskell, text, th-lift + , th-lift-instances, th-orphans, th-reify-many, th-utilities, time + , transformers, unordered-containers, vector + , vector-binary-instances, void, weigh + }: + mkDerivation { + pname = "store"; + version = "0.7.9"; + sha256 = "189ygrm1ycyyklh77a9vhdvw86gbhjba0kl8kj7z1b79sw8q4v4g"; + libraryHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring containers contravariant cryptohash deepseq directory + filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp + lifted-base monad-control mono-traversable nats network primitive + resourcet safe smallcheck store-core syb template-haskell text + th-lift th-lift-instances th-orphans th-reify-many th-utilities + time transformers unordered-containers vector void + ]; + testHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring clock containers contravariant cryptohash deepseq + directory filepath free ghc-prim hashable hspec hspec-smallcheck + integer-gmp lifted-base monad-control mono-traversable nats network + primitive resourcet safe smallcheck store-core syb template-haskell + text th-lift th-lift-instances th-orphans th-reify-many + th-utilities time transformers unordered-containers vector void + ]; + benchmarkHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring cereal cereal-vector containers contravariant criterion + cryptohash deepseq directory filepath free ghc-prim hashable hspec + hspec-smallcheck integer-gmp lifted-base monad-control + mono-traversable nats network primitive resourcet safe smallcheck + store-core syb template-haskell text th-lift th-lift-instances + th-orphans th-reify-many th-utilities time transformers + unordered-containers vector vector-binary-instances void weigh + ]; + description = "Fast binary serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "store-core" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, primitive, text , transformers @@ -244580,6 +245289,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stripe-hs" = callPackage + ({ mkDerivation, aeson, base, bytestring, casing, cpphs, cryptonite + , hspec, http-client, http-client-tls, memory, safe, servant + , servant-client, stripe-servant, text, time, vector + }: + mkDerivation { + pname = "stripe-hs"; + version = "0.1.0.0"; + sha256 = "1zfs0cwcylzv8ski3chprn5f85cfgjsdclngzmabwqww0ijrl806"; + libraryHaskellDepends = [ + aeson base bytestring casing cpphs cryptonite http-client memory + safe servant servant-client stripe-servant text time + ]; + testHaskellDepends = [ + aeson base bytestring casing cpphs cryptonite hspec http-client + http-client-tls memory safe servant servant-client stripe-servant + text time vector + ]; + description = "Unofficial Stripe client"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stripe-http-client" = callPackage ({ mkDerivation, aeson, base, bytestring, free, hspec, http-client , http-client-tls, http-types, stripe-core, stripe-tests, text @@ -244639,6 +245370,22 @@ self: { broken = true; }) {}; + "stripe-servant" = callPackage + ({ mkDerivation, aeson, base, casing, http-api-data, servant, text + , time, unordered-containers, vector + }: + mkDerivation { + pname = "stripe-servant"; + version = "0.1.0.0"; + sha256 = "05l07x8k0dd81yxq1m0j7h7kvpplr3f69yxl1f9sx9z9cdqjxspa"; + libraryHaskellDepends = [ + aeson base casing http-api-data servant text time + unordered-containers vector + ]; + description = "Unofficial Stripe servant types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stripe-signature" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite , memory, stripe-concepts, text @@ -248257,8 +249004,8 @@ self: { }: mkDerivation { pname = "table-layout"; - version = "0.9.0.1"; - sha256 = "09lj27z5jnnzj0piyr9g3g76j4i0wcmvz65zk839ssaqymmnl9cg"; + version = "0.9.1.0"; + sha256 = "0jg6hr835r8m7vn92a01y754ssby3qkkai8sr42bwjvqn7zy7xl8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -248461,8 +249208,6 @@ self: { executablePkgconfigDepends = [ gtk3 ]; description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk3;}; "tag-bits" = callPackage @@ -249864,6 +250609,18 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "tasty-hunit-compat_0_2_0_1" = callPackage + ({ mkDerivation, base, HUnit, tasty, tasty-hunit }: + mkDerivation { + pname = "tasty-hunit-compat"; + version = "0.2.0.1"; + sha256 = "0kfxga9j1iy7f00gj3dsh45ywyi7qzdlrmp16gr4ir3b08rwhj2m"; + libraryHaskellDepends = [ base HUnit tasty tasty-hunit ]; + description = "Integration of `HUnit` with `tasty`"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-integrate" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, containers , deepseq, directory, either, haskell-src-exts @@ -250130,6 +250887,8 @@ self: { pname = "tasty-silver"; version = "3.1.15"; sha256 = "07iiaw5q5jb6bxm5ys1s6bliw0qxsqp100awzxwkwfia03i1iz8z"; + revision = "1"; + editedCabalFile = "1pxwixy274w0z99zsx0aywcxcajnpgan3qri81mr1wb6afxrq8d6"; libraryHaskellDepends = [ ansi-terminal async base bytestring containers deepseq directory filepath mtl optparse-applicative process process-extras regex-tdfa @@ -250143,6 +250902,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-silver_3_2_1" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, containers + , deepseq, directory, filepath, mtl, optparse-applicative, process + , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit + , temporary, text, transformers + }: + mkDerivation { + pname = "tasty-silver"; + version = "3.2.1"; + sha256 = "1i39xks5rjpnid2y1n16fyb01wj7hpdw0n5ci1rnsps5f16nkcxr"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring containers deepseq directory + filepath mtl optparse-applicative process process-extras regex-tdfa + stm tagged tasty temporary text + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary + transformers + ]; + description = "A fancy test runner, including support for golden tests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-smallcheck" = callPackage ({ mkDerivation, async, base, smallcheck, tagged, tasty }: mkDerivation { @@ -250154,6 +250937,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-smallcheck_0_8_2" = callPackage + ({ mkDerivation, base, optparse-applicative, smallcheck, tagged + , tasty + }: + mkDerivation { + pname = "tasty-smallcheck"; + version = "0.8.2"; + sha256 = "0csgwn3vch0jnpqyyfnrfjq4z0dpl67imh5a7byll3hhlyidgjym"; + libraryHaskellDepends = [ + base optparse-applicative smallcheck tagged tasty + ]; + description = "SmallCheck support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-stats" = callPackage ({ mkDerivation, base, containers, directory, process, stm, tagged , tasty, time @@ -256956,6 +257755,29 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {}; + "tlynx_0_5_0_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad + , containers, elynx-tools, elynx-tree, gnuplot, lifted-async + , monad-logger, mwc-random, optparse-applicative, parallel + , statistics, text, transformers, vector + }: + mkDerivation { + pname = "tlynx"; + version = "0.5.0.1"; + sha256 = "0prqnbq75jrixx845z3hbqajfc63vgsdfdgrsxw0g29rx0x4hw2i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring comonad containers elynx-tools + elynx-tree gnuplot lifted-async monad-logger mwc-random + optparse-applicative parallel statistics text transformers vector + ]; + executableHaskellDepends = [ base ]; + description = "Handle phylogenetic trees"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tmapchan" = callPackage ({ mkDerivation, base, containers, hashable, stm , unordered-containers @@ -262772,8 +263594,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.7.10.1"; - sha256 = "0zq0bl4j1hwf2q0ipl0vp0q19lhs0bnwmrh7qh1qn53g078aj5ga"; + version = "0.7.11.1"; + sha256 = "1kbxj35dr41rg1s38f9dv2bg2d0rrwj1g2154ggfpx6kwy758jg6"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -280740,8 +281562,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.6.1.6"; - sha256 = "188msa26wr1xwz2ib7pa5bjb9sih02cklgh68i7h1rq412nw7anr"; + version = "0.6.1.7"; + sha256 = "11z4zgzj9j15agnqj9dpfavmi2ns9d6aa4inazk1kig1wai2inp1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -281359,8 +282181,8 @@ self: { }: mkDerivation { pname = "yesod-form-multi"; - version = "1.6.0"; - sha256 = "162pyvyv5kv5bicl8ikvffnsyjqc8z0n758ycgnvwly0bvskrl37"; + version = "1.7.0"; + sha256 = "02xba6x59sx8c72vazbl5jhjkxgni6h3bkvidr4hvqrx2bscmk45"; libraryHaskellDepends = [ base containers network-uri shakespeare text transformers yesod-core yesod-form diff --git a/third_party/nixpkgs/pkgs/development/libraries/KQuickImageEdit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/KQuickImageEdit/default.nix new file mode 100644 index 0000000000..a62bf54df6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/KQuickImageEdit/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, fetchFromGitLab +, extra-cmake-modules +, qtbase +, qtquickcontrols2 +}: + +stdenv.mkDerivation rec { + pname = "KQuickImageEditor"; + version = "0.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "libraries"; + repo = pname; + rev = version; + sha256 = "0krx9bq6nfmpjjangis8gaz8rx3z35f6m3cpsrcfdwpgpm22fqll"; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtbase qtquickcontrols2 ]; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/inih/default.nix b/third_party/nixpkgs/pkgs/development/libraries/inih/default.nix new file mode 100644 index 0000000000..62de607f7d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/inih/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, meson, ninja }: + +stdenv.mkDerivation rec { + pname = "inih"; + version = "r52"; + + src = fetchFromGitHub { + owner = "benhoyt"; + repo = pname; + rev = version; + sha256 = "0lsvm34zabvi1xlximybzvgc58zb90mm3b9babwxlqs05jy871m4"; + }; + + nativeBuildInputs = [ meson ninja ]; + + mesonFlags = [ + "-Ddefault_library=shared" + "-Ddistro_install=true" + "-Dwith_INIReader=true" + ]; + + meta = with stdenv.lib; { + description = "Simple .INI file parser in C, good for embedded systems"; + homepage = "https://github.com/benhoyt/inih"; + changelog = "https://github.com/benhoyt/inih/releases/tag/${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ TredwellGit ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ounit2/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ounit2/default.nix index 708c9a6c19..52676a1c88 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ounit2/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ounit2/default.nix @@ -1,18 +1,21 @@ -{ lib, buildDunePackage, fetchurl, stdlib-shims }: +{ lib, ocaml, buildDunePackage, fetchurl, stdlib-shims, ncurses }: buildDunePackage rec { minimumOCamlVersion = "4.04"; pname = "ounit2"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { url = "https://github.com/gildor478/ounit/releases/download/v${version}/ounit-v${version}.tbz"; - sha256 = "1naahh24lbyxmrnzpfz8karniqbf1nknivf96mrvsr6zlx5ad072"; + sha256 = "0i9kiqbf2dp12c4qcvbn4abdpdp6h4g5z54ycsh0q8jpv6jnkh5m"; }; propagatedBuildInputs = [ stdlib-shims ]; + doCheck = true; + checkInputs = lib.optional (lib.versionOlder ocaml.version "4.07") ncurses; + meta = with lib; { homepage = "https://github.com/gildor478/ounit"; description = "A unit test framework for OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index 08b9e73e66..08915244fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "2.0.0"; + version = "2.1.0"; pname = "azure-mgmt-hdinsight"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "fd47029f2423e45ec4d311f651dc972043b98e960f186f5c6508c6fdf6eb2fe8"; + sha256 = "ed55df52d35fc03a9c7ca060af1ec0faf7b5510381d2a5e74b73f59ac0d79028"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix index 7956a31492..20d47dfe7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "1.9.1"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "883a862ddd17b0f4868ec55d6697a64c13d91c41b9fa5103198d2140053abac2"; + sha256 = "b33021b58edacc16bf2ba8453efbb26a8b04242ee3f4d62dcdaa3c6e199f136f"; }; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix index a4b310797a..815ecc118f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "0.30.2"; + version = "0.30.3"; src = fetchPypi { inherit pname version; - sha256 = "de7eba5235df61deee2291a2fe70b904154df613a334109488afdea7a4c0011f"; + sha256 = "3577bbf38f2c7c2f42306b8dfdeffbb0eedf45aaec947fd513d51937f72046d1"; }; disabled = pythonOlder "3.5"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix index d8ab5093ec..1c6c9a5b9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab_git"; - version = "0.23.2"; + version = "0.23.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "2c4c55c5bc651a670b13e89064f7aba7422b72ad6b3f2b3890ac72cc9a2d4089"; + sha256 = "20a4954d8d1b1eb6f9111cd15d6a598bd7ff72b08797cf5e86c5a55827c85a1d"; }; propagatedBuildInputs = [ notebook nbdime git ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mpd2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mpd2/default.nix index 95ee5c5001..3573c7987c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mpd2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mpd2/default.nix @@ -1,17 +1,19 @@ { stdenv , buildPythonPackage , fetchPypi +, pythonOlder , python , mock }: buildPythonPackage rec { pname = "python-mpd2"; - version = "1.0.0"; + version = "3.0.1"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - extension = "tar.bz2"; sha256 = "772fa6861273bb9f363a97987c2c45ca3965eb770570f1f02566efec9c89fc5f"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix index 150198a65a..0ec483c16f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "py-air-control-exporter"; - version = "0.2.0"; + version = "0.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "2c1bce2423b7452388e35756bef098c123b3cd4a38e8b1302f7297a08e0a9eaa"; + sha256 = "ece2e446273542e5c0352c9d6e80d8279132c6ada3649c59e87a711448801a3b"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix index 673b14bfe4..333312d6aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pygame"; - version = "2.0.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "63b038da116a643046181b02173fd894d87d2f85ecfd6aa7d5ece73c6ef501e9"; + sha256 = "8b1e7b63f47aafcdd8849933b206778747ef1802bd3d526aca45ed77141e4001"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/runway-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/runway-python/default.nix index 9c7f89585d..69b928aad0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/runway-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/runway-python/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "runway-python"; - version = "0.6.0"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "695d78f8edeb6a7ca98d8351adb36948d56cceeffe8a84896c9fbfd349fc4cb8"; + sha256 = "66cf1517dd817bf6db3792608920274f964dd0ced8dabecd925b8bc17aa95740"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix index 39832109d9..a9314cef0c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "wFxv20NfMMcw4yP8wbmLow8189jExDxkSIRqK2Ix/6U="; + sha256 = "sha256-hqbyjnmWYHQQEGarGqGSZ9DI1E6uIdqpPJxgVspvnaQ="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/go-minimock/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-minimock/default.nix new file mode 100644 index 0000000000..ed4374e776 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/go-minimock/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "go-minimock"; + version = "3.0.8"; + + src = fetchFromGitHub { + owner = "gojuno"; + repo = "minimock"; + rev = "v${version}"; + sha256 = "0r0krbwvx5w1z0yv2qqi92irbsfhkvwvaigy350cvcz9gmcppj4h"; + }; + + vendorSha256 = "1macwm6hybjinwnx62v146yxydcn5k5r587nxwkf4ffy76s2m3jc"; + + doCheck = true; + + subPackages = [ "cmd/minimock" "." ]; + + meta = with lib; { + homepage = "https://github.com/gojuno/minimock"; + description = "A golang mock generator from interfaces"; + license = licenses.mit; + maintainers = with maintainers; [ svrana ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/purescript/spago/default.nix b/third_party/nixpkgs/pkgs/development/tools/purescript/spago/default.nix index f5720837d7..62e85a8748 100644 --- a/third_party/nixpkgs/pkgs/development/tools/purescript/spago/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/purescript/spago/default.nix @@ -1,6 +1,9 @@ { haskell , haskellPackages , lib + +# The following are only needed for the passthru.tests: +, git , nodejs , purescript , runCommand @@ -32,6 +35,7 @@ spago.overrideAttrs (oldAttrs: { { __noChroot = true; nativeBuildInputs = [ + git nodejs purescript spago diff --git a/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix b/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix index 4a5ad361e9..43f8e66d87 100644 --- a/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix +++ b/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix @@ -1,21 +1,22 @@ { mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool , base, bower-json, bytestring, Cabal, containers, dhall, directory , either, exceptions, extra, fetchgit, file-embed, filepath, foldl -, fsnotify, github, Glob, hpack, hspec, hspec-discover -, hspec-megaparsec, http-client, http-conduit, http-types -, lens-family-core, megaparsec, mtl, network-uri, open-browser -, optparse-applicative, prettyprinter, process, QuickCheck, retry -, rio, rio-orphans, safe, semver-range, stdenv, stm, tar -, template-haskell, temporary, text, time, transformers, turtle -, unliftio, unordered-containers, vector, versions, with-utf8, zlib +, fsnotify, generic-lens, github, Glob, hpack, hspec +, hspec-discover, hspec-megaparsec, http-client, http-conduit +, http-types, lens-family-core, megaparsec, mtl, network-uri +, open-browser, optparse-applicative, prettyprinter, process +, QuickCheck, retry, rio, rio-orphans, safe, semver-range, stdenv +, stm, stringsearch, tar, template-haskell, temporary, text, time +, transformers, turtle, unliftio, unordered-containers, utf8-string +, vector, versions, with-utf8, zlib }: mkDerivation { pname = "spago"; - version = "0.17.0"; + version = "0.18.0"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "1w9y1gvk307f92gixs5g02zbg0xwhrshwmc5j97pxhbzzg9qjidy"; - rev = "3309afdef25e3e77f991a079eed78ff2f750e463"; + sha256 = "03ww7qhrggwsbm0kcnvcr3ifb8rm860ajimzr81isiw46ykwrl38"; + rev = "a4d39c21cae2f2c6d43fa204853c8e17c72904d2"; fetchSubmodules = true; }; isLibrary = true; @@ -23,12 +24,12 @@ mkDerivation { libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async-pool base bower-json bytestring Cabal containers dhall directory either exceptions - file-embed filepath foldl fsnotify github Glob http-client - http-conduit http-types lens-family-core megaparsec mtl network-uri - open-browser optparse-applicative prettyprinter process retry rio - rio-orphans safe semver-range stm tar template-haskell temporary - text time transformers turtle unliftio unordered-containers vector - versions with-utf8 zlib + file-embed filepath foldl fsnotify generic-lens github Glob + http-client http-conduit http-types lens-family-core megaparsec mtl + network-uri open-browser optparse-applicative prettyprinter process + retry rio rio-orphans safe semver-range stm stringsearch tar + template-haskell temporary text time transformers turtle unliftio + unordered-containers utf8-string vector versions with-utf8 zlib ]; libraryToolDepends = [ hpack ]; executableHaskellDepends = [ base text turtle with-utf8 ]; diff --git a/third_party/nixpkgs/pkgs/games/augustus/default.nix b/third_party/nixpkgs/pkgs/games/augustus/default.nix index cabe419ef5..18c8842e59 100644 --- a/third_party/nixpkgs/pkgs/games/augustus/default.nix +++ b/third_party/nixpkgs/pkgs/games/augustus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "augustus"; - version = "1.4.1a"; + version = "2.0.1"; src = fetchFromGitHub { owner = "Keriew"; repo = "augustus"; rev = "v${version}"; - sha256 = "1xqv8j8jh3f13fjhyf7hk1anrn799cwwsvsd75kpl9n5yh5s1j5y"; + sha256 = "0czazw8mc3fbvdazs2nzvgxd1dpzjc8z5fwiv89vv4nd7laz3jkj"; }; nativeBuildInputs = [ cmake ]; @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source re-implementation of Caesar III. Fork of Julius incorporating gameplay changes"; homepage = "https://github.com/Keriew/augustus"; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = platforms.all; + broken = stdenv.isDarwin; maintainers = with maintainers; [ Thra11 ]; }; } diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/kyodialog3/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/kyodialog3/default.nix index fa16a136f9..7e0a0dea67 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/kyodialog3/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/kyodialog3/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { dontStrip = true; src = fetchzip { - url = "https://usa.kyoceradocumentsolutions.com/content/dam/kdc/kdag/downloads/technical/executables/drivers/kyoceradocumentsolutions/us/en/Kyocera_Linux_PPD_Ver_${version}.tar.gz"; + url = "https://la.kyoceradocumentsolutions.com/content/dam/kdc/kdag/downloads/technical/executables/drivers/kyoceradocumentsolutions/lad/en/Kyocera_Linux_PPD_Ver_${version}.tar.gz"; sha256 = "11znnlkfssakml7w80gxlz1k59f3nvhph91fkzzadnm9i7a8yjal"; }; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epkowa/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/epkowa/default.nix index eb88476432..9054c4c48f 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/epkowa/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/epkowa/default.nix @@ -65,6 +65,40 @@ let plugins = { }; meta = common_meta // { description = "Plugin to support " + passthru.hw + " scanner in sane"; }; }; + v370 = stdenv.mkDerivation rec { + name = "iscan-v370-bundle"; + version = "2.30.4"; + + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/perfection-v370/rpm/x64/iscan-perfection-v370-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v370/rpm/x64/iscan-perfection-v370-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "1ff7adp9mha1i2ibllz540xkagpy8r757h4s3h60bgxbyzv2yggr"; + }; + + nativeBuildInputs = [ autoPatchelfHook rpm ]; + + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-plugin-perfection-v370-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + + + mkdir -p $out/share $out/lib + cp -r usr/share/{iscan-data,iscan}/ $out/share + cp -r usr/lib64/iscan $out/lib + mv $out/share/iscan $out/share/esci + mv $out/lib/iscan $out/lib/esci + ''; + + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x014a "$plugin/lib/esci/libiscan-plugin-perfection-v370 $plugin/share/esci/esfwdd.bin" + ''; + hw = "Perfection V37/V370"; + }; + meta = common_meta // { description = "Plugin to support " + passthru.hw + " scanner in sane"; }; + }; x770 = stdenv.mkDerivation rec { pname = "iscan-gt-x770-bundle"; version = "2.30.4"; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/yuzu/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/yuzu/default.nix new file mode 100644 index 0000000000..3c643822c1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/emulators/yuzu/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub +, cmake, pkgconfig, wrapQtAppsHook +, boost173, catch2, fmt, lz4, nlohmann_json, rapidjson, zlib, zstd, SDL2 +, udev, libusb1, libzip, qtbase, qtwebengine, qttools, ffmpeg +, libpulseaudio, libjack2, alsaLib, sndio, ecasound +, useVulkan ? true, vulkan-loader, vulkan-headers +}: + +stdenv.mkDerivation rec { + pname = "yuzu"; + version = "482"; + + src = fetchFromGitHub { + owner = "yuzu-emu"; + repo = "yuzu-mainline"; # They use a separate repo for mainline “branch” + rev = "mainline-0-${version}"; + sha256 = "1bhkdbhj1dv33qv0np26gzsw65p4z88whjmd6bc7mh2b5lvrjwxm"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + buildInputs = [ qtbase qtwebengine qttools boost173 catch2 fmt lz4 nlohmann_json rapidjson zlib zstd SDL2 udev libusb1 libpulseaudio alsaLib sndio ecasound libjack2 libzip ffmpeg ] + ++ stdenv.lib.optionals useVulkan [ vulkan-loader vulkan-headers ]; + cmakeFlags = [ "-DENABLE_QT_TRANSLATION=ON" "-DYUZU_USE_QT_WEB_ENGINE=ON" "-DUSE_DISCORD_PRESENCE=ON" ] + ++ stdenv.lib.optionals (!useVulkan) [ "-DENABLE_VULKAN=No" ]; + + # Trick the configure system. This prevents a check for submodule directories. + preConfigure = "rm .gitmodules"; + + # Fix vulkan detection + postFixup = stdenv.lib.optionals useVulkan '' + wrapProgram $out/bin/yuzu --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + wrapProgram $out/bin/yuzu-cmd --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + ''; + + meta = with stdenv.lib; { + homepage = "https://yuzu-emu.org"; + description = "An experimental Nintendo Switch emulator written in C++"; + license = with licenses; [ + gpl2Plus + # Icons + cc-by-nd-30 cc0 + ]; + maintainers = with maintainers; [ ivar joshuafern ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix b/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix new file mode 100644 index 0000000000..8c43e2b903 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "code-minimap"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "wfxr"; + repo = pname; + rev = "v${version}"; + sha256 = "03azqy4i15kfpd0gzjaw2di9xva4xdf95yb65b93z3y9y5wy4krc"; + }; + + cargoSha256 = "1rxrdavj07i7qa5rf1i3aj7zdcp7c6lrg8yiy75r6lm4g98izzww"; + + meta = with stdenv.lib; { + description = "A high performance code minimap render"; + homepage = "https://github.com/wfxr/code-minimap"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ bsima ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix index 11cb0dcf55..392de7d1bd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nix-direnv"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = version; - sha256 = "sha256-xMz6e0OLeB3eltGrLV3Hew0lMjH5LSgqJ1l7JT2Ho/M="; + sha256 = "sha256-/mlM1EeUlr1nTUJ5rB41idzk3Mfy/htjjPUARYDFpb0="; }; # Substitute instead of wrapping because the resulting file is diff --git a/third_party/nixpkgs/pkgs/tools/networking/httpstat/default.nix b/third_party/nixpkgs/pkgs/tools/networking/httpstat/default.nix index e9987a51ea..f404090e5e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/httpstat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/httpstat/default.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonApplication rec { pname = "httpstat"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "reorx"; repo = pname; rev = version; - sha256 = "18k2glnyzxlmry19ijmndim2vqqn3c86smd7xc3haw6k7qafifx1"; + sha256 = "sha256-zUdis41sQpJ1E3LdNwaCVj6gexi/Rk21IBUgoFISiDM="; }; doCheck = false; # No tests buildInputs = [ glibcLocales ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-update/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-update/default.nix index 54492d173e..34f6359361 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix-update/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-update/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "nix-update"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - sha256 = "12fsxy2rv2dgk8l10ymp10j01jkcbn9w0fv5iyb5db85q4xsrsm5"; + sha256 = "sha256-cMllWFPK6pwqrocjkZKjnELIdtW4tj5Yu6AMw7Zd2JU="; }; makeWrapperArgs = [ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix index 8acf57570d..ac470d3e26 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix @@ -1,21 +1,22 @@ -{ stdenv, lib +{ stdenv, lib, fetchpatch , pkgconfig, autoreconfHook -, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages +, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages +, sqlite }: stdenv.mkDerivation rec { pname = "rpm"; - version = "4.15.1"; + version = "4.16.1.2"; src = fetchurl { url = "http://ftp.rpm.org/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2"; - sha256 = "0c6jwail90fhha3bpx70w4a2i8ycxwvnx6zwxm121l8wc3wlbvyx"; + sha256 = "1k6ank2aad7r503w12m6m494mxr6iccj52wqhwbc94pwxsf34mw3"; }; outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua ] + buildInputs = [ cpio zlib bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements @@ -28,14 +29,23 @@ stdenv.mkDerivation rec { "--with-external-db" "--with-lua" "--enable-python" + "--enable-ndb" + "--enable-sqlite" "--localstatedir=/var" "--sharedstatedir=/com" ]; - postPatch = '' - # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here - substituteInPlace configure.ac --replace 'python''${PYTHON_VERSION}' ${python.executable} + # Small fixes for ndb on darwin + # https://github.com/rpm-software-management/rpm/pull/1465 + patches = [ + (fetchpatch { + name = "darwin-support.patch"; + url = "https://github.com/rpm-software-management/rpm/commit/2d20e371d5e38f4171235e5c64068cad30bda557.patch"; + sha256 = "0p3j5q5a4hl357maf7018k3826jhcpqg6wfrnccrkv30g0ayk171"; + }) + ]; + postPatch = '' substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' "" ''; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/bibclean/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/bibclean/default.nix index d0e2c79c0b..c95c6921a4 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/bibclean/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/bibclean/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { description = "Prettyprint and syntax check BibTeX and Scribe bibliography data base files"; homepage = "http://ftp.math.utah.edu/pub/bibclean"; license = licenses.gpl2; + platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; }; } diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index f777a787f7..d23f291175 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -1859,6 +1859,8 @@ in cpulimit = callPackage ../tools/misc/cpulimit { }; + code-minimap = callPackage ../tools/misc/code-minimap { }; + codesearch = callPackage ../tools/text/codesearch { }; codec2 = callPackage ../development/libraries/codec2 { }; @@ -5937,6 +5939,8 @@ in neo-cowsay = callPackage ../tools/misc/neo-cowsay { }; + neochat = libsForQt5.callPackage ../applications/networking/instant-messengers/neochat { }; + neofetch = callPackage ../tools/misc/neofetch { }; nerdfonts = callPackage ../data/fonts/nerdfonts { }; @@ -9438,7 +9442,7 @@ in # Please update doc/languages-frameworks/haskell.section.md, “Our # current default compiler is”, if you bump this: - haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8102; + haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8103; inherit (haskellPackages) ghc; @@ -13586,6 +13590,8 @@ in indilib = callPackage ../development/libraries/indilib { }; + inih = callPackage ../development/libraries/inih { }; + iniparser = callPackage ../development/libraries/iniparser { }; intel-gmmlib = callPackage ../development/libraries/intel-gmmlib { }; @@ -15657,6 +15663,8 @@ in kreport = callPackage ../development/libraries/kreport { }; + KQuickImageEdit = callPackage ../development/libraries/KQuickImageEdit { }; + ldutils = callPackage ../development/libraries/ldutils { }; libcommuni = callPackage ../development/libraries/libcommuni { }; @@ -15705,6 +15713,12 @@ in suffix = "qt5"; }; + poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix { + lcms = lcms2; + qt5Support = true; + suffix = "qt5"; + }; + pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { }; qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; @@ -18948,6 +18962,8 @@ in go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { }; + go-minimock = callPackage ../development/tools/go-minimock { }; + go-protobuf = callPackage ../development/tools/go-protobuf { }; go-symbols = callPackage ../development/tools/go-symbols { }; @@ -20630,13 +20646,10 @@ in calibre = calibre-py3; - calligra = libsForQt514.callPackage ../applications/office/calligra { + calligra = libsForQt5.callPackage ../applications/office/calligra { openjpeg = openjpeg_1; - poppler = poppler_0_61.override { - qt5Support = true; - # Must be using the same qt version as calligra itself. - qtbase = qt514.qtbase; - }; + # Must use the same Qt version as Calligra itself: + poppler = libsForQt5.poppler_0_61; }; perkeep = callPackage ../applications/misc/perkeep { }; @@ -22308,14 +22321,14 @@ in k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; - kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; + kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; - kdevelop-unwrapped = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop.nix { + kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { llvmPackages = llvmPackages_10; }; - kdev-php = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; - kdev-python = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-python.nix { + kdev-php = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; + kdev-python = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-python.nix { python = python3; }; @@ -24469,7 +24482,7 @@ in tribler = callPackage ../applications/networking/p2p/tribler { }; - trojita = libsForQt514.callPackage ../applications/networking/mailreaders/trojita { }; + trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; tudu = callPackage ../applications/office/tudu { }; @@ -25284,7 +25297,7 @@ in zam-plugins = callPackage ../applications/audio/zam-plugins { }; - zanshin = libsForQt514.callPackage ../applications/office/zanshin { + zanshin = libsForQt5.callPackage ../applications/office/zanshin { boost = boost160; }; @@ -25623,7 +25636,7 @@ in dhewm3 = callPackage ../games/dhewm3 {}; - digikam = libsForQt514.callPackage ../applications/graphics/digikam {}; + digikam = libsForQt5.callPackage ../applications/graphics/digikam {}; displaycal = callPackage ../applications/graphics/displaycal {}; @@ -26509,10 +26522,9 @@ in lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); lxqt = recurseIntoAttrs (import ../desktops/lxqt { - inherit qt5; - inherit libsForQt5; inherit pkgs; inherit (lib) makeScope; + inherit qt5 libsForQt5; }); mate = recurseIntoAttrs (callPackage ../desktops/mate { }); @@ -28663,6 +28675,10 @@ in yaxg = callPackage ../tools/graphics/yaxg {}; + yuzu = libsForQt5.callPackage ../misc/emulators/yuzu { + stdenv = gcc10Stdenv; + }; + zap = callPackage ../tools/networking/zap { }; zigbee2mqtt = callPackage ../servers/zigbee2mqtt { }; diff --git a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix index 2d25ea149a..46e222261f 100644 --- a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -104,6 +104,16 @@ in { buildLlvmPackages = buildPackages.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9; }; + ghc8103 = callPackage ../development/compilers/ghc/8.10.3.nix { + # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar + bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then + packages.ghc8102BinaryMinimal + else + packages.ghc865Binary; + inherit (buildPackages.python3Packages) sphinx; + buildLlvmPackages = buildPackages.llvmPackages_9; + llvmPackages = pkgs.llvmPackages_9; + }; ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { bootPkgs = packages.ghc8102Binary; inherit (buildPackages.python3Packages) sphinx; @@ -206,6 +216,11 @@ in { ghc = bh.compiler.ghc8102; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; }; + ghc8103 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc8103; + ghc = bh.compiler.ghc8103; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; + }; ghc901 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc901; ghc = bh.compiler.ghc901;