From 7f909b041b9c149d9b029ae2e9a0c5e2a01412df Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 28 Jul 2022 17:26:51 +0200 Subject: [PATCH 01/14] haskell.compiler: ghc923 -> ghc924 https://www.haskell.org/ghc/download_ghc_9_2_4.html --- lib/options.nix | 2 +- .../development/option-declarations.section.md | 4 ++-- .../development/option-declarations.section.xml | 4 ++-- .../compilers/ghc/{9.2.3.nix => 9.2.4.nix} | 12 ++---------- .../haskell-language-server/withWrapper.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/haskell-packages.nix | 12 ++++++------ pkgs/top-level/release-haskell.nix | 14 +++++++------- 8 files changed, 22 insertions(+), 30 deletions(-) rename pkgs/development/compilers/ghc/{9.2.3.nix => 9.2.4.nix} (97%) diff --git a/lib/options.nix b/lib/options.nix index 3a1c0e540d7c..84d9fd5e15de 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -121,7 +121,7 @@ rec { Example: mkPackageOption pkgs "GHC" { default = [ "ghc" ]; - example = "pkgs.haskell.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])"; + example = "pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])"; } => { _type = "option"; default = «derivation /nix/store/jxx55cxsjrf8kyh3fp2ya17q99w7541r-ghc-8.10.7.drv»; defaultText = { ... }; description = "The GHC package to use."; example = { ... }; type = { ... }; } */ diff --git a/nixos/doc/manual/development/option-declarations.section.md b/nixos/doc/manual/development/option-declarations.section.md index 79914f2cb6ca..8bf73a66456b 100644 --- a/nixos/doc/manual/development/option-declarations.section.md +++ b/nixos/doc/manual/development/option-declarations.section.md @@ -127,14 +127,14 @@ lib.mkOption { ```nix lib.mkPackageOption pkgs "GHC" { default = [ "ghc" ]; - example = "pkgs.haskell.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])"; + example = "pkgs.haskell.packages.ghc924.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.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])"; + example = lib.literalExpression "pkgs.haskell.packages.ghc924.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 03ec48f35fd7..d7c7f7716bea 100644 --- a/nixos/doc/manual/from_md/development/option-declarations.section.xml +++ b/nixos/doc/manual/from_md/development/option-declarations.section.xml @@ -193,14 +193,14 @@ lib.mkOption { lib.mkPackageOption pkgs "GHC" { default = [ "ghc" ]; - example = "pkgs.haskell.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])"; + example = "pkgs.haskell.packages.ghc924.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.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])"; + example = lib.literalExpression "pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])"; description = "The GHC package to use."; } diff --git a/pkgs/development/compilers/ghc/9.2.3.nix b/pkgs/development/compilers/ghc/9.2.4.nix similarity index 97% rename from pkgs/development/compilers/ghc/9.2.3.nix rename to pkgs/development/compilers/ghc/9.2.4.nix index a7a80f4b9f14..cfbc403a3891 100644 --- a/pkgs/development/compilers/ghc/9.2.3.nix +++ b/pkgs/development/compilers/ghc/9.2.4.nix @@ -6,8 +6,6 @@ , xattr, autoSignDarwinBinariesHook , bash -, autoreconfHook # GHC 9.2.3 tarballs don't have autoconf run on them - , libiconv ? null, ncurses , glibcLocales ? null @@ -176,12 +174,12 @@ assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; stdenv.mkDerivation (rec { - version = "9.2.3"; + version = "9.2.4"; pname = "${targetPrefix}ghc${variantSuffix}"; src = fetchurl { url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "50ecdc2bef013e518f9a62a15245d7db0e4409d737c43b1cea7306fd82e1669e"; + sha256 = "15213888064a0ec4e7723d075f31b87a678ce0851773d58b44ef7aa3de996458"; }; enableParallelBuilding = true; @@ -231,12 +229,7 @@ stdenv.mkDerivation (rec { # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" '' + '' - echo -n "${buildMK}" > mk/build.mk - # GHC 9.2.3 tarball is not properly prepared - ./boot - - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" '' + lib.optionalString (!stdenv.isDarwin) '' @@ -301,7 +294,6 @@ stdenv.mkDerivation (rec { dontAddExtraLibs = true; nativeBuildInputs = [ - autoreconfHook # GHC 9.2.3 tarball hasn't autoconf run on it perl autoconf automake m4 python3 ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 7c6481cabadc..8dbd4fc9fab6 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" "923" ] +, supportedGhcVersions ? [ "884" "8107" "902" "924" ] , dynamic ? false , haskellPackages , haskell diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a701c153653..1af173ae04df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14710,7 +14710,7 @@ with pkgs; stdenv = clangStdenv; }; - jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc923.jacinda; + jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc924.jacinda; janet = callPackage ../development/interpreters/janet {}; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8856d4123210..d6edb1531471 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -15,14 +15,14 @@ let "integer-simple" "native-bignum" "ghc902" - "ghc923" + "ghc924" "ghc941" "ghcHEAD" ]; nativeBignumIncludes = [ "ghc902" - "ghc923" + "ghc924" "ghc941" "ghcHEAD" ]; @@ -138,7 +138,7 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc923 = callPackage ../development/compilers/ghc/9.2.3.nix { + ghc924 = callPackage ../development/compilers/ghc/9.2.4.nix { bootPkgs = # aarch64 ghc8107Binary exceeds max output size on hydra if stdenv.isAarch64 || stdenv.isAarch32 then @@ -277,9 +277,9 @@ in { ghc = bh.compiler.ghc902; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { }; }; - ghc923 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc923; - ghc = bh.compiler.ghc923; + ghc924 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc924; + ghc = bh.compiler.ghc924; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; }; ghc941 = callPackage ../development/haskell-modules { diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 6ab31c747477..ef82c54dda9e 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -52,7 +52,7 @@ let ghc884 ghc8107 ghc902 - ghc923 + ghc924 ]; # packagePlatforms applied to `haskell.packages.*` @@ -331,8 +331,8 @@ let ; }; - haskell.packages.native-bignum.ghc923 = { - inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc923) + haskell.packages.native-bignum.ghc924 = { + inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc924) hello lens random @@ -382,7 +382,7 @@ let weeder = [ compilerNames.ghc8107 compilerNames.ghc902 - compilerNames.ghc923 + compilerNames.ghc924 ]; purescript-cst = [ compilerNames.ghc8107 @@ -456,11 +456,11 @@ let jobs.pkgsMusl.haskell.compiler.ghc884 jobs.pkgsMusl.haskell.compiler.ghc8107 jobs.pkgsMusl.haskell.compiler.ghc902 - jobs.pkgsMusl.haskell.compiler.ghc923 + jobs.pkgsMusl.haskell.compiler.ghc924 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.ghc923 + jobs.pkgsMusl.haskell.compiler.native-bignum.ghc924 jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD ]; }; @@ -476,7 +476,7 @@ let }; constituents = accumulateDerivations [ jobs.pkgsStatic.haskellPackages - jobs.pkgsStatic.haskell.packages.native-bignum.ghc923 + jobs.pkgsStatic.haskell.packages.native-bignum.ghc924 ]; }; } From 42d8425db608710ff30dc229d11ef9e1e4ab90f3 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 31 Jul 2022 12:07:09 +0200 Subject: [PATCH 02/14] all-cabal-hashes: 2022-07-27T11:03:11Z -> 2022-07-31T09:12:37Z 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 4ef318f66734..b7497b154780 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "84a258f1f060f5f31f44b2d966b6e96305932eb2", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/84a258f1f060f5f31f44b2d966b6e96305932eb2.tar.gz", - "sha256": "0nyiyxxqa5h46p50jmvrx6sphxy0j8ib2vy3jvfijdpc4d6d5gx6", - "msg": "Update from Hackage at 2022-07-27T11:03:11Z" + "commit": "219207531a7a2e12e857b3ec55a7573f0a0f34d2", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/219207531a7a2e12e857b3ec55a7573f0a0f34d2.tar.gz", + "sha256": "146y45g6f1vvc3f8p1dq56y1fk1ls7v814iwa736k08ah6jfrq4f", + "msg": "Update from Hackage at 2022-07-31T09:12:37Z" } From 4cb27809af54ee83b604ec4bbce3de65d9748e64 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 31 Jul 2022 12:07:19 +0200 Subject: [PATCH 03/14] haskellPackages: stackage LTS 19.16 -> LTS 19.17 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index e0e05f00797d..59b9f6ad5f7c 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.16 +# Stackage LTS 19.17 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -279,7 +279,7 @@ default-package-overrides: - cached-json-file ==0.1.1 - cacophony ==0.10.1 - calendar-recycling ==0.0.0.1 - - call-alloy ==0.3.0.2 + - call-alloy ==0.3.0.3 - call-stack ==0.4.0 - can-i-haz ==0.3.1.0 - capability ==0.5.0.1 @@ -536,7 +536,7 @@ default-package-overrides: - DBFunctor ==0.1.2.1 - dbus ==1.2.22 - dbus-hslogger ==0.1.0.1 - - debian ==4.0.2 + - debian ==4.0.4 - debian-build ==0.10.2.1 - debug-trace-var ==0.2.0 - dec ==0.0.4 @@ -673,7 +673,7 @@ default-package-overrides: - eq ==4.3 - equal-files ==0.0.5.3 - equational-reasoning ==0.7.0.1 - - equivalence ==0.4.0.1 + - equivalence ==0.4.1 - erf ==2.0.0.0 - errata ==0.4.0.0 - error ==0.3.0.0 @@ -708,7 +708,7 @@ default-package-overrides: - exomizer ==1.0.0 - experimenter ==0.1.0.12 - expiring-cache-map ==0.0.6.1 - - explainable-predicates ==0.1.2.1 + - explainable-predicates ==0.1.2.2 - explicit-exception ==0.1.10 - exp-pairs ==0.2.1.0 - express ==1.0.10 @@ -830,7 +830,7 @@ default-package-overrides: - generic-constraints ==1.1.1.1 - generic-data ==0.9.2.1 - generic-data-surgery ==0.3.0.0 - - generic-deriving ==1.14.1 + - generic-deriving ==1.14.2 - generic-functor ==0.2.0.0 - generic-lens ==2.2.1.0 - generic-lens-core ==2.2.1.0 @@ -979,7 +979,7 @@ default-package-overrides: - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - happstack-server ==7.7.2 - - happstack-server-tls ==7.2.1.2 + - happstack-server-tls ==7.2.1.3 - happy ==1.20.0 - happy-meta ==0.2.0.11 - HasBigDecimal ==0.1.1 @@ -1005,13 +1005,13 @@ default-package-overrides: - haskintex ==0.8.0.0 - haskoin-core ==0.21.2 - hasktags ==0.72.0 - - hasql ==1.5.0.5 + - hasql ==1.5.1 - hasql-migration ==0.3.0 - hasql-notifications ==0.2.0.1 - hasql-optparse-applicative ==0.3.0.9 - hasql-pool ==0.5.2.2 - hasql-queue ==1.2.0.2 - - hasql-th ==0.4.0.16 + - hasql-th ==0.4.0.17 - hasql-transaction ==1.0.1.1 - has-transformers ==0.1.0.4 - hasty-hamiltonian ==1.3.4 @@ -1176,7 +1176,7 @@ default-package-overrides: - HTTP ==4000.3.16 - http-api-data ==0.4.3 - http-api-data-qq ==0.1.0.0 - - http-client ==0.7.11 + - http-client ==0.7.12 - http-client-openssl ==0.3.3 - http-client-overrides ==0.1.1.0 - http-client-tls ==0.3.6.1 @@ -1269,7 +1269,7 @@ default-package-overrides: - infer-license ==0.2.0 - inflections ==0.4.0.6 - influxdb ==1.9.2.2 - - ini ==0.4.1 + - ini ==0.4.2 - inj ==1.0 - inline-c ==0.9.1.6 - inline-c-cpp ==0.5.0.0 @@ -1688,7 +1688,7 @@ default-package-overrides: - numeric-prelude ==0.4.4 - numeric-quest ==0.2.0.2 - numhask ==0.10.1.0 - - numhask-array ==0.10.0 + - numhask-array ==0.10.1 - numhask-space ==0.10.0.0 - NumInstances ==1.4 - numtype-dk ==0.5.0.3 @@ -1707,7 +1707,7 @@ default-package-overrides: - OneTuple ==0.3.1 - Only ==0.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.9.2.0 + - opaleye ==0.9.3.2 - OpenAL ==1.7.0.5 - openapi3 ==3.2.2 - open-browser ==0.2.1.0 @@ -1754,7 +1754,7 @@ default-package-overrides: - pandoc-plot ==1.4.1 - pandoc-throw ==0.1.0.0 - pandoc-types ==1.22.2 - - pantry ==0.5.5 + - pantry ==0.5.6 - parallel ==3.2.2.0 - parallel-io ==0.3.5 - parameterized ==0.5.0.0 @@ -1957,7 +1957,7 @@ default-package-overrides: - pvar ==1.0.0.0 - PyF ==0.10.2.0 - qchas ==1.1.0.1 - - qm-interpolated-string ==0.3.0.0 + - qm-interpolated-string ==0.3.1.0 - qrcode-core ==0.9.5 - qrcode-juicypixels ==0.8.3 - quadratic-irrational ==0.1.1 @@ -2047,7 +2047,7 @@ default-package-overrides: - regex-pcre-builtin ==0.95.2.3.8.44 - regex-posix ==0.96.0.1 - regex-posix-clib ==2.7 - - regex-tdfa ==1.3.1.4 + - regex-tdfa ==1.3.2 - regex-with-pcre ==1.1.0.2 - reinterpret-cast ==0.1.0 - rel8 ==1.3.1.0 @@ -2197,7 +2197,7 @@ default-package-overrides: - servant-websockets ==2.0.0 - servant-xml ==1.0.1.4 - serversession ==1.0.3 - - serversession-frontend-wai ==1.0 + - serversession-frontend-wai ==1.0.1 - servius ==1.2.3.0 - ses-html ==0.4.0.0 - set-cover ==0.1.1 @@ -2440,7 +2440,7 @@ default-package-overrides: - tasty-tap ==0.1.0 - tasty-test-reporter ==0.1.1.4 - tasty-th ==0.1.7 - - tasty-wai ==0.1.1.1 + - tasty-wai ==0.1.2.0 - TCache ==0.12.1 - tce-conf ==1.3 - tcp-streams ==1.0.1.1 @@ -2486,9 +2486,9 @@ default-package-overrides: - text-zipper ==0.11 - tfp ==1.0.2 - tf-random ==0.5 - - th-abstraction ==0.4.3.0 + - th-abstraction ==0.4.4.0 - th-bang-compat ==0.0.1.0 - - th-compat ==0.1.3 + - th-compat ==0.1.4 - th-constraint-compat ==0.0.1.0 - th-desugar ==1.12 - th-env ==0.1.1 @@ -2496,7 +2496,7 @@ default-package-overrides: - these-lens ==1.0.1.2 - these-optics ==1.0.1.2 - these-skinny ==0.7.5 - - th-expand-syns ==0.4.9.0 + - th-expand-syns ==0.4.10.0 - th-extras ==0.0.0.6 - th-lego ==0.3.0.1 - th-lift ==0.8.2 @@ -2842,7 +2842,7 @@ with-compiler: ghc-9.0.2 - yesod-auth-hashdb ==1.7.1.7 - yesod-auth-oauth2 ==0.7.0.1 - yesod-bin ==1.6.2.1 - - yesod-core ==1.6.23.1 + - yesod-core ==1.6.24.0 - yesod-eventsource ==1.6.0.1 - yesod-form ==1.7.0 - yesod-form-bootstrap4 ==3.0.1 From 9a61ce5aadb1cd9eedf216f4f5fb9ea1a2ccef54 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 31 Jul 2022 12:08:51 +0200 Subject: [PATCH 04/14] 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 | 958 ++++++++---------- 1 file changed, 424 insertions(+), 534 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b1aab492a1a0..ed74bf7104d6 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -9913,6 +9913,8 @@ self: { pname = "HaRe"; version = "0.8.4.1"; sha256 = "16ld7lrdf6vjmxam4kfc6zyy2g4baw7mr9ha39nrxjq0p8d4hn3v"; + revision = "1"; + editedCabalFile = "0szsdf6w588ry2z1a093r440h9w6qp4b2qh55vzcb06rif8bgc0p"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -21670,8 +21672,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "WeakSets"; - version = "1.2.4.0"; - sha256 = "1hfs3zd9lq9m8fczs8mrl0k61005yv8ia44c4ls6mgfya606i8r3"; + version = "1.3.0.0"; + sha256 = "10hsxichzxs73rbj8nv65xrk376gh5wi6rfzjg0w9qyr4wpzdp2y"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Simple set types. Useful to create sets of arbitrary types and nested sets."; @@ -21856,12 +21858,12 @@ self: { platforms = lib.platforms.windows; }) {}; - "Win32_2_13_2_1" = callPackage + "Win32_2_13_3_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.13.2.1"; - sha256 = "1fn4z7spq0w2bajg6q8qw6mn3kpz07356zc0shpks8cf6gkmyb8h"; + version = "2.13.3.0"; + sha256 = "1vyml4dz46xvrk7zp0n944x9cl0hy7qnw2z8yh92d0gip25dxky4"; description = "A binding to Windows Win32 API"; license = lib.licenses.bsd3; platforms = lib.platforms.windows; @@ -39866,12 +39868,12 @@ self: { broken = true; }) {}; - "base_4_16_2_0" = callPackage + "base_4_16_3_0" = callPackage ({ mkDerivation, ghc-bignum, ghc-prim, rts }: mkDerivation { pname = "base"; - version = "4.16.2.0"; - sha256 = "015qxwjg47nk5kfp53xlv6pnl6sv7gv9szlvscnglhc00p6iasr9"; + version = "4.16.3.0"; + sha256 = "1jgm0kpcn6b2xvnhh5l09c2khlqz85qj47il2wxalf904iw9262c"; libraryHaskellDepends = [ ghc-bignum ghc-prim rts ]; description = "Basic libraries"; license = lib.licenses.bsd3; @@ -46708,8 +46710,8 @@ self: { pname = "bm"; version = "0.1.0.2"; sha256 = "1rpwlbhn5fkndw19ryksm9x2fcg7z7xscigi4zfs9v4w16skn7zj"; - revision = "2"; - editedCabalFile = "00n49679ib14lkv1ji988rcjpsp42v213bahiga6xgqfdpf486zx"; + revision = "3"; + editedCabalFile = "12san5rjl486n4wf3918bd3rm64n52d82vgz85pjb8gc2s8drdk1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51374,8 +51376,8 @@ self: { ({ mkDerivation, base, Cabal, QuickCheck }: mkDerivation { pname = "cabal-detailed-quickcheck"; - version = "0.1.1.4"; - sha256 = "0rgv66b26kjzl06xlh1x0l4xxc8a0fvzvj6jm9asya2wrmvs9z9m"; + version = "0.1.1.6"; + sha256 = "096arcxxmr4dlfdm32zy7f4szrb96ph1i8la1l8xifb1q76yxzph"; libraryHaskellDepends = [ base Cabal QuickCheck ]; description = "QuickCheck for Cabal tests"; license = lib.licenses.mit; @@ -51649,8 +51651,8 @@ self: { pname = "cabal-hoogle"; version = "0.1.0.0"; sha256 = "0k37r2wismimnj10cclvs1aikzz1c90d40l19hkrk0a47k274yi1"; - revision = "2"; - editedCabalFile = "0a46rwql5r9iv42n32vzpmlci2zchkr93c23yg69k82q90j0zw2h"; + revision = "3"; + editedCabalFile = "18ra82v3pqws7n3dn4wxs0bsdhlksnimx9vcfri49xx4s9j59a0d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53267,29 +53269,6 @@ self: { }) {}; "call-alloy" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, extra - , file-embed, filepath, hashable, hspec, mtl, process, split - , trifecta, unix - }: - mkDerivation { - pname = "call-alloy"; - version = "0.3.0.2"; - sha256 = "1bigpy4338zkvcxccnri3xfav7wdz3zblkzzwm0nrnyz7an4mgy6"; - libraryHaskellDepends = [ - base bytestring containers directory extra file-embed filepath - hashable mtl process split trifecta unix - ]; - testHaskellDepends = [ - base bytestring containers directory extra file-embed filepath - hashable hspec mtl process split trifecta unix - ]; - description = "A simple library to call Alloy given a specification"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "call-alloy_0_3_0_3" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , file-embed, filepath, hashable, hspec, mtl, process, split , trifecta, unix @@ -55294,15 +55273,15 @@ self: { broken = true; }) {}; - "cayley-client_0_4_19" = callPackage + "cayley-client_0_4_19_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , exceptions, hspec, http-client, http-conduit, lens, lens-aeson , mtl, text, transformers, unordered-containers, vector }: mkDerivation { pname = "cayley-client"; - version = "0.4.19"; - sha256 = "0qfi56wkf9ycd7dhah01pc1vlaims4p8mscdcq7xc3pc3m4vvjs2"; + version = "0.4.19.1"; + sha256 = "195qkxxmzbfaynzni7bv99iv7ia2k0ijhkd260nfdaa3z98j4rkz"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers @@ -56365,6 +56344,8 @@ self: { pname = "changelogged"; version = "0.2.0"; sha256 = "05viyx641zwxf222gvhyhs5dclwbylp7s32n7h3zzja4bycf03f2"; + revision = "1"; + editedCabalFile = "0kl6gamkbhyk7wc8vdv03pmfds1nw86d6w8niwwjl3ivbw02bvr5"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -59655,8 +59636,8 @@ self: { }: mkDerivation { pname = "cli-extras"; - version = "0.2.0.0"; - sha256 = "1xzpg8i06jix4dnbjanp85dgjhf4xf7am50k550d88nsnxi93byn"; + version = "0.2.1.0"; + sha256 = "1lg0ssbh2qhjjc31ins29ddy4lkzwxhlm3r9vcy1jk8al5aqa03f"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring containers exceptions io-streams lens logging-effect monad-logger monad-loops mtl process @@ -59691,8 +59672,8 @@ self: { }: mkDerivation { pname = "cli-nix"; - version = "0.1.0.1"; - sha256 = "1ynrni7zyhw8g70bdmd5vamnkw5vac4n5nmxwyka52nqy3zrrlwj"; + version = "0.1.1.0"; + sha256 = "0fjdkpk1zfkv6s64077ihnspil06lm3xkg37y72lz0c39qfb8d26"; libraryHaskellDepends = [ base cli-extras data-default exceptions lens logging-effect mtl text @@ -70289,8 +70270,8 @@ self: { pname = "crypto-rng-effectful"; version = "1.0.0.0"; sha256 = "185ax4v4bfg944igscjg0vb0p15af4vwqdfn239x6xayfgy4xzl0"; - revision = "1"; - editedCabalFile = "1sdjafzvfz6jz0d217l3cr8z1x0fz6fhqm5igly3riwiww4zh4dj"; + revision = "2"; + editedCabalFile = "1jzfinvkwssplxrnpg8f9nckzabbzajbsfq4r675fvkv2h98ikz0"; libraryHaskellDepends = [ base bytestring crypto-rng effectful-core random ]; @@ -76076,35 +76057,6 @@ self: { }) {inherit (pkgs) SDL2; inherit (pkgs) glew;}; "debian" = callPackage - ({ mkDerivation, base, bytestring, bz2, Cabal, containers - , directory, either, exceptions, filepath, hostname, HUnit, lens - , ListLike, mtl, network-uri, old-locale, parsec, pretty, process - , process-extras, pureMD5, QuickCheck, regex-compat, regex-tdfa - , SHA, syb, template-haskell, temporary, text, th-lift, th-orphans - , time, unix, utf8-string, zlib - }: - mkDerivation { - pname = "debian"; - version = "4.0.2"; - sha256 = "1sp8vkg65fllvxk85sp34isc0zvmj0s72i138wz5vhj9hfmn2c71"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring bz2 Cabal containers directory either exceptions - filepath hostname HUnit lens ListLike mtl network-uri old-locale - parsec pretty process process-extras pureMD5 QuickCheck - regex-compat regex-tdfa SHA syb template-haskell temporary text - th-lift th-orphans time unix utf8-string zlib - ]; - executableHaskellDepends = [ base directory filepath process ]; - testHaskellDepends = [ - base Cabal HUnit parsec pretty regex-tdfa text - ]; - description = "Modules for working with the Debian package system"; - license = lib.licenses.bsd3; - }) {}; - - "debian_4_0_4" = callPackage ({ mkDerivation, base, bytestring, bz2, Cabal, containers , directory, either, exceptions, filepath, hostname, HUnit, lens , ListLike, mtl, network-uri, old-locale, parsec, pretty, process @@ -76131,7 +76083,6 @@ self: { ]; description = "Modules for working with the Debian package system"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "debian-binary" = callPackage @@ -83762,6 +83713,35 @@ self: { license = lib.licenses.mit; }) {}; + "doctest-parallel_0_2_4" = callPackage + ({ mkDerivation, base, base-compat, Cabal, code-page, containers + , deepseq, directory, exceptions, extra, filepath, ghc, ghc-paths + , Glob, hspec, hspec-core, hspec-discover, HUnit, mockery, pretty + , process, QuickCheck, random, setenv, silently, stringbuilder, syb + , template-haskell, transformers, unordered-containers + }: + mkDerivation { + pname = "doctest-parallel"; + version = "0.2.4"; + sha256 = "0fzfhvam3j15vmh356svg6zlafbayaqmds8hki6jxrandj2d14kp"; + libraryHaskellDepends = [ + base base-compat Cabal code-page containers deepseq directory + exceptions extra filepath ghc ghc-paths Glob pretty process random + syb template-haskell transformers unordered-containers + ]; + testHaskellDepends = [ + base base-compat code-page containers deepseq directory exceptions + filepath ghc ghc-paths hspec hspec-core hspec-discover HUnit + mockery process QuickCheck setenv silently stringbuilder syb + transformers + ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + description = "Test interactive Haskell examples"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "doctest-prop" = callPackage ({ mkDerivation, base, doctest, HUnit, QuickCheck }: mkDerivation { @@ -87507,8 +87487,8 @@ self: { }: mkDerivation { pname = "effectful"; - version = "1.1.0.0"; - sha256 = "0hfy27bgx57rga93jrj16laia65anhcks9b8xcwfsvc4zp3bsckh"; + version = "1.2.0.0"; + sha256 = "02ynz63c30vssq9lfcn619ll44q5yhnc9w1axbnmsp63zw93swap"; libraryHaskellDepends = [ async base bytestring directory effectful-core process stm time unliftio @@ -87530,8 +87510,8 @@ self: { }: mkDerivation { pname = "effectful-core"; - version = "1.1.0.0"; - sha256 = "1wglhfxmp7vcvyijdz9zmh8ai1q1k0a83d7klmiipxvym853w97b"; + version = "1.2.0.0"; + sha256 = "0brhwd0axkq383b67jyhhgasny353issx7hak7lirvwn6zwfnilr"; libraryHaskellDepends = [ base containers exceptions monad-control primitive transformers-base unliftio-core @@ -87549,8 +87529,8 @@ self: { pname = "effectful-plugin"; version = "1.0.0.0"; sha256 = "11y9d1ylwhgrrwf0pcpjqix2vrwzbwr2rlma6rm0h8yqpkchbx81"; - revision = "1"; - editedCabalFile = "0878clqj18snfg7qlrpca21jy12w5b99d79gx6hkkw8pqi4x96x8"; + revision = "2"; + editedCabalFile = "1dc2asmhiydfz21cgrvmqqx4nwr8k7s2fdgwhvq1qf3zn6k086bx"; libraryHaskellDepends = [ base containers effectful-core ghc ghc-tcplugins-extra ]; @@ -87567,8 +87547,8 @@ self: { pname = "effectful-th"; version = "1.0.0.0"; sha256 = "0qvsxw1ajmr63r1bkgkchj5ra8g1ypx135ld62bip2mvqaxha9ih"; - revision = "1"; - editedCabalFile = "0qpyaxkvz1h6z80zhiq80vs6hhgpp02faxxv5zyxkmi4ixf5arr2"; + revision = "2"; + editedCabalFile = "0v56i1wdq06v5hk7wcq8zgg60i8rbq1dqc47wwjz1wia5l2plhrl"; libraryHaskellDepends = [ base containers effectful exceptions template-haskell th-abstraction @@ -90776,25 +90756,6 @@ self: { }) {}; "equivalence" = callPackage - ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans - , template-haskell, transformers, transformers-compat - }: - mkDerivation { - pname = "equivalence"; - version = "0.4.0.1"; - sha256 = "1pcv64dflv9kknz9smnq4a7pd8jmghi3g4kri1dw0cnb54g7rj7c"; - libraryHaskellDepends = [ - base containers mtl STMonadTrans transformers transformers-compat - ]; - testHaskellDepends = [ - base containers mtl QuickCheck STMonadTrans template-haskell - transformers transformers-compat - ]; - description = "Maintaining an equivalence relation implemented as union-find using STT"; - license = lib.licenses.bsd3; - }) {}; - - "equivalence_0_4_1" = callPackage ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans , template-haskell, transformers, transformers-compat }: @@ -90811,7 +90772,6 @@ self: { ]; description = "Maintaining an equivalence relation implemented as union-find using STT"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "erd" = callPackage @@ -93847,26 +93807,6 @@ self: { }) {}; "explainable-predicates" = 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.1"; - sha256 = "0hx11fp430lf60cwwas3x5jv5yg966fh9qrgxz2q65md6lx3yaga"; - 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; - }) {}; - - "explainable-predicates_0_1_2_2" = callPackage ({ mkDerivation, array, base, doctest-exitcode-stdio, doctest-lib , hspec, HUnit, mono-traversable, QuickCheck, regex-tdfa, syb , template-haskell @@ -93884,7 +93824,6 @@ self: { ]; description = "Predicates that can explain themselves"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "explicit-constraint-lens" = callPackage @@ -95824,13 +95763,13 @@ self: { , extra, fedora-dists, filepath, http-conduit, http-directory , http-query, koji, network-uri, optparse-applicative, pagure , pretty-terminal, process, rpm-nvr, rpmbuild-order, simple-cmd - , simple-cmd-args, text, time, typed-process, unix, utf8-string - , xdg-basedir + , simple-cmd-args, text, time, typed-process, unix + , unordered-containers, utf8-string, xdg-basedir }: mkDerivation { pname = "fbrnch"; - version = "1.1.1"; - sha256 = "1dgpgphffcy1dxyswg7wvcg9np30gn1h5qa15gqb6p95vm1qlc8b"; + version = "1.1.2"; + sha256 = "1ybd98gbck5k433hzli7c5qcgxr5rbmy1ydi6hd7wrkhcrr6mndf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -95839,7 +95778,7 @@ self: { http-conduit http-directory http-query koji network-uri optparse-applicative pagure pretty-terminal process rpm-nvr rpmbuild-order simple-cmd simple-cmd-args text time typed-process - unix utf8-string xdg-basedir + unix unordered-containers utf8-string xdg-basedir ]; description = "Fedora packager tool to build package branches"; license = lib.licenses.gpl2Only; @@ -104197,8 +104136,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.21.13"; - sha256 = "0bzqlsaaqbbi47zvmvv7hd6hcz54hzw676rh9nxcjxgff3hzqb08"; + version = "0.21.14"; + sha256 = "1dmskhf6w2mkrp6vjvy9blky615l000yj9vm63dj8mnm98fjs6qw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105969,23 +105908,6 @@ self: { }) {}; "generic-deriving" = callPackage - ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover - , template-haskell, th-abstraction - }: - mkDerivation { - pname = "generic-deriving"; - version = "1.14.1"; - sha256 = "19qpahcfhs9nqqv6na8znybrvpw885cajbdnrfylxbsmm0sys4s7"; - libraryHaskellDepends = [ - base containers ghc-prim template-haskell th-abstraction - ]; - testHaskellDepends = [ base hspec template-haskell ]; - testToolDepends = [ hspec-discover ]; - description = "Generic programming library for generalised deriving"; - license = lib.licenses.bsd3; - }) {}; - - "generic-deriving_1_14_2" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover , template-haskell, th-abstraction }: @@ -106000,7 +105922,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generic programming library for generalised deriving"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "generic-enum" = callPackage @@ -107858,7 +107779,7 @@ self: { mainProgram = "gh-pocket-knife"; }) {}; - "ghc_9_2_3" = callPackage + "ghc_9_2_4" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-boot, ghc-heap , ghci, hpc, process, template-haskell, terminfo, time @@ -107866,8 +107787,8 @@ self: { }: mkDerivation { pname = "ghc"; - version = "9.2.3"; - sha256 = "09bwgzdj0bvasl8cqz93g03d79bcgpmr5p8dpc05kjxdl24ydrmp"; + version = "9.2.4"; + sha256 = "0w63p24p4k16jbr4pnh8nrnxqpiyg8fa0l75ry28y72kp4ngif9q"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory exceptions filepath ghc-boot ghc-heap ghci hpc process @@ -108634,7 +108555,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib_9_2_3_20220709" = callPackage + "ghc-lib_9_2_4_20220729" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts, time @@ -108642,8 +108563,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.2.3.20220709"; - sha256 = "12073grb3wykvgv3kagaymarklsjxns16y0n9na3cdbmhgxazrvw"; + version = "9.2.4.20220729"; + sha256 = "16whiazjynzj6qw1rmadyrxkibvmyhfzxzw42cv0ya9ijzlplhpq"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -108696,15 +108617,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser_9_2_3_20220709" = callPackage + "ghc-lib-parser_9_2_4_20220729" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.2.3.20220709"; - sha256 = "04xxjvnr3mas1nf4y68x50jpjs7gzw0yrlkn61gqlzgbq5rqjjyl"; + version = "9.2.4.20220729"; + sha256 = "0rlm6znxrhs3s9s6c7qblvl03lscydx3dridyp985i593jyan55s"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -108777,14 +108698,14 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-lib-parser-ex_9_2_1_0" = callPackage + "ghc-lib-parser-ex_9_2_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "9.2.1.0"; - sha256 = "19r0f7qan403ji3mzycz75k0p086zliia8n021z68jgy6w31ysm5"; + version = "9.2.1.1"; + sha256 = "01004zsi4d3vd9k1d2ik284z6wnkny48yp5d2y6fi9hgba11d53q"; libraryHaskellDepends = [ base bytestring containers ghc-lib-parser uniplate ]; @@ -110114,48 +110035,47 @@ self: { ({ mkDerivation, aeson, aeson-pretty, async, base , base16-bytestring, binary, bytestring, bz2, Cabal, cabal-plan , case-insensitive, casing, containers, cryptohash-sha256, deepseq - , directory, disk-free-space, filepath, generic-arbitrary - , haskus-utils-types, haskus-utils-variant, hspec, hspec-discover - , hspec-golden-aeson, libarchive, lzma-static, megaparsec, mtl - , optics, optparse-applicative, os-release, pretty, pretty-terminal - , process, QuickCheck, quickcheck-arbitrary-adt, regex-posix - , resourcet, retry, safe, safe-exceptions, split, strict-base - , tagsoup, template-haskell, temporary, terminal-size, text, time + , directory, disk-free-space, exceptions, filepath + , generic-arbitrary, haskus-utils-types, haskus-utils-variant + , hspec, hspec-discover, hspec-golden-aeson, libarchive + , lzma-static, megaparsec, mtl, optics, optparse-applicative + , os-release, pretty, pretty-terminal, process, QuickCheck + , quickcheck-arbitrary-adt, regex-posix, resourcet, retry, safe + , safe-exceptions, split, streamly, strict-base, tagsoup + , template-haskell, temporary, terminal-size, text, time , transformers, unix, unix-bytestring, unliftio-core , unordered-containers, uri-bytestring, utf8-string, vector , versions, word8, yaml-streamly, zlib }: mkDerivation { pname = "ghcup"; - version = "0.1.17.10"; - sha256 = "18vskipglwds41l1gr1ks7h1h30hasrjdhpmcdm4nhg0ifmjzsag"; - revision = "1"; - editedCabalFile = "0pk2s6mcdby4553zcx08pgxcq854rzjkinvmyqjvc8yxjlb6j76r"; + version = "0.1.18.0"; + sha256 = "09mg0pg520vn4mcc0s59wzssnnj5ps5z50kri8z53bjvn4yfdwvv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base base16-bytestring binary bytestring bz2 Cabal case-insensitive casing containers cryptohash-sha256 deepseq - directory disk-free-space filepath haskus-utils-types + directory disk-free-space exceptions filepath haskus-utils-types haskus-utils-variant libarchive lzma-static megaparsec mtl optics os-release pretty pretty-terminal regex-posix resourcet retry safe - safe-exceptions split strict-base template-haskell temporary - terminal-size text time transformers unix unix-bytestring + safe-exceptions split streamly strict-base template-haskell + temporary terminal-size text time transformers unix unix-bytestring unliftio-core unordered-containers uri-bytestring vector versions word8 yaml-streamly zlib ]; executableHaskellDepends = [ aeson aeson-pretty async base bytestring cabal-plan containers - deepseq directory filepath haskus-utils-variant libarchive - megaparsec mtl optparse-applicative pretty pretty-terminal process - resourcet safe safe-exceptions tagsoup template-haskell temporary - text unix unordered-containers uri-bytestring utf8-string vector - versions yaml-streamly + deepseq directory filepath haskus-utils-types haskus-utils-variant + libarchive megaparsec mtl optparse-applicative pretty + pretty-terminal process resourcet safe safe-exceptions tagsoup + template-haskell temporary text unix unordered-containers + uri-bytestring utf8-string vector versions yaml-streamly ]; testHaskellDepends = [ - base bytestring containers generic-arbitrary hspec - hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt text - uri-bytestring versions + base bytestring containers directory filepath generic-arbitrary + hspec hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt + streamly text uri-bytestring versions ]; testToolDepends = [ hspec-discover ]; description = "ghc toolchain installer"; @@ -119161,6 +119081,22 @@ self: { broken = true; }) {}; + "gridtables" = callPackage + ({ mkDerivation, array, base, containers, doclayout, parsec, tasty + , tasty-hunit, text + }: + mkDerivation { + pname = "gridtables"; + version = "0.0.2.0"; + sha256 = "0bqn1iqpiam9szjwdwam76vh991miyfznyk7gnnr4vrk8jn17p3d"; + libraryHaskellDepends = [ + array base containers doclayout parsec text + ]; + testHaskellDepends = [ array base parsec tasty tasty-hunit text ]; + description = "Parser for reStructuredText-style grid tables"; + license = lib.licenses.mit; + }) {}; + "grm" = callPackage ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, happy , parsec, process, syb, wl-pprint @@ -122120,8 +122056,8 @@ self: { }: mkDerivation { pname = "hackport"; - version = "0.7.2.1"; - sha256 = "0b109c9m52j0idlcp5w7aqnryb2bmghf4g33jhhd3dsrr0xx6ah0"; + version = "0.7.2.2"; + sha256 = "0yknhk34pwmij8virmlf619sw1k8rl5a8sy7h18q05rsnsdsbipf"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -124866,8 +124802,8 @@ self: { }: mkDerivation { pname = "happstack-server-tls"; - version = "7.2.1.2"; - sha256 = "1qij3hx3y54s3vvcs7z656144cbp94aigy84ywfyp8238f4p5yq5"; + version = "7.2.1.3"; + sha256 = "11prqx74dkv38dyg1yh419ckbi5hbyv6ncm9y9inqnabl84qyam1"; libraryHaskellDepends = [ base bytestring extensible-exceptions happstack-server hslogger HsOpenSSL network sendfile time unix @@ -129403,8 +129339,8 @@ self: { }: mkDerivation { pname = "haskoin-node"; - version = "0.17.14"; - sha256 = "0a8lmap19gj2f6xyzz7mk4jdb8rc8vvzrri4jsb10n8xl5g9c2jj"; + version = "0.18.1"; + sha256 = "1sfrcckq345i2m7p1p39l72c83aga8z27jgk996nch1zamj5kx6d"; libraryHaskellDepends = [ base bytestring cereal conduit conduit-extra containers data-default hashable haskoin-core monad-logger mtl network nqe @@ -129487,8 +129423,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.65.2"; - sha256 = "0sfb0z29jzi42yk734gw70dwxjzgfk9bmw3pl9l91iy6iqxakian"; + version = "0.65.3"; + sha256 = "07m5dha3ayqrdp8alq40wqq8b3388m130r0m33v0dfda51gr3p5n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130416,8 +130352,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "1.5.0.5"; - sha256 = "029bsr8966q6r1ig7x2ykj5jmrg64990c00zqpjq48acc39ap0qw"; + version = "1.5.1"; + sha256 = "1g9hbn9saf17a9jxjkm4bak7xbjgq0nf8khv5djfkyz1yxmw4l6p"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-strict-builder contravariant dlist hashable hashtables mtl postgresql-binary postgresql-libpq @@ -130997,24 +130933,6 @@ self: { }) {}; "hasql-th" = callPackage - ({ mkDerivation, base, bytestring, containers, contravariant, foldl - , hasql, postgresql-syntax, template-haskell - , template-haskell-compat-v0208, text, uuid, vector - }: - mkDerivation { - pname = "hasql-th"; - version = "0.4.0.16"; - sha256 = "029zmhwmr8wp432hf33ffvns5nkfqzk1cnh663cln5f2ryllxxx3"; - libraryHaskellDepends = [ - base bytestring containers contravariant foldl hasql - postgresql-syntax template-haskell template-haskell-compat-v0208 - text uuid vector - ]; - description = "Template Haskell utilities for Hasql"; - license = lib.licenses.mit; - }) {}; - - "hasql-th_0_4_0_17" = callPackage ({ mkDerivation, base, bytestring, containers, contravariant, foldl , hasql, postgresql-syntax, template-haskell , template-haskell-compat-v0208, text, uuid, vector @@ -131030,7 +130948,6 @@ self: { ]; description = "Template Haskell utilities for Hasql"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hasql-transaction" = callPackage @@ -149906,8 +149823,8 @@ self: { }: mkDerivation { pname = "hsx2hs"; - version = "0.14.1.9"; - sha256 = "1154p6ki51h5wlq8431q9h8r1q7f409vaq5hzi5q9895nxd3lkr3"; + version = "0.14.1.10"; + sha256 = "04anp9jfr6y0f4dwzn6k051jkbvmnkdayjg980y2pjj6jqqxr00x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150800,37 +150717,6 @@ self: { }) {}; "http-client" = callPackage - ({ mkDerivation, array, async, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, containers, cookie - , deepseq, directory, exceptions, filepath, ghc-prim, hspec - , hspec-discover, http-types, iproute, mime-types, monad-control - , network, network-uri, random, stm, streaming-commons, text, time - , transformers, zlib - }: - mkDerivation { - pname = "http-client"; - version = "0.7.11"; - sha256 = "12j7vkpkm2djws6ny7vm2324c7916d0iaf1mbvf4mfjxzy2w7imv"; - revision = "1"; - editedCabalFile = "0rqrhx4cjqcqhcfad6sjc0wl2anzs6h4186xdj26hdrazs7sqn9z"; - libraryHaskellDepends = [ - array async base base64-bytestring blaze-builder bytestring - case-insensitive containers cookie deepseq exceptions filepath - ghc-prim http-types iproute mime-types network network-uri random - stm streaming-commons text time transformers - ]; - testHaskellDepends = [ - async base blaze-builder bytestring case-insensitive containers - cookie deepseq directory hspec http-types monad-control network - network-uri streaming-commons text time transformers zlib - ]; - testToolDepends = [ hspec-discover ]; - doCheck = false; - description = "An HTTP client engine"; - license = lib.licenses.mit; - }) {}; - - "http-client_0_7_12" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec @@ -150857,7 +150743,6 @@ self: { doCheck = false; description = "An HTTP client engine"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "http-client-auth" = callPackage @@ -158488,22 +158373,6 @@ self: { }) {}; "ini" = callPackage - ({ mkDerivation, attoparsec, base, hspec, text - , unordered-containers - }: - mkDerivation { - pname = "ini"; - version = "0.4.1"; - sha256 = "0mvwii8jbh2ll54qb9dij5m66c6324s2y4vrwz1qr4wz40m3qa8l"; - libraryHaskellDepends = [ - attoparsec base text unordered-containers - ]; - testHaskellDepends = [ base hspec unordered-containers ]; - description = "Quick and easy configuration files in the INI format"; - license = lib.licenses.bsd3; - }) {}; - - "ini_0_4_2" = callPackage ({ mkDerivation, attoparsec, base, hspec, text , unordered-containers }: @@ -158517,7 +158386,6 @@ self: { testHaskellDepends = [ base hspec unordered-containers ]; description = "Configuration files in the INI format"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ini-qq" = callPackage @@ -160622,26 +160490,24 @@ self: { "ip" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytebuild, byteslice - , bytesmith, bytestring, criterion, deepseq, doctest, hashable - , hspec, hspec-discover, HUnit, natural-arithmetic, primitive - , QuickCheck, quickcheck-classes, random, tasty, tasty-hunit - , tasty-quickcheck, text, text-short, vector, wide-word + , bytesmith, bytestring, criterion, deepseq, hashable, hspec + , hspec-discover, HUnit, natural-arithmetic, primitive, QuickCheck + , quickcheck-classes, random, tasty, tasty-hunit, tasty-quickcheck + , text, text-short, vector, wide-word, word-compat }: mkDerivation { pname = "ip"; - version = "1.7.4"; - sha256 = "1hvqgah86z2saizhjpq2352x2ncxjsshvzj66bmij3yk6y107yfs"; - revision = "1"; - editedCabalFile = "09yrwzklzbfvh5x4j7k4vx7a49kndfz9d8kjkfvwi3frqzhr209m"; + version = "1.7.5"; + sha256 = "1kjfzhiwykf1cy0nvsbj0j0k367ky858w862j2z0vp42dybxk5hm"; libraryHaskellDepends = [ aeson attoparsec base bytebuild byteslice bytesmith bytestring deepseq hashable natural-arithmetic primitive text text-short - vector wide-word + vector wide-word word-compat ]; testHaskellDepends = [ - attoparsec base byteslice bytestring doctest hspec HUnit QuickCheck + attoparsec base byteslice bytestring hspec HUnit QuickCheck quickcheck-classes tasty tasty-hunit tasty-quickcheck text - text-short vector wide-word + text-short wide-word ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ @@ -165083,6 +164949,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "json2sg" = callPackage + ({ mkDerivation, aeson, base, bytestring, file-embed, hspec, sugar + , sugar-json, tasty, tasty-hspec, text + }: + mkDerivation { + pname = "json2sg"; + version = "0.0.1"; + sha256 = "0bi3y0pmc5xzdnw5vkvjxplaq2sr6dwgvc6mxkcn8binzcnjig7i"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring sugar sugar-json text + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base file-embed hspec sugar sugar-json tasty tasty-hspec text + ]; + doHaddock = false; + description = "Lossy conversion from JSON to Sugar"; + license = "unknown"; + mainProgram = "json2sg"; + }) {}; + "json2yaml" = callPackage ({ mkDerivation, aeson, base, bytestring, yaml }: mkDerivation { @@ -169202,6 +169091,20 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "lambda" = callPackage + ({ mkDerivation, base, containers, mtl, parsec, text }: + mkDerivation { + pname = "lambda"; + version = "0.1.0.0"; + sha256 = "0311fk40119h9fclhrmv1kpj3gm0xqiq1jb0dgbwc69h942hnklv"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base containers mtl parsec text ]; + description = "Interpreters for lambda calculus, calculus of constructions, and more"; + license = lib.licenses.mit; + mainProgram = "lambda"; + }) {}; + "lambda-ast" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -173949,8 +173852,8 @@ self: { }: mkDerivation { pname = "levenshtein"; - version = "0.2.0.0"; - sha256 = "0q0q19xjp37gl3xadfm1i70q5dwyh1b3699rf0b3rb6zb13py839"; + version = "0.2.1.0"; + sha256 = "0n3sbnbagb5am9z0jb8rd3m8d46ipmypbraqjj14zscih4lhapyi"; libraryHaskellDepends = [ base binary data-default-class deepseq hashable QuickCheck ]; @@ -174919,6 +174822,31 @@ self: { broken = true; }) {}; + "librarian" = callPackage + ({ mkDerivation, base, containers, dhall, directory, easy-file + , Glob, hspec, hspec-core, hspec-discover, optparse-applicative + , pretty-show, regexpr, temporary + }: + mkDerivation { + pname = "librarian"; + version = "0.1.0.0"; + sha256 = "0w3g6dq4kalniaxspj6zs4ghn9dyazkjga2vad4zb9cwr8i9vh2w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers dhall directory easy-file Glob pretty-show regexpr + ]; + executableHaskellDepends = [ base dhall optparse-applicative ]; + testHaskellDepends = [ + base containers directory easy-file Glob hspec hspec-core + hspec-discover temporary + ]; + testToolDepends = [ hspec-discover ]; + description = "Move/rename according a set of rules"; + license = lib.licenses.isc; + mainProgram = "librarian"; + }) {}; + "librato" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, either , http-client, http-conduit, http-types, mtl, resourcet, text @@ -203419,20 +203347,6 @@ self: { }) {}; "numhask-array" = callPackage - ({ mkDerivation, adjunctions, base, distributive, numhask, vector - }: - mkDerivation { - pname = "numhask-array"; - version = "0.10.0"; - sha256 = "0dsjh20y46774hih4ijmr1d50mgm7kz5imah6ynggxmdd595lp0x"; - libraryHaskellDepends = [ - adjunctions base distributive numhask vector - ]; - description = "Multi-dimensional arrays"; - license = lib.licenses.bsd3; - }) {}; - - "numhask-array_0_10_1" = callPackage ({ mkDerivation, adjunctions, base, distributive, numhask, vector }: mkDerivation { @@ -203444,7 +203358,6 @@ self: { ]; description = "Multi-dimensional arrays"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "numhask-free" = callPackage @@ -205295,37 +205208,6 @@ self: { }) {}; "opaleye" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , case-insensitive, containers, contravariant, dotenv, hspec - , hspec-discover, multiset, postgresql-simple, pretty - , product-profunctors, profunctors, QuickCheck, scientific - , semigroups, text, time, time-compat, time-locale-compat - , transformers, uuid, void - }: - mkDerivation { - pname = "opaleye"; - version = "0.9.2.0"; - sha256 = "0zvms42pmsg6ish76mvk0ksz4apxvs4iyjfvgkm7zwadq3i9v8l3"; - revision = "1"; - editedCabalFile = "006pp9l4j2vc2h6597vml424834xv1j4krfb3xjyaxhnq32hzcjr"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors scientific semigroups text time-compat - time-locale-compat transformers uuid void - ]; - testHaskellDepends = [ - aeson base bytestring containers contravariant dotenv hspec - hspec-discover multiset postgresql-simple product-profunctors - profunctors QuickCheck semigroups text time time-compat - transformers uuid - ]; - testToolDepends = [ hspec-discover ]; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = lib.licenses.bsd3; - }) {}; - - "opaleye_0_9_3_2" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -205352,7 +205234,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "An SQL-generating DSL targeting PostgreSQL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -207813,8 +207694,8 @@ self: { }: mkDerivation { pname = "org-mode"; - version = "2.0.1"; - sha256 = "0g22gjy7l6c28j60vbhazgcl0da58mml307qsp4zac4j4nshv7y2"; + version = "2.0.2"; + sha256 = "1fzxpal1ld8l7a4vy9ncv04vwzfb2cbimyjlq0ayl27pii7j5shm"; libraryHaskellDepends = [ base containers filepath hashable megaparsec parser-combinators text time @@ -207833,8 +207714,8 @@ self: { }: mkDerivation { pname = "org-mode-lucid"; - version = "1.6.3"; - sha256 = "0gn5cm9kjx1dpnp311q5hyw6fqyr4l4dvk7cnmwv6r39vyjxy4lc"; + version = "1.6.4"; + sha256 = "0xz9bsfglw7qyj2ivdz36j3ynfxq7bag29fj4mjqpg7ki5di90ja"; libraryHaskellDepends = [ base containers hashable lucid org-mode text ]; @@ -210250,47 +210131,6 @@ self: { }) {}; "pantry" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal - , casa-client, casa-types, conduit, conduit-extra, containers - , cryptonite, cryptonite-conduit, digest, exceptions, filelock - , generic-deriving, hackage-security, hedgehog, hpack, hspec - , http-client, http-client-tls, http-conduit, http-download - , http-types, memory, mtl, network-uri, path, path-io, persistent - , persistent-sqlite, persistent-template, primitive, QuickCheck - , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint - , tar-conduit, text, text-metrics, time, transformers, unix-compat - , unliftio, unordered-containers, vector, yaml, zip-archive - }: - mkDerivation { - pname = "pantry"; - version = "0.5.5"; - sha256 = "0hdpngpq2i8kvw6lmpv99y7q1z6b1rwlcajngwjx46x55faw2gv4"; - libraryHaskellDepends = [ - aeson ansi-terminal base bytestring Cabal casa-client casa-types - conduit conduit-extra containers cryptonite cryptonite-conduit - digest filelock generic-deriving hackage-security hpack http-client - http-client-tls http-conduit http-download http-types memory mtl - network-uri path path-io persistent persistent-sqlite - persistent-template primitive resourcet rio rio-orphans - rio-prettyprint tar-conduit text text-metrics time transformers - unix-compat unliftio unordered-containers vector yaml zip-archive - ]; - testHaskellDepends = [ - aeson ansi-terminal base bytestring Cabal casa-client casa-types - conduit conduit-extra containers cryptonite cryptonite-conduit - digest exceptions filelock generic-deriving hackage-security - hedgehog hpack hspec http-client http-client-tls http-conduit - http-download http-types memory mtl network-uri path path-io - persistent persistent-sqlite persistent-template primitive - QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint - tar-conduit text text-metrics time transformers unix-compat - unliftio unordered-containers vector yaml zip-archive - ]; - description = "Content addressable Haskell package management"; - license = lib.licenses.bsd3; - }) {}; - - "pantry_0_5_6" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , casa-client, casa-types, conduit, conduit-extra, containers , cryptonite, cryptonite-conduit, digest, exceptions, filelock @@ -210329,7 +210169,6 @@ self: { ]; description = "Content addressable Haskell package management"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pantry-tmp" = callPackage @@ -225985,6 +225824,18 @@ self: { license = lib.licenses.mpl20; }) {}; + "prob" = callPackage + ({ mkDerivation, base, containers, hspec, random }: + mkDerivation { + pname = "prob"; + version = "0.1.0.0"; + sha256 = "1y0xfcjpkg72nj3rp6pfwjxdwqf74hdi30h1ih198kkpa0nsazyh"; + libraryHaskellDepends = [ base containers random ]; + testHaskellDepends = [ base hspec ]; + description = "Discrete probability monad"; + license = lib.licenses.bsd3; + }) {}; + "prob-fx" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, dirichlet , extensible, ghc-prim, lens, log-domain, membership, mtl @@ -230068,22 +229919,6 @@ self: { }) {}; "qm-interpolated-string" = callPackage - ({ mkDerivation, base, bytestring, haskell-src-meta, hspec - , template-haskell, text - }: - mkDerivation { - pname = "qm-interpolated-string"; - version = "0.3.0.0"; - sha256 = "1brbs4qwvb16bkmcg51spjjrzc83hwgi1fbsix25vrri2myk6sz8"; - libraryHaskellDepends = [ - base bytestring haskell-src-meta template-haskell text - ]; - testHaskellDepends = [ base hspec ]; - description = "Implementation of interpolated multiline strings"; - license = lib.licenses.publicDomain; - }) {}; - - "qm-interpolated-string_0_3_1_0" = callPackage ({ mkDerivation, base, bytestring, haskell-src-meta, hspec , template-haskell, text }: @@ -230097,7 +229932,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "Implementation of interpolated multiline strings"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "qnap-decrypt" = callPackage @@ -230746,8 +230580,8 @@ self: { pname = "queue-sheet"; version = "0.7.0.2"; sha256 = "14ih4j09r30p0a75na833jq5ar0wfjm1f7qn6hfyqr4hjyqyfwfk"; - revision = "2"; - editedCabalFile = "1kag9n80a1v6hjipyjwihcs8v004xdclhrdi2h7hfpy6a2bdr0pc"; + revision = "3"; + editedCabalFile = "00waw06ql64j097i6156fjw5glv3cz5ni9i0j271wzc5zj1a6p4r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -237508,26 +237342,6 @@ self: { }) {inherit (pkgs) rure;}; "regex-tdfa" = callPackage - ({ mkDerivation, array, base, bytestring, containers, directory - , doctest-parallel, filepath, mtl, parsec, regex-base, text - , utf8-string - }: - mkDerivation { - pname = "regex-tdfa"; - version = "1.3.1.4"; - sha256 = "0ksdfkf2avjfvd4g0mm6kacgrd7sclj7z9zd7vgkwj7q5vafhpgy"; - libraryHaskellDepends = [ - array base bytestring containers mtl parsec regex-base text - ]; - testHaskellDepends = [ - array base bytestring containers directory doctest-parallel - filepath mtl regex-base text utf8-string - ]; - description = "Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)"; - license = lib.licenses.bsd3; - }) {}; - - "regex-tdfa_1_3_2" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , doctest-parallel, filepath, mtl, parsec, regex-base, text , utf8-string @@ -237545,7 +237359,6 @@ self: { ]; description = "Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "regex-tdfa-pipes" = callPackage @@ -240148,8 +239961,8 @@ self: { pname = "resourcet-effectful"; version = "1.0.0.0"; sha256 = "0446j4ihj3fn6lkqi2b1642ak27l6cpwfv4b73gpanq3nad69fzg"; - revision = "1"; - editedCabalFile = "0dy1lljcvva754dk7nbs6jp5h1b532dmndxy43z3k7rpadvh0dxj"; + revision = "2"; + editedCabalFile = "1v02b2cp0cnfinr7bndxdwl84qqzz558rmf17xhskgl4iy2ziqvl"; libraryHaskellDepends = [ base effectful-core resourcet ]; description = "Adaptation of the resourcet library for the effectful ecosystem"; license = lib.licenses.bsd3; @@ -253257,23 +253070,6 @@ self: { }) {}; "serversession-frontend-wai" = callPackage - ({ mkDerivation, base, bytestring, cookie, data-default - , path-pieces, serversession, text, time, transformers - , unordered-containers, vault, wai, wai-session - }: - mkDerivation { - pname = "serversession-frontend-wai"; - version = "1.0"; - sha256 = "0rxifhjirhmhk1x14m6lvpv6dl32g179i4i3xi3dq59r7l716j0b"; - libraryHaskellDepends = [ - base bytestring cookie data-default path-pieces serversession text - time transformers unordered-containers vault wai wai-session - ]; - description = "wai-session bindings for serversession"; - license = lib.licenses.mit; - }) {}; - - "serversession-frontend-wai_1_0_1" = callPackage ({ mkDerivation, base, bytestring, cookie, data-default , path-pieces, serversession, text, time, transformers , unordered-containers, vault, wai, wai-session @@ -253288,7 +253084,6 @@ self: { ]; description = "wai-session bindings for serversession"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "serversession-frontend-yesod" = callPackage @@ -258387,6 +258182,31 @@ self: { mainProgram = "skylighting"; }) {}; + "skylighting_0_13" = callPackage + ({ mkDerivation, base, binary, blaze-html, bytestring, containers + , pretty-show, skylighting-core, skylighting-format-ansi + , skylighting-format-blaze-html, skylighting-format-latex, text + }: + mkDerivation { + pname = "skylighting"; + version = "0.13"; + sha256 = "0gjafmiqah9d7a6h3qx7jmkih6yc47bks5r6hgl5911vhjgifm7k"; + configureFlags = [ "-fexecutable" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary containers skylighting-core skylighting-format-ansi + skylighting-format-blaze-html skylighting-format-latex + ]; + executableHaskellDepends = [ + base blaze-html bytestring containers pretty-show text + ]; + description = "syntax highlighting library"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "skylighting"; + }) {}; + "skylighting-core" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring @@ -258418,6 +258238,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "skylighting-core_0_13" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary + , bytestring, case-insensitive, colour, containers, criterion, Diff + , directory, filepath, mtl, pretty-show, QuickCheck, safe, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, text, transformers + , utf8-string, xml-conduit + }: + mkDerivation { + pname = "skylighting-core"; + version = "0.13"; + sha256 = "01j6v2dy04lsmrx98hvgpb6vnirs1h0gbiy7q5ck5q3k37cqys7p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring binary bytestring + case-insensitive colour containers directory filepath mtl safe text + transformers utf8-string xml-conduit + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath + pretty-show QuickCheck tasty tasty-golden tasty-hunit + tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + base containers criterion filepath text + ]; + description = "syntax highlighting library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "skylighting-extensions" = callPackage ({ mkDerivation, base, containers, skylighting, skylighting-modding , text @@ -258435,6 +258286,47 @@ self: { broken = true; }) {}; + "skylighting-format-ansi" = callPackage + ({ mkDerivation, ansi-terminal, base, binary, colour, containers + , skylighting-core, text + }: + mkDerivation { + pname = "skylighting-format-ansi"; + version = "0.1"; + sha256 = "16qavv10g5yqwi60axj7q595ll605vmnfjgdxyi029nd5rnaipr3"; + libraryHaskellDepends = [ + ansi-terminal base binary colour containers skylighting-core text + ]; + description = "ANSI formatter for skylighting syntax highlighting library"; + license = lib.licenses.bsd3; + }) {}; + + "skylighting-format-blaze-html" = callPackage + ({ mkDerivation, base, blaze-html, containers, skylighting-core + , text + }: + mkDerivation { + pname = "skylighting-format-blaze-html"; + version = "0.1"; + sha256 = "0s996fn7acq3fign0kz2pg1rdw1cw5qs5l422s7rv33r41hrm67b"; + libraryHaskellDepends = [ + base blaze-html containers skylighting-core text + ]; + description = "HTML formatter for skylighting syntax highlighting library"; + license = lib.licenses.bsd3; + }) {}; + + "skylighting-format-latex" = callPackage + ({ mkDerivation, base, containers, skylighting-core, text }: + mkDerivation { + pname = "skylighting-format-latex"; + version = "0.1"; + sha256 = "0y7v5aifwar24i976pw32scfdywjwy2ad05ajhdf8l84nsd6rdlp"; + libraryHaskellDepends = [ base containers skylighting-core text ]; + description = "LaTeX formatter for skylighting syntax highlighting library"; + license = lib.licenses.bsd3; + }) {}; + "skylighting-lucid" = callPackage ({ mkDerivation, base, containers, lucid, skylighting-core, text }: mkDerivation { @@ -270679,60 +270571,75 @@ self: { }) {}; "sugar" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, megaparsec - , ordered-containers, safe, tasty, tasty-hspec, text + ({ mkDerivation, base, bytestring, cereal, containers, file-embed + , hspec, ordered-containers, safe, store, tasty, tasty-hspec, text , text-conversions, unordered-containers, vector }: mkDerivation { pname = "sugar"; - version = "0.0.0.1"; - sha256 = "1m0famhab5m3xaavcg704iq857kmy53vg6apzf19amqp9vknmlds"; + version = "0.0.1.1"; + sha256 = "1lz7j3zrgaar4np1gi60n7kkrb5w4n3mz6bzw1qwd3ss4pc2pqgb"; libraryHaskellDepends = [ - base bytestring cereal containers megaparsec ordered-containers - safe text text-conversions unordered-containers vector + base bytestring cereal containers ordered-containers safe store + text text-conversions unordered-containers vector ]; - testHaskellDepends = [ base tasty tasty-hspec ]; - description = "Legible data"; - license = lib.licenses.mit; + testHaskellDepends = [ + base file-embed hspec tasty tasty-hspec text + ]; + description = "A pretty, sweet data language"; + license = "unknown"; hydraPlatforms = lib.platforms.none; broken = true; }) {}; + "sugar-data" = callPackage + ({ mkDerivation, aeson, base, hspec, sugar, tasty, tasty-hspec + , text + }: + mkDerivation { + pname = "sugar-data"; + version = "0.0.0.0"; + sha256 = "0qg2z675x44hwb18cdhdd9qc96smxdq85xr6zll2h9shpg6byjp5"; + libraryHaskellDepends = [ aeson base sugar text ]; + testHaskellDepends = [ base hspec sugar tasty tasty-hspec ]; + description = "Convert sugar to common data types for code generation"; + license = "unknown"; + }) {}; + "sugar-json" = callPackage - ({ mkDerivation, aeson, base, bytestring, cereal, containers + ({ mkDerivation, aeson, base, bytestring, cereal, containers, hspec , megaparsec, ordered-containers, safe, scientific, sugar, tasty - , tasty-hspec, text, text-conversions, text-show - , unordered-containers, vector + , tasty-hspec, text, text-conversions, unordered-containers, vector }: mkDerivation { pname = "sugar-json"; - version = "0.0.0"; - sha256 = "0yflqan8wk9fyl8pbxq86ngpf5rl6b23vmcfcr1bzajrihlrlqyh"; + version = "0.0.1.1"; + sha256 = "1fjw24293nr4l9qg1qs0f6hilz2k70vn7ddr2niyhy600669kr64"; libraryHaskellDepends = [ aeson base bytestring cereal containers megaparsec ordered-containers safe scientific sugar text text-conversions - text-show unordered-containers vector + unordered-containers vector ]; - testHaskellDepends = [ base sugar tasty tasty-hspec ]; + testHaskellDepends = [ base hspec sugar tasty tasty-hspec ]; description = "Sugar with JSON"; - license = lib.licenses.mit; + license = "unknown"; hydraPlatforms = lib.platforms.none; }) {}; "sugar-scheme" = callPackage - ({ mkDerivation, base, containers, husk-scheme, parsec, sugar - , tasty, tasty-hspec, text + ({ mkDerivation, base, containers, hspec, husk-scheme, parsec + , sugar, tasty, tasty-hspec, text }: mkDerivation { pname = "sugar-scheme"; - version = "0.0.0"; - sha256 = "0c284m21halhcypfmcg17vybm308nnh7aajvr4xnkzbd3zv7c7wf"; + version = "0.0.1"; + sha256 = "1fxbjkw2jibkrkni7kh9yrd3bb8s6zbi43cxq4bw4rlk73p1abdp"; libraryHaskellDepends = [ base containers husk-scheme parsec sugar text ]; - testHaskellDepends = [ base sugar tasty tasty-hspec ]; + testHaskellDepends = [ base hspec sugar tasty tasty-hspec ]; description = "Sugar with Scheme"; - license = lib.licenses.mit; + license = "unknown"; hydraPlatforms = lib.platforms.none; }) {}; @@ -276349,24 +276256,6 @@ self: { }) {}; "tasty-wai" = callPackage - ({ mkDerivation, base, bytestring, http-types, HUnit, tasty, wai - , wai-extra - }: - mkDerivation { - pname = "tasty-wai"; - version = "0.1.1.1"; - sha256 = "1bnq2mbgv1ksn9sq33dq1q91pzndy7gn61mlnkybk89k0bsw5i7y"; - revision = "3"; - editedCabalFile = "1bjmzxnrypv1nqhc37rwwcgilnrrjm8scwnb4ca6z99bldi95b27"; - libraryHaskellDepends = [ - base bytestring http-types HUnit tasty wai wai-extra - ]; - testHaskellDepends = [ base http-types tasty wai ]; - description = "Test 'wai' endpoints via Test.Tasty"; - license = lib.licenses.bsd3; - }) {}; - - "tasty-wai_0_1_2_0" = callPackage ({ mkDerivation, base, bytestring, http-types, HUnit, tasty, wai , wai-extra }: @@ -276380,7 +276269,6 @@ self: { testHaskellDepends = [ base http-types tasty wai ]; description = "Test 'wai' endpoints via Test.Tasty"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "tateti-tateti" = callPackage @@ -280032,27 +279920,25 @@ self: { license = lib.licenses.bsd3; }) {}; - "text-show-instances_3_9" = callPackage + "text-show-instances_3_9_1" = callPackage ({ mkDerivation, base, base-compat-batteries, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim , haskeline, hpc, hspec, hspec-discover, old-locale, old-time , pretty, QuickCheck, quickcheck-instances, random, scientific , semigroups, tagged, template-haskell, terminfo, text, text-short , text-show, th-orphans, time, transformers, transformers-compat - , unix, unordered-containers, vector, xhtml + , unix, unordered-containers, uuid-types, vector, xhtml }: mkDerivation { pname = "text-show-instances"; - version = "3.9"; - sha256 = "1bfangk4ys6pvhrv3j7i2c29xnhgin5lma2ndw051hnmmc7v2j7l"; - revision = "2"; - editedCabalFile = "0jmyq3pcxgwhqvhk16p7hz960f09ap2ym5iz2acnnc8ynyq6vvrf"; + version = "3.9.1"; + sha256 = "0jh4lb2hzyfkp39kpnl82bnx5sz4d9gf0hjk4zasqvra456y5nbh"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random scientific semigroups tagged template-haskell terminfo text text-short text-show time transformers transformers-compat unix - unordered-containers vector xhtml + unordered-containers uuid-types vector xhtml ]; testHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory @@ -280060,7 +279946,7 @@ self: { old-locale old-time pretty QuickCheck quickcheck-instances random scientific tagged template-haskell terminfo text-short text-show th-orphans time transformers transformers-compat unix - unordered-containers vector xhtml + unordered-containers uuid-types vector xhtml ]; testToolDepends = [ hspec-discover ]; description = "Additional instances for text-show"; @@ -280432,20 +280318,6 @@ self: { }) {}; "th-abstraction" = callPackage - ({ mkDerivation, base, containers, ghc-prim, template-haskell }: - mkDerivation { - pname = "th-abstraction"; - version = "0.4.3.0"; - sha256 = "01nyscmjriga4fh4362b4zjad48hdv33asjkd28sj8hx3pii7fy8"; - 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; - }) {}; - - "th-abstraction_0_4_4_0" = callPackage ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "th-abstraction"; @@ -280457,7 +280329,6 @@ self: { 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 @@ -280517,25 +280388,6 @@ self: { }) {}; "th-compat" = callPackage - ({ mkDerivation, base, base-compat, hspec, hspec-discover, mtl - , template-haskell - }: - mkDerivation { - pname = "th-compat"; - version = "0.1.3"; - sha256 = "1il1hs5yjfkb417c224pw1vrh4anyprasfwmjbd4fkviyv55jl3b"; - revision = "1"; - editedCabalFile = "1ax5yz41sfy9klif7j3ihahvdi08alb56l4y9nr45vbc9kvijn7n"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ - base base-compat hspec mtl template-haskell - ]; - testToolDepends = [ hspec-discover ]; - description = "Backward- (and forward-)compatible Quote and Code types"; - license = lib.licenses.bsd3; - }) {}; - - "th-compat_0_1_4" = callPackage ({ mkDerivation, base, base-compat, directory, filepath, hspec , hspec-discover, mtl, template-haskell }: @@ -280552,7 +280404,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Backward- (and forward-)compatible Quote and Code types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "th-constraint-compat" = callPackage @@ -280678,22 +280529,6 @@ self: { }) {}; "th-expand-syns" = callPackage - ({ mkDerivation, base, containers, syb, template-haskell - , th-abstraction - }: - mkDerivation { - pname = "th-expand-syns"; - version = "0.4.9.0"; - sha256 = "1yc6n4pgapl3vfjcilxn6hjdf6cr54c1w32i7wwbn806sljflhwy"; - libraryHaskellDepends = [ - base containers syb template-haskell th-abstraction - ]; - testHaskellDepends = [ base template-haskell th-abstraction ]; - description = "Expands type synonyms in Template Haskell ASTs"; - license = lib.licenses.bsd3; - }) {}; - - "th-expand-syns_0_4_10_0" = callPackage ({ mkDerivation, base, containers, syb, template-haskell , th-abstraction }: @@ -280707,7 +280542,6 @@ self: { testHaskellDepends = [ base template-haskell th-abstraction ]; description = "Expands type synonyms in Template Haskell ASTs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "th-extras" = callPackage @@ -283333,6 +283167,26 @@ self: { license = lib.licenses.mit; }) {}; + "tinkoff-invest-sdk" = callPackage + ({ mkDerivation, async, base, bytestring, Cabal, concurrent-extra + , errors, http2-client, http2-client-grpc, http2-grpc-proto-lens + , lens, mtl, proto-lens, proto-lens-runtime, proto-lens-setup, text + , unordered-containers + }: + mkDerivation { + pname = "tinkoff-invest-sdk"; + version = "0.1.0.0"; + sha256 = "1b66gb1cdlckhiaxbps31dklx0sz9wxs27cpy4zwfn0rxzi96wpv"; + setupHaskellDepends = [ base Cabal proto-lens-setup ]; + libraryHaskellDepends = [ + async base bytestring concurrent-extra errors http2-client + http2-client-grpc http2-grpc-proto-lens lens mtl proto-lens + proto-lens-runtime text unordered-containers + ]; + description = "gRPC based SDK for Tinkoff Invest API V2"; + license = lib.licenses.mit; + }) {}; + "tintin" = callPackage ({ mkDerivation, base, clay, containers, data-has, directory , frontmatter, inflections, inliterate, lucid, optparse-generic @@ -291871,8 +291725,8 @@ self: { ({ mkDerivation, base, HTF, safe, transformers, uniform-strings }: mkDerivation { pname = "uniform-error"; - version = "0.1.3"; - sha256 = "0p9gplvnhfly0whdl0b0ydjpiyg7v5r5flkg4c02yqzsdxfp7sjf"; + version = "0.1.3.1"; + sha256 = "1gq3n9rjar3waddvs7w91y2wy2l2fqdqssd1bz2z2bvb27inggaf"; libraryHaskellDepends = [ base safe transformers uniform-strings ]; testHaskellDepends = [ base HTF safe transformers uniform-strings @@ -292170,6 +292024,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "unique-lang" = callPackage + ({ mkDerivation, base, neat-interpolation, text, transformers }: + mkDerivation { + pname = "unique-lang"; + version = "0.1.0.0"; + sha256 = "0z94lk5wf4wbkb2hw5vd7zgfhgkm0k5l2zpdkn4bafq3mbaprhr7"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base neat-interpolation text transformers + ]; + description = "Esoteric programming language where each number can only appear once"; + license = lib.licenses.mit; + mainProgram = "unique"; + }) {}; + "unique-logic" = callPackage ({ mkDerivation, base, explicit-exception, non-empty, QuickCheck , semigroups, transformers, utility-ht @@ -296471,6 +296341,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "vector-algorithms_0_9_0_1" = callPackage + ({ mkDerivation, base, bitvec, bytestring, containers, mwc-random + , primitive, QuickCheck, vector + }: + mkDerivation { + pname = "vector-algorithms"; + version = "0.9.0.1"; + sha256 = "0h9qqgna787q93q58mrvmg5mw8h92vlapx2glanz6vpjm39w19rb"; + libraryHaskellDepends = [ + base bitvec bytestring primitive vector + ]; + testHaskellDepends = [ + base bytestring containers QuickCheck vector + ]; + benchmarkHaskellDepends = [ base mwc-random vector ]; + description = "Efficient algorithms for vector arrays"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vector-binary" = callPackage ({ mkDerivation, base, binary, vector }: mkDerivation { From f1873383cc4bd7aca6645c8ce6465851f37ed8c8 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 31 Jul 2022 12:19:51 +0200 Subject: [PATCH 05/14] haskellPackages: reflect ghc-lib*_9_2* updates --- .../haskell-modules/configuration-common.nix | 10 +++++----- .../haskell-modules/configuration-ghc-9.2.x.nix | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6194bd2ea6cb..20dff6b93be8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2145,16 +2145,16 @@ 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_3_20220709; - ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_1_0; + 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_0 = super.ghc-lib-parser-ex_9_2_1_0.override { - ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220709; + 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_3_20220709; + ghc-lib-parser = super.ghc-lib-parser_9_2_4_20220729; }; hlint_3_4_1 = doDistribute (super.hlint_3_4_1.override { 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 53e604fbff30..8fc6194d3a4c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -98,9 +98,9 @@ self: super: { self.data-default ] ++ drv.libraryHaskellDepends or []; }) super.ghc-exactprint; - ghc-lib = self.ghc-lib_9_2_3_20220709; - ghc-lib-parser = self.ghc-lib-parser_9_2_3_20220709; - ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_1_0; + ghc-lib = doDistribute self.ghc-lib_9_2_4_20220729; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_4_20220729; + ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_2_1_1; hackage-security = doJailbreak super.hackage-security; hashable = super.hashable_1_4_0_2; hashable-time = doJailbreak super.hashable-time; From 4c85669eb927b2a19eed35430bcb89bc17ef981f Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 31 Jul 2022 12:38:25 +0200 Subject: [PATCH 06/14] haskellPackages.uniform-error: update override comment Seemingly the package is not yet feature complete and a desired feature is already part of the test suite?! --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 20dff6b93be8..b667e691cf89 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2407,8 +2407,9 @@ self: super: { # 2022-03-16: strict upper bounds https://github.com/monadfix/shower/issues/18 shower = doJailbreak (dontCheck super.shower); - # Doesn't compile with HTF 0.15 - # https://github.com/andrewufrank/uniform-error/issues/1 + # Test suite isn't supposed to succeed yet, apparently… + # https://github.com/andrewufrank/uniform-error/blob/f40629ad119e90f8dae85e65e93d7eb149bddd53/test/Uniform/Error_test.hs#L124 + # https://github.com/andrewufrank/uniform-error/issues/2 uniform-error = dontCheck super.uniform-error; # The shipped Setup.hs file is broken. From b319a5ceb5fb380957a63c29ca69fdf1f988a887 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 31 Jul 2022 12:44:05 +0200 Subject: [PATCH 07/14] haskellPackages.levenshtein: remove broken flag Compile failure has been resolved upstream! Closes #183151. --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 33eacf69ff56..f8ba389c990a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2987,7 +2987,6 @@ broken-packages: - less-arbitrary - Level0 - level-monad - - levenshtein - levmar - lfst - lhc diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ed74bf7104d6..7a956d166f7f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -173862,8 +173862,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Calculate the edit distance between two foldables"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "levmar" = callPackage From 120a70d038f959f4a5898514de6477e858afc114 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 31 Jul 2022 12:48:58 +0200 Subject: [PATCH 08/14] haskellPackages.cabal-hoogle: disable cabal v2 layout dependent test --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 3 +++ pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index f8ba389c990a..c5543b23b2e5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -543,7 +543,6 @@ broken-packages: - cabalgraph - cabal-graphdeps - cabal-helper - - cabal-hoogle - Cabal-ide-backend - cabal-info - cabal-install-bundle diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 2b11f4a8ebe1..c38dfe1fc89d 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -977,6 +977,9 @@ self: super: builtins.intersectAttrs super { ''; }) super.jacinda; + # Tests assume dist-newstyle build directory is present + cabal-hoogle = dontCheck super.cabal-hoogle; + nfc = overrideCabal (drv: { isExecutable = true; executableHaskellDepends = with self; drv.executableHaskellDepends or [] ++ [ base base16-bytestring bytestring ]; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7a956d166f7f..5df3d4212f96 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -51664,9 +51664,7 @@ self: { testToolDepends = [ hoogle tasty-discover ]; description = "generate hoogle database for cabal project and dependencies"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "cabal-hoogle"; - broken = true; }) {}; "cabal-info" = callPackage From 41d77132d90112238adeac7fbfb677505101567e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 31 Jul 2022 22:15:50 +0200 Subject: [PATCH 09/14] haskellPackages.debian: drop obsolete patches debian-4.0.4 has added GHC 9.0 support in a released version. --- pkgs/development/haskell-modules/configuration-common.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b667e691cf89..80cfcae82eb4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2504,13 +2504,6 @@ self: super: { servant-cassava = assert super.servant-cassava.version == "0.10.1"; doJailbreak super.servant-cassava; - # Fix tests failure for ghc 9 (https://github.com/clinty/debian-haskell/pull/3) - debian = appendPatch (fetchpatch { - name = "debian-haskell.3.patch"; - url = "https://github.com/clinty/debian-haskell/pull/3/commits/47441c8e4a7a00a3c8825eec98bf7a823594f9be.patch"; - sha256 = "0wxpqazjnal9naibapg63nm7x6qz0lklcfw2m5mzjrh2q9x2cvnd"; - }) super.debian; - # Test data missing from sdist # https://github.com/ngless-toolkit/ngless/issues/152 NGLess = dontCheck super.NGLess; From 3ca851a1d17940d1bb25e73784bfc1ea8d129779 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 1 Aug 2022 14:41:25 +0200 Subject: [PATCH 10/14] haskell.packages.ghc924.hiedb: dontCheck --- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 8fc6194d3a4c..b8d64df26746 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -190,7 +190,9 @@ self: super: { 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; - hiedb = doJailbreak super.hiedb; + + # 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46 + hiedb = doJailbreak (dontCheck super.hiedb); # 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 From 7d4b4a662574bc477c145ac2ad079f0a71558f28 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 1 Aug 2022 16:17:22 +0200 Subject: [PATCH 11/14] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 4 ++++ .../configuration-hackage2nix/transitive-broken.yaml | 4 ++++ pkgs/development/haskell-modules/hackage-packages.nix | 11 +++++++++++ 3 files changed, 19 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index c5543b23b2e5..a7711011d44f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1041,6 +1041,7 @@ broken-packages: - dbmigrations-mysql - dbmigrations-postgresql - dbmigrations-sqlite + - dbmonitor - d-bus - DBus - dbus-core @@ -1741,6 +1742,7 @@ broken-packages: - ginger - gingersnap - ginsu + - gi-pangocairo - giphy-api - gi-rsvg - gist @@ -3005,6 +3007,7 @@ broken-packages: - libpafe - libpq - librandomorg + - librarian - libsecp256k1 - libsystemd-daemon - libsystemd-journal @@ -4718,6 +4721,7 @@ broken-packages: - skemmtun - skulk - skylighting-extensions + - skylighting-format-ansi - skylighting-lucid - skype4hs - slack diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 7d5891c00c18..a623f3919c58 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -2426,6 +2426,7 @@ dont-distribute-packages: - json-togo - json-tokens - json2-hdbc + - json2sg - jsonlogic-aeson - jsons-to-schema - jspath @@ -3594,6 +3595,7 @@ dont-distribute-packages: - skeletons - sketch-frp-copilot - skylark-client + - skylighting_0_13 - slate - slidemews - slip32 @@ -3728,6 +3730,7 @@ dont-distribute-packages: - subG-instances - subhask - substring-parser + - sugar-data - sugar-json - sugar-scheme - summoner-tui @@ -3848,6 +3851,7 @@ dont-distribute-packages: - timeprint - timeseries - timezone-unix + - tinkoff-invest-sdk - tinyMesh - tip-haskell-frontend - tip-lib diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5df3d4212f96..81fa5b7f7c34 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -75430,7 +75430,9 @@ self: { ]; description = "Data consistency alerting for PostgreSQL"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "dbmonitor"; + broken = true; }) {}; "dbus" = callPackage @@ -111213,6 +111215,8 @@ self: { ''; description = "PangoCairo bindings"; license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; "gi-poppler" = callPackage @@ -164967,6 +164971,7 @@ self: { doHaddock = false; description = "Lossy conversion from JSON to Sugar"; license = "unknown"; + hydraPlatforms = lib.platforms.none; mainProgram = "json2sg"; }) {}; @@ -174840,7 +174845,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "Move/rename according a set of rules"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; mainProgram = "librarian"; + broken = true; }) {}; "librato" = callPackage @@ -258295,6 +258302,8 @@ self: { ]; description = "ANSI formatter for skylighting syntax highlighting library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "skylighting-format-blaze-html" = callPackage @@ -270600,6 +270609,7 @@ self: { testHaskellDepends = [ base hspec sugar tasty tasty-hspec ]; description = "Convert sugar to common data types for code generation"; license = "unknown"; + hydraPlatforms = lib.platforms.none; }) {}; "sugar-json" = callPackage @@ -283181,6 +283191,7 @@ self: { ]; description = "gRPC based SDK for Tinkoff Invest API V2"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "tintin" = callPackage From 6a8ad0a973dd8ae68307c0000aee7482ab889165 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 1 Aug 2022 16:20:20 +0200 Subject: [PATCH 12/14] haskellPackages.uniform-fileio: disable tests incompatbile with HTF >= 0.15 --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 80cfcae82eb4..cf78bd1be670 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2411,6 +2411,8 @@ self: super: { # https://github.com/andrewufrank/uniform-error/blob/f40629ad119e90f8dae85e65e93d7eb149bddd53/test/Uniform/Error_test.hs#L124 # https://github.com/andrewufrank/uniform-error/issues/2 uniform-error = dontCheck super.uniform-error; + # https://github.com/andrewufrank/uniform-fileio/issues/2 + uniform-fileio = dontCheck super.uniform-fileio; # The shipped Setup.hs file is broken. csv = overrideCabal (drv: { preCompileBuildDriver = "rm Setup.hs"; }) super.csv; From f6333fe939035f397a999f8abe01173bab72874b Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 2 Aug 2022 10:22:56 +0200 Subject: [PATCH 13/14] maintainers/scripts/haskell/hydra-report: fix capitalisation --- maintainers/scripts/haskell/hydra-report.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index fe55f13de70b..f7e5f573982d 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -451,8 +451,8 @@ printBuildSummary showBuild (name, entry) = printJob id name (summaryBuilds entry, Text.pack (if summaryReverseDeps entry > 0 then " :arrow_heading_up: " <> show (summaryUnbrokenReverseDeps entry) <>" | "<> show (summaryReverseDeps entry) else "")) showMaintainedBuild (name, (table, maintainers)) = printJob id name (table, Text.intercalate " " (fmap ("@" <>) (toList maintainers))) tldr = case (errors, warnings) of - ([],[]) -> [":green_circle: **Ready to merge** (if there are no [Evaluation Errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"] - ([],_) -> [":yellow_circle: **Potential issues** (and possibly [Evaluation Errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"] + ([],[]) -> [":green_circle: **Ready to merge** (if there are no [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"] + ([],_) -> [":yellow_circle: **Potential issues** (and possibly [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"] _ -> [":red_circle: **Branch not mergeable**"] warnings = if' (Unfinished > maybe Success worstState maintainedJob) "`maintained` jobset failed." <> From 4e7c3b982831bc209072fc0a31cd3e11f9ac7b56 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 4 Aug 2022 15:15:55 +0200 Subject: [PATCH 14/14] haskell.compiler.ghc941: apply fix for racy build system https://gitlab.haskell.org/ghc/ghc/-/merge_requests/8751 https://gitlab.haskell.org/ghc/ghc/-/issues/21934 Hopefully this patch fixes the problem we experienced on Hydra once (out of three builds). --- pkgs/development/compilers/ghc/9.4.1.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/compilers/ghc/9.4.1.nix b/pkgs/development/compilers/ghc/9.4.1.nix index f883796452c8..e24f9fbb3767 100644 --- a/pkgs/development/compilers/ghc/9.4.1.nix +++ b/pkgs/development/compilers/ghc/9.4.1.nix @@ -197,6 +197,12 @@ stdenv.mkDerivation (rec { extraPrefix = "utils/haddock/"; stripLen = 1; }) + # fix race condition in make build system + (fetchpatch { + name = "ghc-hs-boot-copying-fix.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/4f17eff0cbd125eca55b68f4927befdd45008eb6.diff"; + sha256 = "0anq3w9z9mhxb0wx6rvxac3n7rl3apcma9zk3r9zz9hj9v7vkqzx"; + }) ]; postPatch = "patchShebangs .";