From e955d5d7ba3a0da4247290a5d26c47564fef4079 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 22 Aug 2022 00:04:32 +0800 Subject: [PATCH 01/53] qt6.qtbase: patch for loading libXcursor --- pkgs/development/libraries/qt-6/default.nix | 1 + .../libraries/qt-6/modules/qtbase.nix | 4 +++ .../qt-6/patches/0007-qtbase-xcursor.patch | 29 +++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/qt-6/patches/0007-qtbase-xcursor.patch diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 8c12cc2fb671..fde9534f0ae5 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -49,6 +49,7 @@ let withGtk3 = true; inherit (srcs.qtbase) src version; inherit bison cups harfbuzz libGL dconf gtk3 developerBuild cmake; + patches = [ ./patches/0007-qtbase-xcursor.patch ]; }; qt3d = callPackage ./modules/qt3d.nix { }; diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index bf210633fc4f..7a4637eb8ecd 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -201,6 +201,10 @@ stdenv.mkDerivation rec { "-DQT_FEATURE_openssl_linked=ON" ]; + NIX_CFLAGS_COMPILE = [ + ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' + ]; + outputs = [ "out" "dev" ]; postInstall = '' diff --git a/pkgs/development/libraries/qt-6/patches/0007-qtbase-xcursor.patch b/pkgs/development/libraries/qt-6/patches/0007-qtbase-xcursor.patch new file mode 100644 index 000000000000..6a92a9528303 --- /dev/null +++ b/pkgs/development/libraries/qt-6/patches/0007-qtbase-xcursor.patch @@ -0,0 +1,29 @@ +From cc953cc3f736fabef1f5c211964f30be719fb35e Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:35:58 -0500 +Subject: [PATCH 07/10] qtbase-xcursor + +--- + src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp +index fbadab4d50..c83ce0af5b 100644 +--- a/src/plugins/platforms/xcb/qxcbcursor.cpp ++++ b/src/plugins/platforms/xcb/qxcbcursor.cpp +@@ -317,10 +317,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) + #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) + static bool function_ptrs_not_initialized = true; + if (function_ptrs_not_initialized) { +- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); ++ QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1); + bool xcursorFound = xcursorLib.load(); + if (!xcursorFound) { // try without the version number +- xcursorLib.setFileName(QLatin1String("Xcursor")); ++ xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR)); + xcursorFound = xcursorLib.load(); + } + if (xcursorFound) { +-- +2.25.1 + From f0cb53892fddcdc33407ce5be94bbaadd08bd548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 14 Sep 2022 10:16:33 -0300 Subject: [PATCH 02/53] xfce.xfce4-windowck-plugin: 0.4.10 -> 0.5.0 - Update to version 0.5.0 - Use mkXfceDerivation --- .../xfce4-windowck-plugin/default.nix | 54 ++++++++----------- 1 file changed, 21 insertions(+), 33 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix index 7c8cf8e26d9a..53c154bdeecc 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix @@ -1,49 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck, libxfce4ui, xfce4-panel, xfconf, xfce4-dev-tools, xfce, gitUpdater }: +{ lib +, mkXfceDerivation +, imagemagick +, libwnck +, libxfce4ui +, python3 +, xfce4-panel +, xfconf +}: -stdenv.mkDerivation rec { - pname = "xfce4-windowck-plugin"; - version = "0.4.10"; - - src = fetchFromGitHub { - owner = "invidian"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-luCQzqWX3Jl2MlBa3vi1q7z1XOhpFxE8PUxscoIyBlA="; - }; - - nativeBuildInputs = [ - pkg-config - intltool - ]; +mkXfceDerivation { + category = "panel-plugins"; + pname = "xfce4-windowck-plugin"; + version = "0.5.0"; + rev-prefix = "v"; + odd-unstable = false; + sha256 = "sha256-MhNSgI74VLdoS5yL6nfRrVrPvv7+0P5meO4zQheYFzo="; buildInputs = [ - python3 imagemagick libwnck libxfce4ui + python3 xfce4-panel xfconf - xfce4-dev-tools ]; - preConfigure = '' - ./autogen.sh - patchShebangs . + postPatch = '' + patchShebangs themes/windowck{,-dark}/{xfwm4,unity}/generator.py ''; - enableParallelBuilding = true; - - passthru.updateScript = gitUpdater { - inherit pname version; - attrPath = "xfce.${pname}"; - rev-prefix = "v"; - }; - meta = with lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/xfce4-windowck-plugin"; - description = "Xfce plugins which allows to put the maximized window title and buttons on the panel"; - license = licenses.gpl2Plus; - platforms = platforms.unix; + description = "Xfce panel plugin for displaying window title and buttons"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } From 7a40af75d634c9f349408b7109b3e82264bdbc3d Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 18 Sep 2022 13:52:53 +0200 Subject: [PATCH 03/53] haskellPackages: stackage LTS 19.22 -> LTS 19.23 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 574cee0b426f..d6a5bfa74c2d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 19.22 +# Stackage LTS 19.23 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -122,7 +122,7 @@ default-package-overrides: - aws-xray-client-persistent ==0.1.0.5 - aws-xray-client-wai ==0.1.0.2 - backtracking ==0.1.0 - - bank-holidays-england ==0.2.0.7 + - bank-holidays-england ==0.2.0.8 - barbies ==2.0.3.1 - barrier ==0.1.1 - base16 ==0.3.2.0 @@ -846,7 +846,7 @@ default-package-overrides: - genvalidity-bytestring ==1.0.0.0 - genvalidity-containers ==1.0.0.0 - genvalidity-criterion ==1.0.0.0 - - genvalidity-hspec ==1.0.0.0 + - genvalidity-hspec ==1.0.0.1 - genvalidity-hspec-aeson ==1.0.0.0 - genvalidity-hspec-binary ==1.0.0.0 - genvalidity-hspec-cereal ==1.0.0.0 @@ -962,7 +962,7 @@ default-package-overrides: - groups ==0.5.3 - gtk2hs-buildtools ==0.13.8.3 - gtk-sni-tray ==0.1.8.0 - - gtk-strut ==0.1.3.0 + - gtk-strut ==0.1.3.1 - guarded-allocation ==0.0.1 - hackage-cli ==0.0.3.6 - hackage-db ==2.1.2 @@ -1002,7 +1002,7 @@ default-package-overrides: - haskell-src-exts-util ==0.2.5 - haskell-src-meta ==0.8.10 - haskey-btree ==0.3.0.1 - - haskintex ==0.8.0.0 + - haskintex ==0.8.0.1 - haskoin-core ==0.21.2 - hasktags ==0.72.0 - hasql ==1.5.1 @@ -1309,7 +1309,7 @@ default-package-overrides: - irc-client ==1.1.2.2 - irc-conduit ==0.3.0.5 - irc-ctcp ==0.1.3.1 - - isbn ==1.1.0.3 + - isbn ==1.1.0.4 - islink ==0.1.0.0 - iso3166-country-codes ==0.20140203.8 - iso639 ==0.1.0.3 @@ -1330,7 +1330,7 @@ default-package-overrides: - json-feed ==2.0.0.4 - jsonifier ==0.2.1.1 - jsonpath ==0.2.1.0 - - json-stream ==0.4.4.1 + - json-stream ==0.4.4.2 - JuicyPixels ==3.3.7 - JuicyPixels-blurhash ==0.1.0.3 - JuicyPixels-extra ==0.5.2 @@ -1531,7 +1531,7 @@ default-package-overrides: - mighty-metropolis ==2.0.0 - mime-mail ==0.5.1 - mime-mail-ses ==0.4.3 - - mime-types ==0.1.0.9 + - mime-types ==0.1.1.0 - minimal-configuration ==0.1.4 - minimorph ==0.3.0.1 - minio-hs ==1.6.0 @@ -1857,14 +1857,14 @@ default-package-overrides: - polynomials-bernstein ==1.1.2 - polyparse ==1.13 - polysemy ==1.6.0.0 - - polysemy-extra ==0.2.0.0 + - polysemy-extra ==0.2.1.0 - polysemy-fs ==0.1.0.0 - polysemy-fskvstore ==0.1.1.0 - polysemy-kvstore ==0.1.3.0 - - polysemy-methodology ==0.2.1.0 + - polysemy-methodology ==0.2.2.0 - polysemy-path ==0.2.1.0 - polysemy-plugin ==0.4.1.1 - - polysemy-several ==0.1.0.0 + - polysemy-several ==0.1.1.0 - polysemy-socket ==0.0.2.0 - polysemy-uncontrolled ==0.1.1.0 - polysemy-video ==0.2.0.1 @@ -1875,7 +1875,7 @@ default-package-overrides: - posix-paths ==0.3.0.0 - possibly ==1.0.0.0 - postgres-options ==0.2.0.0 - - postgresql-binary ==0.12.4.4 + - postgresql-binary ==0.12.5 - postgresql-libpq ==0.9.4.3 - postgresql-libpq-notify ==0.2.0.0 - postgresql-migration ==0.2.1.3 @@ -1954,7 +1954,7 @@ default-package-overrides: - pulse-simple ==0.1.14 - pureMD5 ==2.1.4 - purescript-bridge ==0.14.0.0 - - pusher-http-haskell ==2.1.0.11 + - pusher-http-haskell ==2.1.0.12 - pvar ==1.0.0.0 - PyF ==0.10.2.0 - qchas ==1.1.0.1 @@ -2119,7 +2119,7 @@ default-package-overrides: - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - sampling ==0.3.5 - - sandwich ==0.1.0.10 + - sandwich ==0.1.0.11 - sandwich-quickcheck ==0.1.0.6 - sandwich-slack ==0.1.0.6 - say ==0.1.0.1 @@ -2386,7 +2386,7 @@ default-package-overrides: - swagger2 ==2.8.4 - swish ==0.10.2.0 - syb ==0.7.2.1 - - sydtest-discover ==0.0.0.1 + - sydtest-discover ==0.0.0.2 - symbol ==0.2.4 - symengine ==0.1.2.0 - symmetry-operations-symbols ==0.0.2.1 @@ -2638,7 +2638,7 @@ default-package-overrides: - universum ==1.7.3 - unix-bytestring ==0.3.7.8 - unix-compat ==0.5.4 - - unix-time ==0.4.7 + - unix-time ==0.4.8 - unliftio ==0.2.22.0 - unliftio-core ==0.2.0.1 - unliftio-path ==0.0.2.0 @@ -2768,7 +2768,7 @@ default-package-overrides: - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - wire-streams ==0.1.1.0 - - witch ==1.0.0.3 + - witch ==1.0.0.4 with-compiler: ghc-9.0.2 - withdependencies ==0.3.0 - witherable ==0.4.2 @@ -2836,13 +2836,13 @@ with-compiler: ghc-9.0.2 - yaml-unscrambler ==0.1.0.9 - yarn-lock ==0.6.5 - yeshql-core ==4.2.0.0 - - yesod ==1.6.2 + - yesod ==1.6.2.1 - yesod-alerts ==0.1.3.0 - yesod-auth ==1.6.11 - yesod-auth-basic ==0.1.0.3 - yesod-auth-hashdb ==1.7.1.7 - yesod-auth-oauth2 ==0.7.0.2 - - yesod-bin ==1.6.2.1 + - yesod-bin ==1.6.2.2 - yesod-core ==1.6.24.0 - yesod-eventsource ==1.6.0.1 - yesod-form ==1.7.0 From 284e415ba044bf0946df510e219019c0a9c16c9e Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 18 Sep 2022 13:53:08 +0200 Subject: [PATCH 04/53] all-cabal-hashes: 2022-09-11T02:31:18Z -> 2022-09-18T11:31:48Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 2d37e58b7603..695ac903732a 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "d921dcbcb495c59ebdd949f1b70c00d0b0dfbc34", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d921dcbcb495c59ebdd949f1b70c00d0b0dfbc34.tar.gz", - "sha256": "1kdb392fhm2jvf3rsznx2gzwqki978bj3dpmpjfjxqadbzz9cl34", - "msg": "Update from Hackage at 2022-09-11T02:31:18Z" + "commit": "1aaf651c377b16816f7ded0d09b32f6af8a2f4ec", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/1aaf651c377b16816f7ded0d09b32f6af8a2f4ec.tar.gz", + "sha256": "0l73lzb2yaq3jggn3v9rgv49xn302ccgw1mvd3ga66wh7n89djvm", + "msg": "Update from Hackage at 2022-09-18T11:31:48Z" } From f604bbc9cef2ff7b9013330e1c9fd744a0d6af70 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 18 Sep 2022 13:54:05 +0200 Subject: [PATCH 05/53] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 2189 +++++++++++------ 1 file changed, 1403 insertions(+), 786 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 33313fcfa6e9..bb8425f2422b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1351,13 +1351,13 @@ self: { }) {}; "BPS" = callPackage - ({ mkDerivation, base, extra, free, mtl, resourcet, STMonadTrans - , symbol, template-haskell, TLT, transformers + ({ mkDerivation, base, extra, free, MonadRandom, mtl, resourcet + , STMonadTrans, symbol, template-haskell, TLT, transformers }: mkDerivation { pname = "BPS"; - version = "0.1.0.0"; - sha256 = "0rkrjj42p9ybcifmsmz8717yyf2q3vzwm4y42khxz824vdxa9q2j"; + version = "0.1.1.0"; + sha256 = "0c310zldchyqhkqq2nsarqgkkxrqqcq62796mi0svsn9wk65rrf4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -1365,8 +1365,8 @@ self: { transformers ]; executableHaskellDepends = [ - base extra free mtl resourcet STMonadTrans symbol template-haskell - transformers + base extra free MonadRandom mtl resourcet STMonadTrans symbol + template-haskell transformers ]; testHaskellDepends = [ base extra free mtl resourcet STMonadTrans symbol template-haskell @@ -1375,7 +1375,6 @@ self: { description = "Translations of classic Truth Maintenance Systems"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - mainProgram = "hbps"; broken = true; }) {}; @@ -10074,6 +10073,25 @@ self: { license = lib.licenses.lgpl21Only; }) {}; + "HaXml_1_25_11" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , polyparse, pretty, random + }: + mkDerivation { + pname = "HaXml"; + version = "1.25.11"; + sha256 = "1l5kmiqvnqzdzz3jyaphy7ckglm6jhn0b10kf47yizv0w496bmjg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers filepath polyparse pretty random + ]; + executableHaskellDepends = [ base directory polyparse pretty ]; + description = "Utilities for manipulating XML documents"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "Hach" = callPackage ({ mkDerivation, base, containers, network, old-locale, text, time , vty, vty-ui @@ -13539,8 +13557,8 @@ self: { pname = "MIP"; version = "0.1.1.0"; sha256 = "03gzwg0hzgij9hpxxfsrdxx2cknfy9fr9h1w1na04bmzpai1sl40"; - revision = "1"; - editedCabalFile = "0jm2g7g4js366i6i21d13f2gng7py4gkb3m64f76rdxbpqfcgfq1"; + revision = "2"; + editedCabalFile = "03kjzsyd3sy9iipdnac5ddpkq6v1cfpj0wh00r3yvcjgrk99ycip"; libraryHaskellDepends = [ base bytestring bytestring-encoding case-insensitive containers data-default-class extended-reals filepath intern lattices @@ -14533,80 +14551,77 @@ self: { ({ mkDerivation, aeson, ansi-terminal, async, atomic-write, base , bytestring, bytestring-lexing, bzlib-conduit, conduit , conduit-algorithms, conduit-extra, configurator, containers - , convertible, criterion, data-default, deepseq, diagrams-core - , diagrams-lib, diagrams-svg, directory, double-conversion - , edit-distance, either, errors, exceptions, extra, file-embed - , filemanip, filepath, hashable, hashtables, hostname, http-client - , http-conduit, HUnit, inline-c, inline-c-cpp, int-interval-map - , MissingH, mtl, network, optparse-applicative, parsec, primitive - , process, QuickCheck, regex, resourcet, safe, safeio, stm - , stm-chans, stm-conduit, strict, tar, tar-conduit, tasty - , tasty-hunit, tasty-quickcheck, tasty-th, template-haskell, text - , time, transformers, unix, unix-compat, unliftio, unliftio-core - , vector, vector-algorithms, yaml, zlib + , convertible, criterion, data-default, deepseq, directory + , double-conversion, edit-distance, either, errors, exceptions + , extra, file-embed, filemanip, filepath, hashable, hashtables + , hostname, http-client, http-conduit, HUnit, inline-c + , inline-c-cpp, int-interval-map, MissingH, mtl, network + , optparse-applicative, parsec, primitive, process, QuickCheck + , random-shuffle, regex, resourcet, safe, safeio, stm, stm-chans + , stm-conduit, strict, tar, tar-conduit, tasty, tasty-hunit + , tasty-quickcheck, tasty-th, template-haskell, text, time + , transformers, unix, unix-compat, unliftio, unliftio-core, vector + , vector-algorithms, yaml, zlib }: mkDerivation { pname = "NGLess"; - version = "1.4.2.0"; - sha256 = "0578rjwi3xwikfaxha8yignr37adykqkbhspxds0c5bzwcw5zywh"; + version = "1.5.0"; + sha256 = "0pljyrlpr9r3cl5311dhgxdl8y40szyi4vprn34i3piy0qrldymi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal async atomic-write base bytestring bytestring-lexing bzlib-conduit conduit conduit-algorithms conduit-extra configurator containers convertible data-default - deepseq diagrams-core diagrams-lib diagrams-svg directory - double-conversion edit-distance either errors exceptions extra - file-embed filemanip filepath hashable hashtables hostname - http-client http-conduit inline-c inline-c-cpp int-interval-map - MissingH mtl network optparse-applicative parsec primitive process - regex resourcet safe safeio stm stm-chans stm-conduit strict tar - tar-conduit template-haskell text time transformers unix - unix-compat unliftio unliftio-core vector vector-algorithms yaml - zlib + deepseq directory double-conversion edit-distance either errors + exceptions extra file-embed filemanip filepath hashable hashtables + hostname http-client http-conduit inline-c inline-c-cpp + int-interval-map MissingH mtl network optparse-applicative parsec + primitive process random-shuffle regex resourcet safe safeio stm + stm-chans stm-conduit strict tar tar-conduit template-haskell text + time transformers unix unix-compat unliftio unliftio-core vector + vector-algorithms yaml zlib ]; executableHaskellDepends = [ aeson ansi-terminal async atomic-write base bytestring bytestring-lexing bzlib-conduit conduit conduit-algorithms conduit-extra configurator containers convertible data-default - deepseq diagrams-core diagrams-lib diagrams-svg directory - double-conversion edit-distance either errors exceptions extra - file-embed filemanip filepath hashable hashtables hostname - http-client http-conduit inline-c inline-c-cpp int-interval-map - MissingH mtl network optparse-applicative parsec primitive process - regex resourcet safe safeio stm stm-chans stm-conduit strict tar - tar-conduit template-haskell text time transformers unix - unix-compat unliftio unliftio-core vector vector-algorithms yaml - zlib + deepseq directory double-conversion edit-distance either errors + exceptions extra file-embed filemanip filepath hashable hashtables + hostname http-client http-conduit inline-c inline-c-cpp + int-interval-map MissingH mtl network optparse-applicative parsec + primitive process random-shuffle regex resourcet safe safeio stm + stm-chans stm-conduit strict tar tar-conduit template-haskell text + time transformers unix unix-compat unliftio unliftio-core vector + vector-algorithms yaml zlib ]; testHaskellDepends = [ aeson ansi-terminal async atomic-write base bytestring bytestring-lexing bzlib-conduit conduit conduit-algorithms conduit-extra configurator containers convertible data-default - deepseq diagrams-core diagrams-lib diagrams-svg directory - double-conversion edit-distance either errors exceptions extra - file-embed filemanip filepath hashable hashtables hostname - http-client http-conduit HUnit inline-c inline-c-cpp + deepseq directory double-conversion edit-distance either errors + exceptions extra file-embed filemanip filepath hashable hashtables + hostname http-client http-conduit HUnit inline-c inline-c-cpp int-interval-map MissingH mtl network optparse-applicative parsec - primitive process QuickCheck regex resourcet safe safeio stm - stm-chans stm-conduit strict tar tar-conduit tasty tasty-hunit - tasty-quickcheck tasty-th template-haskell text time transformers - unix unix-compat unliftio unliftio-core vector vector-algorithms - yaml zlib + primitive process QuickCheck random-shuffle regex resourcet safe + safeio stm stm-chans stm-conduit strict tar tar-conduit tasty + tasty-hunit tasty-quickcheck tasty-th template-haskell text time + transformers unix unix-compat unliftio unliftio-core vector + vector-algorithms yaml zlib ]; benchmarkHaskellDepends = [ aeson ansi-terminal async atomic-write base bytestring bytestring-lexing bzlib-conduit conduit conduit-algorithms conduit-extra configurator containers convertible criterion - data-default deepseq diagrams-core diagrams-lib diagrams-svg - directory double-conversion edit-distance either errors exceptions - extra file-embed filemanip filepath hashable hashtables hostname - http-client http-conduit HUnit inline-c inline-c-cpp - int-interval-map MissingH mtl network optparse-applicative parsec - primitive process regex resourcet safe safeio stm stm-chans - stm-conduit strict tar tar-conduit template-haskell text time - transformers unix unix-compat unliftio unliftio-core vector - vector-algorithms yaml zlib + data-default deepseq directory double-conversion edit-distance + either errors exceptions extra file-embed filemanip filepath + hashable hashtables hostname http-client http-conduit HUnit + inline-c inline-c-cpp int-interval-map MissingH mtl network + optparse-applicative parsec primitive process random-shuffle regex + resourcet safe safeio stm stm-chans stm-conduit strict tar + tar-conduit template-haskell text time transformers unix + unix-compat unliftio unliftio-core vector vector-algorithms yaml + zlib ]; description = "NGLess implements ngless, a DSL for processing sequencing data"; license = lib.licenses.mit; @@ -20148,6 +20163,26 @@ self: { broken = true; }) {}; + "SvgIcons" = callPackage + ({ mkDerivation, base, blaze-markup, blaze-svg, directory, text }: + mkDerivation { + pname = "SvgIcons"; + version = "0.1.0.0"; + sha256 = "0vwlzjpcz6ky6x5mycsrqlwdfdzxf7y0z8y7pxwnc0h8f8psalr6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-markup blaze-svg directory text + ]; + executableHaskellDepends = [ + base blaze-markup blaze-svg directory text + ]; + testHaskellDepends = [ base ]; + description = "Svg Icons and more"; + license = lib.licenses.bsd3; + mainProgram = "SvgIcons-exe"; + }) {}; + "SybWidget" = callPackage ({ mkDerivation, base, containers, mtl, syb-with-class , template-haskell, TypeCompose @@ -22251,8 +22286,8 @@ self: { }: mkDerivation { pname = "X11"; - version = "1.10.2"; - sha256 = "1ip207l97s8nw4daxp9s254agk8f0wibpf0prx0n695klqyn8bz1"; + version = "1.10.3"; + sha256 = "0hnj2q310a6s0h479hq8jsmywymvxdjxg13zw46mmdndynwd2jnq"; libraryHaskellDepends = [ base data-default-class ]; librarySystemDepends = [ libX11 libXext libXinerama libXrandr libXrender libXScrnSaver @@ -25845,8 +25880,8 @@ self: { }: mkDerivation { pname = "aeson-match-qq"; - version = "1.4.3"; - sha256 = "0zml908g96x6xqzpa5dv2p46y9rn8kfp10xw6954xabqlba8d0rv"; + version = "1.5.1"; + sha256 = "1m2brw8c1i0p32llng904lb893vkjfcqbmljkcx5m7iab0hvpvaw"; libraryHaskellDepends = [ aeson attoparsec base bytestring case-insensitive containers either haskell-src-meta scientific template-haskell text @@ -39790,18 +39825,6 @@ self: { }) {}; "bank-holidays-england" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck, time }: - mkDerivation { - pname = "bank-holidays-england"; - version = "0.2.0.7"; - sha256 = "0q24flhiqp50krld6blmnlj8wqf2jvhfdpwrg469n3391p7jgfsc"; - libraryHaskellDepends = [ base containers time ]; - testHaskellDepends = [ base containers hspec QuickCheck time ]; - description = "Calculation of bank holidays in England and Wales"; - license = lib.licenses.bsd3; - }) {}; - - "bank-holidays-england_0_2_0_8" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck, time }: mkDerivation { pname = "bank-holidays-england"; @@ -39811,7 +39834,6 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck time ]; description = "Calculation of bank holidays in England and Wales"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "banwords" = callPackage @@ -40103,16 +40125,17 @@ self: { "base-encoding" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring - , bytestring, text + , bytestring, bytestring-builder, text }: mkDerivation { pname = "base-encoding"; - version = "0.2.0.0"; - sha256 = "028b7pbpbnph2k4jzvp9kyn2s7d0zd62panh21digwn4nnc3hbp1"; + version = "0.3.0.0"; + sha256 = "1lcqg4wpbry3x165j8rsjbpj1mzd7bl0917hjv0jhvmh5z3wnas8"; libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring text + base base16-bytestring base64-bytestring bytestring + bytestring-builder text ]; - description = "Binary-to-text encodings (e.g. base64)"; + description = "RFC4648 Binary-to-text encodings (e.g. base64)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -40451,8 +40474,8 @@ self: { pname = "base64"; version = "0.4.2.4"; sha256 = "119mpqcv1rwkhwm69ga2b4f7hr825fa5wfm1w3i1szmhzh52s2k4"; - revision = "1"; - editedCabalFile = "09jja484hzhnjfaz9whridrxsk799gyrg6qnvbpiy8q9c5cybfhi"; + revision = "2"; + editedCabalFile = "0cz3zzz9k490w9nfn4hpgdw4zx4w70fwqrwsfx8svcwqssqibqw3"; libraryHaskellDepends = [ base bytestring deepseq text text-short ]; @@ -42407,6 +42430,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "bifunctors_5_5_13" = callPackage + ({ mkDerivation, base, base-orphans, comonad, containers, hspec + , hspec-discover, QuickCheck, tagged, template-haskell + , th-abstraction, transformers, transformers-compat + }: + mkDerivation { + pname = "bifunctors"; + version = "5.5.13"; + sha256 = "1myvlzxk9xrm6vf9863wnv8py3ccgfxqxyc0sqxz0v3rwfnjgk16"; + libraryHaskellDepends = [ + base base-orphans comonad containers tagged template-haskell + th-abstraction transformers + ]; + testHaskellDepends = [ + base hspec QuickCheck template-haskell transformers + transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + description = "Bifunctors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bighugethesaurus" = callPackage ({ mkDerivation, base, HTTP, split }: mkDerivation { @@ -51633,8 +51679,8 @@ self: { ({ mkDerivation, base, Cabal, QuickCheck }: mkDerivation { pname = "cabal-detailed-quickcheck"; - version = "0.1.2.1"; - sha256 = "0h87l8q3c3pfhkvm0dcxd8q4kzfqzwaqcpn1wbsvcxlyqbn5dqgs"; + version = "0.1.3.0"; + sha256 = "188yzxmrk758py75vk5rfbrn105dysk5nmf9wdgb3a27911b649c"; libraryHaskellDepends = [ base Cabal QuickCheck ]; description = "QuickCheck for Cabal tests"; license = lib.licenses.mit; @@ -57760,8 +57806,8 @@ self: { }: mkDerivation { pname = "chr-core"; - version = "0.1.0.4"; - sha256 = "0kh8md0qw3x3b06lcl6v593dlh8a7m5j6w63j6fbwg2gmk290md9"; + version = "0.1.1.0"; + sha256 = "0bxwj0pwwps55705clzxrm58pzpgh249r9gmidr42vm7gh96pw4a"; libraryHaskellDepends = [ base chr-data chr-pretty containers hashable logict-state mtl pqueue unordered-containers @@ -57797,8 +57843,8 @@ self: { }: mkDerivation { pname = "chr-lang"; - version = "0.1.0.1"; - sha256 = "0dd4xlk2klnqn6xyfh3b7gcy17z8x1lvyps5f5mypk9ijmrckhdy"; + version = "0.1.1.0"; + sha256 = "12bbbadq8da3n9712p0w613alvs65s5rcjmd7nymk3dx1i2syk23"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75106,8 +75152,8 @@ self: { }: mkDerivation { pname = "data-sword"; - version = "0.2.0.2"; - sha256 = "1m14vxfx5raiy5b6w3602hkqywc0gj4yv38mjbwncbic86g6rgn2"; + version = "0.2.0.3"; + sha256 = "1qwvqhg2fdfpl543p96pzgf879qkx29y3z4k15wa3jarx8s619gq"; libraryHaskellDepends = [ base data-bword hashable template-haskell ]; @@ -79954,10 +80000,8 @@ self: { }: mkDerivation { pname = "diagrams-canvas"; - version = "1.4.1"; - sha256 = "1ihmv42412d8dk3s894zd70xd386wrk9ycxkid19barry1vz5plj"; - revision = "3"; - editedCabalFile = "0yajv3bnzhqwr673rch0wd9vhc4kcfdpdw5p5a2x1xbrpzghksac"; + version = "1.4.1.1"; + sha256 = "0vhjrmnf2bf4sfyaqhijsx79wah4p2dkg3h79yj9q8l7n90vbfw5"; libraryHaskellDepends = [ base blank-canvas cmdargs containers data-default-class diagrams-core diagrams-lib lens mtl NumInstances @@ -80171,6 +80215,38 @@ self: { license = lib.licenses.bsd3; }) {}; + "diagrams-lib_1_4_5_2" = callPackage + ({ mkDerivation, active, adjunctions, array, base, bytestring + , cereal, colour, containers, criterion, data-default-class + , deepseq, diagrams-core, diagrams-solve, directory, distributive + , dual-tree, exceptions, filepath, fingertree, fsnotify, hashable + , intervals, JuicyPixels, lens, linear, monoid-extras, mtl + , numeric-extras, optparse-applicative, process, profunctors + , QuickCheck, semigroups, tagged, tasty, tasty-hunit + , tasty-quickcheck, text, transformers, unordered-containers + }: + mkDerivation { + pname = "diagrams-lib"; + version = "1.4.5.2"; + sha256 = "1vx51g9znb4a9bf20pjd9zr98wmh39avk2i06217p0iidcw8whz6"; + libraryHaskellDepends = [ + active adjunctions array base bytestring cereal colour containers + data-default-class diagrams-core diagrams-solve directory + distributive dual-tree exceptions filepath fingertree fsnotify + hashable intervals JuicyPixels lens linear monoid-extras mtl + optparse-applicative process profunctors semigroups tagged text + transformers unordered-containers + ]; + testHaskellDepends = [ + base deepseq diagrams-solve distributive lens numeric-extras + QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion diagrams-core ]; + description = "Embedded domain-specific language for declarative graphics"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "diagrams-pandoc" = callPackage ({ mkDerivation, base, diagrams-builder, diagrams-cairo , diagrams-core, diagrams-lib, diagrams-svg, directory, filepath @@ -85641,8 +85717,8 @@ self: { ({ mkDerivation, base, containers, ghc }: mkDerivation { pname = "driving-classes-plugin"; - version = "0.1.3.0"; - sha256 = "126bih4i3gyjdwnmvivz0kzn6viw1nlap9zz076xljgkf8qw3dwn"; + version = "0.1.4.0"; + sha256 = "1bmf5ahlnlibiq2ydqni8w6iiw2bps92nzcapr4dmqmvgdq0s9lk"; libraryHaskellDepends = [ base containers ghc ]; testHaskellDepends = [ base ]; description = "Deriving without spelling out \"deriving\""; @@ -87610,6 +87686,17 @@ self: { mainProgram = "hectare"; }) {}; + "ecta-plugin" = callPackage + ({ mkDerivation, base, containers, ecta, ghc, text }: + mkDerivation { + pname = "ecta-plugin"; + version = "0.1.1.3"; + sha256 = "1rkh4k00k7g583wbhn28by1qjp39ad89k5nzxg9vm8g4p8famf4c"; + libraryHaskellDepends = [ base containers ecta ghc text ]; + description = "Hole-Fit Synthesis using ECTAs"; + license = lib.licenses.mit; + }) {}; + "ecu" = callPackage ({ mkDerivation, base, bytestring, canlib, digest, directory , process, vcd @@ -88116,8 +88203,8 @@ self: { ({ mkDerivation, base, effectful-core, primitive }: mkDerivation { pname = "effectful-st"; - version = "0.0.0.0"; - sha256 = "1afgq935l29ai9dizk0rzcpxlh7nfwzrkhidrlw77cc5lvypjan4"; + version = "0.0.0.1"; + sha256 = "0wbf6ilaimiqhggv4dvjrkghdv3ylivj2ncshp8ymfrc7kiw51a0"; libraryHaskellDepends = [ base effectful-core primitive ]; description = "`ST`-style mutation for `effectful`"; license = lib.licenses.cc0; @@ -93362,6 +93449,31 @@ self: { license = lib.licenses.mit; }) {}; + "evm-opcodes_0_1_2" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, data-dword + , hedgehog, hspec, tasty, tasty-bench, tasty-discover + , tasty-hedgehog, tasty-hspec, text + }: + mkDerivation { + pname = "evm-opcodes"; + version = "0.1.2"; + sha256 = "0p7gb3k64jsjscfxf2cd34igkm9j8q0rq3irfh1x4jdryvck2jch"; + libraryHaskellDepends = [ + base bytestring cereal containers data-dword text + ]; + testHaskellDepends = [ + base bytestring cereal containers data-dword hedgehog hspec tasty + tasty-discover tasty-hedgehog tasty-hspec text + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base bytestring cereal containers data-dword tasty-bench text + ]; + description = "Opcode types for Ethereum Virtual Machine (EVM)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "evoke" = callPackage ({ mkDerivation, aeson, base, ghc, HUnit, insert-ordered-containers , lens, QuickCheck, swagger2, text @@ -96030,6 +96142,8 @@ self: { pname = "fastparser"; version = "0.5.0"; sha256 = "0pxd2f6f0a6kckqmkkafh9zx11x75x1zx1z90snzj3j8s4jcfg4y"; + revision = "1"; + editedCabalFile = "0h64i8z71h0hfdc89bpqqamjn733mxshmlpapa4gvlnbzylm3cwr"; libraryHaskellDepends = [ base bytestring bytestring-lexing containers kan-extensions microlens thyme transformers vector-space @@ -101291,6 +101405,25 @@ self: { broken = true; }) {}; + "foreign" = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover + , primitive, primitive-unlifted, QuickCheck, quickcheck-instances + }: + mkDerivation { + pname = "foreign"; + version = "0.1.1.0"; + sha256 = "0r9lag2d7hki1ciah4hzf4gdsxdlskjzkcafp6h99ifhb63m55i3"; + libraryHaskellDepends = [ + base bytestring ghc-prim primitive primitive-unlifted + ]; + testHaskellDepends = [ + base hspec QuickCheck quickcheck-instances + ]; + testToolDepends = [ hspec-discover ]; + description = "A collection of helpers for ffi"; + license = lib.licenses.bsd3; + }) {}; + "foreign-storable-asymmetric" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -102452,8 +102585,8 @@ self: { }: mkDerivation { pname = "freckle-app"; - version = "1.6.0.0"; - sha256 = "1ciqkqzif6hnasqhcmlhm5smq06mjh05l94v36413zv7ikcszygx"; + version = "1.6.0.3"; + sha256 = "0nv29d82zsrf6x30jsjgi9wlnfshy50h3pi5x7igxm3zxhh9saf6"; libraryHaskellDepends = [ aeson base Blammo bugsnag bytestring case-insensitive conduit containers datadog doctest dotenv ekg-core envparse errors @@ -103627,6 +103760,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "fsnotify_0_4_0_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , exceptions, filepath, hinotify, hspec, hspec-core + , hspec-expectations, HUnit, monad-control, random, retry + , safe-exceptions, temporary, text, time, unix, unix-compat + }: + mkDerivation { + pname = "fsnotify"; + version = "0.4.0.0"; + sha256 = "033qwa71spjz3klqmsdzi85fjb0ps9l5v1vl5zylz5jarh41z66y"; + libraryHaskellDepends = [ + async base bytestring containers directory filepath hinotify + monad-control safe-exceptions text time unix unix-compat + ]; + testHaskellDepends = [ + async base directory exceptions filepath hspec hspec-core + hspec-expectations HUnit random retry safe-exceptions temporary + unix-compat + ]; + description = "Cross platform library for file change notification"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fsnotify-conduit" = callPackage ({ mkDerivation, base, conduit, directory, filepath, fsnotify , hspec, resourcet, temporary, transformers @@ -107610,25 +107767,6 @@ self: { }) {}; "genvalidity-hspec" = callPackage - ({ mkDerivation, base, genvalidity, genvalidity-property, hspec - , hspec-core, QuickCheck, transformers, validity - }: - mkDerivation { - pname = "genvalidity-hspec"; - version = "1.0.0.0"; - sha256 = "1p00iphswnsaabcnjmvf4ahydpqg66zya4qfjb52bbz6cb7k06s7"; - libraryHaskellDepends = [ - base genvalidity genvalidity-property hspec hspec-core QuickCheck - transformers validity - ]; - testHaskellDepends = [ - base genvalidity hspec hspec-core QuickCheck - ]; - description = "Standard spec's for GenValidity instances"; - license = lib.licenses.mit; - }) {}; - - "genvalidity-hspec_1_0_0_1" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-property, hspec , hspec-core, QuickCheck, transformers, validity }: @@ -107645,7 +107783,6 @@ self: { ]; description = "Standard spec's for GenValidity instances"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-hspec-aeson" = callPackage @@ -109838,6 +109975,18 @@ self: { license = lib.licenses.mit; }) {}; + "ghc-parser_0_2_4_0" = callPackage + ({ mkDerivation, base, ghc }: + mkDerivation { + pname = "ghc-parser"; + version = "0.2.4.0"; + sha256 = "1s7y7npv37x1jxgq6ryl1ijcb7izmz07ab5pmqj4prng6g3majc9"; + libraryHaskellDepends = [ base ghc ]; + description = "Haskell source parser from GHC"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-paths" = callPackage ({ mkDerivation, base, Cabal, directory }: mkDerivation { @@ -110206,19 +110355,20 @@ self: { }) {}; "ghc-tags-core" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq - , directory, filepath, filepath-bytestring, ghc, lattices, mtl - , pipes, pipes-attoparsec, pipes-bytestring, QuickCheck - , quickcheck-instances, tasty, tasty-golden, tasty-quickcheck, text - , transformers + ({ mkDerivation, attoparsec, base, bytestring, containers + , criterion, deepseq, directory, filepath, filepath-bytestring, ghc + , lattices, mtl, pipes, pipes-attoparsec, pipes-bytestring + , QuickCheck, quickcheck-instances, tasty, tasty-golden + , tasty-quickcheck, text, transformers }: mkDerivation { pname = "ghc-tags-core"; - version = "0.3.1.1"; - sha256 = "0ch9xr262c0ssjzgk8yid3hwa04g5q0zn2yxgwjzbzg60ydf9cas"; + version = "0.4.0.0"; + sha256 = "1w1h1j3pchka8nvqpa25s7z5hbzlf4nb2xb2g7krnannkd58wxyp"; libraryHaskellDepends = [ - attoparsec base bytestring directory filepath-bytestring ghc mtl - pipes pipes-attoparsec pipes-bytestring text transformers + attoparsec base bytestring containers deepseq directory + filepath-bytestring ghc mtl pipes pipes-attoparsec pipes-bytestring + text transformers ]; testHaskellDepends = [ attoparsec base bytestring directory filepath filepath-bytestring @@ -110243,8 +110393,8 @@ self: { }: mkDerivation { pname = "ghc-tags-plugin"; - version = "0.4.0.1"; - sha256 = "14s7h7d8ihp800bz79mxpm4jsd3c0c1h228akbl08z69x6ggb1ac"; + version = "0.5.0.0"; + sha256 = "1vwrk7cdq9hc2yw0ab5p86bp69vwkj26c3ys5k3fgvy5w343i148"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110639,6 +110789,8 @@ self: { pname = "ghcid"; version = "0.8.7"; sha256 = "0yqc1pkfajnr56gnh43sbj50r7c3r41b2jfz07ivgl6phi4frjbq"; + revision = "1"; + editedCabalFile = "0s4z20cbap0bymljkdbw6lr3dchi34yvy9j27f4xjwx93dhnrmkk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110658,80 +110810,148 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "ghcid_0_8_8" = callPackage + ({ mkDerivation, ansi-terminal, base, cmdargs, containers + , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit + , terminal-size, time, unix + }: + mkDerivation { + pname = "ghcid"; + version = "0.8.8"; + sha256 = "1y2qr1g0jy1jd8lh6bqwhzad15jgz0psq5qx31hbgq6ikm1nxjcj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base cmdargs directory extra filepath process time + ]; + executableHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process terminal-size time unix + ]; + testHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process tasty tasty-hunit terminal-size time unix + ]; + description = "GHCi based bare bones IDE"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "ghcid"; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "ghcide" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, binary, bytestring, case-insensitive - , containers, cryptohash-sha1, data-default, deepseq, dependent-map - , dependent-sum, Diff, directory, dlist, enummapset, exceptions - , extra, filepath, fingertree, focus, fuzzy, ghc, ghc-boot - , ghc-boot-th, ghc-check, ghc-exactprint, ghc-paths - , ghc-trace-events, ghc-typelits-knownnat, gitrev, Glob - , haddock-library, hashable, heapsize, hie-bios, hie-compat, hiedb - , hls-graph, hls-plugin-api, hp2pretty, hslogger, implicit-hie - , implicit-hie-cradle, lens, list-t, lsp, lsp-test, lsp-types - , monoid-subclasses, mtl, network-uri, opentelemetry - , optparse-applicative, parallel, prettyprinter - , prettyprinter-ansi-terminal, process, QuickCheck - , quickcheck-instances, random, record-dot-preprocessor - , record-hasfield, regex-tdfa, retrie, rope-utf16-splay, safe - , safe-exceptions, shake, shake-bench, sorted-list, sqlite-simple - , stm, stm-containers, syb, tasty, tasty-expected-failure - , tasty-hunit, tasty-quickcheck, tasty-rerun, text, time + , co-log-core, containers, cryptohash-sha1, data-default, deepseq + , dependent-map, dependent-sum, Diff, directory, dlist, enummapset + , exceptions, extra, filepath, fingertree, focus, fuzzy, ghc + , ghc-boot, ghc-boot-th, ghc-check, ghc-paths, ghc-trace-events + , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable + , heapsize, hie-bios, hie-compat, hiedb, hls-graph, hls-plugin-api + , hslogger, implicit-hie, implicit-hie-cradle, lens, list-t, lsp + , lsp-test, lsp-types, monoid-subclasses, mtl, network-uri + , opentelemetry, optparse-applicative, parallel, prettyprinter + , prettyprinter-ansi-terminal, QuickCheck, random + , record-dot-preprocessor, record-hasfield, regex-tdfa + , safe-exceptions, shake, sorted-list, sqlite-simple, stm + , stm-containers, syb, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, tasty-rerun, text, text-rope, time , transformers, unix, unliftio, unliftio-core, unordered-containers - , utf8-string, vector, vector-algorithms, yaml + , vector }: mkDerivation { pname = "ghcide"; - version = "1.7.0.0"; - sha256 = "097vpp1gds36ijldz29bsk71pxc82l966ka578cxsrcdc3g3ll1b"; - revision = "2"; - editedCabalFile = "1j4jzqhghjlzsyfn9jh70ah73nydjp9sjabpc041q5fv17s9b65z"; + version = "1.8.0.0"; + sha256 = "0j46xlaphmsmfpiycdi2n24mydvrb3c20sw2zzqm396x5ziz9p8p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty array async base base16-bytestring binary - bytestring case-insensitive containers cryptohash-sha1 data-default - deepseq dependent-map dependent-sum Diff directory dlist enummapset - exceptions extra filepath fingertree focus ghc ghc-boot ghc-boot-th - ghc-check ghc-exactprint ghc-paths ghc-trace-events Glob + bytestring case-insensitive co-log-core containers cryptohash-sha1 + data-default deepseq dependent-map dependent-sum Diff directory + dlist enummapset exceptions extra filepath fingertree focus ghc + ghc-boot ghc-boot-th ghc-check ghc-paths ghc-trace-events Glob haddock-library hashable heapsize hie-bios hie-compat hiedb hls-graph hls-plugin-api hslogger implicit-hie-cradle lens list-t - lsp lsp-types monoid-subclasses mtl network-uri opentelemetry + lsp lsp-types monoid-subclasses mtl opentelemetry optparse-applicative parallel prettyprinter - prettyprinter-ansi-terminal random regex-tdfa retrie - rope-utf16-splay safe safe-exceptions sorted-list sqlite-simple stm - stm-containers syb text time transformers unix unliftio - unliftio-core unordered-containers utf8-string vector - vector-algorithms + prettyprinter-ansi-terminal random regex-tdfa safe-exceptions + sorted-list sqlite-simple stm stm-containers syb text text-rope + time transformers unix unliftio unliftio-core unordered-containers + vector ]; executableHaskellDepends = [ - aeson base bytestring containers data-default directory extra - filepath ghc gitrev hashable heapsize hie-bios hiedb hls-graph - hls-plugin-api lens lsp lsp-test lsp-types optparse-applicative - process safe-exceptions shake tasty-hunit text unordered-containers + aeson base data-default directory extra filepath ghc gitrev + hashable heapsize hie-bios hiedb hls-graph hls-plugin-api lens lsp + lsp-types optparse-applicative safe-exceptions text + unordered-containers ]; testHaskellDepends = [ - aeson async base binary bytestring containers data-default - directory extra filepath fuzzy ghc ghc-typelits-knownnat - haddock-library hls-graph hls-plugin-api lens list-t lsp lsp-test - lsp-types monoid-subclasses network-uri optparse-applicative - parallel process QuickCheck quickcheck-instances random - record-dot-preprocessor record-hasfield regex-tdfa rope-utf16-splay - safe safe-exceptions shake sqlite-simple stm stm-containers tasty - tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun - text unordered-containers vector + aeson async base containers data-default directory extra filepath + fuzzy ghc ghc-typelits-knownnat hls-plugin-api lens list-t lsp + lsp-test lsp-types monoid-subclasses network-uri QuickCheck random + record-dot-preprocessor record-hasfield regex-tdfa shake + sqlite-simple stm stm-containers tasty tasty-expected-failure + tasty-hunit tasty-quickcheck tasty-rerun text text-rope + unordered-containers ]; testToolDepends = [ implicit-hie ]; - benchmarkHaskellDepends = [ - aeson base directory extra filepath lens optparse-applicative shake - shake-bench text yaml - ]; - benchmarkToolDepends = [ hp2pretty implicit-hie ]; description = "The core of an IDE"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.maralorn ]; }) {}; + "ghcide-bench" = callPackage + ({ mkDerivation, aeson, async, base, binary, bytestring, containers + , data-default, deepseq, directory, extra, filepath, ghcide + , ghcide-test-utils, hashable, hls-graph, hls-plugin-api + , implicit-hie, lens, lsp-test, lsp-types, optparse-applicative + , parser-combinators, process, safe-exceptions, shake, tasty + , tasty-hunit, tasty-rerun, text + }: + mkDerivation { + pname = "ghcide-bench"; + version = "0.1"; + sha256 = "0l7sablv85dgyzj12rbn0az704mzx4hjbm6kz88223kwn71qnnzz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base binary bytestring deepseq directory extra filepath + ghcide ghcide-test-utils hashable lens lsp-test lsp-types + optparse-applicative parser-combinators process safe-exceptions + shake text + ]; + executableHaskellDepends = [ + aeson base bytestring containers data-default directory extra + filepath hls-graph hls-plugin-api lens lsp-test lsp-types + optparse-applicative process safe-exceptions shake tasty-hunit text + ]; + testHaskellDepends = [ + base extra lsp-test tasty tasty-hunit tasty-rerun + ]; + testToolDepends = [ ghcide implicit-hie ]; + description = "An LSP client for running performance experiments on HLS"; + license = lib.licenses.asl20; + mainProgram = "ghcide-bench"; + }) {}; + + "ghcide-test-utils" = callPackage + ({ mkDerivation, aeson, base, containers, data-default, directory + , extra, filepath, ghcide, hls-plugin-api, lens, lsp-test + , lsp-types, tasty-hunit, text + }: + mkDerivation { + pname = "ghcide-test-utils"; + version = "1.8.0.0"; + sha256 = "171y27lkngnsv26qd1wga5yfdjrz48bmz1nzwrskfcfws8hwizd7"; + libraryHaskellDepends = [ + aeson base containers data-default directory extra filepath ghcide + hls-plugin-api lens lsp-test lsp-types tasty-hunit text + ]; + description = "Test utils for ghcide"; + license = lib.licenses.asl20; + }) {}; + "ghcjs-ajax" = callPackage ({ mkDerivation, aeson, base, http-types, text }: mkDerivation { @@ -121039,18 +121259,40 @@ self: { mainProgram = "gtk-sni-tray-standalone"; }) {inherit (pkgs) gtk3;}; - "gtk-strut" = callPackage - ({ mkDerivation, base, gi-gdk, gi-gtk, text, transformers }: + "gtk-sni-tray_0_1_8_1" = callPackage + ({ mkDerivation, base, bytestring, containers, dbus, dbus-hslogger + , directory, enclosed-exceptions, filepath, gi-cairo + , gi-cairo-connector, gi-cairo-render, gi-dbusmenugtk3, gi-gdk + , gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut, gtk3, haskell-gi + , haskell-gi-base, hslogger, optparse-applicative + , status-notifier-item, text, transformers, transformers-base, unix + }: mkDerivation { - pname = "gtk-strut"; - version = "0.1.3.0"; - sha256 = "19p3w1zvnaazfd01yy4cl00sl53xc7kqgqhsw7l3psadmwk6x4w1"; - libraryHaskellDepends = [ base gi-gdk gi-gtk text transformers ]; - description = "Libary for creating strut windows with gi-gtk"; + pname = "gtk-sni-tray"; + version = "0.1.8.1"; + sha256 = "0i131ks6m5akgcfahcbfqhg1i5dxz0y6rba3is4s3m5va6spp5yf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers dbus directory enclosed-exceptions + filepath gi-cairo gi-cairo-connector gi-cairo-render + gi-dbusmenugtk3 gi-gdk gi-gdkpixbuf gi-glib gi-gtk gtk-strut + haskell-gi haskell-gi-base hslogger status-notifier-item text + transformers transformers-base unix + ]; + libraryPkgconfigDepends = [ gtk3 ]; + executableHaskellDepends = [ + base dbus dbus-hslogger gi-gdk gi-gtk gtk-strut hslogger + optparse-applicative status-notifier-item text unix + ]; + description = "A standalone StatusNotifierItem/AppIndicator tray"; license = lib.licenses.bsd3; - }) {}; + badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; + mainProgram = "gtk-sni-tray-standalone"; + }) {inherit (pkgs) gtk3;}; - "gtk-strut_0_1_3_1" = callPackage + "gtk-strut" = callPackage ({ mkDerivation, base, data-default, gi-gdk, gi-gtk, hslogger, text , transformers }: @@ -121063,6 +121305,21 @@ self: { ]; description = "Libary for creating strut windows with gi-gtk"; license = lib.licenses.bsd3; + }) {}; + + "gtk-strut_0_1_3_2" = callPackage + ({ mkDerivation, base, data-default, gi-gdk, gi-gtk, hslogger, text + , transformers + }: + mkDerivation { + pname = "gtk-strut"; + version = "0.1.3.2"; + sha256 = "0rymacvllin8ni2fd7yyfq43rbbyb921c4nm4z7aa2z82fsrkw3q"; + libraryHaskellDepends = [ + base data-default gi-gdk gi-gtk hslogger text transformers + ]; + description = "Library for creating strut windows with gi-gtk"; + license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -123953,8 +124210,8 @@ self: { pname = "hakyll"; version = "4.15.1.1"; sha256 = "0b3bw275q1xbx8qs9a6gzzs3c9z3qdj7skqhpp09jkchi5kdvhvi"; - revision = "6"; - editedCabalFile = "0vkss84dm4fgx94r2wrv1z5mk515am6vbd2y66v44vl7fcr23q83"; + revision = "7"; + editedCabalFile = "0xgcrv98yxf7hjwq2ivg1lcipr3q5f5civp5r6kaq7ygnhggy2w9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -124020,8 +124277,8 @@ self: { }: mkDerivation { pname = "hakyll-alectryon"; - version = "0.1.1.0"; - sha256 = "1gl6ps6zjdlrc2japw1r2k9fg0ar5r8qirk9v3r78wxjw6p6g2qi"; + version = "0.1.2.0"; + sha256 = "0f1jznfr79z3y1zpi30abvcc0i3ylif1aa30wldj7ghpdxsvrjpb"; libraryHaskellDepends = [ aeson base bytestring filepath hakyll mtl optparse-applicative pandoc pandoc-types process text @@ -128206,33 +128463,44 @@ self: { ({ mkDerivation, aeson, aeson-pretty, async, base , base16-bytestring, binary, bytestring, containers , cryptohash-sha1, data-default, deepseq, directory, extra - , filepath, ghc, ghc-boot-th, ghc-paths, ghcide, githash, gitrev - , hashable, hie-bios, hiedb, hls-alternate-number-format-plugin - , hls-call-hierarchy-plugin, hls-change-type-signature-plugin - , hls-class-plugin, hls-eval-plugin, hls-explicit-imports-plugin - , hls-floskell-plugin, hls-fourmolu-plugin, hls-graph - , hls-haddock-comments-plugin, hls-hlint-plugin + , filepath, ghc, ghc-boot-th, ghc-paths, ghcide, ghcide-bench + , githash, gitrev, hashable, hie-bios, hiedb + , hls-alternate-number-format-plugin, hls-call-hierarchy-plugin + , hls-change-type-signature-plugin, hls-class-plugin + , hls-code-range-plugin, hls-eval-plugin + , hls-explicit-fixity-plugin, hls-explicit-imports-plugin + , hls-floskell-plugin, hls-fourmolu-plugin, hls-gadt-plugin + , hls-graph, hls-haddock-comments-plugin, hls-hlint-plugin , hls-module-name-plugin, hls-ormolu-plugin, hls-plugin-api , hls-pragmas-plugin, hls-qualify-imported-names-plugin - , hls-refine-imports-plugin, hls-rename-plugin, hls-retrie-plugin - , hls-selection-range-plugin, hls-splice-plugin, hls-test-utils - , hspec-expectations, lens, lens-aeson, lsp, lsp-test, lsp-types - , mtl, optparse-applicative, optparse-simple, prettyprinter - , process, regex-tdfa, safe-exceptions, sqlite-simple, stm - , temporary, text, transformers, unix, unordered-containers + , hls-refactor-plugin, hls-refine-imports-plugin, hls-rename-plugin + , hls-retrie-plugin, hls-splice-plugin, hls-stylish-haskell-plugin + , hls-tactics-plugin, hls-test-utils, hp2pretty, hslogger + , hspec-expectations, implicit-hie, lens, lens-aeson, lsp, lsp-test + , lsp-types, mtl, optparse-applicative, optparse-simple + , prettyprinter, process, regex-tdfa, safe-exceptions, shake + , shake-bench, sqlite-simple, stm, temporary, text, transformers + , unix, unliftio-core, unordered-containers, yaml }: mkDerivation { pname = "haskell-language-server"; - version = "1.7.0.0"; - sha256 = "1p5dr5j7vl86a4ig6y6cxf7rk8lswxsdxq9029sydghnyl3kaf3f"; - revision = "1"; - editedCabalFile = "0ds5za9xgn5qgmzdy0rps0ywsqy3f12szmi77kwv61lp4y7khwpv"; + version = "1.8.0.0"; + sha256 = "0jmc9qfqq5r7skajma6vd84p7vj8a7k37mk7yzwrqs66f48wcc54"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson-pretty async base base16-bytestring bytestring containers cryptohash-sha1 data-default directory extra filepath ghc ghcide - githash hie-bios hiedb hls-graph hls-plugin-api lsp + githash hie-bios hiedb hls-alternate-number-format-plugin + hls-call-hierarchy-plugin hls-change-type-signature-plugin + hls-class-plugin hls-code-range-plugin hls-eval-plugin + hls-explicit-fixity-plugin hls-explicit-imports-plugin + hls-floskell-plugin hls-fourmolu-plugin hls-gadt-plugin hls-graph + hls-haddock-comments-plugin hls-hlint-plugin hls-module-name-plugin + hls-ormolu-plugin hls-plugin-api hls-pragmas-plugin + hls-qualify-imported-names-plugin hls-refactor-plugin + hls-refine-imports-plugin hls-rename-plugin hls-retrie-plugin + hls-splice-plugin hls-stylish-haskell-plugin hls-tactics-plugin lsp optparse-applicative optparse-simple prettyprinter process safe-exceptions sqlite-simple text unordered-containers ]; @@ -128240,25 +128508,24 @@ self: { aeson async base base16-bytestring binary bytestring containers cryptohash-sha1 data-default deepseq directory extra filepath ghc ghc-boot-th ghc-paths ghcide gitrev hashable hie-bios hiedb - hls-alternate-number-format-plugin hls-call-hierarchy-plugin - hls-change-type-signature-plugin hls-class-plugin hls-eval-plugin - hls-explicit-imports-plugin hls-floskell-plugin hls-fourmolu-plugin - hls-graph hls-haddock-comments-plugin hls-hlint-plugin - hls-module-name-plugin hls-ormolu-plugin hls-plugin-api - hls-pragmas-plugin hls-qualify-imported-names-plugin - hls-refine-imports-plugin hls-rename-plugin hls-retrie-plugin - hls-selection-range-plugin hls-splice-plugin lens lsp mtl + hls-graph hls-plugin-api hslogger lens lsp lsp-types mtl optparse-applicative optparse-simple prettyprinter process regex-tdfa safe-exceptions sqlite-simple stm temporary text - transformers unix unordered-containers + transformers unix unliftio-core unordered-containers ]; testHaskellDepends = [ aeson base bytestring containers data-default directory extra - filepath ghcide hls-plugin-api hls-test-utils hspec-expectations - lens lens-aeson lsp-test lsp-types prettyprinter process text - unordered-containers + filepath ghcide hls-plugin-api hls-refactor-plugin hls-test-utils + hspec-expectations lens lens-aeson lsp-test lsp-types prettyprinter + process text unordered-containers ]; testToolDepends = [ ghcide ]; + benchmarkHaskellDepends = [ + aeson base containers data-default directory extra filepath + ghcide-bench hls-plugin-api lens lens-aeson optparse-applicative + shake shake-bench text yaml + ]; + benchmarkToolDepends = [ ghcide-bench hp2pretty implicit-hie ]; description = "LSP server for GHC"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.maralorn ]; @@ -128974,6 +129241,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "haskell-src-meta_0_8_11" = callPackage + ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty + , syb, tasty, tasty-hunit, template-haskell, th-orphans + }: + mkDerivation { + pname = "haskell-src-meta"; + version = "0.8.11"; + sha256 = "1wks0xb7ah2gj9n0ffbcaskjihy45l99qkf2h9k13cyfvqkzp9rw"; + libraryHaskellDepends = [ + base haskell-src-exts pretty syb template-haskell th-orphans + ]; + testHaskellDepends = [ + base containers haskell-src-exts HUnit pretty syb tasty tasty-hunit + template-haskell + ]; + description = "Parse source to template-haskell abstract syntax"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "haskell-src-meta-mwotton" = callPackage ({ mkDerivation, base, containers, ghc-prim, haskell-src-exts , pretty, syb, template-haskell @@ -130238,8 +130525,8 @@ self: { }: mkDerivation { pname = "haskintex"; - version = "0.8.0.0"; - sha256 = "1n6xbk8mc4n7a7w9hw2q21ya784jd2wqfvx54iqz9fik5w8p8jcx"; + version = "0.8.0.1"; + sha256 = "12q6j9z7hwb93sli4wk4lidlf3m7y3dazpp5ymvpbxnb7wjzirr6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131445,22 +131732,24 @@ self: { license = lib.licenses.mit; }) {}; - "hasql_1_6_1_1" = callPackage - ({ mkDerivation, attoparsec, base, bytestring + "hasql_1_6_1_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring , bytestring-strict-builder, contravariant, contravariant-extras - , dlist, gauge, hashable, hashtables, mtl, postgresql-binary - , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances - , rerebase, tasty, tasty-hunit, tasty-quickcheck, text - , text-builder, transformers, vector + , dlist, gauge, hashable, hashtables, mtl, network-ip + , postgresql-binary, postgresql-libpq, profunctors, QuickCheck + , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit + , tasty-quickcheck, text, text-builder, time, transformers, uuid + , vector }: mkDerivation { pname = "hasql"; - version = "1.6.1.1"; - sha256 = "1m78v3j9mx3cr40m45343h1ff5vy09pb46pjhc72vm30dmxg0259"; + version = "1.6.1.3"; + sha256 = "0bqsv0g7kv2wb9inx7gbrasdyw03nyjjjdv1x8jghcdgz0nhb1jn"; libraryHaskellDepends = [ - attoparsec base bytestring bytestring-strict-builder contravariant - dlist hashable hashtables mtl postgresql-binary postgresql-libpq - profunctors text text-builder transformers vector + aeson attoparsec base bytestring bytestring-strict-builder + contravariant dlist hashable hashtables mtl network-ip + postgresql-binary postgresql-libpq profunctors scientific text + text-builder time transformers uuid vector ]; testHaskellDepends = [ contravariant-extras QuickCheck quickcheck-instances rerebase tasty @@ -133334,8 +133623,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "hcom"; - version = "0.0.0.5"; - sha256 = "02f959qd7gm5gpa8w39hqj5a8pn6gizjif7rr7mwlq8g3gsq8gsk"; + version = "0.0.0.6"; + sha256 = "1793wnjrny1nydqnbvvh1wsq9qnnknf80fmpxvz281mdpjz6n1h2"; doHaddock = false; description = "Haskell COM support library"; license = lib.licenses.bsd3; @@ -137390,8 +137679,8 @@ self: { }: mkDerivation { pname = "hhp"; - version = "1.0.0"; - sha256 = "0jwn10k2v3i8w57mx5w8czvgaw483dp9fdf1w214qr9dz654sb9a"; + version = "1.0.1"; + sha256 = "0926x82vbndj3mahh7pix0gfc5jjr1yl499ggkgfdc55mykr4bn9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -137650,7 +137939,7 @@ self: { mainProgram = "hie-bios"; }) {}; - "hie-bios_0_10_0" = callPackage + "hie-bios_0_11_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , co-log-core, conduit, conduit-extra, containers, cryptohash-sha1 , deepseq, directory, exceptions, extra, file-embed, filepath, ghc @@ -137660,10 +137949,8 @@ self: { }: mkDerivation { pname = "hie-bios"; - version = "0.10.0"; - sha256 = "0k9d106y46dqwr5dw6yzmqvb03gshlp6qbzznz67qkwbkj2calyz"; - revision = "1"; - editedCabalFile = "1brqph8n754kv0jgrjg12jhgpzsx92m5jafx8wjnm5gf2ri7ip8h"; + version = "0.11.0"; + sha256 = "1vqfbyi1jlgzrvl9njgdhvj1hp0b7rl4xpchyldpf179151vy24p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137679,7 +137966,7 @@ self: { ]; testHaskellDepends = [ aeson base directory extra filepath ghc tagged tasty - tasty-expected-failure tasty-hunit temporary text + tasty-expected-failure tasty-hunit temporary text transformers unordered-containers yaml ]; description = "Set up a GHC API session"; @@ -137694,8 +137981,8 @@ self: { }: mkDerivation { pname = "hie-compat"; - version = "0.2.1.1"; - sha256 = "054ll31b2j31a2yjcz7q7zxqyyszrkbaz4kzxhih4k84v9h0nhk6"; + version = "0.3.0.0"; + sha256 = "169175gn1699k2w7w8ific49qmvw8h1gh585k3pzfwb921lyj0mb"; libraryHaskellDepends = [ array base bytestring containers directory filepath ghc ghc-boot transformers @@ -137750,10 +138037,8 @@ self: { }: mkDerivation { pname = "hiedb"; - version = "0.4.1.0"; - sha256 = "1389qmlga5rq8has02rn35pzag5wnfpx3w77r60mzl3b4pkpzi7i"; - revision = "3"; - editedCabalFile = "0y6vsx4n3hbpbl6d9qpb5d40s2rh0pkqm76gnjvx045zvrdkxi66"; + version = "0.4.2.0"; + sha256 = "025rc75wfb3dpnxrd5r3jvxm8x1wpb3m0zya69y78pbama753jlw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138879,6 +139164,20 @@ self: { mainProgram = "hipsql-demo-server"; }) {}; + "hipsql-tx-simple" = callPackage + ({ mkDerivation, base, hipsql-monad, hipsql-server + , postgresql-simple, postgresql-tx + }: + mkDerivation { + pname = "hipsql-tx-simple"; + version = "0.0.0.0"; + sha256 = "17ab2k9q7d5xqjbqr6r22xlgi3hnw20cq1lw2ambhvzwdlb0z9kw"; + libraryHaskellDepends = [ + base hipsql-monad hipsql-server postgresql-simple postgresql-tx + ]; + license = lib.licenses.bsd3; + }) {}; + "hircules" = callPackage ({ mkDerivation, base, containers, directory, gtk, mtl, network , old-locale, old-time, time, utf8-string @@ -139414,10 +139713,8 @@ self: { ({ mkDerivation, base, some }: mkDerivation { pname = "hkd"; - version = "0.1"; - sha256 = "1xz0i8lkh0rp55b0s7npkzqgyz9pf1bwq9b66cwbg073r9sz41wa"; - revision = "4"; - editedCabalFile = "08qjy1616ypa6r0jwh5m66dlvnj87k4cdcggi28caadzg8cf1fz5"; + version = "0.2"; + sha256 = "1sq0w5n6y7m2qqpl9s04hsg14qc7p8xrj4x1s1lhw9qbapwb8g8w"; libraryHaskellDepends = [ base some ]; testHaskellDepends = [ base some ]; description = "\"higher-kinded data\""; @@ -139463,12 +139760,12 @@ self: { }) {}; "hkd-records" = callPackage - ({ mkDerivation, base, hkd, text }: + ({ mkDerivation, base, hkd, template-haskell, text }: mkDerivation { pname = "hkd-records"; - version = "0.0.2"; - sha256 = "1404c3gqrk2i0ab67v12h5khcghbkad7cyphfmp6kkn8d5smpz1m"; - libraryHaskellDepends = [ base hkd text ]; + version = "0.0.6"; + sha256 = "0wgavxkpsk9qmqz1vnabr2bi679pd8sfn1kpf5s73bsq81mif09h"; + libraryHaskellDepends = [ base hkd template-haskell text ]; description = "higher kinded record operations"; license = lib.licenses.bsd3; }) {}; @@ -140490,8 +140787,8 @@ self: { }: mkDerivation { pname = "hls-alternate-number-format-plugin"; - version = "1.1.0.0"; - sha256 = "1s81p2jnln8v8ny13cf26d9925lfcyhs5di5xbh3p9645ngdiy9h"; + version = "1.2.0.0"; + sha256 = "1rwb24nnwqgqm08yq8737sfan3zvfnccympjrnfjqdj0xihb77j0"; libraryHaskellDepends = [ aeson base containers ghc-boot-th ghcide hie-compat hls-graph hls-plugin-api lens lsp mtl regex-tdfa syb text @@ -140512,8 +140809,8 @@ self: { }: mkDerivation { pname = "hls-brittany-plugin"; - version = "1.0.2.1"; - sha256 = "0f86iymcinbad9cpghi7965xhv4ky6kq4jqsn7nndq2jklwgrw7i"; + version = "1.0.2.2"; + sha256 = "0spr7qmqjkg0aqr16cp9pi5dqc10lskhqa6mpx49z0rifhk84hay"; libraryHaskellDepends = [ base brittany czipwith extra filepath ghc-boot-th ghc-exactprint ghcide hls-plugin-api lens lsp-types text transformers @@ -140530,8 +140827,8 @@ self: { }: mkDerivation { pname = "hls-call-hierarchy-plugin"; - version = "1.0.3.0"; - sha256 = "0yfl75d2ddkzrz3p1pn8spra0qssqazsqklan46zmagrv69yg5iv"; + version = "1.1.0.0"; + sha256 = "1010lwrgp3qs3i9rpsphfiq72d8qisvz4jn9rn09h1wdc10bl7sg"; libraryHaskellDepends = [ aeson base bytestring containers extra ghc ghcide hiedb hls-plugin-api lens lsp sqlite-simple text unordered-containers @@ -140551,10 +140848,8 @@ self: { }: mkDerivation { pname = "hls-change-type-signature-plugin"; - version = "1.0.1.0"; - sha256 = "0wl4vgml491gkvzmsfj3nlwx18ywvrdwgwdkqjp0rwid0pidd6z8"; - revision = "1"; - editedCabalFile = "0kz9zrjrpy5c84mj45spf75sklyhlvfdl5v526bpaiaphihzbr80"; + version = "1.0.1.1"; + sha256 = "1sgnx7jl7cfklds2vka4sbrc7462spmjfhw34r7kn52m1079x1k2"; libraryHaskellDepends = [ base ghcide hls-plugin-api lsp-types regex-tdfa syb text transformers unordered-containers @@ -140567,25 +140862,49 @@ self: { }) {}; "hls-class-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, filepath, ghc - , ghc-exactprint, ghcide, hls-plugin-api, hls-test-utils, lens, lsp - , lsp-types, text, transformers + ({ mkDerivation, aeson, base, containers, deepseq, extra, filepath + , ghc, ghc-boot-th, ghc-exactprint, ghcide, hls-graph + , hls-plugin-api, hls-test-utils, lens, lsp, lsp-types, text + , transformers }: mkDerivation { pname = "hls-class-plugin"; - version = "1.0.3.0"; - sha256 = "0ad7ypw7d8waz3nq9p6m8l91rcibd2fzxxmdrpncwshiyrhazq3l"; + version = "1.1.0.0"; + sha256 = "049vz69a0xfbc8b3lhf35lcss2pig7nrln6k7n2y5f28dhb3dy00"; libraryHaskellDepends = [ - aeson base containers ghc ghc-exactprint ghcide hls-plugin-api lens - lsp text transformers + aeson base containers deepseq extra ghc ghc-boot-th ghc-exactprint + ghcide hls-graph hls-plugin-api lens lsp text transformers ]; testHaskellDepends = [ - base filepath hls-test-utils lens lsp-types + aeson base filepath ghcide hls-plugin-api hls-test-utils lens + lsp-types ]; description = "Class/instance management plugin for Haskell Language Server"; license = lib.licenses.asl20; }) {}; + "hls-code-range-plugin" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , extra, filepath, ghcide, hashable, hls-plugin-api, hls-test-utils + , lens, lsp, lsp-test, mtl, semigroupoids, tasty-hunit, text + , transformers, vector + }: + mkDerivation { + pname = "hls-code-range-plugin"; + version = "1.0.0.0"; + sha256 = "1jk0nklplwbdikp1y5r1w7l0ab3i28isibdd15prcxjf98rsp8m9"; + libraryHaskellDepends = [ + aeson base containers deepseq extra ghcide hashable hls-plugin-api + lens lsp mtl semigroupoids text transformers vector + ]; + testHaskellDepends = [ + base bytestring containers filepath ghcide hls-test-utils lens lsp + lsp-test tasty-hunit text transformers vector + ]; + description = "HLS Plugin to support smart selection range"; + license = lib.licenses.asl20; + }) {}; + "hls-eval-plugin" = callPackage ({ mkDerivation, aeson, base, containers, data-default, deepseq , Diff, directory, dlist, extra, filepath, ghc, ghc-boot-th @@ -140596,10 +140915,8 @@ self: { }: mkDerivation { pname = "hls-eval-plugin"; - version = "1.2.2.0"; - sha256 = "17si94yzxz19hcddn57wf0npxc9m9vzb08b2gph7pkbxprsksb6g"; - revision = "1"; - editedCabalFile = "1hilh189fmqbm65cmsn2j70n83dq356xq1r6mf893chxwins57p3"; + version = "1.3.0.0"; + sha256 = "0nzrlggabh8s822zc0hirqj943f9b7hkd45yl3dhf2vkgxwm377s"; libraryHaskellDepends = [ aeson base containers data-default deepseq Diff directory dlist extra filepath ghc ghc-boot-th ghc-paths ghcide hashable hls-graph @@ -140634,6 +140951,23 @@ self: { broken = true; }) {}; + "hls-explicit-fixity-plugin" = callPackage + ({ mkDerivation, base, containers, deepseq, extra, filepath, ghc + , ghcide, hashable, hls-plugin-api, hls-test-utils, lsp, text + }: + mkDerivation { + pname = "hls-explicit-fixity-plugin"; + version = "1.0.0.0"; + sha256 = "0nwfx9k6yaja3qm2s3bckyfl7qagfb1cly602xcrzrc85q1zg4lx"; + libraryHaskellDepends = [ + base containers deepseq extra ghc ghcide hashable hls-plugin-api + lsp text + ]; + testHaskellDepends = [ base filepath hls-test-utils text ]; + description = "Show fixity explicitly while hovering"; + license = lib.licenses.asl20; + }) {}; + "hls-explicit-imports-plugin" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, filepath, ghc , ghcide, hls-graph, hls-plugin-api, hls-test-utils, lsp, text @@ -140641,8 +140975,8 @@ self: { }: mkDerivation { pname = "hls-explicit-imports-plugin"; - version = "1.1.0.0"; - sha256 = "1r5cy59xk35d6smnrka42hxfa012h45nvsmlr1a1kbyac8ywzf6m"; + version = "1.1.0.1"; + sha256 = "0xdh9mvhdq9cgw33gi6q46ik010d6mv5acxj07pwca48dks3c2bx"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide hls-graph hls-plugin-api lsp text unordered-containers @@ -140658,8 +140992,8 @@ self: { }: mkDerivation { pname = "hls-floskell-plugin"; - version = "1.0.1.1"; - sha256 = "01c8xwfdgx5g5ipb366q0smjisyq1dfjz7scjfg5p3lyn0v555wb"; + version = "1.0.1.2"; + sha256 = "06klnrgz6jsxxsy4gpf2mcnbj35kd9gp3xy9l0pyhki14fhi5y4p"; libraryHaskellDepends = [ base floskell ghcide hls-plugin-api lsp-types text transformers ]; @@ -140675,10 +141009,8 @@ self: { }: mkDerivation { pname = "hls-fourmolu-plugin"; - version = "1.0.3.0"; - sha256 = "103rndxbmv72ghbh685766498j9rqnmgdwsrswk5nrf7afwd9x8w"; - revision = "1"; - editedCabalFile = "1y7jbjzi68x8xxqwhczn4z4nqis2gczggzv65fyvxhlzympsrg28"; + version = "1.1.0.0"; + sha256 = "1b3yzzg7lkf57qlv8hr7y15kd88dxijzxhardi27l4p6kh2bv1r1"; libraryHaskellDepends = [ base filepath fourmolu ghc ghc-boot-th ghcide hls-plugin-api lens lsp process-extras text @@ -140692,28 +141024,50 @@ self: { license = lib.licenses.asl20; }) {}; + "hls-gadt-plugin" = callPackage + ({ mkDerivation, aeson, base, containers, extra, filepath, ghc + , ghc-boot-th, ghc-exactprint, ghcide, hls-plugin-api + , hls-refactor-plugin, hls-test-utils, lens, lsp, lsp-test, mtl + , text, transformers, unordered-containers + }: + mkDerivation { + pname = "hls-gadt-plugin"; + version = "1.0.0.0"; + sha256 = "09k1ykb7694v9zmhr78dwbwdp33zvs3vnbq02hsinchhaqb3xj54"; + libraryHaskellDepends = [ + aeson base containers extra ghc ghc-boot-th ghc-exactprint ghcide + hls-plugin-api hls-refactor-plugin lens lsp mtl text transformers + unordered-containers + ]; + testHaskellDepends = [ + base filepath hls-test-utils lens lsp lsp-test text + ]; + description = "Convert to GADT syntax plugin"; + license = lib.licenses.asl20; + }) {}; + "hls-graph" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , deepseq, directory, exceptions, extra, filepath, focus, hashable , hspec, hspec-discover, js-dgtable, js-flot, js-jquery, list-t , primitive, stm, stm-containers, tasty, tasty-hspec, tasty-hunit - , tasty-rerun, text, time, transformers, unordered-containers + , tasty-rerun, text, time, transformers, unliftio + , unordered-containers }: mkDerivation { pname = "hls-graph"; - version = "1.7.0.0"; - sha256 = "1mq1pvn5z8fnlsj9iqck05shm8fak9zf05mbcbrxb5jvq0a31ypd"; - revision = "1"; - editedCabalFile = "090jis882l9pjg6dlw8dbf7qzq4g2rbrfwkl96rk7p4yw0hdgd01"; + version = "1.8.0.0"; + sha256 = "02lliak6nn2cjah0xvwgxb2gsryckgqjly064p4x7f10anrfw62a"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson async base bytestring containers deepseq directory exceptions extra filepath focus hashable js-dgtable js-flot js-jquery list-t - primitive stm stm-containers time transformers unordered-containers + primitive stm stm-containers time transformers unliftio + unordered-containers ]; testHaskellDepends = [ base containers directory extra filepath hspec stm stm-containers - tasty tasty-hspec tasty-hunit tasty-rerun text + tasty tasty-hspec tasty-hunit tasty-rerun text unordered-containers ]; testToolDepends = [ hspec-discover ]; description = "Haskell Language Server internal graph API"; @@ -140722,18 +141076,16 @@ self: { "hls-haddock-comments-plugin" = callPackage ({ mkDerivation, base, containers, filepath, ghc, ghc-exactprint - , ghcide, hls-plugin-api, hls-test-utils, lsp-types, text - , unordered-containers + , ghcide, hls-plugin-api, hls-refactor-plugin, hls-test-utils + , lsp-types, text, unordered-containers }: mkDerivation { pname = "hls-haddock-comments-plugin"; - version = "1.0.1.0"; - sha256 = "1jlz6vg5ff2j2vba4yg8nymxfs7vmg5h3kzjhsj6bs2jn8kh722r"; - revision = "2"; - editedCabalFile = "0dq2in2cn0wdhn6m8zd10g3hmc23rnl40jss19fvifn0k8lcsqpb"; + version = "1.1.0.0"; + sha256 = "0g0vwn5mcl4g1gxzg501mchxyyqwz83hjhqzai33qsmklcmnk5rc"; libraryHaskellDepends = [ - base containers ghc ghc-exactprint ghcide hls-plugin-api lsp-types - text unordered-containers + base containers ghc ghc-exactprint ghcide hls-plugin-api + hls-refactor-plugin lsp-types text unordered-containers ]; testHaskellDepends = [ base filepath hls-test-utils text ]; description = "Haddock comments plugin for Haskell Language Server"; @@ -140743,18 +141095,18 @@ self: { "hls-hlint-plugin" = callPackage ({ mkDerivation, aeson, apply-refact, base, binary, bytestring , containers, data-default, deepseq, Diff, directory, extra - , filepath, ghc, ghc-exactprint, ghc-lib-parser-ex, ghcide - , hashable, hlint, hls-plugin-api, hls-test-utils, hslogger, lens - , lsp, lsp-types, refact, regex-tdfa, stm, temporary, text + , filepath, ghc-exactprint, ghc-lib-parser, ghc-lib-parser-ex + , ghcide, hashable, hlint, hls-plugin-api, hls-test-utils, hslogger + , lens, lsp, lsp-types, refact, regex-tdfa, stm, temporary, text , transformers, unordered-containers }: mkDerivation { pname = "hls-hlint-plugin"; - version = "1.0.4.0"; - sha256 = "089pa1fg4ygc39a70g6x1ma1fci6jrkypg7hsmq4gf3h2rwiyvwy"; + version = "1.1.0.0"; + sha256 = "1xr6ayzjd12y6l3dd8azlgks7fsiy87z5n14grf7yw65pdfrvgni"; libraryHaskellDepends = [ aeson apply-refact base binary bytestring containers data-default - deepseq Diff directory extra filepath ghc ghc-exactprint + deepseq Diff directory extra filepath ghc-exactprint ghc-lib-parser ghc-lib-parser-ex ghcide hashable hlint hls-plugin-api hslogger lens lsp refact regex-tdfa stm temporary text transformers unordered-containers @@ -140774,8 +141126,8 @@ self: { }: mkDerivation { pname = "hls-module-name-plugin"; - version = "1.0.2.0"; - sha256 = "09548l8vmfq2y83agsr12w0x82drhmwa4bxpwby0mf466f4hj8da"; + version = "1.1.0.0"; + sha256 = "1xjj1sbq3a71z37dcsgv0cd3qjklm4fl5grnivprgywa71a8k201"; libraryHaskellDepends = [ aeson base directory filepath ghcide hls-plugin-api lsp text transformers unordered-containers @@ -140792,8 +141144,8 @@ self: { }: mkDerivation { pname = "hls-ormolu-plugin"; - version = "1.0.2.1"; - sha256 = "1if4gahvdayx1ar4wxi4mk074zxpx6wzkwdd64fnri4k5xb15sa7"; + version = "1.0.2.2"; + sha256 = "063sy86mkrjnhycwq7ifbm3w0h7wc2df8wm3p4wd45mpk9r0cqsb"; libraryHaskellDepends = [ base filepath ghc ghc-boot-th ghcide hls-plugin-api lens lsp ormolu text @@ -140805,20 +141157,19 @@ self: { "hls-plugin-api" = callPackage ({ mkDerivation, aeson, base, containers, data-default - , dependent-map, dependent-sum, Diff, dlist, extra, ghc, hashable - , hls-graph, lens, lens-aeson, lsp, lsp-types, opentelemetry - , optparse-applicative, process, regex-tdfa, tasty, tasty-hunit - , tasty-rerun, text, transformers, unix, unordered-containers + , dependent-map, dependent-sum, Diff, dlist, extra, filepath, ghc + , hashable, hls-graph, lens, lens-aeson, lsp, lsp-types + , opentelemetry, optparse-applicative, process, regex-tdfa, tasty + , tasty-hunit, tasty-rerun, text, transformers, unix + , unordered-containers }: mkDerivation { pname = "hls-plugin-api"; - version = "1.4.0.0"; - sha256 = "0yk2y6qw88vhww8z10d2kgn57wsarfnp6z1gmjl1ik2w96a8g3mv"; - revision = "1"; - editedCabalFile = "0mqwnvq892qa793pv68fsfhnkysm386vrkyx28qaaraqfnbxkysn"; + version = "1.5.0.0"; + sha256 = "0vw3bldcrhmq0xfj5k07p67rz0w05ls542q18429g2ikxqyw1rz5"; libraryHaskellDepends = [ aeson base containers data-default dependent-map dependent-sum Diff - dlist extra ghc hashable hls-graph lens lens-aeson lsp + dlist extra filepath ghc hashable hls-graph lens lens-aeson lsp opentelemetry optparse-applicative process regex-tdfa text transformers unix unordered-containers ]; @@ -140836,10 +141187,8 @@ self: { }: mkDerivation { pname = "hls-pragmas-plugin"; - version = "1.0.2.1"; - sha256 = "11l79214wz21v7plqf2wb6ac8bgw74fhql1p5cvkv8gr80hpb4jk"; - revision = "1"; - editedCabalFile = "0xg7jv31yh6mm4awg759wh792jfca48za133bfs2g2877vf2llzj"; + version = "1.0.3.0"; + sha256 = "17fnfndym9w689rp6l7xb3qfb9i603blr52s0qyznmbkdk2l81kl"; libraryHaskellDepends = [ base containers extra fuzzy ghc ghcide hls-plugin-api lens lsp text transformers unordered-containers @@ -140871,6 +141220,35 @@ self: { license = lib.licenses.asl20; }) {}; + "hls-refactor-plugin" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , data-default, deepseq, directory, dlist, extra, filepath, ghc + , ghc-boot, ghc-exactprint, ghcide, ghcide-test-utils, hls-graph + , hls-plugin-api, hls-test-utils, lens, lsp, lsp-test, lsp-types + , mtl, network-uri, parser-combinators, regex-tdfa, retrie, shake + , syb, tasty, tasty-expected-failure, tasty-hunit, tasty-rerun + , text, text-rope, time, transformers, unordered-containers + }: + mkDerivation { + pname = "hls-refactor-plugin"; + version = "1.0.0.0"; + sha256 = "0gn35af8yfdaq7dnbc8x0p79jf2lxs1wvka8xcjcclg3sxji04d1"; + libraryHaskellDepends = [ + aeson base bytestring containers data-default deepseq dlist extra + ghc ghc-boot ghc-exactprint ghcide hls-graph hls-plugin-api lens + lsp mtl regex-tdfa retrie syb text text-rope time transformers + unordered-containers + ]; + testHaskellDepends = [ + aeson async base containers data-default directory extra filepath + ghcide ghcide-test-utils hls-plugin-api hls-test-utils lens + lsp-test lsp-types network-uri parser-combinators regex-tdfa shake + tasty tasty-expected-failure tasty-hunit tasty-rerun text text-rope + ]; + description = "Exactprint refactorings for Haskell Language Server"; + license = lib.licenses.asl20; + }) {}; + "hls-refine-imports-plugin" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, filepath, ghc , ghcide, hls-explicit-imports-plugin, hls-graph, hls-plugin-api @@ -140878,8 +141256,8 @@ self: { }: mkDerivation { pname = "hls-refine-imports-plugin"; - version = "1.0.2.0"; - sha256 = "01hgz66dm6rpk7fp6b2byzvnaan3snvimkicl67c6qxla9dpxcjn"; + version = "1.0.3.0"; + sha256 = "1rw9vdpzg63506b289rar0csdqniv1alc37q33x9x65qlvkqf9dh"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide hls-explicit-imports-plugin hls-graph hls-plugin-api lsp text @@ -140893,17 +141271,17 @@ self: { "hls-rename-plugin" = callPackage ({ mkDerivation, aeson, base, containers, extra, filepath, ghc , ghc-exactprint, ghcide, hashable, hiedb, hls-plugin-api - , hls-test-utils, lsp, lsp-types, mod, syb, text, transformers - , unordered-containers + , hls-refactor-plugin, hls-test-utils, lsp, lsp-types, mod, syb + , text, transformers, unordered-containers }: mkDerivation { pname = "hls-rename-plugin"; - version = "1.0.0.2"; - sha256 = "1cqcyyh4ywxwl2wppdacp2y6hpbl5534vq8xw2ih489qczcg6s78"; + version = "1.0.1.0"; + sha256 = "0619vjcyfdjln5v2gc6hpdvl5lwx8kg97zlqpz937742q6bvkb66"; libraryHaskellDepends = [ base containers extra ghc ghc-exactprint ghcide hashable hiedb - hls-plugin-api lsp lsp-types mod syb text transformers - unordered-containers + hls-plugin-api hls-refactor-plugin lsp lsp-types mod syb text + transformers unordered-containers ]; testHaskellDepends = [ aeson base containers filepath hls-plugin-api hls-test-utils @@ -140920,8 +141298,8 @@ self: { }: mkDerivation { pname = "hls-retrie-plugin"; - version = "1.0.2.1"; - sha256 = "1vl7kdw8sm9r5q35lnihq0r98wd2s3mm76c7wp0cwd55qdkaf7qv"; + version = "1.0.2.2"; + sha256 = "19ljig86aw5y0f6w83wgl5aazybh6nlzmigy12p5ldnbl027r4ry"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory extra ghc ghcide hashable hls-plugin-api lsp lsp-types retrie safe-exceptions stm @@ -140957,25 +141335,33 @@ self: { "hls-splice-plugin" = callPackage ({ mkDerivation, aeson, base, containers, dlist, extra, filepath , foldl, ghc, ghc-exactprint, ghcide, hls-plugin-api - , hls-test-utils, lens, lsp, retrie, syb, text, transformers - , unliftio-core, unordered-containers + , hls-refactor-plugin, hls-test-utils, lens, lsp, retrie, syb, text + , transformers, unliftio-core, unordered-containers }: mkDerivation { pname = "hls-splice-plugin"; - version = "1.0.1.0"; - sha256 = "07v4rgss140vfc4xqibccimm48ys4awz7yficr0wf440p6i83qdc"; - revision = "1"; - editedCabalFile = "15hr2vc1r4zxf4z26byax95cdqhl1733fna16lifrdj15xkwxs3r"; + version = "1.0.2.0"; + sha256 = "0dq726cxgya756rx40nqhb7lz6fxd38y3r2cgvywc8jp0crpvmyc"; libraryHaskellDepends = [ aeson base containers dlist extra foldl ghc ghc-exactprint ghcide - hls-plugin-api lens lsp retrie syb text transformers unliftio-core - unordered-containers + hls-plugin-api hls-refactor-plugin lens lsp retrie syb text + transformers unliftio-core unordered-containers ]; testHaskellDepends = [ base filepath hls-test-utils text ]; description = "HLS Plugin to expand TemplateHaskell Splices and QuasiQuotes"; license = lib.licenses.asl20; }) {}; + "hls-stan-plugin" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "hls-stan-plugin"; + version = "1.0.0.0"; + sha256 = "03pg68gmardqkx9xa218bb0j4b1f0h5p6gn6xzfwmdj5c005rxjk"; + description = "Stan integration plugin with Haskell Language Server"; + license = lib.licenses.asl20; + }) {}; + "hls-stylish-haskell-plugin" = callPackage ({ mkDerivation, base, directory, filepath, ghc, ghc-boot-th , ghcide, hls-plugin-api, hls-test-utils, lsp-types @@ -140998,22 +141384,22 @@ self: { ({ mkDerivation, aeson, base, containers, deepseq, directory, extra , filepath, fingertree, generic-lens, ghc, ghc-boot-th , ghc-exactprint, ghc-source-gen, ghcide, hls-graph, hls-plugin-api - , hls-test-utils, hspec, hspec-discover, hspec-expectations - , hyphenation, lens, lsp, lsp-types, megaparsec, mtl - , parser-combinators, prettyprinter, QuickCheck, refinery, retrie - , syb, tasty-hspec, tasty-hunit, text, transformers, unagi-chan - , unordered-containers + , hls-refactor-plugin, hls-test-utils, hspec, hspec-discover + , hspec-expectations, hyphenation, lens, lsp, lsp-types, megaparsec + , mtl, parser-combinators, prettyprinter, QuickCheck, refinery + , retrie, syb, tasty-hspec, tasty-hunit, text, transformers + , unagi-chan, unordered-containers }: mkDerivation { pname = "hls-tactics-plugin"; - version = "1.6.2.0"; - sha256 = "07qh9sz3rbqflfryxaj7y8vjmv388jdsmaxvz5z0xfq895yk968p"; + version = "1.7.0.0"; + sha256 = "097jkwcdmpabfniqj725bm67z4nf4ir2yh0zxjl4h1zn7lyldqdd"; libraryHaskellDepends = [ aeson base containers deepseq directory extra filepath fingertree generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide - hls-graph hls-plugin-api hyphenation lens lsp megaparsec mtl - parser-combinators prettyprinter refinery retrie syb text - transformers unagi-chan unordered-containers + hls-graph hls-plugin-api hls-refactor-plugin hyphenation lens lsp + megaparsec mtl parser-combinators prettyprinter refinery retrie syb + text transformers unagi-chan unordered-containers ]; testHaskellDepends = [ aeson base containers deepseq directory filepath ghc ghcide @@ -141034,8 +141420,8 @@ self: { }: mkDerivation { pname = "hls-test-utils"; - version = "1.3.0.0"; - sha256 = "1qm3lna4jy658bmbr6gpjq2gmcz03rdz535gilxycbjkxl2z3hkq"; + version = "1.4.0.0"; + sha256 = "01j85mpcj7klvsbfwfvp9zs7985hxl23bj56lqgh2gd73b5g14xd"; libraryHaskellDepends = [ aeson async base blaze-markup bytestring containers data-default directory extra filepath ghcide hls-graph hls-plugin-api lens lsp @@ -142177,6 +142563,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "hoauth2-tutorial" = callPackage + ({ mkDerivation, aeson, base, bytestring, hoauth2, http-conduit + , http-types, scotty, text, transformers, uri-bytestring, wai, warp + }: + mkDerivation { + pname = "hoauth2-tutorial"; + version = "0.1"; + sha256 = "08c5zhqsi4817sgjczb4k0a2ga12n6vgr17r9dlgzwx2x7khak6l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring hoauth2 http-conduit http-types scotty text + transformers uri-bytestring wai warp + ]; + executableHaskellDepends = [ base ]; + description = "Tutorial for using hoauth2"; + license = lib.licenses.bsd3; + mainProgram = "hoauth2-tutorial"; + }) {}; + "hob" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , glib, gtk-largeTreeStore, gtk3, gtksourceview3, hspec, mtl, pango @@ -143156,6 +143562,8 @@ self: { pname = "hookup"; version = "0.7"; sha256 = "02prkwj4rj8g330z17bpjh7hpwfdvasaxsk74mcvbi03gjpydrib"; + revision = "1"; + editedCabalFile = "1x4hxcb81rczpywcda3s9jbh2gs1sfwvd7wzv3cxxkbd4smlrh1r"; libraryHaskellDepends = [ async attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network stm @@ -144623,6 +145031,37 @@ self: { broken = true; }) {inherit (pkgs) postgresql;}; + "hpqtypes_1_10_0_0" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers + , directory, exceptions, filepath, HUnit, lifted-base + , monad-control, mtl, postgresql, QuickCheck, random, resource-pool + , scientific, semigroups, test-framework, test-framework-hunit + , text, text-show, time, transformers, transformers-base + , unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "hpqtypes"; + version = "1.10.0.0"; + sha256 = "082hn1g2ilia146rkczia0b37n628wa6xi28w75ikxpwpnkmz422"; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ + aeson async base bytestring containers exceptions lifted-base + monad-control mtl resource-pool semigroups text text-show time + transformers transformers-base uuid-types vector + ]; + librarySystemDepends = [ postgresql ]; + testHaskellDepends = [ + aeson base bytestring exceptions HUnit lifted-base monad-control + mtl QuickCheck random scientific test-framework + test-framework-hunit text text-show time transformers-base + unordered-containers uuid-types vector + ]; + description = "Haskell bindings to libpqtypes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {inherit (pkgs) postgresql;}; + "hpqtypes-extras" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, containers , cryptohash, deepseq, exceptions, extra, hpqtypes, log-base, mtl @@ -149115,14 +149554,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_10_5" = callPackage + "hspec_2_10_6" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.10.5"; - sha256 = "1nn9xj1n9007i2zjg03m6n1zjb8f9i2dgvdx1whr06rjya0dyb8v"; + version = "2.10.6"; + sha256 = "129yk1ar962xf02axbdbcvx2icw09b2b6q7q1639391aikisivqz"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -149246,7 +149685,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_10_5" = callPackage + "hspec-core_2_10_6" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans , call-stack, deepseq, directory, filepath, ghc, ghc-boot-th , hspec-expectations, hspec-meta, HUnit, process, QuickCheck @@ -149255,12 +149694,12 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.10.5"; - sha256 = "084kr32arn6pcfhjf024hm98b9cwlslnjpxq0knhkcgh576asy22"; + version = "2.10.6"; + sha256 = "1cz02l3xkj91f41ghz3mkm5nxl6zaj5kgam63rqp8f0yxzhfrvwm"; libraryHaskellDepends = [ ansi-terminal array base call-stack deepseq directory filepath ghc - ghc-boot-th hspec-expectations HUnit QuickCheck quickcheck-io - random setenv stm tf-random time transformers + ghc-boot-th hspec-expectations HUnit process QuickCheck + quickcheck-io random setenv stm tf-random time transformers ]; testHaskellDepends = [ ansi-terminal array base base-orphans call-stack deepseq directory @@ -149337,14 +149776,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hspec-discover_2_10_5" = callPackage + "hspec-discover_2_10_6" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.10.5"; - sha256 = "0w0xsvzsyc3wrjv12nfynq7bgcxmg1kgpjp4lplp88q1c7y2rkv6"; + version = "2.10.6"; + sha256 = "0x7yx55l2cngg4vw2k4mirajbprpa7bkx8rnyvyads8c6f97s71v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -149700,15 +150139,15 @@ self: { mainProgram = "hspec-meta-discover"; }) {}; - "hspec-meta_2_9_3" = callPackage + "hspec-meta_2_10_5" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, ghc, ghc-boot-th, QuickCheck , quickcheck-io, random, setenv, stm, time, transformers }: mkDerivation { pname = "hspec-meta"; - version = "2.9.3"; - sha256 = "1raxwpsmcijl3x2h5naw6aydhbiknxvhj3x7v384bi1rqi51ainm"; + version = "2.10.5"; + sha256 = "0jgagvmvp3nvz9vdgvr42x0xv7nnjzz1rshs6x4wzc38qvcrssbn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153797,6 +154236,25 @@ self: { broken = true; }) {}; + "hurl-xml" = callPackage + ({ mkDerivation, base, bytestring, containers, css-syntax + , data-default-class, directory, file-embed, filepath, html-conduit + , hurl, network-uri, stylist-traits, temporary, text, time + , xml-conduit, xml-conduit-stylist + }: + mkDerivation { + pname = "hurl-xml"; + version = "0.1.0.0"; + sha256 = "14z0b68fsqpbhap6yywjv3y48bz0chn4p0hhklw9zgyyhhrvlz1z"; + libraryHaskellDepends = [ + base bytestring containers css-syntax data-default-class directory + file-embed filepath html-conduit hurl network-uri stylist-traits + temporary text time xml-conduit xml-conduit-stylist + ]; + description = "Fetch parsed XML & possibly CSS for a URL based on MIMEtype"; + license = lib.licenses.gpl3Only; + }) {}; + "hurriyet" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, here, hspec , http-client, http-client-tls, mtl, text @@ -157630,6 +158088,43 @@ self: { mainProgram = "ihaskell"; }) {}; + "ihaskell_0_10_3_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring + , cmdargs, containers, directory, exceptions, filepath, ghc + , ghc-boot, ghc-parser, ghc-paths, haskeline, here, hlint, hspec + , hspec-contrib, http-client, http-client-tls, HUnit + , ipython-kernel, parsec, process, random, raw-strings-qq, setenv + , shelly, split, stm, strict, text, time, transformers, unix + , unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "ihaskell"; + version = "0.10.3.0"; + sha256 = "0caghqp1k04mhfxqpz2hics92wdw8krnjycqsxsjp8s7impl36vl"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base base64-bytestring binary bytestring cmdargs containers + directory exceptions filepath ghc ghc-boot ghc-parser ghc-paths + haskeline hlint http-client http-client-tls ipython-kernel parsec + process random shelly split stm strict text time transformers unix + unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers directory ghc ipython-kernel + process strict text transformers unix unordered-containers + ]; + testHaskellDepends = [ + base directory ghc ghc-paths here hspec hspec-contrib HUnit + raw-strings-qq setenv shelly text transformers + ]; + description = "A Haskell backend kernel for the Jupyter project"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "ihaskell"; + }) {}; + "ihaskell-aeson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, here , ihaskell, text @@ -157869,16 +158364,16 @@ self: { "ihp-hsx" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring - , containers, haskell-src-meta, megaparsec, string-conversions - , template-haskell, text + , containers, ghc, megaparsec, string-conversions, template-haskell + , text }: mkDerivation { pname = "ihp-hsx"; - version = "0.18.0"; - sha256 = "1a5sc7qz24qkkm0s5fc3pqdnq7gl29fw400sv7zq05bkrrnlfzpn"; + version = "0.20.0"; + sha256 = "118bhsyn5r9p03b8six9g5xna4vrh2qsq3ka4mqlvzv4kp4d7dkb"; libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring containers haskell-src-meta - megaparsec string-conversions template-haskell text + base blaze-html blaze-markup bytestring containers ghc megaparsec + string-conversions template-haskell text ]; description = "JSX-like but for Haskell"; license = lib.licenses.mit; @@ -162083,6 +162578,29 @@ self: { license = lib.licenses.mit; }) {}; + "ipython-kernel_0_10_3_0" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , cryptonite, directory, filepath, memory, parsec, process + , temporary, text, transformers, unordered-containers, uuid + , zeromq4-haskell + }: + mkDerivation { + pname = "ipython-kernel"; + version = "0.10.3.0"; + sha256 = "0zvcqgvrykfmp706snbpxy8ia0hkxshrj8r8kfwkvkwhxd72ad5c"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base binary bytestring containers cryptonite directory + filepath memory parsec process temporary text transformers + unordered-containers uuid zeromq4-haskell + ]; + description = "A library for creating kernels for IPython frontends"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "irc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -162490,18 +163008,6 @@ self: { }) {}; "isbn" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, text }: - mkDerivation { - pname = "isbn"; - version = "1.1.0.3"; - sha256 = "16srdvsjsiqzcm0hb3rhwry1vr170fz85g84wk6nyk1glbva4bga"; - libraryHaskellDepends = [ base text ]; - testHaskellDepends = [ base hspec QuickCheck text ]; - description = "ISBN Validation and Manipulation"; - license = lib.licenses.asl20; - }) {}; - - "isbn_1_1_0_4" = callPackage ({ mkDerivation, base, hspec, QuickCheck, text }: mkDerivation { pname = "isbn"; @@ -162511,7 +163017,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck text ]; description = "ISBN Validation and Manipulation"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "isdicom" = callPackage @@ -162767,8 +163272,8 @@ self: { }: mkDerivation { pname = "isomorphism-class"; - version = "0.1.0.6"; - sha256 = "0sy9v5830giqkk4r7c0ycvm5z3racf953dy5lwsfxm7zygzb8dm3"; + version = "0.1.0.7"; + sha256 = "0kngrwjj5m2pg4pkcvcxamsx82y03lfpj4hs7ifsxf64qm67bmgy"; libraryHaskellDepends = [ base bytestring containers hashable primitive text unordered-containers vector @@ -165993,27 +166498,6 @@ self: { }) {}; "json-stream" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, hspec - , primitive, QuickCheck, quickcheck-unicode, scientific, text - , unordered-containers, vector - }: - mkDerivation { - pname = "json-stream"; - version = "0.4.4.1"; - sha256 = "1czl29nn2i4li6m1dn151l5rbiwrb3c47njnmlk3pqk138k0czgy"; - libraryHaskellDepends = [ - aeson base bytestring primitive scientific text - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring directory hspec primitive QuickCheck - quickcheck-unicode scientific text unordered-containers vector - ]; - description = "Incremental applicative JSON parser"; - license = lib.licenses.bsd3; - }) {}; - - "json-stream_0_4_4_2" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, hspec , primitive, QuickCheck, quickcheck-unicode, scientific, text , unordered-containers, vector @@ -166032,7 +166516,6 @@ self: { ]; description = "Incremental applicative JSON parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "json-syntax" = callPackage @@ -168517,8 +169000,8 @@ self: { }: mkDerivation { pname = "keid-frp-banana"; - version = "0.1.0.0"; - sha256 = "1d0il5v7chn9gyr5gs15d35pyls1ynnn6jfysx7rqhzhglgvc164"; + version = "0.1.1.0"; + sha256 = "0m62bj6cc9xl5rricmc1xxs8q8vlbn7ablcrx923289bynyiir0i"; libraryHaskellDepends = [ base geomancy keid-core reactive-banana resourcet rio these vulkan ]; @@ -169596,8 +170079,8 @@ self: { }: mkDerivation { pname = "koji-tool"; - version = "0.9.4"; - sha256 = "0s4h1qqw6bxffyvi5qn8k42b3h6alyzcccbad802x5p08arpnfp2"; + version = "0.9.5"; + sha256 = "0pcy0xr6iq5g6w0vxvrx7wiz2gy6whb8c2hh53w8x7a2j04na8gn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -171651,6 +172134,8 @@ self: { pname = "language-conf"; version = "0.2.2.0"; sha256 = "16m3m31c17hjkl6mkln5fy8n0pim0cdamqk5g6s65yq65kj3whgp"; + revision = "1"; + editedCabalFile = "18r7g8am4wl01wyxw15npyld3ikdssy6ydsjgi2kw3c66cjxmmsh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180862,8 +181347,8 @@ self: { ({ mkDerivation, base, logict, mtl, transformers }: mkDerivation { pname = "logict-state"; - version = "0.1.0.5"; - sha256 = "17rx8rj6m4jny52zh4daw6ac9pyp0yns470nm0bf2z9y69mfr63g"; + version = "0.1.1.0"; + sha256 = "080qdlq9d8hkzzs4xls5myjdjjzyslz8834mfm4c2ria8hdabqsx"; libraryHaskellDepends = [ base logict mtl transformers ]; description = "Library for logic programming based on haskell package logict"; license = lib.licenses.bsd3; @@ -181795,30 +182280,28 @@ self: { license = lib.licenses.mit; }) {}; - "lsp_1_5_0_0" = callPackage + "lsp_1_6_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , co-log-core, containers, data-default, directory, exceptions , filepath, hashable, hspec, hspec-discover, lens, lsp-types, mtl - , network-uri, prettyprinter, QuickCheck, quickcheck-instances - , random, scientific, sorted-list, stm, temporary, text, text-rope - , time, transformers, unliftio-core, unordered-containers, uuid + , prettyprinter, random, sorted-list, stm, temporary, text + , text-rope, transformers, unliftio-core, unordered-containers + , uuid }: mkDerivation { pname = "lsp"; - version = "1.5.0.0"; - sha256 = "0cqrdsq4w4nwhzpxadxa5mvh3cn1zy9wjsq7ib38r6b09zxzi3i7"; + version = "1.6.0.0"; + sha256 = "0w04n299d8yh545jggh93wm6nxpp5jwz8hr7qynbxslcdrv06s49"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async attoparsec base bytestring co-log-core containers data-default directory exceptions filepath hashable lens lsp-types - mtl network-uri prettyprinter random scientific sorted-list stm - temporary text text-rope time transformers unliftio-core - unordered-containers uuid + mtl prettyprinter random sorted-list stm temporary text text-rope + transformers unliftio-core unordered-containers uuid ]; testHaskellDepends = [ - aeson base containers filepath hspec lens network-uri QuickCheck - quickcheck-instances sorted-list text text-rope + base containers hspec sorted-list text text-rope unordered-containers ]; testToolDepends = [ hspec-discover ]; @@ -181856,22 +182339,23 @@ self: { license = lib.licenses.bsd3; }) {}; - "lsp-test_0_14_0_3" = callPackage + "lsp-test_0_14_1_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, co-log-core, conduit, conduit-parse, containers - , data-default, Diff, directory, extra, filepath, Glob, hspec, lens - , lsp, lsp-types, mtl, parser-combinators, process, some, text - , time, transformers, unix, unliftio, unordered-containers + , data-default, Diff, directory, exceptions, extra, filepath, Glob + , hspec, lens, lsp, lsp-types, mtl, parser-combinators, process + , some, text, time, transformers, unix, unliftio + , unordered-containers }: mkDerivation { pname = "lsp-test"; - version = "0.14.0.3"; - sha256 = "110hkf91033m1vg90mj7ifq5214r4a2qwswkgb0ahj4sd8c0hsa7"; + version = "0.14.1.0"; + sha256 = "0db4mpzn05k3isk1a3rdpqr7if9j0kr3bxdri9739q9a8azf4fp1"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring co-log-core conduit conduit-parse containers data-default Diff directory - filepath Glob lens lsp lsp-types mtl parser-combinators process - some text time transformers unix unordered-containers + exceptions filepath Glob lens lsp lsp-types mtl parser-combinators + process some text time transformers unix unordered-containers ]; testHaskellDepends = [ aeson base co-log-core data-default directory filepath hspec lens @@ -181908,21 +182392,27 @@ self: { license = lib.licenses.mit; }) {}; - "lsp-types_1_5_0_0" = callPackage + "lsp-types_1_6_0_0" = callPackage ({ mkDerivation, aeson, base, binary, containers, data-default - , deepseq, Diff, dlist, filepath, hashable, lens, mod, mtl - , network-uri, scientific, some, template-haskell, text - , unordered-containers + , deepseq, Diff, dlist, exceptions, filepath, hashable, hspec + , hspec-discover, lens, mod, mtl, network-uri, QuickCheck + , quickcheck-instances, safe, scientific, some, template-haskell + , text, tuple, unordered-containers }: mkDerivation { pname = "lsp-types"; - version = "1.5.0.0"; - sha256 = "18hbhwd0cl32dbw88wskpxkqvnkym0rvjm46mcpnz3nxa1rdbn0m"; + version = "1.6.0.0"; + sha256 = "00lqq5lw7pi8qrnjlibsvhldp747kdc9zkr6rg3bbkbz7kxw8p9q"; libraryHaskellDepends = [ aeson base binary containers data-default deepseq Diff dlist - filepath hashable lens mod mtl network-uri scientific some - template-haskell text unordered-containers + exceptions filepath hashable lens mod mtl network-uri safe + scientific some template-haskell text unordered-containers ]; + testHaskellDepends = [ + aeson base filepath hspec lens network-uri QuickCheck + quickcheck-instances text tuple + ]; + testToolDepends = [ hspec-discover ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -187463,10 +187953,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "memoize"; - version = "1.1.1"; - sha256 = "18xn1rb0wqxm0zi4rm5ipihj5kndmc3dbahxxwdpxwapsk4i9j1k"; - revision = "1"; - editedCabalFile = "195bcyvvvqi23b9i575206nvbh406khh9s36ma4ldl1021izq0nr"; + version = "1.1.2"; + sha256 = "0sm1vwdkzq6ibnfp5v4lqagwfcnyrsf075mr1a8mwidgcr03lb9l"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; description = "A memoization library"; @@ -189402,8 +189890,8 @@ self: { ({ mkDerivation, base, bytestring, containers, text }: mkDerivation { pname = "mime-types"; - version = "0.1.0.9"; - sha256 = "1lkipa4v73z3l5lqs6sdhl898iq41kyxv2jb9agsajzgd58l6cha"; + version = "0.1.1.0"; + sha256 = "06z1z5q7c77sdaych0jq1d54vdkrx1gybzyl6crcnhkiwga1xl7b"; libraryHaskellDepends = [ base bytestring containers text ]; description = "Basic mime-type handling types and functions"; license = lib.licenses.mit; @@ -191984,8 +192472,8 @@ self: { }: mkDerivation { pname = "monad-logger-aeson"; - version = "0.3.1.0"; - sha256 = "1j5gxmzqblqqbdf1xdmi2j0s89hhc28bv8jsbx114wdqyl9v4nb5"; + version = "0.4.0.2"; + sha256 = "1z0r0xkd8i9nw9jlzb7m50m2qi48mf6v26h533jn91yw6gi830r0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193049,6 +193537,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "monadology" = callPackage + ({ mkDerivation, base, constraints, invariant, tasty, tasty-hunit + , transformers, type-rig, witness + }: + mkDerivation { + pname = "monadology"; + version = "0.1"; + sha256 = "0pr9ia4jns545sk5x85pdwgbw1qd648nh9avb5q7jql7dwa21928"; + libraryHaskellDepends = [ + base constraints invariant transformers type-rig witness + ]; + testHaskellDepends = [ base tasty tasty-hunit transformers ]; + license = lib.licenses.bsd2; + }) {}; + "monadplus" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -200719,8 +201222,8 @@ self: { }: mkDerivation { pname = "network-dns"; - version = "1.1.0.1"; - sha256 = "0q709qfhph93k8yni6047yr2zhswmc3cvizyyk63vmh3h2dwfmgs"; + version = "1.1.0.2"; + sha256 = "1b7bgx2sbcdw6c9p1v458glrwpp7869wz0vr0inz3f7g55ll8a3l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202153,23 +202656,23 @@ self: { }) {}; "ngx-export-tools-extra" = callPackage - ({ mkDerivation, aeson, array, base, base64, binary, bytestring - , case-insensitive, containers, ede, enclosed-exceptions - , http-client, http-client-brread-timeout, http-types, network - , ngx-export, ngx-export-tools, pcre-heavy, pcre-light - , prettyprinter, safe, snap-core, snap-server, template-haskell - , text, time, trifecta, unordered-containers + ({ mkDerivation, aeson, array, async, base, base64, binary + , bytestring, case-insensitive, containers, ede + , enclosed-exceptions, http-client, http-client-brread-timeout + , http-types, network, ngx-export, ngx-export-tools, pcre-heavy + , pcre-light, prettyprinter, resolv, safe, snap-core, snap-server + , template-haskell, text, time, trifecta, unordered-containers }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "1.1.0"; - sha256 = "191v30zxqwpyb546sbgbn7nwbxmv7l476msavgrqnahphcgg5zqy"; + version = "1.2.0"; + sha256 = "14s7dri3ivy4zk0nsz2xqq951rf3ypicwqnxixjqbrnbwgakccdw"; libraryHaskellDepends = [ - aeson array base base64 binary bytestring case-insensitive + aeson array async base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client http-client-brread-timeout http-types network ngx-export - ngx-export-tools pcre-heavy pcre-light prettyprinter safe snap-core - snap-server template-haskell text time trifecta + ngx-export-tools pcre-heavy pcre-light prettyprinter resolv safe + snap-core snap-server template-haskell text time trifecta unordered-containers ]; description = "More extra tools for Nginx haskell module"; @@ -206710,7 +207213,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "opaleye_0_9_5_1" = callPackage + "opaleye_0_9_6_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -206720,8 +207223,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.9.5.1"; - sha256 = "0441hf03zll5jjbmb6iz6f13aj5kcmnpqlxfrbb1lsby10i2l0kn"; + version = "0.9.6.0"; + sha256 = "1hzpahvpgx8yr6jhyjklj2bigcb2ia4vwcix6kx0i015zns0m04z"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -210853,6 +211356,8 @@ self: { pname = "pandoc-crossref"; version = "0.3.13.0"; sha256 = "0fn5xrsh1x1rk74vd30yvg4ha9aicqbm7r1w0nrq9fkgcmz1q01x"; + revision = "1"; + editedCabalFile = "09sjf2fm09jcz1mnqlbmbfwb1237j26xcfgfq6b2fpl00gjg83di"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -214152,19 +214657,23 @@ self: { "patrol" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, http-client, http-types, network-uri, text, time - , uuid + , containers, exceptions, hspec, http-client, http-types + , network-uri, text, time, uuid }: mkDerivation { pname = "patrol"; - version = "0.0.4"; - sha256 = "1n9ixzmsn35zjk9liwfc0mv3kz3mhczxlj01bc5zjb7cmd66cs3f"; + version = "0.1.0.1"; + sha256 = "1mdl9r8kga6n7v7yvds46j0y8mg59h1irw8fbwqzzj142va9q8xc"; libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers http-client - http-types network-uri text time uuid + aeson base bytestring case-insensitive containers exceptions + http-client http-types network-uri text time uuid + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive containers exceptions hspec + http-client http-types network-uri text time uuid ]; description = "Sentry SDK"; - license = lib.licenses.isc; + license = lib.licenses.mit; }) {}; "patronscraper" = callPackage @@ -216049,7 +216558,7 @@ self: { maintainers = [ lib.maintainers.psibi ]; }) {}; - "persistent_2_14_2_0" = callPackage + "persistent_2_14_3_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, criterion, deepseq , fast-logger, file-embed, hspec, http-api-data, lift-type @@ -216060,8 +216569,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.14.2.0"; - sha256 = "0iwkn9llas29jmih1zqj52973352pz4yp3dpajdxbypyn16v8p5v"; + version = "2.14.3.0"; + sha256 = "06cs30886s0y50kw4p2x8jw1k173il4mfqdfbkkdnd6kc97j920j"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data lift-type monad-logger @@ -217538,8 +218047,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "phonetic-languages-basis"; - version = "0.1.1.0"; - sha256 = "0fpsavprp4l39l0mj7rwckrsbwdphzxs61y24ds1dg3zvhphn06c"; + version = "0.2.0.0"; + sha256 = "0hpdf2m0wpzd680hhlsiymygmdr2sw62d2s2qj1pb5757n2kans1"; libraryHaskellDepends = [ base ]; description = "A basics of the phonetic-languages functionality"; license = lib.licenses.mit; @@ -217684,8 +218193,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-phonetics-basics"; - version = "0.9.0.0"; - sha256 = "1sbsywylcmjf592618rs727k1lfc42yll541cqwm34ffhzsvfzij"; + version = "0.9.1.0"; + sha256 = "1ahmgk42n08644h6gmrnz5p13pip18sbyaim5za0z7aaxm9qr70v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217758,8 +218267,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-base"; - version = "0.6.0.0"; - sha256 = "0bryrk05xpdz3dx96vwma91kig8xs6mkdlbpslk9qxf8b55yrnd2"; + version = "0.6.1.0"; + sha256 = "1217hpd1x65nl1yf50bghj8gmnv1wdwd5wbrhx454726p0fbjd7s"; libraryHaskellDepends = [ base phonetic-languages-basis phonetic-languages-permutations-array subG @@ -217800,8 +218309,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.20.1.0"; - sha256 = "0c664k9vvk2j522dwn27caf4d35dshj3z07c9qgzy47rjs65r6xw"; + version = "0.21.0.0"; + sha256 = "0mlnlnp5k030pgc7ii8nnqmva97wp5j8vvdhgni9l9qxgj3jvf2c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217842,8 +218351,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-common"; - version = "0.5.0.0"; - sha256 = "0abby7z7zys9dj8w4xk3289jxl39i4kqdzb3cq5rjvacw5z0im6a"; + version = "0.5.1.0"; + sha256 = "0mgkgqf3rjjdrz85qxdjz6b0ivgc9h4k06gj5wnv3nbfjk5wpndk"; libraryHaskellDepends = [ base heaps phonetic-languages-simplified-properties-array phonetic-languages-ukrainian-array ukrainian-phonetics-basic-array @@ -217866,8 +218375,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.18.2.0"; - sha256 = "0jyg507a4gh437vzxj658nhs8l32p2xg4vifrgs5q5jyck61p7z5"; + version = "0.19.0.1"; + sha256 = "1fi106cpm5vl8pp6csz9laph8w0jd79xxbgy5gar28ml33zrji6a"; libraryHaskellDepends = [ base cli-arguments foldable-ix heaps mmsyn2-array mmsyn3 parallel phonetic-languages-basis phonetic-languages-constraints-array @@ -217890,8 +218399,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-common"; - version = "0.5.0.0"; - sha256 = "0mma7d4hjd45fb7nzhpc438qfjfhkrd59rrm734nw8z5i9j6sv35"; + version = "0.5.1.0"; + sha256 = "0mdsn3clb422r02y87ix6bphggvg8m2yacar5y4ipj0vq2ky2m4a"; libraryHaskellDepends = [ base heaps phonetic-languages-phonetics-basics phonetic-languages-simplified-generalized-properties-array @@ -217908,8 +218417,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-properties-array"; - version = "0.11.0.0"; - sha256 = "0j025aahsfywrf76mqg1p80kri7n8q2madg5qc3l6frlwgxhk44m"; + version = "0.12.0.0"; + sha256 = "14y4h8p43wrhxs110jn4idcvj441ai6qhhs86kfnhvrg3glw9nln"; libraryHaskellDepends = [ base lists-flines mmsyn2-array phonetic-languages-basis phonetic-languages-phonetics-basics phonetic-languages-rhythmicity @@ -217963,8 +218472,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-array"; - version = "0.15.0.0"; - sha256 = "1p8mdrz1k6352rfcfmwnvs338bkbhzj89ag1swd9rxa79igsv87v"; + version = "0.16.0.0"; + sha256 = "05zbdafl2hga04sy5vcq121n8aigbrhfb4xynvafbyxsmsahflkz"; libraryHaskellDepends = [ base lists-flines mmsyn2-array phonetic-languages-basis phonetic-languages-rhythmicity phonetic-languages-simplified-base @@ -217981,8 +218490,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-array-common"; - version = "0.2.0.0"; - sha256 = "1c61pi61kcbr70xfrxiq50frg7rd9sabj7834x3lhlix41s6rhld"; + version = "0.3.0.0"; + sha256 = "1yf0z02zyqp9s441c2rg7rnfhvhiiqz0qm3i9r4jxwjr20hak333"; libraryHaskellDepends = [ base phonetic-languages-basis phonetic-languages-rhythmicity ]; @@ -222124,21 +222633,6 @@ self: { }) {}; "polysemy-extra" = callPackage - ({ mkDerivation, base, containers, polysemy, polysemy-kvstore }: - mkDerivation { - pname = "polysemy-extra"; - version = "0.2.0.0"; - sha256 = "0w8spy9l66ys1x9riwy8cwvywzqxkcbhzrqyia85jgl6mgp96zis"; - revision = "1"; - editedCabalFile = "0j44rqp13n5hxl0kx06hhliwmsqxl81jrcylsk7h8khjqmphgsn7"; - libraryHaskellDepends = [ - base containers polysemy polysemy-kvstore - ]; - description = "Extra Input and Output functions for polysemy"; - license = lib.licenses.mit; - }) {}; - - "polysemy-extra_0_2_1_0" = callPackage ({ mkDerivation, base, containers, polysemy, polysemy-kvstore }: mkDerivation { pname = "polysemy-extra"; @@ -222149,7 +222643,6 @@ self: { ]; description = "Extra Input and Output functions for polysemy"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-fs" = callPackage @@ -222350,22 +222843,6 @@ self: { }) {}; "polysemy-methodology" = callPackage - ({ mkDerivation, base, polysemy, polysemy-kvstore, polysemy-several - }: - mkDerivation { - pname = "polysemy-methodology"; - version = "0.2.1.0"; - sha256 = "17md6l5smy1ssn99kij6rnb42bx3fx8h49z85cm9sf41k6lb5k1g"; - revision = "2"; - editedCabalFile = "0dpancn85f8j3pxhk43lik6fbznp502cc68rkhqkan791kh1bbc7"; - libraryHaskellDepends = [ - base polysemy polysemy-kvstore polysemy-several - ]; - description = "Domain modelling algebra for polysemy"; - license = lib.licenses.mit; - }) {}; - - "polysemy-methodology_0_2_2_0" = callPackage ({ mkDerivation, base, polysemy, polysemy-kvstore, polysemy-several }: mkDerivation { @@ -222377,7 +222854,6 @@ self: { ]; description = "Domain modelling algebra for polysemy"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-methodology-co-log" = callPackage @@ -222610,19 +223086,6 @@ self: { }) {}; "polysemy-several" = callPackage - ({ mkDerivation, base, polysemy }: - mkDerivation { - pname = "polysemy-several"; - version = "0.1.0.0"; - sha256 = "1mw6a6fz3879yqnpq6h0221i8b8f05j90b1zydhzr57nsbklxzps"; - revision = "3"; - editedCabalFile = "0ig9jqrv9dqasgjhshapcxjqp4vdpl1p09q0fy34847vchg5jgpb"; - libraryHaskellDepends = [ base polysemy ]; - description = "Run several effects at once, taken from the polysemy-zoo"; - license = lib.licenses.mit; - }) {}; - - "polysemy-several_0_1_1_0" = callPackage ({ mkDerivation, base, polysemy }: mkDerivation { pname = "polysemy-several"; @@ -222631,7 +223094,6 @@ self: { libraryHaskellDepends = [ base polysemy ]; description = "Run several effects at once, taken from the polysemy-zoo"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "polysemy-socket" = callPackage @@ -222757,23 +223219,24 @@ self: { }) {}; "polysemy-zoo" = callPackage - ({ mkDerivation, async, base, compact, constraints, containers - , contravariant, exceptions, ghc-prim, hspec, hspec-discover, mtl - , polysemy, polysemy-plugin, random, reflection, streaming, text - , transformers + ({ mkDerivation, async, base, constraints, containers + , contravariant, exceptions, ghc-compact, ghc-prim, hspec + , hspec-discover, mtl, polysemy, polysemy-plugin, random + , reflection, streaming, text, transformers }: mkDerivation { pname = "polysemy-zoo"; - version = "0.8.0.0"; - sha256 = "1ylsr092a42xsbx6aancbcnfp1m66azv3vn44hqar069c5y96ilc"; + version = "0.8.1.0"; + sha256 = "0p8ljkpmcf0gf29b8dl1xwra189xfs5ba88fgmys2jcg2wz6yy1d"; libraryHaskellDepends = [ - async base compact constraints containers contravariant exceptions - ghc-prim mtl polysemy random reflection streaming text transformers + async base constraints containers contravariant exceptions + ghc-compact ghc-prim mtl polysemy random reflection streaming text + transformers ]; testHaskellDepends = [ - async base compact constraints containers contravariant exceptions - ghc-prim hspec mtl polysemy polysemy-plugin random reflection - streaming text transformers + async base constraints containers contravariant exceptions + ghc-compact ghc-prim hspec mtl polysemy polysemy-plugin random + reflection streaming text transformers ]; testToolDepends = [ hspec-discover ]; description = "Experimental, user-contributed effects and interpreters for polysemy"; @@ -223981,33 +224444,6 @@ self: { }) {}; "postgresql-binary" = callPackage - ({ mkDerivation, aeson, base, binary-parser, bytestring - , bytestring-strict-builder, containers, conversion - , conversion-bytestring, conversion-text, criterion, json-ast - , network-ip, postgresql-libpq, QuickCheck, quickcheck-instances - , rerebase, scientific, tasty, tasty-hunit, tasty-quickcheck, text - , time, transformers, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "postgresql-binary"; - version = "0.12.4.4"; - sha256 = "03lh7ply77849xwpxh6k2hz20xl9cmvyx8yq03wqywvh7snd1ss3"; - libraryHaskellDepends = [ - aeson base binary-parser bytestring bytestring-strict-builder - containers network-ip scientific text time transformers - unordered-containers uuid vector - ]; - testHaskellDepends = [ - aeson conversion conversion-bytestring conversion-text json-ast - network-ip postgresql-libpq QuickCheck quickcheck-instances - rerebase tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "Encoders and decoders for the PostgreSQL's binary format"; - license = lib.licenses.mit; - }) {}; - - "postgresql-binary_0_12_5" = callPackage ({ mkDerivation, aeson, base, binary-parser, bytestring , bytestring-strict-builder, containers, criterion, network-ip , postgresql-libpq, QuickCheck, quickcheck-instances, rerebase @@ -224030,6 +224466,31 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "Encoders and decoders for the PostgreSQL's binary format"; license = lib.licenses.mit; + }) {}; + + "postgresql-binary_0_13" = callPackage + ({ mkDerivation, aeson, base, binary-parser, bytestring + , bytestring-strict-builder, containers, criterion, network-ip + , postgresql-libpq, QuickCheck, quickcheck-instances, rerebase + , scientific, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.13"; + sha256 = "0pb4bzkhgw59y2l06gikwf6i8g9wfzkx5swmw9c8hdxdzcjzjb1k"; + libraryHaskellDepends = [ + aeson base binary-parser bytestring bytestring-strict-builder + containers network-ip scientific text time transformers + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson network-ip postgresql-libpq QuickCheck quickcheck-instances + rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; }) {}; @@ -224228,6 +224689,31 @@ self: { mainProgram = "migrate"; }) {}; + "postgresql-migration_0_2_1_4" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash + , directory, filepath, hspec, postgresql-simple, text, time + }: + mkDerivation { + pname = "postgresql-migration"; + version = "0.2.1.4"; + sha256 = "0p8rggalgijw02p7m77x443md5dg1kjvvm06v980cchsj148c80s"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base64-bytestring bytestring cryptohash directory filepath + postgresql-simple text time + ]; + executableHaskellDepends = [ + base base64-bytestring bytestring cryptohash directory + postgresql-simple text time + ]; + testHaskellDepends = [ base bytestring hspec postgresql-simple ]; + description = "PostgreSQL Schema Migrations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "migrate"; + }) {}; + "postgresql-named" = callPackage ({ mkDerivation, base, bytestring, extra, generics-sop, hspec, mtl , postgresql-libpq, postgresql-simple, utf8-string @@ -227025,6 +227511,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "primitive-primvar" = callPackage + ({ mkDerivation, base, primitive }: + mkDerivation { + pname = "primitive-primvar"; + version = "0.0.0.0"; + sha256 = "0dgswszya33vabbyxz96g6z2z4nikqv4h8yj59b0q5j9f3pmmd3z"; + libraryHaskellDepends = [ base primitive ]; + description = "Unboxed variables for `Prim` values"; + license = lib.licenses.cc0; + }) {}; + "primitive-simd" = callPackage ({ mkDerivation, base, criterion, deepseq, ghc-prim, primitive , random, vector @@ -227079,12 +227576,27 @@ self: { pname = "primitive-unaligned"; version = "0.1.1.1"; sha256 = "1f3a46d9dr7x1k8b6ixnp9jzxkppx3g27qsxq4f244ndnf2jnchl"; + revision = "1"; + editedCabalFile = "1vksp8izwb2hwyc1li3cf209cf2vaj6ww9n3lyrksr8ymd1p6f16"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive ]; description = "Unaligned access to primitive arrays"; license = lib.licenses.bsd3; }) {}; + "primitive-unaligned_0_1_1_2" = callPackage + ({ mkDerivation, base, primitive }: + mkDerivation { + pname = "primitive-unaligned"; + version = "0.1.1.2"; + sha256 = "1ksl2gib15inbd80rf0bl3baj8fmk740liv4fdg9493dlhr3a4pa"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ base primitive ]; + description = "Unaligned access to primitive arrays"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "primitive-unlifted" = callPackage ({ mkDerivation, base, bytestring, primitive, stm, text-short }: mkDerivation { @@ -228992,6 +229504,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "proto-lens_0_7_1_2" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim + , lens-family, parsec, pretty, primitive, profunctors, QuickCheck + , tagged, tasty, tasty-quickcheck, text, transformers, vector + }: + mkDerivation { + pname = "proto-lens"; + version = "0.7.1.2"; + sha256 = "0zbkwksmnpc5ivbhckg1kjivn1qbk9pz79vifyiydp90nxjh56fy"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim lens-family parsec + pretty primitive profunctors tagged text transformers vector + ]; + testHaskellDepends = [ + base bytestring QuickCheck tasty tasty-quickcheck vector + ]; + description = "A lens-based implementation of protocol buffers in Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "proto-lens-arbitrary" = callPackage ({ mkDerivation, base, bytestring, containers, lens-family , proto-lens, QuickCheck, text @@ -229132,6 +229666,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "proto-lens-runtime_0_7_0_3" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, filepath + , lens-family, proto-lens, text, vector + }: + mkDerivation { + pname = "proto-lens-runtime"; + version = "0.7.0.3"; + sha256 = "1fb64xcrgd7v2l4hqqcs0riszklkxh516l7n4p9lwwqmagmgz36y"; + libraryHaskellDepends = [ + base bytestring containers deepseq filepath lens-family proto-lens + text vector + ]; + doHaddock = false; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "proto-lens-setup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, deepseq , directory, filepath, process, proto-lens-protoc, temporary, text @@ -229650,8 +230201,8 @@ self: { pname = "pseudo-boolean"; version = "0.1.10.0"; sha256 = "1p9w1d80d2kp7wp7wp6xf9dz1iv9knhy8b75mklz7zq3cf5gvnrh"; - revision = "2"; - editedCabalFile = "0i5f3p9rhb3pvrrcw5x83h5vhkg5pmakfs1prg7fik447k1bda66"; + revision = "3"; + editedCabalFile = "0cn7v9r8kd9xcfhkzd2ln5kqfwv4dc81c4lmv402sa1w82sbbf2h"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable megaparsec parsec void @@ -230460,15 +231011,15 @@ self: { "purebred-email" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring - , case-insensitive, concise, deepseq, hedgehog, lens, QuickCheck + , case-insensitive, concise, deepseq, hedgehog, lens , quickcheck-instances, random, semigroupoids, stringsearch, tasty , tasty-golden, tasty-hedgehog, tasty-hunit, tasty-quickcheck, text , time }: mkDerivation { pname = "purebred-email"; - version = "0.5.1"; - sha256 = "1g64z0ibbp5sq9m1jmxks5l89rdmdg8szidclxwz2xs0ilzsy65m"; + version = "0.6"; + sha256 = "0i89jyzy04fsrkfsqasrszhhax3hhmms7ih31sypn67w3awkk985"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230477,8 +231028,8 @@ self: { ]; testHaskellDepends = [ attoparsec base bytestring case-insensitive hedgehog lens - QuickCheck quickcheck-instances random tasty tasty-golden - tasty-hedgehog tasty-hunit tasty-quickcheck text time + quickcheck-instances random tasty tasty-golden tasty-hedgehog + tasty-hunit tasty-quickcheck text time ]; description = "types and parser for email messages (including MIME)"; license = lib.licenses.agpl3Plus; @@ -230933,27 +231484,6 @@ self: { }) {}; "pusher-http-haskell" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , cryptonite, hashable, hspec, http-client, http-client-tls - , http-types, memory, QuickCheck, text, time, unordered-containers - }: - mkDerivation { - pname = "pusher-http-haskell"; - version = "2.1.0.11"; - sha256 = "1vrpdj0z41zhpfy4lk87w4fyfvrp27rvqds9j5s2wyxj95k2scm5"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hashable - http-client http-client-tls http-types memory text time - unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring hspec QuickCheck text unordered-containers - ]; - description = "Haskell client library for the Pusher Channels HTTP API"; - license = lib.licenses.mit; - }) {}; - - "pusher-http-haskell_2_1_0_12" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptonite, hashable, hspec, http-client, http-client-tls , http-types, memory, QuickCheck, text, time, unordered-containers @@ -230972,7 +231502,6 @@ self: { ]; description = "Haskell client library for the Pusher Channels HTTP API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "pusher-ws" = callPackage @@ -231964,6 +232493,19 @@ self: { mainProgram = "quantities"; }) {}; + "quantizer" = callPackage + ({ mkDerivation, base, subG, uniqueness-periods-vector-stats }: + mkDerivation { + pname = "quantizer"; + version = "0.1.0.0"; + sha256 = "0pall4g5fd8flv7b380y7qqnh630jbnf5kbzxhpx13qr287casrh"; + libraryHaskellDepends = [ + base subG uniqueness-periods-vector-stats + ]; + description = "Library to provide the behaviour similar to quantum states superposition"; + license = lib.licenses.mit; + }) {}; + "quantum-arrow" = callPackage ({ mkDerivation, base, MonadRandom, mtl, QuickCheck, random }: mkDerivation { @@ -236430,7 +236972,7 @@ self: { license = lib.licenses.mit; }) {}; - "rebase_1_16" = callPackage + "rebase_1_16_1" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , contravariant, deepseq, dlist, either, groups, hashable , invariant, mtl, profunctors, scientific, selective, semigroupoids @@ -236439,10 +236981,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.16"; - sha256 = "0r5dmkw1bb3fkc40gjdcswf7388c8w7lzvzh7wvf7vk4lhxjaxhd"; - revision = "1"; - editedCabalFile = "048h2ir37j09s0z7fb364p7smyhzq6h4705qklhvylak9242gz2n"; + version = "1.16.1"; + sha256 = "0mb1x5p3lvfhxsrnmkhsv6f4rd1cxp6m3qg6kyz30svrbwxsvvkz"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers contravariant deepseq dlist either groups hashable invariant mtl profunctors scientific @@ -237590,8 +238130,8 @@ self: { pname = "reflex"; version = "0.8.2.0"; sha256 = "1hvagxcs413bqairxf77vp19484mxnbfckhd44wv22ncwfh5mq6d"; - revision = "2"; - editedCabalFile = "1msjk8bk59dv1pm90l2hxkrl185aj4xblzgc7nkwn7x31ykcnhyw"; + revision = "3"; + editedCabalFile = "1sax4fx7pgn85dvih4y6mnvhdq8nssan1rcys5kdfhirnr4vgn1m"; libraryHaskellDepends = [ base bifunctors comonad constraints constraints-extras containers data-default dependent-map dependent-sum exception-transformers @@ -239515,8 +240055,8 @@ self: { }: mkDerivation { pname = "registry-hedgehog"; - version = "0.7.0.3"; - sha256 = "1scas90v8qsikacahk6z5xkg4k6vy0fq4kpgdzgmzibfgjb5d4an"; + version = "0.7.0.5"; + sha256 = "1mc8m74mx5119b6k7ac4ysilnwm0163a4c57gc15620mw3f0w0dl"; libraryHaskellDepends = [ base containers hedgehog mmorph multimap protolude registry tasty tasty-discover tasty-hedgehog tasty-th template-haskell text @@ -239568,8 +240108,8 @@ self: { }: mkDerivation { pname = "registry-messagepack"; - version = "0.3.0.1"; - sha256 = "00h4ics8gavvscp3sjp1j0vyhqj90zi7pmxqhrlzja0fnmhb1brj"; + version = "0.3.0.2"; + sha256 = "1xp6b3w8gs702q27cg50gh5mcakgxdc23ahnbbgg2cw4mg4l9nqz"; libraryHaskellDepends = [ base containers msgpack protolude registry template-haskell text transformers vector @@ -241361,6 +241901,18 @@ self: { license = lib.licenses.mit; }) {}; + "rerebase_1_16_1" = callPackage + ({ mkDerivation, rebase }: + mkDerivation { + pname = "rerebase"; + version = "1.16.1"; + sha256 = "04pw2j4nh8x53axmfzp9d2plmiwxpxddgwcji0a8j24lkdyv8k32"; + libraryHaskellDepends = [ rebase ]; + description = "Reexports from \"base\" with a bunch of other standard libraries"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "reroute" = callPackage ({ mkDerivation, base, criterion, deepseq, graph-core, hashable , hspec, http-api-data, hvect, mtl, random, regex-compat, text @@ -247210,49 +247762,6 @@ self: { }) {}; "sandwich" = callPackage - ({ mkDerivation, aeson, ansi-terminal, async, base, brick - , bytestring, colour, containers, directory, exceptions, filepath - , free, haskell-src-exts, lens, lifted-async, microlens - , microlens-th, monad-control, monad-logger, mtl - , optparse-applicative, pretty-show, process, safe, safe-exceptions - , stm, string-interpolate, template-haskell, text, time - , transformers, transformers-base, unix, unliftio-core, vector, vty - }: - mkDerivation { - pname = "sandwich"; - version = "0.1.0.10"; - sha256 = "1163l9ammy91aclxf12hk5z65ivw4zz4b04bgpdlwalhlygnlxba"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lens - lifted-async microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - executableHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lens - lifted-async microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - testHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lens - lifted-async microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - description = "Yet another test framework for Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "sandwich_0_1_0_11" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, brick , bytestring, colour, containers, directory, exceptions, filepath , free, haskell-src-exts, lifted-async, microlens, microlens-th @@ -247293,7 +247802,6 @@ self: { ]; description = "Yet another test framework for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sandwich-hedgehog" = callPackage @@ -251339,8 +251847,8 @@ self: { }: mkDerivation { pname = "seonbi"; - version = "0.3.2"; - sha256 = "1a0mh7fi0h04n56vdl5xh2p4ql813743x7y11zl06llrj5cvgggg"; + version = "0.3.4"; + sha256 = "1yi01l1hn9fx7n39s5f7vwp9hlv5f0ah0gxs14dd46i2xrpxf5a8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -255913,6 +256421,41 @@ self: { mainProgram = "shake"; }) {}; + "shake_0_19_7" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, directory + , extra, filepath, filepattern, hashable, heaps, js-dgtable + , js-flot, js-jquery, primitive, process, QuickCheck, random, time + , transformers, unix, unordered-containers, utf8-string + }: + mkDerivation { + pname = "shake"; + version = "0.19.7"; + sha256 = "1lcr6q53qwm308bny6gfawcjhxsmalqi3dnwckam02zp2apmcaim"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary bytestring deepseq directory extra filepath filepattern + hashable heaps js-dgtable js-flot js-jquery primitive process + random time transformers unix unordered-containers utf8-string + ]; + executableHaskellDepends = [ + base binary bytestring deepseq directory extra filepath filepattern + hashable heaps js-dgtable js-flot js-jquery primitive process + random time transformers unix unordered-containers utf8-string + ]; + testHaskellDepends = [ + base binary bytestring deepseq directory extra filepath filepattern + hashable heaps js-dgtable js-flot js-jquery primitive process + QuickCheck random time transformers unix unordered-containers + utf8-string + ]; + description = "Build system library, like Make, but more accurate dependencies"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "shake"; + }) {}; + "shake-ats" = callPackage ({ mkDerivation, base, binary, cdeps, dependency, directory, hs2ats , language-ats, microlens, shake, shake-c, shake-cabal, shake-ext @@ -261685,6 +262228,21 @@ self: { mainProgram = "smtp2mta"; }) {}; + "smtpbz" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types + , text + }: + mkDerivation { + pname = "smtpbz"; + version = "1.0.0"; + sha256 = "1xn66l3bifrd6y12rssgsj4dihy325c9lbxl20ms49rnkcnwzwfq"; + libraryHaskellDepends = [ + aeson base bytestring http-conduit http-types text + ]; + description = "This is smtpbz"; + license = lib.licenses.bsd2; + }) {}; + "smtps-gmail" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring , conduit, conduit-extra, data-default, filepath, mime-mail @@ -267304,8 +267862,8 @@ self: { }: mkDerivation { pname = "stack2cabal"; - version = "1.0.13"; - sha256 = "00jibr5mvvaj9ggzvp3f0qcrwz51bg3a2m1447c45cwhailzaqkk"; + version = "1.0.14"; + sha256 = "11ja6k9k4gj9cfa7s6jv43wkm5f189a51rr21v4891226rf79agy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -270451,7 +271009,7 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "streamly_0_8_2" = callPackage + "streamly_0_8_3" = callPackage ({ mkDerivation, atomic-primops, base, containers, deepseq , directory, exceptions, filepath, fusion-plugin-types, ghc-prim , heaps, lockfree-queue, monad-control, mtl, network, primitive @@ -270459,8 +271017,8 @@ self: { }: mkDerivation { pname = "streamly"; - version = "0.8.2"; - sha256 = "0mqixkxvwcvb0fcgsrd1xvi9hag5dwj1cwg4brsmzj138fkjrn47"; + version = "0.8.3"; + sha256 = "0xjvrkyh8i6hkfr3vsi3n56z85qd56nyjiwi1abzhhdshvxw92xg"; libraryHaskellDepends = [ atomic-primops base containers deepseq directory exceptions filepath fusion-plugin-types ghc-prim heaps lockfree-queue @@ -271245,12 +271803,17 @@ self: { }) {}; "string-interpreter" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, cli-arguments, phonetic-languages-basis + , phonetic-languages-permutations-array + }: mkDerivation { pname = "string-interpreter"; - version = "0.6.0.0"; - sha256 = "0a0i95j8y49wijh2c0bpy5fwz72w0p6nh19df56g2yy7xik5h6xq"; - libraryHaskellDepends = [ base ]; + version = "0.7.0.0"; + sha256 = "0j8q9vps7r3vd71j4slz540y8a3bbh1c2hdn5d9g2892984chjb2"; + libraryHaskellDepends = [ + base cli-arguments phonetic-languages-basis + phonetic-languages-permutations-array + ]; description = "Is used in the phonetic languages approach (e. g. in the recursive mode)."; license = lib.licenses.mit; }) {}; @@ -273421,6 +273984,25 @@ self: { broken = true; }) {}; + "svg-icons" = callPackage + ({ mkDerivation, base, blaze-markup, blaze-svg, directory, text }: + mkDerivation { + pname = "svg-icons"; + version = "0.1.0.3"; + sha256 = "00d5n73p31xci44hkd58gn5szixmk4mvgzfiikkan1padg4kknki"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-markup blaze-svg directory text + ]; + executableHaskellDepends = [ + base blaze-markup blaze-svg directory text + ]; + description = "Svg Icons and more"; + license = lib.licenses.bsd3; + mainProgram = "svg-icons-exe"; + }) {}; + "svg-tree" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , JuicyPixels, lens, linear, mtl, scientific, text, transformers @@ -273955,6 +274537,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "syb_0_7_2_2" = callPackage + ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }: + mkDerivation { + pname = "syb"; + version = "0.7.2.2"; + sha256 = "1qxjjndfwz2vvpz9707banmcn6jl2v6w6zp401zxaj327fccchw1"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base containers mtl tasty tasty-hunit ]; + description = "Scrap Your Boilerplate"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "syb-extras" = callPackage ({ mkDerivation, base, eq, prelude-extras }: mkDerivation { @@ -274087,25 +274682,6 @@ self: { }) {}; "sydtest-discover" = callPackage - ({ mkDerivation, base, filepath, optparse-applicative, path - , path-io - }: - mkDerivation { - pname = "sydtest-discover"; - version = "0.0.0.1"; - sha256 = "1f0a169cl8lv6zz9hs351f6aqha9iyl1n2fwfzskccvx1m4dk8z6"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base filepath optparse-applicative path path-io - ]; - executableHaskellDepends = [ base ]; - description = "Automatic test suite discovery for sydtest"; - license = "unknown"; - mainProgram = "sydtest-discover"; - }) {}; - - "sydtest-discover_0_0_0_2" = callPackage ({ mkDerivation, base, filepath, optparse-applicative, path , path-io }: @@ -274121,7 +274697,6 @@ self: { executableHaskellDepends = [ base ]; description = "Automatic test suite discovery for sydtest"; license = "unknown"; - hydraPlatforms = lib.platforms.none; mainProgram = "sydtest-discover"; }) {}; @@ -279262,6 +279837,18 @@ self: { license = lib.licenses.mit; }) {}; + "template-haskell-compat-v0208_0_1_9_1" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "template-haskell-compat-v0208"; + version = "0.1.9.1"; + sha256 = "1z87rla4vcbghdrvjkay59b686f0by02102vwrcayn4vbwzn4am1"; + libraryHaskellDepends = [ base template-haskell ]; + description = "A backwards compatibility layer for Template Haskell newer than 2.8"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "template-haskell-optics" = callPackage ({ mkDerivation, base, containers, optics-core, template-haskell , th-abstraction @@ -281643,8 +282230,8 @@ self: { }: mkDerivation { pname = "text-lips"; - version = "0.1.0.1"; - sha256 = "1sm7sy11yc2rfjrpq5in7fqv3gh7zcfli8vw4b2mdlh6nxrh7k89"; + version = "0.1.0.2"; + sha256 = "0bjcapvcfpljjcf5z41xm5zqrjfyma8cs7cwzag3bl0zlppnq17h"; libraryHaskellDepends = [ base containers parsers text text-loc transformers ]; @@ -281658,8 +282245,8 @@ self: { ({ mkDerivation, base, hashable }: mkDerivation { pname = "text-loc"; - version = "0.1"; - sha256 = "069v99jnlayl2srl09355i56wpry0f6mq4bfp8lj0sxcsm1bzpgw"; + version = "0.1.1"; + sha256 = "00zd2bd8c9lrl34pwbnv0278jxipdycjjipxrfrfkn2iiawy65f9"; libraryHaskellDepends = [ base hashable ]; description = "Line-column locations within a text"; license = lib.licenses.bsd3; @@ -282445,6 +283032,21 @@ self: { license = lib.licenses.isc; }) {}; + "th-abstraction_0_4_5_0" = callPackage + ({ mkDerivation, base, containers, ghc-prim, template-haskell }: + mkDerivation { + pname = "th-abstraction"; + version = "0.4.5.0"; + sha256 = "09hm0famyqsq09lal2ylnhsb31hybj8zanldi7cqncky4i7y5m80"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + testHaskellDepends = [ base containers template-haskell ]; + description = "Nicer interface for reified information about data types"; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-alpha" = callPackage ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar @@ -284073,20 +284675,19 @@ self: { mainProgram = "tidal"; }) {}; - "tidal_1_8_1" = callPackage - ({ mkDerivation, base, bifunctors, bytestring, clock, colour - , containers, criterion, deepseq, exceptions, hosc, microspec, mtl - , network, parsec, primitive, random, text, transformers, weigh + "tidal_1_9_2" = callPackage + ({ mkDerivation, base, bytestring, clock, colour, containers + , criterion, deepseq, exceptions, hosc, microspec, mtl, network + , parsec, primitive, random, text, tidal-link, transformers, weigh }: mkDerivation { pname = "tidal"; - version = "1.8.1"; - sha256 = "00000haj9y3ss95dhphq2pq0xs2qagg76ra4lir5kg3pv71i2dh9"; + version = "1.9.2"; + sha256 = "0ncc5rc2g0brmgd28cbigp1rhvch9az30vg987q8fn7xfzbxw92h"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bifunctors bytestring clock colour containers deepseq - exceptions hosc mtl network parsec primitive random text - transformers + base bytestring clock colour containers deepseq exceptions hosc mtl + network parsec primitive random text tidal-link transformers ]; testHaskellDepends = [ base containers deepseq hosc microspec parsec @@ -284101,8 +284702,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "tidal-link"; - version = "1.0"; - sha256 = "0rc6gj6vfvhp9583farykw4i434krazak0gmm2h8nvfg8cw7liia"; + version = "1.0.1"; + sha256 = "0s3x73zx4rxjawcf2744z9dr05j4pabbxddrz9814h1d61q2cbb1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -284120,12 +284721,12 @@ self: { pname = "tidal-midi"; version = "0.9.10"; sha256 = "0d59s9vq2jmlb8b1bbay6n5911fjm9j04c9545p4i5visniv61b4"; - revision = "2"; - editedCabalFile = "1vc5ck25wdqz8ywk2zmn2nmg1mihwkihwp2wirxmmd0qxi1v2vpf"; + revision = "3"; + editedCabalFile = "0m6hn5nr0lj6h18388kf0dspiv798w6c2h73z6hrypn64dwmhvdg"; libraryHaskellDepends = [ base containers PortMidi tidal time transformers ]; - description = "MIDI support for tidal"; + description = "Please ignore this package"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; @@ -287257,8 +287858,8 @@ self: { }: mkDerivation { pname = "toysolver"; - version = "0.8.0"; - sha256 = "1vlswvlnj8xsz2lqwl0z9mnmznqgjzi0595jlcr2lw4d4na1sxs7"; + version = "0.8.1"; + sha256 = "00f3x4rq8334g2923l338vzdz9jmf4amab16awr29bkj90h1ay5a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -290264,8 +290865,8 @@ self: { }: mkDerivation { pname = "twee"; - version = "2.4.1"; - sha256 = "0gh0cr3f19jsfq6025y1lq0mcg8cd920xd3x7jmd1cjlyjbkslsf"; + version = "2.4.2"; + sha256 = "1m6pfxna4nby2mxalx6wa4gnnszhxfj58pc1i1by53c5fixnl1n6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -290277,18 +290878,16 @@ self: { }) {}; "twee-lib" = callPackage - ({ mkDerivation, base, containers, dlist, ghc-prim, pretty - , primitive, random, transformers, uglymemo, vector + ({ mkDerivation, base, bytestring, cereal, containers, dlist + , ghc-prim, pretty, primitive, random, transformers, uglymemo }: mkDerivation { pname = "twee-lib"; - version = "2.4.1"; - sha256 = "14pvmxq0dp8lwbmkvch4c6v4rblc8a2ybkm7q3hhr1qaj2pyiv0b"; - revision = "1"; - editedCabalFile = "1d9z1ggiw23snn35nhbkj0rh2abha2ca1csr49x5a7lxc974mzc7"; + version = "2.4.2"; + sha256 = "1fncqc2abb9hhy5ncb7174gy7n7wp5c9ablq07pr7k61i8ngqwd9"; libraryHaskellDepends = [ - base containers dlist ghc-prim pretty primitive random transformers - uglymemo vector + base bytestring cereal containers dlist ghc-prim pretty primitive + random transformers uglymemo ]; description = "An equational theorem prover"; license = lib.licenses.bsd3; @@ -291536,6 +292135,17 @@ self: { broken = true; }) {}; + "type-rig" = callPackage + ({ mkDerivation, base, invariant }: + mkDerivation { + pname = "type-rig"; + version = "0.1"; + sha256 = "105p9mvcig9damgihywjjikxcgdqgzb08w721rc908kxnz6f5m38"; + libraryHaskellDepends = [ base invariant ]; + description = "Classes for the rig (sums and products) of types"; + license = lib.licenses.bsd2; + }) {}; + "type-safe-avl" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -292475,6 +293085,29 @@ self: { license = lib.licenses.asl20; }) {}; + "tztime" = callPackage + ({ mkDerivation, base, deepseq, directory, doctest-parallel + , filepath, mtl, safe-exceptions, tasty, tasty-discover + , tasty-hunit-compat, template-haskell, text, th-test-utils, time + , time-compat, tz + }: + mkDerivation { + pname = "tztime"; + version = "0.1.0.0"; + sha256 = "0d605i6q281cmr3zxrhh51cahlgc4v0sdbzzrzyjwzdnf8rhj5nl"; + libraryHaskellDepends = [ + base deepseq directory filepath mtl safe-exceptions + template-haskell text time time-compat tz + ]; + testHaskellDepends = [ + base doctest-parallel tasty tasty-hunit-compat template-haskell + th-test-utils time time-compat + ]; + testToolDepends = [ tasty-discover ]; + description = "Safe timezone-aware handling of time"; + license = lib.licenses.mpl20; + }) {}; + "u2f" = callPackage ({ mkDerivation, aeson, asn1-encoding, asn1-types, base , base64-bytestring, binary, bytestring, cryptohash, cryptonite @@ -293628,8 +294261,8 @@ self: { pname = "unicode-data"; version = "0.3.0"; sha256 = "0pwjjsk0gjkn73ghj10s603p84xr7h2kfg351c9grzngrcv9giq8"; - revision = "1"; - editedCabalFile = "1invxbc1f635rywnkcpap9s93z08mbdfi3rzi7882lssf1wy0i85"; + revision = "2"; + editedCabalFile = "1hvqizqk4v231iy9kj0g2yq3cxzd37bw2yrxr36201qsznc2kxxq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -293760,6 +294393,8 @@ self: { pname = "unicode-transforms"; version = "0.4.0.1"; sha256 = "1z29jvli2rqkynfxni1gibl81458j7h8lrb8fg6lpnj8svhy2y1j"; + revision = "1"; + editedCabalFile = "0ml5j3j3dan7fgbyd3vgmlrij7bgszgfh244b1sppciis1v4m94p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -294959,23 +295594,6 @@ self: { }) {}; "unix-time" = callPackage - ({ mkDerivation, base, binary, bytestring, hspec, hspec-discover - , old-locale, old-time, QuickCheck, time - }: - mkDerivation { - pname = "unix-time"; - version = "0.4.7"; - sha256 = "02fyh298lm8jsg52i3z0ikazwz477ljqjmhnqr2d88grmn5ky8qr"; - libraryHaskellDepends = [ base binary bytestring old-time ]; - testHaskellDepends = [ - base bytestring hspec old-locale old-time QuickCheck time - ]; - testToolDepends = [ hspec-discover ]; - description = "Unix time parser/formatter and utilities"; - license = lib.licenses.bsd3; - }) {}; - - "unix-time_0_4_8" = callPackage ({ mkDerivation, base, binary, bytestring, hspec, hspec-discover , old-locale, old-time, QuickCheck, time }: @@ -294990,7 +295608,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Unix time parser/formatter and utilities"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "unjson" = callPackage @@ -297029,8 +297646,8 @@ self: { pname = "uuid"; version = "1.3.15"; sha256 = "0r05h16gd7fgfpq9iz43jcn9jzrgfa0gk4cv1xy0p4rli66rb1gq"; - revision = "1"; - editedCabalFile = "1wjcic98hvvz5xynlrk60dyfhw0nypv56sza24g2z3q62013rfrg"; + revision = "2"; + editedCabalFile = "06j1hk4alypnwd4v55w6lfm1jrsaqh85k350qmymw0sqbrd9rmx3"; libraryHaskellDepends = [ base binary bytestring cryptohash-md5 cryptohash-sha1 entropy network-info random text time uuid-types @@ -300532,7 +301149,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "vty_5_36" = callPackage + "vty_5_37" = callPackage ({ mkDerivation, ansi-terminal, base, binary, blaze-builder , bytestring, Cabal, containers, deepseq, directory, filepath , hashable, HUnit, microlens, microlens-mtl, microlens-th, mtl @@ -300543,8 +301160,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.36"; - sha256 = "19841hwr0s1s05dlxw5386vnrxka9567bn309d002y263wb8vfzi"; + version = "5.37"; + sha256 = "1w6dc25npvlaflxcyzdssnymgi7x03zkwg7swyjw6cjjfdmkgqb7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -300649,8 +301266,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.21"; - sha256 = "06j9di520ysv12xcd2yfdfscf1gfskfhn25ldwbp3vdx2hw9rjwp"; + version = "3.21.1"; + sha256 = "06yh0iw0yhs7kdgra3s39cl7fyvl2ys81ihw48k9jpravaal31xl"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -305086,6 +305703,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "welford-online-mean-variance" = callPackage + ({ mkDerivation, base, cereal, deepseq, QuickCheck, tasty + , tasty-discover, tasty-quickcheck, vector + }: + mkDerivation { + pname = "welford-online-mean-variance"; + version = "0.1.0.0"; + sha256 = "0px7b1jbz5wn3zvmj0y4nrwy9m99615nw06hd3snaa60z4m88blm"; + libraryHaskellDepends = [ base cereal deepseq vector ]; + testHaskellDepends = [ + base cereal deepseq QuickCheck tasty tasty-discover + tasty-quickcheck vector + ]; + testToolDepends = [ tasty-discover ]; + description = "Online computation of mean and variance using the Welford algorithm"; + license = lib.licenses.bsd3; + }) {}; + "welshy" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , http-types, lifted-base, resourcet, text, transformers @@ -305845,25 +306480,6 @@ self: { }) {}; "witch" = callPackage - ({ mkDerivation, base, bytestring, containers, HUnit - , template-haskell, text, time - }: - mkDerivation { - pname = "witch"; - version = "1.0.0.3"; - sha256 = "1d6wn4ykafq3hi439pf9ap55vjrcv668qq5wmxm5fiq6r78ndn0b"; - libraryHaskellDepends = [ - base bytestring containers template-haskell text time - ]; - testHaskellDepends = [ - base bytestring containers HUnit template-haskell text time - ]; - description = "Convert values from one type into another"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.maralorn ]; - }) {}; - - "witch_1_0_0_4" = callPackage ({ mkDerivation, base, bytestring, containers, HUnit , template-haskell, text, time, transformers }: @@ -305879,7 +306495,6 @@ self: { ]; description = "Convert values from one type into another"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.maralorn ]; }) {}; @@ -305999,12 +306614,12 @@ self: { }) {}; "witness" = callPackage - ({ mkDerivation, base, constraints, countable }: + ({ mkDerivation, base, constraints, containers, countable }: mkDerivation { pname = "witness"; - version = "0.6"; - sha256 = "1y8scf6a061s8gnx38sfwn88ramakjr0h54qwlwcjrjpf0y6024l"; - libraryHaskellDepends = [ base constraints countable ]; + version = "0.6.1"; + sha256 = "02ky1qc4ar8iy3rzjp2j89mp3k7skz5jp65vn7lilmwrvm1b2vcx"; + libraryHaskellDepends = [ base constraints containers countable ]; description = "values that witness types"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; @@ -311392,8 +312007,8 @@ self: { }: mkDerivation { pname = "yarl"; - version = "0.1.0.1"; - sha256 = "0qcfmvd3s18kz8g5sg7f4jaf2ai5dacszbk2nlnd1q3mafhz2cia"; + version = "0.1.1.0"; + sha256 = "188dxv2pncq6x54n679ia86pl3ym8h6zgczs6zzcrd3w78ph0vmh"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec hspec-core hspec-discover ]; testToolDepends = [ hspec-discover ]; @@ -312482,6 +313097,8 @@ self: { pname = "yesod-bin"; version = "1.6.2.2"; sha256 = "18bnr7wjcb5w8v62gfkrx7ky35agbkwl8f8vn2cdbjksa6wsllvr"; + revision = "1"; + editedCabalFile = "07zc0jf8gpv1zhyglgq2xj89jl6rc22mjv2v2k8lywlm8i5vjvdm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -312910,8 +313527,8 @@ self: { }: mkDerivation { pname = "yesod-form"; - version = "1.7.0"; - sha256 = "170gby381h5pg9njn908cyx2931yiv79x3rc5npg2rd74kif06vi"; + version = "1.7.2"; + sha256 = "1f50vhp1ggmh7ja1rw71d10cwzyqxzhkgjwwy2vwp9r4x6fkb836"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html blaze-markup byteable bytestring containers data-default email-validate From 25cb49180fac6c5efc59a98baa00fcdb8e342f24 Mon Sep 17 00:00:00 2001 From: maralorn Date: Mon, 19 Sep 2022 14:58:55 +0200 Subject: [PATCH 06/53] all-cabal-hashes: 2022-09-18T11:31:48Z -> 2022-09-19T12:29:18Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 695ac903732a..fc9feaaed083 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "1aaf651c377b16816f7ded0d09b32f6af8a2f4ec", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/1aaf651c377b16816f7ded0d09b32f6af8a2f4ec.tar.gz", - "sha256": "0l73lzb2yaq3jggn3v9rgv49xn302ccgw1mvd3ga66wh7n89djvm", - "msg": "Update from Hackage at 2022-09-18T11:31:48Z" + "commit": "e456824564bb5457549a70dc03c7ae00b3dfaec3", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e456824564bb5457549a70dc03c7ae00b3dfaec3.tar.gz", + "sha256": "0kvjhghjhs5b6ldp4yyyy158lqk54aahqqp4n0mm67p7qv09i5xr", + "msg": "Update from Hackage at 2022-09-19T12:29:18Z" } From 2d4bd8892f169f1755920bd5407c9c1a4dad14e9 Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 20 Sep 2022 02:10:05 +0200 Subject: [PATCH 07/53] haskellPackages: Bump hspec versions --- .../haskell-modules/configuration-common.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2af3f162cc0c..a5d1ba5f3c09 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -817,12 +817,12 @@ self: super: { # requires git at test-time *and* runtime, but we'll just rely on users to # bring their own git at runtime sensei = overrideCabal (drv: { - testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_9_3 ]; + testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_10_5 ]; testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ]; }) (super.sensei.override { - hspec = self.hspec_2_10_5; + hspec = self.hspec_2_10_6; hspec-wai = super.hspec-wai.override { - hspec = self.hspec_2_10_5; + hspec = self.hspec_2_10_6; }; }); @@ -1642,15 +1642,15 @@ self: super: { servant-openapi3 = dontCheck super.servant-openapi3; # Give hspec 2.10.* correct dependency versions without overrideScope - hspec_2_10_5 = doDistribute (super.hspec_2_10_5.override { - hspec-discover = self.hspec-discover_2_10_5; - hspec-core = self.hspec-core_2_10_5; + hspec_2_10_6 = doDistribute (super.hspec_2_10_6.override { + hspec-discover = self.hspec-discover_2_10_6; + hspec-core = self.hspec-core_2_10_6; }); - hspec-discover_2_10_5 = super.hspec-discover_2_10_5.override { - hspec-meta = self.hspec-meta_2_9_3; + hspec-discover_2_10_6 = super.hspec-discover_2_10_6.override { + hspec-meta = self.hspec-meta_2_10_5; }; - hspec-core_2_10_5 = super.hspec-core_2_10_5.override { - hspec-meta = self.hspec-meta_2_9_3; + hspec-core_2_10_6 = super.hspec-core_2_10_6.override { + hspec-meta = self.hspec-meta_2_10_5; }; # Point hspec 2.7.10 to correct dependencies From 6f241f7cec70bbacd6cb3e4c672987e09fb74e9d Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 20 Sep 2022 02:11:26 +0200 Subject: [PATCH 08/53] haskellPackages: Move permanent overrides to configuration.nix --- pkgs/development/haskell-modules/configuration-common.nix | 5 ----- pkgs/development/haskell-modules/configuration-nix.nix | 5 ++++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a5d1ba5f3c09..a0900d72cf17 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1010,11 +1010,6 @@ self: super: { # https://github.com/haskell-hvr/hgettext/issues/14 hgettext = doJailbreak super.hgettext; - # Generate shell completion. - cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; - - ormolu = generateOptparseApplicativeCompletion "ormolu" super.ormolu; - stack = generateOptparseApplicativeCompletion "stack" (doJailbreak # for Cabal constraint added on hackage diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index cc163ec74cec..503601a1b656 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -96,8 +96,11 @@ self: super: builtins.intersectAttrs super { # avoid compiling twice by providing executable as a separate output (with small closure size) niv = enableSeparateBinOutput (generateOptparseApplicativeCompletion "niv" super.niv); - ormolu = enableSeparateBinOutput super.ormolu; ghcid = enableSeparateBinOutput super.ghcid; + ormolu = generateOptparseApplicativeCompletion "ormolu" (enableSeparateBinOutput super.ormolu); + + # Generate shell completion. + cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; arbtt = overrideCabal (drv: { # The test suite needs the packages's executables in $PATH to succeed. From cbb22921dbf0b48ede636d816ad1b64cef13ce1c Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 20 Sep 2022 02:12:09 +0200 Subject: [PATCH 09/53] haskellPackages.hie-bios: Remove unused 0.5.0 override --- pkgs/development/haskell-modules/configuration-nix.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 503601a1b656..a728aa6376b6 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -679,7 +679,6 @@ self: super: builtins.intersectAttrs super { # Tests access homeless-shelter. hie-bios = dontCheck super.hie-bios; - hie-bios_0_5_0 = dontCheck super.hie-bios_0_5_0; # Compiling the readme throws errors and has no purpose in nixpkgs aeson-gadt-th = From 161a30b76a660091ecb6cbc988e9fbb79f9f8430 Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 20 Sep 2022 02:50:55 +0200 Subject: [PATCH 10/53] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 186 ++++++++++++------ 1 file changed, 128 insertions(+), 58 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bb8425f2422b..577b5c208f26 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -51679,8 +51679,8 @@ self: { ({ mkDerivation, base, Cabal, QuickCheck }: mkDerivation { pname = "cabal-detailed-quickcheck"; - version = "0.1.3.0"; - sha256 = "188yzxmrk758py75vk5rfbrn105dysk5nmf9wdgb3a27911b649c"; + version = "0.1.3.2"; + sha256 = "0pxl8jf8ak9irln9vkkhb5mrbvq62c9p71gxhwzml1042gbl93x9"; libraryHaskellDepends = [ base Cabal QuickCheck ]; description = "QuickCheck for Cabal tests"; license = lib.licenses.mit; @@ -94547,6 +94547,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "explainable-predicates_0_1_2_3" = callPackage + ({ mkDerivation, array, base, doctest-exitcode-stdio, doctest-lib + , hspec, HUnit, mono-traversable, QuickCheck, regex-tdfa, syb + , template-haskell + }: + mkDerivation { + pname = "explainable-predicates"; + version = "0.1.2.3"; + sha256 = "1ch86wb7bz9ydvrbdd2arskaj5pdc2x9vby4pbvnwv1r4d8n40la"; + libraryHaskellDepends = [ + array base HUnit mono-traversable QuickCheck regex-tdfa syb + template-haskell + ]; + testHaskellDepends = [ + base doctest-exitcode-stdio doctest-lib hspec + ]; + description = "Predicates that can explain themselves"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "explicit-constraint-lens" = callPackage ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { @@ -110363,8 +110384,8 @@ self: { }: mkDerivation { pname = "ghc-tags-core"; - version = "0.4.0.0"; - sha256 = "1w1h1j3pchka8nvqpa25s7z5hbzlf4nb2xb2g7krnannkd58wxyp"; + version = "0.4.1.0"; + sha256 = "0lcgbp61zvaa52ynp4lwnjf7vwk126f496r16zfbc6saxrgdmz0p"; libraryHaskellDepends = [ attoparsec base bytestring containers deepseq directory filepath-bytestring ghc mtl pipes pipes-attoparsec pipes-bytestring @@ -110393,8 +110414,8 @@ self: { }: mkDerivation { pname = "ghc-tags-plugin"; - version = "0.5.0.0"; - sha256 = "1vwrk7cdq9hc2yw0ab5p86bp69vwkj26c3ys5k3fgvy5w343i148"; + version = "0.5.1.0"; + sha256 = "0k8lg8k4vd6z12zfks50j6i9mz827bgchjg55snbgnh3h30is6ab"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130787,8 +130808,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.65.3"; - sha256 = "07m5dha3ayqrdp8alq40wqq8b3388m130r0m33v0dfda51gr3p5n"; + version = "0.65.5"; + sha256 = "00w0y7agxmazfaq8ghkv8mppswxppdp8d02bcdnr70xfich8w3qc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130836,8 +130857,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.65.2"; - sha256 = "1nx2fiai27mycbqsxi1hbgwnsaa36836zzg65bdaj5wl03549ywj"; + version = "0.65.5"; + sha256 = "121vyncj8f2hwxd1j96d134c6fdr4lf3pqdrrj5n3gjb0rj61vn8"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -137433,8 +137454,8 @@ self: { }: mkDerivation { pname = "hgettext"; - version = "0.1.40"; - sha256 = "1qrmvgi0517zywqw3yvm7f86766sv6hanchv6cr54vm2z9r88ciy"; + version = "0.1.40.1"; + sha256 = "1wdwrp4zjhjjq49yihid9x4lhx26nbixax84njj02d79wq2kmdb7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139969,7 +139990,7 @@ self: { maintainers = [ lib.maintainers.peti ]; }) {}; - "hledger_1_27" = callPackage + "hledger_1_27_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, breakpoint, bytestring , cmdargs, containers, data-default, Decimal, Diff, directory , extra, filepath, githash, hashable, haskeline, hledger-lib, lucid @@ -139980,8 +140001,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.27"; - sha256 = "0v74wja2rd9ip1993p0sv7pwl2f0k4rapd6r6s5wq0c5j50s2wpq"; + version = "1.27.1"; + sha256 = "0qdg87m7ys2ykqqq32p7h7aw827w4f5bcqx4dspxxq6zqlvzddqb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140238,7 +140259,7 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "hledger-lib_1_27" = callPackage + "hledger-lib_1_27_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base , blaze-markup, breakpoint, bytestring, call-stack, cassava , cassava-megaparsec, cmdargs, containers, data-default, Decimal @@ -140250,8 +140271,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.27"; - sha256 = "0l52dhpglvjsw1dllidpqd38gc2djm2mxlcidsm1iil93812vmyp"; + version = "1.27.1"; + sha256 = "0w2jnpyfc6pp3n5fzdjd78hdh9vv9w98xwd2j6dw98rm6hlapwhb"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base blaze-markup breakpoint bytestring call-stack cassava cassava-megaparsec cmdargs containers @@ -140383,7 +140404,7 @@ self: { maintainers = [ lib.maintainers.peti ]; }) {}; - "hledger-ui_1_27" = callPackage + "hledger-ui_1_27_1" = callPackage ({ mkDerivation, ansi-terminal, async, base, breakpoint, brick , cmdargs, containers, data-default, directory, doclayout, extra , filepath, fsnotify, hledger, hledger-lib, megaparsec, microlens @@ -140392,8 +140413,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.27"; - sha256 = "06gkzzckq3bq5z0svi498zvsi9hzgrkzvf8736s28mcazdlkxdj1"; + version = "1.27.1"; + sha256 = "1srzlz0mdcp0259k0vsc8xkisd9l59s30j1k1x9bnsn179n8bi22"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -140466,7 +140487,7 @@ self: { maintainers = [ lib.maintainers.peti ]; }) {}; - "hledger-web_1_27" = callPackage + "hledger-web_1_27_1" = callPackage ({ mkDerivation, aeson, base, base64, blaze-html, blaze-markup , breakpoint, bytestring, case-insensitive, clientsession, cmdargs , conduit, conduit-extra, containers, data-default, Decimal @@ -140479,8 +140500,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.27"; - sha256 = "0j4xdpxhx83g4pg4w2x81x93ca3apwdnpgjig43x16p1gc04kvw4"; + version = "1.27.1"; + sha256 = "151dxci7dld8626dzw823sr3d9iaac92wfzbfcbdz4jh9f7n07wa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141209,8 +141230,8 @@ self: { pname = "hls-qualify-imported-names-plugin"; version = "1.0.1.0"; sha256 = "0h456cq3qvksrkzfzpq2qsabsl3vpg4gh2mwyxc39xh4qm7ifban"; - revision = "1"; - editedCabalFile = "0pb9fgpbv24726n250rkb33gx3f3xcaxmv1qqh12q4sz181qn4mb"; + revision = "2"; + editedCabalFile = "1adnnd8fg4pfdc6n1797naqf4pmgspisjmw121mk39y02b057cdw"; libraryHaskellDepends = [ aeson base containers deepseq dlist ghc ghcide hls-graph hls-plugin-api lsp text transformers unordered-containers @@ -142569,8 +142590,8 @@ self: { }: mkDerivation { pname = "hoauth2-tutorial"; - version = "0.1"; - sha256 = "08c5zhqsi4817sgjczb4k0a2ga12n6vgr17r9dlgzwx2x7khak6l"; + version = "0.1.1"; + sha256 = "1qac41pv4j13kbf43915j5ybdsi3a93akcn15ip3rs36zvcv63i3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178110,8 +178131,8 @@ self: { }: mkDerivation { pname = "linearmap-category"; - version = "0.4.3.0"; - sha256 = "0319x0fz863d44p1lzgbnp8nwxdpvn50ms29z7lwh0g3s0mcs628"; + version = "0.5.0.1"; + sha256 = "0d8abx928mr0cw04xja5ffybzlmvb4pq6g4cdm9px5r7x567hpb5"; libraryHaskellDepends = [ base call-stack constrained-categories containers data-default-class free-vector-spaces hashable ieee754 lens linear @@ -222764,8 +222785,8 @@ self: { }: mkDerivation { pname = "polysemy-log"; - version = "0.7.0.0"; - sha256 = "1n39zpg992vmz0pcf89ljf6vy83z5r27jzg4iakh97bpfskacii6"; + version = "0.7.1.0"; + sha256 = "1cmj8h9c8w17sg2kqm9dw6cnh0b3va44n8aga02r1dg7cbw7wlbk"; libraryHaskellDepends = [ ansi-terminal async base incipit-core polysemy polysemy-conc polysemy-time stm time @@ -222785,8 +222806,8 @@ self: { }: mkDerivation { pname = "polysemy-log-co"; - version = "0.7.0.0"; - sha256 = "10f5fg0xx58v4rnd62ll68k7anahrgb7iqv5fkz4xb17yvrkgckk"; + version = "0.7.1.0"; + sha256 = "1qylyx2fjk5x685z523xzk1z3vld1w7gn62jx43hjgd6839ngzbz"; libraryHaskellDepends = [ base co-log co-log-polysemy incipit-core polysemy polysemy-conc polysemy-log polysemy-time stm @@ -222806,8 +222827,8 @@ self: { }: mkDerivation { pname = "polysemy-log-di"; - version = "0.7.0.0"; - sha256 = "03rfjx91wc2m79alxjhi2mqlxnal87nbgwidin04s9x3zq2hyk9k"; + version = "0.7.1.0"; + sha256 = "1nzqlj1sdic8hai8bmy6mbic0519nm17zinlrzzlmxha78a75bp9"; libraryHaskellDepends = [ base di-polysemy incipit-core polysemy polysemy-conc polysemy-log polysemy-time stm @@ -236983,6 +237004,8 @@ self: { pname = "rebase"; version = "1.16.1"; sha256 = "0mb1x5p3lvfhxsrnmkhsv6f4rd1cxp6m3qg6kyz30svrbwxsvvkz"; + revision = "1"; + editedCabalFile = "1igpk9gz54jfvf5m69xcp7hl567c4lkbmwhzylcbx0i1n0pd7i2n"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers contravariant deepseq dlist either groups hashable invariant mtl profunctors scientific @@ -251056,14 +251079,29 @@ self: { license = lib.licenses.mit; }) {}; + "selda_0_5_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, mtl + , random, text, time, uuid-types + }: + mkDerivation { + pname = "selda"; + version = "0.5.2.0"; + sha256 = "1n0zkd80a9z83q5nld0gyg2p25nfy4rjkihql88binhknhk3hkgk"; + libraryHaskellDepends = [ + base bytestring containers exceptions mtl random text time + uuid-types + ]; + description = "Multi-backend, high-level EDSL for interacting with SQL databases"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "selda-json" = callPackage ({ mkDerivation, aeson, base, bytestring, selda, text }: mkDerivation { pname = "selda-json"; - version = "0.1.1.0"; - sha256 = "1ai24qmz5nkpqx0zd24ix0ci5aqiccfy57fkf8f87swrv28101l8"; - revision = "1"; - editedCabalFile = "1gajzv8zhj8i3bxzjh81vjn8j2igh3nrawfpddvxg1ayb5l2d2y0"; + version = "0.1.1.1"; + sha256 = "0sjy83538g6a2yq1q9ifadfwp7lf5b2grmm0i02qpp47n1b039rh"; libraryHaskellDepends = [ aeson base bytestring selda text ]; description = "JSON support for the Selda database library"; license = lib.licenses.mit; @@ -251077,10 +251115,8 @@ self: { }: mkDerivation { pname = "selda-postgresql"; - version = "0.1.8.1"; - sha256 = "0dxycilvxjbi1cy9c0rzq9ywh48i2lh37j77a5i1x6v1625h51mk"; - revision = "1"; - editedCabalFile = "10qlb9yswjsvpj1f7dmm0amkq52g00f1kc2xqh1d7vfkvkb2bhk6"; + version = "0.1.8.2"; + sha256 = "1rn75ynvn2iipz9yj3h4iwgz2922s9hwpgiga0brj00pb0b5a52g"; libraryHaskellDepends = [ base bytestring exceptions postgresql-binary postgresql-libpq selda selda-json text time uuid-types @@ -251108,6 +251144,23 @@ self: { license = lib.licenses.mit; }) {}; + "selda-sqlite_0_1_7_2" = callPackage + ({ mkDerivation, base, bytestring, direct-sqlite, directory + , exceptions, selda, text, time, uuid-types + }: + mkDerivation { + pname = "selda-sqlite"; + version = "0.1.7.2"; + sha256 = "1cldk804vv82dp3hyxcddzy3plijgkmjz3ykrjzy7afqni97yc4y"; + libraryHaskellDepends = [ + base bytestring direct-sqlite directory exceptions selda text time + uuid-types + ]; + description = "SQLite backend for the Selda database EDSL"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "select" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -267445,7 +267498,7 @@ self: { , mintty, mono-traversable, mtl, mustache, neat-interpolation , network-uri, open-browser, optparse-applicative, pantry, path , path-io, persistent, persistent-sqlite, persistent-template - , pretty, primitive, process, project-template, QuickCheck + , pretty, primitive, process, project-template, QuickCheck, random , raw-strings-qq, retry, rio, rio-prettyprint, semigroups , smallcheck, split, stm, streaming-commons, tar, template-haskell , temporary, text, text-metrics, th-reify-many, time, tls @@ -267455,10 +267508,8 @@ self: { }: mkDerivation { pname = "stack"; - version = "2.7.5"; - sha256 = "103yyfl02chbmkb6csri403921z7jhfdrrv99lch951flv149pcx"; - revision = "2"; - editedCabalFile = "18hiffjrzfn97yl9al97vxing6qajiv732nr61i4lv1y4xhhm6v8"; + version = "2.9.1"; + sha256 = "01020dx89m07qmjs58vs2kidhkzq3106md08w6c65bzxvlf6kcwk"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -267477,9 +267528,9 @@ self: { mtl mustache neat-interpolation network-uri open-browser optparse-applicative pantry path path-io persistent persistent-sqlite persistent-template pretty primitive process - project-template retry rio rio-prettyprint semigroups split stm - streaming-commons tar template-haskell temporary text text-metrics - th-reify-many time tls transformers typed-process + project-template random retry rio rio-prettyprint semigroups split + stm streaming-commons tar template-haskell temporary text + text-metrics th-reify-many time tls transformers typed-process unicode-transforms unix unix-compat unliftio unordered-containers vector yaml zip-archive zlib ]; @@ -267494,9 +267545,9 @@ self: { mtl mustache neat-interpolation network-uri open-browser optparse-applicative pantry path path-io persistent persistent-sqlite persistent-template pretty primitive process - project-template retry rio rio-prettyprint semigroups split stm - streaming-commons tar template-haskell temporary text text-metrics - th-reify-many time tls transformers typed-process + project-template random retry rio rio-prettyprint semigroups split + stm streaming-commons tar template-haskell temporary text + text-metrics th-reify-many time tls transformers typed-process unicode-transforms unix unix-compat unliftio unordered-containers vector yaml zip-archive zlib ]; @@ -267511,7 +267562,7 @@ self: { mono-traversable mtl mustache neat-interpolation network-uri open-browser optparse-applicative pantry path path-io persistent persistent-sqlite persistent-template pretty primitive process - project-template QuickCheck raw-strings-qq retry rio + project-template QuickCheck random raw-strings-qq retry rio rio-prettyprint semigroups smallcheck split stm streaming-commons tar template-haskell temporary text text-metrics th-reify-many time tls transformers typed-process unicode-transforms unix unix-compat @@ -273988,8 +274039,8 @@ self: { ({ mkDerivation, base, blaze-markup, blaze-svg, directory, text }: mkDerivation { pname = "svg-icons"; - version = "0.1.0.3"; - sha256 = "00d5n73p31xci44hkd58gn5szixmk4mvgzfiikkan1padg4kknki"; + version = "0.4.0.2"; + sha256 = "1z31ynhchk27hzfayrbnh9xzdq5ibz57ls2jk7j5jck9xmxl7zac"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -287233,6 +287284,8 @@ self: { pname = "toml-reader"; version = "0.1.0.0"; sha256 = "06gxp8pzh8cdrifg5n0mhlnrslrx7k235sz2ldpy60x7vz7qywv9"; + revision = "1"; + editedCabalFile = "16qfl1bz7c8a34xvs5fzs5r421309xpw9gfsiv2szivd5hcp9f9r"; libraryHaskellDepends = [ base containers deepseq megaparsec parser-combinators text time ]; @@ -287244,6 +287297,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "toml-reader-parse" = callPackage + ({ mkDerivation, base, comonad, containers, deepseq, dlist, mtl + , prettyprinter, prettyprinter-combinators, text, time, toml-reader + , vector + }: + mkDerivation { + pname = "toml-reader-parse"; + version = "0.1.0.0"; + sha256 = "1ddwk29isiq190fd025laq0g8js7ifcngph9acy8zlmppp3685w7"; + libraryHaskellDepends = [ + base comonad containers deepseq dlist mtl prettyprinter + prettyprinter-combinators text time toml-reader vector + ]; + description = "Alternative parser for TOML values produced by the toml-reader package"; + license = lib.licenses.asl20; + }) {}; + "tomland" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , hashable, hedgehog, hspec, hspec-hedgehog, hspec-megaparsec From 33944d5ddd7ddfb841248c77f45c46d2228d21a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Sep 2022 16:25:47 +0200 Subject: [PATCH 11/53] openssl: fix static cross compilation --- pkgs/development/libraries/openssl/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 471666129fc1..78cc680c7be5 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -67,7 +67,8 @@ let !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl ] + ++ lib.optionals static [ removeReferencesTo ]; buildInputs = lib.optional withCryptodev cryptodev # perl is included to allow the interpreter path fixup hook to set the # correct interpreter in c_rehash. @@ -155,7 +156,7 @@ let postInstall = (if static then '' # OPENSSLDIR has a reference to self - ${removeReferencesTo}/bin/remove-references-to -t $out $out/lib/*.a + remove-references-to -t $out $out/lib/*.a '' else '' # If we're building dynamic libraries, then don't install static # libraries. From 2a5b10b81d625fb4f57bc499e9d0db654306ba86 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Tue, 20 Sep 2022 16:16:21 -0400 Subject: [PATCH 12/53] stack: get 2.9.1 building --- .../haskell-modules/configuration-common.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a0900d72cf17..59ded829ff47 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1012,20 +1012,12 @@ self: super: { stack = generateOptparseApplicativeCompletion "stack" - (doJailbreak # for Cabal constraint added on hackage - (appendPatch - (fetchpatch { - # https://github.com/commercialhaskell/stack/pull/5559 - # When removing, also remove doJailbreak. - name = "stack-pull-5559.patch"; - url = "https://github.com/hercules-ci/stack/compare/v2.7.5...brandon-leapyear/chinn/cabal-0.patch"; - sha256 = "sha256-OXmdGgQ2KSKtQKOK6eePLgvUOTlzac544HQYKJpcjnU="; - }) + # stack has a bunch of constraints in its .cabal file that don't seem to be necessary + (doJailbreak (super.stack.overrideScope (self: super: { - # stack 2.7.5 requires aeson <= 1.6. - aeson = self.aeson_1_5_6_0; - })) - )); + # Needs Cabal-3.6 + Cabal = self.Cabal_3_6_3_0; + }))); # Too strict version bound on hashable-time. # Tests require newer package version. From e678b769bc88738c70db57befba5c08075e391d3 Mon Sep 17 00:00:00 2001 From: maralorn Date: Wed, 21 Sep 2022 00:45:51 +0200 Subject: [PATCH 13/53] hedgewars: disable on darwin --- pkgs/games/hedgewars/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 04bed46f8b6e..4c4914190ed4 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -82,6 +82,7 @@ stdenv.mkDerivation rec { hedgehog or hedgehogs after a player's or CPU turn is shown only when all movement on the battlefield has ceased).''; maintainers = with maintainers; [ kragniz fpletz ]; - inherit (fpc.meta) platforms; + broken = stdenv.isDarwin; + platforms = platforms.linux; }; } From 6a3d7aeb8e05683be2902fc3aff553ce9c78dfe4 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 20 Sep 2022 14:17:58 +0800 Subject: [PATCH 14/53] k3s: fix cross compilation --- pkgs/applications/networking/cluster/k3s/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 7a16f9cc2095..47caa1721336 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -22,6 +22,7 @@ , zstd , yq-go , nixosTests +, pkgsBuildBuild }: with lib; @@ -240,7 +241,11 @@ buildGoModule rec { substituteInPlace scripts/package-cli \ --replace '"''${GO}" generate' \ - 'GOFLAGS="" "''${GO}" generate' + 'GOFLAGS="" \ + GOOS="${pkgsBuildBuild.go.GOOS}" \ + GOARCH="${pkgsBuildBuild.go.GOARCH}" \ + CC="${pkgsBuildBuild.stdenv.cc}/bin/cc" \ + "''${GO}" generate' ''; # Important utilities used by the kubelet, see From a7d50b4e0988e4f53d2d3629c7b5f57c2736480f Mon Sep 17 00:00:00 2001 From: maralorn Date: Wed, 21 Sep 2022 05:14:42 +0200 Subject: [PATCH 15/53] haskellPackages.ghcup: Remove override for defunct package --- pkgs/development/haskell-modules/configuration-common.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 59ded829ff47..9abcbaa83304 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2096,11 +2096,6 @@ self: super: { # https://github.com/plow-technologies/hspec-golden-aeson/issues/17 hspec-golden-aeson = dontCheck super.hspec-golden-aeson; - # 2021-11-05: jailBreak the too tight upper bound on haskus-utils-variant - ghcup = doJailbreak (super.ghcup.overrideScope (self: super: { - Cabal = self.Cabal_3_6_3_0; - })); - # 2022-03-21: Newest stylish-haskell needs ghc-lib-parser-9_2 stylish-haskell = (super.stylish-haskell.override { ghc-lib-parser = super.ghc-lib-parser_9_2_4_20220729; From 7c2fda45cc67990994ee160309fb5ed2e8425ff3 Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 20 Sep 2022 02:49:35 +0200 Subject: [PATCH 16/53] haskell-language-server: 1.7.0.0 -> 1.8.0.0 --- .../scripts/haskell/update-stackage.sh | 7 + .../haskell-modules/configuration-common.nix | 68 ++--- .../configuration-ghc-8.10.x.nix | 35 +-- .../configuration-ghc-8.8.x.nix | 29 +- .../configuration-ghc-9.0.x.nix | 6 + .../configuration-ghc-9.2.x.nix | 31 +- .../configuration-hackage2nix/main.yaml | 10 +- .../configuration-hackage2nix/stackage.yaml | 4 - .../haskell-modules/configuration-nix.nix | 18 +- .../haskell-modules/hackage-packages.nix | 269 +++++++++++------- 10 files changed, 269 insertions(+), 208 deletions(-) diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index 4da9f6d28c2f..f1f04cdf4504 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -58,7 +58,14 @@ sed -r \ -e '/ jailbreak-cabal /d' \ -e '/ language-nix /d' \ -e '/ cabal-install /d' \ + -e '/ lsp /d' \ + -e '/ lsp-types /d' \ + -e '/ lsp-test /d' \ + -e '/ hie-bios /d' \ < "${tmpfile_new}" >> $stackage_config +# Explanations: +# cabal2nix, distribution-nixpkgs, jailbreak-cabal, language-nix: These are our packages and we know what we are doing. +# lsp, lsp-types, lsp-test, hie-bios: These are tightly coupled to hls which is not in stackage. They have no rdeps in stackage. if [[ "${1:-}" == "--do-commit" ]]; then git add $stackage_config diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9abcbaa83304..6761be0d34d8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1286,13 +1286,17 @@ self: super: { # upstream: https://github.com/obsidiansystems/which/pull/6 which = doJailbreak super.which; - # the test suite attempts to run the binaries built in this package - # through $PATH but they aren't in $PATH - dhall-lsp-server = dontCheck super.dhall-lsp-server; - # https://github.com/ocharles/weeder/issues/15 weeder = doJailbreak super.weeder; + # 2022-09-20: We have overridden lsp to not be the stackage version. + # dhall-lsp-server needs the older 1.4.0.0 lsp + dhall-lsp-server = super.dhall-lsp-server.override { + lsp = dontCheck (super.lsp_1_4_0_0.override { + lsp-types = super.lsp-types_1_4_0_1; + }); + }; + # Requested version bump on upstream https://github.com/obsidiansystems/constraints-extras/issues/32 constraints-extras = doJailbreak super.constraints-extras; @@ -1518,20 +1522,22 @@ self: super: { }) ] super.binary-strict; - # 2020-11-19: Checks nearly fixed, but still disabled because of flaky tests: - # https://github.com/haskell/haskell-language-server/issues/610 - # https://github.com/haskell/haskell-language-server/issues/611 - haskell-language-server = lib.pipe super.haskell-language-server [ + haskell-language-server = (lib.pipe super.haskell-language-server [ dontCheck - (appendConfigureFlags ["-ftactics"]) - (overrideCabal (old: { - libraryHaskellDepends = old.libraryHaskellDepends ++ [ - super.hls-tactics-plugin - ]; - })) - ]; + (disableCabalFlag "stan") # Sorry stan is totally unmaintained and terrible to get to run. It only works on ghc 8.8 or 8.10 anyways … + ]).overrideScope (lself: lsuper: { + # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515 + hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1; + ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4; + ormolu = doJailbreak lself.ormolu_0_5_0_1; + fourmolu = doJailbreak lself.fourmolu_0_8_2_0; + ghc-lib-parser = lself.ghc-lib-parser_9_2_4_20220729; + }); - lsp = assert super.lsp.version == "1.4.0.0"; dontCheck super.lsp; + # For -f-auto see cabal.project in haskell-language-server. + ghc-lib-parser-ex_9_2_0_4 = disableCabalFlag "auto" (super.ghc-lib-parser-ex_9_2_0_4.override { + ghc-lib-parser = self.ghc-lib-parser_9_2_4_20220729; + }); # 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1809 hls-eval-plugin = dontCheck super.hls-eval-plugin; @@ -1552,6 +1558,9 @@ self: super: { # https://github.com/haskell/haskell-language-server/issues/2375 hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin; + # 2022-09-19: https://github.com/haskell/haskell-language-server/issues/3200 + hls-refactor-plugin = dontCheck super.hls-refactor-plugin; + # 2021-03-21: Test hangs # https://github.com/haskell/haskell-language-server/issues/1562 # 2021-11-13: Too strict upper bound on implicit-hie-cradle @@ -2098,19 +2107,7 @@ self: super: { # 2022-03-21: Newest stylish-haskell needs ghc-lib-parser-9_2 stylish-haskell = (super.stylish-haskell.override { - ghc-lib-parser = super.ghc-lib-parser_9_2_4_20220729; - ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_1_1; - }); - - ghc-lib-parser-ex_9_2_1_1 = super.ghc-lib-parser-ex_9_2_1_1.override { - ghc-lib-parser = super.ghc-lib-parser_9_2_4_20220729; - }; - - ghc-lib-parser-ex_9_2_0_4 = super.ghc-lib-parser-ex_9_2_0_4.override { - ghc-lib-parser = super.ghc-lib-parser_9_2_4_20220729; - }; - - hlint_3_4_1 = doDistribute (super.hlint_3_4_1.override { + ghc-lib-parser = self.ghc-lib-parser_9_2_4_20220729; ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4; }); @@ -2141,10 +2138,6 @@ self: super: { # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too. streamly-posix = doJailbreak super.streamly-posix; - # Not running the "example" test because it requires a binary from lsps test - # suite which is not part of the output of lsp. - lsp-test = overrideCabal (old: { testTarget = "tests func-test"; }) super.lsp-test; - # 2021-09-14: Tests are flaky. hls-splice-plugin = dontCheck super.hls-splice-plugin; @@ -2492,13 +2485,8 @@ self: super: { # has been resolved. lucid-htmx = doJailbreak super.lucid-htmx; - lsp_1_5_0_0 = doDistribute (super.lsp_1_5_0_0.override { - lsp-types = self.lsp-types_1_5_0_0; - }); - - futhark = super.futhark.override { - lsp = self.lsp_1_5_0_0; - }; + # 2022-09-20: Restrictive upper bound on lsp + futhark = doJailbreak super.futhark; # Too strict bounds on hspec # https://github.com/klapaucius/vector-hashtables/issues/11 diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 4e71c26a504b..1eb8e4af80f7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -96,31 +96,20 @@ self: super: { executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ]; }) super.hnix); + haskell-language-server = addBuildDepend self.hls-brittany-plugin (super.haskell-language-server.overrideScope (lself: lsuper: { + Cabal = lself.Cabal_3_6_3_0; + aeson = lself.aeson_1_5_6_0; + lsp-types = doJailbreak lsuper.lsp-types; # Checks require aeson >= 2.0 + })); + + hls-brittany-plugin = super.hls-brittany-plugin.overrideScope (lself: lsuper: { + brittany = doJailbreak lself.brittany_0_13_1_2; + aeson = lself.aeson_1_5_6_0; + lsp-types = doJailbreak lsuper.lsp-types; # Checks require aeson >= 2.0 + }); + mime-string = disableOptimization super.mime-string; - # Older compilers need the latest ghc-lib to build this package. - # Fix build with ghc-lib >= 9.0 and ghc <= 8.10.7 - # https://github.com/haskell/haskell-language-server/issues/2728 - hls-hlint-plugin = addBuildDepend self.ghc-lib (appendPatch (pkgs.fetchpatch { - name = "hls-hlint-plugin-workaround.patch"; - url = "https://github.com/haskell/haskell-language-server/pull/2854.patch"; - hash = "sha256-bLGu0OQtXsmMF3rZM+R6k7bsZm4Vgf2r0ert5Wunong="; - stripLen = 2; - includes = ["src/Ide/Plugin/Hlint.hs"]; - }) super.hls-hlint-plugin); - - haskell-language-server = appendConfigureFlags [ - "-f-stylishhaskell" - "-f-brittany" - ] - super.haskell-language-server; - - # has a restrictive lower bound on Cabal - fourmolu = doJailbreak super.fourmolu; - - # ormolu 0.3 requires Cabal == 3.4 - ormolu = super.ormolu_0_2_0_0; - # weeder 2.3.0 no longer supports GHC 8.10 weeder = doDistribute (doJailbreak self.weeder_2_2_0); diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 48cb8ed8c085..05585b885650 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -141,20 +141,23 @@ self: super: { mime-string = disableOptimization super.mime-string; - # Older compilers need the latest ghc-lib to build this package. - hls-hlint-plugin = addBuildDepend self.ghc-lib (overrideCabal (drv: { - # Workaround for https://github.com/haskell/haskell-language-server/issues/2728 - postPatch = '' - sed -i 's/(GHC.RealSrcSpan x,/(GHC.RealSrcSpan x Nothing,/' src/Ide/Plugin/Hlint.hs - ''; - }) - super.hls-hlint-plugin); + haskell-language-server = addBuildDepend self.hls-brittany-plugin (super.haskell-language-server.overrideScope (lself: lsuper: { + ghc-lib-parser = lself.ghc-lib-parser_8_10_7_20220219; + ghc-lib-parser-ex = addBuildDepend lself.ghc-lib-parser lself.ghc-lib-parser-ex_8_10_0_24; + # Pick old ormolu and fourmolu because ghc-lib-parser is not compatible + ormolu = doJailbreak lself.ormolu_0_1_4_1; + fourmolu = doJailbreak lself.fourmolu_0_3_0_0; + hlint = lself.hlint_3_2_8; + aeson = lself.aeson_1_5_6_0; + stylish-haskell = lself.stylish-haskell_0_13_0_0; + lsp-types = doJailbreak lsuper.lsp-types; + })); - haskell-language-server = appendConfigureFlags [ - "-f-stylishhaskell" - "-f-brittany" - ] - super.haskell-language-server; + hls-brittany-plugin = super.hls-brittany-plugin.overrideScope (lself: lsuper: { + brittany = doJailbreak lself.brittany_0_13_1_2; + aeson = lself.aeson_1_5_6_0; + lsp-types = doJailbreak lsuper.lsp-types; + }); # has a restrictive lower bound on Cabal fourmolu = doJailbreak super.fourmolu; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index c5585825c382..9cc6a3ecd243 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -99,6 +99,12 @@ self: super: { sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; }) (doJailbreak super.language-haskell-extract); + haskell-language-server = super.haskell-language-server.overrideScope (lself: lsuper: { + # Needed for modern ormolu and fourmolu. + # Apply this here and not in common, because other ghc versions offer different Cabal versions. + Cabal = lself.Cabal_3_6_3_0; + }); + # The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x. unordered-containers = dontCheck super.unordered-containers; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 41228cfb294b..db27788eeae5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -190,8 +190,13 @@ self: super: { revision = null; } super.memory); - # Use hlint from git for GHC 9.2.1 support - hlint = self.hlint_3_4_1; + # For -fghc-lib see cabal.project in haskell-language-server. + stylish-haskell = enableCabalFlag "ghc-lib" super.stylish-haskell; + + # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515 + hlint = enableCabalFlag "ghc-lib" (super.hlint_3_4_1.override { + ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4; + }); # https://github.com/sjakobi/bsb-http-chunked/issues/38 bsb-http-chunked = dontCheck super.bsb-http-chunked; @@ -201,13 +206,8 @@ self: super: { jacinda = doDistribute super.jacinda; some = doJailbreak super.some; - # 2022-06-05: this is not the latest version of fourmolu because - # hls-fourmolu-plugin 1.0.3.0 doesn‘t support a newer one. - fourmolu = super.fourmolu_0_6_0_0; - # hls-fourmolu-plugin in this version has a to strict upper bound of fourmolu <= 0.5.0.0 - hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.0.3.0"; doJailbreak super.hls-fourmolu-plugin; + fourmolu = super.fourmolu_0_8_2_0; - hls-ormolu-plugin = assert super.hls-ormolu-plugin.version == "1.0.2.1"; doJailbreak super.hls-ormolu-plugin; implicit-hie-cradle = doJailbreak super.implicit-hie-cradle; # 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed hashtables = assert super.hashtables.version == "1.2.4.2"; doJailbreak super.hashtables; @@ -215,20 +215,15 @@ self: super: { # 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46 hiedb = doJailbreak (dontCheck super.hiedb); + apply-refact = doDistribute super.apply-refact_0_10_0_0; + # 2022-02-05: The following plugins don‘t work yet on ghc9.2. # Compare: https://haskell-language-server.readthedocs.io/en/latest/supported-versions.html - haskell-language-server = overrideCabal (old: {libraryHaskellDepends = builtins.filter (x: x != super.hls-tactics-plugin) old.libraryHaskellDepends;}) - (appendConfigureFlags [ - "-f-haddockComments" - "-f-retrie" - "-f-splice" - "-f-tactics" - ] (super.haskell-language-server.override { + haskell-language-server = super.haskell-language-server.override { hls-haddock-comments-plugin = null; - hls-hlint-plugin = null; - hls-retrie-plugin = null; hls-splice-plugin = null; - })); + hls-tactics-plugin = null; + }; # https://github.com/fpco/inline-c/pull/131 inline-c-cpp = diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index d828b93d0a4a..7c76ce72a578 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -113,7 +113,6 @@ extra-packages: - dhall == 1.29.0 # required for ats-pkg - dhall == 1.38.1 # required for spago - doctest == 0.18.* # 2021-11-19: closest to stackage version for GHC 9.* - - fourmolu == 0.6.0.0 # 2022-06-05: Last fourmolu version compatible with hls 1.7/ hls-fourmolu-plugin 1.0.3.0 - ghc-api-compat == 8.10.7 # 2022-02-17: preserve for GHC 8.10.7 - ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4 - ghc-lib == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 @@ -121,7 +120,7 @@ extra-packages: - ghc-lib-parser == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 9.2 - ghc-lib-parser-ex == 8.10.* # 2022-02-17: preserve for GHC 8.10.7 - - ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 9.2 + - ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 9.2 - ghc-lib-parser-ex >= 9.2.0.3 && < 9.2.1 # 2022-07-13: needed by hlint 3.4.1 - haddock == 2.23.* # required on GHC < 8.10.x - haddock-api == 2.23.* # required on GHC < 8.10.x @@ -153,6 +152,13 @@ extra-packages: - basement < 0.0.15 # 2022-08-30: last version to support GHC < 8.10 - foundation < 0.0.29 # 2022-08-30: last version to support GHC < 8.10 - cabal-install-parsers < 0.5 # 2022-08-31: required by haskell-ci 0.14.3 + - lsp == 1.4.0.0 # 2022-09-18: need for dhall-lsp-server 1.1.2 + - lsp-types == 1.4.0.1 # 2022-09-18: need for dhall-lsp-server 1.1.2 + - stylish-haskell == 0.13.0.0 # 2022-09-19: needed for hls on ghc 8.8 + - brittany == 0.13.1.2 # 2022-09-20: needed for hls on ghc 8.8 + - fourmolu == 0.3.0.0 # 2022-09-21: needed for hls on ghc 8.8 + - ormolu == 0.1.4.1 # 2022-09-21: needed for hls on ghc 8.8 + - hlint == 3.2.8 # 2022-09-21: needed for hls on ghc 8.8 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index d6a5bfa74c2d..15e9de507891 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1048,7 +1048,6 @@ default-package-overrides: - hgeometry-combinatorial ==0.14 - hid ==0.2.2 - hidapi ==0.1.8 - - hie-bios ==0.9.1 - hi-file-parser ==0.1.3.0 - higher-leveldb ==0.6.0.0 - highlighting-kate ==0.6.4 @@ -1455,9 +1454,6 @@ default-package-overrides: - lpeg ==1.0.3 - lrucache ==1.2.0.1 - lrucaching ==0.3.3 - - lsp ==1.4.0.0 - - lsp-test ==0.14.0.2 - - lsp-types ==1.4.0.1 - lua ==2.1.0 - lua-arbitrary ==1.0.1 - lucid ==2.11.1 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a728aa6376b6..21016baede7b 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -498,6 +498,14 @@ self: super: builtins.intersectAttrs super { librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ]; }) super.LDAP); + # Not running the "example" test because it requires a binary from lsps test + # suite which is not part of the output of lsp. + lsp-test = overrideCabal (old: { testTarget = "tests func-test"; }) super.lsp-test; + + # the test suite attempts to run the binaries built in this package + # through $PATH but they aren't in $PATH + dhall-lsp-server = dontCheck super.dhall-lsp-server; + # Expects z3 to be on path so we replace it with a hard # # The tests expect additional solvers on the path, replace the @@ -935,11 +943,11 @@ self: super: builtins.intersectAttrs super { }) super.procex; # Test suite wants to run main executable - fourmolu_0_7_0_1 = overrideCabal (drv: { + fourmolu_0_8_2_0 = overrideCabal (drv: { preCheck = drv.preCheck or "" + '' export PATH="$PWD/dist/build/fourmolu:$PATH" ''; - }) super.fourmolu_0_7_0_1; + }) super.fourmolu_0_8_2_0; # Apply a patch which hardcodes the store path of graphviz instead of using # whatever graphviz is in PATH. @@ -1053,9 +1061,13 @@ self: super: builtins.intersectAttrs super { hls-fourmolu-plugin hls-module-name-plugin hls-pragmas-plugin - hls-splice-plugin; + hls-splice-plugin + hls-refactor-plugin + hls-code-range-plugin + hls-explicit-fixity-plugin; # Tests have file permissions expections that don‘t work with the nix store. hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin; + hls-gadt-plugin = dontCheck super.hls-gadt-plugin; # Flaky tests hls-hlint-plugin = dontCheck super.hls-hlint-plugin; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 577b5c208f26..306c0c77afc0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -48621,6 +48621,40 @@ self: { broken = true; }) {}; + "brittany_0_13_1_2" = callPackage + ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs + , containers, czipwith, data-tree-print, deepseq, directory, extra + , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec + , monad-memo, mtl, multistate, parsec, pretty, random, safe + , semigroups, strict, syb, text, transformers, uniplate, unsafe + , yaml + }: + mkDerivation { + pname = "brittany"; + version = "0.13.1.2"; + sha256 = "1pa8qgsild3zl56sdmbsllka64k05jk2p16ij3bdla4rbfw96z5g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base butcher bytestring cmdargs containers czipwith + data-tree-print deepseq directory extra filepath ghc ghc-boot-th + ghc-exactprint ghc-paths monad-memo mtl multistate pretty random + safe semigroups strict syb text transformers uniplate unsafe yaml + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base butcher bytestring cmdargs containers czipwith + data-tree-print deepseq directory extra filepath ghc ghc-boot-th + ghc-exactprint ghc-paths hspec monad-memo mtl multistate parsec + pretty safe semigroups strict syb text transformers uniplate unsafe + yaml + ]; + description = "Haskell source code formatter"; + license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "brittany"; + }) {}; + "brittany" = callPackage ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs , containers, czipwith, data-tree-print, deepseq, directory, extra @@ -102128,6 +102162,38 @@ self: { license = lib.licenses.bsd3; }) {}; + "fourmolu_0_3_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec + , hspec-discover, HsYAML, HsYAML-aeson, mtl, optparse-applicative + , path, path-io, syb, text + }: + mkDerivation { + pname = "fourmolu"; + version = "0.3.0.0"; + sha256 = "0v89dvcr8l0swj23kkakc39q6lyxjz90rqgwy7m6a5p6iv3h2wms"; + revision = "2"; + editedCabalFile = "16ky7wzmnwhzkk18r63ynq78vlrg065z6mp3hqgs92khpjr33g1l"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory dlist exceptions + filepath ghc-lib-parser HsYAML HsYAML-aeson mtl syb text + ]; + executableHaskellDepends = [ + base directory ghc-lib-parser gitrev optparse-applicative text + ]; + testHaskellDepends = [ + base containers filepath hspec path path-io text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "fourmolu"; + }) {}; + "fourmolu" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , containers, Diff, directory, dlist, exceptions, filepath @@ -102162,39 +102228,6 @@ self: { mainProgram = "fourmolu"; }) {}; - "fourmolu_0_6_0_0" = callPackage - ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring - , Cabal, containers, Diff, directory, dlist, exceptions, filepath - , ghc-lib-parser, gitrev, hspec, hspec-discover, HsYAML - , HsYAML-aeson, mtl, optparse-applicative, path, path-io, syb - , temporary, text - }: - mkDerivation { - pname = "fourmolu"; - version = "0.6.0.0"; - sha256 = "0yxv3ih2jjnjzdhz31y4a94ly6g3qhddrm3lvflqrb4krk445p67"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal array base bytestring Cabal containers Diff - directory dlist exceptions filepath ghc-lib-parser HsYAML - HsYAML-aeson mtl syb text - ]; - executableHaskellDepends = [ - base directory filepath ghc-lib-parser gitrev optparse-applicative - text - ]; - testHaskellDepends = [ - base containers directory filepath hspec path path-io temporary - text - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "fourmolu"; - }) {}; - "fourmolu_0_8_2_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring , Cabal, containers, Diff, directory, dlist, exceptions, filepath @@ -137926,41 +137959,6 @@ self: { }) {}; "hie-bios" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , conduit, conduit-extra, containers, cryptohash-sha1, deepseq - , directory, exceptions, extra, file-embed, filepath, ghc, hslogger - , optparse-applicative, process, tagged, tasty - , tasty-expected-failure, tasty-hunit, temporary, text, time - , transformers, unix-compat, unordered-containers, vector, yaml - }: - mkDerivation { - pname = "hie-bios"; - version = "0.9.1"; - sha256 = "0pcbgrn0hl19rk72z7mcd44j72lsmnl88nlk95rlb47l0ymr3ij1"; - revision = "1"; - editedCabalFile = "1hvhln1mnvghs05959fi5i71gaw04zhdk4wg558h2p4ybjcjsvb5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring conduit conduit-extra - containers cryptohash-sha1 deepseq directory exceptions extra - file-embed filepath ghc hslogger process temporary text time - transformers unix-compat unordered-containers vector yaml - ]; - executableHaskellDepends = [ - base directory filepath ghc optparse-applicative - ]; - testHaskellDepends = [ - aeson base directory extra filepath ghc tagged tasty - tasty-expected-failure tasty-hunit temporary text - unordered-containers yaml - ]; - description = "Set up a GHC API session"; - license = lib.licenses.bsd3; - mainProgram = "hie-bios"; - }) {}; - - "hie-bios_0_11_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , co-log-core, conduit, conduit-extra, containers, cryptohash-sha1 , deepseq, directory, exceptions, extra, file-embed, filepath, ghc @@ -137992,7 +137990,6 @@ self: { ]; description = "Set up a GHC API session"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hie-bios"; }) {}; @@ -140614,6 +140611,34 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) libsass;}; + "hlint_3_2_8" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs + , containers, cpphs, data-default, directory, extra, file-embed + , filepath, filepattern, ghc-lib-parser, ghc-lib-parser-ex + , hscolour, process, refact, text, transformers, uniplate + , unordered-containers, utf8-string, vector, yaml + }: + mkDerivation { + pname = "hlint"; + version = "3.2.8"; + sha256 = "14nvq71kn1lhqx02r69f949p33rhxi466fwmxj9g0wd5191jawrs"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring cmdargs containers cpphs + data-default directory extra file-embed filepath filepattern + ghc-lib-parser ghc-lib-parser-ex hscolour process refact text + transformers uniplate unordered-containers utf8-string vector yaml + ]; + executableHaskellDepends = [ base ]; + description = "Source code suggestions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hlint"; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "hlint" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, cpphs, data-default, directory, extra, file-embed @@ -182269,7 +182294,7 @@ self: { broken = true; }) {}; - "lsp" = callPackage + "lsp_1_4_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, exceptions, filepath, hashable , hslogger, hspec, hspec-discover, lens, lsp-types, mtl @@ -182299,9 +182324,10 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell library for the Microsoft Language Server Protocol"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; - "lsp_1_6_0_0" = callPackage + "lsp" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , co-log-core, containers, data-default, directory, exceptions , filepath, hashable, hspec, hspec-discover, lens, lsp-types, mtl @@ -182328,39 +182354,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell library for the Microsoft Language Server Protocol"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "lsp-test" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base - , bytestring, conduit, conduit-parse, containers, data-default - , Diff, directory, extra, filepath, Glob, hspec, lens, lsp - , lsp-types, mtl, parser-combinators, process, some, text, time - , transformers, unix, unliftio, unordered-containers - }: - mkDerivation { - pname = "lsp-test"; - version = "0.14.0.2"; - sha256 = "1capjilca74cqiwmrhbl1an6ih3227n3g417dfvql0lffa3j6qsf"; - revision = "1"; - editedCabalFile = "0szqlr1brhr1z2m2fwqj98ghh73d2sim4r5mbqzm072f6iycl6ky"; - libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal async base bytestring conduit - conduit-parse containers data-default Diff directory filepath Glob - lens lsp-types mtl parser-combinators process some text time - transformers unix unordered-containers - ]; - testHaskellDepends = [ - aeson base data-default directory filepath hspec lens lsp mtl - parser-combinators process text unliftio unordered-containers - ]; - testToolDepends = [ lsp ]; - benchmarkHaskellDepends = [ base extra lsp process ]; - description = "Functional test framework for LSP servers"; - license = lib.licenses.bsd3; - }) {}; - - "lsp-test_0_14_1_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, co-log-core, conduit, conduit-parse, containers , data-default, Diff, directory, exceptions, extra, filepath, Glob @@ -182387,10 +182383,9 @@ self: { benchmarkHaskellDepends = [ base extra lsp process ]; description = "Functional test framework for LSP servers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; - "lsp-types" = callPackage + "lsp-types_1_4_0_1" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , data-default, deepseq, Diff, directory, dlist, filepath, hashable , hslogger, lens, mod, mtl, network-uri, rope-utf16-splay @@ -182411,9 +182406,10 @@ self: { ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; - "lsp-types_1_6_0_0" = callPackage + "lsp-types" = callPackage ({ mkDerivation, aeson, base, binary, containers, data-default , deepseq, Diff, dlist, exceptions, filepath, hashable, hspec , hspec-discover, lens, mod, mtl, network-uri, QuickCheck @@ -182436,7 +182432,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "lss" = callPackage @@ -209937,6 +209932,38 @@ self: { broken = true; }) {}; + "ormolu_0_1_4_1" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, containers, Diff + , dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec + , hspec-discover, mtl, optparse-applicative, path, path-io, syb + , text + }: + mkDerivation { + pname = "ormolu"; + version = "0.1.4.1"; + sha256 = "1aamgzimjn9h7kwby9ajfgbj5dx08nmxyalwvpg9rs4xd8pbpd9s"; + revision = "1"; + editedCabalFile = "1fi8fxyhw9jdwhsbmrikjqd461wrz7h4kdszrahlvdjfdsn4wh7d"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring containers Diff dlist exceptions + ghc-lib-parser mtl syb text + ]; + executableHaskellDepends = [ + base filepath ghc-lib-parser gitrev optparse-applicative text + ]; + testHaskellDepends = [ + base containers filepath hspec path path-io text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "ormolu"; + }) {}; + "ormolu_0_2_0_0" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, containers, Diff , dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec @@ -272785,6 +272812,38 @@ self: { broken = true; }) {}; + "stylish-haskell_0_13_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , directory, file-embed, filepath, ghc-lib-parser, HsYAML + , HsYAML-aeson, HUnit, mtl, optparse-applicative, random, strict + , syb, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "stylish-haskell"; + version = "0.13.0.0"; + sha256 = "0x9w3zh1lzp6l5xj3mynnlr0fzb5mbv0wwpfxp8fr6bk0jcrzjwf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers directory file-embed + filepath ghc-lib-parser HsYAML HsYAML-aeson mtl syb text + ]; + executableHaskellDepends = [ + aeson base bytestring Cabal containers directory file-embed + filepath ghc-lib-parser HsYAML HsYAML-aeson mtl + optparse-applicative strict syb + ]; + testHaskellDepends = [ + aeson base bytestring Cabal containers directory file-embed + filepath ghc-lib-parser HsYAML HsYAML-aeson HUnit mtl random syb + test-framework test-framework-hunit text + ]; + description = "Haskell code prettifier"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "stylish-haskell"; + }) {}; + "stylish-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, file-embed, filepath, ghc-lib-parser From fae2ff5c035231ea858f9fa6f712e50143db0899 Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 20 Sep 2022 03:37:03 +0200 Subject: [PATCH 17/53] haskell.{compiler,packages}: Add aliases without minor versions --- .../option-declarations.section.md | 4 +- .../option-declarations.section.xml | 4 +- .../from_md/release-notes/rl-2111.section.xml | 12 +++++ .../manual/release-notes/rl-2111.section.md | 2 + .../services/x11/window-managers/xmonad.nix | 2 +- pkgs/development/compilers/elm/default.nix | 2 +- .../haskell-language-server/withWrapper.nix | 4 +- pkgs/top-level/all-packages.nix | 18 +++---- pkgs/top-level/haskell-packages.nix | 29 ++++++++--- pkgs/top-level/release-haskell.nix | 51 ++++++++++--------- 10 files changed, 78 insertions(+), 50 deletions(-) diff --git a/nixos/doc/manual/development/option-declarations.section.md b/nixos/doc/manual/development/option-declarations.section.md index 7fdc77b964a1..0f5673dd4d58 100644 --- a/nixos/doc/manual/development/option-declarations.section.md +++ b/nixos/doc/manual/development/option-declarations.section.md @@ -124,14 +124,14 @@ lib.mkOption { ```nix lib.mkPackageOption pkgs "GHC" { default = [ "ghc" ]; - example = "pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])"; + example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; } # is like lib.mkOption { type = lib.types.package; default = pkgs.ghc; defaultText = lib.literalExpression "pkgs.ghc"; - example = lib.literalExpression "pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])"; + example = lib.literalExpression "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; description = "The GHC package to use."; } ``` diff --git a/nixos/doc/manual/from_md/development/option-declarations.section.xml b/nixos/doc/manual/from_md/development/option-declarations.section.xml index ba604d109ad2..69163853b627 100644 --- a/nixos/doc/manual/from_md/development/option-declarations.section.xml +++ b/nixos/doc/manual/from_md/development/option-declarations.section.xml @@ -189,14 +189,14 @@ lib.mkOption { lib.mkPackageOption pkgs "GHC" { default = [ "ghc" ]; - example = "pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])"; + example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; } # is like lib.mkOption { type = lib.types.package; default = pkgs.ghc; defaultText = lib.literalExpression "pkgs.ghc"; - example = lib.literalExpression "pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])"; + example = lib.literalExpression "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; description = "The GHC package to use."; } diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index d9ebbe74d54f..f1c433183475 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -2087,6 +2087,18 @@ Superuser created successfully. java-packages.compiler. + + + The sets haskell.packages and + haskell.compiler now contain for every ghc + version an attribute with the minor version dropped. E.g. for + ghc8107 there also now exists + ghc810. Those attributes point to the same + compilers and packagesets but have the advantage that e.g. + ghc92 stays stable when we update from + ghc924 to ghc925. + + diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index e673d6721a38..1cf1ad72c07f 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -573,3 +573,5 @@ In addition to numerous new and upgraded packages, this release has the followin - hydrus has been upgraded from version `438` to `463`. Since upgrading between releases this old is advised against, be sure to have a backup of your data before upgrading. For details, see [the hydrus manual](https://hydrusnetwork.github.io/hydrus/help/getting_started_installing.html#big_updates). - More jdk and jre versions are now exposed via `java-packages.compiler`. + +- The sets `haskell.packages` and `haskell.compiler` now contain for every ghc version an attribute with the minor version dropped. E.g. for `ghc8107` there also now exists `ghc810`. Those attributes point to the same compilers and packagesets but have the advantage that e.g. `ghc92` stays stable when we update from `ghc924` to `ghc925`. diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index de5996448cb8..c35446bf405b 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -46,7 +46,7 @@ in { haskellPackages = mkOption { default = pkgs.haskellPackages; defaultText = literalExpression "pkgs.haskellPackages"; - example = literalExpression "pkgs.haskell.packages.ghc8107"; + example = literalExpression "pkgs.haskell.packages.ghc810"; type = types.attrs; description = lib.mdDoc '' haskellPackages used to build Xmonad and other packages. diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index ba98648a8a95..132811eb3f2a 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -7,7 +7,7 @@ let fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { }; - hsPkgs = self: pkgs.haskell.packages.ghc8107.override { + hsPkgs = self: pkgs.haskell.packages.ghc810.override { overrides = self: super: with pkgs.haskell.lib.compose; with lib; let elmPkgs = rec { elm = overrideCabal (drv: { diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 8dbd4fc9fab6..616dcabd9cfd 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,6 +1,6 @@ { lib , stdenv -, supportedGhcVersions ? [ "884" "8107" "902" "924" ] +, supportedGhcVersions ? [ "88" "810" "90" "92" ] , dynamic ? false , haskellPackages , haskell @@ -8,7 +8,7 @@ # # The recommended way to override this package is # -# pkgs.haskell-language-server.override { supportedGhcVersions = [ "902" ]; } +# pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" ]; } # # for example. Read more about this in the haskell-language-server section of the nixpkgs manual. # diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b104897a0f1b..61a813b22d60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9798,7 +9798,7 @@ with pkgs; pakcs = callPackage ../development/compilers/pakcs { # Doesn't compile with GHC 9.0 due to whitespace syntax changes # see also https://github.com/NixOS/nixpkgs/issues/166108 - haskellPackages = haskell.packages.ghc8107; + haskellPackages = haskell.packages.ghc810; }; pal = callPackage ../tools/misc/pal { }; @@ -12714,7 +12714,7 @@ with pkgs; # To expose more packages for Yi, override the extraPackages arg. yi = callPackage ../applications/editors/yi/wrapper.nix { - haskellPackages = haskell.packages.ghc8107; + haskellPackages = haskell.packages.ghc810; }; yj = callPackage ../development/tools/yj { }; @@ -13894,8 +13894,8 @@ with pkgs; haskellPackages = dontRecurseIntoAttrs # Prefer native-bignum to avoid linking issues with gmp (if stdenv.hostPlatform.isStatic - then haskell.packages.native-bignum.ghc902 - else haskell.packages.ghc902); + then haskell.packages.native-bignum.ghc90 + else haskell.packages.ghc90); # haskellPackages.ghc is build->host (it exposes the compiler used to build the # set, similarly to stdenv.cc), but pkgs.ghc should be host->target to be more @@ -13908,8 +13908,8 @@ with pkgs; ghc = targetPackages.haskellPackages.ghc or # Prefer native-bignum to avoid linking issues with gmp (if stdenv.targetPlatform.isStatic - then haskell.compiler.native-bignum.ghc902 - else haskell.compiler.ghc902); + then haskell.compiler.native-bignum.ghc90 + else haskell.compiler.ghc90); cabal-install = haskell.lib.compose.justStaticExecutables haskellPackages.cabal-install; @@ -15188,7 +15188,7 @@ with pkgs; stdenv = clangStdenv; }; - jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc924.jacinda; + jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc92.jacinda; janet = callPackage ../development/interpreters/janet {}; @@ -23031,7 +23031,7 @@ with pkgs; hashi-ui = callPackage ../servers/hashi-ui {}; - hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskell.packages.ghc8107.graphql-engine; + hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskell.packages.ghc810.graphql-engine; hasura-cli = callPackage ../servers/hasura/cli.nix { }; @@ -31422,7 +31422,7 @@ with pkgs; # Use GHC 9.0 when this asserts starts to fire taffybar = assert haskellPackages.taffybar.version == "3.3.0"; callPackage ../applications/window-managers/taffybar { - inherit (haskell.packages.ghc8107) ghcWithPackages taffybar; + inherit (haskell.packages.ghc810) ghcWithPackages taffybar; }; tagainijisho = libsForQt5.callPackage ../applications/office/tagainijisho {}; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index caa84277b0e2..bad2ae124338 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -15,15 +15,18 @@ let "integer-simple" "native-bignum" "ghc902" + "ghc90" "ghc924" + "ghc92" "ghc942" + "ghc94" "ghcHEAD" ]; nativeBignumIncludes = [ - "ghc902" - "ghc924" - "ghc942" + "ghc90" + "ghc92" + "ghc94" "ghcHEAD" ]; @@ -56,7 +59,7 @@ in { package-list = callPackage ../development/haskell-modules/package-list.nix {}; - compiler = { + compiler = rec { ghc865Binary = callPackage ../development/compilers/ghc/8.6.5-binary.nix { llvmPackages = pkgs.llvmPackages_6; @@ -103,6 +106,7 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_7; llvmPackages = pkgs.llvmPackages_7; }; + ghc88 = ghc884; ghc8107 = callPackage ../development/compilers/ghc/8.10.7.nix { bootPkgs = # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar @@ -123,6 +127,7 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; + ghc810 = ghc8107; ghc902 = callPackage ../development/compilers/ghc/9.0.2.nix { bootPkgs = # aarch64 ghc8107Binary exceeds max output size on hydra @@ -130,7 +135,7 @@ in { if stdenv.hostPlatform.isAarch then packages.ghc8107BinaryMinimal else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc8107 + packages.ghc810 else packages.ghc8107Binary; inherit (buildPackages.python3Packages) sphinx; @@ -138,13 +143,14 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; + ghc90 = ghc902; ghc924 = callPackage ../development/compilers/ghc/9.2.4.nix { bootPkgs = # aarch64 ghc8107Binary exceeds max output size on hydra if stdenv.hostPlatform.isAarch then packages.ghc8107BinaryMinimal else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc8107 + packages.ghc810 else packages.ghc8107Binary; inherit (buildPackages.python3Packages) sphinx; @@ -155,6 +161,7 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; + ghc92 = ghc924; ghc942 = callPackage ../development/compilers/ghc/9.4.2.nix { bootPkgs = # Building with 9.2 is broken due to @@ -179,6 +186,7 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; + ghc94 = ghc942; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then @@ -197,7 +205,7 @@ in { ghcjs = compiler.ghcjs810; ghcjs810 = callPackage ../development/compilers/ghcjs/8.10 { - bootPkgs = packages.ghc8107; + bootPkgs = packages.ghc810; ghcjsSrcJson = ../development/compilers/ghcjs/8.10/git.json; stage0 = ../development/compilers/ghcjs/8.10/stage0.nix; }; @@ -227,7 +235,7 @@ in { packageOverrides = self : super : {}; # Always get compilers from `buildPackages` - packages = let bh = buildPackages.haskell; in { + packages = let bh = buildPackages.haskell; in rec { ghc865Binary = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc865Binary; @@ -276,26 +284,31 @@ in { ghc = bh.compiler.ghc884; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { }; }; + ghc88 = ghc884; ghc8107 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc8107; ghc = bh.compiler.ghc8107; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; }; + ghc810 = ghc8107; ghc902 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc902; ghc = bh.compiler.ghc902; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { }; }; + ghc90 = ghc902; ghc924 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc924; ghc = bh.compiler.ghc924; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; }; + ghc92 = ghc924; ghc942 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc942; ghc = bh.compiler.ghc942; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; }; + ghc94= ghc942; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index ef82c54dda9e..d0819557d6cb 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -49,10 +49,10 @@ let # list of all compilers to test specific packages on released = with compilerNames; [ - ghc884 - ghc8107 - ghc902 - ghc924 + ghc88 + ghc810 + ghc90 + ghc92 ]; # packagePlatforms applied to `haskell.packages.*` @@ -287,6 +287,7 @@ let # Can't be built with musl, see meta.broken comment in the drv integer-simple.ghc884 = {}; + integer-simple.ghc88 = {}; }; # Get some cache going for MUSL-enabled GHC. @@ -331,8 +332,8 @@ let ; }; - haskell.packages.native-bignum.ghc924 = { - inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc924) + haskell.packages.native-bignum.ghc92 = { + inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc92) hello lens random @@ -365,30 +366,30 @@ let nix-paths = released; titlecase = released; ghc-api-compat = [ - compilerNames.ghc884 - compilerNames.ghc8107 - compilerNames.ghc902 + compilerNames.ghc88 + compilerNames.ghc810 + compilerNames.ghc90 ]; ghc-bignum = [ - compilerNames.ghc884 - compilerNames.ghc8107 + compilerNames.ghc88 + compilerNames.ghc810 ]; ghc-lib = released; ghc-lib-parser = released; ghc-lib-parser-ex = released; spectacle = [ - compilerNames.ghc8107 + compilerNames.ghc810 ]; weeder = [ - compilerNames.ghc8107 - compilerNames.ghc902 - compilerNames.ghc924 + compilerNames.ghc810 + compilerNames.ghc90 + compilerNames.ghc92 ]; purescript-cst = [ - compilerNames.ghc8107 + compilerNames.ghc810 ]; purescript-ast = [ - compilerNames.ghc8107 + compilerNames.ghc810 ]; }) { @@ -453,14 +454,14 @@ let constituents = accumulateDerivations [ jobs.pkgsMusl.haskell.compiler.ghc8102Binary jobs.pkgsMusl.haskell.compiler.ghc8107Binary - jobs.pkgsMusl.haskell.compiler.ghc884 - jobs.pkgsMusl.haskell.compiler.ghc8107 - jobs.pkgsMusl.haskell.compiler.ghc902 - jobs.pkgsMusl.haskell.compiler.ghc924 + jobs.pkgsMusl.haskell.compiler.ghc88 + jobs.pkgsMusl.haskell.compiler.ghc810 + jobs.pkgsMusl.haskell.compiler.ghc90 + jobs.pkgsMusl.haskell.compiler.ghc92 jobs.pkgsMusl.haskell.compiler.ghcHEAD - jobs.pkgsMusl.haskell.compiler.integer-simple.ghc8107 - jobs.pkgsMusl.haskell.compiler.native-bignum.ghc902 - jobs.pkgsMusl.haskell.compiler.native-bignum.ghc924 + jobs.pkgsMusl.haskell.compiler.integer-simple.ghc810 + jobs.pkgsMusl.haskell.compiler.native-bignum.ghc90 + jobs.pkgsMusl.haskell.compiler.native-bignum.ghc92 jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD ]; }; @@ -476,7 +477,7 @@ let }; constituents = accumulateDerivations [ jobs.pkgsStatic.haskellPackages - jobs.pkgsStatic.haskell.packages.native-bignum.ghc924 + jobs.pkgsStatic.haskell.packages.native-bignum.ghc92 ]; }; } From 352da0ce3117965dc5b2c460ceddd520549b99d2 Mon Sep 17 00:00:00 2001 From: maralorn Date: Wed, 21 Sep 2022 06:06:28 +0200 Subject: [PATCH 18/53] haskellPackages.hlint: Fix plugin and ghc924 jobs --- .../haskell-modules/configuration-common.nix | 10 ++++++++-- .../haskell-modules/configuration-ghc-8.8.x.nix | 7 +++++++ .../haskell-modules/configuration-ghc-9.2.x.nix | 4 ++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6761be0d34d8..9dee611953ed 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1526,11 +1526,17 @@ self: super: { dontCheck (disableCabalFlag "stan") # Sorry stan is totally unmaintained and terrible to get to run. It only works on ghc 8.8 or 8.10 anyways … ]).overrideScope (lself: lsuper: { + ormolu = doJailbreak lself.ormolu_0_5_0_1; + fourmolu = doJailbreak lself.fourmolu_0_8_2_0; + hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1; + ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4; + ghc-lib-parser = lself.ghc-lib-parser_9_2_4_20220729; + }); + + hls-hlint-plugin = super.hls-hlint-plugin.overrideScope (lself: lsuper: { # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515 hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1; ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4; - ormolu = doJailbreak lself.ormolu_0_5_0_1; - fourmolu = doJailbreak lself.fourmolu_0_8_2_0; ghc-lib-parser = lself.ghc-lib-parser_9_2_4_20220729; }); diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 05585b885650..071cdeaa5030 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -153,6 +153,13 @@ self: super: { lsp-types = doJailbreak lsuper.lsp-types; })); + hls-hlint-plugin = super.hls-hlint-plugin.overrideScope (lself: lsuper: { + # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515 + hlint = lself.hlint_3_2_8; + ghc-lib-parser = lself.ghc-lib-parser_8_10_7_20220219; + ghc-lib-parser-ex = addBuildDepend lself.ghc-lib-parser lself.ghc-lib-parser-ex_8_10_0_24; + }); + hls-brittany-plugin = super.hls-brittany-plugin.overrideScope (lself: lsuper: { brittany = doJailbreak lself.brittany_0_13_1_2; aeson = lself.aeson_1_5_6_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index db27788eeae5..0cebab8f4b8c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -194,9 +194,9 @@ self: super: { stylish-haskell = enableCabalFlag "ghc-lib" super.stylish-haskell; # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515 - hlint = enableCabalFlag "ghc-lib" (super.hlint_3_4_1.override { + hlint = doDistribute (enableCabalFlag "ghc-lib" (super.hlint_3_4_1.override { ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4; - }); + })); # https://github.com/sjakobi/bsb-http-chunked/issues/38 bsb-http-chunked = dontCheck super.bsb-http-chunked; From 772ea71e2c603f3d0ba05e962651fbf6c2746f26 Mon Sep 17 00:00:00 2001 From: maralorn Date: Wed, 21 Sep 2022 06:39:59 +0200 Subject: [PATCH 19/53] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 12 ++++++++ .../transitive-broken.yaml | 4 +++ .../haskell-modules/hackage-packages.nix | 28 +++++++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 7b95e1504129..2efb531ff2c3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1245,6 +1245,7 @@ broken-packages: - ebnf-bff - eccrypto-ed25519-bindings - ecma262 + - ecta-plugin - ecu - eddie - ede @@ -1516,6 +1517,7 @@ broken-packages: - forbidden-fruit - fordo - forecast-io + - foreign - foreign-var - forest - forest-fire @@ -2233,6 +2235,7 @@ broken-packages: - HJVM - hkd-delta - hkd-lens + - hkd-records - hkt - hlbfgsb - hleap @@ -2250,6 +2253,7 @@ broken-packages: - hlongurl - hlrdb-core - hls-exactprint-utils + - hls-stan-plugin - hlwm - hmarkup - hmatrix-banded @@ -2275,6 +2279,7 @@ broken-packages: - hnn - hnop - hoauth + - hoauth2-tutorial - hobbes - hobbits - hocilib @@ -3247,6 +3252,7 @@ broken-packages: - mios - MIP - mismi-s3-core + - miso-action-logger - miso-examples - mit-3qvpPyAi6mH - mix-arrows @@ -3756,6 +3762,7 @@ broken-packages: - Pathfinder - pathfindingcore - PathTree + - patrol - patronscraper - paypal-adaptive-hoops - paypal-api @@ -4321,6 +4328,7 @@ broken-packages: - reversi - ReviewBoard - rewrite-inspector + - rfc - rfc-prelude - r-glpk-phonetic-languages-ukrainian-durations - rhbzquery @@ -4927,6 +4935,8 @@ broken-packages: - SVD2HS - svfactor - svg-builder-fork + - svg-icons + - SvgIcons - svgutils - svm-light-utils - svm-simple @@ -5300,6 +5310,7 @@ broken-packages: - type-of-html-static - typeparams - type-prelude + - type-rig - types-compat - type-settheory - type-spine @@ -5308,6 +5319,7 @@ broken-packages: - typograffiti - typson-core - tyro + - tztime - uAgda - uberlast - ucam-webauth-types diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 5769390738c4..329f9eb75147 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -940,6 +940,7 @@ dont-distribute-packages: - claferwiki - clash - classify-frog + - classy-miso - clckwrks - clckwrks-cli - clckwrks-dot-com @@ -2068,6 +2069,7 @@ dont-distribute-packages: - hipbot - hipsql-client - hipsql-server + - hipsql-tx-simple - hirt - hist-pl - hist-pl-dawg @@ -2204,6 +2206,7 @@ dont-distribute-packages: - hunt-searchengine - hunt-server - hurdle + - hurl-xml - huzzy - hw-all - hw-aws-sqs-conduit @@ -2680,6 +2683,7 @@ dont-distribute-packages: - monad-stlike-stm - monad-unlift-ref - monadiccp-gecode + - monadology - monarch - monetdb-mapi - mongrel2-handler diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 306c0c77afc0..7df84ce40d4f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -20180,7 +20180,9 @@ self: { testHaskellDepends = [ base ]; description = "Svg Icons and more"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "SvgIcons-exe"; + broken = true; }) {}; "SybWidget" = callPackage @@ -59452,6 +59454,7 @@ self: { testHaskellDepends = [ base miso rfc ]; description = "Typeclass based support for Miso, the Tasty Web Framework for Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "classy-miso-demo"; }) {}; @@ -87729,6 +87732,8 @@ self: { libraryHaskellDepends = [ base containers ecta ghc text ]; description = "Hole-Fit Synthesis using ECTAs"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ecu" = callPackage @@ -101477,6 +101482,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "A collection of helpers for ffi"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "foreign-storable-asymmetric" = callPackage @@ -139194,6 +139201,7 @@ self: { base hipsql-monad hipsql-server postgresql-simple postgresql-tx ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hircules" = callPackage @@ -139786,6 +139794,8 @@ self: { libraryHaskellDepends = [ base hkd template-haskell text ]; description = "higher kinded record operations"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hkdf" = callPackage @@ -141406,6 +141416,8 @@ self: { sha256 = "03pg68gmardqkx9xa218bb0j4b1f0h5p6gn6xzfwmdj5c005rxjk"; description = "Stan integration plugin with Haskell Language Server"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hls-stylish-haskell-plugin" = callPackage @@ -142626,7 +142638,9 @@ self: { executableHaskellDepends = [ base ]; description = "Tutorial for using hoauth2"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hoauth2-tutorial"; + broken = true; }) {}; "hob" = callPackage @@ -154299,6 +154313,7 @@ self: { ]; description = "Fetch parsed XML & possibly CSS for a URL based on MIMEtype"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; }) {}; "hurriyet" = callPackage @@ -190622,6 +190637,8 @@ self: { libraryHaskellDepends = [ aeson base ghcjs-base miso ]; description = "Miso state transition logger"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "miso-examples" = callPackage @@ -193566,6 +193583,7 @@ self: { ]; testHaskellDepends = [ base tasty tasty-hunit transformers ]; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; }) {}; "monadplus" = callPackage @@ -214722,6 +214740,8 @@ self: { ]; description = "Sentry SDK"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "patronscraper" = callPackage @@ -243180,6 +243200,8 @@ self: { ]; description = "Robert Fischer's Common library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rfc-env" = callPackage @@ -274110,7 +274132,9 @@ self: { ]; description = "Svg Icons and more"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "svg-icons-exe"; + broken = true; }) {}; "svg-tree" = callPackage @@ -292273,6 +292297,8 @@ self: { libraryHaskellDepends = [ base invariant ]; description = "Classes for the rig (sums and products) of types"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "type-safe-avl" = callPackage @@ -293235,6 +293261,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Safe timezone-aware handling of time"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "u2f" = callPackage From ea93f058d1c4ab10885f76b51ceddd4570e73de8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Sep 2022 04:46:46 +0000 Subject: [PATCH 20/53] hugo: 0.103.0 -> 0.103.1 --- pkgs/applications/misc/hugo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 0e176e1971e8..a8068bd2a1b9 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.103.0"; + version = "0.103.1"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-X78wmxEjw2noOjOj3uujXZHsPOSdZJ4KPz4Ia5sOu3I="; + sha256 = "sha256-KSNBbSJROx65WxOd98XLLbbSDL0x4ESEKVIsrZV911k="; }; vendorSha256 = "sha256-Y0+D5H7kWi+bacJm1pouYDPHnnSRPatOt6qPfkk92X4="; From 60b61935ad6be949e4272429653299e1529b2e18 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 21 Sep 2022 12:50:50 +0800 Subject: [PATCH 21/53] linuxPackages.nvidia_x11: 515.65.01 -> 515.76 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 65d0edb80352..1ec98cc7b349 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -27,11 +27,11 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "515.65.01"; - sha256_64bit = "sha256-BJLdxbXmWqAMvHYujWaAIFyNCOEDtxMQh6FRJq7klek="; - openSha256 = "sha256-GCCDnaDsbXTmbCYZBCM3fpHmOSWti/DkBJwYrRGAMPI="; - settingsSha256 = "sha256-kBELMJCIWD9peZba14wfCoxsi3UXO3ehFYcVh4nvzVg="; - persistencedSha256 = "sha256-P8oT7g944HvNk2Ot/0T0sJM7dZs+e0d+KwbwRrmsuDY="; + version = "515.76"; + sha256_64bit = "sha256-xqKhjOuWX0mAvOTlzqNv1iLNwaXzGg6xu9NZqen2v0Q="; + openSha256 = "sha256-843l42atzaTm4pX5UC/JZjXAvhwmBpE8k3SQFEFdcdY="; + settingsSha256 = "sha256-2GdqmuvROLa8xFfyFY/F4YzEBq+SlVIYM4CVEARh9MI="; + persistencedSha256 = "sha256-nIfP7xBIVy+BUa9VBCNQ9v5RT4l4S9X0GHLpNiN/WRg="; brokenOpen = kernelModVersion == "5.4" && kernel.isHardened; }; From e1d61de7a8f7d6fc531a30f51ba224bd34fb9b9c Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 21 Sep 2022 15:41:31 +1000 Subject: [PATCH 22/53] yubikey-manager: set `meta.mainProgram` --- pkgs/tools/misc/yubikey-manager/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index d2c665670128..0d73b826a667 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -68,5 +68,6 @@ python3Packages.buildPythonPackage rec { license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ benley lassulus pinpox ]; + mainProgram = "ykman"; }; } From 6de2d274fb51accc8a4ad2b8cf30b74c7f29e4e2 Mon Sep 17 00:00:00 2001 From: usertam Date: Tue, 20 Sep 2022 15:45:26 +0800 Subject: [PATCH 23/53] optifinePackages: update versions, refactor version generation optifinePackages.optifine-latest: 1.18.1_HD_U_H4 -> 1.19.2_HD_U_H9 optifinePackages.optifine_1_19_2: init at 1.19.2_HD_U_H9 optifinePackages.optifine_1_19_1: init at 1.19.1_HD_U_H9 optifinePackages.optifine_1_19: init at 1.19_HD_U_H9 optifinePackages.optifine_1_18_2: init at 1.18.2_HD_U_H7 optifinePackages.optifine_1_18_1: 1.18.1_HD_U_H4 -> 1.18.1_HD_U_H6 optifinePackages.optifine_1_18: init at 1.18_HD_U_H3 optifinePackages.optifine_1_16_4: init at 1.16.4_HD_U_G7 optifinePackages.optifine_1_16_3: init at 1.16.3_HD_U_G5 optifinePackages.optifine_1_16_2: init at 1.16.2_HD_U_G5 optifinePackages.optifine_1_16_1: init at 1.16.1_HD_U_G2 optifinePackages.optifine_1_15_2: 1.16.5_HD_U_G8 -> 1.15.2_HD_U_G6 optifinePackages.optifine_1_14_3: init at 1.14.3_HD_U_F2 optifinePackages.optifine_1_14_2: init at 1.14.2_HD_U_F1 optifinePackages.optifine_1_13_1: init at 1.13.1_HD_U_E4 optifinePackages.optifine_1_13: init at 1.13_HD_U_E4 optifinePackages.optifine_1_12_1: init at 1.12.1_HD_U_G5 optifinePackages.optifine_1_12: init at 1.12_HD_U_G5 optifinePackages.optifine_1_11: init at 1.11_HD_U_G5 optifinePackages.optifine_1_10_2: init at 1.10.2_HD_U_I5 optifinePackages.optifine_1_9_2: init at 1.9.2_HD_U_E3 optifinePackages.optifine_1_9_0: init at 1.9.0_HD_U_I5 optifinePackages.optifine_1_8_8: init at 1.8.8_HD_U_I7 optifinePackages.optifine_1_8_0: init at 1.8.0_HD_U_I7 optifinePackages.optifine_1_7_2: init at 1.7.2_HD_U_F7 --- .../games/minecraft/optifine/default.nix | 72 ++------- .../games/minecraft/optifine/generic.nix | 5 + pkgs/tools/games/minecraft/optifine/update.py | 60 ++++++++ .../games/minecraft/optifine/versions.json | 142 ++++++++++++++++++ 4 files changed, 218 insertions(+), 61 deletions(-) create mode 100755 pkgs/tools/games/minecraft/optifine/update.py create mode 100644 pkgs/tools/games/minecraft/optifine/versions.json diff --git a/pkgs/tools/games/minecraft/optifine/default.nix b/pkgs/tools/games/minecraft/optifine/default.nix index 7152cb1eec46..e5608559af0d 100644 --- a/pkgs/tools/games/minecraft/optifine/default.nix +++ b/pkgs/tools/games/minecraft/optifine/default.nix @@ -1,67 +1,17 @@ { recurseIntoAttrs , callPackage +, lib }: -recurseIntoAttrs rec { - optifine-latest = optifine_1_18_1; +# All versions are taken from `version.json` created by `update.py`, and realised with `generic.nix`. +# The `update.py` is a web scraper script that writes the latest versions into `version.json`. - optifine_1_18_1 = callPackage ./generic.nix { - version = "1.18.1_HD_U_H4"; - sha256 = "sha256-MlFoVpshotzegpmYdvaeydivdSAqcCFpHyq+3k2B3Ow="; - }; +# The `versions.json` can be automatically updated and committed with a commit summary. +# To do so, change directory to nixpkgs root, and do: +# $ nix-shell ./maintainers/scripts/update.nix --argstr package optifinePackages.optifine-latest --argstr commit true - optifine_1_17_1 = callPackage ./generic.nix { - version = "1.17.1_HD_U_H1"; - sha256 = "sha256-HHt747bIHYY/WNAx19mNgvnLrLCqaKIqwXmmB7A895M="; - }; - - optifine_1_16_5 = callPackage ./generic.nix { - version = "1.16.5_HD_U_G8"; - sha256 = "sha256-PHa8kO1EvOVnzufCDrLENhkm8jqG5TZ9WW9uYk0LSU8="; - }; - - optifine_1_15_2 = callPackage ./generic.nix { - version = "1.16.5_HD_U_G8"; - sha256 = "sha256-PHa8kO1EvOVnzufCDrLENhkm8jqG5TZ9WW9uYk0LSU8="; - }; - - optifine_1_14_4 = callPackage ./generic.nix { - version = "1.14.4_HD_U_G5"; - sha256 = "sha256-I+65vQO6yG4AQ0ZLAfX73ImsFKAQkTyrIOnQHldTibs="; - }; - - optifine_1_13_2 = callPackage ./generic.nix { - version = "1.13.2_HD_U_G5"; - sha256 = "sha256-sjUQot8fPdbZTiLqt+exbF5T8kI5bLQevu7atW9Xu3E="; - }; - - optifine_1_12_2 = callPackage ./generic.nix { - version = "1.12.2_HD_U_G5"; - sha256 = "sha256-OwAGeXdx/rl/LQ0pCK58mnjO+y5zCvHC6F0IqDm6Jx4="; - }; - - optifine_1_11_2 = callPackage ./generic.nix { - version = "1.11.2_HD_U_G5"; - sha256 = "sha256-1sLUBtM5e5LDTUFCRZf9UeH6WOA8zY6TAmB9PCS5iv4="; - }; - - optifine_1_10 = callPackage ./generic.nix { - version = "1.10_HD_U_I5"; - sha256 = "sha256-oKOsaNFnOKfhWLDDYG/0Z4h/ZCDtyJWS9LXPaKAApc0="; - }; - - optifine_1_9_4 = callPackage ./generic.nix { - version = "1.9.4_HD_U_I5"; - sha256 = "sha256-t+OxIf0Tl/NZxUTl+LGnWRUhEwZ+vxiZfhclxEAf6yI="; - }; - - optifine_1_8_9 = callPackage ./generic.nix { - version = "1.8.9_HD_U_M5"; - sha256 = "sha256-Jzl2CnD8pq5cfcgXvMYoPxj1Xjj6I3eNp/OHprckssQ="; - }; - - optifine_1_7_10 = callPackage ./generic.nix { - version = "1.7.10_HD_U_E7"; - sha256 = "sha256-i82dg94AGgWR9JgQXzafBwxH0skZJ3TVpbafZG5E+rQ="; - }; -} +recurseIntoAttrs ( + lib.mapAttrs + (name: value: callPackage ./generic.nix value) + (lib.importJSON ./versions.json) +) diff --git a/pkgs/tools/games/minecraft/optifine/generic.nix b/pkgs/tools/games/minecraft/optifine/generic.nix index 76acd065af1d..3174998cb5f2 100644 --- a/pkgs/tools/games/minecraft/optifine/generic.nix +++ b/pkgs/tools/games/minecraft/optifine/generic.nix @@ -22,6 +22,11 @@ runCommand "optifine-${mcVersion}" { nativeBuildInputs = [ jre makeWrapper ]; + passthru.updateScript = { + command = [ ./update.py ]; + supportedFeatures = [ "commit" ]; + }; + meta = with lib; { homepage = "https://optifine.net/"; description = "A Minecraft ${mcVersion} optimization mod"; diff --git a/pkgs/tools/games/minecraft/optifine/update.py b/pkgs/tools/games/minecraft/optifine/update.py new file mode 100755 index 000000000000..999f688be285 --- /dev/null +++ b/pkgs/tools/games/minecraft/optifine/update.py @@ -0,0 +1,60 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i python3 -p python3.pkgs.requests python3.pkgs.lxml nix + +from lxml import html +import json +import os.path +import re +import requests +import subprocess + +def nix_prefetch_sha256(name): + return subprocess.run(['nix-prefetch-url', '--type', 'sha256', 'https://optifine.net/download?f=' + name], capture_output=True, text=True).stdout.strip() + +# fetch download page +sess = requests.session() +page = sess.get('https://optifine.net/downloads') +tree = html.fromstring(page.content) + +# parse and extract main jar file names +href = tree.xpath('//tr[@class="downloadLine downloadLineMain"]/td[@class="colMirror"]/a/@href') +expr = re.compile('(OptiFine_)([0-9.]*)(.*)\.jar') +result = [ expr.search(x) for x in href ] + +# format name, version and hash for each file +catalogue = {} +for i, r in enumerate(result): + index = r.group(1).lower() + r.group(2).replace('.', '_') + version = r.group(2) + r.group(3) + catalogue[index] = { + "version": version, + "sha256": nix_prefetch_sha256(r.group(0)) + } + +# latest version should be the first entry +if len(catalogue) > 0: + catalogue['optifine-latest'] = list(catalogue.values())[0] + +# read previous versions +d = os.path.dirname(os.path.abspath(__file__)) +with open(os.path.join(d, 'versions.json'), 'r') as f: + prev = json.load(f) + +# `maintainers/scripts/update.py` will extract stdout to write commit message +# embed the commit message in json and print it +changes = [ { 'commitMessage': 'optifinePackages: update versions\n\n' } ] + +# build a longest common subsequence, natural sorted by keys +for key, value in sorted({**prev, **catalogue}.items(), key=lambda item: [int(s) if s.isdigit() else s for s in re.split(r'(\d+)', item[0])]): + if key not in prev: + changes[0]['commitMessage'] += 'optifinePackages.{}: init at {}\n'.format(key, value['version']) + elif value['version'] != prev[key]['version']: + changes[0]['commitMessage'] += 'optifinePackages.{}: {} -> {}\n'.format(key, prev[key]['version'], value['version']) + +# print the changes in stdout +print(json.dumps(changes)) + +# write catalogue to file +with open(os.path.join(d, 'versions.json'), 'w') as f: + json.dump(catalogue, f, indent=4) + f.write('\n') diff --git a/pkgs/tools/games/minecraft/optifine/versions.json b/pkgs/tools/games/minecraft/optifine/versions.json new file mode 100644 index 000000000000..cbbf231d3d69 --- /dev/null +++ b/pkgs/tools/games/minecraft/optifine/versions.json @@ -0,0 +1,142 @@ +{ + "optifine_1_19_2": { + "version": "1.19.2_HD_U_H9", + "sha256": "1xyg98i7zar5x3xbgpn2nm48mc3r9q6yqisxnqk3g254ghjcy4xx" + }, + "optifine_1_19_1": { + "version": "1.19.1_HD_U_H9", + "sha256": "1p5a3i383ca2l3snsm36dyngfz9a1f9xffaxk439149h0i2d0nlj" + }, + "optifine_1_19": { + "version": "1.19_HD_U_H9", + "sha256": "19zjvwg0sr6279plj5qxj7hdlw9w8q3qd78dg6911m356z6g87ah" + }, + "optifine_1_18_2": { + "version": "1.18.2_HD_U_H7", + "sha256": "169ajvw3zrb0xrz2h1z3x6vdr4122s8m3rxb461s8y2fk6i4y9kr" + }, + "optifine_1_18_1": { + "version": "1.18.1_HD_U_H6", + "sha256": "0nh8ls306rs1qcbyibb6idapws4z5cyaqrgh9ipvm1vcwvxxj9ys" + }, + "optifine_1_18": { + "version": "1.18_HD_U_H3", + "sha256": "11zqiwmqj4ja6l87acwzs7cnabsgn2x36510hap8gj139l3vbrvb" + }, + "optifine_1_17_1": { + "version": "1.17.1_HD_U_H1", + "sha256": "14zp7jq0g9krq4ma4s5an2ncpyc2ipcxfcfhb0zqc7f8nvipnyqw" + }, + "optifine_1_16_5": { + "version": "1.16.5_HD_U_G8", + "sha256": "0ks91d6n4vkgb5ykdrc67br2c69nqjr0xhp7rrkybg24xn8bqxiw" + }, + "optifine_1_16_4": { + "version": "1.16.4_HD_U_G7", + "sha256": "063zdfmhzq5jgfdy27c8b0008sribl8rbvfxa7nkk86qwpvz6v8h" + }, + "optifine_1_16_3": { + "version": "1.16.3_HD_U_G5", + "sha256": "0pipr77jrva5wrllil40myansyrxxvcckxlvf4k2vhqf2g1mfigl" + }, + "optifine_1_16_2": { + "version": "1.16.2_HD_U_G5", + "sha256": "1iav08qqk7wb43ars9nilbgm4ybdi02pd0ahb0xy7clkxvlnjcx2" + }, + "optifine_1_16_1": { + "version": "1.16.1_HD_U_G2", + "sha256": "1gwbxv3dx82lxkbp9gaf1nqczkcxdzlfsspxlrv6gcn7w8vvwf5v" + }, + "optifine_1_15_2": { + "version": "1.15.2_HD_U_G6", + "sha256": "10qz6y3h80s56wsk3f5wwg52d0d7mkklhhhvgp6y84zlzq6xdbq4" + }, + "optifine_1_14_4": { + "version": "1.14.4_HD_U_G5", + "sha256": "1fw9adbixl7942mkr48hl0aar2fwzgsh2js68c06xj5s0fyvkvi3" + }, + "optifine_1_14_3": { + "version": "1.14.3_HD_U_F2", + "sha256": "00wys29pmgfsc4j2jy2mpfl493vy52jdxprxl92hcg2xz77ipqjh" + }, + "optifine_1_14_2": { + "version": "1.14.2_HD_U_F1", + "sha256": "0645d38z8llnnv546zfkflqp441kxvf8vd0l3zjsls81w3bpc6n8" + }, + "optifine_1_13_2": { + "version": "1.13.2_HD_U_G5", + "sha256": "0wdvaxpvbnpfpqgb8v1r8br56pkcn7kvgsi29vcxcg8zvyi10ddj" + }, + "optifine_1_13_1": { + "version": "1.13.1_HD_U_E4", + "sha256": "0r5x703pgwi8vakii0nhlij7j24zkq1xvyscqd8lv6w3yq7xd5b3" + }, + "optifine_1_13": { + "version": "1.13_HD_U_E4", + "sha256": "0x8ynnm9dglzrajb3ffmvmwkx6ipzs306qadwhcp0ah148wiz1l3" + }, + "optifine_1_12_2": { + "version": "1.12.2_HD_U_G5", + "sha256": "07i7p8wsh22xx31g22kk5vxwwy4sgjp0ha8d5mzvkzkifxwhc01v" + }, + "optifine_1_12_1": { + "version": "1.12.1_HD_U_G5", + "sha256": "1jn02mknpf622q6i942v63x3kzs9q7n394x188nfh508rn9fpipn" + }, + "optifine_1_12": { + "version": "1.12_HD_U_G5", + "sha256": "1slbz0ss670gwlzv4dw362cc5wlpxjv81004n04vcsip8l491pdb" + }, + "optifine_1_11_2": { + "version": "1.11.2_HD_U_G5", + "sha256": "1zlap4j3qzb00a9qxk9ww1cgmqaiznblahj19p1r4yrrsc3d9hnn" + }, + "optifine_1_11": { + "version": "1.11_HD_U_G5", + "sha256": "1azgnsqbl71087i83dn6wyb7qdz2wa42f04cabnlhmdcmdd4kcsj" + }, + "optifine_1_10_2": { + "version": "1.10.2_HD_U_I5", + "sha256": "0m05xqcmh8kaqvlb57yz0mslf22wr89wamlf1q1cma4fn385i57f" + }, + "optifine_1_10": { + "version": "1.10_HD_U_I5", + "sha256": "1kd502h6ikxmyj99bj7d41j7z237yipn1hxhb3hsff37s5lar8x0" + }, + "optifine_1_9_4": { + "version": "1.9.4_HD_U_I5", + "sha256": "08pb3x0c898pgsciigvy0q9j25arlyqzira4qmcz75qkzlhv3qxp" + }, + "optifine_1_9_2": { + "version": "1.9.2_HD_U_E3", + "sha256": "1bgyxhs554wswavidsnmm6mahngndd5bc98jma6wgi7g5qrngcrp" + }, + "optifine_1_9_0": { + "version": "1.9.0_HD_U_I5", + "sha256": "1nyiv91hm9765244xa6mh9cf62l329ppm8rdib35lb3ghgasid9n" + }, + "optifine_1_8_9": { + "version": "1.8.9_HD_U_M5", + "sha256": "1i5j4jvsd1zkly6pf8zs71gga61z533bq5y8gmfax9pwf057cf97" + }, + "optifine_1_8_8": { + "version": "1.8.8_HD_U_I7", + "sha256": "0x4aambs2kww9lanm4kp2jw4h3cwk25fa6xwsm9r7a1jv42jlyay" + }, + "optifine_1_8_0": { + "version": "1.8.0_HD_U_I7", + "sha256": "1ig013l61f7yj061ncnvmjsp9j2nd8fy8j03f8ry045d0s7idnfk" + }, + "optifine_1_7_10": { + "version": "1.7.10_HD_U_E7", + "sha256": "1d7s8ip697xnlpap89qrr794f307kwv5y44qyj8ha6h0vs1rvkcb" + }, + "optifine_1_7_2": { + "version": "1.7.2_HD_U_F7", + "sha256": "18lzyh639mi7r2hzwnmxv0a6v1ay7dk9bzasvwff82dxq0y9zi7m" + }, + "optifine-latest": { + "version": "1.19.2_HD_U_H9", + "sha256": "1xyg98i7zar5x3xbgpn2nm48mc3r9q6yqisxnqk3g254ghjcy4xx" + } +} From 44d3703d62e635ea0b39f8a25c60d179c3217b67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Sep 2022 07:59:58 +0000 Subject: [PATCH 24/53] thunderbird-unwrapped: 102.2.2 -> 102.3.0 --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 0c34c2b17469..4156825a3377 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -39,13 +39,13 @@ rec { }; thunderbird-102 = (buildMozillaMach rec { pname = "thunderbird"; - version = "102.2.2"; + version = "102.3.0"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "fe72ddb81d35d4a85b25a6d955a0b0f705aeda2dca0f572efca7ce94041c4ddcead6c690bda8d4bded4c43e12a15669f9608db6debec38d8b5157a914e280db5"; + sha512 = "9b9908d9f7b1281df5b2c74a25211973e25d9b780f05b9550c89e5aeb8b39070c517a1a33d0d84a33ed26dbcef99058308b76c056bd4e34987c32f0600e3882e"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. From 9fd75b45a0e47f72c04c24ca1d8b730d90d3606b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Sep 2022 08:17:18 +0000 Subject: [PATCH 25/53] kubevirt: 0.56.1 -> 0.57.0 --- pkgs/tools/virtualization/kubevirt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/kubevirt/default.nix b/pkgs/tools/virtualization/kubevirt/default.nix index ccf0e40ab4c9..99217a2f5845 100644 --- a/pkgs/tools/virtualization/kubevirt/default.nix +++ b/pkgs/tools/virtualization/kubevirt/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubevirt"; - version = "0.56.1"; + version = "0.57.0"; src = fetchFromGitHub { owner = "kubevirt"; repo = "kubevirt"; rev = "v${version}"; - sha256 = "sha256-PYVV/0qCBhR2l+rLuoPTe3FvLX9NmHHcA9gOeUj1IVw="; + sha256 = "sha256-+35z953dgb6lJpC/8+VcrHLY6yXINoDxq6GxkEEVOgU="; }; vendorSha256 = null; From 7286bad3a91710bbc64b3b4ec07fcfe236b6984f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Sep 2022 08:18:01 +0000 Subject: [PATCH 26/53] kubebuilder: 3.6.0 -> 3.7.0 --- .../applications/networking/cluster/kubebuilder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index 0aeb54948a3a..bf469c0f4b56 100644 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -9,15 +9,15 @@ buildGoModule rec { pname = "kubebuilder"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - sha256 = "sha256-WbFY1tBwq0DjJqM5ld7W9GkhPQDsGUQCwEe42XkJlfQ="; + sha256 = "sha256-nLjmz9OakBLTBWdYA6czgtJmCuP96abNwLcLZo+yZ48="; }; - vendorSha256 = "sha256-tz0SHAl9SwppjA8s0m4gJOh6rf8F+kRc2HnNMjO+blQ="; + vendorSha256 = "sha256-xljLDwubwr6rZ/ZpW9/WithClaMo88ivlBhWFb0iAvo="; subPackages = ["cmd"]; From 21bc002b61377b2603c18a47ecf922c747934951 Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 13 Sep 2022 18:40:48 +0200 Subject: [PATCH 27/53] pkgsMusl.python3.pkgs.watchdog: fix build --- pkgs/development/python-modules/watchdog/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index c530ea66cde6..d77f0d5db1f0 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -41,6 +41,11 @@ buildPythonPackage rec { substituteInPlace setup.cfg \ --replace "--cov=watchdog" "" \ --replace "--cov-report=term-missing" "" + '' + lib.optionalString stdenv.hostPlatform.isMusl + # https://github.com/gorakhargosh/watchdog/issues/920 + '' + substituteInPlace tests/test_inotify_c.py \ + --replace "Unknown error -1" "No error information" ''; disabledTests = [ From cabf66eefaffdc3e2faf63e081934f2c5587125a Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 21 Sep 2022 12:19:14 +0200 Subject: [PATCH 28/53] pkgsMusl.game-music-emu: fix build --- pkgs/applications/audio/game-music-emu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix index b54bf789f6b2..a10aace767be 100644 --- a/pkgs/applications/audio/game-music-emu/default.nix +++ b/pkgs/applications/audio/game-music-emu/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.xz"; sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb"; }; - cmakeFlags = lib.optionals stdenv.isDarwin [ "-DENABLE_UBSAN=OFF" ]; + cmakeFlags = lib.optionals (stdenv.isDarwin || stdenv.hostPlatform.isMusl) [ "-DENABLE_UBSAN=OFF" ]; nativeBuildInputs = [ cmake removeReferencesTo ]; # It used to reference it, in the past, but thanks to the postFixup hook, now From 0e40d1f469838fd692b2e572035bcd7b92e4032c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Sep 2022 12:12:49 +0000 Subject: [PATCH 29/53] changie: 1.9.0 -> 1.9.1 --- pkgs/development/tools/changie/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/development/tools/changie/default.nix index b85841f087d9..53c4a22f59f3 100644 --- a/pkgs/development/tools/changie/default.nix +++ b/pkgs/development/tools/changie/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "changie"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "miniscruff"; repo = pname; - sha256 = "sha256-3i+GInsxGeHXdFYfI664sOshHFsEIVXgXolzPhc9eoM="; + sha256 = "sha256-3AGz84z0YmDiLxlbDO0f9ny75hyLB4fnYQSICElJVK4="; }; - vendorSha256 = "sha256-/tYhoHk4+gbdfeBNqcBSM0y4V3tVH67Xta3+e+Sctsg="; + vendorSha256 = "sha256-9Cpyemq/f62rVMvGwOtgDGd9XllvICXL2dqNwUoFQmg="; meta = with lib; { homepage = "https://changie.dev"; From e6b5dc2eeb72eeee43bdc2f06679a1e1de6bbc5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Sep 2022 12:13:05 +0000 Subject: [PATCH 30/53] checkSSLCert: 2.45.0 -> 2.46.0 --- pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index e3283b7d3940..3b8ad1017c0a 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.45.0"; + version = "2.46.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - hash = "sha256-JmSSGt6rm4eSOVIT9eDN8FmQogG8kevHE2jgZfCzmgU="; + hash = "sha256-19goHso7jfG5agLB2xetYP2nv0HuXhXYDB6vBC0Pr5M="; }; nativeBuildInputs = [ From 3de898f26272c261b4e186bc8744080e22019068 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Fri, 16 Sep 2022 00:28:29 -0700 Subject: [PATCH 31/53] nixos/lemmy: inline localPostgres into database assertion Co-authored-by: Shahar Dawn Or Co-authored-by: Ctem Co-authored-by: a-kenji Co-authored-by: Brian Leung Co-authored-by: Ilan Joselevich --- nixos/modules/services/web-apps/lemmy.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-apps/lemmy.nix b/nixos/modules/services/web-apps/lemmy.nix index 925156e7c4ab..24ba91df6148 100644 --- a/nixos/modules/services/web-apps/lemmy.nix +++ b/nixos/modules/services/web-apps/lemmy.nix @@ -71,9 +71,6 @@ in }; config = - let - localPostgres = (cfg.settings.database.host == "localhost" || cfg.settings.database.host == "/run/postgresql"); - in lib.mkIf cfg.enable { services.lemmy.settings = (mapAttrs (name: mkDefault) { @@ -100,7 +97,7 @@ in }; }); - services.postgresql = mkIf localPostgres { + services.postgresql = mkIf cfg.database.createLocally { enable = mkDefault true; }; @@ -141,7 +138,7 @@ in }; assertions = [{ - assertion = cfg.database.createLocally -> localPostgres; + assertion = cfg.database.createLocally -> cfg.settings.database.host == "localhost" || cfg.settings.database.host == "/run/postgresql"; message = "if you want to create the database locally, you need to use a local database"; }]; From e5f798f3b98ad370c9b7c8380de54c86549bbf18 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Wed, 21 Sep 2022 00:48:02 -0700 Subject: [PATCH 32/53] nixos/lemmy: use PostgreSQL module to ensure database/user existence Co-authored-by: Shahar Dawn Or Co-authored-by: a-kenji Co-authored-by: Valentin Gagarin Co-authored-by: Ilan Joselevich --- nixos/modules/services/web-apps/lemmy.nix | 32 ++++++----------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/nixos/modules/services/web-apps/lemmy.nix b/nixos/modules/services/web-apps/lemmy.nix index 24ba91df6148..267584dd0ca7 100644 --- a/nixos/modules/services/web-apps/lemmy.nix +++ b/nixos/modules/services/web-apps/lemmy.nix @@ -98,7 +98,12 @@ in }); services.postgresql = mkIf cfg.database.createLocally { - enable = mkDefault true; + enable = true; + ensureDatabases = [ cfg.settings.database.database ]; + ensureUsers = [{ + name = cfg.settings.database.user; + ensurePermissions."DATABASE ${cfg.settings.database.database}" = "ALL PRIVILEGES"; + }]; }; services.pict-rs.enable = true; @@ -159,9 +164,9 @@ in wantedBy = [ "multi-user.target" ]; - after = [ "pict-rs.service" ] ++ lib.optionals cfg.database.createLocally [ "lemmy-postgresql.service" ]; + after = [ "pict-rs.service" ] ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ]; - requires = lib.optionals cfg.database.createLocally [ "lemmy-postgresql.service" ]; + requires = lib.optionals cfg.database.createLocally [ "postgresql.service" ]; serviceConfig = { DynamicUser = true; @@ -198,27 +203,6 @@ in ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.lemmy-ui}/dist/js/server.js"; }; }; - - systemd.services.lemmy-postgresql = mkIf cfg.database.createLocally { - description = "Lemmy postgresql db"; - after = [ "postgresql.service" ]; - partOf = [ "lemmy.service" ]; - script = with cfg.settings.database; '' - PSQL() { - ${config.services.postgresql.package}/bin/psql --port=${toString cfg.settings.database.port} "$@" - } - # check if the database already exists - if ! PSQL -lqt | ${pkgs.coreutils}/bin/cut -d \| -f 1 | ${pkgs.gnugrep}/bin/grep -qw ${database} ; then - PSQL -tAc "CREATE ROLE ${user} WITH LOGIN;" - PSQL -tAc "CREATE DATABASE ${database} WITH OWNER ${user};" - fi - ''; - serviceConfig = { - User = config.services.postgresql.superUser; - Type = "oneshot"; - RemainAfterExit = true; - }; - }; }; } From 54ce4e4eaaa5796f11149f18f927d8cea8bb7464 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 21 Sep 2022 15:19:40 +0200 Subject: [PATCH 33/53] game-music-emu: to pkgs/development/libraries --- .../libraries}/audio/game-music-emu/default.nix | 0 pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/{applications => development/libraries}/audio/game-music-emu/default.nix (100%) diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/development/libraries/audio/game-music-emu/default.nix similarity index 100% rename from pkgs/applications/audio/game-music-emu/default.nix rename to pkgs/development/libraries/audio/game-music-emu/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e599e5cc261..28f54ec58f60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18362,6 +18362,8 @@ with pkgs; gamenetworkingsockets = callPackage ../development/libraries/gamenetworkingsockets { }; + game-music-emu = callPackage ../development/libraries/audio/game-music-emu { }; + gamin = callPackage ../development/libraries/gamin { }; fam = gamin; # added 2018-04-25 @@ -28152,8 +28154,6 @@ with pkgs; g933-utils = callPackage ../tools/misc/g933-utils { }; - game-music-emu = callPackage ../applications/audio/game-music-emu { }; - gavrasm = callPackage ../development/compilers/gavrasm { }; gcalcli = callPackage ../applications/misc/gcalcli { }; From 371ae1a052165d5efade459bb0ce3148c81a9c2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Sep 2022 14:08:03 +0000 Subject: [PATCH 34/53] doctl: 1.79.0 -> 1.81.0 --- pkgs/development/tools/doctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 04014db912cc..250b05361b10 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.79.0"; + version = "1.81.0"; vendorSha256 = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-0tl79nVvnY2KECrfgEXQ8tOHnwEX+34uiJ/jshK5oFA="; + sha256 = "sha256-9sBuuRDbd44XH/DJVQrwiw+MhhQ8pl8uKcnsAa8nXGM="; }; meta = with lib; { From b6f1e6a1b26174624e1ef9127710b4d96a74ee53 Mon Sep 17 00:00:00 2001 From: maralorn Date: Wed, 21 Sep 2022 16:23:37 +0200 Subject: [PATCH 35/53] haskell.packages: Show minor version in test names --- pkgs/top-level/release-haskell.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index d0819557d6cb..e9be5e269b85 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -49,10 +49,10 @@ let # list of all compilers to test specific packages on released = with compilerNames; [ - ghc88 - ghc810 - ghc90 - ghc92 + ghc884 + ghc8107 + ghc902 + ghc924 ]; # packagePlatforms applied to `haskell.packages.*` From 49c6362244b5791b1f242b155ceea09ce6bccd77 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Wed, 21 Sep 2022 16:25:23 +0200 Subject: [PATCH 36/53] eventstore: 21.10.5 -> 22.6.0 --- pkgs/servers/nosql/eventstore/default.nix | 8 +++---- pkgs/servers/nosql/eventstore/deps.nix | 29 ++++++++++++++--------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index 60a69d200049..f0e4fca7dfd8 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "EventStore"; - version = "21.10.5"; + version = "22.6.0"; src = fetchFromGitHub { owner = "EventStore"; repo = "EventStore"; rev = "oss-v${version}"; - sha256 = "sha256-uUDjTGCiQgXmvOUsujIA0JkGQGuw9U4zLKDP1WIFq1o="; + sha256 = "sha256-+s/FjHKBpcpxFecuPrc26fA6WW20Uurxx1RunRY3JWI="; leaveDotGit = true; }; @@ -32,8 +32,8 @@ buildDotnetModule rec { runtimeDeps = [ mono ]; nugetBinariesToPatch = lib.optionals stdenv.isLinux [ - "grpc.tools/2.39.1/tools/linux_x64/protoc" - "grpc.tools/2.39.1/tools/linux_x64/grpc_csharp_plugin" + "grpc.tools/2.41.0/tools/linux_x64/protoc" + "grpc.tools/2.41.0/tools/linux_x64/grpc_csharp_plugin" ]; postConfigure = '' diff --git a/pkgs/servers/nosql/eventstore/deps.nix b/pkgs/servers/nosql/eventstore/deps.nix index 92b57b9440f2..01ff5be768c4 100644 --- a/pkgs/servers/nosql/eventstore/deps.nix +++ b/pkgs/servers/nosql/eventstore/deps.nix @@ -1,3 +1,6 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + { fetchNuGet }: [ (fetchNuGet { pname = "CompareNETObjects"; version = "4.65.0"; sha256 = "09p4xs6f7y8dykxx369ycp7z0jl7ai9bx23nazn8yxs5s38d9x2g"; }) (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "4.0.0"; sha256 = "013pzi7f4hf68wjswg0pzamjjsj63rl6jr1ivpd15v86y7vs6r9g"; }) @@ -5,17 +8,18 @@ (fetchNuGet { pname = "EventStore.Client"; version = "21.2.0"; sha256 = "1crnk0nbwcz4l2dv3ia96skmfn274nbyh5j1p0g9rjbzyy7kzf5j"; }) (fetchNuGet { pname = "EventStore.Plugins"; version = "21.2.0"; sha256 = "0fn2c2xi6yrwznnff3xpkhv5z5rnpka6wsaq1hb1jpxlxfscp670"; }) (fetchNuGet { pname = "GitHubActionsTestLogger"; version = "1.2.0"; sha256 = "0kndl162zas1ic185v10bm23hmrai54ng7wqlk3sp39gmdqhmyf5"; }) + (fetchNuGet { pname = "GitHubActionsTestLogger"; version = "2.0.0"; sha256 = "0579akfqnb6r3jrr5x6fi5c2pm58m00pjl0g74mxf0xp10sslg5b"; }) (fetchNuGet { pname = "GitInfo"; version = "2.0.26"; sha256 = "050l74vkamvbsp8f02b8aknizcknk4fr26dvwvw86mm8iw1dlvrv"; }) - (fetchNuGet { pname = "Google.Protobuf"; version = "3.15.8"; sha256 = "0k7hiijdrjw2y37yadd0jxx6hm4cd969v8svvddhksh6yqwnzh08"; }) - (fetchNuGet { pname = "Grpc.AspNetCore"; version = "2.39.0"; sha256 = "05im3lh8ar47m2zciwykjn6yqh2m4791pfzqr26408027wjm9vya"; }) - (fetchNuGet { pname = "Grpc.AspNetCore.Server"; version = "2.39.0"; sha256 = "17dhi75q2q0ra5n8qp0dlpgq1vqh186hgs3pqda60ya6hyc1fa45"; }) - (fetchNuGet { pname = "Grpc.AspNetCore.Server.ClientFactory"; version = "2.39.0"; sha256 = "0n21bfk1gabqpy9wpyzrzmilz4p8r1b4h0nq9waiqphkbv8g6frh"; }) - (fetchNuGet { pname = "Grpc.Core"; version = "2.39.1"; sha256 = "1c302krbhy063lpd52mgg9xx9ripp17314mfhym78r1q3nwrp15l"; }) - (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.39.1"; sha256 = "014b57zhflycsvdc2gmyv2a1vji7qzj1c7l4d1vgksb3ndwaxzrx"; }) - (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.39.0"; sha256 = "0km3zlkm3yq14yzcyq9g62i7a9qfihg1mczhbm6g8v5xkwbf667l"; }) - (fetchNuGet { pname = "Grpc.Net.ClientFactory"; version = "2.39.0"; sha256 = "115iky8qcazzl993mdf34v6hxzvhk9mpnk7kgxlw4cc1cf0iv16q"; }) - (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.39.0"; sha256 = "19mghqpgvr5slnlmjvv8hxhq3v9wq7bzab3bcg2b7623z0yxylr4"; }) - (fetchNuGet { pname = "Grpc.Tools"; version = "2.39.1"; sha256 = "1i5x4sm4rqfs8hc3vgwj05nlhqf0zx9vp72na65z2xyfabc0ybgc"; }) + (fetchNuGet { pname = "Google.Protobuf"; version = "3.18.0"; sha256 = "0ldfgw6zjjwdw66y3mbq4db54bsbqkklqanm78c8gij3pbvd223z"; }) + (fetchNuGet { pname = "Grpc.AspNetCore"; version = "2.41.0"; sha256 = "0sh9406vs7qfq852b24qxy4ivgxww0paf8rxsn7gs943si6dvj0n"; }) + (fetchNuGet { pname = "Grpc.AspNetCore.Server"; version = "2.41.0"; sha256 = "1ij5wvk3147jdmlybal59xbmlyr50xmzrxsnn77rj2l8g54ajyk2"; }) + (fetchNuGet { pname = "Grpc.AspNetCore.Server.ClientFactory"; version = "2.41.0"; sha256 = "0pb4vnc6dfwhrmgraicvqjf3gfz6d9g0qdhicahzsm1ngcj36klc"; }) + (fetchNuGet { pname = "Grpc.Core"; version = "2.41.0"; sha256 = "1caavhi66r9a0nwyk4vm8mhaayg899d6l0p71cv9n5qgc5xhkwqs"; }) + (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.41.0"; sha256 = "0524fv8mkdszhblfp1v2d5azdb1vg1rpy30yqpsfn00m7qr3smbv"; }) + (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.41.0"; sha256 = "0skn1sinkfk8fjpjd2qwr13x62pvk50n8nyy0nwb75n1bp9n8rwc"; }) + (fetchNuGet { pname = "Grpc.Net.ClientFactory"; version = "2.41.0"; sha256 = "08rin624q0w1vk59naxhnn20236yix7g7xb7jfciyv851b4ib1b4"; }) + (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.41.0"; sha256 = "0cp9xav7bzzy31s1xx221kzslrahnqmcj967lwrk6h949b2g552v"; }) + (fetchNuGet { pname = "Grpc.Tools"; version = "2.41.0"; sha256 = "153c994q14pyj6dyw8k3ckjkawn8m2ja34fv0w9wnxv4g2b6i4qd"; }) (fetchNuGet { pname = "HdrHistogram"; version = "2.5.0"; sha256 = "1s2np7m3pp17rgambax9a3x5pd2grx74cr325q3xapjz2gd58sj1"; }) (fetchNuGet { pname = "HostStat.NET"; version = "1.0.2"; sha256 = "1khxpp1fy36njjcmikr0xnxk7zv9d3rcnm6f7x2s94agins23hg7"; }) (fetchNuGet { pname = "Jint"; version = "3.0.0-beta-2038"; sha256 = "0gnp5pqsxd9lr7b4i73mpq5lyq16vzn0pr8rcyvnjjf3fanls8kc"; }) @@ -77,6 +81,7 @@ (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.0"; sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.8.3"; sha256 = "0szyg2p18w9lhlp52iylrr97w3kdalab089imhc53x1850avddsg"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.1"; sha256 = "1igpx7ldxqx9fkrbhakd2bybc0dgpvj86zr30vpfj31ncm6lp4id"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.2.0"; sha256 = "0l05smcgjzdfa5f60f9q5lylap3i21aswxbava92s19bgv46w2rv"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.9.1"; sha256 = "1frx5r7l0jd3j6my4s2qas13fkljgfn87a84xk8l7sisafpfsvzp"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) @@ -84,13 +89,15 @@ (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.7.0"; sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.7.0"; sha256 = "0pjll2a62hc576hd4wgyasva0lp733yllmk54n37svz5ac7nfz0q"; }) - (fetchNuGet { pname = "MinVer"; version = "2.3.0"; sha256 = "0h6mhh76jhmf60kyjrw8daxpsvprml814v7a8dc3vf5s1lvn2x4j"; }) + (fetchNuGet { pname = "MinVer"; version = "2.5.0"; sha256 = "0p6b80f1xv7k53lpanhh2spcz3l1krvr1j7xaij2kcrp275zsjyk"; }) (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "NUnit"; version = "3.13.2"; sha256 = "00bkjgarkwbj497da9d7lajala1ns67h1kx53w4bapwkf32jlcvn"; }) (fetchNuGet { pname = "NUnit3TestAdapter"; version = "3.17.0"; sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6"; }) (fetchNuGet { pname = "protobuf-net"; version = "2.4.0"; sha256 = "106lxm9afga7ihlknyy7mlfplyq40mrndksqrsn8ia2a47fbqqld"; }) From 2cd8c29a758383d5fbe831193dff30c0defc06ec Mon Sep 17 00:00:00 2001 From: mdarocha Date: Wed, 21 Sep 2022 16:25:59 +0200 Subject: [PATCH 37/53] eventstore: add updateScript --- pkgs/servers/nosql/eventstore/default.nix | 2 ++ pkgs/servers/nosql/eventstore/updater.sh | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100755 pkgs/servers/nosql/eventstore/updater.sh diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index f0e4fca7dfd8..177525700b6a 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -71,6 +71,8 @@ buildDotnetModule rec { kill "$PID"; ''; + passthru.updateScript = ./updater.sh; + meta = with lib; { homepage = "https://geteventstore.com/"; description = "Event sourcing database with processing logic in JavaScript"; diff --git a/pkgs/servers/nosql/eventstore/updater.sh b/pkgs/servers/nosql/eventstore/updater.sh new file mode 100755 index 000000000000..85be2c8aa8cc --- /dev/null +++ b/pkgs/servers/nosql/eventstore/updater.sh @@ -0,0 +1,23 @@ +#! /usr/bin/env nix-shell +#! nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts +# shellcheck shell=bash + +set -euo pipefail + +cd "$(dirname "${BASH_SOURCE[0]}")" + +deps_file="$(realpath "./deps.nix")" + +new_version="$(curl -s "https://api.github.com/repos/EventStore/EventStore/releases/latest" | jq -r '.name')" +new_version="${new_version#oss-v}" +old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" + +if [[ "$new_version" == "$old_version" ]]; then + echo "Already up to date!" + exit 0 +fi + +cd ../../../.. +update-source-version eventstore "${new_version//v}" + +$(nix-build -A eventstore.fetch-deps --no-out-link) "$deps_file" From bdcbbc7bd29cbd7f1ad3abc039e506b3991aaf28 Mon Sep 17 00:00:00 2001 From: maralorn Date: Wed, 21 Sep 2022 05:33:48 +0200 Subject: [PATCH 38/53] haskell-language-server: Default toplevel attribute to dynamic linking and one ghc version --- .../manual/from_md/release-notes/rl-2111.section.xml | 10 ++++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ .../haskell/haskell-language-server/withWrapper.nix | 9 ++++----- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index f1c433183475..484311980566 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -1469,6 +1469,16 @@ Superuser created successfully. extent. + + + pkgs.haskell-language-server will now by + default be linked dynamically to improve TemplateHaskell + compatibility. To mitigate the increased closure size it will + now by default only support our current default ghc (at the + moment 9.0.2). Add other ghc versions via e.g. + pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "92" ]; }. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 1cf1ad72c07f..bc3bd639b1ba 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -437,6 +437,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `/usr` will always be included in the initial ramdisk. See the `fileSystems..neededForBoot` option. If any files exist under `/usr` (which is not typical for NixOS), they will be included in the initial ramdisk, increasing its size to a possibly problematic extent. +- `pkgs.haskell-language-server` will now by default be linked dynamically to improve TemplateHaskell compatibility. To mitigate the increased closure size it will now by default only support our current default ghc (at the moment 9.0.2). Add other ghc versions via e.g. `pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "92" ]; }`. + ## Other Notable Changes {#sec-release-21.11-notable-changes} diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 616dcabd9cfd..e7ba49fa68dc 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,14 +1,14 @@ { lib , stdenv -, supportedGhcVersions ? [ "88" "810" "90" "92" ] -, dynamic ? false +, supportedGhcVersions ? [ "90" ] +, dynamic ? true , haskellPackages , haskell }: # # The recommended way to override this package is # -# pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" ]; } +# pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "92"]; } # # for example. Read more about this in the haskell-language-server section of the nixpkgs manual. # @@ -57,8 +57,7 @@ in stdenv.mkDerivation { concatMapStringsSep ", " (x: concatStringsSep ", " (targets x)) supportedGhcVersions }. - - You can override the list supportedGhcVersions. + You can choose for which ghc versions to install hls with pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "92" ]; }. ''; }; } From 1ef96c2f2453385f543a8042f63afe48e58183f5 Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Wed, 21 Sep 2022 16:10:35 +0200 Subject: [PATCH 39/53] ocamlPackages.dns: 6.1.4 -> 6.3.0 --- pkgs/development/ocaml-modules/dns/cli.nix | 3 +- .../development/ocaml-modules/dns/default.nix | 7 +++-- pkgs/development/ocaml-modules/dns/dnssec.nix | 30 +++++++++++++++++++ .../ocaml-modules/dns/resolver.nix | 3 +- pkgs/top-level/ocaml-packages.nix | 2 ++ 5 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/ocaml-modules/dns/dnssec.nix diff --git a/pkgs/development/ocaml-modules/dns/cli.nix b/pkgs/development/ocaml-modules/dns/cli.nix index f20f1373633a..fd54d9c8c86f 100644 --- a/pkgs/development/ocaml-modules/dns/cli.nix +++ b/pkgs/development/ocaml-modules/dns/cli.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, dns, dns-tsig, dns-client, dns-server, dns-certify +{ buildDunePackage, dns, dns-tsig, dns-client, dns-server, dns-certify, dnssec , bos, cmdliner, fpath, x509, mirage-crypto, mirage-crypto-pk , mirage-crypto-rng, hex, ptime, mtime, logs, fmt, ipaddr, lwt , randomconv, alcotest @@ -19,6 +19,7 @@ buildDunePackage { dns-client dns-server dns-certify + dnssec bos cmdliner fpath diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix index 2829b8a42fab..174adce4320f 100644 --- a/pkgs/development/ocaml-modules/dns/default.nix +++ b/pkgs/development/ocaml-modules/dns/default.nix @@ -1,19 +1,20 @@ { lib, buildDunePackage, fetchurl, alcotest , cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, fmt +, base64 }: buildDunePackage rec { pname = "dns"; - version = "6.1.4"; + version = "6.3.0"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz"; - sha256 = "sha256-nO9hRFOQzm3j57S1xTUC/j8ejSB+aDcsw/pOi893kHY="; + sha256 = "sha256-3EAjenN9EIi4PsXCZDevmEPDaS4xbESbcbB7pFgwc1E="; }; - propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ]; + propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics base64 ]; doCheck = true; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/dns/dnssec.nix b/pkgs/development/ocaml-modules/dns/dnssec.nix new file mode 100644 index 000000000000..06fe3f057eb5 --- /dev/null +++ b/pkgs/development/ocaml-modules/dns/dnssec.nix @@ -0,0 +1,30 @@ +{ buildDunePackage, cstruct, dns, mirage-crypto, mirage-crypto-pk, mirage-crypto-ec +, domain-name, logs +, alcotest, base64 +}: + +buildDunePackage { + pname = "dnssec"; + + inherit (dns) version src; + + propagatedBuildInputs = [ + cstruct + dns + mirage-crypto + mirage-crypto-pk + mirage-crypto-ec + domain-name + logs + ]; + + doCheck = true; + checkInputs = [ + alcotest + base64 + ]; + + meta = dns.meta // { + description = "DNSSec support for OCaml-DNS"; + }; +} diff --git a/pkgs/development/ocaml-modules/dns/resolver.nix b/pkgs/development/ocaml-modules/dns/resolver.nix index a4f5eaf1b71a..a262280a460a 100644 --- a/pkgs/development/ocaml-modules/dns/resolver.nix +++ b/pkgs/development/ocaml-modules/dns/resolver.nix @@ -1,6 +1,6 @@ { buildDunePackage, dns, dns-server, dns-mirage, lru, duration , randomconv, lwt, mirage-time, mirage-clock, mirage-random -, tcpip, tls, tls-mirage +, tcpip, tls, tls-mirage, dnssec , alcotest }: @@ -13,6 +13,7 @@ buildDunePackage { dns dns-server dns-mirage + dnssec lru duration randomconv diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4f2260ab7bb5..e306f48b4778 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -319,6 +319,8 @@ let dns-tsig = callPackage ../development/ocaml-modules/dns/tsig.nix { }; + dnssec = callPackage ../development/ocaml-modules/dns/dnssec.nix { }; + dolmen = callPackage ../development/ocaml-modules/dolmen { }; dolog = callPackage ../development/ocaml-modules/dolog { }; From 188ea7b8c83d2b66ebdbabfca1e560da895ff25a Mon Sep 17 00:00:00 2001 From: maralorn Date: Wed, 21 Sep 2022 17:03:11 +0200 Subject: [PATCH 40/53] haskell.packages: Revert to minor version test names --- pkgs/top-level/release-haskell.nix | 46 +++++++++++++++++------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index e9be5e269b85..6b70511cf4c2 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -140,7 +140,13 @@ let # ghcjs attribute in their bootstrap package set (exposed via passthru) which # would otherwise be ignored by Hydra. bootGhcjs = (packagePlatforms pkgs.haskell.compiler.${ghcjsName}.passthru).bootGhcjs; - })); + })) // { + ghc88 = {}; + ghc810 = {}; + ghc90 = {}; + ghc92 = {}; + ghc94 = {}; + }; tests.haskell = packagePlatforms pkgs.tests.haskell; @@ -366,30 +372,30 @@ let nix-paths = released; titlecase = released; ghc-api-compat = [ - compilerNames.ghc88 - compilerNames.ghc810 - compilerNames.ghc90 + compilerNames.ghc884 + compilerNames.ghc8107 + compilerNames.ghc902 ]; ghc-bignum = [ - compilerNames.ghc88 - compilerNames.ghc810 + compilerNames.ghc884 + compilerNames.ghc8107 ]; ghc-lib = released; ghc-lib-parser = released; ghc-lib-parser-ex = released; spectacle = [ - compilerNames.ghc810 + compilerNames.ghc8107 ]; weeder = [ - compilerNames.ghc810 - compilerNames.ghc90 - compilerNames.ghc92 + compilerNames.ghc8107 + compilerNames.ghc902 + compilerNames.ghc924 ]; purescript-cst = [ - compilerNames.ghc810 + compilerNames.ghc8107 ]; purescript-ast = [ - compilerNames.ghc810 + compilerNames.ghc8107 ]; }) { @@ -454,14 +460,14 @@ let constituents = accumulateDerivations [ jobs.pkgsMusl.haskell.compiler.ghc8102Binary jobs.pkgsMusl.haskell.compiler.ghc8107Binary - jobs.pkgsMusl.haskell.compiler.ghc88 - jobs.pkgsMusl.haskell.compiler.ghc810 - jobs.pkgsMusl.haskell.compiler.ghc90 - jobs.pkgsMusl.haskell.compiler.ghc92 + jobs.pkgsMusl.haskell.compiler.ghc884 + jobs.pkgsMusl.haskell.compiler.ghc8107 + jobs.pkgsMusl.haskell.compiler.ghc902 + jobs.pkgsMusl.haskell.compiler.ghc924 jobs.pkgsMusl.haskell.compiler.ghcHEAD - jobs.pkgsMusl.haskell.compiler.integer-simple.ghc810 - jobs.pkgsMusl.haskell.compiler.native-bignum.ghc90 - jobs.pkgsMusl.haskell.compiler.native-bignum.ghc92 + jobs.pkgsMusl.haskell.compiler.integer-simple.ghc8107 + jobs.pkgsMusl.haskell.compiler.native-bignum.ghc902 + jobs.pkgsMusl.haskell.compiler.native-bignum.ghc924 jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD ]; }; @@ -477,7 +483,7 @@ let }; constituents = accumulateDerivations [ jobs.pkgsStatic.haskellPackages - jobs.pkgsStatic.haskell.packages.native-bignum.ghc92 + jobs.pkgsStatic.haskell.packages.native-bignum.ghc924 ]; }; } From 9cb8ee31ef408077f46b4e4f8469ef4769512323 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Sep 2022 15:04:24 +0000 Subject: [PATCH 41/53] mapserver: 7.6.4 -> 8.0.0 --- pkgs/servers/geospatial/mapserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/geospatial/mapserver/default.nix b/pkgs/servers/geospatial/mapserver/default.nix index e643f790bb57..d7012af0ffee 100644 --- a/pkgs/servers/geospatial/mapserver/default.nix +++ b/pkgs/servers/geospatial/mapserver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "mapserver"; - version = "7.6.4"; + version = "8.0.0"; src = fetchFromGitHub { owner = "MapServer"; repo = "MapServer"; rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; - sha256 = "sha256-NMo/7CtWYIP1oPKki09oDWLCbj2vPk3xCU4rkHq8YKY="; + sha256 = "sha256-t9tthHszqtbFEh50IhQMtBb9rD9tU3QbDlUsVRVkQ6U="; }; nativeBuildInputs = [ From 413c67c96d3802941d3d1443813df9b7fad170b8 Mon Sep 17 00:00:00 2001 From: maralorn Date: Wed, 21 Sep 2022 17:10:59 +0200 Subject: [PATCH 42/53] haskell.compiler.native-bignum: Readd missing minor versions --- pkgs/top-level/haskell-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index bad2ae124338..66e94b12c5b0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -25,8 +25,11 @@ let nativeBignumIncludes = [ "ghc90" + "ghc902" "ghc92" + "ghc924" "ghc94" + "ghc942" "ghcHEAD" ]; From 122c082943c204516c86187ad5a61de894befa10 Mon Sep 17 00:00:00 2001 From: maralorn Date: Wed, 21 Sep 2022 17:15:58 +0200 Subject: [PATCH 43/53] haskell.pkgsStatic: Fix missing minor version for hydr checks --- pkgs/top-level/release-haskell.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 6b70511cf4c2..529194b1d135 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -338,7 +338,7 @@ let ; }; - haskell.packages.native-bignum.ghc92 = { + haskell.packages.native-bignum.ghc924 = { inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc92) hello lens From 39a02ce041750f27bc55ad4d38125f40fc7793eb Mon Sep 17 00:00:00 2001 From: maralorn Date: Wed, 21 Sep 2022 17:20:16 +0200 Subject: [PATCH 44/53] =?UTF-8?q?haskell.compiler:=20Don=E2=80=98t=20filte?= =?UTF-8?q?r=20redundant=20major=20version=20jobs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/top-level/release-haskell.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 529194b1d135..167896af4d2b 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -140,13 +140,7 @@ let # ghcjs attribute in their bootstrap package set (exposed via passthru) which # would otherwise be ignored by Hydra. bootGhcjs = (packagePlatforms pkgs.haskell.compiler.${ghcjsName}.passthru).bootGhcjs; - })) // { - ghc88 = {}; - ghc810 = {}; - ghc90 = {}; - ghc92 = {}; - ghc94 = {}; - }; + })); tests.haskell = packagePlatforms pkgs.tests.haskell; From c8608fa54024d3d441fea0c42febc6778283f678 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 21 Sep 2022 11:21:35 -0400 Subject: [PATCH 45/53] terraform: 1.2.9 -> 1.3.0 --- pkgs/applications/networking/cluster/terraform/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index be0e78580790..342344a5310c 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -168,9 +168,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.2.9"; - sha256 = "sha256-Q5AJiFnbHXhIJP06SCJNvuMKGwEJUOsmueCI7QCeQlk="; - vendorSha256 = "sha256-VKJ+aWZYD6N8HDJwUEtgWxoBMGOa27K9ze2RUJvuipc="; + version = "1.3.0"; + sha256 = "1bl2d1wzarhglfc2vxg4m080d6z5mm35h3i4vg7n93wj9x3wkkq8"; + vendorSha256 = "1kjbrwn6k0fycal8g189pda1w3qyjzfk2qjvm1fyj60dr155gncw"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; From b0e0e80ddc637603482cebe4c17d7ea87b765a8c Mon Sep 17 00:00:00 2001 From: quasigod-io Date: Wed, 21 Sep 2022 01:34:20 -0400 Subject: [PATCH 46/53] nitch: init at 0.1.6 --- pkgs/tools/misc/nitch/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/nitch/default.nix diff --git a/pkgs/tools/misc/nitch/default.nix b/pkgs/tools/misc/nitch/default.nix new file mode 100644 index 000000000000..62a691f306e9 --- /dev/null +++ b/pkgs/tools/misc/nitch/default.nix @@ -0,0 +1,28 @@ +{ lib, nimPackages, fetchFromGitHub, fetchpatch }: +nimPackages.buildNimPackage rec { + pname = "nitch"; + version = "0.1.6"; + nimBinOnly = true; + src = fetchFromGitHub { + owner = "unxsh"; + repo = "nitch"; + rev = "42ad6899931dd5e0cec7b021c2b7e383fcc891f3"; + hash = "sha256-QI7CbP0lvvjD+g29FR/YJjuZboZ+PoHynsNbpYC9SvE="; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/unxsh/nitch/commit/6831cf96144f58c4da298a0bc9b50d33056f6c08.patch"; + sha256 = "sha256-uZUzUBLHBsssNqDxZ0NuTRMN9/gBxIlIiGgQkqCqEFc="; + }) + ]; + + meta = with lib; { + description = "Incredibly fast system fetch written in nim"; + homepage = "https://github.com/unxsh/nitch"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ quasigod-io ]; + mainProgram = "nitch"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 049dac6838eb..9ed7a44796b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4451,6 +4451,8 @@ with pkgs; nfstrace = callPackage ../tools/networking/nfstrace { }; + nitch = callPackage ../tools/misc/nitch { }; + nix-direnv = callPackage ../tools/misc/nix-direnv { }; nixel = callPackage ../tools/nix/nixel { }; From 0ba6b83dd3200858f0ea2860e54248de2129a0c8 Mon Sep 17 00:00:00 2001 From: quasigod-io Date: Wed, 21 Sep 2022 01:35:25 -0400 Subject: [PATCH 47/53] maintainers: add quasigod-io --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 169ee60d27aa..00556a82b24c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15407,4 +15407,10 @@ github = "zuzuleinen"; githubId = 944919; }; + quasigod-io = { + email = "quasigod-io@protonmail.com"; + name = "Michael Belsanti"; + github = "quasigod-io"; + githubId = 62124625; + }; } From bc5a8468514170cac588c2ece88af7411674f90c Mon Sep 17 00:00:00 2001 From: maralorn Date: Wed, 21 Sep 2022 17:40:09 +0200 Subject: [PATCH 48/53] haskellPackages.ghcide-bench: dontCheck --- pkgs/development/haskell-modules/configuration-nix.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 21016baede7b..6e341278b6e8 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1045,6 +1045,9 @@ self: super: builtins.intersectAttrs super { keid-render-basic = addBuildTool pkgs.glslang super.keid-render-basic; + # ghcide-bench tests need network + ghcide-bench = dontCheck super.ghcide-bench; + # haskell-language-server plugins all use the same test harness so we give them what we want in this loop. } // pkgs.lib.mapAttrs (_: overrideCabal (drv: { From b2532132fdc5ab4afcf9d39fbc7fb9cba2d966d2 Mon Sep 17 00:00:00 2001 From: talyz Date: Wed, 21 Sep 2022 17:49:46 +0200 Subject: [PATCH 49/53] pythonPackages.elasticsearch: Remove notice about breakage --- pkgs/development/python-modules/elasticsearch/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 73a3882927c2..33e91ebc22c1 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,6 @@ buildPythonPackage (rec { pname = "elasticsearch"; - # In 7.14.0, the package was intentionally made incompatible with - # the OSS version of elasticsearch - don't update past 7.13.x until - # there's a clear path forward. See - # https://github.com/elastic/elasticsearch-py/issues/1639 for more - # info. version = "7.16.3"; src = fetchPypi { From c4bb5315d3c7b8a2c48cfff0b489efb8928510dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Sep 2022 08:57:45 +0000 Subject: [PATCH 50/53] lighttpd: 1.4.66 -> 1.4.67 --- pkgs/servers/http/lighttpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 2885676279dc..f2d8187f81f3 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "lighttpd"; - version = "1.4.66"; + version = "1.4.67"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; - sha256 = "sha256-R6xuYCcaoBluZUctAtAZVW3HxtCd87Zd8sGraGY0jjs="; + sha256 = "sha256-fgTXZ/UajYJLMuJIPvKVCYKSDUJ9EnLvRmf0nW+J81g="; }; postPatch = '' From 7cc305fa594353ef5084dae6329d2646d6789513 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 21 Sep 2022 17:57:38 +0200 Subject: [PATCH 51/53] pdns-recursor: 4.7.2 -> 4.7.3 --- pkgs/servers/dns/pdns-recursor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 35d79d6b1439..4e9e2f014f9b 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.7.2"; + version = "4.7.3"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "sha256-vbQZB5D+dZd41vBRWvu8wKKLPn4bg8Vwyq84QZ1Xgg0="; + sha256 = "sha256-IG12bMjwGJ951pr2TY2TfsxhpNE+jqZZTXj+MOYUBfI="; }; nativeBuildInputs = [ pkg-config ]; From 7e058ceb6f232275ed95820b31329e67969cce16 Mon Sep 17 00:00:00 2001 From: maralorn Date: Wed, 21 Sep 2022 18:13:33 +0200 Subject: [PATCH 52/53] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 2efb531ff2c3..4b49ace5a940 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2253,6 +2253,7 @@ broken-packages: - hlongurl - hlrdb-core - hls-exactprint-utils + - hls-selection-range-plugin - hls-stan-plugin - hlwm - hmarkup diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7df84ce40d4f..2d354718004b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -141386,6 +141386,8 @@ self: { ]; description = "HLS Plugin to support smart selection range"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hls-splice-plugin" = callPackage From 944c6691fc7e7a49f3980f252eb8c184a534a4b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Wed, 21 Sep 2022 19:06:36 +0200 Subject: [PATCH 53/53] aws: remove, recommend `awscli` / `awscli2` (#176707) Co-authored-by: superherointj <5861043+superherointj@users.noreply.github.com> --- .../from_md/release-notes/rl-2211.section.xml | 8 +++++ .../manual/release-notes/rl-2211.section.md | 2 ++ pkgs/tools/virtualization/aws/default.nix | 29 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 11 insertions(+), 31 deletions(-) delete mode 100644 pkgs/tools/virtualization/aws/default.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 6c4bc01cc16b..f93f56898d13 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -508,6 +508,14 @@ been removed due to lack of upstream maintenance. + + + The aws package has been removed due to + being abandoned by the upstream. It is recommended to use + awscli or awscli2 + instead. + + The meta.mainProgram attribute of packages diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 720603ef1ad8..f8f42abacc27 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -176,6 +176,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). `python3.pkgs.influxgraph` packages, have been removed due to lack of upstream maintenance. +- The `aws` package has been removed due to being abandoned by the upstream. It is recommended to use `awscli` or `awscli2` instead. + - The `meta.mainProgram` attribute of packages in `wineWowPackages` now defaults to `"wine64"`. - The `paperless` module now defaults `PAPERLESS_TIME_ZONE` to your configured system timezone. diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix deleted file mode 100644 index d09e001ec6eb..000000000000 --- a/pkgs/tools/virtualization/aws/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, perl, curl }: - -stdenv.mkDerivation { - pname = "aws"; - version = "2019.06.18"; - - src = fetchurl { - url = "https://raw.github.com/timkay/aws/ac68eb5191c52f069b9aa0c9a99808f8a4430833/aws"; - sha256 = "02bym9wicqpdr7mdim13zw5ssh97xfswzab9q29rsbg7058ddbil"; - }; - - buildInputs = [ perl ]; - - dontUnpack = true; - - installPhase = - '' - mkdir -p $out/bin - sed 's|\[curl|[${curl.bin}/bin/curl|g' $src > $out/bin/aws - chmod +x $out/bin/aws - ''; - - meta = { - homepage = "https://www.timkay.com/aws/"; - description = "Command-line utility for working with Amazon EC2, S3, SQS, ELB, IAM and SDB"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0df3ba637ae4..61263109006b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -95,6 +95,7 @@ mapAliases ({ avldrums-lv2 = x42-avldrums; # Added 2020-03-29 avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18 awesome-4-0 = awesome; # Added 2022-05-05 + aws = throw "aws has been removed: abandoned by upstream. For the AWS CLI maintained by Amazon, see 'awscli' or 'awscli2'"; # Added 2022-09-21 awless = throw "awless has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-05-30 aws-okta = throw "aws-okta is on indefinite hiatus. See https://github.com/segmentio/aws-okta/issues/278"; # Added 2022-04-05; axoloti = throw "axoloti has been removed: abandoned by upstream"; # Added 2022-05-13 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac351e13aba7..07ed8daa9bc3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2899,8 +2899,6 @@ with pkgs; avro-cpp = callPackage ../development/libraries/avro-c++ { }; - aws = callPackage ../tools/virtualization/aws { }; - aws_mturk_clt = callPackage ../tools/misc/aws-mturk-clt { }; awsls = callPackage ../tools/admin/awsls { };