diff options
35 files changed, 1081 insertions, 602 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix index ec5fbb13b323..5fe84cfb82ec 100644 --- a/nixos/modules/services/x11/desktop-managers/lumina.nix +++ b/nixos/modules/services/x11/desktop-managers/lumina.nix @@ -33,7 +33,6 @@ in environment.systemPackages = [ pkgs.fluxbox pkgs.libsForQt5.kwindowsystem - pkgs.kdeFrameworks.oxygen-icons5 pkgs.lumina pkgs.numlockx pkgs.qt5.qtsvg diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 0660d0b2bc34..1923377e56a2 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -1,39 +1,33 @@ { stdenv, fetchurl, boost, mpd_clientlib, ncurses, pkgconfig, readline -, libiconv, icu +, libiconv, icu, curl , outputsSupport ? false # outputs screen , visualizerSupport ? false, fftw ? null # visualizer screen , clockSupport ? false # clock screen -, unicodeSupport ? true # utf8 support -, curlSupport ? true, curl ? null # allow fetching lyrics from the internet , taglibSupport ? true, taglib ? null # tag editor }: assert visualizerSupport -> (fftw != null); -assert curlSupport -> (curl != null); assert taglibSupport -> (taglib != null); with stdenv.lib; stdenv.mkDerivation rec { name = "ncmpcpp-${version}"; - version = "0.7.7"; + version = "0.8"; src = fetchurl { url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; - sha256 = "1vq19m36608pvw1g8nbcaqqb89wsw05v35pi45xwr20z7g4bxg5p"; + sha256 = "0nj6ky805a55acj0w57sbn3vfmmkbqp97rhbi0q9848n10f2l3rg"; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] ++ optional outputsSupport "--enable-outputs" ++ optional visualizerSupport "--enable-visualizer --with-fftw" ++ optional clockSupport "--enable-clock" - ++ optional unicodeSupport "--enable-unicode" - ++ optional curlSupport "--with-curl" ++ optional taglibSupport "--with-taglib"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ boost mpd_clientlib ncurses readline libiconv icu ] - ++ optional curlSupport curl + buildInputs = [ boost mpd_clientlib ncurses readline libiconv icu curl ] ++ optional visualizerSupport fftw ++ optional taglibSupport taglib; @@ -41,7 +35,7 @@ stdenv.mkDerivation rec { description = "A featureful ncurses based MPD client inspired by ncmpc"; homepage = http://ncmpcpp.rybczak.net/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 mornfall koral ]; - platforms = platforms.linux; + maintainers = with maintainers; [ jfrankenau koral lovek323 mornfall ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index d5f223afd5db..d22b5c9a8834 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -48,25 +48,9 @@ in { sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb"; }; - terraform_0_9_4 = generic { - version = "0.9.4"; - sha256 = "07vcmjyl0y48hm5lqqzdd51hmrxapvywzbdkg5f3rcqd7dn9c2xs"; - postPatch = '' - rm builtin/providers/dns/data_dns_cname_record_set_test.go - rm builtin/providers/vsphere/resource_vsphere_file_test.go - ''; - doCheck = true; - }; - - terraform_0_9_6 = generic { - version = "0.9.6"; - sha256 = "1f6z1zkklzpqgc7akgdz1g306ccmhni5lmg7i6g762n3qai60bnv"; - doCheck = true; - }; - - terraform_0_9_9 = generic { - version = "0.9.9"; - sha256 = "1pa9dd87dcjnn7fm1qn63da5qx87l7xjqlwiczrswcjfbismvl1p"; + terraform_0_9_10 = generic { + version = "0.9.10"; + sha256 = "0sg8czfn4hh7cf7zcdqwkygsvm9p47f5bi6kbl37bx9rn6bi5m6s"; doCheck = true; }; } diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 2bb0d9579428..dcffa2f14f46 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mcabber-${version}"; - version = "1.0.5"; + version = "1.1.0"; src = fetchurl { url = "http://mcabber.com/files/mcabber-${version}.tar.bz2"; - sha256 = "0ixdzk5b3s31a4bdfqgqrsiq7vbgdzhqr49p9pz9cq9bgn0h1wm0"; + sha256 = "1ggh865p1rf10ffsnf4g6qv9i8bls36dxdb1nzs5r9vdqci2rz04"; }; buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ]; diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index d9ec66a53e74..3473d321c75b 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, which, autoreconfHook, ncurses, perl -, cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl, lmdb, libxslt, docbook_xsl }: +, cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl, lmdb, libxslt, docbook_xsl }: stdenv.mkDerivation rec { - version = "20170602"; + version = "20170609"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "0rpvxmv10ypl7la4nmp0s02ixmm9g5pn9g9ms8ygzsix9pa86w45"; + sha256 = "015dd6rphvqdmnv477f1is22l7n5gvcvyblbyp0ggbp64650k0bz"; }; nativeBuildInputs = [ autoreconfHook docbook_xsl libxslt.bin which ]; buildInputs = [ - cyrus_sasl gdbm gpgme kerberos libidn ncurses + cyrus_sasl gss gpgme kerberos libidn ncurses notmuch openssl perl lmdb ]; @@ -28,23 +28,13 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-debug" "--enable-gpgme" - "--enable-hcache" - "--enable-imap" "--enable-notmuch" - "--enable-pgp" - "--enable-pop" - "--enable-sidebar" - "--enable-keywords" - "--enable-smtp" - "--enable-nntp" - "--enable-compressed" "--with-homespool=mailbox" "--with-gss" "--with-mailpath=" "--with-ssl" "--with-sasl" "--with-curses" - "--with-regex" "--with-idn" "--with-lmdb" @@ -61,6 +51,6 @@ stdenv.mkDerivation rec { homepage = http://www.neomutt.org; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan vrthra erikryb ]; + maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ]; }; } diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index df7ba69c5c5f..a4eb850f9390 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,72 +1,85 @@ { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev , yajl, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon -, xorgserver, xvfb_run }: +, xorgserver, xvfb_run, symlinkJoin, configFile ? null }: -stdenv.mkDerivation rec { - name = "i3-${version}"; +let version = "4.13"; - src = fetchurl { - url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "12ngz32swh9n85xy0cz1lq16aqi9ys5hq19v589q9a97wn1k3hcl"; - }; + i3 = stdenv.mkDerivation rec { + name = "i3-${version}"; - nativeBuildInputs = [ which pkgconfig makeWrapper ]; + src = fetchurl { + url = "http://i3wm.org/downloads/${name}.tar.bz2"; + sha256 = "12ngz32swh9n85xy0cz1lq16aqi9ys5hq19v589q9a97wn1k3hcl"; + }; - buildInputs = [ - libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon - libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango - perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun - perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC - xorgserver xvfb_run - ]; + nativeBuildInputs = [ which pkgconfig makeWrapper ]; - configureFlags = [ "--disable-builddir" ]; + buildInputs = [ + libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon + libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango + perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun + perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC + xorgserver xvfb_run + ]; - enableParallelBuilding = true; + configureFlags = [ "--disable-builddir" ]; - postPatch = '' - patchShebangs . - ''; + enableParallelBuilding = true; - # Tests have been failing (at least for some people in some cases) - # and have been disabled until someone wants to fix them. Some - # initial digging uncovers that the tests call out to `git`, which - # they shouldn't, and then even once that's fixed have some - # perl-related errors later on. For more, see - # https://github.com/NixOS/nixpkgs/issues/7957 - doCheck = false; # stdenv.system == "x86_64-linux"; - - checkPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") - '' - (cd testcases && xvfb-run ./complete-run.pl -p 1 --keep-xserver-output) - ! grep -q '^not ok' testcases/latest/complete-run.log - ''; + postPatch = '' + patchShebangs . + ''; - postInstall = '' - wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB" - for program in $out/bin/i3-sensible-*; do - sed -i 's/which/command -v/' $program - done - ''; + # Tests have been failing (at least for some people in some cases) + # and have been disabled until someone wants to fix them. Some + # initial digging uncovers that the tests call out to `git`, which + # they shouldn't, and then even once that's fixed have some + # perl-related errors later on. For more, see + # https://github.com/NixOS/nixpkgs/issues/7957 + doCheck = false; # stdenv.system == "x86_64-linux"; + + checkPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") + '' + (cd testcases && xvfb-run ./complete-run.pl -p 1 --keep-xserver-output) + ! grep -q '^not ok' testcases/latest/complete-run.log + ''; - separateDebugInfo = true; - - meta = with stdenv.lib; { - description = "A tiling window manager"; - homepage = "http://i3wm.org"; - maintainers = with maintainers; [ garbas modulistic fpletz ]; - license = licenses.bsd3; - platforms = platforms.all; - - longDescription = '' - A tiling window manager primarily targeted at advanced users and - developers. Based on a tree as data structure, supports tiling, - stacking, and tabbing layouts, handled dynamically, as well as - floating windows. Configured via plain text file. Multi-monitor. - UTF-8 clean. + postInstall = '' + wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB" + for program in $out/bin/i3-sensible-*; do + sed -i 's/which/command -v/' $program + done ''; + + separateDebugInfo = true; + + meta = with stdenv.lib; { + description = "A tiling window manager"; + homepage = "http://i3wm.org"; + maintainers = with maintainers; [ garbas modulistic fpletz ]; + license = licenses.bsd3; + platforms = platforms.all; + + longDescription = '' + A tiling window manager primarily targeted at advanced users and + developers. Based on a tree as data structure, supports tiling, + stacking, and tabbing layouts, handled dynamically, as well as + floating windows. Configured via plain text file. Multi-monitor. + UTF-8 clean. + ''; + }; + }; +in if configFile == null then i3 else symlinkJoin { + name = "i3-with-config-${version}"; + paths = [ i3 ]; + + buildInputs = [ makeWrapper ]; + postBuild = '' + wrapProgram $out/bin/i3 \ + --add-flags "-c ${configFile}" + ''; } diff --git a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix index 0e895339f24c..eea190d0a88c 100644 --- a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix +++ b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "emacs-all-the-icons-fonts-${version}"; - version = "2.50"; + version = "2.6.4"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "2.5.0"; - sha256 = "125qw96rzbkv39skxk5511jrcx9hxm0fqcmny6213wzswgdn37z3"; + rev = version; + sha256 = "0xwj8wyj0ywpy4rcqxz15hkr8jnffn7nrp5fnq56j360v8858q8x"; }; installPhase = '' diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix index 81ced85d4620..77b47533d537 100644 --- a/pkgs/desktops/lumina/default.nix +++ b/pkgs/desktops/lumina/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, numlockx, - xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, qttools, oxygen-icons5 + xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, qttools }: stdenv.mkDerivation rec { name = "lumina-${version}"; - version = "1.2.0-p1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "trueos"; repo = "lumina"; rev = "v${version}"; - sha256 = "0k16lcpxp9avwkadbbyqficd1wxsmwian5ji38wyax76v22yq7p6"; + sha256 = "13kwlhv2qscrn52xvx0n1sqbl96fkcb5r1ixa0wazflx8dfl9ndn"; }; nativeBuildInputs = [ @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { qtsvg qtmultimedia qtx11extras - oxygen-icons5 fluxbox xscreensaver desktop_file_utils diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index e82e10edc582..83efa6b0b5a3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -58,4 +58,6 @@ self: super: { # https://github.com/nominolo/ghc-syb/issues/20 ghc-syb-utils = dontCheck super.ghc-syb-utils; + # Newer versions require ghc>=8.2 + apply-refact = super.apply-refact_0_3_0_1; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 700d209285d3..c3a33e73f775 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 8.20 + # LTS Haskell 8.21 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -548,7 +548,7 @@ default-package-overrides: - distributed-process ==0.6.6 - distributed-process-simplelocalnet ==0.2.3.3 - distributed-static ==0.3.5.0 - - distribution ==1.1.0.0 + - distribution ==1.1.1.0 - distributive ==0.5.2 - diversity ==0.8.0.2 - djinn-ghc ==0.0.2.3 @@ -605,14 +605,14 @@ default-package-overrides: - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - elm-export-persistent ==0.1.2 - - email-validate ==2.2.0 + - email-validate ==2.2.1.1 - emailaddress ==0.2.0.0 - enclosed-exceptions ==1.0.2 - encoding-io ==0.0.1 - engine-io ==1.2.16 - engine-io-wai ==1.0.6 - EntrezHTTP ==1.0.3 - - entropy ==0.3.7 + - entropy ==0.3.8 - enummapset ==0.5.2.1 - enummapset-th ==0.6.1.1 - enumset ==0.0.4 @@ -918,7 +918,7 @@ default-package-overrides: - hackage-security ==0.5.2.2 - hackernews ==1.1.2.0 - haddock-library ==1.4.3 - - hailgun ==0.4.1.3 + - hailgun ==0.4.1.4 - hailgun-simple ==0.1.0.0 - hakyll ==4.9.7.0 - half ==0.2.2.3 @@ -936,7 +936,7 @@ default-package-overrides: - happy ==1.19.5 - HaRe ==0.8.4.0 - harp ==0.4.2 - - hasbolt ==0.1.1.3 + - hasbolt ==0.1.2.1 - hashable ==1.2.6.1 - hashable-time ==0.2.0.1 - hashmap ==1.3.2 @@ -1042,7 +1042,7 @@ default-package-overrides: - hPDB ==1.2.0.9 - hPDB-examples ==1.2.0.7 - HPDF ==1.4.10 - - hpio ==0.8.0.9 + - hpio ==0.8.0.10 - hpp ==0.4.0 - hpqtypes ==1.5.1.1 - hquantlib ==0.0.4.0 @@ -1233,7 +1233,7 @@ default-package-overrides: - kan-extensions ==5.0.2 - kansas-comet ==0.4 - katip ==0.3.1.5 - - katip-elasticsearch ==0.3.0.2 + - katip-elasticsearch ==0.3.1.0 - kawhi ==0.2.3 - kdt ==0.2.4 - keter ==1.4.3.2 @@ -1291,7 +1291,7 @@ default-package-overrides: - LibZip ==1.0.1 - licensor ==0.2.0 - lift-generics ==0.1.1 - - lifted-async ==0.9.1.1 + - lifted-async ==0.9.3 - lifted-base ==0.2.3.11 - line ==2.2.0 - linear ==1.20.6 @@ -1631,7 +1631,7 @@ default-package-overrides: - post-mess-age ==0.2.1.0 - postgresql-binary ==0.9.3 - postgresql-libpq ==0.9.3.1 - - postgresql-schema ==0.1.10 + - postgresql-schema ==0.1.11 - postgresql-simple ==0.5.3.0 - postgresql-simple-migration ==0.1.9.0 - postgresql-simple-url ==0.2.0.0 @@ -1668,7 +1668,7 @@ default-package-overrides: - prometheus-metrics-ghc ==0.1.1 - prompt ==0.1.1.2 - proto-lens ==0.2.1.0 - - proto-lens-arbitrary ==0.1.0.2 + - proto-lens-arbitrary ==0.1.0.3 - proto-lens-combinators ==0.1.0.7 - proto-lens-descriptors ==0.2.1.0 - proto-lens-optparse ==0.1.0.3 @@ -1699,7 +1699,7 @@ default-package-overrides: - quickcheck-instances ==0.3.12 - quickcheck-io ==0.1.4 - quickcheck-simple ==0.1.0.1 - - quickcheck-special ==0.1.0.4 + - quickcheck-special ==0.1.0.5 - quickcheck-text ==0.1.2.1 - quickcheck-unicode ==1.0.1.0 - raaz ==0.1.1 @@ -1731,7 +1731,7 @@ default-package-overrides: - ReadArgs ==1.2.3 - readline ==1.0.3.0 - rebase ==1.0.8 - - recursion-schemes ==5.0.1 + - recursion-schemes ==5.0.2 - redis-io ==0.7.0 - redis-resp ==0.4.0 - reducers ==3.12.1 @@ -2094,7 +2094,7 @@ default-package-overrides: - textlocal ==0.1.0.5 - tf-random ==0.5 - tfp ==1.0.0.2 - - th-abstraction ==0.2.2.0 + - th-abstraction ==0.2.3.0 - th-data-compat ==0.0.2.2 - th-desugar ==1.6 - th-expand-syns ==0.4.3.0 @@ -2130,7 +2130,7 @@ default-package-overrides: - tinylog ==0.14.0 - tinytemplate ==0.1.2.0 - titlecase ==0.1.0.3 - - tls ==1.3.10 + - tls ==1.3.11 - tls-debug ==0.4.4 - token-bucket ==0.1.0.1 - tostring ==0.2.1.1 @@ -2432,6 +2432,7 @@ extra-packages: - aeson < 0.8 # newer versions don't work with GHC 7.6.x or earlier - aeson < 1 # required by liquidhaskell-0.8.0.0 - aeson-pretty < 0.8 # required by elm compiler + - apply-refact < 0.4 # newer versions don't work with GHC 8.0.x - binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers - binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers - Cabal == 1.18.* # required for cabal-install et al on old GHC versions @@ -2793,7 +2794,6 @@ dont-distribute-packages: applicative-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-quoters: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-splice: [ i686-linux, x86_64-linux, x86_64-darwin ] - apply-refact: [ i686-linux, x86_64-linux, x86_64-darwin ] ApproxFun-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] approximate: [ i686-linux, x86_64-linux, x86_64-darwin ] approx-rand-test: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1b72b9020b05..f75d435cddc2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17950,8 +17950,8 @@ self: { }: mkDerivation { pname = "VKHS"; - version = "1.8.3"; - sha256 = "1rj1vi804g6dfzl730lfgcpycw348pcvvs0209qhwdhyn6mrdqgw"; + version = "1.9"; + sha256 = "0vfspcsm2fgpqwbwli5a4ca8lsh50j8m9x2v4ccs6zd8svcimg3q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24755,7 +24755,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "amqp_0_15_0" = callPackage + "amqp_0_15_1" = callPackage ({ mkDerivation, base, binary, bytestring, clock, connection , containers, data-binary-ieee754, hspec, hspec-expectations , monad-control, network, network-uri, split, stm, text, vector @@ -24763,8 +24763,8 @@ self: { }: mkDerivation { pname = "amqp"; - version = "0.15.0"; - sha256 = "1chxcc9r9cyk8jhrb2vyh0k374hhw8ia6bbq92yw9dlp1y5fvxfi"; + version = "0.15.1"; + sha256 = "17pgwa810w8f3kqhxp850hwkr9yqi0sydy4sc6wxxfi4pwy5xvld"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -26133,6 +26133,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "apply-refact_0_3_0_1" = callPackage + ({ mkDerivation, base, containers, directory, filemanip, filepath + , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact + , silently, syb, tasty, tasty-expected-failure, tasty-golden + , temporary, transformers, unix-compat + }: + mkDerivation { + pname = "apply-refact"; + version = "0.3.0.1"; + sha256 = "0578ql80fzkbjiw589v4498qd9jd7l2sz626imkdybxr1lqbsm0p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filemanip ghc ghc-exactprint mtl process + refact syb temporary transformers unix-compat + ]; + executableHaskellDepends = [ + base containers directory filemanip filepath ghc ghc-exactprint mtl + optparse-applicative process refact syb temporary transformers + unix-compat + ]; + testHaskellDepends = [ + base containers directory filemanip filepath ghc ghc-exactprint mtl + optparse-applicative process refact silently syb tasty + tasty-expected-failure tasty-golden temporary transformers + unix-compat + ]; + description = "Perform refactorings specified by the refact library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "apply-refact" = callPackage ({ mkDerivation, base, containers, directory, filemanip, filepath , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact @@ -26162,7 +26194,6 @@ self: { ]; description = "Perform refactorings specified by the refact library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "apportionment" = callPackage @@ -27650,6 +27681,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async-refresh_0_2_0_2" = callPackage + ({ mkDerivation, base, criterion, formatting, HUnit, lifted-async + , microlens, microlens-th, monad-control, monad-logger + , safe-exceptions, stm, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "async-refresh"; + version = "0.2.0.2"; + sha256 = "1hq1h9ngvg12rwn2xbby69w9y19gm4qaqzdfc1iv5019l5kqncls"; + libraryHaskellDepends = [ + base formatting lifted-async microlens microlens-th monad-control + monad-logger safe-exceptions stm text + ]; + testHaskellDepends = [ + base criterion HUnit monad-logger stm test-framework + test-framework-hunit text + ]; + homepage = "https://github.com/mtesseract/async-refresh"; + description = "Package implementing core logic for refreshing of expiring data"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "async-refresh-tokens" = callPackage ({ mkDerivation, async-refresh, base, bytestring, criterion , formatting, HUnit, lens, lifted-async, monad-control @@ -31798,8 +31852,8 @@ self: { }: mkDerivation { pname = "binary-ext"; - version = "1.0"; - sha256 = "0ds8l02l6nyrqpyfxjjgxp7qg8cs4rkbravf0k7hhnif9mylqyqb"; + version = "1.0.8.5.1"; + sha256 = "166c0wvmjpgpsm5s93clkp0ba50xyxinma4bkjxwqz3x1iv0gvzb"; libraryHaskellDepends = [ array base binary bytestring containers ]; @@ -35095,8 +35149,8 @@ self: { }: mkDerivation { pname = "bond"; - version = "0.9.0.0"; - sha256 = "020a8hydpmxm7xppxr12ks52b47vssxggziw6qahzkkx8f2lq1bm"; + version = "0.10.0.0"; + sha256 = "1f7vfh9pcg6za8rcdpq1lbvyn2z7plcb70d5r1xj330akvl626jw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41117,6 +41171,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "chatwork" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection + , data-default-class, http-client, http-client-tls, http-types, req + , text + }: + mkDerivation { + pname = "chatwork"; + version = "0.1.0.0"; + sha256 = "1harahpwd3m8d4qyf7lswhragpsin0qdj7j97jl482qkzvnpzbmf"; + libraryHaskellDepends = [ + aeson aeson-casing base bytestring connection data-default-class + http-client http-client-tls http-types req text + ]; + homepage = "https://github.com/matsubara0507/chatwork#readme"; + description = "The ChatWork API in Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "cheapskate" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , data-default, mtl, syb, text, uniplate, xss-sanitize @@ -42290,8 +42362,8 @@ self: { pname = "clash-lib"; version = "0.7.1"; sha256 = "1mml3f10mdirlihjnbzjh3jjnmvgcqfqs16k22a13m8pd4whcw88"; - revision = "1"; - editedCabalFile = "00vdln8qysx9m7br6mcszgkw810dglry6irfs9d24r0vrwfvfrig"; + revision = "2"; + editedCabalFile = "1b8d63wisrizirkyrl58840bfnknjy049sm43zhhr9nbw6fn2c51"; libraryHaskellDepends = [ aeson attoparsec base bytestring clash-prelude concurrent-supply containers data-binary-ieee754 deepseq directory errors fgl @@ -43937,6 +44009,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "codec-rpm" = callPackage + ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring + , conduit, conduit-combinators, conduit-extra, hspec + , hspec-attoparsec, HUnit, mtl, parsec, pretty, resourcet, text + }: + mkDerivation { + pname = "codec-rpm"; + version = "0.1.1"; + sha256 = "0qn79jr1z382kf08r5v48lj1zpsi88sxsvi0vwkv3ijz7gfx2lni"; + libraryHaskellDepends = [ + attoparsec attoparsec-binary base bytestring conduit + conduit-combinators conduit-extra mtl parsec pretty resourcet text + ]; + testHaskellDepends = [ + attoparsec base bytestring hspec hspec-attoparsec HUnit text + ]; + homepage = "https://github.com/weldr/codec-rpm"; + description = "A library for manipulating RPM files"; + license = "LGPL"; + }) {}; + "codecov-haskell" = callPackage ({ mkDerivation, aeson, async, base, bytestring, cmdargs , containers, curl, hpc, HUnit, process, regex-posix, retry, safe @@ -45232,23 +45325,24 @@ self: { "composite-aeson" = callPackage ({ mkDerivation, aeson, aeson-better-errors, aeson-qq, base , composite-base, containers, contravariant, generic-deriving - , hashable, hspec, lens, profunctors, QuickCheck, scientific - , tagged, template-haskell, text, time, unordered-containers - , vector, vinyl + , hashable, hspec, lens, mmorph, mtl, profunctors, QuickCheck + , scientific, tagged, template-haskell, text, time + , unordered-containers, vector, vinyl }: mkDerivation { pname = "composite-aeson"; - version = "0.4.1.0"; - sha256 = "0sbx0ww1fb5pr39d9ss40zkw74mgv1g3ynxklm46f0pnzyyny6v3"; + version = "0.4.2.0"; + sha256 = "06zaji95znvy5v9qmyczdncqgdmp2jkibqimchziayjs1vcmb8bg"; libraryHaskellDepends = [ aeson aeson-better-errors base composite-base containers - contravariant generic-deriving hashable lens profunctors scientific - tagged template-haskell text time unordered-containers vector vinyl + contravariant generic-deriving hashable lens mmorph mtl profunctors + scientific tagged template-haskell text time unordered-containers + vector vinyl ]; testHaskellDepends = [ aeson aeson-better-errors aeson-qq base composite-base containers - contravariant generic-deriving hashable hspec lens profunctors - QuickCheck scientific tagged template-haskell text time + contravariant generic-deriving hashable hspec lens mmorph mtl + profunctors QuickCheck scientific tagged template-haskell text time unordered-containers vector vinyl ]; homepage = "https://github.com/ConferHealth/composite#readme"; @@ -45258,12 +45352,16 @@ self: { }) {}; "composite-aeson-refined" = callPackage - ({ mkDerivation, base, composite-aeson, refined }: + ({ mkDerivation, aeson-better-errors, base, composite-aeson, mtl + , refined + }: mkDerivation { pname = "composite-aeson-refined"; - version = "0.4.1.0"; - sha256 = "1d4rjhgcxaklq7nbmi45qwi7zk3mhyf6bfzijv7qh9ln3nkg644k"; - libraryHaskellDepends = [ base composite-aeson refined ]; + version = "0.4.2.0"; + sha256 = "1zzqrjvlk6yy2zsx1v325mbwl9qjjwj6qvc42y61acag9n08asv5"; + libraryHaskellDepends = [ + aeson-better-errors base composite-aeson mtl refined + ]; homepage = "https://github.com/ConferHealth/composite#readme"; description = "composite-aeson support for Refined from the refined package"; license = stdenv.lib.licenses.bsd3; @@ -45277,8 +45375,8 @@ self: { }: mkDerivation { pname = "composite-base"; - version = "0.4.1.0"; - sha256 = "16yxc1i75mag3dnw7v62k418fg0visc616g769qj9n8nyr1viyw9"; + version = "0.4.2.0"; + sha256 = "0mfz7xpkl3lxg3pfk83mba7kb9phpcc4cnvimpphfcbwpzx8qcqw"; libraryHaskellDepends = [ base exceptions lens monad-control mtl profunctors template-haskell text transformers transformers-base vinyl @@ -45299,8 +45397,8 @@ self: { }: mkDerivation { pname = "composite-ekg"; - version = "0.4.1.0"; - sha256 = "1xbipy46bvph4h9wm73l68z7m4i8mcxxmgyzcqkyq8rwmrfx3diq"; + version = "0.4.2.0"; + sha256 = "06lb5djs1w9gby7f192wssxwbik2lpigzsfv25z5pchf8iab4f9d"; libraryHaskellDepends = [ base composite-base ekg ekg-core lens text vinyl ]; @@ -45317,8 +45415,8 @@ self: { }: mkDerivation { pname = "composite-opaleye"; - version = "0.4.1.0"; - sha256 = "1jb5garjx1yy4jdznbcfimjipjpmrxy9a1l9yfqbg9mlyz57y4mk"; + version = "0.4.2.0"; + sha256 = "0id817bwss3haskvfpn86bqsva8a0ahwbgbzh5zbyiwc5vqksnkx"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors template-haskell text vinyl @@ -49739,6 +49837,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cryptoconditions" = callPackage + ({ mkDerivation, aeson, aeson-quick, asn1-encoding, asn1-parse + , asn1-types, base, base16-bytestring, base64-bytestring + , bytestring, containers, cryptonite, memory, tasty, tasty-hunit + , text, transformers + }: + mkDerivation { + pname = "cryptoconditions"; + version = "0.1.0.0"; + sha256 = "0dbhlv7nh0awnvi1rwg3s25ksbxgvdlci543bwqp5ilkqdl3vlh0"; + libraryHaskellDepends = [ + asn1-encoding asn1-parse asn1-types base base64-bytestring + bytestring containers cryptonite memory text + ]; + testHaskellDepends = [ + aeson aeson-quick asn1-encoding base base16-bytestring + base64-bytestring bytestring cryptonite tasty tasty-hunit text + transformers + ]; + homepage = "https://github.com/libscott/cryptoconditions-hs"; + description = "Interledger Crypto-Conditions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cryptohash" = callPackage ({ mkDerivation, base, byteable, bytestring, criterion, cryptonite , ghc-prim, HUnit, memory, QuickCheck, tasty, tasty-hunit @@ -51658,6 +51780,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "data-basic" = callPackage + ({ mkDerivation, aeson, base, basic, binary, bytestring, cases + , containers, hssqlppp, lens, lens-aeson, mtl, overload + , postgresql-simple, simple-effects, string-conv, template-haskell + , text, time + }: + mkDerivation { + pname = "data-basic"; + version = "0.2.0.1"; + sha256 = "16j5jvry7hfgnyz4bsi1a2kja7q7a0sfafswa942pqby6dzcgxz1"; + libraryHaskellDepends = [ + aeson base binary bytestring cases containers hssqlppp lens + lens-aeson mtl overload postgresql-simple simple-effects + string-conv template-haskell text time + ]; + testHaskellDepends = [ base basic lens postgresql-simple time ]; + homepage = "https://gitlab.com/haskell-hr/basic"; + description = "A database library with a focus on ease of use, type safety and useful error messages"; + license = stdenv.lib.licenses.mit; + broken = true; + }) {basic = null;}; + "data-binary-ieee754" = callPackage ({ mkDerivation, base, binary }: mkDerivation { @@ -55599,16 +55743,19 @@ self: { }) {}; "di" = callPackage - ({ mkDerivation, base, stm, text, time, transformers }: + ({ mkDerivation, base, bytestring, QuickCheck, stm, tasty + , tasty-hunit, tasty-quickcheck, time, transformers + }: mkDerivation { pname = "di"; - version = "0.1"; - sha256 = "06vy2x4v5h4pnidqjyi2s8rk13zp9anx61z251dphmbv510rlfw8"; - revision = "1"; - editedCabalFile = "08fmgc1dsvwipd0dnwbnmc9f16abzfhxk4kkcf535kykxxc621qc"; - libraryHaskellDepends = [ base stm text time transformers ]; + version = "0.2"; + sha256 = "1vmhd8zph5ai13n2cfrjaxcdifwqv7wiggqbfi5ifhancxwlfq7p"; + libraryHaskellDepends = [ base stm time transformers ]; + testHaskellDepends = [ + base bytestring QuickCheck stm tasty tasty-hunit tasty-quickcheck + ]; homepage = "https://github.com/k0001/di"; - description = "Easy and powerful typeful logging without monad towers"; + description = "Easy, powerful, structured and typeful logging without monad towers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -56805,6 +56952,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dimensions" = callPackage + ({ mkDerivation, base, Cabal, ghc-prim, QuickCheck }: + mkDerivation { + pname = "dimensions"; + version = "0.1.0.0"; + sha256 = "0162ki2vw1k3wza7b4zfp4ya4lb3cdzp0vdr0k8d8k5b3w107p26"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base Cabal QuickCheck ]; + homepage = "https://github.com/achirkin/easytensor#readme"; + description = "Safe type-level dimensionality for multidimensional data"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dingo-core" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-builder, blaze-html, blaze-textual, bytestring, conduit @@ -58026,8 +58186,8 @@ self: { ({ mkDerivation, array, base, containers, MonadRandom, random }: mkDerivation { pname = "distribution"; - version = "1.1.0.0"; - sha256 = "03l1aki8cvpqx0b11923nkcpp32afwk0k5cgv7hc74yzbwmniqnv"; + version = "1.1.1.0"; + sha256 = "1cc16020b8jifcqb2k61g9rv100i8iga7dfsi8jf502myvpgilpx"; libraryHaskellDepends = [ array base containers MonadRandom random ]; @@ -58520,24 +58680,26 @@ self: { , lens-aeson, monad-control, mtl, network, process, QuickCheck , resourcet, scientific, tar, tasty, tasty-hunit, tasty-quickcheck , temporary, text, time, tls, transformers, transformers-base - , unordered-containers, uuid, x509, x509-store, x509-system, zlib + , unordered-containers, uuid, vector, x509, x509-store, x509-system + , zlib }: mkDerivation { pname = "docker"; - version = "0.4.0.0"; - sha256 = "0fcgy6fbhwwvdv93i5xggzkagnzlyccnciy7n8jxdrrm2fg8xxk1"; + version = "0.4.0.1"; + sha256 = "1nf860admbdhrbyyj8m7ymd9c390rnrn2nqb2gr3i8dk4rcm4hsf"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit conduit-combinators conduit-extra containers data-default-class directory exceptions filemanip filepath http-client http-conduit http-types monad-control mtl network resourcet scientific tar temporary text time tls transformers transformers-base unordered-containers uuid - x509 x509-store x509-system zlib + vector x509 x509-store x509-system zlib ]; testHaskellDepends = [ aeson base bytestring connection containers http-client http-client-tls http-types lens lens-aeson process QuickCheck tasty tasty-hunit tasty-quickcheck text transformers unordered-containers + vector ]; homepage = "https://github.com/denibertovic/docker-hs"; description = "An API client for docker written in Haskell"; @@ -60535,16 +60697,16 @@ self: { }) {}; "easytensor" = callPackage - ({ mkDerivation, base, ghc-prim }: + ({ mkDerivation, base, Cabal, dimensions, ghc-prim, QuickCheck + , time + }: mkDerivation { pname = "easytensor"; - version = "0.1.0.0"; - sha256 = "0cdhy00if38yaqg5n05sg3i8h8gh6shcwlycchgibw4141fj5wkz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ghc-prim ]; - executableHaskellDepends = [ base ghc-prim ]; - testHaskellDepends = [ base ]; + version = "0.2.0.0"; + sha256 = "1z5myc51q96pbwaryf6pvjvfqq9l2d0cwnhpxpxn3bkcj6jr9yf8"; + libraryHaskellDepends = [ base dimensions ghc-prim ]; + testHaskellDepends = [ base Cabal dimensions QuickCheck ]; + benchmarkHaskellDepends = [ base dimensions time ]; homepage = "https://github.com/achirkin/easytensor#readme"; description = "Initial project template from stack"; license = stdenv.lib.licenses.mit; @@ -62124,21 +62286,20 @@ self: { }) {}; "email-validate" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, ghc-prim, HUnit - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2 + ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "email-validate"; - version = "2.2.0"; - sha256 = "0sfbv4l5h13h9shgf2fgm1a7sxbcy633abvwwr5bqnq15kqd6zxa"; - libraryHaskellDepends = [ attoparsec base bytestring ghc-prim ]; + version = "2.2.1.1"; + sha256 = "18q1n0x79mii4d3hdm671ziswh1283mwl1xj47vcvizz4mi6vhh7"; + libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct"; - description = "Validating an email address string against RFC 5322"; + homepage = "https://github.com/Porges/email-validate-hs"; + description = "Email address validation"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -62564,23 +62725,6 @@ self: { }: mkDerivation { pname = "entropy"; - version = "0.3.7"; - sha256 = "1vzg9fi597dbrcbjsr71y47rvmhiih7lg5rjnb297fzdlbmj1w0z"; - revision = "1"; - editedCabalFile = "01lyh4cbpqlcj1y8mnkw6vk4vid5rzqg1vcf9kwxwd88zj86cgjg"; - setupHaskellDepends = [ base Cabal directory filepath process ]; - libraryHaskellDepends = [ base bytestring unix ]; - homepage = "https://github.com/TomMD/entropy"; - description = "A platform independent entropy source"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "entropy_0_3_8" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, filepath - , process, unix - }: - mkDerivation { - pname = "entropy"; version = "0.3.8"; sha256 = "1l3lfigqvdlmxkz1wl7zdkmc0i2r5p6z4xzhiw8xdsbsw7aljfkl"; setupHaskellDepends = [ base Cabal directory filepath process ]; @@ -62588,7 +62732,6 @@ self: { homepage = "https://github.com/TomMD/entropy"; description = "A platform independent entropy source"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "enumerable" = callPackage @@ -68695,8 +68838,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.3.0"; - sha256 = "0g58anj96b482xm0vgxxf9v8m4m9x2lq4g1r0ynfc5zr9c64wb1n"; + version = "0.5.3.2"; + sha256 = "0m29qcajhbzkl577xyzly82m9jrd446gzpxgg7sswvaki1wa6yv0"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -68859,15 +69002,15 @@ self: { ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, containers, criterion, deepseq, formatting, hspec , interpolate, microlens, neat-interpolation, text, text-format - , vector + , time, time-locale-compat, vector }: mkDerivation { pname = "fmt"; - version = "0.2.0.0"; - sha256 = "1yg4wkb7irhvy6vzpbzj9aibb0kjl9xqaamn2cnq77f5znvwgpwh"; + version = "0.3.0.0"; + sha256 = "1dihbcawpf082maxw3g6gsp1n8cmfdil4llqa3wmf37dqyi2bvjm"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring containers - microlens text text-format + microlens text text-format time time-locale-compat ]; testHaskellDepends = [ base bytestring containers hspec neat-interpolation text vector @@ -85100,24 +85243,6 @@ self: { }: mkDerivation { pname = "hailgun"; - version = "0.4.1.3"; - sha256 = "0x3yjxrjy6yg8b4pj7q8wzfmxxx9j5pzz17why5wyawvpswc3gjp"; - libraryHaskellDepends = [ - aeson base bytestring email-validate exceptions filepath - http-client http-client-tls http-types tagsoup text time - transformers - ]; - description = "Mailgun REST api interface for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hailgun_0_4_1_4" = callPackage - ({ mkDerivation, aeson, base, bytestring, email-validate - , exceptions, filepath, http-client, http-client-tls, http-types - , tagsoup, text, time, transformers - }: - mkDerivation { - pname = "hailgun"; version = "0.4.1.4"; sha256 = "0qcfhprg5x0wb28zgn80x808a1w6il2hc6mykq8wv0ranmwj1lrx"; libraryHaskellDepends = [ @@ -85128,7 +85253,6 @@ self: { homepage = "https://bitbucket.org/robertmassaioli/hailgun"; description = "Mailgun REST api interface for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hailgun-send" = callPackage @@ -87358,15 +87482,15 @@ self: { "hasbolt" = callPackage ({ mkDerivation, base, binary, bytestring, containers , data-binary-ieee754, data-default, hex, hspec, network - , network-simple, QuickCheck, text, transformers + , QuickCheck, text, transformers }: mkDerivation { pname = "hasbolt"; - version = "0.1.1.3"; - sha256 = "1ba85bq8p6cjrxajinb3ykqyffq0h2xcsq80q26y9iy18ys7mcbr"; + version = "0.1.2.1"; + sha256 = "08pa4df4klijdxpbfkqiqfjrcwl3ip3gwg84kx1zg9wpnvdbjn4l"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 data-default - hex network network-simple text transformers + hex network text transformers ]; testHaskellDepends = [ base bytestring containers hex hspec QuickCheck text @@ -94996,6 +95120,38 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; + "highlight" = callPackage + ({ mkDerivation, ansi-terminal, base, base-compat, bytestring + , containers, criterion, directory, doctest, filepath, lens, mtl + , mtl-compat, optparse-applicative, pipes, pipes-bytestring + , pipes-group, pipes-safe, process, QuickCheck, regex + , regex-with-pcre, semigroups, system-filepath, tasty, tasty-golden + , text, transformers, transformers-compat, unix + }: + mkDerivation { + pname = "highlight"; + version = "1.0.0.0"; + sha256 = "1gr4aj0w605hx2mrgzicb1nwimxyxpj2jid7ca6qpwnbxvnj7ryi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base base-compat bytestring containers directory + filepath lens mtl mtl-compat optparse-applicative pipes + pipes-bytestring pipes-group pipes-safe regex regex-with-pcre + semigroups system-filepath text transformers transformers-compat + unix + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base base-compat bytestring directory doctest lens pipes process + QuickCheck tasty tasty-golden transformers transformers-compat unix + ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/cdepillabout/highlight"; + description = "Command line tool for highlighting parts of files matching a regex"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "highlight-versions" = callPackage ({ mkDerivation, ansi-terminal, base, Cabal, containers, hackage-db }: @@ -96121,47 +96277,48 @@ self: { }) {}; "hledger" = callPackage - ({ mkDerivation, base, base-compat, bytestring, cmdargs, containers - , criterion, csv, data-default, directory, file-embed, filepath - , hashable, haskeline, here, hledger-lib, html, HUnit, megaparsec - , mtl, mtl-compat, old-time, parsec, pretty-show, process - , regex-tdfa, safe, shakespeare, split, tabular, temporary - , terminfo, test-framework, test-framework-hunit, text, time - , timeit, transformers, unordered-containers, utf8-string, wizards + ({ mkDerivation, ansi-terminal, base, base-compat, bytestring + , cmdargs, containers, criterion, csv, data-default, directory + , file-embed, filepath, hashable, haskeline, here, hledger-lib + , html, HUnit, megaparsec, mtl, mtl-compat, old-time, parsec + , pretty-show, process, regex-tdfa, safe, shakespeare, split + , tabular, temporary, terminfo, test-framework + , test-framework-hunit, text, time, timeit, transformers + , unordered-containers, utf8-string, wizards }: mkDerivation { pname = "hledger"; - version = "1.2"; - sha256 = "18j7h8km15lyqhhglbxj9gqrhk3r2wh6qv8v3cly05lrlkjvmx06"; - revision = "1"; - editedCabalFile = "02ddp8gkx3k36b9n2jywd0pkzvjq8mapc6idxa70az84va3lmnvd"; + version = "1.3"; + sha256 = "0b9gaj68ykx1ak2v4kjif67kkwv1s8rf9nvcijs4garz98781sdd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base-compat bytestring cmdargs containers csv data-default - directory file-embed filepath hashable haskeline here hledger-lib - HUnit megaparsec mtl mtl-compat old-time pretty-show process - regex-tdfa safe shakespeare split tabular temporary terminfo text - time transformers unordered-containers utf8-string wizards + ansi-terminal base base-compat bytestring cmdargs containers csv + data-default directory file-embed filepath hashable haskeline here + hledger-lib HUnit megaparsec mtl mtl-compat old-time pretty-show + process regex-tdfa safe shakespeare split tabular temporary + terminfo text time transformers unordered-containers utf8-string + wizards ]; executableHaskellDepends = [ - base base-compat bytestring cmdargs containers csv data-default - directory file-embed filepath haskeline here hledger-lib HUnit mtl - mtl-compat old-time parsec pretty-show process regex-tdfa safe - shakespeare split tabular temporary terminfo text time - unordered-containers utf8-string wizards + ansi-terminal base base-compat bytestring cmdargs containers csv + data-default directory file-embed filepath haskeline here + hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show + process regex-tdfa safe shakespeare split tabular temporary + terminfo text time unordered-containers utf8-string wizards ]; testHaskellDepends = [ - base base-compat bytestring cmdargs containers csv data-default - directory file-embed filepath haskeline here hledger-lib HUnit mtl - mtl-compat old-time parsec pretty-show process regex-tdfa safe - shakespeare split tabular temporary terminfo test-framework - test-framework-hunit text time unordered-containers utf8-string - wizards + ansi-terminal base base-compat bytestring cmdargs containers csv + data-default directory file-embed filepath haskeline here + hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show + process regex-tdfa safe shakespeare split tabular temporary + terminfo test-framework test-framework-hunit text time + unordered-containers utf8-string wizards ]; benchmarkHaskellDepends = [ - base base-compat criterion directory file-embed filepath here - hledger-lib html pretty-show process tabular temporary time timeit + ansi-terminal base base-compat criterion directory file-embed + filepath here hledger-lib html pretty-show process tabular + temporary time timeit ]; homepage = "http://hledger.org"; description = "Command-line interface for the hledger accounting tool"; @@ -96177,8 +96334,8 @@ self: { }: mkDerivation { pname = "hledger-api"; - version = "1.2"; - sha256 = "0pa2h79qy4a2in8q66q9rqh0sav44q7drdklsgqi3sm7ic65klwq"; + version = "1.3"; + sha256 = "0kl0sc11181bgpz65b5xg9l1hxdaai27icx13x15kwlc01jf9rcc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -96295,31 +96452,30 @@ self: { }) {}; "hledger-lib" = callPackage - ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring - , cmdargs, containers, csv, data-default, Decimal, deepseq - , directory, doctest, filepath, Glob, hashtables, HUnit, megaparsec - , mtl, mtl-compat, old-time, parsec, pretty-show, regex-tdfa, safe - , semigroups, split, test-framework, test-framework-hunit, text - , time, transformers, uglymemo, utf8-string + ({ mkDerivation, ansi-terminal, array, base, base-compat + , blaze-markup, bytestring, cmdargs, containers, csv, data-default + , Decimal, deepseq, directory, doctest, filepath, Glob, hashtables + , HUnit, megaparsec, mtl, mtl-compat, old-time, parsec, pretty-show + , regex-tdfa, safe, semigroups, split, test-framework + , test-framework-hunit, text, time, transformers, uglymemo + , utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.2"; - sha256 = "15yp89q5im3b7fbjz50inkmrgihq16vgbrfkdd6nnnd9n8vxhzrc"; - revision = "1"; - editedCabalFile = "0alkb7hd6rvfr5fvlqyqy1ma7fbsfnkn36gnx8dcvij75b1ym0a2"; + version = "1.3"; + sha256 = "052ynivzbyabp2yn7y2wfy9dvjly989rpbcla9kx8kvmqij5qdhm"; libraryHaskellDepends = [ - array base base-compat blaze-markup bytestring cmdargs containers - csv data-default Decimal deepseq directory filepath hashtables - HUnit megaparsec mtl mtl-compat old-time parsec pretty-show - regex-tdfa safe semigroups split text time transformers uglymemo - utf8-string + ansi-terminal array base base-compat blaze-markup bytestring + cmdargs containers csv data-default Decimal deepseq directory + filepath hashtables HUnit megaparsec mtl mtl-compat old-time parsec + pretty-show regex-tdfa safe semigroups split text time transformers + uglymemo utf8-string ]; testHaskellDepends = [ - array base base-compat blaze-markup bytestring cmdargs containers - csv data-default Decimal deepseq directory doctest filepath Glob - hashtables HUnit megaparsec mtl mtl-compat old-time parsec - pretty-show regex-tdfa safe split test-framework + ansi-terminal array base base-compat blaze-markup bytestring + cmdargs containers csv data-default Decimal deepseq directory + doctest filepath Glob hashtables HUnit megaparsec mtl mtl-compat + old-time parsec pretty-show regex-tdfa safe split test-framework test-framework-hunit text time transformers uglymemo utf8-string ]; homepage = "http://hledger.org"; @@ -96336,10 +96492,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.2"; - sha256 = "02mhhhkk6zz3bjcv6x0yhp4f2ifhj3pdk1z4wf6qkwm7jqsamqk1"; - revision = "2"; - editedCabalFile = "0w3w4llvb9fmdd555q4823dagw7ibqwas8cycra5pvw50ciia4xd"; + version = "1.3"; + sha256 = "0bixkihc2hcf98xpnb9a8lnqi5rcg2pj6d78w4pzwzd83vkmr1rj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -96384,10 +96538,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.2"; - sha256 = "1rn5x8h8vn28hk1201v2zzaawc86zkxrlqv8jwiyp2jls3l4m8d3"; - revision = "1"; - editedCabalFile = "1l08fzwdn1wqb1f1788rqdqr0znvgfqyb4r82vbjm62dar8qmzcg"; + version = "1.3"; + sha256 = "01y8djakr4r0jm5wyi6fbp911y3i82r1xmfi4gm9sgf27fi6a3i4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98749,16 +98901,17 @@ self: { "hp2pretty" = callPackage ({ mkDerivation, array, attoparsec, base, containers, filepath - , floatshow, mtl, text + , floatshow, mtl, optparse-applicative, semigroups, text }: mkDerivation { pname = "hp2pretty"; - version = "0.7"; - sha256 = "0b706fdq91n1pfsa8c9gqwpw6r14lgfc9p7c7iq6zm78kj3n8fgp"; + version = "0.8.0.2"; + sha256 = "1j3rn4xjpyqnl8vcsc9pyj03mwpilq20g0z8brh3prsvhjb9gl9g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array attoparsec base containers filepath floatshow mtl text + array attoparsec base containers filepath floatshow mtl + optparse-applicative semigroups text ]; homepage = "https://code.mathr.co.uk/hp2pretty"; description = "generate pretty graphs from heap profiles"; @@ -99115,37 +99268,6 @@ self: { }: mkDerivation { pname = "hpio"; - version = "0.8.0.9"; - sha256 = "1yr86m9zw3kbhb6wl2i3ikkvhzkzrlswgvan8wpyvd5chp4vxjm7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat bytestring containers directory exceptions - filepath mtl mtl-compat QuickCheck text transformers - transformers-compat unix unix-bytestring - ]; - executableHaskellDepends = [ - async base base-compat exceptions mtl mtl-compat - optparse-applicative transformers transformers-compat - ]; - testHaskellDepends = [ - async base base-compat bytestring containers directory doctest - exceptions filepath hlint hspec mtl mtl-compat QuickCheck text - transformers transformers-compat unix unix-bytestring - ]; - homepage = "https://github.com/quixoftic/hpio"; - description = "Monads for GPIO in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hpio_0_8_0_10" = callPackage - ({ mkDerivation, async, base, base-compat, bytestring, containers - , directory, doctest, exceptions, filepath, hlint, hspec, mtl - , mtl-compat, optparse-applicative, QuickCheck, text, transformers - , transformers-compat, unix, unix-bytestring - }: - mkDerivation { - pname = "hpio"; version = "0.8.0.10"; sha256 = "05cpfym6jb27z557i1954jnz9v3ghjg45h4rjfl9ql54cx6bx429"; isLibrary = true; @@ -99167,7 +99289,6 @@ self: { homepage = "https://github.com/quixoftic/hpio"; description = "Monads for GPIO in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hplayground" = callPackage @@ -101967,8 +102088,8 @@ self: { }: mkDerivation { pname = "hsparql"; - version = "0.3.1"; - sha256 = "0a7769mazml334agv6jkr3kwgcyp1y58bakgywa7b5crgznbvkc0"; + version = "0.3.3"; + sha256 = "08a24py8scbshrs1j0x5d6n1lsw1sxyp90wvvsscndnqsy60wcnl"; libraryHaskellDepends = [ base bytestring HTTP MissingH mtl network network-uri rdf4h text xml @@ -114942,37 +115063,6 @@ self: { }: mkDerivation { pname = "katip-elasticsearch"; - version = "0.3.0.2"; - sha256 = "1v9r03nwklb203llnda6v91yfcz3fhmhw8bc8mxn5mibbxbf88xw"; - libraryHaskellDepends = [ - aeson async base bloodhound enclosed-exceptions exceptions - http-client http-types katip retry scientific stm stm-chans text - time transformers unordered-containers uuid - ]; - testHaskellDepends = [ - aeson base bloodhound containers http-client http-types katip lens - lens-aeson quickcheck-instances scientific stm tasty tasty-hunit - tasty-quickcheck text time transformers unordered-containers vector - ]; - benchmarkHaskellDepends = [ - aeson base bloodhound criterion deepseq rng-utils text - unordered-containers uuid - ]; - description = "ElasticSearch scribe for the Katip logging framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "katip-elasticsearch_0_3_1_0" = callPackage - ({ mkDerivation, aeson, async, base, bloodhound, containers - , criterion, deepseq, enclosed-exceptions, exceptions, http-client - , http-types, katip, lens, lens-aeson, quickcheck-instances, retry - , rng-utils, scientific, stm, stm-chans, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers, unordered-containers - , uuid, vector - }: - mkDerivation { - pname = "katip-elasticsearch"; version = "0.3.1.0"; sha256 = "162ikrqpk0i8zh5gw3isc1lflg4a4bsqk3ci2rpirll0wf1dqgz9"; libraryHaskellDepends = [ @@ -120711,28 +120801,6 @@ self: { }: mkDerivation { pname = "lifted-async"; - version = "0.9.1.1"; - sha256 = "0h4fskcgr053s21z43bh1mlz40i8f5d166d382frng3j6jw49b1i"; - libraryHaskellDepends = [ - async base constraints lifted-base monad-control transformers-base - ]; - testHaskellDepends = [ - async base HUnit lifted-base monad-control mtl tasty tasty-hunit - tasty-th - ]; - benchmarkHaskellDepends = [ async base criterion deepseq ]; - homepage = "https://github.com/maoe/lifted-async"; - description = "Run lifted IO operations asynchronously and wait for their results"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lifted-async_0_9_3" = callPackage - ({ mkDerivation, async, base, constraints, criterion, deepseq - , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit - , tasty-th, transformers-base - }: - mkDerivation { - pname = "lifted-async"; version = "0.9.3"; sha256 = "0qdlc64kf02g97rzpragm4943ppy2cx74kbjcpbv32jcyc3q75wp"; libraryHaskellDepends = [ @@ -120746,7 +120814,6 @@ self: { homepage = "https://github.com/maoe/lifted-async"; description = "Run lifted IO operations asynchronously and wait for their results"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lifted-base" = callPackage @@ -122694,8 +122761,8 @@ self: { ({ mkDerivation, base, containers, monadLib, parsec, pretty }: mkDerivation { pname = "llvm-pretty"; - version = "0.7.1.0"; - sha256 = "0q1cbnllxs8xm98glm4brb5yryy8bg8yprdf1qjsv3a0l2vbn1aq"; + version = "0.7.1.1"; + sha256 = "17lb4jfkaxz2ahjfvq2mxnb82k209qg13rhdg76v3j8yahr5z0a2"; libraryHaskellDepends = [ base containers monadLib parsec pretty ]; description = "A pretty printing library inspired by the llvm binding"; license = stdenv.lib.licenses.bsd3; @@ -129850,8 +129917,8 @@ self: { }: mkDerivation { pname = "mltool"; - version = "0.1.0.1"; - sha256 = "14b8an1kba1xqnm9ay0y0pw9vam1hsviiwqbz6id5vrbldhwsfd7"; + version = "0.1.0.2"; + sha256 = "1gzm8a8abz8bnh80ylq0clp3isz2cx05mmyqwsdmh6kf94xsg71p"; libraryHaskellDepends = [ ascii-progress base deepseq hmatrix hmatrix-gsl hmatrix-gsl-stats MonadRandom random vector @@ -130482,6 +130549,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-control_1_0_2_1" = callPackage + ({ mkDerivation, base, stm, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "monad-control"; + version = "1.0.2.1"; + sha256 = "1hjq0d1y18yyw3p4g78r7k88xy92pzxiqchqll7rqj8lnwnwnknc"; + libraryHaskellDepends = [ + base stm transformers transformers-base transformers-compat + ]; + homepage = "https://github.com/basvandijk/monad-control"; + description = "Lift control operations, like exception catching, through monad transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-control-aligned" = callPackage ({ mkDerivation, base, stm, transformers, transformers-base , transformers-compat @@ -144457,8 +144541,8 @@ self: { }: mkDerivation { pname = "pdf-slave"; - version = "1.3.1.0"; - sha256 = "0285cjf3qgy5kkpssa5g4pb73bxjkqdksh47cdgrgvhzypxfq5q4"; + version = "1.3.2.0"; + sha256 = "1l7an71cnsgq7j6yfdvjqp1lj44f4kwb52c555ciccd6mz6f7866"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144476,14 +144560,49 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pdf-slave-server" = callPackage + ({ mkDerivation, acid-state, aeson, aeson-injector, base + , base16-bytestring, bytestring, containers, cryptonite, hashable + , http-client, http-client-tls, immortal, lens, memory + , monad-control, monad-logger, mtl, optparse-applicative, pdf-slave + , pdf-slave-server-api, safecopy, scientific, servant + , servant-auth-token, servant-auth-token-acid + , servant-auth-token-api, servant-server, shelly, stm, text, time + , transformers-base, unbounded-delays, unordered-containers, uuid + , wai-extra, warp, wreq, yaml + }: + mkDerivation { + pname = "pdf-slave-server"; + version = "0.1.1.0"; + sha256 = "0vjajkb0hamn68klihk6i6xwc6qc8ann5miqh9w71vgmwc5ksz0g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + acid-state aeson aeson-injector base base16-bytestring bytestring + containers cryptonite hashable http-client http-client-tls immortal + lens memory monad-control monad-logger mtl pdf-slave + pdf-slave-server-api safecopy scientific servant servant-auth-token + servant-auth-token-acid servant-auth-token-api servant-server + shelly stm text time transformers-base unbounded-delays + unordered-containers uuid wreq yaml + ]; + executableHaskellDepends = [ + base optparse-applicative wai-extra warp + ]; + homepage = "https://github.com/NCrashed/pdf-slave-server#readme"; + description = "Web service for pdf-slave tool"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {pdf-slave-server-api = null;}; + "pdf-slave-template" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, text }: mkDerivation { pname = "pdf-slave-template"; - version = "1.2.0.0"; - sha256 = "0c95p48pla8fsm2qq326rn1z98pkz3ycyh4g8bc9ixlinfgbxb33"; + version = "1.2.1.0"; + sha256 = "17sl4dcisvzjbxa0b6qbi934nl7f5rqm840l66axw2bz43aq1m1f"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring containers text ]; @@ -149717,29 +149836,6 @@ self: { }: mkDerivation { pname = "postgresql-schema"; - version = "0.1.10"; - sha256 = "0yp239akswajxp9l3d2sdgkba9iycri2zvb5r6pdjzvaj44pwc19"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base basic-prelude postgresql-simple shelly text - ]; - executableHaskellDepends = [ - base basic-prelude optparse-applicative shelly text time - time-locale-compat - ]; - homepage = "https://github.com/mfine/postgresql-schema"; - description = "PostgreSQL Schema Management"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "postgresql-schema_0_1_11" = callPackage - ({ mkDerivation, base, basic-prelude, optparse-applicative - , postgresql-simple, shelly, text, time, time-locale-compat - }: - mkDerivation { - pname = "postgresql-schema"; version = "0.1.11"; sha256 = "1xhaqxc389dghf77hlz6zy6pa6phxv8by42lzs91ymjhvwhnb7bl"; isLibrary = true; @@ -150437,8 +150533,8 @@ self: { }: mkDerivation { pname = "preamble"; - version = "0.0.39"; - sha256 = "019apng4q6hz14xnjjs6iyzkrr13pw4pclr9h39s2qjc17xjwc4d"; + version = "0.0.40"; + sha256 = "0g7l11nqslyqhcrm5l5k2yigd4d8gjaysm5kc6n2mm7n8c3cw1b2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152467,23 +152563,6 @@ self: { }: mkDerivation { pname = "proto-lens-arbitrary"; - version = "0.1.0.2"; - sha256 = "0pqscamjyfkga8fixv1wnyygx2c1vcqa855gi526dvjp7rljj5pz"; - libraryHaskellDepends = [ - base bytestring containers lens-family proto-lens QuickCheck text - ]; - homepage = "https://github.com/google/proto-lens"; - description = "Arbitrary instances for proto-lens"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "proto-lens-arbitrary_0_1_0_3" = callPackage - ({ mkDerivation, base, bytestring, containers, lens-family - , proto-lens, QuickCheck, text - }: - mkDerivation { - pname = "proto-lens-arbitrary"; version = "0.1.0.3"; sha256 = "029liw55v5k9f5bsfpsadd85sgrriwvrhfk242d2wfp3fypafd39"; libraryHaskellDepends = [ @@ -154918,23 +154997,6 @@ self: { }: mkDerivation { pname = "quickcheck-special"; - version = "0.1.0.4"; - sha256 = "1dv7pan8sdq8dfc17scyskr5f96857il85n6nh9alnjrnqj3lgws"; - libraryHaskellDepends = [ - base bytestring ieee754 QuickCheck scientific text - ]; - homepage = "https://github.com/minad/quickcheck-special#readme"; - description = "Edge cases and special values for QuickCheck Arbitrary instances"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "quickcheck-special_0_1_0_5" = callPackage - ({ mkDerivation, base, bytestring, ieee754, QuickCheck, scientific - , text - }: - mkDerivation { - pname = "quickcheck-special"; version = "0.1.0.5"; sha256 = "189gadjm06zm3jilr5dcqbmfgq8d6j91nsvnzwwp9kdn3j9m711p"; libraryHaskellDepends = [ @@ -157862,28 +157924,6 @@ self: { }: mkDerivation { pname = "recursion-schemes"; - version = "5.0.1"; - sha256 = "00zz8gxf3ha1zq6m2hzcia35cry5wgvs29h60s2jvp3yzmr7radp"; - revision = "1"; - editedCabalFile = "0f5fhr93jgnm1jhl6kd3fbxxmkyfa6h7asgwk5klliy0m2j3y51n"; - libraryHaskellDepends = [ - base base-orphans bifunctors comonad free semigroups - template-haskell transformers transformers-compat - ]; - testHaskellDepends = [ base HUnit ]; - homepage = "http://github.com/ekmett/recursion-schemes/"; - description = "Generalized bananas, lenses and barbed wire"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "recursion-schemes_5_0_2" = callPackage - ({ mkDerivation, base, base-orphans, bifunctors, comonad, free - , HUnit, semigroups, template-haskell, transformers - , transformers-compat - }: - mkDerivation { - pname = "recursion-schemes"; version = "5.0.2"; sha256 = "1lmayskniljw3lxk64apvshn9h90gwfpflgxilfivsqhrjxnaj9s"; libraryHaskellDepends = [ @@ -169942,8 +169982,8 @@ self: { ({ mkDerivation, base, basic-prelude, directory, shake }: mkDerivation { pname = "shakers"; - version = "0.0.22"; - sha256 = "1s6grydppi50xlfxpjgprv29nsdn2z7d34z87fa994jiimp5i3a8"; + version = "0.0.24"; + sha256 = "1wrn28r4w8zxay119n4lsxx2yg0n42rv2msn1px2p76k86bz03w4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base basic-prelude directory shake ]; @@ -171249,8 +171289,8 @@ self: { }: mkDerivation { pname = "simple-effects"; - version = "0.8.0.2"; - sha256 = "04iszcd5sjr9qaq7604v8fdhlbljzkga468s9h6fv7q9mdy77sjw"; + version = "0.9.0.0"; + sha256 = "1wrdqzwzi9gjjixg3rhkvc1lpi6br07inl0k6ngbrd8shxipwsa3"; libraryHaskellDepends = [ array base exceptions list-t monad-control MonadRandom mtl text transformers transformers-base @@ -176331,6 +176371,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "splitmix" = callPackage + ({ mkDerivation, base, base-compat, bytestring, containers + , criterion, random, tf-random, time + }: + mkDerivation { + pname = "splitmix"; + version = "0"; + sha256 = "0qa86iflw1v8vqci8krj4kdvp648hnl8wx3wyhnd1c95jrla0fpi"; + libraryHaskellDepends = [ base random time ]; + testHaskellDepends = [ + base base-compat bytestring random tf-random + ]; + benchmarkHaskellDepends = [ + base containers criterion random tf-random + ]; + description = "Fast Splittable PRNG"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "splitter" = callPackage ({ mkDerivation, base, directory, filepath, parsec, range }: mkDerivation { @@ -179472,6 +179531,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "streaming-cassava" = callPackage + ({ mkDerivation, base, bytestring, cassava, hspec, mtl, QuickCheck + , quickcheck-instances, streaming, streaming-bytestring, text + , transformers, vector + }: + mkDerivation { + pname = "streaming-cassava"; + version = "0.1.0.0"; + sha256 = "17swzhq069rr041l33bwa5ybx1j6w9lvh3l3xs40m842njli2bac"; + libraryHaskellDepends = [ + base bytestring cassava mtl streaming streaming-bytestring + transformers + ]; + testHaskellDepends = [ + base hspec mtl QuickCheck quickcheck-instances streaming text + vector + ]; + description = "Cassava support for the streaming ecosystem"; + license = stdenv.lib.licenses.mit; + }) {}; + "streaming-commons" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , criterion, deepseq, directory, hspec, network, process @@ -179654,6 +179734,21 @@ self: { maintainers = with stdenv.lib.maintainers; [ jb55 ]; }) {}; + "streaming-with" = callPackage + ({ mkDerivation, base, exceptions, managed, streaming-bytestring + , transformers + }: + mkDerivation { + pname = "streaming-with"; + version = "0.1.0.0"; + sha256 = "1gc8y3ak3w411yibzrbf9wa719zr0zym6pqmg3ihrdn03z1ij3h0"; + libraryHaskellDepends = [ + base exceptions managed streaming-bytestring transformers + ]; + description = "with/bracket-style idioms for use with streaming"; + license = stdenv.lib.licenses.mit; + }) {}; + "streamproc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -181137,6 +181232,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "superrecord" = callPackage + ({ mkDerivation, aeson, base, bookkeeper, constraints, criterion + , deepseq, ghc-prim, hspec, labels, primitive, text + }: + mkDerivation { + pname = "superrecord"; + version = "0.1.1.0"; + sha256 = "04fmccpfx3lyms8xmya1yidjj9ahhyikr3ilfr3x9m59sc47vhd0"; + libraryHaskellDepends = [ + aeson base constraints deepseq ghc-prim primitive text + ]; + testHaskellDepends = [ aeson base hspec ]; + benchmarkHaskellDepends = [ + aeson base bookkeeper criterion deepseq labels + ]; + homepage = "https://github.com/agrafix/superrecord#readme"; + description = "Supercharged anonymous records"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "supervisor" = callPackage ({ mkDerivation, base, containers, exceptions, monadloc, mtl }: mkDerivation { @@ -186123,6 +186238,30 @@ self: { license = "GPL"; }) {}; + "texmath_0_9_4_1" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pandoc-types, parsec, process, split, syb, temporary, text + , utf8-string, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.9.4.1"; + sha256 = "014xka6vz8qc043icrhf5m47g8jwlr608qzymrikjh4nr2r048ih"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec syb xml + ]; + testHaskellDepends = [ + base bytestring directory filepath process split temporary text + utf8-string xml + ]; + homepage = "http://github.com/jgm/texmath"; + description = "Conversion between formats used to represent mathematics"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, temporary, test-framework @@ -187220,21 +187359,6 @@ self: { ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "th-abstraction"; - version = "0.2.2.0"; - sha256 = "00xnyknp1xgbr6rqbmdbpvxrnd3pw1wax46vv03g8bbjm0m4d7kd"; - libraryHaskellDepends = [ - base containers ghc-prim template-haskell - ]; - testHaskellDepends = [ base containers template-haskell ]; - homepage = "https://github.com/glguy/th-abstraction"; - description = "Nicer interface for reified information about data types"; - license = stdenv.lib.licenses.isc; - }) {}; - - "th-abstraction_0_2_3_0" = callPackage - ({ mkDerivation, base, containers, ghc-prim, template-haskell }: - mkDerivation { - pname = "th-abstraction"; version = "0.2.3.0"; sha256 = "00yy303rrnx26z9aam33j8m1v0dq5wxk71901fbl50jm9mdg4jwm"; libraryHaskellDepends = [ @@ -187244,7 +187368,6 @@ self: { homepage = "https://github.com/glguy/th-abstraction"; description = "Nicer interface for reified information about data types"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-alpha" = callPackage @@ -189737,36 +189860,6 @@ self: { }: mkDerivation { pname = "tls"; - version = "1.3.10"; - sha256 = "0w81bv1khibp36mnqb2685y01s3v1032l3qf1y6wx9fx807ps1cz"; - revision = "2"; - editedCabalFile = "17734zs69kph9pv8zpk4fm58gfhzcwjwqlk71sqib5r2zi0lby9h"; - libraryHaskellDepends = [ - asn1-encoding asn1-types async base bytestring cereal cryptonite - data-default-class memory mtl network transformers x509 x509-store - x509-validation - ]; - testHaskellDepends = [ - base bytestring cereal cryptonite data-default-class hourglass mtl - QuickCheck tasty tasty-quickcheck x509 x509-validation - ]; - benchmarkHaskellDepends = [ - base bytestring criterion cryptonite data-default-class hourglass - mtl QuickCheck tasty-quickcheck x509 x509-validation - ]; - homepage = "http://github.com/vincenthz/hs-tls"; - description = "TLS/SSL protocol native implementation (Server and Client)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tls_1_3_11" = callPackage - ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring - , cereal, criterion, cryptonite, data-default-class, hourglass - , memory, mtl, network, QuickCheck, tasty, tasty-quickcheck - , transformers, x509, x509-store, x509-validation - }: - mkDerivation { - pname = "tls"; version = "1.3.11"; sha256 = "00r7zfkdzy7hi6nhzkirp8jjims4kikgjcm3z4a82kw78awqw01z"; libraryHaskellDepends = [ @@ -189785,7 +189878,6 @@ self: { homepage = "http://github.com/vincenthz/hs-tls"; description = "TLS/SSL protocol native implementation (Server and Client)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tls-debug" = callPackage @@ -193488,6 +193580,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "typed-duration" = callPackage + ({ mkDerivation, base, lifted-base, monad-control + , transformers-base + }: + mkDerivation { + pname = "typed-duration"; + version = "0.1.0.0"; + sha256 = "06z2yq29z3mwyiwy2n389f39ygcrhjjib82vl1hkyj3573sillj8"; + libraryHaskellDepends = [ + base lifted-base monad-control transformers-base + ]; + homepage = "https://github.com/osa1/typed-duration#readme"; + description = "Thread delay and timeout functions with typed arguments"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "typed-process" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring , conduit, conduit-extra, exceptions, hspec, http-conduit, process @@ -197885,12 +197993,15 @@ self: { }) {}; "vector-mmap" = callPackage - ({ mkDerivation, base, mmap, primitive, vector }: + ({ mkDerivation, base, mmap, primitive, QuickCheck, temporary + , vector + }: mkDerivation { pname = "vector-mmap"; - version = "0.0.2"; - sha256 = "03hczjc7j1hxnny912cblxdwn908gwm012w03zgj2v9avldp0gmr"; + version = "0.0.3"; + sha256 = "12l6ka6vgl5g193sycn3k6gr2q3k64jaq196p825vawh46qdsfg5"; libraryHaskellDepends = [ base mmap primitive vector ]; + testHaskellDepends = [ base QuickCheck temporary vector ]; homepage = "http://github.com/pumpkin/vector-mmap"; description = "Memory map immutable and mutable vectors"; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index e4aa7db3e28d..5654aefe5d29 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -36,7 +36,8 @@ let ./no-sys-dirs.patch ] ++ optional stdenv.isSunOS ./ld-shared.patch - ++ optional stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ]; + ++ optional stdenv.isDarwin ./cpp-precomp.patch + ++ optional (stdenv.isDarwin && versionAtLeast version "5.24") ./sw_vers.patch; postPatch = '' pwd="$(type -P pwd)" diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 7e296fb9d06e..07f370b42100 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib , postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl -, libpng, sqlite, libspatialite, poppler +, libpng, sqlite, libspatialite, poppler, hdf4 , libiconv , netcdfSupport ? true, netcdf, hdf5 , curl }: @@ -17,15 +17,20 @@ composableDerivation.composableDerivation {} (fixed: rec { }; buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite - libspatialite poppler ] + libspatialite poppler hdf4 ] ++ (with pythonPackages; [ python numpy wrapPython ]) ++ stdenv.lib.optional stdenv.isDarwin libiconv ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]; hardeningDisable = [ "format" ]; - # Unset CC and CXX as they confuse libtool. - preConfigure = "unset CC CXX"; + # - Unset CC and CXX as they confuse libtool. + # - teach gdal that libdf is the legacy name for libhdf + preConfigure = '' + unset CC CXX + substituteInPlace configure \ + --replace "-lmfhdf -ldf" "-lmfhdf -lhdf" + ''; configureFlags = [ "--with-jpeg=${libjpeg.dev}" @@ -41,6 +46,7 @@ composableDerivation.composableDerivation {} (fixed: rec { "--with-python" # optional "--with-static-proj4=${proj}" # optional "--with-geos=${geos}/bin/geos-config"# optional + "--with-hdf4=${hdf4.dev}" # optional (if netcdfSupport then "--with-netcdf=${netcdf}" else "") ]; diff --git a/pkgs/development/ocaml-modules/cohttp/0.19.3.nix b/pkgs/development/ocaml-modules/cohttp/0.19.3.nix new file mode 100644 index 000000000000..99f101010f3e --- /dev/null +++ b/pkgs/development/ocaml-modules/cohttp/0.19.3.nix @@ -0,0 +1,30 @@ +{ stdenv, buildOcaml, fetchurl, ocaml, cmdliner, re, uri_p4, fieldslib_p4 +, sexplib_p4, conduit , stringext, base64, magic-mime, ounit, alcotest +, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" +, lwt ? null, async_p4 ? null, async_ssl_p4 ? null +}: + +buildOcaml rec { + name = "cohttp"; + version = "0.19.3"; + + minimumSupportedOcamlVersion = "4.01"; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-cohttp/archive/v${version}.tar.gz"; + sha256 = "1nrzpd4h52c1hnzcgsz462676saj9zss708ng001h54dglk8i1iv"; + }; + + buildInputs = [ alcotest cmdliner conduit magic-mime ounit lwt ] + ++ stdenv.lib.optionals asyncSupport [ async_p4 async_ssl_p4 ]; + propagatedBuildInputs = [ re stringext uri_p4 fieldslib_p4 sexplib_p4 base64 ]; + + buildFlags = "PREFIX=$(out)"; + + meta = with stdenv.lib; { + homepage = https://github.com/mirage/ocaml-cohttp; + description = "Very lightweight HTTP server using Lwt or Async"; + license = licenses.mit; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 99f101010f3e..1fd4446f1ee9 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,30 +1,35 @@ -{ stdenv, buildOcaml, fetchurl, ocaml, cmdliner, re, uri_p4, fieldslib_p4 -, sexplib_p4, conduit , stringext, base64, magic-mime, ounit, alcotest -, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" -, lwt ? null, async_p4 ? null, async_ssl_p4 ? null +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild +, ppx_fields_conv, ppx_sexp_conv +, base64, fieldslib, uri, conduit +# Optional for async and lwt support: +, async , async_ssl, cmdliner, fmt, magic-mime, ocaml_lwt, tls }: -buildOcaml rec { - name = "cohttp"; - version = "0.19.3"; +stdenv.mkDerivation rec { + version = "0.22.0"; + name = "ocaml${ocaml.version}-cohttp-${version}"; - minimumSupportedOcamlVersion = "4.01"; + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-cohttp"; + rev = "v${version}"; + sha256 = "1iy4ynh0yrw8337nsa9zvgcf476im0bhccsbs0vki3c5yxw2x60d"; + }; - src = fetchurl { - url = "https://github.com/mirage/ocaml-cohttp/archive/v${version}.tar.gz"; - sha256 = "1nrzpd4h52c1hnzcgsz462676saj9zss708ng001h54dglk8i1iv"; - }; + buildInputs = [ ocaml findlib ocamlbuild ppx_fields_conv ppx_sexp_conv conduit + async async_ssl cmdliner fmt magic-mime ocaml_lwt tls ]; - buildInputs = [ alcotest cmdliner conduit magic-mime ounit lwt ] - ++ stdenv.lib.optionals asyncSupport [ async_p4 async_ssl_p4 ]; - propagatedBuildInputs = [ re stringext uri_p4 fieldslib_p4 sexplib_p4 base64 ]; + propagatedBuildInputs = [ base64 fieldslib uri ]; - buildFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { - homepage = https://github.com/mirage/ocaml-cohttp; - description = "Very lightweight HTTP server using Lwt or Async"; - license = licenses.mit; - maintainers = [ maintainers.ericbmerritt ]; - }; + createFindlibDestdir = true; + + meta = { + description = "HTTP(S) library for Lwt, Async and Mirage"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; } diff --git a/pkgs/development/ocaml-modules/conduit/0.10.0.nix b/pkgs/development/ocaml-modules/conduit/0.10.0.nix new file mode 100644 index 000000000000..4d1c43e0ae18 --- /dev/null +++ b/pkgs/development/ocaml-modules/conduit/0.10.0.nix @@ -0,0 +1,26 @@ +{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri_p4, cstruct, ipaddr_p4 +, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" +, async_p4 ? null, async_ssl_p4 ? null, lwt ? null +}: + +buildOcaml rec { + name = "conduit"; + version = "0.10.0"; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-conduit/archive/v${version}.tar.gz"; + sha256 = "1jz2skzsyg0axlkk9s6ahfblfrjx599wisyfs0cvn5dik9jqjadh"; + }; + + propagatedBuildInputs = [ sexplib_p4 stringext uri_p4 cstruct ipaddr_p4 ]; + buildInputs = stdenv.lib.optional (lwt != null) lwt + ++ stdenv.lib.optional (asyncSupport && async_p4 != null) async_p4 + ++ stdenv.lib.optional (asyncSupport && async_ssl_p4 != null) async_ssl_p4; + + meta = with stdenv.lib; { + homepage = https://github.com/mirage/ocaml-conduit; + description = "Resolve URIs into communication channels for Async or Lwt "; + license = licenses.mit; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index d1da95ffaa1c..750bded28938 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,26 +1,33 @@ -{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri_p4, cstruct, ipaddr_p4 -, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" -, async_p4 ? null, async_ssl_p4 ? null, lwt ? null +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild +, ppx_driver, ppx_sexp_conv +, ipaddr, uri, logs +, ocaml_lwt ? null +, async ? null, async_ssl ? null +, tls ? null }: -buildOcaml rec { - name = "conduit"; - version = "0.8.3"; +stdenv.mkDerivation rec { + version = "0.15.4"; + name = "ocaml${ocaml.version}-conduit-${version}"; - src = fetchurl { - url = "https://github.com/mirage/ocaml-conduit/archive/v${version}.tar.gz"; - sha256 = "5cf1a46aa0254345e5143feebe6b54bdef96314e9987f44e69f24618d620faa1"; - }; + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-conduit"; + rev = "v${version}"; + sha256 = "1ya7jqvhl8hc22cid5myf31w5c473imdxjnl9785lavsqj3djjxq"; + }; - propagatedBuildInputs = [ sexplib_p4 stringext uri_p4 cstruct ipaddr_p4 ]; - buildInputs = stdenv.lib.optional (lwt != null) lwt - ++ stdenv.lib.optional (asyncSupport && async_p4 != null) async_p4 - ++ stdenv.lib.optional (asyncSupport && async_ssl_p4 != null) async_ssl_p4; + buildInputs = [ ocaml findlib ocamlbuild ppx_driver ppx_sexp_conv + ocaml_lwt async async_ssl tls ]; + propagatedBuildInputs = [ ipaddr uri logs ]; - meta = with stdenv.lib; { - homepage = https://github.com/mirage/ocaml-conduit; - description = "Resolve URIs into communication channels for Async or Lwt "; - license = licenses.mit; - maintainers = [ maintainers.ericbmerritt ]; - }; + createFindlibDestdir = true; + + meta = { + description = "Network connection library for TCP and SSL"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; } diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix new file mode 100644 index 000000000000..389a136aae6b --- /dev/null +++ b/pkgs/development/ocaml-modules/decompress/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg, opam +}: + +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "decompress is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + version = "0.6"; + name = "ocaml${ocaml.version}-decompress-${version}"; + + src = fetchFromGitHub { + owner = "mirage"; + repo = "decompress"; + rev = "v${version}"; + sha256 = "0hfs5zrvimzvjwdg57vrxx9bb7irvlm07dk2yv3s5qhj30zimd08"; + }; + + buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; + + inherit (topkg) buildPhase installPhase; + + meta = { + description = "Pure OCaml implementation of Zlib"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix new file mode 100644 index 000000000000..13b85c0c570c --- /dev/null +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam +, astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, uri +}: + +stdenv.mkDerivation rec { + version = "1.11.0"; + name = "ocaml${ocaml.version}-git-${version}"; + + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-git"; + rev = version; + sha256 = "1gsvp783g4jb54ccvvpyjpxjmp0pjvlq0cicygk4z4rxs0crd6kw"; + }; + + buildInputs = [ ocaml findlib jbuilder ]; + + propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph uri ]; + + buildPhase = "jbuilder build -p git"; + + inherit (jbuilder) installPhase; + + meta = { + description = "Git format and protocol in pure OCaml"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix index fb73df808fe7..2bdaf6556486 100644 --- a/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/pkgs/development/ocaml-modules/jsonm/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam, uutf }: -let version = "1.0.0"; in +let version = "1.0.1"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-jsonm-${version}"; src = fetchurl { url = "http://erratique.ch/software/jsonm/releases/jsonm-${version}.tbz"; - sha256 = "1v3ln6d965lplj28snjdqdqablpp1kx8bw2cfx0m6i157mqyln62"; + sha256 = "1176dcmxb11fnw49b7yysvkjh0kpzx4s48lmdn5psq9vshp5c29w"; }; buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; diff --git a/pkgs/development/ocaml-modules/mstruct/default.nix b/pkgs/development/ocaml-modules/mstruct/default.nix new file mode 100644 index 000000000000..958cbdc554e8 --- /dev/null +++ b/pkgs/development/ocaml-modules/mstruct/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam +, cstruct +}: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "mstruct is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + version = "1.3.3"; + name = "ocaml${ocaml.version}-mstruct-${version}"; + + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-mstruct"; + rev = "v${version}"; + sha256 = "1rxjzkg6156vl6yazbk1h0ndqj80wym5aliaapijf60apqqmsp4s"; + }; + + buildInputs = [ ocaml findlib jbuilder opam ]; + + propagatedBuildInputs = [ cstruct ]; + + inherit (jbuilder) installPhase; + + meta = { + description = "A thin mutable layer on top of cstruct"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix new file mode 100644 index 000000000000..bf0e98ec1952 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, pprint }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ocp-ocamlres-${version}"; + version = "0.3"; + src = fetchFromGitHub { + owner = "OCamlPro"; + repo = "ocp-ocamlres"; + rev = "v${version}"; + sha256 = "0pm1g38f6pmch1x4pcc09ky587x5g7p7n9dfbbif8zkjqr603ixg"; + }; + + buildInputs = [ ocaml findlib pprint ]; + createFindlibDestdir = true; + + installFlags = [ "BINDIR=$(out)/bin" ]; + preInstall = "mkdir -p $out/bin"; + + meta = { + description = "A simple tool and library to embed files and directories inside OCaml executables"; + license = stdenv.lib.licenses.lgpl3Plus; + homepage = https://www.typerex.org/ocp-ocamlres.html; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 6da6bd4b4f92..48ba6379a0c1 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -7,15 +7,15 @@ let in stdenv.mkDerivation rec { name = "spin-${version}"; - version = "6.4.5"; + version = "6.4.6"; url-version = stdenv.lib.replaceChars ["."] [""] version; src = fetchurl { # The homepage is behind CloudFlare anti-DDoS protection, which blocks cURL. # Dropbox mirror from developers: # https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADZPqS4aoR-pjNF6OQXRLQHa - url = "https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AAANRpxsSyWC7iHZB-XgBwJFa/spin645.tar.gz?raw=1"; - sha256 = "0x8qnwm2xa8f176c52mzpvnfzglxs6xgig7bcgvrvkb3xf114224"; + url = "https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AAA-vBeJ7xty-CDZgk7OB58Ta/spin646.tar.gz?raw=1"; + sha256 = "1n33qzlb7g30vhr5yxssw210b2m0242y9j21c7fqpn9z6b0rbhjp"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 99348e907a94..765fdfb2ea45 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -2,15 +2,18 @@ let ccache = stdenv.mkDerivation rec { name = "ccache-${version}"; - version = "3.2.5"; + version = "3.3.4"; src = fetchurl { - sha256 = "11db1g109g0g5si0s50yd99ja5f8j4asxb081clvx78r9d9i2w0i"; + sha256 = "0ks0vk408mdppfbk8v38p46fqx3p30r9a9cwiia43373i7rmpw94"; url = "mirror://samba/ccache/${name}.tar.xz"; }; buildInputs = [ zlib ]; + # non to be fail on filesystems with unconventional blocksizes (zfs on Hydra?) + patches = [ ./skip-fs-dependent-test.patch ]; + postPatch = '' substituteInPlace Makefile.in --replace 'objs) $(extra_libs)' 'objs)' ''; diff --git a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch new file mode 100644 index 000000000000..ecd3c4c9a74e --- /dev/null +++ b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch @@ -0,0 +1,43 @@ +--- ccache-3.3.4.org/test.sh 2017-02-17 21:28:53.000000000 +0000 ++++ ccache-3.3.4/test.sh 2017-07-01 18:38:00.523403023 +0100 +@@ -2631,23 +2631,23 @@ + $CCACHE -F 0 -M 256K >/dev/null + $CCACHE -c >/dev/null + # floor(0.8 * 4) = 3 +- expect_file_count 3 '*.o' $CCACHE_DIR +- expect_file_count 3 '*.d' $CCACHE_DIR +- expect_file_count 3 '*.stderr' $CCACHE_DIR +- expect_stat 'files in cache' 9 +- expect_stat 'cleanups performed' 1 +- for i in 3 4 5; do +- file=$CCACHE_DIR/a/result$i-4017.o +- if [ ! -f $file ]; then +- test_failed "File $file removed when it shouldn't" +- fi +- done +- for i in 0 1 2 6 7 8 9; do +- file=$CCACHE_DIR/a/result$i-4017.o +- if [ -f $file ]; then +- test_failed "File $file not removed when it should" +- fi +- done ++ #expect_file_count 3 '*.o' $CCACHE_DIR ++ #expect_file_count 3 '*.d' $CCACHE_DIR ++ #expect_file_count 3 '*.stderr' $CCACHE_DIR ++ #expect_stat 'files in cache' 9 ++ #expect_stat 'cleanups performed' 1 ++ #for i in 3 4 5; do ++ # file=$CCACHE_DIR/a/result$i-4017.o ++ # if [ ! -f $file ]; then ++ # test_failed "File $file removed when it shouldn't" ++ # fi ++ #done ++ #for i in 0 1 2 6 7 8 9; do ++ # file=$CCACHE_DIR/a/result$i-4017.o ++ # if [ -f $file ]; then ++ # test_failed "File $file not removed when it should" ++ # fi ++ #done + + # ------------------------------------------------------------------------- + TEST "Automatic cache cleanup" diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 84e57e267c2f..1eed4c2ad862 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "yodl-${version}"; - version = "3.08.02"; + version = "4.01.00"; nativeBuildInputs = [ icmake ]; buildInputs = [ perl ]; src = fetchFromGitHub { - sha256 = "0z4pjrl4bq03fxc50c9h0bnc90vqn5c2dy830mjyzjrn1ms3i003"; + sha256 = "1aahwmj4gmf59lrij2373lkgfj77i3ghdas9c7iqrjwaizb0430p"; rev = version; repo = "yodl"; owner = "fbb-git"; diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix index f36d19bfb209..b6d61e293951 100644 --- a/pkgs/servers/radicale/default.nix +++ b/pkgs/servers/radicale/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "radicale-${version}"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { url = "mirror://pypi/R/Radicale/Radicale-${version}.tar.gz"; - sha256 = "1g20p3998f46ywda7swv0py63wjbrhvk0nrafajlbb6wgzxjmqpb"; + sha256 = "17p0hayyw30pfb81xqvd7jhjm6yrk2dnbgvqagx1nqdsr89ar0ss"; }; propagatedBuildInputs = stdenv.lib.optionals (!pythonPackages.isPy3k) [ diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix new file mode 100644 index 000000000000..a227030f0bc4 --- /dev/null +++ b/pkgs/tools/misc/hdf4/default.nix @@ -0,0 +1,76 @@ +{ stdenv +, fetchurl +, cmake +, libjpeg +, szip +, zlib +}: + +stdenv.mkDerivation rec { + name = "hdf-${version}"; + version = "4.2.12"; + src = fetchurl { + url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${version}/src/hdf-${version}.tar.bz2"; + sha256 = "020jh563sjyxsgml8l809d2i1d4ms9shivwj3gbm7n0ilxbll8id"; + }; + + buildInputs = [ + cmake + libjpeg + szip + zlib + ]; + + preConfigure = "export SZIP_INSTALL=${szip}"; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_TESTING=ON" + "-DHDF4_BUILD_TOOLS=ON" + "-DHDF4_BUILD_UTILS=ON" + "-DHDF4_BUILD_WITH_INSTALL_NAME=OFF" + "-DHDF4_ENABLE_JPEG_LIB_SUPPORT=ON" + "-DHDF4_ENABLE_NETCDF=OFF" + "-DHDF4_ENABLE_SZIP_ENCODING=ON" + "-DHDF4_ENABLE_SZIP_SUPPORT=ON" + "-DHDF4_ENABLE_Z_LIB_SUPPORT=ON" + "-DHDF4_BUILD_FORTRAN=OFF" + "-DJPEG_DIR=${libjpeg}" + ]; + + doCheck = true; + + preCheck = '' + export LD_LIBRARY_PATH=$(pwd)/bin + '' + stdenv.lib.optionalString (stdenv.isDarwin) '' + export DYLD_LIBRARY_PATH=$(pwd)/bin + ''; + + excludedTests = [ + "MFHDF_TEST-hdftest" + "MFHDF_TEST-hdftest-shared" + "HDP-dumpsds-18" + "NC_TEST-nctest" + ]; + + checkPhase = let excludedTestsRegex = if (excludedTests != []) + then "(" + (stdenv.lib.concatStringsSep "|" excludedTests) + ")" + else ""; in '' + runHook preCheck + ctest -E "${excludedTestsRegex}" --output-on-failure + runHook postCheck + ''; + + outputs = [ "bin" "dev" "out" ]; + + postInstall = '' + moveToOutput bin "$bin" + ''; + + meta = { + description = "Data model, library, and file format for storing and managing data"; + homepage = https://support.hdfgroup.org/products/hdf4/; + maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index e7a23b70ce9a..d72ee844c0ec 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "nzbget-${version}"; - version = "18.1"; + version = "19.0"; src = fetchurl { url = "http://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz"; - sha256 = "069q75b0s9fzzy15m96dhn83jypgc91yx998rl0nykfcl7nzkxyx"; + sha256 = "08kgi4zmh4h1pvxh8x4c3ydf9xl2s6ncm579f0wdm2zknvpf0j16"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/security/gen-oath-safe/default.nix b/pkgs/tools/security/gen-oath-safe/default.nix new file mode 100644 index 000000000000..49770813b2b6 --- /dev/null +++ b/pkgs/tools/security/gen-oath-safe/default.nix @@ -0,0 +1,41 @@ +{ coreutils, fetchFromGitHub, libcaca, makeWrapper, python, openssl, qrencode, stdenv, yubikey-manager }: + +stdenv.mkDerivation { + name = "gen-oath-safe-2017-01-23"; + src = fetchFromGitHub { + owner = "mcepl"; + repo = "gen-oath-safe"; + rev = "fb53841"; + sha256 = "0018kqmhg0861r5xkbis2a1rx49gyn0dxcyj05wap5ms7zz69m0m"; + }; + + buildInputs = [ makeWrapper ]; + + buildPhase = ":"; + + installPhase = + let + path = stdenv.lib.makeBinPath [ + coreutils + libcaca.bin + openssl.bin + python + qrencode + yubikey-manager + ]; + in + '' + mkdir -p $out/bin + cp gen-oath-safe $out/bin/ + wrapProgram $out/bin/gen-oath-safe \ + --prefix PATH : ${path} + ''; + meta = with stdenv.lib; { + homepage = https://github.com/mcepl/gen-oath-safe; + description = "Script for generating HOTP/TOTP keys (and QR code)"; + platforms = platforms.unix; + license = licenses.mit; + maintainers = [ maintainers.makefu ]; + }; + +} diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 05dbe6b7d84f..2555aeccea4c 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.3.0.8"; + name = "tor-0.3.0.9"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "0j0dhq1zp6w6zy7y4kiw7zg1imbgv8nsl7imlzwc0951p2kknfk6"; + sha256 = "0hhyb1wil8japynqnm07r1f67w3wdnafdg9amzlrrcfcyq5qim28"; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index c783316c6d55..9af1d6a59ffd 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -155,18 +155,24 @@ in buildEnv { --prefix PERL5LIB : "$out/share/texmf/scripts/texlive" # avoid using non-nix shebang in $target by calling interpreter - if [[ "$(head -c 2 $target)" = "#!" ]]; then - local cmdline="$(head -n 1 $target | sed 's/^\#\! *//;s/ *$//')" + if [[ "$(head -c 2 "$target")" = "#!" ]]; then + local cmdline="$(head -n 1 "$target" | sed 's/^\#\! *//;s/ *$//')" local relative=`basename "$cmdline" | sed 's/^env //' ` local newInterp=`echo "$relative" | cut -d\ -f1` local params=`echo "$relative" | cut -d\ -f2- -s` - local newPath="$(type -P $newInterp)" + local newPath="$(type -P "$newInterp")" if [[ -z "$newPath" ]]; then echo " Warning: unknown shebang '$cmdline' in '$target'" continue fi echo " and patching shebang '$cmdline'" sed "s|^exec |exec $newPath $params |" -i "$link" + + elif head -n 1 "$target" | grep -q 'exec perl'; then + # see #24343 for details of the problem + echo " and patching weird perl shebang" + sed "s|^exec |exec '${perl}/bin/perl' -w |" -i "$link" + else sed 's|^exec |exec -a "$0" |' -i "$link" echo diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 701ce7f67b2d..692f6b1772c7 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -4,7 +4,7 @@ */ { stdenv, lib, fetchurl, runCommand, writeText, buildEnv , callPackage, ghostscriptX, harfbuzz, poppler_min -, makeWrapper, perl, python, ruby +, makeWrapper, perl522, python, ruby , useFixedHashes ? true , recurseIntoAttrs }: @@ -28,7 +28,8 @@ let # function for creating a working environment from a set of TL packages combine = import ./combine.nix { inherit bin combinePkgs buildEnv fastUnique lib makeWrapper writeText - perl stdenv python ruby; + stdenv python ruby; + perl = perl522; # avoid issues like #26890, probably remove after texlive upgrade }; # the set of TeX Live packages, collections, and schemes; using upstream naming diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 593fb7d3a368..16582677904e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2039,6 +2039,8 @@ with pkgs; gdmap = callPackage ../tools/system/gdmap { }; + gen-oath-safe = callPackage ../tools/security/gen-oath-safe { }; + genext2fs = callPackage ../tools/filesystems/genext2fs { }; gengetopt = callPackage ../development/tools/misc/gengetopt { }; @@ -2360,6 +2362,8 @@ with pkgs; hddtemp = callPackage ../tools/misc/hddtemp { }; + hdf4 = callPackage ../tools/misc/hdf4 { }; + hdf5 = callPackage ../tools/misc/hdf5 { gfortran = null; szip = null; @@ -14487,6 +14491,8 @@ with pkgs; i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; + + configFile = config.i3.configFile or null; }; i3-gaps = callPackage ../applications/window-managers/i3/gaps.nix { }; @@ -18690,12 +18696,10 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/terraform {}) terraform_0_8_5 terraform_0_8_8 - terraform_0_9_4 - terraform_0_9_6 - terraform_0_9_9; + terraform_0_9_10; terraform_0_8 = terraform_0_8_8; - terraform_0_9 = terraform_0_9_9; + terraform_0_9 = terraform_0_9_10; terraform = terraform_0_9; terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 617a9a378dd8..1b2e23916ef2 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -114,10 +114,6 @@ let }; camlimages = camlimages_4_1; - conduit = callPackage ../development/ocaml-modules/conduit { - lwt = ocaml_lwt; - }; - biniou = callPackage ../development/ocaml-modules/biniou { }; bin_prot_p4 = callPackage ../development/ocaml-modules/bin_prot { }; @@ -132,10 +128,24 @@ let cmdliner_1_0 = callPackage ../development/ocaml-modules/cmdliner/1.0.nix { }; - cohttp = callPackage ../development/ocaml-modules/cohttp { + cohttp_p4 = callPackage ../development/ocaml-modules/cohttp/0.19.3.nix { lwt = ocaml_lwt; }; + cohttp = + if lib.versionOlder "4.03" ocaml.version + then callPackage ../development/ocaml-modules/cohttp { } + else cohttp_p4; + + conduit_p4 = callPackage ../development/ocaml-modules/conduit/0.10.0.nix { + lwt = ocaml_lwt; + }; + + conduit = + if lib.versionOlder "4.03" ocaml.version + then callPackage ../development/ocaml-modules/conduit { } + else conduit_p4; + config-file = callPackage ../development/ocaml-modules/config-file { }; containers = callPackage ../development/ocaml-modules/containers { }; @@ -162,6 +172,8 @@ let ctypes = callPackage ../development/ocaml-modules/ctypes { }; + decompress = callPackage ../development/ocaml-modules/decompress { }; + dolmen = callPackage ../development/ocaml-modules/dolmen { }; dolog = callPackage ../development/ocaml-modules/dolog { }; @@ -235,6 +247,8 @@ let gg = callPackage ../development/ocaml-modules/gg { }; + git = callPackage ../development/ocaml-modules/git { }; + gmetadom = callPackage ../development/ocaml-modules/gmetadom { }; gtktop = callPackage ../development/ocaml-modules/gtktop { }; @@ -306,6 +320,8 @@ let mparser = callPackage ../development/ocaml-modules/mparser { }; + mstruct = callPackage ../development/ocaml-modules/mstruct { }; + mtime = callPackage ../development/ocaml-modules/mtime { }; nocrypto = callPackage ../development/ocaml-modules/nocrypto { @@ -393,6 +409,8 @@ let ocp-index = callPackage ../development/tools/ocaml/ocp-index { ocpIndent = ocpIndent_1_5_2; }; + ocp-ocamlres = callPackage ../development/ocaml-modules/ocp-ocamlres { }; + ocplib-endian = callPackage ../development/ocaml-modules/ocplib-endian { }; ocplib-json-typed = callPackage ../development/ocaml-modules/ocplib-json-typed { }; |