From d6d127668df3dd9c52f4aa07ef6d4755aa45ba5d Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 13 Apr 2022 21:51:50 +0300 Subject: [PATCH 01/42] cmdstan: 2.17.1 -> 2.29.2 --- .../development/compilers/cmdstan/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index a41f836e10c..40fdcb29013 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { pname = "cmdstan"; - version = "2.17.1"; + version = "2.29.2"; + # includes stanc binaries needed to build cmdstand src = fetchurl { url = "https://github.com/stan-dev/cmdstan/releases/download/v${version}/cmdstan-${version}.tar.gz"; - sha256 = "1vq1cnrkvrvbfl40j6ajc60jdrjcxag1fi6kff5pqmadfdz9564j"; + sha256 = "sha256-VntTH6c//fcGyqF+szROHftB6GmTyvi6QIdf+RAzUVM="; }; buildFlags = [ "build" ]; @@ -14,7 +15,16 @@ stdenv.mkDerivation rec { doCheck = true; checkInputs = [ python3 ]; - checkPhase = "python ./runCmdStanTests.py src/test/interface"; # see #5368 + + postPatch = '' + substituteInPlace stan/lib/stan_math/make/libraries \ + --replace "/usr/bin/env bash" "bash" + patchShebangs . + ''; + + checkPhase = '' + ./runCmdStanTests.py -j$NIX_BUILD_CORES src/test/interface + ''; installPhase = '' mkdir -p $out/opt $out/bin @@ -28,6 +38,9 @@ stdenv.mkDerivation rec { chmod a+x $out/bin/stan ''; + # Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference. + preFixup = "rm -rf $(pwd)"; + meta = { description = "Command-line interface to Stan"; longDescription = '' From 5a77756649f7c95268c86dfa6fa96d65bbccd4b1 Mon Sep 17 00:00:00 2001 From: Christian Luetke Stetzkamp Date: Fri, 22 Apr 2022 11:46:45 +0200 Subject: [PATCH 02/42] radicle-upstream: 0.2.12 -> 0.3.0 Fixes #168605 --- .../git-and-tools/radicle-upstream/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix index 87d92e72a8f..d5791f6506c 100644 --- a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix +++ b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix @@ -2,17 +2,17 @@ let pname = "radicle-upstream"; - version = "0.2.12"; + version = "0.3.0"; name = "${pname}-${version}"; srcs = { x86_64-linux = fetchurl { url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage"; - sha256 = "7520c7feb94234df6f8523689d098e0d19510e2ac0122e482d1e01086c9b02fe"; + sha256 = "sha256-Y7V89G+nXRtknOukvBN8Q+sNx91YNPDT0p5hrFYe/Sk="; }; x86_64-darwin = fetchurl { url = "https://releases.radicle.xyz/radicle-upstream-${version}.dmg"; - sha256 = "8bbff051f169f029044e4c4965cad88f48e939b945fd5c253f0c39665a19ce44"; + sha256 = "sha256-EuWGbn6qggi8/9Rci8iaXfuVKE+QXb1BHEYDvotR/q4="; }; }; src = srcs.${stdenv.hostPlatform.system}; From b0c232895a678da14daf91c365c8d75fb92e9c71 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Sat, 23 Apr 2022 13:54:58 -0500 Subject: [PATCH 03/42] mapserver: switch to python3 --- pkgs/servers/mapserver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mapserver/default.nix b/pkgs/servers/mapserver/default.nix index f8b0d8196fa..9ec9ad01bc8 100644 --- a/pkgs/servers/mapserver/default.nix +++ b/pkgs/servers/mapserver/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config , cairo, curl, fcgi, freetype, fribidi, gdal, geos, giflib, harfbuzz , libjpeg, libpng, librsvg, libxml2, postgresql, proj, protobufc, zlib -, withPython ? true, swig, python2 +, withPython ? true, swig, python3 }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - ] ++ lib.optional withPython swig; + ] ++ lib.optional withPython [ swig python3.pkgs.setuptools ]; buildInputs = [ cairo @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { proj protobufc zlib - ] ++ lib.optional withPython python2; + ] ++ lib.optional withPython python3; cmakeFlags = [ "-DWITH_KML=ON" From c9a1647adeef403328f7b222666648bf8bfa0320 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sun, 24 Apr 2022 23:31:35 -0700 Subject: [PATCH 04/42] nixos/tailscale: use systemctl restart during activation. This avoids the scenario where you activate a new config over Tailscale, and a long delay between the "stop services" and "start services" phases of the activation script lead to your terminal freezing for tens of seconds, until tailscaled finally gets started again and the session recovers. Per the documentation of stopIfChanged, this is only safe to do if the service definition is robust to stopping the old process using the new service definition. As the maintainer of the upstream systemd unit, I can confirm that Tailscale is robust to this scenario: it has to be in order to work right on several other distros that just do unpack-then-restart, rather than the more complex stop-unpack-start dance. Signed-off-by: David Anderson --- nixos/modules/services/networking/tailscale.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index 1f64113950a..36db8bfb128 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -47,6 +47,18 @@ in { ] ++ (lib.optionals (cfg.permitCertUid != null) [ "TS_PERMIT_CERT_UID=${cfg.permitCertUid}" ]); + # Restart tailscaled with a single `systemctl restart` at the + # end of activation, rather than a `stop` followed by a later + # `start`. Activation over Tailscale can hang for tens of + # seconds in the stop+start setup, if the activation script has + # a significant delay between the stop and start phases + # (e.g. script blocked on another unit with a slow shutdown). + # + # Tailscale is aware of the correctness tradeoff involved, and + # already makes its upstream systemd unit robust against unit + # version mismatches on restart for compatibility with other + # linux distros. + stopIfChanged = false; }; }; } From 813f8b5efbc827bf39416120b8a651cc1a2df8c5 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 29 Apr 2022 15:27:02 +0200 Subject: [PATCH 05/42] haskellPackages: xhtml is not bundled if haddock is disabled The xhtml library is only built as part of the GHC build process if GHC is disabled. This means that no GHC cross compiler has xhtml bundled, since haddock can't be built if GHC is a cross compiler (see relevant notes in the GHC nix expressions). This means that all packages depending on xhtml would currently fail to build when cross-compiled, as haskellPackages would assume it'd be provided by GHC. This is fixed by this commit. pkgsStatic hits this case, so we test compilation of xhtml for these package sets which will remind us to update the attribute name whenever its version changes. --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 4 +++- pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 4 +++- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 +++- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 4 +++- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 4 +++- pkgs/development/haskell-modules/configuration-ghc-head.nix | 4 +++- pkgs/top-level/release-haskell.nix | 2 ++ 7 files changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index c8e7c8179e6..48972849cf6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -43,7 +43,9 @@ self: super: { time = null; transformers = null; unix = null; - xhtml = null; + # GHC only bundles the xhtml library if haddock is enabled, check if this is + # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 + xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1; # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = super.cabal-install.overrideScope (self: super: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 5eaa1ae413d..11c3677913e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -42,7 +42,9 @@ self: super: { time = null; transformers = null; unix = null; - xhtml = null; + # GHC only bundles the xhtml library if haddock is enabled, check if this is + # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 + xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1; # Needs Cabal 3.0.x. cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; }); diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 98eaab70731..d7b049b205b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -42,7 +42,9 @@ self: super: { time = null; transformers = null; unix = null; - xhtml = null; + # GHC only bundles the xhtml library if haddock is enabled, check if this is + # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 + xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1; # GHC 8.8.x can build haddock version 2.23.* haddock = self.haddock_2_23_1; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 855afa28101..db38ebd8b70 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -44,7 +44,9 @@ self: super: { time = null; transformers = null; unix = null; - xhtml = null; + # GHC only bundles the xhtml library if haddock is enabled, check if this is + # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 + xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1; # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { 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 249816cc49c..00c1698b6a0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -44,7 +44,9 @@ self: super: { time = null; transformers = null; unix = null; - xhtml = null; + # GHC only bundles the xhtml library if haddock is enabled, check if this is + # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 + xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1; # Tests fail because of typechecking changes conduit = dontCheck super.conduit; diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index bc65e209911..ad3aea047ae 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -52,7 +52,9 @@ self: super: { time = null; transformers = null; unix = null; - xhtml = null; + # GHC only bundles the xhtml library if haddock is enabled, check if this is + # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 + xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1; # https://github.com/tibbe/unordered-containers/issues/214 unordered-containers = dontCheck super.unordered-containers; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 88b53f6b636..a1e72c90bea 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -317,6 +317,7 @@ let random QuickCheck cabal2nix + xhtml # isn't bundled for cross ; }; @@ -327,6 +328,7 @@ let random QuickCheck cabal2nix + xhtml # isn't bundled for cross ; }; }; From a83edfb86b1353acf38f9a69658d157d41124f04 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 1 May 2022 16:20:11 +0900 Subject: [PATCH 06/42] haskellPackages: stackage LTS 19.4 -> LTS 19.5 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 52 ++++++++++--------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index e0e60d509a0..64f9195673d 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.4 +# Stackage LTS 19.5 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -78,7 +78,7 @@ default-package-overrides: - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - arrows ==0.4.4.2 - - ascii ==1.1.2.0 + - ascii ==1.1.3.0 - ascii-case ==1.0.0.10 - ascii-char ==1.0.0.14 - asciidiagram ==1.3.3.3 @@ -86,7 +86,7 @@ default-package-overrides: - ascii-numbers ==1.0.0.0 - ascii-predicates ==1.0.0.10 - ascii-progress ==0.3.3.0 - - ascii-superset ==1.0.1.12 + - ascii-superset ==1.0.1.13 - ascii-th ==1.0.0.10 - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 @@ -297,8 +297,8 @@ default-package-overrides: - cast ==0.1.0.2 - caster ==0.0.3.0 - cayley-client ==0.4.17 - - cborg ==0.2.6.0 - - cborg-json ==0.2.3.0 + - cborg ==0.2.7.0 + - cborg-json ==0.2.4.0 - cdar-mBound ==0.1.0.4 - c-enum ==0.1.1.3 - cereal ==0.5.8.2 @@ -630,7 +630,7 @@ default-package-overrides: - dual ==0.1.1.1 - dual-tree ==0.2.3.0 - dublincore-xml-conduit ==0.1.0.2 - - dunai ==0.8.1 + - dunai ==0.8.2 - duration ==0.2.0.0 - dvorak ==0.1.0.0 - dynamic-state ==0.3.1 @@ -874,7 +874,7 @@ default-package-overrides: - ghc-check ==0.5.0.6 - ghc-compact ==0.1.0.0 - ghc-core ==0.5.6 - - ghc-events ==0.17.0.2 + - ghc-events ==0.17.0.3 - ghc-exactprint ==0.6.4 - ghcid ==0.8.7 - ghci-hexcalc ==0.1.1.0 @@ -980,7 +980,7 @@ default-package-overrides: - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - happstack-server ==7.7.2 - - happstack-server-tls ==7.2.1.1 + - happstack-server-tls ==7.2.1.2 - happy ==1.20.0 - happy-meta ==0.2.0.11 - HasBigDecimal ==0.1.1 @@ -1012,7 +1012,7 @@ default-package-overrides: - hasql-optparse-applicative ==0.3.0.8 - hasql-pool ==0.5.2.2 - hasql-queue ==1.2.0.2 - - hasql-th ==0.4.0.11 + - hasql-th ==0.4.0.12 - hasql-transaction ==1.0.1.1 - has-transformers ==0.1.0.4 - hasty-hamiltonian ==1.3.4 @@ -1216,6 +1216,7 @@ default-package-overrides: - hw-json-simd ==0.1.1.1 - hw-json-simple-cursor ==0.1.1.1 - hw-json-standard-cursor ==0.2.3.2 + - hwk ==0.6 - hw-kafka-client ==4.0.3 - hw-mquery ==0.2.1.1 - hworker ==0.1.0.1 @@ -1240,7 +1241,7 @@ default-package-overrides: - hxt-unicode ==9.0.2.4 - hybrid-vectors ==0.2.2 - hyper ==0.2.1.1 - - hyperloglog ==0.4.5 + - hyperloglog ==0.4.6 - hyphenation ==0.8.2 - iconv ==0.4.1.3 - identicon ==0.2.2 @@ -1787,7 +1788,7 @@ default-package-overrides: - pattern-arrows ==0.0.2 - pava ==0.1.1.3 - pcg-random ==0.1.3.7 - - pcre2 ==2.1.0.1 + - pcre2 ==2.1.1 - pcre-heavy ==1.0.0.2 - pcre-light ==0.4.1.0 - pcre-utils ==0.1.8.2 @@ -2030,10 +2031,10 @@ default-package-overrides: - ref-fd ==0.5 - refined ==0.6.3 - reflection ==2.1.6 - - reform ==0.2.7.4 - - reform-blaze ==0.2.4.3 + - reform ==0.2.7.5 + - reform-blaze ==0.2.4.4 - reform-hamlet ==0.0.5.3 - - reform-happstack ==0.2.5.4 + - reform-happstack ==0.2.5.5 - RefSerialize ==0.4.0 - ref-tf ==0.5.0.1 - regex ==1.1.0.1 @@ -2136,7 +2137,7 @@ default-package-overrides: - sdl2 ==2.5.3.0 - sdl2-ttf ==2.1.2 - search-algorithms ==0.3.2 - - secp256k1-haskell ==0.6.0 + - secp256k1-haskell ==0.6.1 - securemem ==0.1.10 - selda ==0.5.1.0 - selda-sqlite ==0.1.7.1 @@ -2158,7 +2159,7 @@ default-package-overrides: - sequence-formats ==1.6.6.1 - sequenceTools ==1.5.2 - serf ==0.1.1.0 - - serialise ==0.2.4.0 + - serialise ==0.2.5.0 - servant ==0.19 - servant-auth ==0.4.1.0 - servant-auth-client ==0.4.1.0 @@ -2245,6 +2246,7 @@ default-package-overrides: - singletons-presburger ==0.6.1.0 - singletons-th ==3.0 - siphash ==1.0.3 + - Sit ==0.2022.3.18 - sitemap-gen ==0.1.0.0 - sized ==1.0.0.0 - skein ==1.0.9.4 @@ -2382,7 +2384,7 @@ default-package-overrides: - SVGFonts ==1.8.0.1 - svg-tree ==0.6.2.4 - swagger2 ==2.8.2 - - swish ==0.10.1.0 + - swish ==0.10.2.0 - syb ==0.7.2.1 - sydtest-discover ==0.0.0.1 - symbol ==0.2.4 @@ -2716,7 +2718,7 @@ default-package-overrides: - wai-cors ==0.2.7 - wai-enforce-https ==1.0.0.0 - wai-eventsource ==3.0.0 - - wai-extra ==3.1.8 + - wai-extra ==3.1.10 - wai-feature-flags ==0.1.0.3 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.4.0 @@ -2749,11 +2751,11 @@ default-package-overrides: - webgear-server ==1.0.1 - webpage ==0.0.5.1 - web-plugins ==0.4.1 - - web-routes ==0.27.14.3 - - web-routes-boomerang ==0.28.4.2 - - web-routes-happstack ==0.23.12.1 - - web-routes-hsp ==0.24.6.1 - - web-routes-wai ==0.24.3.1 + - web-routes ==0.27.14.4 + - web-routes-boomerang ==0.28.4.3 + - web-routes-happstack ==0.23.12.2 + - web-routes-hsp ==0.24.6.2 + - web-routes-wai ==0.24.3.2 - webrtc-vad ==0.1.0.3 - websockets ==0.12.7.3 - websockets-simple ==0.2.0 @@ -2839,7 +2841,7 @@ default-package-overrides: - yesod-auth-hashdb ==1.7.1.7 - yesod-auth-oauth2 ==0.7.0.1 - yesod-bin ==1.6.2.1 - - yesod-core ==1.6.22.0 + - yesod-core ==1.6.23 - yesod-eventsource ==1.6.0.1 - yesod-form ==1.7.0 - yesod-form-bootstrap4 ==3.0.1 @@ -2854,7 +2856,7 @@ default-package-overrides: - yesod-routes-flow ==3.0.0.2 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.1.0 - - yesod-test ==1.6.12 + - yesod-test ==1.6.13 - yesod-websockets ==0.3.0.3 - yes-precure5-command ==5.5.3 - yi-rope ==0.11 From d36e5507ffe3cb4a3dfa6872df9b31e5e7c69f6e Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 1 May 2022 16:20:26 +0900 Subject: [PATCH 07/42] all-cabal-hashes: 2022-04-20T23:34:08Z -> 2022-05-01T06:09:30Z 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 e99d660bcf3..9454a39d9d7 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "762464dcc5ce93f1c6a9a746feb6bd1bd0c47006", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/762464dcc5ce93f1c6a9a746feb6bd1bd0c47006.tar.gz", - "sha256": "0k1qp34lsc08a99p669v8n0fxs6mdzwc2bz87v0hdah4qagi4z4g", - "msg": "Update from Hackage at 2022-04-20T23:34:08Z" + "commit": "08ae12813ead00810e00ffe9dae284fcafe6a08a", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/08ae12813ead00810e00ffe9dae284fcafe6a08a.tar.gz", + "sha256": "00jc08pifnp791s1scscdhgwlf75v9682a7vjis1djnhj3y5s3ny", + "msg": "Update from Hackage at 2022-05-01T06:09:30Z" } From 95cb7852a2b4582489e808b1253275899b94d09b Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 1 May 2022 16:21:28 +0900 Subject: [PATCH 08/42] 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 | 2315 ++++++++++++----- 1 file changed, 1605 insertions(+), 710 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 612b0a224c5..ba29b38f362 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1331,6 +1331,32 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "BPS" = callPackage + ({ mkDerivation, base, extra, free, mtl, resourcet, STMonadTrans + , symbol, template-haskell, TLT, transformers + }: + mkDerivation { + pname = "BPS"; + version = "0.1.0.0"; + sha256 = "0rkrjj42p9ybcifmsmz8717yyf2q3vzwm4y42khxz824vdxa9q2j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base extra free mtl resourcet STMonadTrans symbol template-haskell + transformers + ]; + executableHaskellDepends = [ + base extra free mtl resourcet STMonadTrans symbol template-haskell + transformers + ]; + testHaskellDepends = [ + base extra free mtl resourcet STMonadTrans symbol template-haskell + TLT transformers + ]; + description = "Translations of classic Truth Maintenance Systems"; + license = lib.licenses.gpl3Only; + }) {}; + "Baggins" = callPackage ({ mkDerivation, base, cairo, containers, mtl }: mkDerivation { @@ -5186,6 +5212,8 @@ self: { pname = "EdisonAPI"; version = "1.3.1"; sha256 = "0vmmlsj8ggbpwx6fkf5fvb6jp0zpx6iba6b28m80lllr2p8bi8wm"; + revision = "1"; + editedCabalFile = "1nlw49ifjvav102pigksi46xg0zwnpfj29j3db0rr76hykikpipy"; libraryHaskellDepends = [ base mtl ]; description = "A library of efficient, purely-functional data structures (API)"; license = lib.licenses.mit; @@ -19773,8 +19801,8 @@ self: { }: mkDerivation { pname = "TLT"; - version = "0.1.0.0"; - sha256 = "125hfd8ig706zsizyn959qsjcadsgbiqq3dnygjxambvd2d135pr"; + version = "0.1.0.1"; + sha256 = "1b91ax19dfgi50rlkfvjjywzz6w998d5jsq5c0yz620rcdl7jrki"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25032,14 +25060,12 @@ self: { }) {}; "aeson-helper" = callPackage - ({ mkDerivation, aeson, base, text, unordered-containers, vector }: + ({ mkDerivation, aeson, base, text, vector }: mkDerivation { pname = "aeson-helper"; - version = "0.1.0.0"; - sha256 = "0s4gq827i2wyflcaxbhlr8f8svlw8szzmwax9d7vnxk9wy9fw8w0"; - libraryHaskellDepends = [ - aeson base text unordered-containers vector - ]; + version = "0.2.0.0"; + sha256 = "1im4grk23vkxgpa1fhhdg0ghg5j1z2qcwqvnpjk1s168993j2522"; + libraryHaskellDepends = [ aeson base text vector ]; description = "Aeson helper func"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -25350,8 +25376,8 @@ self: { ({ mkDerivation, aeson, aeson-helper, base, text }: mkDerivation { pname = "aeson-result"; - version = "0.1.0.0"; - sha256 = "10bnzh7vlh42sip0z7mvx5jxrsi7p2s3vqy55pfg2pb17czzly2y"; + version = "0.2.0.0"; + sha256 = "1sssh9k4fkmsn96m796f5j3p5a5sc8khqgjfj4pzi1r935368n1f"; libraryHaskellDepends = [ aeson aeson-helper base text ]; description = "API Result for aeson"; license = lib.licenses.bsd3; @@ -26507,22 +26533,27 @@ self: { }) {}; "alfred-margaret" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, hashable, hspec - , hspec-expectations, primitive, QuickCheck, quickcheck-instances - , text, unordered-containers, vector + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, hashable, hspec, hspec-expectations, primitive + , QuickCheck, quickcheck-instances, text, unordered-containers + , vector }: mkDerivation { pname = "alfred-margaret"; - version = "1.1.1.0"; - sha256 = "1z3plc2a6qnlx1cpb3icw44h3lbspaq2n7djl4pljhb4dm5bflbq"; + version = "1.1.2.0"; + sha256 = "02p9djplw187v4k7mi6mh6mjjs7gir0crghyxfkjqjrxk5s7f3j7"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - aeson base containers deepseq hashable primitive text + aeson base bytestring containers deepseq hashable primitive text unordered-containers vector ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ - base deepseq hspec hspec-expectations QuickCheck + base deepseq hspec hspec-expectations primitive QuickCheck quickcheck-instances text ]; + benchmarkHaskellDepends = [ base criterion deepseq vector ]; description = "Fast Aho-Corasick string searching"; license = lib.licenses.bsd3; }) {}; @@ -26533,8 +26564,8 @@ self: { pname = "alg"; version = "0.2.13.1"; sha256 = "0764j2njb86qdskck3nvbrh61v99hqdhf8aj9irblm6smdlrv4l3"; - revision = "1"; - editedCabalFile = "0rm66k502d8la140ffawd38yaf0hr92h8x7xrq6krn6ypljwql0v"; + revision = "2"; + editedCabalFile = "1ffcn0ahv2jl6191baik5sqsh5mb61n1g4rgkiybd1mspgsmnnwy"; libraryHaskellDepends = [ base dual util ]; description = "Algebraic structures"; license = lib.licenses.bsd3; @@ -30788,8 +30819,8 @@ self: { }: mkDerivation { pname = "annotated-exception"; - version = "0.2.0.1"; - sha256 = "0lqr283ql82kfpd6rvznwj4p0h4176mg9xnb1wnzdxxbl9rn3xgl"; + version = "0.2.0.2"; + sha256 = "07njn6r1c3n1nblnlz5q2jrk5887vxxr2yzw4khqwayy0nmgbc7l"; libraryHaskellDepends = [ base containers safe-exceptions text unliftio-core ]; @@ -30898,6 +30929,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "ansi-terminal_0_11_3" = callPackage + ({ mkDerivation, base, colour }: + mkDerivation { + pname = "ansi-terminal"; + version = "0.11.3"; + sha256 = "0swy5alj4xvfsnjrfiwxdlgzdnggjy6lgbfwph2d7c8zyzn67mgl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base colour ]; + description = "Simple ANSI terminal support, with Windows compatibility"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ansi-terminal-game" = callPackage ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal , clock, containers, exceptions, hspec, linebreak, mintty, mtl @@ -32342,6 +32387,43 @@ self: { broken = true; }) {}; + "appendful" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, mtl, validity + , validity-containers + }: + mkDerivation { + pname = "appendful"; + version = "0.0.0.0"; + sha256 = "1wb2abnr2k7d7bgvh3zjyg55s1236cgnz1idldpxcrib30nr01l8"; + libraryHaskellDepends = [ + aeson base containers deepseq mtl validity validity-containers + ]; + license = lib.licenses.mit; + }) {}; + + "appendful-persistent" = callPackage + ({ mkDerivation, appendful, base, containers, genvalidity + , genvalidity-appendful, genvalidity-hspec, genvalidity-persistent + , hspec, microlens, monad-logger, mtl, path, path-io, persistent + , persistent-sqlite, persistent-template, QuickCheck, text + , validity + }: + mkDerivation { + pname = "appendful-persistent"; + version = "0.0.0.0"; + sha256 = "0h0hdjkkrz8ckhs8r8n0vm983513lahi9bd89i1hyqlycrckbphl"; + libraryHaskellDepends = [ + appendful base containers microlens persistent + ]; + testHaskellDepends = [ + appendful base containers genvalidity genvalidity-appendful + genvalidity-hspec genvalidity-persistent hspec monad-logger mtl + path path-io persistent persistent-sqlite persistent-template + QuickCheck text validity + ]; + license = lib.licenses.mit; + }) {}; + "appendmap" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck }: mkDerivation { @@ -34059,8 +34141,10 @@ self: { }: mkDerivation { pname = "ascii"; - version = "1.1.2.0"; - sha256 = "17yh71i28m1m4hnlbd6sp234kwqpgsdpn4bmv2g283vq37mkn09n"; + version = "1.1.3.0"; + sha256 = "0pzyamd64mj8sx5a43gi7yjdy5dx6k9648ihbgsri8k8srlhm0c8"; + revision = "1"; + editedCabalFile = "0lxjb940qm86i1b2i9dgyj8874y49spwmkm5ninxd5hs7g9manll"; libraryHaskellDepends = [ ascii-case ascii-char ascii-group ascii-numbers ascii-predicates ascii-superset ascii-th base bytestring text @@ -34071,15 +34155,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ascii_1_2_0_0" = callPackage + "ascii_1_2_2_0" = callPackage ({ mkDerivation, ascii-case, ascii-char, ascii-group, ascii-numbers , ascii-predicates, ascii-superset, ascii-th, base, bytestring , hedgehog, text }: mkDerivation { pname = "ascii"; - version = "1.2.0.0"; - sha256 = "1m043s6030mwz4gam83nb1dyxsbkaar6i7cdvzjfgawv9gdpwkbb"; + version = "1.2.2.0"; + sha256 = "1s6xm2b0g1jcbg8xfkhysmk4rhsx2342dd980md827rnfc5l4w80"; libraryHaskellDepends = [ ascii-case ascii-char ascii-group ascii-numbers ascii-predicates ascii-superset ascii-th base bytestring text @@ -34284,22 +34368,6 @@ self: { }) {}; "ascii-superset" = callPackage - ({ mkDerivation, ascii-char, base, bytestring, hashable, hedgehog - , text - }: - mkDerivation { - pname = "ascii-superset"; - version = "1.0.1.12"; - sha256 = "04kp4v0m1z1sh78862qryhkq1a5jzv1hdkyyrsv2m7caqkh8rn2c"; - libraryHaskellDepends = [ - ascii-char base bytestring hashable text - ]; - testHaskellDepends = [ ascii-char base hedgehog text ]; - description = "Representing ASCII with refined supersets"; - license = lib.licenses.asl20; - }) {}; - - "ascii-superset_1_0_1_13" = callPackage ({ mkDerivation, ascii-char, base, bytestring, hashable, hedgehog , text }: @@ -34313,7 +34381,6 @@ self: { testHaskellDepends = [ ascii-char base hedgehog text ]; description = "Representing ASCII with refined supersets"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-table" = callPackage @@ -36342,27 +36409,25 @@ self: { , http-types, language-bash, megaparsec, network-uri , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal , rio, scheduler, stm, tasty, tasty-hunit, text, time, transformers - , typed-process, versions + , typed-process, unix, versions }: mkDerivation { pname = "aura"; - version = "3.2.7"; - sha256 = "07ya2vd94grh6fs7k5kq25yh95xfk5mdqcgqq84anjz0phprq5z3"; - revision = "1"; - editedCabalFile = "16z28nkj5ladbbrg2h5sc1qcl3335g3i37x02h0by8bpqbkld6xr"; + version = "3.2.8"; + sha256 = "1frvim9asp0849g7f5c1hcjkr82c9w27im479vmk6n4zzssvzach"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson algebraic-graphs aur base bytestring containers filepath hashable http-client http-types language-bash megaparsec network-uri prettyprinter prettyprinter-ansi-terminal rio scheduler - stm text time transformers typed-process versions + stm text time transformers typed-process unix versions ]; executableHaskellDepends = [ aeson aur base bytestring containers http-client http-client-tls megaparsec optparse-applicative prettyprinter prettyprinter-ansi-terminal rio scheduler text transformers - typed-process versions + typed-process unix versions ]; testHaskellDepends = [ base bytestring containers megaparsec rio tasty tasty-hunit text @@ -36523,8 +36588,8 @@ self: { }: mkDerivation { pname = "autodocodec"; - version = "0.0.1.0"; - sha256 = "0g0k1c76nfkw8l5x6isz6fkci9bjn67qdpmjksf4qdfla28v35ha"; + version = "0.0.1.1"; + sha256 = "12wvqn2hqfi4fh4w53qs137x5cdbqwvlksbncnbcnzdlad7ncfqa"; libraryHaskellDepends = [ aeson base bytestring containers hashable mtl scientific text time unordered-containers validity validity-scientific vector @@ -36561,8 +36626,8 @@ self: { }: mkDerivation { pname = "autodocodec-schema"; - version = "0.1.0.0"; - sha256 = "0qk1fjb47whpbnj2w776sk5mnb1m4z1dq6fmxhvjih3xsrpjq7s3"; + version = "0.1.0.1"; + sha256 = "1nzwbj3r5gps2lnriig38h1y51m4pd997z65kpsmxzcbyakdxjnd"; libraryHaskellDepends = [ aeson autodocodec base containers mtl text unordered-containers validity validity-aeson validity-containers validity-text @@ -36596,8 +36661,8 @@ self: { }: mkDerivation { pname = "autodocodec-yaml"; - version = "0.1.0.0"; - sha256 = "1wa51mas9jxzhig651i9r21fxahk8rdwg7waxx4ilayzdfhaic4b"; + version = "0.1.0.1"; + sha256 = "1js3w0r7nrvl70vkkwblx8zqax22idblpdzs1ljr4x0jiwwji8bs"; libraryHaskellDepends = [ autodocodec autodocodec-schema base bytestring containers path path-io safe-coloured-text scientific text unordered-containers @@ -38839,10 +38904,8 @@ self: { ({ mkDerivation, barbies, base, split, template-haskell }: mkDerivation { pname = "barbies-th"; - version = "0.1.9"; - sha256 = "1brikm7qr2yi3426vgwjjxjrvw060sb0v7jbxrhazjps28f6aa3n"; - revision = "1"; - editedCabalFile = "0iij1y72q28wvj8hfx000cpckl1wlcgj050380lx526cmwavy151"; + version = "0.1.10"; + sha256 = "0h16ywwf6dgazwnsqxl82l28vjx51gmh2xn8idlvc7kkl8ylgq54"; libraryHaskellDepends = [ barbies base split template-haskell ]; testHaskellDepends = [ barbies base ]; description = "Create strippable HKD via TH"; @@ -40546,8 +40609,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.13.3"; - sha256 = "0qakz6fidvhg121j442lsvcz9va0xa0rks41qj293mnrs8savv0p"; + version = "0.13.4"; + sha256 = "1c2w0ll84mrzkwg3314pnmasgaql0yjhrb5wy7zlm18s3bgpcysb"; libraryHaskellDepends = [ base dunai MonadRandom mtl simple-affine-space transformers ]; @@ -43054,6 +43117,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "binrep" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, refined + , refined-with, text + }: + mkDerivation { + pname = "binrep"; + version = "0.1.0"; + sha256 = "10b65qdk4h96q44bl6ic8c4v2lfkr3vsm15zpia0dlikxnibvb8i"; + libraryHaskellDepends = [ + aeson base bytestring cereal refined refined-with text + ]; + description = "Encode binary representations via types"; + license = lib.licenses.mit; + }) {}; + "bins" = callPackage ({ mkDerivation, base, containers, finite-typelits , ghc-typelits-knownnat, ghc-typelits-natnormalise, math-functions @@ -49597,6 +49675,33 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) bzip2;}; + "bzlib-conduit-jappie" = callPackage + ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit + , data-default-class, hspec, mtl, random, resourcet + }: + mkDerivation { + pname = "bzlib-conduit-jappie"; + version = "0.3.0.3"; + sha256 = "10fvvcv205r45yk02fi4cyqq1r7f98hl5p4psfr3xixlzsyh6n8k"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bindings-DSL bytestring conduit data-default-class mtl + resourcet + ]; + librarySystemDepends = [ bzip2 ]; + libraryPkgconfigDepends = [ bzip2 ]; + testHaskellDepends = [ + base bindings-DSL bytestring conduit data-default-class hspec mtl + random resourcet + ]; + benchmarkHaskellDepends = [ + base bindings-DSL bytestring conduit data-default-class mtl + resourcet + ]; + description = "Streaming compression/decompression via conduits"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) bzip2;}; + "c-dsl" = callPackage ({ mkDerivation, base, language-c }: mkDerivation { @@ -50170,6 +50275,17 @@ self: { broken = true; }) {}; + "cabal-detailed-quickcheck" = callPackage + ({ mkDerivation, base, Cabal, QuickCheck }: + mkDerivation { + pname = "cabal-detailed-quickcheck"; + version = "0.1.1.3"; + sha256 = "1zy2b86ns5jhrl6z6qw6g1zq5nv3lpf4askpr40l9gid61h6mr01"; + libraryHaskellDepends = [ base Cabal QuickCheck ]; + description = "QuickCheck for Cabal tests"; + license = lib.licenses.mit; + }) {}; + "cabal-dev" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-install, containers , directory, filepath, HTTP, mtl, network, pretty, process, setenv @@ -51998,6 +52114,27 @@ self: { license = lib.licenses.mit; }) {}; + "calligraphy" = callPackage + ({ mkDerivation, array, base, containers, directory, enummapset + , filepath, ghc, hspec, HUnit, mtl, optparse-applicative, process + , QuickCheck, text + }: + mkDerivation { + pname = "calligraphy"; + version = "0.1.2"; + sha256 = "08kiqp1z60hbfxm5s2d0hdr516gbq8fqyz0ddlr3vk0g9npm3nj2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers directory enummapset filepath ghc mtl + optparse-applicative process text + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base containers hspec HUnit QuickCheck ]; + description = "HIE-based Haskell call graph and source code visualizer"; + license = lib.licenses.bsd3; + }) {}; + "camfort" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, fgl, filepath, flint, fortran-src @@ -53708,6 +53845,8 @@ self: { pname = "category"; version = "0.2.5.0"; sha256 = "0iya7q3b1z1bxv4amsibmc1lrmf7dng76nzcnanwy300jm1n42w7"; + revision = "1"; + editedCabalFile = "13yj1v414llr5cxdd5f3wdy75si2hj7f3k1f6w7kwj84gbrii5rr"; libraryHaskellDepends = [ alg base dual transformers ]; description = "Categorical types and classes"; license = lib.licenses.bsd3; @@ -53980,10 +54119,8 @@ self: { }: mkDerivation { pname = "cborg"; - version = "0.2.6.0"; - sha256 = "1mvsavi8ngsvmcvlmaygsnygf7hn8kdqdhfff91n1zajgpz577h6"; - revision = "1"; - editedCabalFile = "0ry5p8cnmm772m3z074azh1ldxvq851dmffsp2b7vljjhzd9j4sc"; + version = "0.2.7.0"; + sha256 = "076656vq2qabhdnwzifc5gsj20vwh69vhy19dh0qa1f2lqxrzfvq"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-bignum ghc-prim half primitive text @@ -54004,8 +54141,8 @@ self: { }: mkDerivation { pname = "cborg-json"; - version = "0.2.3.0"; - sha256 = "1nsind3yiix6mb3xgwcnb267d8w9k0dvfnj78jc58gybx5hl9n53"; + version = "0.2.4.0"; + sha256 = "1h5i8sf1q1xr4c2y945vanj6n1wkkag1vflfjys7ygbgddbcq7rv"; libraryHaskellDepends = [ aeson aeson-pretty base cborg scientific text unordered-containers vector @@ -54039,8 +54176,8 @@ self: { pname = "cci"; version = "0.3.1"; sha256 = "0pvap67fn9kmjvn2qqq3x99k3mzrrsnb6q6fhawvyxv8drihsfc7"; - revision = "1"; - editedCabalFile = "11s00cbbimpglashmp1vmw1xhd4y2g1spn01ajvx3sw6wdyh614n"; + revision = "2"; + editedCabalFile = "123jmn7lgz1hmkygjzqckffm77783pfzddnjyvvv7rsnpgl4ckqn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -57365,8 +57502,8 @@ self: { }: mkDerivation { pname = "clash-shake"; - version = "0.2.2"; - sha256 = "10gj6764qhdy6ki0dyy75ycpj5il26jgxxjcr0xy9kkixi3wgsrb"; + version = "0.3.0"; + sha256 = "1iprssnpxykh9fjgckjnh5qlmnf1drgzjjfcq9fxyqs755y38vbi"; libraryHaskellDepends = [ aeson base bytestring clash-ghc clash-lib clash-prelude directory shake split stache text unordered-containers @@ -57673,8 +57810,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.28.0"; - sha256 = "11cr4mql6jhskhk1hg2c7kkvv005bha7y9b3ccpgy1147grnp00m"; + version = "0.28.0.1"; + sha256 = "1h18gh6042qq7qphiqdj9ww9k2pghj3dzz33rdh6w4jlx967w6bw"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring @@ -57847,8 +57984,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.3.25"; - sha256 = "0ii9984y7792i7kiwnqmgn9mfyky2k9dkx3fnzkirypqbxyri92s"; + version = "0.4.3.26"; + sha256 = "1h348cgxrvj6p4kd4vzfkdjvx592p7yb16mmxp27k61jvncg1vjw"; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl @@ -57872,8 +58009,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-redirect"; - version = "0.0.1.2"; - sha256 = "1vb0knjy0qkbpzni10bgvznnjxc7bv7pbp1l9frdffdsrssgyx8w"; + version = "0.0.1.3"; + sha256 = "15qcqrrznx7wz0anfwvs0rr3jl51ifcb0gxlr236c4c4xx8wfhna"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57894,8 +58031,8 @@ self: { }: mkDerivation { pname = "clckwrks-theme-bootstrap"; - version = "0.4.3.2"; - sha256 = "0ag94kc0csjnh88vw6ljifv6cqqwc8wizyizqk0mj4qpp73z6qd2"; + version = "0.4.3.5"; + sha256 = "07gms8mcp4lbi6fqxanzg2z7ybjhisxaal7yix3039glh54d2gv3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro @@ -65272,14 +65409,14 @@ self: { }) {}; "context" = callPackage - ({ mkDerivation, async, base, containers, ghc-prim, hspec - , hspec-discover + ({ mkDerivation, async, base, containers, exceptions, ghc-prim + , hspec, hspec-discover }: mkDerivation { pname = "context"; - version = "0.1.1.1"; - sha256 = "0zn8hnyf04q7brchll3xnk0ifxadl050wric191irmnl29m6p5k8"; - libraryHaskellDepends = [ base containers ]; + version = "0.2.0.0"; + sha256 = "1s915v2wbmhwp3qwk5p7n1iz510wfdmi4nq2zg1m04q7dpzhl0xz"; + libraryHaskellDepends = [ base containers exceptions ]; testHaskellDepends = [ async base ghc-prim hspec ]; testToolDepends = [ hspec-discover ]; description = "Thread-indexed, nested contexts"; @@ -65339,8 +65476,8 @@ self: { }: mkDerivation { pname = "context-http-client"; - version = "0.1.0.0"; - sha256 = "0ad917jnzqd2idzh6a5j9nvjf2pg7l968vmn38cxgh9hfq3yhwm7"; + version = "0.2.0.0"; + sha256 = "0d7hdqcvfay8m1inbl19z4hj8qqi2a00qsxh7n7s03075rd8wzs0"; libraryHaskellDepends = [ base context http-client ]; testHaskellDepends = [ async base bytestring case-insensitive context hspec http-client @@ -65352,12 +65489,14 @@ self: { }) {}; "context-resource" = callPackage - ({ mkDerivation, async, base, context, hspec, hspec-discover }: + ({ mkDerivation, async, base, context, exceptions, hspec + , hspec-discover + }: mkDerivation { pname = "context-resource"; - version = "0.1.0.0"; - sha256 = "0695m9hnx8grfmyy7mzd6n3426qc18sh14hy6glhr5nwj9c4k4c2"; - libraryHaskellDepends = [ base context ]; + version = "0.2.0.0"; + sha256 = "0jjy6i6vcg3b9chrkw7l2yza8kdxl8d4bdlrqp0anpaxwm1q34da"; + libraryHaskellDepends = [ base context exceptions ]; testHaskellDepends = [ async base context hspec ]; testToolDepends = [ hspec-discover ]; description = "Thread-safe, pool-compatible resource provider"; @@ -65385,8 +65524,8 @@ self: { }: mkDerivation { pname = "context-wai-middleware"; - version = "0.1.0.0"; - sha256 = "0bisqsngccddkamf60qyk4h9w4w80ppks51i4p9bl39kmf7hd65l"; + version = "0.2.0.0"; + sha256 = "017zwjq4kl3jjmrdp0x6zxbsd9k5xnvcgf4r1cjk7cnlch36cwmn"; libraryHaskellDepends = [ base context wai ]; testHaskellDepends = [ async base bytestring case-insensitive context hspec http-client @@ -66384,6 +66523,24 @@ self: { license = lib.licenses.mit; }) {}; + "core-data_0_3_2_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, core-text + , hashable, prettyprinter, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "core-data"; + version = "0.3.2.2"; + sha256 = "000ffh2lrv5yl9gybx3i8gp66f1vd1w6mhih8bipxf7fzgsn6pik"; + libraryHaskellDepends = [ + aeson base bytestring containers core-text hashable prettyprinter + scientific text unordered-containers vector + ]; + description = "Convenience wrappers around common data structures and encodings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-haskell" = callPackage ({ mkDerivation, base, haskeline, haskell-src-exts, hint }: mkDerivation { @@ -66422,6 +66579,28 @@ self: { license = lib.licenses.mit; }) {}; + "core-program_0_4_6_1" = callPackage + ({ mkDerivation, async, base, bytestring, chronologique, core-data + , core-text, directory, exceptions, filepath, fsnotify, hashable + , hourglass, mtl, prettyprinter, safe-exceptions, stm + , template-haskell, terminal-size, text, text-short, transformers + , typed-process, unix + }: + mkDerivation { + pname = "core-program"; + version = "0.4.6.1"; + sha256 = "0vjrffccnh7vl86mfm7i4rfwk9pzsg47g0gd4pg6fsdcs6118amq"; + libraryHaskellDepends = [ + async base bytestring chronologique core-data core-text directory + exceptions filepath fsnotify hashable hourglass mtl prettyprinter + safe-exceptions stm template-haskell terminal-size text text-short + transformers typed-process unix + ]; + description = "Opinionated Haskell Interoperability"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-telemetry" = callPackage ({ mkDerivation, async, base, bytestring, chronologique, core-data , core-program, core-text, exceptions, http-streams, io-streams @@ -66441,6 +66620,26 @@ self: { license = lib.licenses.mit; }) {}; + "core-telemetry_0_2_0_1" = callPackage + ({ mkDerivation, async, base, bytestring, chronologique, core-data + , core-program, core-text, exceptions, http-streams, io-streams + , mtl, network-info, random, safe-exceptions, scientific, stm + , template-haskell, text, unix + }: + mkDerivation { + pname = "core-telemetry"; + version = "0.2.0.1"; + sha256 = "1l302ncnv1w3p84v16acxvkyr6kvrr6385i7qdrmqi0a8yfwizb0"; + libraryHaskellDepends = [ + async base bytestring chronologique core-data core-program + core-text exceptions http-streams io-streams mtl network-info + random safe-exceptions scientific stm template-haskell text unix + ]; + description = "Advanced telemetry"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-text" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq , fingertree, hashable, prettyprinter, template-haskell, text @@ -66458,6 +66657,24 @@ self: { license = lib.licenses.mit; }) {}; + "core-text_0_3_7_1" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq + , fingertree, hashable, prettyprinter, template-haskell, text + , text-short + }: + mkDerivation { + pname = "core-text"; + version = "0.3.7.1"; + sha256 = "11l89p9fn05l8h7dx6mpw4mhwhcxhdl2879lj628bxjal3f2fys3"; + libraryHaskellDepends = [ + ansi-terminal base bytestring colour deepseq fingertree hashable + prettyprinter template-haskell text text-short + ]; + description = "A rope type based on a finger tree over UTF-8 fragments"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-warn" = callPackage ({ mkDerivation, base, containers, containers-good-graph, ghc, syb }: @@ -66497,8 +66714,8 @@ self: { }: mkDerivation { pname = "core-webserver-warp"; - version = "0.1.1.0"; - sha256 = "0yfd2037bq6vljixkhrk2v2mlywj2br16pf5dpz2vahjpk0079yj"; + version = "0.1.1.3"; + sha256 = "1yjy5y0lvwkjyribhqavcda57s30jc7xjacng2g3p256kfp7mc2r"; libraryHaskellDepends = [ async base bytestring core-data core-program core-telemetry core-text http-types http2 mtl safe-exceptions vault wai warp @@ -66763,6 +66980,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "countable_1_2" = callPackage + ({ mkDerivation, base, bytestring, silently, tasty, tasty-golden + , tasty-hunit + }: + mkDerivation { + pname = "countable"; + version = "1.2"; + sha256 = "119v5ms4nyxikfwlmz71qk9gqp53zkpyxc6wm3qp5bm9b6n1ff47"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring silently tasty tasty-golden tasty-hunit + ]; + description = "Countable, Searchable, Finite, Empty classes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "countable-inflections" = callPackage ({ mkDerivation, base, bytestring, exceptions, hspec, pcre-utils , QuickCheck, regex-pcre-builtin, text @@ -67221,8 +67455,8 @@ self: { }: mkDerivation { pname = "cql"; - version = "4.0.3"; - sha256 = "1b6bqhg3rf2kk7i81l4vsgyp7zxiycifdrsj8qa4sqx78m72dmxh"; + version = "4.0.4"; + sha256 = "04s947r9wsqamqx3sq0h41l0mwxcw7pqc11jlrj8r94wgiikpkh2"; libraryHaskellDepends = [ base bytestring cereal containers Decimal iproute network template-haskell text time transformers uuid vector @@ -69519,6 +69753,24 @@ self: { broken = true; }) {}; + "csv-sip" = callPackage + ({ mkDerivation, base, bytestring, conduit, containers, hspec, text + , transformers + }: + mkDerivation { + pname = "csv-sip"; + version = "0.1.0"; + sha256 = "1m33kw4rgzq7ivhr44giagp0b2xx0h9q0ipidll8xrrklvxzkcsc"; + libraryHaskellDepends = [ + base bytestring conduit containers text transformers + ]; + testHaskellDepends = [ + base bytestring conduit containers hspec text transformers + ]; + description = "extracts data from a CSV file"; + license = lib.licenses.gpl3Plus; + }) {}; + "csv-table" = callPackage ({ mkDerivation, base, containers, csv, filepath, process }: mkDerivation { @@ -76028,6 +76280,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "derivingvia-extras" = callPackage + ({ mkDerivation, base, hashable }: + mkDerivation { + pname = "derivingvia-extras"; + version = "0.1.0.0"; + sha256 = "11fsx8pbxqp968pgvms6qzw5x871r3c94m812nz81fpqkm6mv5cz"; + libraryHaskellDepends = [ base hashable ]; + description = "DerivingVia extras - Miscellaneous /via/ types"; + license = lib.licenses.bsd3; + }) {}; + "derp" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -77132,6 +77395,26 @@ self: { broken = true; }) {}; + "dhall-text-shell" = callPackage + ({ mkDerivation, base, containers, dhall, filepath + , optparse-applicative, process, text + }: + mkDerivation { + pname = "dhall-text-shell"; + version = "0.2.0.0"; + sha256 = "10i1i7fk9y5hsxjjb87jbfnprg7nkrvpax6kd4blfphpzs2mpz5b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers dhall filepath optparse-applicative process text + ]; + executableHaskellDepends = [ + base containers dhall filepath optparse-applicative process text + ]; + description = "Render dhall text with shell commands as function arguments"; + license = lib.licenses.mit; + }) {}; + "dhall-to-cabal" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, contravariant , dhall, Diff, directory, filepath, microlens, optparse-applicative @@ -77396,6 +77679,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "diagnose" = callPackage + ({ mkDerivation, base, data-default, hashable, prettyprinter + , prettyprinter-ansi-terminal, unordered-containers, wcwidth + }: + mkDerivation { + pname = "diagnose"; + version = "1.8.2"; + sha256 = "11hyd08aixx795mf79ybzkz59s68v59rdl6lkyjvzn06sh1fvvdc"; + libraryHaskellDepends = [ + base data-default hashable prettyprinter + prettyprinter-ansi-terminal unordered-containers wcwidth + ]; + testHaskellDepends = [ + base data-default hashable prettyprinter + prettyprinter-ansi-terminal unordered-containers wcwidth + ]; + description = "Beautiful error reporting done easily"; + license = lib.licenses.bsd3; + }) {}; + "diagrams" = callPackage ({ mkDerivation, diagrams-contrib, diagrams-core, diagrams-lib , diagrams-svg @@ -83602,8 +83905,8 @@ self: { }: mkDerivation { pname = "dunai"; - version = "0.8.1"; - sha256 = "1zijhrk50cyyrb6jqlf8q0hh87lbfy5k9iy6w2az66nm89ckxrv9"; + version = "0.8.2"; + sha256 = "1hcjzd6zki10lkh6f11naxqrnkdmiqm4hwyj5acj4naqkakc6mmp"; libraryHaskellDepends = [ base MonadRandom simple-affine-space transformers transformers-base ]; @@ -83633,8 +83936,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.8.1"; - sha256 = "1iy989wz4jnn9g892p7n0f1hj2hd61a01vxnqz5fr0yppbsckp3h"; + version = "0.8.2"; + sha256 = "0cicvzp604945mmlnrxwkkcyl01id933jrnnrv3y0c5xqlly2y9r"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -90357,6 +90660,23 @@ self: { license = lib.licenses.mit; }) {}; + "exact-pi_0_5_0_2" = callPackage + ({ mkDerivation, base, numtype-dk, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "exact-pi"; + version = "0.5.0.2"; + sha256 = "1xmc3vlzfccrn5szglnxx13akxw2xacgl40kqh0kiw82d58x47a4"; + libraryHaskellDepends = [ base numtype-dk ]; + testHaskellDepends = [ + base numtype-dk QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Exact rational multiples of pi (and integer powers of pi)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "exact-real" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, checkers, criterion , doctest, groups, integer-gmp, QuickCheck, random, tasty @@ -90431,6 +90751,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "exception-hierarchy_0_1_0_7" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "exception-hierarchy"; + version = "0.1.0.7"; + sha256 = "14kk0rync05rq2adx5lk59y56h97s0yv7mqfn2grhhwqb10maqj0"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Exception type hierarchy with TemplateHaskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "exception-mailer" = callPackage ({ mkDerivation, base, hslogger, mime-mail, text }: mkDerivation { @@ -91803,6 +92135,23 @@ self: { license = lib.licenses.mit; }) {}; + "extensioneer" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, hpack, mtl + , optparse-applicative, yaml + }: + mkDerivation { + pname = "extensioneer"; + version = "0.1.0.0"; + sha256 = "02n7ajra4vx63wjjj4dj54md87hk0cjz61bh6m3ql37h97iqsiqx"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base Cabal containers directory hpack mtl optparse-applicative yaml + ]; + description = "Inspect extensions in cabal and hpack files"; + license = lib.licenses.mit; + }) {}; + "extensions" = callPackage ({ mkDerivation, base, bytestring, Cabal, colourista, containers , directory, filepath, ghc-boot-th, hedgehog, hspec, hspec-hedgehog @@ -93145,8 +93494,8 @@ self: { }: mkDerivation { pname = "fb"; - version = "2.1.1"; - sha256 = "0j2rckrv1aksfp2wyiyffqg40jl927vs97fk2lyzkscz673jd9s9"; + version = "2.1.1.1"; + sha256 = "18hqmhfzniydmxwi8b21iz04pc6x8hdy8pj6960ihrk20ddkih3d"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit conduit-extra cryptonite data-default http-client http-conduit http-types memory @@ -93217,8 +93566,8 @@ self: { }: mkDerivation { pname = "fbrnch"; - version = "1.0.0"; - sha256 = "1j5whbx72q7jvjkv952y8qmgqkm19dprn6p1glvgsck8nhmffkkd"; + version = "1.1"; + sha256 = "11vhm176dm2i4zy7ipg20rsmp7rdabq8gh29byflqxm5s5wp86y6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -93313,16 +93662,20 @@ self: { }) {}; "fcf-containers" = callPackage - ({ mkDerivation, base, doctest, first-class-families, Glob }: + ({ mkDerivation, base, doctest, first-class-families, ghc-prim + , Glob, mtl + }: mkDerivation { pname = "fcf-containers"; - version = "0.6.0"; - sha256 = "09sr1xqdjzfk5gysd7hi66xadwcfrjq4q3vakmdilc14lw833wgp"; + version = "0.7.0"; + sha256 = "0ai2hmcva84z29jxr3inngnicx0wn05vnh9lw460fcfckdfxf5xf"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base first-class-families ]; + libraryHaskellDepends = [ base first-class-families ghc-prim mtl ]; executableHaskellDepends = [ base first-class-families ]; - testHaskellDepends = [ base doctest first-class-families Glob ]; + testHaskellDepends = [ + base doctest first-class-families ghc-prim Glob + ]; description = "Data structures and algorithms for first-class-families"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -103836,8 +104189,8 @@ self: { }: mkDerivation { pname = "genvalidity-aeson"; - version = "1.0.0.0"; - sha256 = "1k28vl7i2idv44962wspvhpqpfznj52ckd3g7h580894vghhwi89"; + version = "1.0.0.1"; + sha256 = "0j5sms6f3ivxn981gzqsyhks2q2fws8xdbnnffb209dr0afg00b1"; libraryHaskellDepends = [ aeson base genvalidity genvalidity-scientific genvalidity-text genvalidity-unordered-containers genvalidity-vector QuickCheck @@ -103854,6 +104207,31 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "genvalidity-appendful" = callPackage + ({ mkDerivation, appendful, base, containers, criterion + , genvalidity, genvalidity-containers, genvalidity-criterion + , genvalidity-hspec, genvalidity-hspec-aeson, genvalidity-time + , genvalidity-uuid, hspec, mtl, pretty-show, QuickCheck, random + , time, uuid + }: + mkDerivation { + pname = "genvalidity-appendful"; + version = "0.0.0.0"; + sha256 = "0sri0xdaqxpaapjspq4gipmvh7az3dilbzd4v5ihgcsjfk7kxmaj"; + libraryHaskellDepends = [ + appendful base containers genvalidity genvalidity-containers + genvalidity-time QuickCheck + ]; + testHaskellDepends = [ + appendful base containers genvalidity-hspec genvalidity-hspec-aeson + genvalidity-uuid hspec mtl pretty-show QuickCheck random time uuid + ]; + benchmarkHaskellDepends = [ + appendful base criterion genvalidity-criterion + ]; + license = lib.licenses.mit; + }) {}; + "genvalidity-bytestring" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, genvalidity , genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck @@ -103879,6 +104257,29 @@ self: { license = lib.licenses.mit; }) {}; + "genvalidity-case-insensitive" = callPackage + ({ mkDerivation, base, case-insensitive, criterion, genvalidity + , genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck + , validity-case-insensitive + }: + mkDerivation { + pname = "genvalidity-case-insensitive"; + version = "0.0.0.0"; + sha256 = "1lmg44ihas98h02121bv1wy59k0za65nsgb64nh0al5bs6m7vsrl"; + libraryHaskellDepends = [ + base case-insensitive genvalidity validity-case-insensitive + ]; + testHaskellDepends = [ + base case-insensitive genvalidity-hspec hspec + ]; + benchmarkHaskellDepends = [ + base case-insensitive criterion genvalidity genvalidity-criterion + QuickCheck + ]; + description = "GenValidity support for case-insensitive"; + license = lib.licenses.mit; + }) {}; + "genvalidity-containers" = callPackage ({ mkDerivation, base, containers, criterion, genvalidity , genvalidity-criterion, genvalidity-hspec, genvalidity-property @@ -105299,25 +105700,6 @@ self: { }) {}; "ghc-events" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers, text - , vector - }: - mkDerivation { - pname = "ghc-events"; - version = "0.17.0.2"; - sha256 = "0dkzxpfiqpd1i1lhrssp1b242111228ap113iavarr9hb7y8rl72"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers text vector - ]; - executableHaskellDepends = [ base containers ]; - testHaskellDepends = [ base ]; - description = "Library and tool for parsing .eventlog files from GHC"; - license = lib.licenses.bsd3; - }) {}; - - "ghc-events_0_17_0_3" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers, text , vector }: @@ -105334,7 +105716,6 @@ self: { testHaskellDepends = [ base ]; description = "Library and tool for parsing .eventlog files from GHC"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-events-analyze" = callPackage @@ -105442,6 +105823,18 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-gc-hook" = callPackage + ({ mkDerivation, base, clock }: + mkDerivation { + pname = "ghc-gc-hook"; + version = "0.2.0.0"; + sha256 = "0k7w7imrlg2gdcibkm6b02phk163xv4lnsab316jcfdid53zi7j2"; + libraryHaskellDepends = [ base clock ]; + testHaskellDepends = [ base clock ]; + description = "GHC garbage collection hook"; + license = lib.licenses.bsd3; + }) {}; + "ghc-gc-tune" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -105474,6 +105867,8 @@ self: { pname = "ghc-heap"; version = "9.2.1"; sha256 = "10d7p12p9v5z426rxx1cyhk90hx6ab6l98bk1v4a9gk551fcqsv9"; + revision = "1"; + editedCabalFile = "11kwkc96vk0jd7lpm0bz5x2ji4qc222wm2lc3y4lfx0knir2kyi6"; libraryHaskellDepends = [ base containers ghc-prim rts ]; description = "Functions for walking GHC's heap"; license = lib.licenses.bsd3; @@ -106716,15 +107111,16 @@ self: { ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, binary, bytestring, case-insensitive , containers, cryptohash-sha1, data-default, deepseq, dependent-map - , dependent-sum, Diff, directory, dlist, exceptions, extra - , filepath, fingertree, focus, fuzzy, ghc, ghc-boot, ghc-boot-th - , ghc-check, ghc-exactprint, ghc-paths, ghc-trace-events - , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable - , heapsize, hie-bios, hie-compat, hiedb, hls-graph, hls-plugin-api - , hp2pretty, hslogger, implicit-hie, implicit-hie-cradle, lens - , list-t, lsp, lsp-test, lsp-types, monoid-subclasses, mtl - , network-uri, opentelemetry, optparse-applicative, parallel - , prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck + , dependent-sum, Diff, directory, dlist, enummapset, exceptions + , extra, filepath, fingertree, focus, fuzzy, ghc, ghc-boot + , ghc-boot-th, ghc-check, ghc-exactprint, ghc-paths + , ghc-trace-events, ghc-typelits-knownnat, gitrev, Glob + , haddock-library, hashable, heapsize, hie-bios, hie-compat, hiedb + , hls-graph, hls-plugin-api, hp2pretty, hslogger, implicit-hie + , implicit-hie-cradle, lens, list-t, lsp, lsp-test, lsp-types + , monoid-subclasses, mtl, network-uri, opentelemetry + , optparse-applicative, parallel, prettyprinter + , prettyprinter-ansi-terminal, process, QuickCheck , quickcheck-instances, random, record-dot-preprocessor , record-hasfield, regex-tdfa, retrie, rope-utf16-splay, safe , safe-exceptions, shake, shake-bench, sorted-list, sqlite-simple @@ -106735,15 +107131,17 @@ self: { }: mkDerivation { pname = "ghcide"; - version = "1.6.0.1"; - sha256 = "14k1x54kk27yaaw8n0iq1kq1hl4j417bgbvdiy0a6zg6h7rdnwzw"; + version = "1.7.0.0"; + sha256 = "097vpp1gds36ijldz29bsk71pxc82l966ka578cxsrcdc3g3ll1b"; + revision = "1"; + editedCabalFile = "0xvszq1jad6126vg73qys8z9jys7b1gs75fsaa4kq5dnrfg8hpx3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty array async base base16-bytestring binary bytestring case-insensitive containers cryptohash-sha1 data-default - deepseq dependent-map dependent-sum Diff directory dlist exceptions - extra filepath fingertree focus fuzzy ghc ghc-boot ghc-boot-th + deepseq dependent-map dependent-sum Diff directory dlist enummapset + exceptions extra filepath fingertree focus ghc ghc-boot ghc-boot-th ghc-check ghc-exactprint ghc-paths ghc-trace-events Glob haddock-library hashable heapsize hie-bios hie-compat hiedb hls-graph hls-plugin-api hslogger implicit-hie-cradle lens list-t @@ -106763,13 +107161,14 @@ self: { ]; testHaskellDepends = [ aeson async base binary bytestring containers data-default - directory extra filepath ghc ghc-typelits-knownnat haddock-library - hls-graph hls-plugin-api lens list-t lsp lsp-test lsp-types - network-uri optparse-applicative process QuickCheck - quickcheck-instances random record-dot-preprocessor record-hasfield - regex-tdfa rope-utf16-splay safe safe-exceptions shake - sqlite-simple stm stm-containers tasty tasty-expected-failure - tasty-hunit tasty-quickcheck tasty-rerun text unordered-containers + directory extra filepath fuzzy ghc ghc-typelits-knownnat + haddock-library hls-graph hls-plugin-api lens list-t lsp lsp-test + lsp-types monoid-subclasses network-uri optparse-applicative + parallel process QuickCheck quickcheck-instances random + record-dot-preprocessor record-hasfield regex-tdfa rope-utf16-splay + safe safe-exceptions shake sqlite-simple stm stm-containers tasty + tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun + text unordered-containers vector ]; testToolDepends = [ implicit-hie ]; benchmarkHaskellDepends = [ @@ -109337,6 +109736,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "github_0_28" = callPackage + ({ mkDerivation, aeson, base, base-compat, base16-bytestring + , binary, binary-instances, bytestring, containers, cryptohash-sha1 + , deepseq, deepseq-generics, exceptions, file-embed, hashable + , hspec, hspec-discover, http-client, http-client-tls + , http-link-header, http-types, iso8601-time, mtl, network-uri + , tagged, text, time-compat, tls, transformers, transformers-compat + , unordered-containers, vector, vector-instances + }: + mkDerivation { + pname = "github"; + version = "0.28"; + sha256 = "142l0zff852606hkpvkhvagp6h3ziq2z2x7x2pa77q5ymyq48089"; + libraryHaskellDepends = [ + aeson base base-compat base16-bytestring binary binary-instances + bytestring containers cryptohash-sha1 deepseq deepseq-generics + exceptions hashable http-client http-client-tls http-link-header + http-types iso8601-time mtl network-uri tagged text time-compat tls + transformers transformers-compat unordered-containers vector + vector-instances + ]; + testHaskellDepends = [ + aeson base base-compat bytestring file-embed hspec tagged text + unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Access to the GitHub API, v3"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "github-backup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , exceptions, filepath, git, github, hslogger, IfElse, mtl, network @@ -114082,8 +114512,8 @@ self: { }: mkDerivation { pname = "gopro-plus"; - version = "0.6.5.0"; - sha256 = "09hj57r77r9mx2dy830n9qv3ap2nsg8a94gmpzf69zddqvk1fhm8"; + version = "0.6.5.1"; + sha256 = "06sasqagh4xa6gkhgjxf7jpvwfp9q27r0qnpr7rq0dxwsbrpqgnp"; libraryHaskellDepends = [ aeson base bytestring containers exceptions filepath generic-deriving generic-random lens lens-aeson monad-logger mtl @@ -114654,13 +115084,13 @@ self: { ({ mkDerivation, attoparsec, base, Cabal, cabal-doctest, checkers , containers, criterion, deepseq, doctest, input-parsers , markdown-unlit, monoid-subclasses, parsers, QuickCheck - , rank2classes, size-based, tasty, tasty-quickcheck, testing-feat - , text, transformers, witherable + , rank2classes, tasty, tasty-quickcheck, text, transformers + , witherable }: mkDerivation { pname = "grammatical-parsers"; - version = "0.5.2"; - sha256 = "1xnm5j0lznabscpswzvxjccwxb6c8js7jg3z1ddd60gffq69wpip"; + version = "0.6"; + sha256 = "1ck7zv110yrwz04q10j38wx6ipap88np9px6l94rxbha1m1k7nhi"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -114673,8 +115103,7 @@ self: { ]; testHaskellDepends = [ base checkers containers doctest monoid-subclasses parsers - QuickCheck rank2classes size-based tasty tasty-quickcheck - testing-feat witherable + QuickCheck rank2classes tasty tasty-quickcheck witherable ]; testToolDepends = [ markdown-unlit ]; benchmarkHaskellDepends = [ @@ -118492,6 +118921,37 @@ self: { broken = true; }) {}; + "hackage-cli" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , deepseq, directory, filepath, http-io-streams, io-streams + , microlens, microlens-mtl, microlens-th, mtl, netrc + , optparse-applicative, pretty, process-extras, semigroups + , stringsearch, tagsoup, tar, tasty, tasty-golden, text, time + , unordered-containers, zlib + }: + mkDerivation { + pname = "hackage-cli"; + version = "0.0.3.6"; + sha256 = "1wnh3571mgwyl9c5bfkwvr4rvsnw41qb9mlz1nda1ya53qfdjl4p"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers mtl pretty + ]; + executableHaskellDepends = [ + aeson base bytestring Cabal containers deepseq directory filepath + http-io-streams io-streams microlens microlens-mtl microlens-th mtl + netrc optparse-applicative process-extras semigroups stringsearch + tagsoup tar text time unordered-containers zlib + ]; + testHaskellDepends = [ + base bytestring Cabal filepath tasty tasty-golden + ]; + doHaddock = false; + description = "CLI tool for Hackage"; + license = lib.licenses.gpl3Plus; + }) {}; + "hackage-db" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, exceptions, filepath, tar, time, utf8-string @@ -121137,8 +121597,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.6.0"; - sha256 = "0sqldnhfp631vb3v69zm856zax89mgykvj4f9siisqn41qz097zx"; + version = "2.6.1"; + sha256 = "1kyh4l3c4xf6ykjmjvza44d0mf69wpwgi7v88g7lh3ag26m455w3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang @@ -121311,8 +121771,8 @@ self: { }: mkDerivation { pname = "happstack-foundation"; - version = "0.5.9.1"; - sha256 = "05fcvwa25x993ba8h034877di4y1m3yp5f5fvx4jxdybpf868jnn"; + version = "0.5.9.3"; + sha256 = "1qm6kk5p5j7gvr6ckjibls5pid3qqihv9csd50q5yb1vzdqv1pii"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state base happstack-hsp happstack-server hsp lifted-base @@ -121385,8 +121845,8 @@ self: { }: mkDerivation { pname = "happstack-hsp"; - version = "7.3.7.5"; - sha256 = "1krjas0id8an3ry83xrgxl9cb18n17r394ivz05c45mwan6sbpqf"; + version = "7.3.7.6"; + sha256 = "1y23yzppvxjhmvaq9yl02v8mp6ww91jpsvqfhpzxkw1jccz54bcq"; libraryHaskellDepends = [ base bytestring happstack-server harp hsp hsx2hs mtl syb text utf8-string @@ -121439,8 +121899,8 @@ self: { }: mkDerivation { pname = "happstack-jmacro"; - version = "7.0.12.3"; - sha256 = "1phhy9sq7hiz3c50k5wyclrsjqacw8mcdyg80h3xi43zgjmff23w"; + version = "7.0.12.4"; + sha256 = "1zqfivzwq6wfwfgds5icy5rs5vrxiw9w1wzxn5jlqn7zkz3svbl9"; libraryHaskellDepends = [ base base64-bytestring bytestring cereal digest happstack-server jmacro text utf8-string wl-pprint-text @@ -121454,8 +121914,8 @@ self: { ({ mkDerivation, base, bytestring, happstack-server, mtl, text }: mkDerivation { pname = "happstack-lite"; - version = "7.3.7"; - sha256 = "12vyyjl0n9dqp8mh5279930rnbwaxxlzw34651sa7h9gir9hv1zv"; + version = "7.3.8"; + sha256 = "0bvcgacsngpj92ldb2fd7yj67im0bn4jnd5a1ldpbk43w85f91pk"; libraryHaskellDepends = [ base bytestring happstack-server mtl text ]; @@ -121533,8 +121993,8 @@ self: { }: mkDerivation { pname = "happstack-server-tls"; - version = "7.2.1.1"; - sha256 = "0bply7dxz2046h0v0ydkicjvl491k0llapf2shxjqnskjjr5rqnk"; + version = "7.2.1.2"; + sha256 = "1qij3hx3y54s3vvcs7z656144cbp94aigy84ywfyp8238f4p5yq5"; libraryHaskellDepends = [ base bytestring extensible-exceptions happstack-server hslogger HsOpenSSL network sendfile time unix @@ -123742,51 +124202,52 @@ self: { , cryptohash-sha1, data-default, deepseq, directory, extra , filepath, ghc, ghc-boot-th, ghc-paths, ghcide, githash, gitrev , hashable, hie-bios, hiedb, hls-alternate-number-format-plugin - , hls-call-hierarchy-plugin, hls-class-plugin, hls-eval-plugin - , hls-explicit-imports-plugin, hls-floskell-plugin - , hls-fourmolu-plugin, hls-graph, hls-haddock-comments-plugin - , hls-hlint-plugin, hls-module-name-plugin, hls-ormolu-plugin - , hls-plugin-api, hls-pragmas-plugin - , hls-qualify-imported-names-plugin, hls-refine-imports-plugin - , hls-retrie-plugin, hls-selection-range-plugin, hls-splice-plugin - , hls-test-utils, hslogger, hspec-expectations, lens, lens-aeson - , lsp, lsp-test, lsp-types, mtl, optparse-applicative - , optparse-simple, process, regex-tdfa, safe-exceptions - , sqlite-simple, stm, temporary, text, transformers - , unordered-containers + , hls-call-hierarchy-plugin, hls-change-type-signature-plugin + , hls-class-plugin, hls-eval-plugin, hls-explicit-imports-plugin + , hls-floskell-plugin, hls-fourmolu-plugin, hls-graph + , hls-haddock-comments-plugin, hls-hlint-plugin + , hls-module-name-plugin, hls-ormolu-plugin, hls-plugin-api + , hls-pragmas-plugin, hls-qualify-imported-names-plugin + , hls-refine-imports-plugin, hls-rename-plugin, hls-retrie-plugin + , hls-selection-range-plugin, hls-splice-plugin, hls-test-utils + , hspec-expectations, lens, lens-aeson, lsp, lsp-test, lsp-types + , mtl, optparse-applicative, optparse-simple, prettyprinter + , process, regex-tdfa, safe-exceptions, sqlite-simple, stm + , temporary, text, transformers, unix, unordered-containers }: mkDerivation { pname = "haskell-language-server"; - version = "1.6.1.1"; - sha256 = "03z650zk7ma0gsmb7mirzarwg0535kwmwyf0h8a89s8bqfcd5mxf"; + version = "1.7.0.0"; + sha256 = "1p5dr5j7vl86a4ig6y6cxf7rk8lswxsdxq9029sydghnyl3kaf3f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson-pretty async base base16-bytestring bytestring containers cryptohash-sha1 data-default directory extra filepath ghc ghcide - githash hie-bios hiedb hls-graph hls-plugin-api hslogger lsp - optparse-applicative optparse-simple process safe-exceptions - sqlite-simple text unordered-containers + githash hie-bios hiedb hls-graph hls-plugin-api lsp + optparse-applicative optparse-simple prettyprinter process + safe-exceptions sqlite-simple text unordered-containers ]; executableHaskellDepends = [ aeson async base base16-bytestring binary bytestring containers cryptohash-sha1 data-default deepseq directory extra filepath ghc ghc-boot-th ghc-paths ghcide gitrev hashable hie-bios hiedb hls-alternate-number-format-plugin hls-call-hierarchy-plugin - hls-class-plugin hls-eval-plugin hls-explicit-imports-plugin - hls-floskell-plugin hls-fourmolu-plugin hls-graph - hls-haddock-comments-plugin hls-hlint-plugin hls-module-name-plugin - hls-ormolu-plugin hls-plugin-api hls-pragmas-plugin - hls-qualify-imported-names-plugin hls-refine-imports-plugin - hls-retrie-plugin hls-selection-range-plugin hls-splice-plugin - hslogger lens lsp mtl optparse-applicative optparse-simple process + hls-change-type-signature-plugin hls-class-plugin hls-eval-plugin + hls-explicit-imports-plugin hls-floskell-plugin hls-fourmolu-plugin + hls-graph hls-haddock-comments-plugin hls-hlint-plugin + hls-module-name-plugin hls-ormolu-plugin hls-plugin-api + hls-pragmas-plugin hls-qualify-imported-names-plugin + hls-refine-imports-plugin hls-rename-plugin hls-retrie-plugin + hls-selection-range-plugin hls-splice-plugin lens lsp mtl + optparse-applicative optparse-simple prettyprinter process regex-tdfa safe-exceptions sqlite-simple stm temporary text - transformers unordered-containers + transformers unix unordered-containers ]; testHaskellDepends = [ aeson base bytestring containers data-default directory extra filepath ghcide hls-plugin-api hls-test-utils hspec-expectations - lens lens-aeson lsp-test lsp-types process text + lens lens-aeson lsp-test lsp-types prettyprinter process text unordered-containers ]; testToolDepends = [ ghcide ]; @@ -127414,8 +127875,8 @@ self: { }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.11"; - sha256 = "1dkx0r874qzn2kb8wimr1n75vmx70jx5ddi8088dlw5cxhj2v950"; + version = "0.4.0.12"; + sha256 = "0fcfm2d66f7hzzc9s73dd9dxcjsrr33c1q0v04j3zqm159kk69jd"; libraryHaskellDepends = [ base bytestring containers contravariant foldl hasql postgresql-syntax template-haskell template-haskell-compat-v0208 @@ -127425,15 +127886,15 @@ self: { license = lib.licenses.mit; }) {}; - "hasql-th_0_4_0_12" = callPackage + "hasql-th_0_4_0_14" = 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.12"; - sha256 = "0fcfm2d66f7hzzc9s73dd9dxcjsrr33c1q0v04j3zqm159kk69jd"; + version = "0.4.0.14"; + sha256 = "0zskfsvxzilz6j3cd09hl6ixn3j9daksqjcb73pfm1f9hhrasa2a"; libraryHaskellDepends = [ base bytestring containers contravariant foldl hasql postgresql-syntax template-haskell template-haskell-compat-v0208 @@ -127484,8 +127945,8 @@ self: { }: mkDerivation { pname = "hasql-url"; - version = "0.1.0.0"; - sha256 = "12zsw4jag27g0bgxm9sp45bs2i7p5h42zs5avj01zlddpyhla0wx"; + version = "0.2.0.0"; + sha256 = "1f8vc7s031f33rkbzlmqac3h1g6aynj9z03x4lx19526q2d2r7ns"; libraryHaskellDepends = [ base bytestring hasql network-uri split ]; @@ -130362,26 +130823,27 @@ self: { }) {}; "helic" = callPackage - ({ mkDerivation, aeson, base, chronos, containers, exon, gi-gdk - , gi-glib, gi-gtk, hostname, http-client, http-client-tls, incipit - , optparse-applicative, path, path-io, polysemy, polysemy-chronos - , polysemy-conc, polysemy-http, polysemy-log, polysemy-plugin - , polysemy-process, polysemy-test, polysemy-time, servant - , servant-client, servant-client-core, servant-server, table-layout - , tasty, template-haskell, terminal-size, torsor, transformers - , typed-process, unix, wai-extra, warp, yaml + ({ mkDerivation, aeson, base, chronos, containers, exon + , fast-logger, gi-gdk, gi-glib, gi-gtk, hostname, http-client + , http-client-tls, incipit, optparse-applicative, path, path-io + , polysemy, polysemy-chronos, polysemy-conc, polysemy-http + , polysemy-log, polysemy-plugin, polysemy-process, polysemy-test + , polysemy-time, servant, servant-client, servant-client-core + , servant-server, table-layout, tasty, template-haskell + , terminal-size, torsor, transformers, typed-process, unix + , wai-extra, warp, yaml }: mkDerivation { pname = "helic"; - version = "0.5.1.0"; - sha256 = "1gglcac10abszarmrgggrirf51jj0qcbp7gdqh93kghx1pqv4ldg"; + version = "0.5.2.0"; + sha256 = "0yklds711iya00fmp9l1kdyipdm8mrfssabqf8g7f55p1nnmn91g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base chronos exon gi-gdk gi-glib gi-gtk hostname http-client - http-client-tls incipit optparse-applicative path path-io polysemy - polysemy-chronos polysemy-conc polysemy-http polysemy-log - polysemy-plugin polysemy-process polysemy-time servant + aeson base chronos exon fast-logger gi-gdk gi-glib gi-gtk hostname + http-client http-client-tls incipit optparse-applicative path + path-io polysemy polysemy-chronos polysemy-conc polysemy-http + polysemy-log polysemy-plugin polysemy-process polysemy-time servant servant-client servant-client-core servant-server table-layout template-haskell terminal-size transformers typed-process unix wai-extra warp yaml @@ -132972,6 +133434,8 @@ self: { pname = "hiedb"; version = "0.4.1.0"; sha256 = "1389qmlga5rq8has02rn35pzag5wnfpx3w77r60mzl3b4pkpzi7i"; + revision = "1"; + editedCabalFile = "1ayy7xjbwfbdln1bqk9lpv2afc8kbzxyz9858gfafdd08kx0xmw1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135287,6 +135751,33 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; + "hlint_3_4" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs + , containers, cpphs, data-default, directory, extra, file-embed + , filepath, filepattern, ghc-lib-parser, ghc-lib-parser-ex + , hscolour, process, refact, text, transformers, uniplate + , unordered-containers, utf8-string, vector, yaml + }: + mkDerivation { + pname = "hlint"; + version = "3.4"; + sha256 = "15cfvch0yrzkl7qr87966amdsy05a7axvjc6wmw99ys9d5fn3z3n"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring cmdargs containers cpphs + data-default directory extra file-embed filepath filepattern + ghc-lib-parser ghc-lib-parser-ex hscolour process refact text + transformers uniplate unordered-containers utf8-string vector yaml + ]; + executableHaskellDepends = [ base ]; + description = "Source code suggestions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; + }) {}; + "hlint-test" = callPackage ({ mkDerivation, base, hlint }: mkDerivation { @@ -135425,8 +135916,8 @@ self: { }: mkDerivation { pname = "hls-alternate-number-format-plugin"; - version = "1.0.1.0"; - sha256 = "1xr4rizv1k6dx32mnny55s33cngmvy0a52sswpk17fl4zx3bd0pp"; + version = "1.1.0.0"; + sha256 = "1s81p2jnln8v8ny13cf26d9925lfcyhs5di5xbh3p9645ngdiy9h"; libraryHaskellDepends = [ aeson base containers ghc-boot-th ghcide hie-compat hls-graph hls-plugin-api lens lsp mtl regex-tdfa syb text @@ -135447,8 +135938,8 @@ self: { }: mkDerivation { pname = "hls-brittany-plugin"; - version = "1.0.2.0"; - sha256 = "0vxlhggmbrfmf81qgpxmrpsflmi32hafhy21dxain1as5hrnxw8g"; + version = "1.0.2.1"; + sha256 = "0f86iymcinbad9cpghi7965xhv4ky6kq4jqsn7nndq2jklwgrw7i"; libraryHaskellDepends = [ base brittany czipwith extra filepath ghc-boot-th ghc-exactprint ghcide hls-plugin-api lens lsp-types text transformers @@ -135465,8 +135956,8 @@ self: { }: mkDerivation { pname = "hls-call-hierarchy-plugin"; - version = "1.0.2.0"; - sha256 = "0772kxdp6ww91a1b0c8lfxjlpvwr8smcf8ayvaxazw76hisxrrj5"; + version = "1.0.3.0"; + sha256 = "0yfl75d2ddkzrz3p1pn8spra0qssqazsqklan46zmagrv69yg5iv"; libraryHaskellDepends = [ aeson base bytestring containers extra ghc ghcide hiedb hls-plugin-api lens lsp sqlite-simple text unordered-containers @@ -135479,6 +135970,26 @@ self: { license = lib.licenses.asl20; }) {}; + "hls-change-type-signature-plugin" = callPackage + ({ mkDerivation, base, filepath, ghcide, hls-plugin-api + , hls-test-utils, lsp, lsp-types, QuickCheck, regex-tdfa, syb, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "hls-change-type-signature-plugin"; + version = "1.0.1.0"; + sha256 = "0wl4vgml491gkvzmsfj3nlwx18ywvrdwgwdkqjp0rwid0pidd6z8"; + libraryHaskellDepends = [ + base ghcide hls-plugin-api lsp-types regex-tdfa syb text + transformers unordered-containers + ]; + testHaskellDepends = [ + base filepath hls-test-utils lsp QuickCheck regex-tdfa text + ]; + description = "Change a declarations type signature with a Code Action"; + license = lib.licenses.asl20; + }) {}; + "hls-class-plugin" = callPackage ({ mkDerivation, aeson, base, containers, filepath, ghc , ghc-exactprint, ghcide, hls-plugin-api, hls-test-utils, lens, lsp @@ -135486,10 +135997,8 @@ self: { }: mkDerivation { pname = "hls-class-plugin"; - version = "1.0.2.0"; - sha256 = "0drpxrazhwd228skgky7xdzcf22gi1pi2lby0dj0nzpzhrdl0pw0"; - revision = "1"; - editedCabalFile = "18x8k0gwpxv0vs4d8rbl5p0pjf75apb142i0p8vssbpvjwiwx33i"; + version = "1.0.3.0"; + sha256 = "0ad7ypw7d8waz3nq9p6m8l91rcibd2fzxxmdrpncwshiyrhazq3l"; libraryHaskellDepends = [ aeson base containers ghc ghc-exactprint ghcide hls-plugin-api lens lsp text transformers @@ -135507,23 +136016,22 @@ self: { , ghc-paths, ghcide, hashable, hls-graph, hls-plugin-api , hls-test-utils, lens, lsp, lsp-types, megaparsec, mtl , parser-combinators, pretty-simple, QuickCheck, safe-exceptions - , temporary, text, time, transformers, unliftio - , unordered-containers + , text, time, transformers, unliftio, unordered-containers }: mkDerivation { pname = "hls-eval-plugin"; - version = "1.2.1.0"; - sha256 = "18xjq664b8aj199gd1sswa7gndwikch77v3p1c36yshfa0rviwi8"; + version = "1.2.2.0"; + sha256 = "17si94yzxz19hcddn57wf0npxc9m9vzb08b2gph7pkbxprsksb6g"; libraryHaskellDepends = [ aeson base containers data-default deepseq Diff directory dlist extra filepath ghc ghc-boot-th ghc-paths ghcide hashable hls-graph hls-plugin-api lens lsp lsp-types megaparsec mtl parser-combinators - pretty-simple QuickCheck safe-exceptions temporary text time - transformers unliftio unordered-containers + pretty-simple QuickCheck safe-exceptions text time transformers + unliftio unordered-containers ]; testHaskellDepends = [ - aeson base directory extra filepath hls-test-utils lens lsp-types - text + aeson base containers directory extra filepath hls-plugin-api + hls-test-utils lens lsp-types text ]; description = "Eval plugin for Haskell Language Server"; license = lib.licenses.asl20; @@ -135555,8 +136063,8 @@ self: { }: mkDerivation { pname = "hls-explicit-imports-plugin"; - version = "1.0.2.0"; - sha256 = "04v6sgzsjqk4qj586qzvfvq405z0zpc08xljxb12glmqghvi5xjg"; + version = "1.1.0.0"; + sha256 = "1r5cy59xk35d6smnrka42hxfa012h45nvsmlr1a1kbyac8ywzf6m"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide hls-graph hls-plugin-api lsp text unordered-containers @@ -135572,8 +136080,8 @@ self: { }: mkDerivation { pname = "hls-floskell-plugin"; - version = "1.0.1.0"; - sha256 = "1slzv2c5lzxprh8yhfk8iabmmlhh3sx97m393nrnwrjcbpzq0vai"; + version = "1.0.1.1"; + sha256 = "01c8xwfdgx5g5ipb366q0smjisyq1dfjz7scjfg5p3lyn0v555wb"; libraryHaskellDepends = [ base floskell ghcide hls-plugin-api lsp-types text transformers ]; @@ -135583,18 +136091,23 @@ self: { }) {}; "hls-fourmolu-plugin" = callPackage - ({ mkDerivation, base, filepath, fourmolu, ghc, ghc-boot-th, ghcide - , hls-plugin-api, hls-test-utils, lens, lsp, lsp-test, text + ({ mkDerivation, aeson, base, containers, filepath, fourmolu, ghc + , ghc-boot-th, ghcide, hls-plugin-api, hls-test-utils, lens, lsp + , lsp-test, process-extras, text }: mkDerivation { pname = "hls-fourmolu-plugin"; - version = "1.0.2.0"; - sha256 = "0n9yk539wc046i6sx68gsbrc4jfmp1nsm2nir00q4sdcf7flcvff"; + version = "1.0.3.0"; + sha256 = "103rndxbmv72ghbh685766498j9rqnmgdwsrswk5nrf7afwd9x8w"; libraryHaskellDepends = [ base filepath fourmolu ghc ghc-boot-th ghcide hls-plugin-api lens - lsp text + lsp process-extras text ]; - testHaskellDepends = [ base filepath hls-test-utils lsp-test ]; + testHaskellDepends = [ + aeson base containers filepath hls-plugin-api hls-test-utils + lsp-test + ]; + testToolDepends = [ fourmolu ]; description = "Integration with the Fourmolu code formatter"; license = lib.licenses.asl20; }) {}; @@ -135602,19 +136115,25 @@ self: { "hls-graph" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , deepseq, directory, exceptions, extra, filepath, focus, hashable - , js-dgtable, js-flot, js-jquery, list-t, primitive, stm - , stm-containers, time, transformers, unordered-containers + , hspec, hspec-discover, js-dgtable, js-flot, js-jquery, list-t + , primitive, stm, stm-containers, tasty, tasty-hspec, tasty-hunit + , tasty-rerun, text, time, transformers, unordered-containers }: mkDerivation { pname = "hls-graph"; - version = "1.6.0.0"; - sha256 = "0raz4gkfhxzbmg5rf65yp5p0i3mpd0rlraz90gwbvf5l1z9jlqml"; + version = "1.7.0.0"; + sha256 = "1mq1pvn5z8fnlsj9iqck05shm8fak9zf05mbcbrxb5jvq0a31ypd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson async base bytestring containers deepseq directory exceptions extra filepath focus hashable js-dgtable js-flot js-jquery list-t primitive stm stm-containers time transformers unordered-containers ]; + testHaskellDepends = [ + base containers directory extra filepath hspec stm stm-containers + tasty tasty-hspec tasty-hunit tasty-rerun text + ]; + testToolDepends = [ hspec-discover ]; description = "Haskell Language Server internal graph API"; license = lib.licenses.asl20; }) {}; @@ -135628,6 +136147,8 @@ self: { pname = "hls-haddock-comments-plugin"; version = "1.0.1.0"; sha256 = "1jlz6vg5ff2j2vba4yg8nymxfs7vmg5h3kzjhsj6bs2jn8kh722r"; + revision = "1"; + editedCabalFile = "004pi0hl1mf5njvadc45bkgahi97xdpf6pfafq1np5059ccyfd8d"; libraryHaskellDepends = [ base containers ghc ghc-exactprint ghcide hls-plugin-api lsp-types text unordered-containers @@ -135642,18 +136163,18 @@ self: { , containers, data-default, deepseq, Diff, directory, extra , filepath, ghc, ghc-exactprint, ghc-lib-parser-ex, ghcide , hashable, hlint, hls-plugin-api, hls-test-utils, hslogger, lens - , lsp, lsp-types, regex-tdfa, stm, temporary, text, transformers - , unordered-containers + , lsp, lsp-types, refact, regex-tdfa, stm, temporary, text + , transformers, unordered-containers }: mkDerivation { pname = "hls-hlint-plugin"; - version = "1.0.3.0"; - sha256 = "0vzgsh6x8bjgi3l6nc9kfgbczxnd7fws5bmglac5khr0z042babb"; + version = "1.0.4.0"; + sha256 = "089pa1fg4ygc39a70g6x1ma1fci6jrkypg7hsmq4gf3h2rwiyvwy"; libraryHaskellDepends = [ aeson apply-refact base binary bytestring containers data-default deepseq Diff directory extra filepath ghc ghc-exactprint ghc-lib-parser-ex ghcide hashable hlint hls-plugin-api hslogger - lens lsp regex-tdfa stm temporary text transformers + lens lsp refact regex-tdfa stm temporary text transformers unordered-containers ]; testHaskellDepends = [ @@ -135671,8 +136192,8 @@ self: { }: mkDerivation { pname = "hls-module-name-plugin"; - version = "1.0.1.0"; - sha256 = "108p9j01d2s14akbwgwmpwb2a5r5d14vqzy6lw8n5cymgfdlza4a"; + version = "1.0.2.0"; + sha256 = "09548l8vmfq2y83agsr12w0x82drhmwa4bxpwby0mf466f4hj8da"; libraryHaskellDepends = [ aeson base directory filepath ghcide hls-plugin-api lsp text transformers unordered-containers @@ -135689,8 +136210,8 @@ self: { }: mkDerivation { pname = "hls-ormolu-plugin"; - version = "1.0.2.0"; - sha256 = "1jbh16z4yzl3lx9q7pcrkfrmip6rifif3rirfn7dvyj1q7cf1fk4"; + version = "1.0.2.1"; + sha256 = "1if4gahvdayx1ar4wxi4mk074zxpx6wzkwdd64fnri4k5xb15sa7"; libraryHaskellDepends = [ base filepath ghc ghc-boot-th ghcide hls-plugin-api lens lsp ormolu text @@ -135703,18 +136224,17 @@ self: { "hls-plugin-api" = callPackage ({ mkDerivation, aeson, base, containers, data-default , dependent-map, dependent-sum, Diff, dlist, extra, ghc, hashable - , hls-graph, hslogger, lens, lens-aeson, lsp, lsp-types - , opentelemetry, optparse-applicative, process, regex-tdfa, tasty - , tasty-hunit, tasty-rerun, text, transformers, unix - , unordered-containers + , hls-graph, lens, lens-aeson, lsp, lsp-types, opentelemetry + , optparse-applicative, process, regex-tdfa, tasty, tasty-hunit + , tasty-rerun, text, transformers, unix, unordered-containers }: mkDerivation { pname = "hls-plugin-api"; - version = "1.3.0.0"; - sha256 = "0dkpamqgw2icx6zns79cpzsnsr33qg0i3ix66hvcl5fhhp363g9m"; + version = "1.4.0.0"; + sha256 = "0yk2y6qw88vhww8z10d2kgn57wsarfnp6z1gmjl1ik2w96a8g3mv"; libraryHaskellDepends = [ aeson base containers data-default dependent-map dependent-sum Diff - dlist extra ghc hashable hls-graph hslogger lens lens-aeson lsp + dlist extra ghc hashable hls-graph lens lens-aeson lsp opentelemetry optparse-applicative process regex-tdfa text transformers unix unordered-containers ]; @@ -135732,8 +136252,8 @@ self: { }: mkDerivation { pname = "hls-pragmas-plugin"; - version = "1.0.2.0"; - sha256 = "0bmifvjhcvwhivnx6s971nidjdb2ichphp70pahx72ai24ffqqx9"; + version = "1.0.2.1"; + sha256 = "11l79214wz21v7plqf2wb6ac8bgw74fhql1p5cvkv8gr80hpb4jk"; libraryHaskellDepends = [ base containers extra fuzzy ghc ghcide hls-plugin-api lens lsp text transformers unordered-containers @@ -135754,6 +136274,8 @@ self: { pname = "hls-qualify-imported-names-plugin"; version = "1.0.1.0"; sha256 = "0h456cq3qvksrkzfzpq2qsabsl3vpg4gh2mwyxc39xh4qm7ifban"; + revision = "1"; + editedCabalFile = "0pb9fgpbv24726n250rkb33gx3f3xcaxmv1qqh12q4sz181qn4mb"; libraryHaskellDepends = [ aeson base containers deepseq dlist ghc ghcide hls-graph hls-plugin-api lsp text transformers unordered-containers @@ -135770,8 +136292,8 @@ self: { }: mkDerivation { pname = "hls-refine-imports-plugin"; - version = "1.0.1.0"; - sha256 = "10q5yjpny5aah245ivazqn2h05ak428qc9arpzlg5ks2n4n293lf"; + version = "1.0.2.0"; + sha256 = "01hgz66dm6rpk7fp6b2byzvnaan3snvimkicl67c6qxla9dpxcjn"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide hls-explicit-imports-plugin hls-graph hls-plugin-api lsp text @@ -135783,19 +136305,23 @@ self: { }) {}; "hls-rename-plugin" = callPackage - ({ mkDerivation, base, containers, extra, filepath, ghc - , ghc-exactprint, ghcide, hiedb, hls-plugin-api, hls-test-utils - , lsp, lsp-types, syb, text, transformers + ({ mkDerivation, aeson, base, containers, extra, filepath, ghc + , ghc-exactprint, ghcide, hashable, hiedb, hls-plugin-api + , hls-test-utils, lsp, lsp-types, mod, syb, text, transformers + , unordered-containers }: mkDerivation { pname = "hls-rename-plugin"; - version = "1.0.0.1"; - sha256 = "04l2w3x60ayxa9a6cdmscrfvyx9fsnbl4q05m8f0s1s18zlgjf86"; + version = "1.0.0.2"; + sha256 = "1cqcyyh4ywxwl2wppdacp2y6hpbl5534vq8xw2ih489qczcg6s78"; libraryHaskellDepends = [ - base containers extra ghc ghc-exactprint ghcide hiedb - hls-plugin-api lsp lsp-types syb text transformers + base containers extra ghc ghc-exactprint ghcide hashable hiedb + hls-plugin-api lsp lsp-types mod syb text transformers + unordered-containers + ]; + testHaskellDepends = [ + aeson base containers filepath hls-plugin-api hls-test-utils ]; - testHaskellDepends = [ base filepath hls-test-utils ]; description = "Rename plugin for Haskell Language Server"; license = lib.licenses.asl20; }) {}; @@ -135808,8 +136334,8 @@ self: { }: mkDerivation { pname = "hls-retrie-plugin"; - version = "1.0.2.0"; - sha256 = "0w41di7rqy8xrcaavzlfhai73yw0whmnyqxhyfjwx93y1sy1l6zg"; + version = "1.0.2.1"; + sha256 = "1vl7kdw8sm9r5q35lnihq0r98wd2s3mm76c7wp0cwd55qdkaf7qv"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory extra ghc ghcide hashable hls-plugin-api lsp lsp-types retrie safe-exceptions stm @@ -135828,6 +136354,8 @@ self: { pname = "hls-selection-range-plugin"; version = "1.0.0.0"; sha256 = "1pfgxz7nyqr8gaxxv7nc0d4rpfc4rbgdkafy1fpgcsbkqx9llkn0"; + revision = "1"; + editedCabalFile = "1njq2p1z9z5gy0fxgbp81q4syqw3hx1b5151g93qhhla9d0cr7nv"; libraryHaskellDepends = [ aeson base containers extra ghcide hls-plugin-api lsp mtl semigroupoids text transformers @@ -135850,6 +136378,8 @@ self: { pname = "hls-splice-plugin"; version = "1.0.1.0"; sha256 = "07v4rgss140vfc4xqibccimm48ys4awz7yficr0wf440p6i83qdc"; + revision = "1"; + editedCabalFile = "15hr2vc1r4zxf4z26byax95cdqhl1733fna16lifrdj15xkwxs3r"; libraryHaskellDepends = [ aeson base containers dlist extra foldl ghc ghc-exactprint ghcide hls-plugin-api lens lsp retrie syb text transformers unliftio-core @@ -135867,8 +136397,8 @@ self: { }: mkDerivation { pname = "hls-stylish-haskell-plugin"; - version = "1.0.1.0"; - sha256 = "1f9g113xrb167cpdjifd2zp8ps1w2apvkghdiagc9rzw1fl0l7l4"; + version = "1.0.1.1"; + sha256 = "1k9bv31226zgy5aqxzzj7npph2ff0r5bx692q5n26lpil2ivq6sn"; libraryHaskellDepends = [ base directory filepath ghc ghc-boot-th ghcide hls-plugin-api lsp-types stylish-haskell text @@ -135890,8 +136420,8 @@ self: { }: mkDerivation { pname = "hls-tactics-plugin"; - version = "1.6.1.0"; - sha256 = "15ynxlafrs0hss5qcn4aj8iip8iy631hfgqql0irqskvf3x5yxlx"; + version = "1.6.2.0"; + sha256 = "07qh9sz3rbqflfryxaj7y8vjmv388jdsmaxvz5z0xfq895yk968p"; libraryHaskellDepends = [ aeson base containers deepseq directory extra filepath fingertree generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide @@ -135912,20 +136442,19 @@ self: { "hls-test-utils" = callPackage ({ mkDerivation, aeson, async, base, blaze-markup, bytestring , containers, data-default, directory, extra, filepath, ghcide - , hls-graph, hls-plugin-api, hspec, hspec-core, lens, lsp, lsp-test - , lsp-types, tasty, tasty-expected-failure, tasty-golden - , tasty-hunit, tasty-rerun, temporary, text, unordered-containers + , hls-graph, hls-plugin-api, lens, lsp, lsp-test, lsp-types, tasty + , tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun + , temporary, text, unordered-containers }: mkDerivation { pname = "hls-test-utils"; - version = "1.2.0.0"; - sha256 = "1y3g101n7z78f5shfqfklg5zgl8gpkic0dwvpr5072dq1vvpfdvf"; + version = "1.3.0.0"; + sha256 = "1qm3lna4jy658bmbr6gpjq2gmcz03rdz535gilxycbjkxl2z3hkq"; libraryHaskellDepends = [ aeson async base blaze-markup bytestring containers data-default - directory extra filepath ghcide hls-graph hls-plugin-api hspec - hspec-core lens lsp lsp-test lsp-types tasty tasty-expected-failure - tasty-golden tasty-hunit tasty-rerun temporary text - unordered-containers + directory extra filepath ghcide hls-graph hls-plugin-api lens lsp + lsp-test lsp-types tasty tasty-expected-failure tasty-golden + tasty-hunit tasty-rerun temporary text unordered-containers ]; description = "Utilities used in the tests of Haskell Language Server"; license = lib.licenses.asl20; @@ -138743,6 +139272,45 @@ self: { license = lib.licenses.mit; }) {}; + "hpack_0_35_0" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, cryptonite, deepseq, directory, filepath, Glob, hspec + , hspec-discover, http-client, http-client-tls, http-types, HUnit + , infer-license, interpolate, mockery, pretty, QuickCheck + , scientific, template-haskell, temporary, text, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.35.0"; + sha256 = "1cii4bdn4rm2l3yw9vsv4ygn61zmalaa282iqg9rihys90nvrgf6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob hspec http-client http-client-tls + http-types HUnit infer-license interpolate mockery pretty + QuickCheck scientific template-haskell temporary text transformers + unordered-containers vector yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A modern format for Haskell packages"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hpack-convert" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, containers, deepseq, directory, filepath, Glob, hspec @@ -138806,7 +139374,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "hpack-dhall_0_5_5" = callPackage + "hpack-dhall_0_5_7" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal , dhall, dhall-json, Diff, directory, filepath, hpack, megaparsec , microlens, optparse-applicative, prettyprinter, tasty @@ -138814,8 +139382,8 @@ self: { }: mkDerivation { pname = "hpack-dhall"; - version = "0.5.5"; - sha256 = "1256vqqncgir0ir7i0vnvr7v5jkyx5ggng8gyi4qsqs8lmqn11r3"; + version = "0.5.7"; + sha256 = "1hwq3painl4ix7pldkzi5a8zakh9f67kcyabfbdky8b49dc5703r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140417,8 +140985,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-api"; - version = "0.0.3.3"; - sha256 = "0hrlz77p5w57ax4jml5c415qb1bfh8zi357xvnb0bin7g5a00fn8"; + version = "0.0.3.4"; + sha256 = "0qg5kaybxax632nbj6qjrn02j1c954kpw5xv3yqsysdqqcqxw6bg"; libraryHaskellDepends = [ async attoparsec base binary bytestring charset clock containers ghc-prim hashable http-types memory mtl template-haskell text @@ -140560,8 +141128,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-instrumentation-wai"; - version = "0.0.1.2"; - sha256 = "1yxy49cacldbic67ic35ym48zd0c1cwx1cjh6l0fxn26yvjp1i68"; + version = "0.0.1.3"; + sha256 = "1dczyw9w9pahrrj0q2qcnkx7kc46k7gqrrpbspdc0rc09idk33jx"; libraryHaskellDepends = [ base bytestring hs-opentelemetry-api http-types iproute network text vault wai @@ -145507,8 +146075,8 @@ self: { ({ mkDerivation, base, hsp, jmacro, mtl, text, wl-pprint-text }: mkDerivation { pname = "hsx-jmacro"; - version = "7.3.8.1"; - sha256 = "0ndgy5vf5rwgwqya75ny5vbr7hfqwjrdgfgpwf5410bk0603v47i"; + version = "7.3.8.2"; + sha256 = "0zb6mjky88qn918vaqbwjszjb6zczb4kqpnw3p222z44if3xpzsq"; libraryHaskellDepends = [ base hsp jmacro mtl text wl-pprint-text ]; @@ -150684,24 +151252,6 @@ self: { }) {}; "hyperloglog" = callPackage - ({ mkDerivation, approximate, base, binary, bits, bytes, cereal - , cereal-vector, comonad, deepseq, distributive, hashable, lens - , reflection, semigroupoids, semigroups, siphash, tagged, vector - }: - mkDerivation { - pname = "hyperloglog"; - version = "0.4.5"; - sha256 = "0v2zw0p104gbydj6hp2cxa2s4b85pq4srcspr582aqj38bs7spfz"; - libraryHaskellDepends = [ - approximate base binary bits bytes cereal cereal-vector comonad - deepseq distributive hashable lens reflection semigroupoids - semigroups siphash tagged vector - ]; - description = "An approximate streaming (constant space) unique object counter"; - license = lib.licenses.bsd3; - }) {}; - - "hyperloglog_0_4_6" = callPackage ({ mkDerivation, approximate, base, binary, bits, bytes, bytestring , cereal, cereal-vector, comonad, cpu, deepseq, distributive , hashable, lens, reflection, semigroupoids, semigroups, tagged @@ -150718,7 +151268,6 @@ self: { ]; description = "An approximate streaming (constant space) unique object counter"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hyperloglogplus" = callPackage @@ -152813,8 +153362,8 @@ self: { }: mkDerivation { pname = "implicit-hie"; - version = "0.1.2.6"; - sha256 = "1j2q1mqxfgcb8r6388xanmp5i1sdh6w52s08nd94g5lpg93mjz2q"; + version = "0.1.2.7"; + sha256 = "0yb457n26455kbq6kv8g48q66pmmaxcpikmpg9gm00sd6adgq6gl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155745,8 +156294,8 @@ self: { pname = "io-streams-haproxy"; version = "1.0.1.0"; sha256 = "1dcn5hd4fiwyq7m01r6fi93vfvygca5s6mz87c78m0zyj29clkmp"; - revision = "3"; - editedCabalFile = "02k9halblgnynlm781ahc81yxla8z7cck1gikm8555v78rf5hv7x"; + revision = "5"; + editedCabalFile = "073aciql0czvpaiwh9mpljcd1j2a8p5ka5awsw1j3dh7bdyg2mp7"; libraryHaskellDepends = [ attoparsec base bytestring io-streams network transformers ]; @@ -155898,6 +156447,8 @@ self: { pname = "ip"; version = "1.7.4"; sha256 = "1hvqgah86z2saizhjpq2352x2ncxjsshvzj66bmij3yk6y107yfs"; + revision = "1"; + editedCabalFile = "09yrwzklzbfvh5x4j7k4vx7a49kndfz9d8kjkfvwi3frqzhr209m"; libraryHaskellDepends = [ aeson attoparsec base bytebuild byteslice bytesmith bytestring deepseq hashable natural-arithmetic primitive text text-short @@ -157596,8 +158147,8 @@ self: { }: mkDerivation { pname = "ixset"; - version = "1.1.1.1"; - sha256 = "1d3h53sq8i8azzr71yi4h5zma2bb2f623gpfw25x2kd4slhpkrgf"; + version = "1.1.1.2"; + sha256 = "15dgh9lgjqgn0483p98q21ym1mrwi5h7ygdjxf48aap1d20x6swp"; libraryHaskellDepends = [ base containers safecopy syb syb-with-class template-haskell ]; @@ -158515,8 +159066,8 @@ self: { }: mkDerivation { pname = "jmacro"; - version = "0.6.17"; - sha256 = "14vmnaqr3lhcj7y5rj4jgm2w89kkznfksy53pinmc1xq1bd8b7px"; + version = "0.6.17.1"; + sha256 = "17z39w888nrq0jfzi74z1wnswzmcyi2x6h2p2nnmhyjsgvpjkcxa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162562,8 +163113,8 @@ self: { }: mkDerivation { pname = "keter"; - version = "1.8.4"; - sha256 = "10p8hc1jfzkg3s8shazkip95i6r5a8gyiz6m1khl7myvb05i21gc"; + version = "1.9"; + sha256 = "00mgh6447p0gsvm7agy1i9a874afirirx2a7qdqnbw1m14j3mzfl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163373,8 +163924,8 @@ self: { }: mkDerivation { pname = "koji-tool"; - version = "0.8.2"; - sha256 = "0hhpw8v09alicymbndl6lpflasmzchrf8zg1l4gqd8j9sj2rrzqg"; + version = "0.8.3"; + sha256 = "17xd1755yr2acf6brwbxn3yzbndv982s7jgxbj9dmd7my6v1d9i2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -175140,15 +175691,15 @@ self: { }: mkDerivation { pname = "lsfrom"; - version = "0.1"; - sha256 = "04cv4x88r10b9zkfiy1kclq3dm79akg1p16djfad8h5x988c7bq1"; + version = "0.1.1.1"; + sha256 = "1vm80k8gsh4k7937i02wv4dk2s173c9wvgiilc1am3ddp7x7ms1h"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base filepath simple-cmd simple-cmd-args ]; testHaskellDepends = [ base directory filepath simple-cmd ]; - description = "List dir files starting from a specific name"; + description = "List directory files starting from a specific name"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -177899,8 +178450,8 @@ self: { pname = "map-syntax"; version = "0.3"; sha256 = "0b3ddi998saw5gi5r4bjbpid03rxlifn08zv15wf0b90ambhcc4k"; - revision = "3"; - editedCabalFile = "19p79gjwlpgx210zlc9625vwp6mjmnb9mvxaz1h5zmgir8dwb4lv"; + revision = "4"; + editedCabalFile = "09sr3lzgkqs59vnwsimqgv098h3hj4srr2avza3z05gfkvxqj8yw"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers deepseq hspec HUnit mtl QuickCheck transformers @@ -177974,8 +178525,8 @@ self: { ({ mkDerivation, base, tidal }: mkDerivation { pname = "maquinitas-tidal"; - version = "0.2.4"; - sha256 = "0apr5qkir3b6mnczi50lf3p349p1q3bl1sn4yg9dls2n3m147mf7"; + version = "0.2.5"; + sha256 = "1jqa471r7r3my32lrjcrfc35259kj7afp1jgj8jr3r62dd8ckq63"; libraryHaskellDepends = [ base tidal ]; description = "library for MIDI control of hardware"; license = lib.licenses.mit; @@ -186573,6 +187124,44 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) glew;}; + "monomer_1_4_0_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , bytestring-to-vector, c2hs, containers, data-default, exceptions + , extra, formatting, glew, hspec, http-client, JuicyPixels, lens + , mtl, nanovg, OpenGLRaw, process, random, sdl2, stm, text + , text-show, time, transformers, vector, websockets, wreq, wuss + }: + mkDerivation { + pname = "monomer"; + version = "1.4.0.0"; + sha256 = "104j89l1c39yl9sqfv1nsq7c3p00v0h28kvrmym46b5w1hd86xxr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async attoparsec base bytestring bytestring-to-vector containers + data-default exceptions extra formatting http-client JuicyPixels + lens mtl nanovg OpenGLRaw process sdl2 stm text text-show time + transformers vector wreq + ]; + librarySystemDepends = [ glew ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ + aeson async attoparsec base bytestring bytestring-to-vector + containers data-default exceptions extra formatting http-client + JuicyPixels lens mtl nanovg OpenGLRaw process random sdl2 stm text + text-show time transformers vector websockets wreq wuss + ]; + testHaskellDepends = [ + async attoparsec base bytestring bytestring-to-vector containers + data-default exceptions extra formatting hspec http-client + JuicyPixels lens mtl nanovg OpenGLRaw process sdl2 stm text + text-show time transformers vector wreq + ]; + description = "A GUI library for writing native Haskell applications"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) glew;}; + "monomorphic" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -201718,8 +202307,8 @@ self: { }: mkDerivation { pname = "org-mode"; - version = "2.0.0"; - sha256 = "17yn9si0mxyydjgv40q6rc5nw579kswlx69ycyinhdx0q34ds7rl"; + version = "2.0.1"; + sha256 = "0g22gjy7l6c28j60vbhazgcl0da58mml307qsp4zac4j4nshv7y2"; libraryHaskellDepends = [ base containers filepath hashable megaparsec parser-combinators text time @@ -201738,8 +202327,8 @@ self: { }: mkDerivation { pname = "org-mode-lucid"; - version = "1.6.1"; - sha256 = "0fkwwwrmfq22g1yak9srmlbq5yixf4kdwfapq0dyr8f3pqaglf1v"; + version = "1.6.2"; + sha256 = "0qz8s63m2l0aff23fgdn97xxswbn3ah3m4rx9snfi5cscsrzsb8h"; libraryHaskellDepends = [ base containers hashable lucid org-mode text ]; @@ -206916,8 +207505,8 @@ self: { }: mkDerivation { pname = "pcf-font"; - version = "0.2.2.0"; - sha256 = "1vwqy2zkj0yb0b7hx3hrcfdcg46j67sv9l8ljik8wrm7811d0rwa"; + version = "0.2.2.1"; + sha256 = "1gzlbdyhcrf7ap6zjd0fvkfwyakvb805198hpb9a86hrs5bih9mj"; libraryHaskellDepends = [ base binary bytestring containers vector zlib ]; @@ -207056,8 +207645,8 @@ self: { }: mkDerivation { pname = "pcre2"; - version = "2.1.0.1"; - sha256 = "06fj8p49whxixphncmzm0c85wzqrsmg59zbb423qnqqmcwjwy2qf"; + version = "2.1.1"; + sha256 = "07ls9vxj5l8wvrj75wvyrq6qsz7fz0pamx92ik50cpl71p76lc92"; libraryHaskellDepends = [ base containers microlens mtl template-haskell text ]; @@ -209099,8 +209688,8 @@ self: { }: mkDerivation { pname = "persistent-typed-db"; - version = "0.1.0.5"; - sha256 = "0xqvaypl987br15pymky9qa1z62sfa32kmcgpvnl8zpgdjsa17nc"; + version = "0.1.0.6"; + sha256 = "1hvja9yh40nqifvy0fsamdfj3f9ps85g187c7m3hg2yqz4w8pm05"; libraryHaskellDepends = [ aeson base bytestring conduit http-api-data monad-logger path-pieces persistent resource-pool resourcet template-haskell @@ -209826,8 +210415,8 @@ self: { ({ mkDerivation, base, subG }: mkDerivation { pname = "phonetic-languages-constraints-array"; - version = "0.1.1.0"; - sha256 = "1c5n04zkfhws6ciilbkya4fyr3qc2yszmqrbb7pk3jcjnv2xp32b"; + version = "0.1.2.0"; + sha256 = "1s28pipyijz13sn6wni9v850w8c6n6rkiqmavhddfnichwp3gq55"; libraryHaskellDepends = [ base subG ]; description = "Constraints to filter the needed permutations"; license = lib.licenses.mit; @@ -209872,8 +210461,8 @@ self: { ({ mkDerivation, base, filters-basic, mmsyn2-array }: mkDerivation { pname = "phonetic-languages-filters-array"; - version = "0.3.0.0"; - sha256 = "0g1nyab2cagppwj75vr2fj0yd9g3hs1qdkb2grj14j13bvaqbi7p"; + version = "0.4.0.0"; + sha256 = "0rkgwf9v98vdflhkcfn7s0in8dw69rh2dcv8n9lvpjd0ccmlvil8"; libraryHaskellDepends = [ base filters-basic mmsyn2-array ]; description = "Allows to change the structure of the function output"; license = lib.licenses.mit; @@ -210041,8 +210630,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.17.1.0"; - sha256 = "00lb3h4b0yd3ra0i6g64r8vfn2cyazrqai51arfprihyj31zm9kq"; + version = "0.18.0.2"; + sha256 = "0m79iv739cakgpfbixg613fhwjnvy4nidqvfrvqgq53wn4x9pdm3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210075,16 +210664,13 @@ self: { }) {}; "phonetic-languages-simplified-examples-common" = callPackage - ({ mkDerivation, base, heaps, phonetic-languages-constraints-array - , phonetic-languages-ukrainian-array - }: + ({ mkDerivation, base, heaps, phonetic-languages-ukrainian-array }: mkDerivation { pname = "phonetic-languages-simplified-examples-common"; - version = "0.4.4.0"; - sha256 = "1y5nrr23blxm08s62q58aq0yiifxgds9lf2wf45zz11w1z16ff1n"; + version = "0.4.6.0"; + sha256 = "13i8pq52bfmxvidvykn1hcy9yv2i8yni76mcnbmfwdbd1sy615pn"; libraryHaskellDepends = [ - base heaps phonetic-languages-constraints-array - phonetic-languages-ukrainian-array + base heaps phonetic-languages-ukrainian-array ]; description = "Some commonly used by phonetic-languages-simplified* series functions"; license = lib.licenses.mit; @@ -210092,8 +210678,9 @@ self: { }) {}; "phonetic-languages-simplified-generalized-examples-array" = callPackage - ({ mkDerivation, base, cli-arguments, heaps, mmsyn2-array, mmsyn3 - , parallel, phonetic-languages-constraints-array + ({ mkDerivation, base, cli-arguments, foldable-ix, heaps + , mmsyn2-array, mmsyn3, parallel + , phonetic-languages-constraints-array , phonetic-languages-filters-array , phonetic-languages-permutations-array , phonetic-languages-phonetics-basics, phonetic-languages-plus @@ -210104,10 +210691,10 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.15.0.0"; - sha256 = "1rayhhyvqskxw374jrl5h92lhx0n3k3wda7vw4wkgw3kbargwm7q"; + version = "0.16.0.0"; + sha256 = "16ia1kd217hy0wpdjd60l1qdz2ivcm1n0sncp106x4dksy4xc1pv"; libraryHaskellDepends = [ - base cli-arguments heaps mmsyn2-array mmsyn3 parallel + base cli-arguments foldable-ix heaps mmsyn2-array mmsyn3 parallel phonetic-languages-constraints-array phonetic-languages-filters-array phonetic-languages-permutations-array @@ -214165,20 +214752,21 @@ self: { }) {}; "polysemy-RandomFu" = callPackage - ({ mkDerivation, base, hspec, hspec-discover, polysemy - , polysemy-plugin, polysemy-zoo, random-fu, random-source, text - , vector + ({ mkDerivation, base, hspec, hspec-discover, mtl, polysemy + , polysemy-plugin, polysemy-zoo, random, random-fu, random-source + , rvar, text, vector }: mkDerivation { pname = "polysemy-RandomFu"; - version = "0.4.4.1"; - sha256 = "1zw8n16dm2l8rwrf014kb9jhp3q4a719bp8p08s4fnlksqkf88vl"; + version = "0.5.0.0"; + sha256 = "0zjywc9m7y56kzxvzayq4psjz6zip1x40cpjkvw39i5p2jkycc4c"; libraryHaskellDepends = [ - base polysemy polysemy-plugin polysemy-zoo random-fu random-source + base mtl polysemy polysemy-plugin polysemy-zoo random random-fu + random-source rvar ]; testHaskellDepends = [ - base hspec polysemy polysemy-plugin polysemy-zoo random-fu - random-source text vector + base hspec mtl polysemy polysemy-plugin polysemy-zoo random + random-fu random-source text vector ]; testToolDepends = [ hspec-discover ]; description = "Experimental, RandomFu effect and interpreters for polysemy"; @@ -214234,8 +214822,8 @@ self: { }: mkDerivation { pname = "polysemy-conc"; - version = "0.7.0.0"; - sha256 = "0jr5wh0sxbymz4p9x2p86cm9djr8bybss747xx9c778va0vgcncg"; + version = "0.8.0.1"; + sha256 = "0l1hgv9xlax5ycp66j5asfhfi9jyfcwvd9z132pbx8dyj4ikzp8y"; libraryHaskellDepends = [ async base containers incipit-core polysemy polysemy-resume polysemy-time stm stm-chans torsor unagi-chan unix @@ -214580,19 +215168,21 @@ self: { ({ mkDerivation, base, incipit-core, path, path-io, polysemy , polysemy-conc, polysemy-plugin, polysemy-resume, polysemy-test , polysemy-time, posix-pty, process, stm-chans, tasty - , typed-process, unix + , tasty-expected-failure, typed-process, unix }: mkDerivation { pname = "polysemy-process"; - version = "0.7.0.0"; - sha256 = "0g1rmii4jnffl2f4ziibw62nkgzl92wf4pvq0fvzwkm01rpm9frz"; + version = "0.8.0.1"; + sha256 = "0ayn6l2c6009wrxc4rya6dc8185wp6krdck8mbbasrlvah3in3cs"; libraryHaskellDepends = [ base incipit-core path path-io polysemy polysemy-conc - polysemy-resume posix-pty process stm-chans typed-process unix + polysemy-resume polysemy-time posix-pty process stm-chans + typed-process unix ]; testHaskellDepends = [ base incipit-core polysemy polysemy-conc polysemy-plugin - polysemy-resume polysemy-test polysemy-time tasty typed-process + polysemy-resume polysemy-test polysemy-time tasty + tasty-expected-failure typed-process ]; description = "Polysemy Effects for System Processes"; license = "BSD-2-Clause-Patent"; @@ -214656,6 +215246,26 @@ self: { license = "BSD-2-Clause-Patent"; }) {}; + "polysemy-scoped-fs" = callPackage + ({ mkDerivation, base, bytestring, directory, doctest, extra, path + , polysemy, polysemy-fs, polysemy-path, polysemy-plugin, text + }: + mkDerivation { + pname = "polysemy-scoped-fs"; + version = "0.1.0.0"; + sha256 = "08mj5q8rfbhyd7ns4vf696cqvm0792f5dv3x1w0ci3spl2m7nhdi"; + libraryHaskellDepends = [ + base bytestring directory doctest extra path polysemy polysemy-fs + polysemy-path polysemy-plugin text + ]; + testHaskellDepends = [ + base bytestring directory doctest extra path polysemy polysemy-fs + polysemy-path polysemy-plugin text + ]; + description = "Well-typed filesystem operation effects"; + license = lib.licenses.agpl3Plus; + }) {}; + "polysemy-several" = callPackage ({ mkDerivation, base, polysemy }: mkDerivation { @@ -216626,6 +217236,30 @@ self: { license = lib.licenses.mit; }) {}; + "postgresql-syntax_0_4_1" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, hashable + , headed-megaparsec, hedgehog, megaparsec, parser-combinators + , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck, text, text-builder, unordered-containers + }: + mkDerivation { + pname = "postgresql-syntax"; + version = "0.4.1"; + sha256 = "1ls3jjgbvdy0x3110lgjd3icas187qyd31cwvi858l6ayhwf9kck"; + libraryHaskellDepends = [ + base bytestring case-insensitive hashable headed-megaparsec + megaparsec parser-combinators text text-builder + unordered-containers + ]; + testHaskellDepends = [ + hedgehog QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "PostgreSQL AST parsing and rendering"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "postgresql-transactional" = callPackage ({ mkDerivation, base, monad-control, mtl, postgresql-simple }: mkDerivation { @@ -217109,17 +217743,17 @@ self: { }: mkDerivation { pname = "powerdns"; - version = "0.4.0"; - sha256 = "0gcf04naa9ai4f6v7ycakwmdz379dqrr3nl0ry1pnqck835p629a"; + version = "0.4.1"; + sha256 = "1ss88q1lndjvmy7bp2jxh7qbh6z57kl1q5zcv4kzjampajf1fjbi"; revision = "1"; - editedCabalFile = "1pf6f09kdawn17nrjn221xr40g66wa282r65521y4mdmlm6yrfd0"; + editedCabalFile = "08n8l7629ci2xksjihqwrag0gcj0cdhaj94awmybd454j4idy5c1"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq hashable servant servant-client servant-client-core text time ]; testHaskellDepends = [ - base http-client servant-client servant-client-core tasty + base http-client servant servant-client servant-client-core tasty tasty-hunit ]; description = "PowerDNS API bindings for api/v1"; @@ -219627,8 +220261,8 @@ self: { }: mkDerivation { pname = "procex"; - version = "0.3.1"; - sha256 = "16f91ic12wldf59dabdca76bdcvq5r1alf05bai060dby5qqj2qj"; + version = "0.3.2"; + sha256 = "0962i86fdlgrzrzq6sp1v5hpkp1vsrsacpnalxvsz1nc81pi14qj"; libraryHaskellDepends = [ async base bytestring containers deepseq unix utf8-string ]; @@ -221661,8 +222295,8 @@ self: { }: mkDerivation { pname = "ptera-th"; - version = "0.3.0.0"; - sha256 = "0w5kr7cp0kcxh1cmqb38waxci81i9ccqn42kvhkrkzf35pnkn0m4"; + version = "0.4.0.0"; + sha256 = "00rvc6y3wnxsr3ybxd3wmywgcwsajjh0g40magnlfzkgdnih9qg2"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base containers enummapset-th ghc-prim membership ptera @@ -221727,6 +222361,22 @@ self: { license = lib.licenses.mit; }) {}; + "ptr-poker_0_1_2_8" = callPackage + ({ mkDerivation, base, bytestring, gauge, hedgehog, numeric-limits + , rerebase, scientific, text + }: + mkDerivation { + pname = "ptr-poker"; + version = "0.1.2.8"; + sha256 = "10bbfw0jdzvds4j6qcgppn4l7xflqa2578w6sqmz807mwr563f8c"; + libraryHaskellDepends = [ base bytestring scientific text ]; + testHaskellDepends = [ hedgehog numeric-limits rerebase ]; + benchmarkHaskellDepends = [ gauge rerebase ]; + description = "Pointer poking action construction and composition toolkit"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ptrdiff" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -222330,18 +222980,18 @@ self: { , fsnotify, gitrev, Glob, happy, haskeline, hspec, hspec-discover , http-types, HUnit, language-javascript, lifted-async, lifted-base , memory, microlens, microlens-platform, monad-control - , monad-logger, mtl, network, optparse-applicative, parallel - , parsec, pattern-arrows, process, protolude, purescript-cst - , QuickCheck, regex-base, regex-tdfa, safe, scientific, semialign - , semigroups, serialise, sourcemap, split, stm, stringsearch, syb - , text, these, time, transformers, transformers-base - , transformers-compat, unordered-containers, utf8-string, vector - , wai, wai-websockets, warp, websockets + , monad-logger, monoidal-containers, mtl, network + , optparse-applicative, parallel, parsec, pattern-arrows, process + , protolude, QuickCheck, regex-base, regex-tdfa, safe, scientific + , semialign, semigroups, serialise, sourcemap, split, stm + , stringsearch, syb, text, these, time, transformers + , transformers-base, transformers-compat, unordered-containers + , utf8-string, vector }: mkDerivation { pname = "purescript"; - version = "0.14.9"; - sha256 = "13canh915v668ii58y880b6zgzga3qmxxiblljs9qsdpwx1q7yzd"; + version = "0.15.0"; + sha256 = "0md1rkm7w6yn45i4igwqpvb82p491ai1w1z2yiym1qyi8p08798g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -222350,10 +223000,10 @@ self: { cheapskate clock containers cryptonite data-ordlist deepseq directory dlist edit-distance file-embed filepath fsnotify Glob haskeline language-javascript lifted-async lifted-base memory - microlens microlens-platform monad-control monad-logger mtl - parallel parsec pattern-arrows process protolude purescript-cst - regex-tdfa safe scientific semialign semigroups serialise sourcemap - split stm stringsearch syb text these time transformers + microlens microlens-platform monad-control monad-logger + monoidal-containers mtl parallel parsec pattern-arrows process + protolude regex-tdfa safe scientific semialign semigroups serialise + sourcemap split stm stringsearch syb text these time transformers transformers-base transformers-compat unordered-containers utf8-string vector ]; @@ -222365,12 +223015,12 @@ self: { directory dlist edit-distance exceptions file-embed filepath fsnotify gitrev Glob haskeline http-types language-javascript lifted-async lifted-base memory microlens microlens-platform - monad-control monad-logger mtl network optparse-applicative - parallel parsec pattern-arrows process protolude purescript-cst - regex-tdfa safe scientific semialign semigroups serialise sourcemap - split stm stringsearch syb text these time transformers + monad-control monad-logger monoidal-containers mtl network + optparse-applicative parallel parsec pattern-arrows process + protolude regex-tdfa safe scientific semialign semigroups serialise + sourcemap split stm stringsearch syb text these time transformers transformers-base transformers-compat unordered-containers - utf8-string vector wai wai-websockets warp websockets + utf8-string vector ]; executableToolDepends = [ happy ]; testHaskellDepends = [ @@ -222379,11 +223029,11 @@ self: { cheapskate clock containers cryptonite data-ordlist deepseq directory dlist edit-distance file-embed filepath fsnotify Glob haskeline hspec HUnit language-javascript lifted-async lifted-base - memory microlens microlens-platform monad-control monad-logger mtl - parallel parsec pattern-arrows process protolude purescript-cst - QuickCheck regex-base regex-tdfa safe scientific semialign - semigroups serialise sourcemap split stm stringsearch syb text - these time transformers transformers-base transformers-compat + memory microlens microlens-platform monad-control monad-logger + monoidal-containers mtl parallel parsec pattern-arrows process + protolude QuickCheck regex-base regex-tdfa safe scientific + semialign semigroups serialise sourcemap split stm stringsearch syb + text these time transformers transformers-base transformers-compat unordered-containers utf8-string vector ]; testToolDepends = [ happy hspec-discover ]; @@ -228959,6 +229609,17 @@ self: { broken = true; }) {}; + "refined-with" = callPackage + ({ mkDerivation, aeson, base, deepseq, hashable, refined }: + mkDerivation { + pname = "refined-with"; + version = "0.3.0"; + sha256 = "1d74ax7z822xsdnajsja1h49j966s7ym2ah35bpxlikl1l2wsmnh"; + libraryHaskellDepends = [ aeson base deepseq hashable refined ]; + description = "Refinement types with an \"refinement applied\" switch"; + license = lib.licenses.mit; + }) {}; + "refinery" = callPackage ({ mkDerivation, base, checkers, exceptions, hspec, mmorph, mtl , QuickCheck @@ -229812,17 +230473,6 @@ self: { }) {}; "reform" = callPackage - ({ mkDerivation, base, containers, mtl, semigroups, text }: - mkDerivation { - pname = "reform"; - version = "0.2.7.4"; - sha256 = "0dl0jz5ibcj4vafpf0a0v52rac4nmmif69817g7qgxavc093nq82"; - libraryHaskellDepends = [ base containers mtl semigroups text ]; - description = "reform is a type-safe HTML form generation and validation library"; - license = lib.licenses.bsd3; - }) {}; - - "reform_0_2_7_5" = callPackage ({ mkDerivation, base, containers, mtl, semigroups, text }: mkDerivation { pname = "reform"; @@ -229831,15 +230481,14 @@ self: { libraryHaskellDepends = [ base containers mtl semigroups text ]; description = "reform is a type-safe HTML form generation and validation library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reform-blaze" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, reform, text }: mkDerivation { pname = "reform-blaze"; - version = "0.2.4.3"; - sha256 = "1r5j827diiqybjm75j0gmfb81q7irdc11sj714589xbb6lkz3g0i"; + version = "0.2.4.4"; + sha256 = "0cf1nimvkpag4fqs9jk17cl0h9wkpv2lcq5m1l704pznms22s7c7"; libraryHaskellDepends = [ base blaze-html blaze-markup reform text ]; @@ -229866,8 +230515,8 @@ self: { }: mkDerivation { pname = "reform-happstack"; - version = "0.2.5.4"; - sha256 = "1xknj906vr0q6vrxrvna1777v7hsdg1l3r0wwnga7k1yn5hcfc76"; + version = "0.2.5.5"; + sha256 = "0knsx790vf5xvnxhfdz48gz3352z98ghy1ld7yh3rmp1apciqd35"; libraryHaskellDepends = [ base bytestring happstack-server mtl random reform text utf8-string ]; @@ -230902,8 +231551,8 @@ self: { }: mkDerivation { pname = "registry-messagepack"; - version = "0.1.0.2"; - sha256 = "0pwljb8zdq5m47zjfbmy8827g99y2fai6ib9z2p82kkknag1mg5q"; + version = "0.1.0.3"; + sha256 = "0i49cic87jdkfalwbyry7c6f1828vd1n33nkdjmxa73w3vhjklf5"; libraryHaskellDepends = [ base containers msgpack protolude registry template-haskell text transformers vector @@ -233210,8 +233859,8 @@ self: { }: mkDerivation { pname = "restful-snap"; - version = "0.4.1"; - sha256 = "1447hbwky8lslblq3vpm7d1zyri4apmf459fbaq3m15kkd1qsyxq"; + version = "0.4.2"; + sha256 = "0639j9dv51jra3mx9pqsb9hwrp73cw4xlc27p4hklk3xqr0fvf0p"; libraryHaskellDepends = [ base blaze-builder bytestring containers data-default digestive-functors errors heist lens map-syntax mtl old-locale @@ -233434,8 +234083,8 @@ self: { pname = "retrie"; version = "1.2.0.1"; sha256 = "1n3g9wr45xz1q2mhlj1r2709rqakczrvd7x6vxh7iapz43f69c6x"; - revision = "1"; - editedCabalFile = "0dx1gxf2c88rzd1z83lmvgpbv8xny9yz8px4cjjpnmlrah1fmmqh"; + revision = "2"; + editedCabalFile = "0h6r4jg9mnqwvlsl3s6yl2zvhkwr8pdypbzvky4kwz4zvc03j5ql"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -233464,8 +234113,8 @@ self: { }: mkDerivation { pname = "retroclash-lib"; - version = "0.1.1"; - sha256 = "1v8xw37cbnz16gqmf65hgk0kvh0vgmq8sj6nh4ngz48l6i5wylv6"; + version = "0.1.2"; + sha256 = "11f15nhxp8aaim6yrzlh33dilp2zywdfikgdii44q0mszmm9q0vr"; libraryHaskellDepends = [ barbies base clash-ghc clash-lib clash-prelude containers ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise @@ -234461,6 +235110,35 @@ self: { license = lib.licenses.mit; }) {}; + "rio_0_1_22_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, hashable, hspec, hspec-discover, microlens + , microlens-mtl, mtl, primitive, process, QuickCheck, text, time + , typed-process, unix, unliftio, unliftio-core + , unordered-containers, vector + }: + mkDerivation { + pname = "rio"; + version = "0.1.22.0"; + sha256 = "0rpc4f2yvw0y6mqz9ykm3778j6srya7ssww691kpf9nb8vddgjb6"; + libraryHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable microlens microlens-mtl mtl primitive process text time + typed-process unix unliftio unliftio-core unordered-containers + vector + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable hspec microlens microlens-mtl mtl primitive process + QuickCheck text time typed-process unix unliftio unliftio-core + unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + description = "A standard library for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "rio-app" = callPackage ({ mkDerivation, base, optparse-simple, resourcet, rio }: mkDerivation { @@ -237886,15 +238564,15 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) libsodium;}; - "saltine_0_2_0_0" = callPackage + "saltine_0_2_0_1" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, hashable , libsodium, profunctors, QuickCheck, semigroups, test-framework , test-framework-quickcheck2, text }: mkDerivation { pname = "saltine"; - version = "0.2.0.0"; - sha256 = "1xgrnm6qmm0mymq3dh4mdvzi8sfssnpz06xsrw8zdpa1vl0a0gm6"; + version = "0.2.0.1"; + sha256 = "181fxlp8p0zhz58h23fxavhcbxkwhd3a3idlbhawb2rhiah6fs6f"; libraryHaskellDepends = [ base bytestring deepseq hashable profunctors text ]; @@ -238750,6 +239428,36 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) z3;}; + "sbv_9_0" = callPackage + ({ mkDerivation, array, async, base, bytestring, containers + , deepseq, directory, filepath, hlint, libBF, mtl, pretty, process + , QuickCheck, random, syb, tasty, tasty-bench, tasty-golden + , tasty-hunit, tasty-quickcheck, template-haskell, text, time + , transformers, uniplate, z3 + }: + mkDerivation { + pname = "sbv"; + version = "9.0"; + sha256 = "0r84ak8n8vqs1xbvxjzai828yr5msjyf5igf6qmn6f47m0mhf6cz"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array async base containers deepseq directory filepath libBF mtl + pretty process QuickCheck random syb template-haskell text time + transformers uniplate + ]; + testHaskellDepends = [ + base bytestring containers directory filepath hlint mtl process + QuickCheck random tasty tasty-golden tasty-hunit tasty-quickcheck + ]; + testSystemDepends = [ z3 ]; + benchmarkHaskellDepends = [ + base deepseq filepath process random tasty tasty-bench time + ]; + description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) z3;}; + "sbvPlugin" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , ghc-prim, mtl, process, sbv, tasty, tasty-golden @@ -238757,8 +239465,8 @@ self: { }: mkDerivation { pname = "sbvPlugin"; - version = "9.0.1"; - sha256 = "1hg1sxnspyxjpj98c2h7hzf93m9acw8cjiva4wsnxl1gspln4gwb"; + version = "9.2.2"; + sha256 = "0cv2f6n32m8xaii5dpk3kz6wclxgmri1zfh09dq23s91l5asrp1v"; libraryHaskellDepends = [ base containers ghc ghc-prim mtl sbv template-haskell ]; @@ -240077,8 +240785,8 @@ self: { }: mkDerivation { pname = "scotty-utils"; - version = "0.1.0.0"; - sha256 = "0f77b5xmr5gwswz15i5833karfr1qvyaaiy58khd75n9awfx5jqv"; + version = "0.2.0.0"; + sha256 = "0b2r43dcgcq7azcn0l9lxml84h6w5bk09h65y1mlvccwzhwbfini"; libraryHaskellDepends = [ aeson aeson-result base http-types scotty text ]; @@ -241103,29 +241811,6 @@ self: { }) {inherit (pkgs) secp256k1;}; "secp256k1-haskell" = callPackage - ({ mkDerivation, base, base16, bytestring, cereal, deepseq, entropy - , hashable, hspec, hspec-discover, HUnit, monad-par, mtl - , QuickCheck, secp256k1, string-conversions, unliftio-core - }: - mkDerivation { - pname = "secp256k1-haskell"; - version = "0.6.0"; - sha256 = "0qq37xy61kk5h9h6zaiycjlrr1k9kjddy319qgqi0ja9vkm8msj1"; - libraryHaskellDepends = [ - base base16 bytestring cereal deepseq entropy hashable QuickCheck - string-conversions unliftio-core - ]; - libraryPkgconfigDepends = [ secp256k1 ]; - testHaskellDepends = [ - base base16 bytestring cereal deepseq entropy hashable hspec HUnit - monad-par mtl QuickCheck string-conversions unliftio-core - ]; - testToolDepends = [ hspec-discover ]; - description = "Bindings for secp256k1"; - license = lib.licenses.mit; - }) {inherit (pkgs) secp256k1;}; - - "secp256k1-haskell_0_6_1" = callPackage ({ mkDerivation, base, base16, bytestring, cereal, deepseq, entropy , hashable, hspec, hspec-discover, HUnit, monad-par, mtl , QuickCheck, secp256k1, string-conversions, unliftio-core @@ -241146,7 +241831,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Bindings for secp256k1"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) secp256k1;}; "secp256k1-legacy" = callPackage @@ -242455,10 +243139,8 @@ self: { }: mkDerivation { pname = "serialise"; - version = "0.2.4.0"; - sha256 = "07i50rza58x8j7kw9w2mhbks41gjv6xgnlgfdb0hw2cwdmkrmjqd"; - revision = "1"; - editedCabalFile = "0rgc0sr4csmiq38sf6x1xz6cqmp30nn8837xsfwpvcfb7kh4bqy0"; + version = "0.2.5.0"; + sha256 = "08ny0bdxd591w4bx6sd16ndik0j8g3578ck6zj667rm1z3ssqqj2"; libraryHaskellDepends = [ array base bytestring cborg containers ghc-prim half hashable primitive strict text these time unordered-containers vector @@ -243514,8 +244196,8 @@ self: { }: mkDerivation { pname = "servant-errors"; - version = "0.1.6.0"; - sha256 = "0qap8wbchpl48aigwqgxrgb6v3d6h80fpxq319c399pwrrkzyh9v"; + version = "0.1.7.0"; + sha256 = "0g7mclwxvjw9jwxmd8nkz9a0v4jwm9nxpwlranfdm2f55pa288i1"; libraryHaskellDepends = [ aeson base base-compat bytestring http-api-data http-media http-types scientific servant string-conversions text @@ -243801,14 +244483,14 @@ self: { ({ mkDerivation, base, servant-server, text }: mkDerivation { pname = "servant-htmx"; - version = "0.1.0.1"; - sha256 = "1plqqaa3vhmwg37bai6xpi415fd772fx6rf0dr919mc79ms0zcfx"; + version = "0.1.0.2"; + sha256 = "06lcs2qv6dxlx6sj16qr426vm7rklv80d720hrw4zfdba5rsl7d9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base servant-server text ]; executableHaskellDepends = [ base servant-server text ]; testHaskellDepends = [ base servant-server text ]; - description = "A library for using htmx with servant"; + description = "A library for using servant with htmx"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -246602,16 +247284,16 @@ self: { "shake-bench" = callPackage ({ mkDerivation, aeson, base, Chart, Chart-diagrams , diagrams-contrib, diagrams-core, diagrams-lib, diagrams-svg - , directory, extra, filepath, lens, lens-aeson, shake, text + , directory, extra, filepath, lens, lens-aeson, mtl, shake, text }: mkDerivation { pname = "shake-bench"; - version = "0.1.0.3"; - sha256 = "04pngr9a1g7dr7kb0xp9k2yrbg6vqk3lfpksz6bbyydbmypix3ay"; + version = "0.1.1.0"; + sha256 = "1p2xa2kxfvzy2c188i9czr5w4jck4sxw2jb7s9dc1b5xf1a4bi01"; libraryHaskellDepends = [ aeson base Chart Chart-diagrams diagrams-contrib diagrams-core diagrams-lib diagrams-svg directory extra filepath lens lens-aeson - shake text + mtl shake text ]; description = "Build rules for historical benchmarking"; license = lib.licenses.asl20; @@ -247024,6 +247706,33 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {}; + "shakespeare_2_0_27" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, directory, exceptions, file-embed, ghc-prim, hspec + , HUnit, parsec, process, scientific, template-haskell, text + , th-lift, time, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "shakespeare"; + version = "2.0.27"; + sha256 = "1bnl7m96x8qr2rvkfzjy01d720xb3c55l3vg0zm2lfbz3gpml1jz"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions file-embed ghc-prim parsec process scientific + template-haskell text th-lift time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim hspec HUnit parsec process template-haskell + text time transformers + ]; + description = "A toolkit for making compile-time interpolated templates"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ psibi ]; + }) {}; + "shakespeare-babel" = callPackage ({ mkDerivation, base, classy-prelude, data-default, directory , process, shakespeare, template-haskell @@ -248719,6 +249428,8 @@ self: { pname = "simple-cmd"; version = "0.2.4"; sha256 = "19kd863gm33sj01biqz94jk9cy8vb07xlqmw2m9vlh16h3phgqv1"; + revision = "1"; + editedCabalFile = "01sqxzvkkj4lvsp3kd8qjb5p2k6ylkiv4a2dc821ihapr0cf2fzj"; libraryHaskellDepends = [ base directory extra filepath process unix ]; @@ -248727,6 +249438,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "simple-cmd_0_2_5" = callPackage + ({ mkDerivation, base, directory, extra, filepath, hspec, process + , time, unix + }: + mkDerivation { + pname = "simple-cmd"; + version = "0.2.5"; + sha256 = "151js143l6b5rg6llvmcy1hcg80cmbp50ydrjhyfjqj32a1ygrsz"; + libraryHaskellDepends = [ + base directory extra filepath process time unix + ]; + testHaskellDepends = [ base hspec ]; + description = "Simple String-based process commands"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "simple-cmd-args" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -249730,8 +250458,8 @@ self: { }: mkDerivation { pname = "simplexmq"; - version = "1.0.2"; - sha256 = "142jpsy8myjffx4c1iw21iv210wgnyikmr66bih4gm3xgbqniz9q"; + version = "1.1.0"; + sha256 = "1qzrc32bs4s2qn8hz6z0ni5nv89a6vakl5wzk8sa7p2b3fkrc3gw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -251626,14 +252354,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "smash_0_1_3" = callPackage + ({ mkDerivation, base, bifunctors, binary, deepseq, hashable, mtl + , template-haskell + }: + mkDerivation { + pname = "smash"; + version = "0.1.3"; + sha256 = "1i8a8i81xs68zrsv173q0xv0f9cmxmhkgd5k90x60kv7v5pwpqw4"; + libraryHaskellDepends = [ + base bifunctors binary deepseq hashable mtl template-haskell + ]; + description = "Combinators for Maybe types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "smash-aeson" = callPackage ({ mkDerivation, aeson, base, smash, unordered-containers }: mkDerivation { pname = "smash-aeson"; - version = "0.1.0.0"; - sha256 = "0vmazs3ypqxaw4zdywimxfzrsvidnyk5damx6fpy549ny9319rqs"; - revision = "1"; - editedCabalFile = "1y0k6gz9qlr98f543607zkx6a97fnzh3zrbi2b59rlljp0rjvdw8"; + version = "0.2.0.1"; + sha256 = "0gbqvm34afkv1v0xajz8cjw0xaih3ls4dh1ygcbybgic08y0xl85"; libraryHaskellDepends = [ aeson base smash unordered-containers ]; description = "Aeson support for the smash library"; license = lib.licenses.bsd3; @@ -251645,8 +252387,8 @@ self: { ({ mkDerivation, base, lens, smash }: mkDerivation { pname = "smash-lens"; - version = "0.1.0.1"; - sha256 = "1j7v3713aahp3vh7dswrkdfrnksi1zlw9iv9zanhb714s6anyq66"; + version = "0.1.0.3"; + sha256 = "0lzvw7349wv1fjsm4q4jwggmjx9cxsrrjydvpq3q12kj6s9p9m5k"; libraryHaskellDepends = [ base lens smash ]; testHaskellDepends = [ base ]; description = "Optics for the `smash` library"; @@ -251669,12 +252411,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "smash-microlens_0_1_0_2" = callPackage + ({ mkDerivation, base, microlens, smash }: + mkDerivation { + pname = "smash-microlens"; + version = "0.1.0.2"; + sha256 = "0rfpdaw1zs8fpw6kp5zkrhj8nmx839fp2ca0cgk14g431yl651ir"; + libraryHaskellDepends = [ base microlens smash ]; + testHaskellDepends = [ base ]; + description = "Optics for the `smash` library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "smash-optics" = callPackage ({ mkDerivation, base, optics-core, smash }: mkDerivation { pname = "smash-optics"; - version = "0.1.0.1"; - sha256 = "1jf60vx8hlmyjgap91fvwn0p0hnazpcimshhkz5lsys0ynd4pcwh"; + version = "0.1.0.2"; + sha256 = "0acxkswkvbcwd8mawy9w029h01g3l30rkvvy6yzkb693l8xwiiry"; libraryHaskellDepends = [ base optics-core smash ]; description = "Optics for the `smash` library using `optics-core`"; license = lib.licenses.bsd3; @@ -252138,14 +252893,14 @@ self: { }: mkDerivation { pname = "snack"; - version = "0.1.0.0"; - sha256 = "01h49r64mg55ii32gnd7bab4rmgp73r3gks9g35z2qgdacwijwac"; + version = "0.2.0.0"; + sha256 = "13crnza7fav388s3n8gywbjam97xqhdqh0r10dcgpm5jffi8vns2"; libraryHaskellDepends = [ base bytestring bytestring-lexing text ]; benchmarkHaskellDepends = [ attoparsec base bytestring criterion string-conversions text ]; description = "Strict ByteString Parser Combinator"; - license = lib.licenses.mit; + license = lib.licenses.cc0; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252521,6 +253276,8 @@ self: { pname = "snap-server"; version = "1.1.2.0"; sha256 = "0w4yv9a5ilpma0335ariwap2iscmdbaaif88lq3cm7px910nyc4j"; + revision = "1"; + editedCabalFile = "0ijwp0s976cpb4nny8l7vpf5xny6k8dy2xb1rya1l2x5yzj7hlrj"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -252666,21 +253423,21 @@ self: { ({ mkDerivation, base, blaze-builder, bytestring , digestive-functors, digestive-functors-heist , digestive-functors-snap, errors, heist, lens, map-syntax - , persistent, persistent-postgresql, persistent-template, readable - , restful-snap, snap, snap-extras, snaplet-persistent, text, time - , transformers, unordered-containers, xmlhtml + , persistent, persistent-postgresql, readable, restful-snap, snap + , snap-extras, snaplet-persistent, text, time, transformers + , unordered-containers, xmlhtml }: mkDerivation { pname = "snaplet-actionlog"; - version = "0.3.1"; - sha256 = "1cs1spfy253zf2lxjdx2ki20ikzyj035xcxkzldxkn994amw2p7l"; + version = "0.4.0"; + sha256 = "1sg6pni9317v9g0v69b4a8rhnln6bal9iv0znz07ssgj9jg1ppp0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-builder bytestring digestive-functors digestive-functors-heist digestive-functors-snap errors heist lens - map-syntax persistent persistent-postgresql persistent-template - readable restful-snap snap snap-extras snaplet-persistent text time - transformers unordered-containers xmlhtml + map-syntax persistent persistent-postgresql readable restful-snap + snap snap-extras snaplet-persistent text time transformers + unordered-containers xmlhtml ]; description = "Generic action log snaplet for the Snap Framework"; license = lib.licenses.bsd3; @@ -259761,6 +260518,56 @@ self: { license = lib.licenses.mit; }) {}; + "store_0_7_15" = callPackage + ({ mkDerivation, array, async, base, base-orphans + , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector + , clock, containers, contravariant, criterion, cryptohash, deepseq + , directory, filepath, free, ghc-prim, hashable, hspec + , hspec-discover, hspec-smallcheck, integer-gmp, lifted-base + , monad-control, mono-traversable, nats, network, primitive + , resourcet, safe, smallcheck, store-core, syb, template-haskell + , text, th-lift, th-lift-instances, th-orphans, th-reify-many + , th-utilities, time, transformers, unordered-containers, vector + , vector-binary-instances, void, weigh + }: + mkDerivation { + pname = "store"; + version = "0.7.15"; + sha256 = "0ws8gck230q2wcmgbpynvppd122ag1rksjjg67wcy62dfkzdk264"; + libraryHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring containers contravariant cryptohash deepseq directory + filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp + lifted-base monad-control mono-traversable nats network primitive + resourcet safe smallcheck store-core syb template-haskell text + th-lift th-lift-instances th-orphans th-reify-many th-utilities + time transformers unordered-containers vector void + ]; + testHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring clock containers contravariant cryptohash deepseq + directory filepath free ghc-prim hashable hspec hspec-smallcheck + integer-gmp lifted-base monad-control mono-traversable nats network + primitive resourcet safe smallcheck store-core syb template-haskell + text th-lift th-lift-instances th-orphans th-reify-many + th-utilities time transformers unordered-containers vector void + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring cereal cereal-vector containers contravariant criterion + cryptohash deepseq directory filepath free ghc-prim hashable hspec + hspec-smallcheck integer-gmp lifted-base monad-control + mono-traversable nats network primitive resourcet safe smallcheck + store-core syb template-haskell text th-lift th-lift-instances + th-orphans th-reify-many th-utilities time transformers + unordered-containers vector vector-binary-instances void weigh + ]; + description = "Fast binary serialization"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "store-core" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, primitive, text , transformers @@ -261406,8 +262213,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "string-interpreter"; - version = "0.5.5.0"; - sha256 = "094fh3byv0bgcaccq15nqra31cw12csmyqj38hib2a2p6jnc3mq1"; + version = "0.6.0.0"; + sha256 = "0a0i95j8y49wijh2c0bpy5fwz72w0p6nh19df56g2yy7xik5h6xq"; libraryHaskellDepends = [ base ]; description = "Is used in the phonetic languages approach (e. g. in the recursive mode)."; license = lib.licenses.mit; @@ -262282,8 +263089,8 @@ self: { }: mkDerivation { pname = "stylish-haskell"; - version = "0.14.1.0"; - sha256 = "1chgkxqbnrgq7w9zzx118igp08h9vfgp150akazmgimy378cadlk"; + version = "0.14.2.0"; + sha256 = "1k2ffsizpy476v3zj6j634ap62qklzv80ryyh7c3j5l2cbzfv0gi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -263844,23 +264651,23 @@ self: { "swish" = callPackage ({ mkDerivation, base, containers, directory, filepath, hashable - , HUnit, intern, mtl, network-uri, old-locale, polyparse - , semigroups, test-framework, test-framework-hunit, text, time + , HUnit, intern, mtl, network-uri, polyparse, semigroups + , test-framework, test-framework-hunit, text, time }: mkDerivation { pname = "swish"; - version = "0.10.1.0"; - sha256 = "0xy12fmmiydaqm0cng24qd7c1py1sbb4ww66w0n5w26kwgh622cc"; + version = "0.10.2.0"; + sha256 = "162sq6k9ylzlnqj4l9plykvhhrkc7sc08bza6az5cadfvnqlham8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers directory filepath hashable intern mtl network-uri - old-locale polyparse text time + polyparse text time ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base containers hashable HUnit network-uri old-locale semigroups + base containers hashable HUnit network-uri semigroups test-framework test-framework-hunit text time ]; description = "A semantic web toolkit"; @@ -264027,17 +264834,17 @@ self: { , MonadRandom, mtl, optparse-applicative, path, path-io , pretty-show, QuickCheck, quickcheck-io, random, random-shuffle , safe, safe-coloured-text, safe-coloured-text-terminfo, split, stm - , sydtest-discover, text, yaml + , sydtest-discover, text }: mkDerivation { pname = "sydtest"; - version = "0.9.0.0"; - sha256 = "1gp9kifyh88pjnk7vnb0p09fkcmnhy5akgfdacmrmgwcnyswx6f1"; + version = "0.10.0.0"; + sha256 = "009d4ai8dqhxcrgkd0d37l97dkiqh7qmr1wvhwj38mblrhpgpm3z"; libraryHaskellDepends = [ async autodocodec autodocodec-yaml base bytestring containers Diff dlist envparse filepath MonadRandom mtl optparse-applicative path path-io pretty-show QuickCheck quickcheck-io random-shuffle safe - safe-coloured-text safe-coloured-text-terminfo split stm text yaml + safe-coloured-text safe-coloured-text-terminfo split stm text ]; testHaskellDepends = [ base bytestring path path-io QuickCheck random safe-coloured-text @@ -264050,17 +264857,18 @@ self: { }) {}; "sydtest-aeson" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, path - , path-io, sydtest, sydtest-discover, text + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq + , directory, path, path-io, sydtest, sydtest-discover, text }: mkDerivation { pname = "sydtest-aeson"; - version = "0.0.0.0"; - sha256 = "0x4n27v60m6h44xwpf60j11j1r9r1zzixlszq21skrf2r6lla2gn"; + version = "0.1.0.0"; + sha256 = "1kidxlaw8snyzl0nq2vynjz179blh03cvg2qdjr5j521cjxxmwf8"; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring path path-io sydtest text + aeson aeson-pretty base bytestring deepseq path path-io sydtest + text ]; - testHaskellDepends = [ aeson base sydtest text ]; + testHaskellDepends = [ aeson base directory sydtest text ]; testToolDepends = [ sydtest-discover ]; description = "An aeson companion library for sydtest"; license = "unknown"; @@ -264113,8 +264921,8 @@ self: { }: mkDerivation { pname = "sydtest-hedgehog"; - version = "0.1.0.0"; - sha256 = "0p0aj2jd6cgi3mdzdlwksczikxsx9ajh0lcvd6k4059x1ddjxplb"; + version = "0.2.0.0"; + sha256 = "084nqzl1i5phy0hwdgcx0dvlajr8g1iva73f3j9y9rsgl08wh727"; libraryHaskellDepends = [ base containers hedgehog stm sydtest ]; testHaskellDepends = [ base hedgehog sydtest ]; testToolDepends = [ sydtest-discover ]; @@ -264149,8 +264957,8 @@ self: { }: mkDerivation { pname = "sydtest-hspec"; - version = "0.1.0.0"; - sha256 = "17j48cp7n0smci0m42yyvkz0rd5xfrysb2f6hwxaqhl703ifhlyy"; + version = "0.3.0.0"; + sha256 = "1vda3jhgnqbs0sw219li3s83vyqr1k1hzvy0prr2c4hv62cr47p3"; libraryHaskellDepends = [ base hspec-core mtl QuickCheck stm sydtest ]; @@ -264204,19 +265012,19 @@ self: { "sydtest-persistent-postgresql" = callPackage ({ mkDerivation, base, monad-logger, mtl, persistent - , persistent-postgresql, persistent-template, sydtest - , sydtest-discover, sydtest-persistent, tmp-postgres + , persistent-postgresql, sydtest, sydtest-discover + , sydtest-persistent, tmp-postgres }: mkDerivation { pname = "sydtest-persistent-postgresql"; - version = "0.2.0.0"; - sha256 = "0c3f9m3d7nryb2xvfp7zrqqi9136mgf89ccwg8vlaapnx1bqap43"; + version = "0.2.0.1"; + sha256 = "1j4mb5vxwcdpfnrbk1xk8cg9s93dzndhdg2b4xgb91ix1c2ly5rz"; libraryHaskellDepends = [ base monad-logger mtl persistent persistent-postgresql sydtest sydtest-persistent tmp-postgres ]; testHaskellDepends = [ - base persistent persistent-postgresql persistent-template sydtest + base persistent persistent-postgresql sydtest ]; testToolDepends = [ sydtest-discover ]; description = "An persistent-postgresql companion library for sydtest"; @@ -264226,20 +265034,17 @@ self: { "sydtest-persistent-sqlite" = callPackage ({ mkDerivation, base, monad-logger, mtl, persistent - , persistent-sqlite, persistent-template, sydtest, sydtest-discover - , sydtest-persistent + , persistent-sqlite, sydtest, sydtest-discover, sydtest-persistent }: mkDerivation { pname = "sydtest-persistent-sqlite"; - version = "0.2.0.0"; - sha256 = "1l17n6hgc64ngjfdgg6c1zhnlg6ks9bvb7hbv5yf454bhbm6p83s"; + version = "0.2.0.1"; + sha256 = "1hy0i03pmdxmrw8nh07m8s7vr9af7m54gw0myn6flw9x57s2zk7v"; libraryHaskellDepends = [ - base monad-logger mtl persistent persistent-sqlite - persistent-template sydtest sydtest-persistent - ]; - testHaskellDepends = [ - base persistent persistent-sqlite persistent-template sydtest + base monad-logger mtl persistent persistent-sqlite sydtest + sydtest-persistent ]; + testHaskellDepends = [ base persistent persistent-sqlite sydtest ]; testToolDepends = [ sydtest-discover ]; description = "A persistent-sqlite companion library for sydtest"; license = "unknown"; @@ -264283,19 +265088,18 @@ self: { }) {}; "sydtest-servant" = callPackage - ({ mkDerivation, base, http-client, servant, servant-client - , servant-server, stm, sydtest, sydtest-discover, sydtest-wai + ({ mkDerivation, base, http-client, servant-client, servant-server + , stm, sydtest, sydtest-discover, sydtest-wai }: mkDerivation { pname = "sydtest-servant"; - version = "0.2.0.1"; - sha256 = "1yclwmcqp6wkcd980ha7a93dz99zc55mcw2z5fwhk3gfwdpdfyfj"; + version = "0.2.0.2"; + sha256 = "0gmaf1p7f588mvcf486wb32qjh74gvqyf965wczh5h0phgyg2f8z"; libraryHaskellDepends = [ - base http-client servant servant-client servant-server sydtest - sydtest-wai + base http-client servant-client servant-server sydtest sydtest-wai ]; testHaskellDepends = [ - base servant servant-client servant-server stm sydtest sydtest-wai + base servant-client servant-server stm sydtest sydtest-wai ]; testToolDepends = [ sydtest-discover ]; description = "A servant companion library for sydtest"; @@ -268862,6 +269666,8 @@ self: { pname = "telegram-bot-simple"; version = "0.5"; sha256 = "0mzzq7lfl56h1i9dr617h5vcv47j2nsf77pkq18s8wk5zrc67r2w"; + revision = "1"; + editedCabalFile = "0nz2g3jfb3l66ixrxlz257pmg2qbg7l6wsi0q38iv8fl4483md2s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -271065,6 +271871,26 @@ self: { license = lib.licenses.mit; }) {}; + "text-builder_0_6_7" = callPackage + ({ mkDerivation, base, bytestring, criterion, QuickCheck + , quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck, text, text-builder-dev + }: + mkDerivation { + pname = "text-builder"; + version = "0.6.7"; + sha256 = "00pl4jbqpcrfc00m3hf871g9k7s0n6xf2igb7ba1dnqh76w4lw4h"; + libraryHaskellDepends = [ base bytestring text text-builder-dev ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "An efficient strict text builder"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-builder-dev" = callPackage ({ mkDerivation, base, bytestring, criterion, deferred-folds , QuickCheck, quickcheck-instances, rerebase, split, tasty @@ -271088,6 +271914,28 @@ self: { license = lib.licenses.mit; }) {}; + "text-builder-dev_0_3_1" = callPackage + ({ mkDerivation, base, bytestring, criterion, deferred-folds + , QuickCheck, quickcheck-instances, rerebase, split, tasty + , tasty-hunit, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "text-builder-dev"; + version = "0.3.1"; + sha256 = "18ipiiqrr0hz0yl7lqv2y730vl6mzqp0jg1yir097gp53ky6hzyw"; + libraryHaskellDepends = [ + base bytestring deferred-folds split text transformers + ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Edge of developments for \"text-builder\""; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-containers" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim , hashable, QuickCheck, quickcheck-instances, tasty @@ -273744,6 +274592,34 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "tidal_1_8_0" = callPackage + ({ mkDerivation, async, base, bifunctors, bytestring, clock, colour + , containers, criterion, deepseq, exceptions, hint, hosc, microspec + , mtl, network, parsec, primitive, random, text, transformers + , weigh + }: + mkDerivation { + pname = "tidal"; + version = "1.8.0"; + sha256 = "19gh5l8hna9s4k5qw98qcr1s9wpqi6mf2kxd4kz6lzl3yxj56y6z"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bifunctors bytestring clock colour containers deepseq + exceptions hosc mtl network parsec primitive random text + transformers + ]; + executableHaskellDepends = [ async base exceptions hint ]; + testHaskellDepends = [ + base containers deepseq hosc microspec parsec + ]; + benchmarkHaskellDepends = [ base criterion weigh ]; + description = "Pattern language for improvised music"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "tidal-midi" = callPackage ({ mkDerivation, base, containers, PortMidi, tidal, time , transformers @@ -279586,17 +280462,19 @@ self: { "twain" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive, cookie - , either, exceptions, http-types, http2, text, time, transformers - , vault, wai, wai-extra + , either, exceptions, hspec, hspec-discover, hspec-wai, http-types + , http2, text, time, transformers, vault, wai, wai-extra }: mkDerivation { pname = "twain"; - version = "2.0.1.0"; - sha256 = "0wal0qr3bacy7phgbvi2sif5q490jk8mhw675lpl2ch8dmmf769p"; + version = "2.1.0.0"; + sha256 = "0ffppxfdrjgqr3csm2cwsc2sgxgrl9dqx60n2zffnh3c7qc7z749"; libraryHaskellDepends = [ aeson base bytestring case-insensitive cookie either exceptions http-types http2 text time transformers vault wai wai-extra ]; + testHaskellDepends = [ base hspec hspec-discover hspec-wai ]; + testToolDepends = [ hspec-discover ]; description = "Tiny web application framework for WAI"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -281075,14 +281953,16 @@ self: { }) {}; "typecheck-plugin-nat-simple" = callPackage - ({ mkDerivation, base, containers, ghc }: + ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra }: mkDerivation { pname = "typecheck-plugin-nat-simple"; - version = "0.1.0.4"; - sha256 = "0ybkkfk9ha3f1f5cq45r0rmnws0ai6imwic0srf78d6ys3q5n5n5"; + version = "0.1.0.6"; + sha256 = "0qhqys9kiisgy8gwfz92ffvmccgan2v95zxyfnbjqj1z9ks26br5"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base containers ghc ]; - testHaskellDepends = [ base containers ghc ]; + libraryHaskellDepends = [ + base containers ghc ghc-tcplugins-extra + ]; + testHaskellDepends = [ base containers ghc ghc-tcplugins-extra ]; description = "Simple type check plugin which calculate addition, subtraction and less-or-equal-than"; license = lib.licenses.bsd3; }) {}; @@ -284300,6 +285180,32 @@ self: { license = lib.licenses.mit; }) {}; + "unliftio_0_2_22_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, gauge, hspec, process, QuickCheck, stm, time + , transformers, unix, unliftio-core + }: + mkDerivation { + pname = "unliftio"; + version = "0.2.22.0"; + sha256 = "125vzwkzp53i5n0yxy7bbivpzgf3c7ynsfhn04xk1ymy9fqsvi0z"; + libraryHaskellDepends = [ + async base bytestring deepseq directory filepath process stm time + transformers unix unliftio-core + ]; + testHaskellDepends = [ + async base bytestring containers deepseq directory filepath hspec + process QuickCheck stm time transformers unix unliftio-core + ]; + benchmarkHaskellDepends = [ + async base bytestring deepseq directory filepath gauge process stm + time transformers unix unliftio-core + ]; + description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "unliftio-core" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -284453,7 +285359,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "unordered-containers_0_2_18_0" = callPackage + "unordered-containers_0_2_19_1" = callPackage ({ mkDerivation, base, bytestring, ChasingBottoms, containers , deepseq, hashable, hashmap, HUnit, mtl, nothunks, QuickCheck , random, tasty, tasty-bench, tasty-hunit, tasty-quickcheck @@ -284461,8 +285367,8 @@ self: { }: mkDerivation { pname = "unordered-containers"; - version = "0.2.18.0"; - sha256 = "09cvqdqaqbf0z5i0hbkgn7hkz44plniznj6zimdx0a86i6lhq3b2"; + version = "0.2.19.1"; + sha256 = "1li8s6qw8mgv6a7011y7hg0cn2nllv2g9sr9c1xb48nmw32vw9qv"; libraryHaskellDepends = [ base deepseq hashable template-haskell ]; testHaskellDepends = [ base ChasingBottoms containers hashable HUnit nothunks QuickCheck @@ -285884,8 +286790,8 @@ self: { pname = "util"; version = "0.1.17.1"; sha256 = "1qhx4r27sny25sykacf5xi5br4msq4335ghp5zc3fq0lii3866s7"; - revision = "1"; - editedCabalFile = "16hbcmcq2674j37gl808n5i02kv0vn3nwq5l2a6v5lj0dn34nicb"; + revision = "2"; + editedCabalFile = "0z9bf05jn5y9k5nrjksfpzjml5xchjrj3nk3jh90g8pygs2658rb"; libraryHaskellDepends = [ base transformers ]; description = "Utilities"; license = lib.licenses.bsd3; @@ -286295,10 +287201,8 @@ self: { }: mkDerivation { pname = "uuid-orphans"; - version = "1.4.5"; - sha256 = "14d7gyf3sa2874r0dhj3ydvmb1iz174kp4pxz7aq984zb4m6d87z"; - revision = "2"; - editedCabalFile = "1202zn5f70f1yvmaknm8l34igg9ihyqs8lhch4ihvx9vcqxs3c0v"; + version = "1.4.6"; + sha256 = "0is5f2fn5ip93wla33dcjpl8hscpcwyv6cpxcmqs25vvbwz27kvz"; libraryHaskellDepends = [ base safecopy text th-lift uuid-types web-routes ]; @@ -286806,16 +287710,27 @@ self: { license = lib.licenses.mit; }) {}; + "validity_0_12_0_1" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "validity"; + version = "0.12.0.1"; + sha256 = "1j9yswqas9dpb9mv132myfn1rky5vbh5gdvcxbb7p93k5c2y4g0w"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "Validity typeclass"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "validity-aeson" = callPackage ({ mkDerivation, aeson, base, hspec, validity, validity-scientific , validity-text, validity-unordered-containers, validity-vector }: mkDerivation { pname = "validity-aeson"; - version = "0.2.0.4"; - sha256 = "1k0x6va9mmz0z9hgd1is71ks4fgbziw53rm7r6jsidp4ksszdzm0"; - revision = "1"; - editedCabalFile = "1zhqg6hac0js33yn0xw10pcp11hbygr95vmcmgpp3sdxdhgpbnmy"; + version = "0.2.0.5"; + sha256 = "0gk2mqhsailjp3130jgd17j2254kx28fnhhwyi1f66is1axw6cmj"; libraryHaskellDepends = [ aeson base validity validity-scientific validity-text validity-unordered-containers validity-vector @@ -286838,6 +287753,22 @@ self: { license = lib.licenses.mit; }) {}; + "validity-case-insensitive" = callPackage + ({ mkDerivation, base, case-insensitive, genvalidity-hspec, hspec + , validity + }: + mkDerivation { + pname = "validity-case-insensitive"; + version = "0.0.0.0"; + sha256 = "075pxgviqmf5xi4if15mbabn32xw11nss19a4il9z9ng1fsrcn1d"; + libraryHaskellDepends = [ base case-insensitive validity ]; + testHaskellDepends = [ + base case-insensitive genvalidity-hspec hspec validity + ]; + description = "Validity instances for case-insensitive"; + license = lib.licenses.mit; + }) {}; + "validity-containers" = callPackage ({ mkDerivation, base, containers, validity }: mkDerivation { @@ -286911,6 +287842,18 @@ self: { license = lib.licenses.mit; }) {}; + "validity-text_0_3_1_3" = callPackage + ({ mkDerivation, base, bytestring, text, validity }: + mkDerivation { + pname = "validity-text"; + version = "0.3.1.3"; + sha256 = "0igxjd53aqlhhnjilbyjsxs4hjc8b21mpi504kc8c60q0ysq7vks"; + libraryHaskellDepends = [ base bytestring text validity ]; + description = "Validity instances for text"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "validity-time" = callPackage ({ mkDerivation, base, time, validity }: mkDerivation { @@ -290123,36 +291066,6 @@ self: { }) {}; "wai-extra" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , bytestring, call-stack, case-insensitive, containers, cookie - , data-default-class, directory, fast-logger, hspec, http-types - , http2, HUnit, iproute, network, resourcet, streaming-commons - , text, time, transformers, unix, vault, wai, wai-logger, word8 - , zlib - }: - mkDerivation { - pname = "wai-extra"; - version = "3.1.8"; - sha256 = "0ddgdr0304b3kg50vfjsg3bxlhfp3vmsb4c8i80k8adqzh54hz5l"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring bytestring call-stack - case-insensitive containers cookie data-default-class directory - fast-logger http-types http2 HUnit iproute network resourcet - streaming-commons text time transformers unix vault wai wai-logger - word8 - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive cookie fast-logger hspec - http-types http2 HUnit iproute resourcet text time transformers wai - zlib - ]; - description = "Provides some basic WAI handlers and middleware"; - license = lib.licenses.mit; - }) {}; - - "wai-extra_3_1_10" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring , bytestring, call-stack, case-insensitive, containers, cookie , data-default-class, directory, fast-logger, hspec, http-types @@ -290180,7 +291093,6 @@ self: { ]; description = "Provides some basic WAI handlers and middleware"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "wai-feature-flags" = callPackage @@ -292592,24 +293504,6 @@ self: { }) {}; "web-routes" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, exceptions - , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck - , split, text, utf8-string - }: - mkDerivation { - pname = "web-routes"; - version = "0.27.14.3"; - sha256 = "1a66m261ilqafbwwgjvalh3rz38qxcwxw9a99wr18lm0ah27lvx4"; - libraryHaskellDepends = [ - base blaze-builder bytestring exceptions ghc-prim http-types mtl - parsec split text utf8-string - ]; - testHaskellDepends = [ base hspec HUnit QuickCheck text ]; - description = "portable, type-safe URL routing"; - license = lib.licenses.bsd3; - }) {}; - - "web-routes_0_27_14_4" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, exceptions , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck , split, text, utf8-string @@ -292625,23 +293519,9 @@ self: { testHaskellDepends = [ base hspec HUnit QuickCheck text ]; description = "portable, type-safe URL routing"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "web-routes-boomerang" = callPackage - ({ mkDerivation, base, boomerang, mtl, parsec, text, web-routes }: - mkDerivation { - pname = "web-routes-boomerang"; - version = "0.28.4.2"; - sha256 = "09vq5gfxibrbh65a4y94crcb99s848rx56grmfny89ccdv6r5a3y"; - libraryHaskellDepends = [ - base boomerang mtl parsec text web-routes - ]; - description = "Use boomerang for type-safe URL parsers/printers"; - license = lib.licenses.bsd3; - }) {}; - - "web-routes-boomerang_0_28_4_3" = callPackage ({ mkDerivation, base, boomerang, mtl, parsec, text, web-routes }: mkDerivation { pname = "web-routes-boomerang"; @@ -292652,7 +293532,6 @@ self: { ]; description = "Use boomerang for type-safe URL parsers/printers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "web-routes-generics" = callPackage @@ -292667,21 +293546,6 @@ self: { }) {}; "web-routes-happstack" = callPackage - ({ mkDerivation, base, bytestring, happstack-server, text - , web-routes - }: - mkDerivation { - pname = "web-routes-happstack"; - version = "0.23.12.1"; - sha256 = "06gifknfv6g9rd9f83r75hc3sld4xb4f1czxs9k5ca7n1l1vlccy"; - libraryHaskellDepends = [ - base bytestring happstack-server text web-routes - ]; - description = "Adds support for using web-routes with Happstack"; - license = lib.licenses.bsd3; - }) {}; - - "web-routes-happstack_0_23_12_2" = callPackage ({ mkDerivation, base, bytestring, happstack-server, text , web-routes }: @@ -292694,21 +293558,9 @@ self: { ]; description = "Adds support for using web-routes with Happstack"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "web-routes-hsp" = callPackage - ({ mkDerivation, base, hsp, text, web-routes }: - mkDerivation { - pname = "web-routes-hsp"; - version = "0.24.6.1"; - sha256 = "1arc22l7xk49fp80i1fkvj8xj71lqxrs2g5gnvjzwlkc0azzaz6a"; - libraryHaskellDepends = [ base hsp text web-routes ]; - description = "Adds XMLGenerator instance for RouteT monad"; - license = lib.licenses.bsd3; - }) {}; - - "web-routes-hsp_0_24_6_2" = callPackage ({ mkDerivation, base, hsp, text, web-routes }: mkDerivation { pname = "web-routes-hsp"; @@ -292717,7 +293569,6 @@ self: { libraryHaskellDepends = [ base hsp text web-routes ]; description = "Adds XMLGenerator instance for RouteT monad"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "web-routes-mtl" = callPackage @@ -292790,21 +293641,6 @@ self: { }) {}; "web-routes-wai" = callPackage - ({ mkDerivation, base, bytestring, http-types, text, wai - , web-routes - }: - mkDerivation { - pname = "web-routes-wai"; - version = "0.24.3.1"; - sha256 = "0j9h22nsj7zf5qpf4i07jdcih00r2fivdilvj8wsylk4d23x27wf"; - libraryHaskellDepends = [ - base bytestring http-types text wai web-routes - ]; - description = "Library for maintaining correctness of URLs within an application"; - license = lib.licenses.bsd3; - }) {}; - - "web-routes-wai_0_24_3_2" = callPackage ({ mkDerivation, base, bytestring, http-types, text, wai , web-routes }: @@ -292817,7 +293653,6 @@ self: { ]; description = "Library for maintaining correctness of URLs within an application"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "web-routing" = callPackage @@ -298471,8 +299306,8 @@ self: { pname = "xmlhtml"; version = "0.2.5.2"; sha256 = "1p2v1cj9jjwbqyb0fyv2201zd7ljz5d46qg5kwy7rz2bchbqd0b4"; - revision = "3"; - editedCabalFile = "00a7ymnzf87p6dv6mphziycyx6p97xbbbvg8fzbqa6am4pvr029z"; + revision = "4"; + editedCabalFile = "1q4f9pvyrkrw793kvd1lxzpzf49h2rs8zdmmhsli487sllflghnq"; libraryHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-builder containers parsec text unordered-containers @@ -299998,6 +300833,33 @@ self: { license = lib.licenses.mit; }) {}; + "yaml-unscrambler_0_1_0_10" = callPackage + ({ mkDerivation, acc, attoparsec, attoparsec-data, attoparsec-time + , base, base64-bytestring, bytestring, conduit, containers, foldl + , hashable, libyaml, mtl, neat-interpolation, QuickCheck + , quickcheck-instances, rerebase, scientific, selective, tasty + , tasty-hunit, tasty-quickcheck, text, text-builder-dev, time + , transformers, unordered-containers, uuid, vector, yaml + }: + mkDerivation { + pname = "yaml-unscrambler"; + version = "0.1.0.10"; + sha256 = "07pwdd6w6gh0x05925hfk5mhzmig6rh9yb87rkyx15197r9hj7xw"; + libraryHaskellDepends = [ + acc attoparsec attoparsec-data attoparsec-time base + base64-bytestring bytestring conduit containers foldl hashable + libyaml mtl scientific selective text text-builder-dev time + transformers unordered-containers uuid vector yaml + ]; + testHaskellDepends = [ + foldl neat-interpolation QuickCheck quickcheck-instances rerebase + tasty tasty-hunit tasty-quickcheck + ]; + description = "Flexible declarative YAML parsing toolkit"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yaml2owl" = callPackage ({ mkDerivation, base, containers, directory, filepath, network , network-uri, swish, text, xml, yaml @@ -301406,8 +302268,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.22.0"; - sha256 = "0vc60va1lj7a409ljpipk90k89pycsf7zfpvdn0bvsqgsy75qgq6"; + version = "1.6.23"; + sha256 = "06v475xa2qbgsqx2gk1lz4y8xwb4d1ak06cw75ig3ji7d1knq4w2"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit conduit-extra @@ -301430,6 +302292,44 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-core_1_6_23_1" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-html + , blaze-markup, bytestring, case-insensitive, cereal, clientsession + , conduit, conduit-extra, containers, cookie, deepseq, entropy + , fast-logger, gauge, hspec, hspec-expectations, http-types, HUnit + , memory, monad-logger, mtl, network, parsec, path-pieces + , primitive, random, resourcet, shakespeare, streaming-commons + , template-haskell, text, time, transformers, unix-compat, unliftio + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.6.23.1"; + sha256 = "1s9wa9xw9ximivwv9bk7lf4w20yhlcy8vyp2i3j6w4fig918qxg9"; + libraryHaskellDepends = [ + aeson auto-update base blaze-html blaze-markup bytestring + case-insensitive cereal clientsession conduit conduit-extra + containers cookie deepseq entropy fast-logger http-types memory + monad-logger mtl parsec path-pieces primitive random resourcet + shakespeare template-haskell text time transformers unix-compat + unliftio unordered-containers vector wai wai-extra wai-logger warp + word8 + ]; + testHaskellDepends = [ + async base bytestring clientsession conduit conduit-extra + containers cookie hspec hspec-expectations http-types HUnit network + path-pieces random resourcet shakespeare streaming-commons + template-haskell text transformers unliftio wai wai-extra warp + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring gauge shakespeare text + ]; + description = "Creation of type-safe, RESTful web applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -302650,32 +303550,6 @@ self: { }) {}; "yesod-test" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , bytestring, case-insensitive, conduit, containers, cookie, hspec - , hspec-core, html-conduit, http-types, HUnit, memory, mtl, network - , pretty-show, text, time, transformers, unliftio, unliftio-core - , wai, wai-extra, xml-conduit, xml-types, yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-test"; - version = "1.6.12"; - sha256 = "1xgy7dzhqjgllqcpyyxs0spdg6vlz2c1sjvni7w7qnsf0ckyw2l8"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html bytestring - case-insensitive conduit containers cookie hspec-core html-conduit - http-types HUnit memory mtl network pretty-show text time - transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers cookie hspec html-conduit http-types - HUnit text unliftio unliftio-core wai wai-extra xml-conduit - yesod-core yesod-form - ]; - description = "integration testing for WAI/Yesod Applications"; - license = lib.licenses.mit; - }) {}; - - "yesod-test_1_6_13" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , bytestring, case-insensitive, conduit, containers, cookie, hspec , hspec-core, html-conduit, http-types, HUnit, memory, mtl, network @@ -302699,7 +303573,6 @@ self: { ]; description = "integration testing for WAI/Yesod Applications"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-test-json" = callPackage @@ -305474,4 +306347,26 @@ self: { broken = true; }) {}; + "zyre2" = callPackage + ({ mkDerivation, base, bytestring, containers, czmq, inline-c, text + , zyre + }: + mkDerivation { + pname = "zyre2"; + version = "0.1.1.0"; + sha256 = "0dqlp60mamqmga6g87qawxg1646czgzhqm441cxpw1dkrshv08jk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers inline-c text + ]; + librarySystemDepends = [ czmq zyre ]; + executableHaskellDepends = [ + base bytestring containers inline-c text + ]; + testHaskellDepends = [ base bytestring containers inline-c text ]; + description = "Haskell zyre bindings for reliable group messaging over local area networks"; + license = lib.licenses.mit; + }) {inherit (pkgs) czmq; zyre = null;}; + } From 4d5a66a1b5a27c53b6d9c4bf356eb3fea4fadab1 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 1 May 2022 20:53:08 +0900 Subject: [PATCH 09/42] haskellPackages.hls-test-utils: remove unneeded patches --- .../haskell-modules/configuration-common.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8393d02a316..eeba731e28b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1667,19 +1667,6 @@ self: super: { lsp = assert super.lsp.version == "1.4.0.0"; dontCheck super.lsp; - hls-test-utils = assert super.hls-test-utils.version == "1.2.0.0"; appendPatches [ - (fetchpatch { - url = "https://github.com/haskell/haskell-language-server/commit/074593987e9086e308b89ecde336de2c64861dc0.patch"; - sha256 = "sha256-uTlIbGQKulP3963UPL2V9cqMoIvPscK+s2W/HtBmMWc="; - relative = "hls-test-utils"; - }) - (fetchpatch { - url = "https://github.com/haskell/haskell-language-server/commit/78305f21783807b04baebca4860c255bfe84d4ab.patch"; - sha256 = "sha256-oe8Q8kBJBkel+pR5imFj43NVpm4afcyLgAUCWhrIoPk="; - relative = "hls-test-utils"; - }) - ] super.hls-test-utils; - # 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1809 hls-eval-plugin = dontCheck super.hls-eval-plugin; From 5d4c4678ff1eb15e5148e8ec5161018933287134 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 1 May 2022 22:12:13 +0900 Subject: [PATCH 10/42] haskell.packages.ghc922.hls-fourmolu-plugin: bump assertion from 1.0.2.0 to 1.0.3.0 since jailbreak is still necessary --- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 2 +- 1 file changed, 1 insertion(+), 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 249816cc49c..32c10636b10 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -216,7 +216,7 @@ self: super: { some = doJailbreak super.some; fourmolu = super.fourmolu_0_6_0_0; # hls-fourmolu-plugin in this version has a to strict upper bound of fourmolu <= 0.5.0.0 - hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.0.2.0"; doJailbreak super.hls-fourmolu-plugin; + hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.0.3.0"; doJailbreak super.hls-fourmolu-plugin; implicit-hie-cradle = doJailbreak super.implicit-hie-cradle; # 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed hashtables = assert super.hashtables.version == "1.2.4.2"; doJailbreak super.hashtables; From f16072011c9f062bb9a0ea40c293aecae4612309 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Mon, 2 May 2022 11:42:50 +0900 Subject: [PATCH 11/42] haskellPackages.hls-change-type-signature-plugin: dontCheck --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index eeba731e28b..5c7b6187349 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2308,6 +2308,10 @@ self: super: { # 2021-09-18: https://github.com/haskell/haskell-language-server/issues/2205 hls-stylish-haskell-plugin = doJailbreak super.hls-stylish-haskell-plugin; + # Necesssary .txt files are not included in sdist. + # https://github.com/haskell/haskell-language-server/pull/2887 + hls-change-type-signature-plugin = dontCheck super.hls-change-type-signature-plugin; + # Too strict bounds on hspec # https://github.com/haskell-works/hw-hspec-hedgehog/issues/62 # https://github.com/haskell-works/hw-prim/issues/132 From fdfc491ba157b3d80ac59f62e98cb2995c1efac5 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 2 May 2022 12:31:21 +0200 Subject: [PATCH 12/42] haskell.packages.ghc922.ghc-exactprint: 1.4.1 -> 1.5.0 The consuming packages all allow the upper bound, so this should be safe. --- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 2 +- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) 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 32c10636b10..a5513a0ed94 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -90,7 +90,7 @@ self: super: { # causing the build-depends to be skipped. Since the dependency # list hasn't changed much since 0.6.4, we can just reuse the # normal expression. - inherit (self.ghc-exactprint_1_4_1) src version; + inherit (self.ghc-exactprint_1_5_0) src version; revision = null; editedCabalFile = null; libraryHaskellDepends = [ self.fail diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index b1bee72c8e2..a444cdcd63f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -121,7 +121,6 @@ extra-packages: - brick == 0.64.* # 2021-12-03: matterhorn depends on brick < 0.65 - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 - ormolu == 0.2.* # 2022-02-21: For ghc 8.8 and 8.10 - - ghc-exactprint == 1.4.* # 2022-02-07: preserve for now, 1.5.0 has a breaking change without type changes - ShellCheck == 0.7.2 # 2022-02-20: haskell-ci 0.14 needs this - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 - attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now From 5a5c806c9f2e0a42ef7114285d4daaba52ff29e5 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 2 May 2022 12:32:26 +0200 Subject: [PATCH 13/42] haskell.packages.ghc922.hlint: unstable -> 3.4 --- .../haskell-modules/configuration-ghc-9.2.x.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) 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 a5513a0ed94..53cb7af96f3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -195,17 +195,7 @@ self: super: { } super.memory); # Use hlint from git for GHC 9.2.1 support - hlint = doDistribute ( - overrideSrc { - version = "unstable-2021-12-12"; - src = pkgs.fetchFromGitHub { - owner = "ndmitchell"; - repo = "hlint"; - rev = "77a9702e10b772a7695c08682cd4f450fd0e9e46"; - sha256 = "0hpp3iw7m7w2abr8vb86gdz3x6c8lj119zxln933k90ia7bmk8jc"; - }; - } super.hlint - ); + hlint = self.hlint_3_4; # https://github.com/sjakobi/bsb-http-chunked/issues/38 bsb-http-chunked = dontCheck super.bsb-http-chunked; From 80ab00ed11671f5070942dc11bff092153d3bfd9 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 2 May 2022 12:32:54 +0200 Subject: [PATCH 14/42] haskell.packages.ghc922.haskell-language-server: enable 3 plugins --- .../haskell-modules/configuration-ghc-9.2.x.nix | 7 ------- 1 file changed, 7 deletions(-) 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 53cb7af96f3..134c43fd0d1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -216,18 +216,11 @@ self: super: { # Compare: https://haskell-language-server.readthedocs.io/en/latest/supported-versions.html haskell-language-server = overrideCabal (old: {libraryHaskellDepends = builtins.filter (x: x != super.hls-tactics-plugin) old.libraryHaskellDepends;}) (appendConfigureFlags [ - "-f-alternateNumberFormat" - "-f-class" - "-f-eval" "-f-haddockComments" - "-f-hlint" "-f-retrie" "-f-splice" "-f-tactics" ] (super.haskell-language-server.override { - hls-alternate-number-format-plugin = null; - hls-class-plugin = null; - hls-eval-plugin = null; hls-haddock-comments-plugin = null; hls-hlint-plugin = null; hls-retrie-plugin = null; From fe8f77c2c086440e8756cba0abf42e7f1b155015 Mon Sep 17 00:00:00 2001 From: Thibault Lemaire Date: Thu, 21 Apr 2022 16:40:39 +0200 Subject: [PATCH 15/42] linphone: Cleanup dependencies A lot of bloat had been accumulated through updates (e.g. with linphone migrating from Gtk to Qt, or linphone being split to liblinphone & linphone-desktop). Method: Through trial and error. Delete all dependencies, try to build, try to run, reintroduce missing dependencies. I have tested everything I could, but it is possible that some optional features have been silently disabled with dependencies not being found now. (Codecs, encryption schemes, etc...) --- .../instant-messengers/linphone/default.nix | 70 +--------------- .../development/libraries/belcard/default.nix | 6 +- .../libraries/liblinphone/default.nix | 82 ++----------------- pkgs/development/libraries/lime/default.nix | 8 +- .../libraries/mediastreamer/default.nix | 37 ++------- .../libraries/mediastreamer/msopenh264.nix | 2 +- 6 files changed, 24 insertions(+), 181 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 3b11f7fc1a8..306a53f0a3c 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,51 +1,18 @@ -{ bcg729 -, bctoolbox -, bcunit +{ bctoolbox , belcard , belle-sip , belr -, bzrtp -, cairo , cmake -, cyrus_sasl , fetchFromGitLab -, fetchurl -, ffmpeg -, gdk-pixbuf -, glib -, graphviz -, gtk2 -, intltool , lib -, libexosip , liblinphone -, libmatroska -, libnotify -, libosip -, libsoup -, libupnp -, libX11 -, libxml2 -, makeWrapper -, mbedtls , mediastreamer , mediastreamer-openh264 , minizip2 , mkDerivation -, openldap -, ortp -, pango -, pkg-config -, qtbase , qtgraphicaleffects , qtquickcontrols2 , qttranslations -, readline -, speex -, sqlite - -, udev -, zlib }: # How to update Linphone? (The Qt desktop app) @@ -95,57 +62,22 @@ mkDerivation rec { # linphone-desktop. buildInputs = [ # Made by BC - bcg729 bctoolbox belcard belle-sip belr - bzrtp liblinphone mediastreamer mediastreamer-openh264 - ortp - - # Vendored by BC but we use upstream, might cause problems - libmatroska - cairo - cyrus_sasl - ffmpeg - gdk-pixbuf - glib - gtk2 - libX11 - libexosip - libnotify - libosip - libsoup - libupnp - libxml2 - mbedtls minizip2 - openldap - pango - qtbase qtgraphicaleffects qtquickcontrols2 qttranslations - readline - speex - sqlite - udev - zlib ]; nativeBuildInputs = [ - # Made by BC - bcunit - cmake - graphviz - intltool - makeWrapper - pkg-config ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index aace36c619c..0f251f73e81 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -22,8 +22,10 @@ stdenv.mkDerivation rec { buildInputs = [ bctoolbox belr ]; nativeBuildInputs = [ cmake ]; - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + cmakeFlags = [ + "-DENABLE_STATIC=NO" # Do not build static libraries + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables + ]; meta = with lib; { description = "C++ library to manipulate VCard standard format. Part of the Linphone project."; diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 89a23dccc7e..10c2bfb272c 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -1,50 +1,20 @@ -{ bcg729 -, bctoolbox -, bcunit +{ bctoolbox , belcard , belle-sip , belr -, bzrtp -, cairo , cmake -, cyrus_sasl , doxygen , fetchFromGitLab -, ffmpeg -, gdk-pixbuf -, glib -, graphviz -, gtk2 -, intltool , jsoncpp -, libexosip -, libmatroska -, libnotify -, libosip -, libsoup -, libupnp -, libX11 , libxml2 , lime -, makeWrapper -, mbedtls , mediastreamer -, openldap -, ortp -, pango -, pkg-config , python3 -, readline , bc-soci -, boost -, speex , sqlite , lib , stdenv -, udev , xercesc -, xsd -, zlib }: stdenv.mkDerivation rec { @@ -62,69 +32,31 @@ stdenv.mkDerivation rec { patches = [ ./use-normal-jsoncpp.patch ]; - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + cmakeFlags = [ + "-DENABLE_STATIC=NO" # Do not build static libraries + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables + ]; - # TODO: Not sure if all these inputs are actually needed. Most of them were - # defined when liblinphone and linphone-desktop weren't separated yet, so some - # of them might not be needed for liblinphone alone. buildInputs = [ - (python3.withPackages (ps: [ ps.pystache ps.six ])) - # Made by BC - bcg729 - bctoolbox belcard belle-sip - belr - bzrtp lime mediastreamer - ortp # Vendored by BC bc-soci - # Vendored by BC but we use upstream, might cause problems - libmatroska - - cairo - cyrus_sasl - ffmpeg - gdk-pixbuf - glib - gtk2 - libX11 - libexosip - libnotify - libosip - libsoup - libupnp + jsoncpp libxml2 - mbedtls - openldap - pango - readline - boost - speex + (python3.withPackages (ps: [ ps.pystache ps.six ])) sqlite - udev xercesc - xsd - zlib - jsoncpp ]; nativeBuildInputs = [ - # Made by BC - bcunit - cmake doxygen - graphviz - intltool - makeWrapper - pkg-config ]; strictDeps = true; diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix index 1d6a94a828a..38dd0d04e67 100644 --- a/pkgs/development/libraries/lime/default.nix +++ b/pkgs/development/libraries/lime/default.nix @@ -5,7 +5,6 @@ , lib , bc-soci , sqlite -, boost , stdenv }: @@ -31,12 +30,13 @@ stdenv.mkDerivation rec { bc-soci sqlite - boost ]; nativeBuildInputs = [ cmake ]; - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + cmakeFlags = [ + "-DENABLE_STATIC=NO" # Do not build static libraries + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables + ]; meta = with lib; { description = "End-to-end encryption library for instant messaging. Part of the Linphone project."; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 2d9c559bcba..bb5bc566bc1 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,33 +1,21 @@ -{ alsa-lib -, bctoolbox +{ bctoolbox , bzrtp , cmake -, doxygen , fetchFromGitLab , ffmpeg , glew , gsm -, intltool , lib -, libGL -, libGLU , libX11 , libXext -, libXv -, libmatroska , libopus -, libpcap , libpulseaudio -, libtheora -, libupnp , libv4l , libvpx , ortp -, pkg-config , python3 , qtbase , qtdeclarative -, SDL , speex , srtp , stdenv @@ -59,9 +47,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - doxygen - intltool - pkg-config python3 qtbase qtdeclarative @@ -73,28 +58,19 @@ stdenv.mkDerivation rec { bzrtp ortp - # Vendored by BC but we use upstream, might cause problems - libmatroska - - alsa-lib ffmpeg glew - gsm - libGL - libGLU libX11 libXext - libXv - libopus - libpcap libpulseaudio - libtheora - libupnp libv4l - libvpx - SDL speex srtp + + # Optional + gsm # GSM audio codec + libopus # Opus audio codec + libvpx # VP8 video codec ]; strictDeps = true; @@ -104,6 +80,7 @@ stdenv.mkDerivation rec { "-DENABLE_QT_GL=ON" # Build necessary MSQOGL plugin for Linphone desktop "-DCMAKE_C_FLAGS=-DGIT_VERSION=\"v${version}\"" "-DENABLE_STRICT=NO" # Disable -Werror + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables ]; NIX_LDFLAGS = "-lXext"; diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index 17f537b4d87..83a96175cba 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-AqZ7tsNZw2Djgyo1JBJbT/c3eQVyEn6r3CT6DQLD/B8="; }; - nativeBuildInputs = [ autoreconfHook cmake pkg-config ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ mediastreamer openh264 ]; # Do not build static libraries From fdd493e6bb874aaedc55457b9d762c35b3190037 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 4 May 2022 00:28:22 +0200 Subject: [PATCH 16/42] haskellPackages.servant-cassava: allow servant 0.19 --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5c7b6187349..06b394bbe5e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2648,4 +2648,9 @@ self: super: { sha256 = "sha256-fW5bVbAGQxU/gd9zqgVNclwKraBtUjkKDek7L0c4+O0="; }) super.wstunnel; + # Adjustment of bounds on servant is unreleased + # https://github.com/haskell-servant/servant-cassava/commit/66617547851d38d48f5f1d1b786db1286bdafa9d + servant-cassava = assert super.servant-cassava.version == "0.10.1"; + doJailbreak super.servant-cassava; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 6afd1dc17d5..24d92c5d3c9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4486,7 +4486,6 @@ broken-packages: - servant-auth-hmac - servant-avro - servant-benchmark - - servant-cassava - servant-client-js - servant-db - servant-dhall diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ba29b38f362..39e9c4f096e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -243783,8 +243783,6 @@ self: { ]; description = "Servant CSV content-type for cassava"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-checked-exceptions" = callPackage From 6a8a22133fae643f0a43b0c53c28d3a944193b4f Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 4 May 2022 10:23:39 +0800 Subject: [PATCH 17/42] haskellPackages.jacinda: disable tests only on x86_64-darwin --- pkgs/development/haskell-modules/configuration-darwin.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 3471e874290..9a917098d79 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -296,4 +296,7 @@ self: super: ({ # tests appear to be failing to link or something: # https://hydra.nixos.org/build/174540882/nixlog/9 regex-rure = dontCheck super.regex-rure; + # same + # https://hydra.nixos.org/build/174540882/nixlog/9 + jacinda = dontCheck super.jacinda; }) From 6c366db32ddf8ea4fd8cf0df53348c9ae301fd99 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 4 May 2022 12:48:07 +0200 Subject: [PATCH 18/42] haskellPackages.ghc-exactprint_1_4_1: remove at 1.4.1 Apply config change of fdfc491 --- .../haskell-modules/hackage-packages.nix | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 39e9c4f096e..421da011274 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -105793,21 +105793,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-exactprint_1_4_1" = callPackage - ({ mkDerivation }: - mkDerivation { - pname = "ghc-exactprint"; - version = "1.4.1"; - sha256 = "0q9z43753arxbcs6mz26kz4dsz0c2i5hkxa125gl36vsipxfrq92"; - revision = "1"; - editedCabalFile = "00wvn8j7439r5pp9wjqasv710amrsf34qpa3czxja2khg9jdnngj"; - isLibrary = true; - isExecutable = true; - description = "ExactPrint for GHC"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "ghc-exactprint_1_5_0" = callPackage ({ mkDerivation }: mkDerivation { From 16e15fa68f0247d1ccc9bf94e2906097bcaa2d5c Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 4 May 2022 17:46:39 -0700 Subject: [PATCH 19/42] treewide: add meta.mainProgram to many packages --- pkgs/applications/editors/oed/default.nix | 3 ++- pkgs/applications/editors/vscode/vscodium.nix | 1 + pkgs/applications/emulators/commanderx16/emulator.nix | 3 ++- pkgs/applications/misc/nanoblogger/default.nix | 1 + pkgs/applications/misc/oil-buku/default.nix | 3 ++- pkgs/applications/misc/taskwarrior/default.nix | 1 + pkgs/applications/misc/translate-shell/default.nix | 1 + pkgs/applications/misc/web-media-controller/default.nix | 1 + pkgs/applications/networking/cluster/bosh-cli/default.nix | 1 + pkgs/applications/networking/cluster/fluxcd/default.nix | 1 + pkgs/applications/networking/cluster/krelay/default.nix | 1 + .../applications/networking/cluster/openshift/default.nix | 3 ++- pkgs/applications/networking/syncthing/default.nix | 1 + pkgs/applications/office/todo.txt-cli/default.nix | 1 + pkgs/applications/radio/kalibrate-rtl/default.nix | 3 ++- pkgs/applications/radio/soapysdr/default.nix | 1 + pkgs/applications/science/logic/abc/default.nix | 3 ++- pkgs/applications/science/logic/key/default.nix | 1 + pkgs/development/compilers/dotnet/build-dotnet.nix | 7 ++++--- pkgs/development/compilers/fstar/default.nix | 5 +++-- pkgs/development/compilers/jasmin-compiler/default.nix | 3 ++- pkgs/development/compilers/vlang/default.nix | 1 + pkgs/development/interpreters/kona/default.nix | 1 + pkgs/development/interpreters/rakudo/moarvm.nix | 3 ++- pkgs/development/tools/ammonite/default.nix | 3 ++- .../tools/build-managers/gnumake/4.2/default.nix | 8 ++++---- pkgs/development/tools/build-managers/gnumake/default.nix | 8 ++++---- pkgs/development/tools/build-managers/jam/ftjam.nix | 3 ++- pkgs/development/tools/build-managers/samurai/default.nix | 3 ++- .../tools/build-managers/sbt-extras/default.nix | 4 ++-- pkgs/development/tools/buildkit/default.nix | 1 + .../tools/continuous-integration/jenkins/default.nix | 3 ++- pkgs/development/tools/dapr/cli/default.nix | 3 ++- pkgs/development/tools/ent/default.nix | 3 ++- pkgs/development/tools/gnulib/default.nix | 3 ++- pkgs/development/tools/go-swag/default.nix | 1 + pkgs/development/tools/goa/default.nix | 3 ++- pkgs/development/tools/jd-diff-patch/default.nix | 1 + pkgs/development/tools/jmespath/default.nix | 3 ++- pkgs/development/tools/kustomize/3.nix | 1 + .../tools/literate-programming/Literate/default.nix | 3 ++- pkgs/development/tools/misc/chruby/default.nix | 3 ++- pkgs/development/tools/misc/gnum4/default.nix | 4 ++-- pkgs/development/tools/misc/premake/default.nix | 5 +++-- pkgs/development/tools/misc/watson-ruby/default.nix | 1 + pkgs/development/tools/rust/bindgen/unwrapped.nix | 3 ++- pkgs/development/tools/rust/rust-analyzer/default.nix | 1 + pkgs/development/tools/selenium/server/default.nix | 3 ++- pkgs/development/web/lucky-cli/default.nix | 4 ++-- pkgs/development/web/shopify-cli/default.nix | 3 ++- pkgs/games/bugdom/default.nix | 5 ++--- pkgs/games/r2mod_cli/default.nix | 1 + pkgs/games/tcl2048/default.nix | 3 ++- pkgs/misc/openrussian-cli/default.nix | 3 ++- pkgs/misc/platformsh/default.nix | 3 ++- pkgs/misc/screensavers/pipes/default.nix | 3 ++- pkgs/servers/exhibitor/default.nix | 3 ++- pkgs/servers/gotify/default.nix | 1 + pkgs/servers/icingaweb2/default.nix | 3 ++- pkgs/servers/mail/opensmtpd/filter-rspamd.nix | 3 ++- pkgs/servers/monitoring/prometheus/json-exporter.nix | 1 + pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix | 1 + pkgs/servers/t-rex/default.nix | 1 + pkgs/servers/unifiedpush-common-proxies/default.nix | 1 + pkgs/servers/web-apps/engelsystem/default.nix | 3 ++- pkgs/servers/web-apps/lemmy/server.nix | 1 + pkgs/servers/web-apps/vikunja/api.nix | 1 + pkgs/shells/zsh/zplug/default.nix | 3 ++- pkgs/shells/zsh/zsh-history/default.nix | 5 +++-- pkgs/tools/archivers/gnutar/default.nix | 4 ++-- pkgs/tools/audio/glyr/default.nix | 3 ++- pkgs/tools/compression/xdelta/default.nix | 1 + pkgs/tools/compression/xdelta/unstable.nix | 1 + pkgs/tools/misc/anystyle-cli/default.nix | 1 + pkgs/tools/misc/didyoumean/default.nix | 1 + pkgs/tools/misc/go.rice/default.nix | 3 ++- pkgs/tools/misc/graylog/default.nix | 3 ++- pkgs/tools/misc/mysql2pgsql/default.nix | 1 + pkgs/tools/misc/opentelemetry-collector/contrib.nix | 5 +++-- pkgs/tools/misc/wakatime/default.nix | 1 + pkgs/tools/misc/zsh-autoenv/default.nix | 1 + pkgs/tools/networking/obfs4/default.nix | 1 + pkgs/tools/networking/ooniprobe-cli/default.nix | 1 + pkgs/tools/networking/samplicator/default.nix | 1 + pkgs/tools/networking/slack-cli/default.nix | 1 + pkgs/tools/networking/tinc/default.nix | 1 + pkgs/tools/nix/nixos-generators/default.nix | 1 + pkgs/tools/security/bash-supergenpass/default.nix | 5 +++-- pkgs/tools/security/sequoia/default.nix | 1 + pkgs/tools/security/vault/vault-bin.nix | 5 +++-- pkgs/tools/system/nkeys/default.nix | 1 + pkgs/tools/system/taskspooler/default.nix | 5 +++-- pkgs/tools/text/discount/default.nix | 1 + pkgs/tools/text/replace/default.nix | 3 ++- 94 files changed, 157 insertions(+), 71 deletions(-) diff --git a/pkgs/applications/editors/oed/default.nix b/pkgs/applications/editors/oed/default.nix index f4012220c50..a17199c2ff6 100644 --- a/pkgs/applications/editors/oed/default.nix +++ b/pkgs/applications/editors/oed/default.nix @@ -24,9 +24,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/ibara/oed"; description = "Portable ed editor from OpenBSD"; + homepage = "https://github.com/ibara/oed"; license = with licenses; [ bsd2 ]; + mainProgram = "ed"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 41dfc3b1145..633688567ae 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -60,6 +60,7 @@ in downloadPage = "https://github.com/VSCodium/vscodium/releases"; license = licenses.mit; maintainers = with maintainers; [ synthetica turion bobby285271 ]; + mainProgram = "codium"; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" "armv7l-linux" ]; }; } diff --git a/pkgs/applications/emulators/commanderx16/emulator.nix b/pkgs/applications/emulators/commanderx16/emulator.nix index d15c99d355b..d070c86eef8 100644 --- a/pkgs/applications/emulators/commanderx16/emulator.nix +++ b/pkgs/applications/emulators/commanderx16/emulator.nix @@ -29,10 +29,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://www.commanderx16.com/forum/index.php?/home/"; description = "The official emulator of CommanderX16 8-bit computer"; + homepage = "https://www.commanderx16.com/forum/index.php?/home/"; license = licenses.bsd2; maintainers = with maintainers; [ AndersonTorres ]; + mainProgram = "x16emu"; inherit (SDL2.meta) platforms; }; diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix index e8fa4d4fd37..0ae63d210e7 100644 --- a/pkgs/applications/misc/nanoblogger/default.nix +++ b/pkgs/applications/misc/nanoblogger/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { description = "Small weblog engine written in Bash for the command line"; homepage = "http://nanoblogger.sourceforge.net/"; license = lib.licenses.gpl2; + mainProgram = "nb"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/oil-buku/default.nix b/pkgs/applications/misc/oil-buku/default.nix index e0c05488288..5f895179f1f 100644 --- a/pkgs/applications/misc/oil-buku/default.nix +++ b/pkgs/applications/misc/oil-buku/default.nix @@ -38,7 +38,8 @@ stdenvNoCC.mkDerivation rec { description = "Search-as-you-type cli frontend for the buku bookmarks manager using peco"; homepage = "https://github.com/AndreiUlmeyda/oil"; license = licenses.gpl3Only; - platforms = platforms.unix; maintainers = with maintainers; [ atila ]; + mainProgram = "oil"; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index 5a12380a4ff..56baa1e9d82 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { homepage = "https://taskwarrior.org"; license = licenses.mit; maintainers = with maintainers; [ marcweber oxalica ]; + mainProgram = "task"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index be2ee1e7a85..e46f5d2b8c1 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { description = "Command-line translator using Google Translate, Bing Translator, Yandex.Translate, and Apertium"; license = licenses.unlicense; maintainers = with maintainers; [ ebzzry infinisil ]; + mainProgram = "trans"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/web-media-controller/default.nix b/pkgs/applications/misc/web-media-controller/default.nix index 7e0fbb999f5..d2b5b924ea8 100644 --- a/pkgs/applications/misc/web-media-controller/default.nix +++ b/pkgs/applications/misc/web-media-controller/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { description = "MPRIS proxy for usage with 'Web Media Controller' web extension"; license = licenses.unlicense; maintainers = with maintainers; [ doronbehar ]; + mainProgram = "web-media-controller"; platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index beedc41fa8e..069307c41e9 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -39,5 +39,6 @@ buildGoModule rec { changelog = "https://github.com/cloudfoundry/bosh-cli/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ris ]; + mainProgram = "bosh"; }; } diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 3889082ec0c..21e2f00c3e2 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -66,5 +66,6 @@ in buildGoModule rec { homepage = "https://fluxcd.io"; license = licenses.asl20; maintainers = with maintainers; [ bryanasdev000 jlesquembre superherointj ]; + mainProgram = "flux"; }; } diff --git a/pkgs/applications/networking/cluster/krelay/default.nix b/pkgs/applications/networking/cluster/krelay/default.nix index f0a9912ab91..16e9203bf9c 100644 --- a/pkgs/applications/networking/cluster/krelay/default.nix +++ b/pkgs/applications/networking/cluster/krelay/default.nix @@ -27,5 +27,6 @@ buildGoModule rec { changelog = "https://github.com/knight42/krelay/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ivankovnatsky ]; + mainProgram = "kubectl-relay"; }; } diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index bab73c41f5f..89bbd0cb7d6 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -60,9 +60,10 @@ buildGoModule rec { meta = with lib; { description = "Build, deploy, and manage your applications with Docker and Kubernetes"; - license = licenses.asl20; homepage = "http://www.openshift.org"; + license = licenses.asl20; maintainers = with maintainers; [ offline bachp moretea stehessel ]; + mainProgram = "oc"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index e4088c3c460..9c50cb28ec1 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -45,6 +45,7 @@ let changelog = "https://github.com/syncthing/syncthing/releases/tag/v${version}"; license = licenses.mpl20; maintainers = with maintainers; [ joko peterhoeg andrew-d ]; + mainProgram = target; platforms = platforms.unix; }; }; diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix index 0e06cf2f65a..fbeea839962 100644 --- a/pkgs/applications/office/todo.txt-cli/default.nix +++ b/pkgs/applications/office/todo.txt-cli/default.nix @@ -23,6 +23,7 @@ in stdenv.mkDerivation { description = "Simple plaintext todo list manager"; homepage = "http://todotxt.com"; license = lib.licenses.gpl3; + mainProgram = "todo.sh"; platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/radio/kalibrate-rtl/default.nix b/pkgs/applications/radio/kalibrate-rtl/default.nix index eb5937bbc3c..b463faa4a25 100644 --- a/pkgs/applications/radio/kalibrate-rtl/default.nix +++ b/pkgs/applications/radio/kalibrate-rtl/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/steve-m/kalibrate-rtl"; license = licenses.bsd2; - platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ bjornfor viraptor ]; + mainProgram = "kal"; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 79dcab19acb..4875a4818f8 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -51,6 +51,7 @@ in stdenv.mkDerivation { description = "Vendor and platform neutral SDR support library"; license = licenses.boost; maintainers = with maintainers; [ markuskowa ]; + mainProgram = "SoapySDRUtil"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 20c33f0fbae..4e808dd8f19 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { description = "A tool for squential logic synthesis and formal verification"; homepage = "https://people.eecs.berkeley.edu/~alanmi/abc"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; + mainProgram = "abc"; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/logic/key/default.nix b/pkgs/applications/science/logic/key/default.nix index aee1a9c63f8..5a48abfc4aa 100644 --- a/pkgs/applications/science/logic/key/default.nix +++ b/pkgs/applications/science/logic/key/default.nix @@ -115,6 +115,7 @@ in stdenv.mkDerivation rec { ''; license = licenses.gpl2; maintainers = with maintainers; [ fgaz ]; + mainProgram = executable-name; platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index bfc2ab7f9b0..4a30107bbec 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -87,10 +87,11 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://dotnet.github.io/"; description = builtins.getAttr type descriptions; - platforms = builtins.attrNames srcs; - maintainers = with maintainers; [ kuznero ]; + homepage = "https://dotnet.github.io/"; license = licenses.mit; + maintainers = with maintainers; [ kuznero ]; + mainProgram = "dotnet"; + platforms = builtins.attrNames srcs; }; } diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index fc0f50d0797..eb81efe2de0 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -64,9 +64,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ML-like functional programming language aimed at program verification"; homepage = "https://www.fstar-lang.org"; - license = licenses.asl20; changelog = "https://github.com/FStarLang/FStar/raw/v${version}/CHANGES.md"; - platforms = with platforms; darwin ++ linux; + license = licenses.asl20; maintainers = with maintainers; [ gebner pnmadelaine ]; + mainProgram = "fstar.exe"; + platforms = with platforms; darwin ++ linux; }; } diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/development/compilers/jasmin-compiler/default.nix index 7642ae4aff2..dbacda5c479 100644 --- a/pkgs/development/compilers/jasmin-compiler/default.nix +++ b/pkgs/development/compilers/jasmin-compiler/default.nix @@ -34,8 +34,9 @@ stdenv.mkDerivation rec { meta = { description = "A workbench for high-assurance and high-speed cryptography"; homepage = "https://github.com/jasmin-lang/jasmin/"; - platforms = lib.platforms.all; license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; + mainProgram = "jasminc"; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix index 0c24e67123c..065e4462f2e 100644 --- a/pkgs/development/compilers/vlang/default.nix +++ b/pkgs/development/compilers/vlang/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { description = "Simple, fast, safe, compiled language for developing maintainable software"; license = licenses.mit; maintainers = with maintainers; [ Madouura ]; + mainProgram = "v"; platforms = platforms.all; }; } diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index 24e10eb7306..cfc1c12d192 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { description = "An interpreter of K, APL-like programming language"; homepage = "https://github.com/kevinlawler/kona/"; maintainers = with maintainers; [ raskin ]; + mainProgram = "k"; platforms = platforms.all; license = licenses.isc; }; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 6ecc3ad6053..08c225603eb 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -35,7 +35,8 @@ stdenv.mkDerivation rec { description = "VM with adaptive optimization and JIT compilation, built for Rakudo"; homepage = "https://moarvm.org"; license = licenses.artistic2; - platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; + mainProgram = "moar"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index efeaf9df507..7d9dbe6f393 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -76,8 +76,9 @@ let ''; homepage = "https://github.com/com-lihaoyi/Ammonite"; license = licenses.mit; - platforms = platforms.all; maintainers = [ maintainers.nequissimus ]; + mainProgram = "amm"; + platforms = platforms.all; }; }; in { diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 7d56e55ebdb..21e9abd04f2 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -40,10 +40,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "info" ]; meta = with lib; { - homepage = "https://www.gnu.org/software/make/"; description = "A tool to control the generation of non-source files from sources"; - license = licenses.gpl3Plus; - longDescription = '' Make is a tool which controls the generation of executables and other non-source files of a program from the program's source files. @@ -54,8 +51,11 @@ stdenv.mkDerivation rec { should write a makefile for it, so that it is possible to use Make to build and install the program. ''; + homepage = "https://www.gnu.org/software/make/"; - platforms = platforms.all; + license = licenses.gpl3Plus; maintainers = [ maintainers.vrthra ]; + mainProgram = "make"; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index 183548f5e31..7c4b0ad4650 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -37,10 +37,7 @@ stdenv.mkDerivation rec { separateDebugInfo = true; meta = with lib; { - homepage = "https://www.gnu.org/software/make/"; description = "A tool to control the generation of non-source files from sources"; - license = licenses.gpl3Plus; - longDescription = '' Make is a tool which controls the generation of executables and other non-source files of a program from the program's source files. @@ -51,8 +48,11 @@ stdenv.mkDerivation rec { should write a makefile for it, so that it is possible to use Make to build and install the program. ''; + homepage = "https://www.gnu.org/software/make/"; - platforms = platforms.all; + license = licenses.gpl3Plus; maintainers = [ maintainers.vrthra ]; + mainProgram = "make"; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/jam/ftjam.nix b/pkgs/development/tools/build-managers/jam/ftjam.nix index 6007b67f148..1f106401c0d 100644 --- a/pkgs/development/tools/build-managers/jam/ftjam.nix +++ b/pkgs/development/tools/build-managers/jam/ftjam.nix @@ -42,10 +42,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "https://freetype.org/jam/"; description = "Freetype's enhanced, backwards-compatible Jam clone"; + homepage = "https://freetype.org/jam/"; license = licenses.free; maintainers = with maintainers; [ AndersonTorres ]; + mainProgram = "jam"; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/build-managers/samurai/default.nix b/pkgs/development/tools/build-managers/samurai/default.nix index b13762d63b1..675160751d1 100644 --- a/pkgs/development/tools/build-managers/samurai/default.nix +++ b/pkgs/development/tools/build-managers/samurai/default.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://github.com/michaelforney/samurai"; description = "ninja-compatible build tool written in C"; longDescription = '' samurai is a ninja-compatible build tool with a focus on simplicity, @@ -50,8 +49,10 @@ stdenv.mkDerivation rec { .ninja_deps as the original ninja tool, currently version 5 and 4 respectively. ''; + homepage = "https://github.com/michaelforney/samurai"; license = with licenses; [ mit asl20 ]; # see LICENSE maintainers = with maintainers; [ dtzWill AndersonTorres ]; + mainProgram = "samu"; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index 26770276372..fa59649dd23 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -67,11 +67,11 @@ stdenv.mkDerivation rec { ''; meta = { - description = - "A more featureful runner for sbt, the simple/scala/standard build tool"; + description = "A more featureful runner for sbt, the simple/scala/standard build tool"; homepage = "https://github.com/paulp/sbt-extras"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ nequissimus puffnfresh ]; + mainProgram = "sbt"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 9244a80672e..88f8846a47b 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -24,5 +24,6 @@ buildGoModule rec { homepage = "https://github.com/moby/buildkit"; license = licenses.asl20; maintainers = with maintainers; [ vdemeester marsam ]; + mainProgram = "buildctl"; }; } diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 5c95c99814d..e3562282afb 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -69,7 +69,8 @@ stdenv.mkDerivation rec { description = "An extendable open source continuous integration server"; homepage = "https://jenkins-ci.org"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ coconnor fpletz earldouglas nequissimus ]; + mainProgram = "jenkins-cli"; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/dapr/cli/default.nix b/pkgs/development/tools/dapr/cli/default.nix index 96b86719e6c..d0d32de0ce1 100644 --- a/pkgs/development/tools/dapr/cli/default.nix +++ b/pkgs/development/tools/dapr/cli/default.nix @@ -28,9 +28,10 @@ buildGoModule rec { ''; meta = with lib; { - homepage = "https://dapr.io"; description = "A CLI for managing Dapr, the distributed application runtime"; + homepage = "https://dapr.io"; license = licenses.mit; maintainers = with maintainers; [ lucperkins ]; + mainProgram = "dapr"; }; } diff --git a/pkgs/development/tools/ent/default.nix b/pkgs/development/tools/ent/default.nix index 79470814ada..c9ed951d596 100644 --- a/pkgs/development/tools/ent/default.nix +++ b/pkgs/development/tools/ent/default.nix @@ -31,10 +31,11 @@ buildGoModule rec { meta = with lib; { description = "An entity framework for Go"; + homepage = "https://entgo.io/"; downloadPage = "https://github.com/ent/ent"; license = licenses.asl20; - homepage = "https://entgo.io/"; maintainers = with maintainers; [ superherointj ]; + mainProgram = "ent"; }; } diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index 708cdb511a8..afc91cb6030 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -27,9 +27,10 @@ stdenv.mkDerivation { dontFixup = true; meta = with lib; { - homepage = "https://www.gnu.org/software/gnulib/"; description = "Central location for code to be shared among GNU packages"; + homepage = "https://www.gnu.org/software/gnulib/"; license = licenses.gpl3Plus; + mainProgram = "gnulib-tool"; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/go-swag/default.nix b/pkgs/development/tools/go-swag/default.nix index 8c340b2ccf6..9f53c702014 100644 --- a/pkgs/development/tools/go-swag/default.nix +++ b/pkgs/development/tools/go-swag/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { homepage = "https://github.com/swaggo/swag"; license = licenses.mit; maintainers = with maintainers; [ stephenwithph ]; + mainProgram = "swag"; }; } diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 56b47bd8c60..4290d1501eb 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -17,9 +17,10 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with lib; { - homepage = "https://goa.design"; description = "A framework for building microservices in Go using a unique design-first approach"; + homepage = "https://goa.design"; license = licenses.mit; maintainers = [ maintainers.rushmorem ]; + mainProgram = "goagen"; }; } diff --git a/pkgs/development/tools/jd-diff-patch/default.nix b/pkgs/development/tools/jd-diff-patch/default.nix index 96fd79d62fc..26c9eeedacd 100644 --- a/pkgs/development/tools/jd-diff-patch/default.nix +++ b/pkgs/development/tools/jd-diff-patch/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { homepage = "https://github.com/josephburnett/jd"; license = licenses.mit; maintainers = with maintainers; [ bryanasdev000 blaggacao ]; + mainProgram = "jd"; }; } diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix index 5abbf71e7f4..c9510a35d10 100644 --- a/pkgs/development/tools/jmespath/default.nix +++ b/pkgs/development/tools/jmespath/default.nix @@ -16,7 +16,8 @@ buildGoPackage rec { meta = with lib; { description = "A JMESPath implementation in Go"; homepage = "https://github.com/jmespath/go-jmespath"; - maintainers = with maintainers; [ cransom ]; license = licenses.asl20; + maintainers = with maintainers; [ cransom ]; + mainProgram = "jpgo"; }; } diff --git a/pkgs/development/tools/kustomize/3.nix b/pkgs/development/tools/kustomize/3.nix index aa99256faa8..d9eb6ce298e 100644 --- a/pkgs/development/tools/kustomize/3.nix +++ b/pkgs/development/tools/kustomize/3.nix @@ -36,5 +36,6 @@ buildGoModule rec { homepage = "https://github.com/kubernetes-sigs/kustomize"; license = licenses.asl20; maintainers = with maintainers; [ carlosdagos vdemeester zaninime Chili-Man saschagrunert ]; + mainProgram = "kustomize"; }; } diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix index 1582ca87402..1a71b9bc857 100644 --- a/pkgs/development/tools/literate-programming/Literate/default.nix +++ b/pkgs/development/tools/literate-programming/Literate/default.nix @@ -18,8 +18,9 @@ stdenv.mkDerivation { meta = with lib; { description = "A literate programming tool for any language"; - homepage = "http://literate.zbyedidia.webfactional.com/"; + homepage = "https://zyedidia.github.io/literate/"; license = licenses.mit; + mainProgram = "lit"; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/chruby/default.nix b/pkgs/development/tools/misc/chruby/default.nix index 1aef6d52075..cbe22351327 100644 --- a/pkgs/development/tools/misc/chruby/default.nix +++ b/pkgs/development/tools/misc/chruby/default.nix @@ -37,7 +37,8 @@ in stdenv.mkDerivation rec { description = "Changes the current Ruby"; homepage = "https://github.com/postmodern/chruby"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ cstrahan ]; + mainProgram = "chruby-exec"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 806625934d9..e0f71b2b3c3 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -19,9 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ]; meta = { - homepage = "https://www.gnu.org/software/m4/"; description = "GNU M4, a macro processor"; - longDescription = '' GNU M4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 compatible although it has some @@ -38,8 +36,10 @@ stdenv.mkDerivation rec { recursion etc... m4 can be used either as a front-end to a compiler or as a macro processor in its own right. ''; + homepage = "https://www.gnu.org/software/m4/"; license = lib.licenses.gpl3Plus; + mainProgram = "m4"; platforms = lib.platforms.unix ++ lib.platforms.windows; }; diff --git a/pkgs/development/tools/misc/premake/default.nix b/pkgs/development/tools/misc/premake/default.nix index 35c651f4a18..e3c4aef87bd 100644 --- a/pkgs/development/tools/misc/premake/default.nix +++ b/pkgs/development/tools/misc/premake/default.nix @@ -23,10 +23,11 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = with lib; { - homepage = "https://premake.github.io/"; description = "A simple build configuration and project generation tool using lua"; + homepage = "https://premake.github.io/"; license = lib.licenses.bsd3; - platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; + mainProgram = "premake4"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix index 4d17680471d..eb6c8bd7619 100644 --- a/pkgs/development/tools/misc/watson-ruby/default.nix +++ b/pkgs/development/tools/misc/watson-ruby/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://goosecode.com/watson/"; license = with licenses; mit; maintainers = with maintainers; [ robertodr nicknovitski ]; + mainProgram = "watson"; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index f77e2feb4ff..458b4a10c8d 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -46,7 +46,8 @@ in rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/rust-lang/rust-bindgen"; license = with licenses; [ bsd3 ]; - platforms = platforms.unix; maintainers = with maintainers; [ johntitor ralith ]; + mainProgram = "bindgen"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 92d731c79b5..7b2493ba985 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -61,5 +61,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://rust-analyzer.github.io"; license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ oxalica ]; + mainProgram = "rust-analyzer"; }; } diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 61959b98b4c..943d6b60b60 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -33,8 +33,9 @@ in stdenv.mkDerivation rec { meta = { homepage = "http://www.seleniumhq.org/"; description = "Selenium Server for remote WebDriver"; + license = licenses.asl20; maintainers = with maintainers; [ coconnor offline ]; + mainProgram = "selenium-server"; platforms = platforms.all; - license = licenses.asl20; }; } diff --git a/pkgs/development/web/lucky-cli/default.nix b/pkgs/development/web/lucky-cli/default.nix index a87892c5f14..3d2901bc9ac 100644 --- a/pkgs/development/web/lucky-cli/default.nix +++ b/pkgs/development/web/lucky-cli/default.nix @@ -33,11 +33,11 @@ crystal.buildCrystalPackage rec { ''; meta = with lib; { - description = - "A Crystal library for creating and running tasks. Also generates Lucky projects"; + description = "A Crystal library for creating and running tasks. Also generates Lucky projects"; homepage = "https://luckyframework.org/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; + mainProgram = "lucky"; platforms = platforms.unix; broken = lib.versionOlder crystal.version "0.35.1"; }; diff --git a/pkgs/development/web/shopify-cli/default.nix b/pkgs/development/web/shopify-cli/default.nix index a3ec7ff3f31..e6f164f2bca 100644 --- a/pkgs/development/web/shopify-cli/default.nix +++ b/pkgs/development/web/shopify-cli/default.nix @@ -27,8 +27,9 @@ stdenv.mkDerivation rec { description = "CLI which helps you build against the Shopify platform faster"; homepage = "https://github.com/Shopify/shopify-cli"; license = licenses.mit; - platforms = ruby.meta.platforms; maintainers = with maintainers; [ onny ]; + mainProgram = "shopify"; + platforms = ruby.meta.platforms; }; } diff --git a/pkgs/games/bugdom/default.nix b/pkgs/games/bugdom/default.nix index c5170c9845c..fd893559469 100644 --- a/pkgs/games/bugdom/default.nix +++ b/pkgs/games/bugdom/default.nix @@ -57,10 +57,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A port of Bugdom, a 1999 Macintosh game by Pangea Software, for modern operating systems"; homepage = "https://github.com/jorio/Bugdom"; - license = with licenses; [ - cc-by-sa-40 - ]; + license = with licenses; [ cc-by-sa-40 ]; maintainers = with maintainers; [ lux ]; + mainProgram = "Bugdom"; platforms = platforms.unix; }; } diff --git a/pkgs/games/r2mod_cli/default.nix b/pkgs/games/r2mod_cli/default.nix index 607a53579c7..eb1dd25811a 100644 --- a/pkgs/games/r2mod_cli/default.nix +++ b/pkgs/games/r2mod_cli/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/foldex/r2mod_cli"; license = licenses.gpl3Only; maintainers = [ maintainers.reedrw ]; + mainProgram = "r2mod"; platforms = platforms.unix; }; } diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix index b2796225a6c..b74d3630e0e 100644 --- a/pkgs/games/tcl2048/default.nix +++ b/pkgs/games/tcl2048/default.nix @@ -21,7 +21,8 @@ tcl.mkTclDerivation rec { homepage = "https://github.com/dbohdan/2048.tcl"; description = "The game of 2048 implemented in Tcl"; license = lib.licenses.mit; - platforms = lib.platforms.all; maintainers = with lib.maintainers; [ dbohdan ]; + mainProgram = "2048"; + platforms = lib.platforms.all; }; } diff --git a/pkgs/misc/openrussian-cli/default.nix b/pkgs/misc/openrussian-cli/default.nix index e7b3d1c496d..e6e089e8861 100644 --- a/pkgs/misc/openrussian-cli/default.nix +++ b/pkgs/misc/openrussian-cli/default.nix @@ -49,10 +49,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/rhaberkorn/openrussian-cli"; description = "Offline Console Russian Dictionary (based on openrussian.org)"; + homepage = "https://github.com/rhaberkorn/openrussian-cli"; license = with licenses; [ gpl3Only mit cc-by-sa-40 ]; maintainers = with maintainers; [ zane ]; + mainProgram = "openrussian"; platforms = platforms.unix; }; } diff --git a/pkgs/misc/platformsh/default.nix b/pkgs/misc/platformsh/default.nix index 9c0410b4738..64b9168fee4 100644 --- a/pkgs/misc/platformsh/default.nix +++ b/pkgs/misc/platformsh/default.nix @@ -42,9 +42,10 @@ stdenv.mkDerivation { meta = with lib; { description = "The unified tool for managing your Platform.sh services from the command line."; - license = licenses.mit; homepage = "https://github.com/platformsh/platformsh-cli"; + license = licenses.mit; maintainers = with maintainers; [ shyim ]; + mainProgram = "platform"; platforms = platforms.all; }; } diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index 99626018750..bbabd02f475 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -22,10 +22,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/pipeseroni/pipes.sh"; description = "Animated pipes terminal screensaver"; + homepage = "https://github.com/pipeseroni/pipes.sh"; license = licenses.mit; maintainers = [ maintainers.matthiasbeyer ]; + mainProgram = "pipes.sh"; platforms = platforms.unix; }; } diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix index 5636f51a169..875a2fa2c1f 100644 --- a/pkgs/servers/exhibitor/default.nix +++ b/pkgs/servers/exhibitor/default.nix @@ -37,9 +37,10 @@ stdenv.mkDerivation rec { mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 ''; meta = with lib; { - homepage = "https://github.com/soabase/exhibitor"; description = "ZooKeeper co-process for instance monitoring, backup/recovery, cleanup and visualization"; + homepage = "https://github.com/soabase/exhibitor"; license = licenses.asl20; + mainProgram = "startExhibitor.sh"; platforms = platforms.unix; }; diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 8f3739b4ebf..3df2d833e0b 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -54,6 +54,7 @@ buildGoModule rec { homepage = "https://gotify.net"; license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; + mainProgram = "server"; }; } diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 651c7398868..e02b54e9eef 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -29,7 +29,8 @@ stdenvNoCC.mkDerivation rec { ''; homepage = "https://www.icinga.com/products/icinga-web-2/"; license = licenses.gpl2Only; - platforms = platforms.all; maintainers = with maintainers; [ das_j ]; + mainProgram = "icingacli"; + platforms = platforms.all; }; } diff --git a/pkgs/servers/mail/opensmtpd/filter-rspamd.nix b/pkgs/servers/mail/opensmtpd/filter-rspamd.nix index 62b01cf9266..bda3f1cda4c 100644 --- a/pkgs/servers/mail/opensmtpd/filter-rspamd.nix +++ b/pkgs/servers/mail/opensmtpd/filter-rspamd.nix @@ -22,9 +22,10 @@ buildGoModule rec { }; meta = with lib; { - homepage = "https://github.com/poolpOrg/filter-rspamd"; description = "OpenSMTPD filter integration for the Rspamd daemon"; + homepage = "https://github.com/poolpOrg/filter-rspamd"; license = licenses.isc; maintainers = with maintainers; [ Flakebi ]; + mainProgram = "filter-rspamd"; }; } diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix index 6d63c6b1d66..904b2182dbe 100644 --- a/pkgs/servers/monitoring/prometheus/json-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix @@ -20,5 +20,6 @@ buildGoModule rec { homepage = "https://github.com/prometheus-community/json_exporter"; license = licenses.asl20; maintainers = with maintainers; [ willibutz ]; + mainProgram = "json_exporter"; }; } diff --git a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix index 386e49594d2..748e135b634 100644 --- a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix @@ -20,6 +20,7 @@ buildGoModule rec { homepage = "https://github.com/xperimental/nextcloud-exporter"; license = licenses.mit; maintainers = with maintainers; [ willibutz ]; + mainProgram = "nextcloud-exporter"; platforms = platforms.unix; }; } diff --git a/pkgs/servers/t-rex/default.nix b/pkgs/servers/t-rex/default.nix index 551282b6058..fb132da8587 100644 --- a/pkgs/servers/t-rex/default.nix +++ b/pkgs/servers/t-rex/default.nix @@ -23,6 +23,7 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/t-rex-tileserver/t-rex/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; + mainProgram = "t_rex"; platforms = platforms.unix; }; } diff --git a/pkgs/servers/unifiedpush-common-proxies/default.nix b/pkgs/servers/unifiedpush-common-proxies/default.nix index b969902b253..4c41a7c9fde 100644 --- a/pkgs/servers/unifiedpush-common-proxies/default.nix +++ b/pkgs/servers/unifiedpush-common-proxies/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { homepage = "https://github.com/UnifiedPush/common-proxies"; license = licenses.mit; maintainers = with maintainers; [ yuka ]; + mainProgram = "up_rewrite"; }; } diff --git a/pkgs/servers/web-apps/engelsystem/default.nix b/pkgs/servers/web-apps/engelsystem/default.nix index 22abbdac08c..d154b1cee11 100644 --- a/pkgs/servers/web-apps/engelsystem/default.nix +++ b/pkgs/servers/web-apps/engelsystem/default.nix @@ -42,9 +42,10 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Coordinate your volunteers in teams, assign them to work shifts or let them decide for themselves when and where they want to help with what"; - license = licenses.gpl2; homepage = "https://engelsystem.de"; + license = licenses.gpl2; maintainers = with maintainers; [ kloenk ]; + mainProgram = "migrate"; platforms = platforms.all; }; } diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index 843e6f71165..5526d8fe31f 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -46,5 +46,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://join-lemmy.org/"; license = licenses.agpl3Only; maintainers = with maintainers; [ happysalada ]; + mainProgram = "lemmy_server"; }; } diff --git a/pkgs/servers/web-apps/vikunja/api.nix b/pkgs/servers/web-apps/vikunja/api.nix index 2917c0e2400..5d01868725a 100644 --- a/pkgs/servers/web-apps/vikunja/api.nix +++ b/pkgs/servers/web-apps/vikunja/api.nix @@ -52,6 +52,7 @@ buildGoModule rec { homepage = "https://vikunja.io/"; license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ em0lar ]; + mainProgram = "vikunja"; platforms = lib.platforms.all; }; } diff --git a/pkgs/shells/zsh/zplug/default.nix b/pkgs/shells/zsh/zplug/default.nix index d35eb345dda..0660bbe7e7b 100644 --- a/pkgs/shells/zsh/zplug/default.nix +++ b/pkgs/shells/zsh/zplug/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { description = "A next-generation plugin manager for zsh"; homepage = "https://github.com/zplug/zplug"; license = licenses.mit; - platforms = platforms.all; maintainers = [ maintainers.s1341 ]; + mainProgram = "zplug-env"; + platforms = platforms.all; }; } diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix index be5c6650557..9f88d972e7d 100644 --- a/pkgs/shells/zsh/zsh-history/default.nix +++ b/pkgs/shells/zsh/zsh-history/default.nix @@ -25,10 +25,11 @@ buildGoModule rec { meta = with lib; { description = "A CLI to provide enhanced history for your ZSH shell"; - license = licenses.mit; homepage = "https://github.com/b4b4r07/history"; - platforms = platforms.unix; + license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "history"; + platforms = platforms.unix; }; passthru.tests = { diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index fcc92e673a5..9be1ea7f4d4 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -45,9 +45,7 @@ stdenv.mkDerivation rec { doInstallCheck = false; # fails meta = { - homepage = "https://www.gnu.org/software/tar/"; description = "GNU implementation of the `tar' archiver"; - longDescription = '' The Tar program provides the ability to create tar archives, as well as various other kinds of manipulation. For example, you @@ -62,10 +60,12 @@ stdenv.mkDerivation rec { pipes), it can even access remote devices or files (as archives). ''; + homepage = "https://www.gnu.org/software/tar/"; license = lib.licenses.gpl3Plus; maintainers = [ ]; + mainProgram = "tar"; platforms = lib.platforms.all; priority = 10; diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/tools/audio/glyr/default.nix index 60585c3b354..0f13addfcd9 100644 --- a/pkgs/tools/audio/glyr/default.nix +++ b/pkgs/tools/audio/glyr/default.nix @@ -16,10 +16,11 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite glib curl ]; meta = with lib; { - license = licenses.lgpl3; description = "A music related metadata searchengine"; homepage = "https://github.com/sahib/glyr"; + license = licenses.lgpl3; maintainers = [ maintainers.sternenseemann ]; + mainProgram = "glyrc"; platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix index fbaab91d093..27d0141ff75 100644 --- a/pkgs/tools/compression/xdelta/default.nix +++ b/pkgs/tools/compression/xdelta/default.nix @@ -56,6 +56,7 @@ in stdenv.mkDerivation rec { ''; homepage = "http://xdelta.org/"; license = licenses.gpl2Plus; + mainProgram = "xdelta3"; platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/xdelta/unstable.nix b/pkgs/tools/compression/xdelta/unstable.nix index 03366e5b1ce..2ac8398dbc2 100644 --- a/pkgs/tools/compression/xdelta/unstable.nix +++ b/pkgs/tools/compression/xdelta/unstable.nix @@ -60,6 +60,7 @@ in stdenv.mkDerivation rec { ''; homepage = "http://xdelta.org/"; license = licenses.gpl2Plus; + mainProgram = "xdelta3"; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/anystyle-cli/default.nix b/pkgs/tools/misc/anystyle-cli/default.nix index 379ed14f8ef..beebae6542b 100644 --- a/pkgs/tools/misc/anystyle-cli/default.nix +++ b/pkgs/tools/misc/anystyle-cli/default.nix @@ -38,6 +38,7 @@ buildRubyGem rec { homepage = "https://anystyle.io/"; license = licenses.bsd2; maintainers = with maintainers; [ shamilton ]; + mainProgram = "anystyle"; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/didyoumean/default.nix b/pkgs/tools/misc/didyoumean/default.nix index cd7b8270a1a..3839d117afd 100644 --- a/pkgs/tools/misc/didyoumean/default.nix +++ b/pkgs/tools/misc/didyoumean/default.nix @@ -28,5 +28,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/hisbaan/didyoumean"; license = licenses.gpl3Plus; maintainers = with maintainers; [ evanjs ]; + mainProgram = "dym"; }; } diff --git a/pkgs/tools/misc/go.rice/default.nix b/pkgs/tools/misc/go.rice/default.nix index 771f3493157..e608ad121cc 100644 --- a/pkgs/tools/misc/go.rice/default.nix +++ b/pkgs/tools/misc/go.rice/default.nix @@ -16,9 +16,10 @@ buildGoModule rec { subPackages = [ "." "rice" ]; meta = with lib; { - homepage = "https://github.com/GeertJohan/go.rice"; description = "A Go package that makes working with resources such as html, js, css, images, templates very easy"; + homepage = "https://github.com/GeertJohan/go.rice"; license = licenses.bsd2; maintainers = with maintainers; [ blaggacao ]; + mainProgram = "rice"; }; } diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 1480f099f9f..5db9e8f00fb 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { description = "Open source log management solution"; homepage = "https://www.graylog.org/"; license = licenses.gpl3; - platforms = platforms.unix; maintainers = [ maintainers.fadenb ]; + mainProgram = "graylogctl"; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix index 680e3738768..d3e24c55984 100644 --- a/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/pkgs/tools/misc/mysql2pgsql/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { description = "Convert MySQL dump files to PostgreSQL-loadable files"; homepage = "https://pgfoundry.org/projects/mysql2pgsql/"; license = lib.licenses.bsdOriginal; + mainProgram = "mysql2psql"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index 384c448e1d9..e158f1c3f44 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -31,8 +31,6 @@ buildGoModule rec { ]; meta = with lib; { - homepage = "https://github.com/open-telemetry/opentelemetry-collector-contrib"; - changelog = "https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v${version}/CHANGELOG.md"; description = "OpenTelemetry Collector superset with additional community collectors"; longDescription = '' The OpenTelemetry Collector offers a vendor-agnostic implementation on how @@ -44,7 +42,10 @@ buildGoModule rec { components that are only useful to a relatively small number of users and is multiple times larger as a result. ''; + homepage = "https://github.com/open-telemetry/opentelemetry-collector-contrib"; + changelog = "https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ uri-canva jk ]; + mainProgram = "otelcontribcol"; }; } diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index de746f39b47..26a80c6a659 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { to install the wakatime CLI interface manually. ''; license = licenses.bsd3; + mainProgram = "wakatime-cli"; }; } diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix index 51cfda5e0aa..d16410c3153 100644 --- a/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/pkgs/tools/misc/zsh-autoenv/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation { variables (overwriting and restoring). ''; homepage = "https://github.com/Tarrasch/zsh-autoenv"; + mainProgram = "zsh-autoenv-share"; platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix index 64e601c375c..d279f061737 100644 --- a/pkgs/tools/networking/obfs4/default.nix +++ b/pkgs/tools/networking/obfs4/default.nix @@ -16,5 +16,6 @@ buildGoModule rec { description = "A pluggable transport proxy"; homepage = "https://www.torproject.org/projects/obfsproxy"; maintainers = with maintainers; [ thoughtpolice ]; + mainProgram = "obfs4proxy"; }; } diff --git a/pkgs/tools/networking/ooniprobe-cli/default.nix b/pkgs/tools/networking/ooniprobe-cli/default.nix index b6feafb4a00..01c5b637676 100644 --- a/pkgs/tools/networking/ooniprobe-cli/default.nix +++ b/pkgs/tools/networking/ooniprobe-cli/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { homepage = "https://ooni.org/install/cli"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda ]; + mainProgram = "ooniprobe"; }; } diff --git a/pkgs/tools/networking/samplicator/default.nix b/pkgs/tools/networking/samplicator/default.nix index 44546465d9e..158cac0a734 100644 --- a/pkgs/tools/networking/samplicator/default.nix +++ b/pkgs/tools/networking/samplicator/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { description = "Send copies of (UDP) datagrams to multiple receivers"; homepage = "https://github.com/sleinen/samplicator/"; license = lib.licenses.gpl2Plus; + mainProgram = "samplicate"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/tools/networking/slack-cli/default.nix index 25e426dc43e..ed6a817058c 100644 --- a/pkgs/tools/networking/slack-cli/default.nix +++ b/pkgs/tools/networking/slack-cli/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { meta = { license = lib.licenses.mit; maintainers = [ lib.maintainers.qyliss ]; + mainProgram = "slack"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index 2387c903a9b..2ca679b16c8 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { ''; homepage="http://www.tinc-vpn.org/"; license = lib.licenses.gpl2Plus; + mainProgram = "tincd"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/nix/nixos-generators/default.nix b/pkgs/tools/nix/nixos-generators/default.nix index e20f36b1ef9..a33833a230d 100644 --- a/pkgs/tools/nix/nixos-generators/default.nix +++ b/pkgs/tools/nix/nixos-generators/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/nix-community/nixos-generators"; license = licenses.mit; maintainers = with maintainers; [ lassulus ]; + mainProgram = "nixos-generate"; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/tools/security/bash-supergenpass/default.nix index ba80734e5cf..ae831bf8675 100644 --- a/pkgs/tools/security/bash-supergenpass/default.nix +++ b/pkgs/tools/security/bash-supergenpass/default.nix @@ -40,9 +40,10 @@ stdenv.mkDerivation { supergenpass will ask for your master password interactively, and it will not be displayed on your terminal. ''; + homepage = "https://github.com/lanzz/bash-supergenpass"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ fgaz ]; - homepage = "https://github.com/lanzz/bash-supergenpass"; + mainProgram = "supergenpass"; + platforms = platforms.all; }; } diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index 4803430018e..50477cf92f0 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -95,5 +95,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://sequoia-pgp.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ minijackson doronbehar ]; + mainProgram = "sq"; }; } diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 048d06f2004..d1a26f25724 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -52,10 +52,11 @@ stdenv.mkDerivation rec { passthru.updateScript = ./update-bin.sh; meta = with lib; { - homepage = "https://www.vaultproject.io"; description = "A tool for managing secrets, this binary includes the UI"; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; + homepage = "https://www.vaultproject.io"; license = licenses.mpl20; maintainers = with maintainers; teams.serokell.members ++ [ offline psyanticy Chili-Man techknowlogick ]; + mainProgram = "vault"; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; }; } diff --git a/pkgs/tools/system/nkeys/default.nix b/pkgs/tools/system/nkeys/default.nix index 05d2d853b24..4693763a89c 100644 --- a/pkgs/tools/system/nkeys/default.nix +++ b/pkgs/tools/system/nkeys/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { homepage = "https://github.com/nats-io/nkeys"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "nk"; }; } diff --git a/pkgs/tools/system/taskspooler/default.nix b/pkgs/tools/system/taskspooler/default.nix index 9899a9fb3f6..26925954778 100644 --- a/pkgs/tools/system/taskspooler/default.nix +++ b/pkgs/tools/system/taskspooler/default.nix @@ -23,9 +23,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple single node task scheduler"; - license = licenses.gpl2Plus; homepage = "https://vicerveza.homeunix.net/~viric/wsgi-bin/hgweb.wsgi/ts"; - platforms = platforms.unix; + license = licenses.gpl2Plus; maintainers = [ maintainers.sheepforce ]; + mainProgram = "ts"; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix index dd03bcfa6a3..44d50c0c963 100644 --- a/pkgs/tools/text/discount/default.nix +++ b/pkgs/tools/text/discount/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { homepage = "http://www.pell.portland.or.us/~orc/Code/discount/"; license = licenses.bsd3; maintainers = with maintainers; [ shell ]; + mainProgram = "markdown"; platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix index 058c2ba3daa..62b83636b37 100644 --- a/pkgs/tools/text/replace/default.nix +++ b/pkgs/tools/text/replace/default.nix @@ -27,8 +27,9 @@ stdenv.mkDerivation rec { patches = [./malloc.patch]; meta = { - homepage = "https://replace.richardlloyd.org.uk/"; description = "A tool to replace verbatim strings"; + homepage = "https://replace.richardlloyd.org.uk/"; + mainProgram = "replace-literal"; platforms = lib.platforms.unix; }; } From 9e4be532219685cdd81e4db54f9fc061d250ba25 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 4 May 2022 17:52:27 -0700 Subject: [PATCH 20/42] treewide: add meta.mainProgram to some libraries where a single bin is provided and someone might actually want to run it --- pkgs/development/libraries/appstream/default.nix | 3 ++- pkgs/development/libraries/aribb25/default.nix | 5 +++-- pkgs/development/libraries/audio/libsmf/default.nix | 1 + pkgs/development/libraries/aws-c-s3/default.nix | 3 ++- pkgs/development/libraries/boolstuff/default.nix | 1 + pkgs/development/libraries/capstone/default.nix | 3 ++- pkgs/development/libraries/check/default.nix | 1 + pkgs/development/libraries/faad2/default.nix | 2 ++ pkgs/development/libraries/fcgi/default.nix | 1 + pkgs/development/libraries/flatbuffers/generic.nix | 5 +++-- pkgs/development/libraries/gdk-pixbuf/default.nix | 3 ++- pkgs/development/libraries/gensio/default.nix | 1 + pkgs/development/libraries/glpk/default.nix | 1 + pkgs/development/libraries/keystone/default.nix | 1 + pkgs/development/libraries/ldns/default.nix | 5 +++-- pkgs/development/libraries/libargon2/default.nix | 1 + pkgs/development/libraries/libaudec/default.nix | 3 ++- pkgs/development/libraries/libb64/default.nix | 2 ++ pkgs/development/libraries/libbencodetools/default.nix | 1 + pkgs/development/libraries/libburn/default.nix | 3 ++- pkgs/development/libraries/libcddb/default.nix | 1 + pkgs/development/libraries/libcdio-paranoia/default.nix | 5 +++-- pkgs/development/libraries/libcmis/default.nix | 3 ++- pkgs/development/libraries/libdc1394/default.nix | 3 ++- pkgs/development/libraries/libdigidoc/default.nix | 3 ++- pkgs/development/libraries/libeatmydata/default.nix | 1 + pkgs/development/libraries/libee/default.nix | 5 +++-- pkgs/development/libraries/libexttextcat/default.nix | 3 ++- pkgs/development/libraries/libiconv/default.nix | 1 + pkgs/development/libraries/libirecovery/default.nix | 5 +++-- pkgs/development/libraries/liblognorm/default.nix | 3 ++- pkgs/development/libraries/libmaxminddb/default.nix | 3 ++- pkgs/development/libraries/libnatpmp/default.nix | 3 ++- pkgs/development/libraries/libnotify/default.nix | 7 ++++--- pkgs/development/libraries/libpostal/default.nix | 1 + pkgs/development/libraries/libpsl/default.nix | 3 ++- pkgs/development/libraries/libqalculate/default.nix | 3 ++- pkgs/development/libraries/libroxml/default.nix | 5 +++-- pkgs/development/libraries/librsvg/default.nix | 1 + pkgs/development/libraries/librsync/default.nix | 3 ++- pkgs/development/libraries/libsecret/default.nix | 1 + pkgs/development/libraries/libshout/default.nix | 1 + pkgs/development/libraries/libu2f-host/default.nix | 3 ++- pkgs/development/libraries/libubox/default.nix | 3 ++- pkgs/development/libraries/libvmaf/default.nix | 5 +++-- pkgs/development/libraries/libxkbcommon/default.nix | 1 + pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix | 1 + pkgs/development/libraries/libxls/default.nix | 3 ++- pkgs/development/libraries/libykneomgr/default.nix | 3 ++- pkgs/development/libraries/matio/default.nix | 5 +++-- pkgs/development/libraries/md4c/default.nix | 3 ++- pkgs/development/libraries/mongoc/default.nix | 3 ++- pkgs/development/libraries/nanomsg/default.nix | 1 + pkgs/development/libraries/ndpi/default.nix | 1 + pkgs/development/libraries/pe-parse/default.nix | 3 ++- pkgs/development/libraries/precice/default.nix | 5 +++-- pkgs/development/libraries/proj-datumgrid/default.nix | 3 ++- pkgs/development/libraries/protobuf/generic-v3.nix | 3 ++- pkgs/development/libraries/rnnoise/default.nix | 3 ++- .../development/libraries/science/math/cliquer/default.nix | 5 +++-- .../development/libraries/science/math/flintqs/default.nix | 3 ++- pkgs/development/libraries/serd/default.nix | 3 ++- pkgs/development/libraries/silgraphite/graphite2.nix | 4 +++- pkgs/development/libraries/slang/default.nix | 1 + pkgs/development/libraries/soundtouch/default.nix | 3 ++- pkgs/development/libraries/sqlite/tools.nix | 6 ++++-- pkgs/development/libraries/stxxl/default.nix | 1 + pkgs/development/libraries/tecla/default.nix | 4 ++-- pkgs/development/libraries/tre/default.nix | 3 ++- pkgs/development/libraries/uriparser/default.nix | 5 +++-- pkgs/development/libraries/xmlsec/default.nix | 3 ++- pkgs/development/libraries/zlog/default.nix | 3 ++- 72 files changed, 139 insertions(+), 64 deletions(-) diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 9b07697a6a9..56268146c5d 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -93,14 +93,15 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Software metadata handling library"; - homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/"; longDescription = '' AppStream is a cross-distro effort for building Software-Center applications and enhancing metadata provided by software components. It provides specifications for meta-information which is shipped by upstream projects and can be consumed by other software. ''; + homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/"; license = licenses.lgpl21Plus; + mainProgram = "appstreamcli"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/aribb25/default.nix b/pkgs/development/libraries/aribb25/default.nix index 3e171d75797..743850c5fdc 100644 --- a/pkgs/development/libraries/aribb25/default.nix +++ b/pkgs/development/libraries/aribb25/default.nix @@ -48,10 +48,11 @@ stdenv.mkDerivation rec { lib.optional stdenv.isDarwin "pcsclite_CFLAGS=-I${PCSC}/Library/Frameworks/PCSC.framework/Headers"; meta = with lib; { - homepage = "https://code.videolan.org/videolan/aribb25"; description = "Sample implementation of the ARIB STD-B25 standard"; - platforms = platforms.all; + homepage = "https://code.videolan.org/videolan/aribb25"; license = licenses.isc; maintainers = with maintainers; [ midchildan ]; + mainProgram = "b25"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix index b3e3a34973c..6737d76538e 100644 --- a/pkgs/development/libraries/audio/libsmf/default.nix +++ b/pkgs/development/libraries/audio/libsmf/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/stump/libsmf"; license = licenses.bsd2; maintainers = [ maintainers.goibhniu ]; + mainProgram = "smfsh"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix index 2868e6b80b8..15bfe3bb9b9 100644 --- a/pkgs/development/libraries/aws-c-s3/default.nix +++ b/pkgs/development/libraries/aws-c-s3/default.nix @@ -44,7 +44,8 @@ stdenv.mkDerivation rec { description = "C99 library implementation for communicating with the S3 service"; homepage = "https://github.com/awslabs/aws-c-s3"; license = licenses.asl20; - platforms = platforms.unix; maintainers = with maintainers; [ r-burns ]; + mainProgram = "s3"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix index c7520ff783e..b49355f60e9 100644 --- a/pkgs/development/libraries/boolstuff/default.nix +++ b/pkgs/development/libraries/boolstuff/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { homepage = "http://perso.b2b2c.ca/~sarrazip/dev/boolstuff.html"; license = "GPL"; maintainers = [ lib.maintainers.marcweber ]; + mainProgram = "booldnf"; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index adc52da1e56..6f5a8e340ad 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -39,7 +39,8 @@ stdenv.mkDerivation rec { description = "Advanced disassembly library"; homepage = "http://www.capstone-engine.org"; license = lib.licenses.bsd3; - platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ thoughtpolice ris ]; + mainProgram = "cstool"; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 37bde1caf43..8add9c62347 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { homepage = "https://libcheck.github.io/check/"; license = licenses.lgpl2Plus; + mainProgram = "checkmk"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index 396acbc1bdf..8b1757ed563 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -21,8 +21,10 @@ stdenv.mkDerivation rec { meta = { description = "An open source MPEG-4 and MPEG-2 AAC decoder"; + homepage = "https://sourceforge.net/projects/faac/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ codyopel ]; + mainProgram = "faad"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix index 434d445ceb4..5c7f0c44f91 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/development/libraries/fcgi/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { description = "A language independent, scalable, open extension to CG"; homepage = "https://fastcgi-archives.github.io/"; # Formerly http://www.fastcgi.com/ license = "FastCGI see LICENSE.TERMS"; + mainProgram = "cgi-fcgi"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/flatbuffers/generic.nix b/pkgs/development/libraries/flatbuffers/generic.nix index 1cdfb4b9c87..c06dad87d95 100644 --- a/pkgs/development/libraries/flatbuffers/generic.nix +++ b/pkgs/development/libraries/flatbuffers/generic.nix @@ -38,9 +38,10 @@ stdenv.mkDerivation rec { access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility. ''; - maintainers = [ maintainers.teh ]; + homepage = "https://google.github.io/flatbuffers/"; license = licenses.asl20; + maintainers = [ maintainers.teh ]; + mainProgram = "flatc"; platforms = platforms.unix; - homepage = "https://google.github.io/flatbuffers/"; }; } diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 1e9c881ae8c..cbed6a62a3c 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -149,8 +149,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library for image loading and manipulation"; homepage = "https://gitlab.gnome.org/GNOME/gdk-pixbuf"; - maintainers = [ maintainers.eelco ] ++ teams.gnome.members; license = licenses.lgpl21Plus; + maintainers = [ maintainers.eelco ] ++ teams.gnome.members; + mainProgram = "gdk-pixbuf-thumbnailer"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index 84d54b3bc35..48e2d4fd8fb 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/ser2net/"; license = licenses.gpl2; maintainers = with maintainers; [ emantor ]; + mainProgram = "gensiot"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index a46c84844e8..7551c15649e 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -73,6 +73,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ bjg ] ++ teams.sage.members; + mainProgram = "glpsol"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/keystone/default.nix b/pkgs/development/libraries/keystone/default.nix index 70864bcf24a..0bb979f7a55 100644 --- a/pkgs/development/libraries/keystone/default.nix +++ b/pkgs/development/libraries/keystone/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://www.keystone-engine.org"; license = licenses.gpl2Only; maintainers = with maintainers; [ luc65r ]; + mainProgram = "kstool"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 1ccb0e41e70..6712d7c6d3c 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -42,9 +42,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library with the aim of simplifying DNS programming in C"; - license = licenses.bsd3; homepage = "http://www.nlnetlabs.nl/projects/ldns/"; - platforms = platforms.unix; + license = licenses.bsd3; maintainers = with maintainers; [ dtzWill ]; + mainProgram = "drill"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix index eb8e6333d41..19ca4fab401 100644 --- a/pkgs/development/libraries/libargon2/default.nix +++ b/pkgs/development/libraries/libargon2/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { homepage = "https://www.argon2.com/"; license = with licenses; [ asl20 cc0 ]; maintainers = with maintainers; [ taeer olynch ]; + mainProgram = "argon2"; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libaudec/default.nix b/pkgs/development/libraries/libaudec/default.nix index 78e4b5cfa40..5340f62a32e 100644 --- a/pkgs/development/libraries/libaudec/default.nix +++ b/pkgs/development/libraries/libaudec/default.nix @@ -18,9 +18,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config ]; meta = with lib; { - homepage = "https://www.zrythm.org"; description = "A library for reading and resampling audio files"; + homepage = "https://www.zrythm.org"; license = licenses.agpl3Plus; + mainProgram = "audec"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index 987a36cd79f..88bc059892c 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -36,7 +36,9 @@ stdenv.mkDerivation rec { meta = { description = "ANSI C routines for fast base64 encoding/decoding"; + homepage = "https://github.com/libb64/libb64"; license = lib.licenses.publicDomain; + mainProgram = "base64"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libbencodetools/default.nix b/pkgs/development/libraries/libbencodetools/default.nix index b8150a90f68..42e6fb9f4ed 100644 --- a/pkgs/development/libraries/libbencodetools/default.nix +++ b/pkgs/development/libraries/libbencodetools/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/heikkiorsila/bencodetools"; license = licenses.bsd2; maintainers = with maintainers; [ OPNA2608 ]; + mainProgram = "bencat"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index f9b6538027d..ba24182ade8 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -10,10 +10,11 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://libburnia-project.org/"; description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)"; + homepage = "http://libburnia-project.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbradar vrthra ]; + mainProgram = "cdrskin"; platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index bf20211ee60..4848f5fcc26 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { description = "C library to access data on a CDDB server (freedb.org)"; homepage = "http://libcddb.sourceforge.net/"; license = licenses.lgpl2Plus; + mainProgram = "cddb_query"; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix index 999c0450489..36b591b0605 100644 --- a/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -28,9 +28,10 @@ stdenv.mkDerivation rec { This is a port of xiph.org's cdda paranoia to use libcdio for CDROM access. By doing this, cdparanoia runs on platforms other than GNU/Linux. ''; - license = licenses.gpl3; homepage = "https://github.com/rocky/libcdio-paranoia"; - platforms = platforms.linux ++ platforms.darwin; + license = licenses.gpl3; maintainers = [ ]; + mainProgram = "cd-paranoia"; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix index 2898c9a1c83..f5a9974f3bc 100644 --- a/pkgs/development/libraries/libcmis/default.nix +++ b/pkgs/development/libraries/libcmis/default.nix @@ -25,8 +25,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ client library for the CMIS interface"; - homepage = "https://sourceforge.net/projects/libcmis/"; + homepage = "https://github.com/tdf/libcmis"; license = licenses.gpl2; + mainProgram = "cmis-client"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index a666eb3a650..379f5397ec0 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -15,10 +15,11 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin CoreServices; meta = with lib; { - homepage = "https://sourceforge.net/projects/libdc1394/"; description = "Capture and control API for IIDC compliant cameras"; + homepage = "https://sourceforge.net/projects/libdc1394/"; license = licenses.lgpl21Plus; maintainers = [ maintainers.viric ]; + mainProgram = "dc1394_reset_bus"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix index 7ee268e4e7d..a639b4b3294 100644 --- a/pkgs/development/libraries/libdigidoc/default.nix +++ b/pkgs/development/libraries/libdigidoc/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { description = "Library for creating DigiDoc signature files"; homepage = "https://github.com/open-eid/libdigidoc"; license = licenses.lgpl2; - platforms = platforms.unix; maintainers = [ maintainers.jagajaga ]; + mainProgram = "cdigidoc"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index 70fab2da568..3a3abdc5e9a 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { description = "Small LD_PRELOAD library to disable fsync and friends"; homepage = "https://www.flamingspork.com/projects/libeatmydata/"; license = licenses.gpl3Plus; + mainProgram = "eatmydata"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix index ae052971825..1269f6f0eff 100644 --- a/pkgs/development/libraries/libee/default.nix +++ b/pkgs/development/libraries/libee/default.nix @@ -12,9 +12,10 @@ stdenv.mkDerivation rec { buildInputs = [ libestr]; meta = { - homepage = "http://www.libee.org/"; description = "An Event Expression Library inspired by CEE"; - platforms = lib.platforms.unix; + homepage = "http://www.libee.org/"; license = lib.licenses.lgpl21Plus; + mainProgram = "libee-convert"; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix index c315379d92c..39369c5c3b6 100644 --- a/pkgs/development/libraries/libexttextcat/default.nix +++ b/pkgs/development/libraries/libexttextcat/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An N-Gram-Based Text Categorization library primarily intended for language guessing"; homepage = "https://wiki.documentfoundation.org/Libexttextcat"; - platforms = platforms.all; license = licenses.bsd3; + mainProgram = "createfp"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 35d01cd3e82..5be5ecfd82e 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; maintainers = [ ]; + mainProgram = "iconv"; # This library is not needed on GNU platforms. hydraPlatforms = with lib.platforms; cygwin ++ darwin ++ freebsd; diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix index 6a2f926d79e..c10d46577ff 100644 --- a/pkgs/development/libraries/libirecovery/default.nix +++ b/pkgs/development/libraries/libirecovery/default.nix @@ -39,16 +39,17 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://github.com/libimobiledevice/libirecovery"; description = "Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux"; longDescription = '' libirecovery is a cross-platform library which implements communication to iBoot/iBSS found on Apple's iOS devices via USB. A command-line utility is also provided. ''; + homepage = "https://github.com/libimobiledevice/libirecovery"; license = licenses.lgpl21; + maintainers = with maintainers; [ nh2 ]; + mainProgram = "irecovery"; # Upstream description says it works on more platforms, but packager hasn't tried that yet platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ nh2 ]; }; } diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix index af4190f9683..184d9932eb2 100644 --- a/pkgs/development/libraries/liblognorm/default.nix +++ b/pkgs/development/libraries/liblognorm/default.nix @@ -15,9 +15,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-regexp" ]; meta = with lib; { - homepage = "https://www.liblognorm.com/"; description = "Help to make sense out of syslog data, or, actually, any event data that is present in text form"; + homepage = "https://www.liblognorm.com/"; license = licenses.lgpl21; + mainProgram = "lognormalizer"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix index 1c15519aaff..855296bddb4 100644 --- a/pkgs/development/libraries/libmaxminddb/default.nix +++ b/pkgs/development/libraries/libmaxminddb/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { description = "C library for working with MaxMind geolocation DB files"; homepage = "https://github.com/maxmind/libmaxminddb"; license = licenses.asl20; - platforms = platforms.all; maintainers = [ maintainers.vcunat ]; + mainProgram = "mmdblookup"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix index 54177ad559d..f718170fc76 100644 --- a/pkgs/development/libraries/libnatpmp/default.nix +++ b/pkgs/development/libraries/libnatpmp/default.nix @@ -22,10 +22,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://miniupnp.free.fr/libnatpmp.html"; description = "NAT-PMP client"; + homepage = "http://miniupnp.free.fr/libnatpmp.html"; license = licenses.bsd3; maintainers = with maintainers; [ orivej ]; + mainProgram = "natpmpc"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index d3b857d7673..eb89fa124c4 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -61,10 +61,11 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/libnotify"; description = "A library that sends desktop notifications to a notification daemon"; - platforms = platforms.unix; - maintainers = teams.gnome.members; + homepage = "https://gitlab.gnome.org/GNOME/libnotify"; license = licenses.lgpl21; + maintainers = teams.gnome.members; + mainProgram = "notify-send"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libpostal/default.nix b/pkgs/development/libraries/libpostal/default.nix index 6b616a61d51..30c7af9ccc5 100644 --- a/pkgs/development/libraries/libpostal/default.nix +++ b/pkgs/development/libraries/libpostal/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/openvenues/libpostal"; license = licenses.mit; maintainers = [ maintainers.Thra11 ]; + mainProgram = "libpostal_data"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 0a710d648fb..fc85f537591 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -85,7 +85,8 @@ in stdenv.mkDerivation rec { homepage = "https://rockdaboot.github.io/libpsl/"; changelog = "https://raw.githubusercontent.com/rockdaboot/${pname}/${pname}-${version}/NEWS"; license = licenses.mit; - platforms = platforms.unix; maintainers = [ maintainers.c0bw3b ]; + mainProgram = "psl"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index ddaa6ae3e1d..afc2313df7a 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -41,8 +41,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An advanced calculator library"; homepage = "http://qalculate.github.io"; - maintainers = with maintainers; [ gebner doronbehar ]; license = licenses.gpl2Plus; + maintainers = with maintainers; [ gebner doronbehar ]; + mainProgram = "qalc"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libroxml/default.nix b/pkgs/development/libraries/libroxml/default.nix index 71d78a8b8e5..647e4c188a0 100644 --- a/pkgs/development/libraries/libroxml/default.nix +++ b/pkgs/development/libraries/libroxml/default.nix @@ -10,10 +10,11 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://www.libroxml.net/"; description = "This library is minimum, easy-to-use, C implementation for xml file parsing"; + homepage = "https://www.libroxml.net/"; license = licenses.lgpl3; - platforms = platforms.unix; maintainers = with maintainers; [ mpickering ]; + mainProgram = "roxml"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index b0935441384..6ef67af4b19 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -146,6 +146,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/LibRsvg"; license = licenses.lgpl2Plus; maintainers = teams.gnome.members; + mainProgram = "rsvg-convert"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index a0248e774b7..0594e9e6e20 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -17,9 +17,10 @@ stdenv.mkDerivation rec { dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; meta = with lib; { + description = "Implementation of the rsync remote-delta algorithm"; homepage = "http://librsync.sourceforge.net/"; license = licenses.lgpl2Plus; - description = "Implementation of the rsync remote-delta algorithm"; + mainProgram = "rdiff"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 95e2c69e4c7..b04012cec28 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -110,6 +110,7 @@ stdenv.mkDerivation rec { description = "A library for storing and retrieving passwords and other secrets"; homepage = "https://wiki.gnome.org/Projects/Libsecret"; license = lib.licenses.lgpl21Plus; + mainProgram = "secret-tool"; inherit (glib.meta) platforms maintainers; }; } diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index e231fb0ed6e..07025b26eea 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { homepage = "https://www.icecast.org"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ jcumming ]; + mainProgram = "shout"; platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index 3be758c906f..9acbaa47906 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -24,9 +24,10 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = "https://developers.yubico.com/libu2f-host"; description = "A C library and command-line tool that implements the host-side of the U2F protocol"; + homepage = "https://developers.yubico.com/libu2f-host"; license = with licenses; [ gpl3Plus lgpl21Plus ]; + mainProgram = "u2f-host"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index 9261d1b81ba..bb49ad4472c 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation { description = "C utility functions for OpenWrt"; homepage = "https://git.openwrt.org/?p=project/libubox.git;a=summary"; license = licenses.isc; - platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; + mainProgram = "jshn"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix index a58f816e8af..e7add08871a 100644 --- a/pkgs/development/libraries/libvmaf/default.nix +++ b/pkgs/development/libraries/libvmaf/default.nix @@ -21,12 +21,13 @@ stdenv.mkDerivation rec { doCheck = false; meta = with lib; { - homepage = "https://github.com/Netflix/vmaf"; description = "Perceptual video quality assessment based on multi-method fusion (VMAF)"; + homepage = "https://github.com/Netflix/vmaf"; changelog = "https://github.com/Netflix/vmaf/raw/v${version}/CHANGELOG.md"; - platforms = platforms.unix; license = licenses.bsd2Patent; maintainers = [ maintainers.cfsmp3 maintainers.marsam ]; + mainProgram = "vmaf"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 7bcc62af6ec..5c632009bee 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/xkbcommon/libxkbcommon/blob/xkbcommon-${version}/NEWS"; license = licenses.mit; maintainers = with maintainers; [ primeos ttuegel ]; + mainProgram = "xkbcli"; platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix index 539fca7456b..6578a86e35b 100644 --- a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix +++ b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://xkbcommon.org"; license = licenses.mit; maintainers = with maintainers; [ ttuegel ]; + mainProgram = "xkbcli"; platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix index 43c96027d08..8ba48e15f22 100644 --- a/pkgs/development/libraries/libxls/default.nix +++ b/pkgs/development/libraries/libxls/default.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { description = "Extract Cell Data From Excel xls files"; homepage = "https://github.com/libxls/libxls"; license = licenses.bsd2; - platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; + mainProgram = "xls2csv"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix index 7f314410667..d0fc1cfd9fb 100644 --- a/pkgs/development/libraries/libykneomgr/default.nix +++ b/pkgs/development/libraries/libykneomgr/default.nix @@ -17,9 +17,10 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://developers.yubico.com/libykneomgr"; description = "A C library to interact with the CCID-part of the Yubikey NEO"; + homepage = "https://developers.yubico.com/libykneomgr"; license = licenses.bsd3; + mainProgram = "ykneomgr"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index 7a227e57560..1805de0264c 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -9,9 +9,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A C library for reading and writing Matlab MAT files"; + homepage = "http://matio.sourceforge.net/"; license = licenses.bsd2; - platforms = platforms.all; maintainers = [ maintainers.vbgl ]; - homepage = "http://matio.sourceforge.net/"; + mainProgram = "matdump"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/md4c/default.nix b/pkgs/development/libraries/md4c/default.nix index 2ad77b2d2fd..6504d99af3e 100644 --- a/pkgs/development/libraries/md4c/default.nix +++ b/pkgs/development/libraries/md4c/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://github.com/mity/md4c"; description = "Markdown parser made in C"; longDescription = '' MD4C is Markdown parser implementation in C, with the following features: @@ -58,8 +57,10 @@ stdenv.mkDerivation rec { "Unicode"). See more details below. - Permissive license: MD4C is available under the MIT license. ''; + homepage = "https://github.com/mity/md4c"; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; + mainProgram = "md2html"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index e9779cf0a05..8b5753b3aca 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -19,8 +19,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The official C client library for MongoDB"; - homepage = "https://github.com/mongodb/mongo-c-driver"; + homepage = "http://mongoc.org"; license = licenses.asl20; + mainProgram = "mongoc-stat"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index 49a93abd7fb..2bc86edef70 100644 --- a/pkgs/development/libraries/nanomsg/default.nix +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { description= "Socket library that provides several common communication patterns"; homepage = "https://nanomsg.org/"; license = licenses.mit; + mainProgram = "nanocat"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index 2e8a997299f..b798320c691 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { homepage = "https://www.ntop.org/products/deep-packet-inspection/ndpi/"; license = with licenses; [ lgpl3Plus bsd3 ]; maintainers = with maintainers; [ takikawa ]; + mainProgram = "ndpiReader"; platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/pe-parse/default.nix b/pkgs/development/libraries/pe-parse/default.nix index 445188bd0d9..76ee7febfe7 100644 --- a/pkgs/development/libraries/pe-parse/default.nix +++ b/pkgs/development/libraries/pe-parse/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { description = "A principled, lightweight parser for Windows portable executable files"; homepage = "https://github.com/trailofbits/pe-parse"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ arturcygan ]; + mainProgram = "dump-pe"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix index ba35a55d920..e700a5f9f11 100644 --- a/pkgs/development/libraries/precice/default.nix +++ b/pkgs/development/libraries/precice/default.nix @@ -25,10 +25,11 @@ stdenv.mkDerivation rec { meta = { description = "preCICE stands for Precise Code Interaction Coupling Environment"; - license = with lib.licenses; [ gpl3 ]; homepage = "https://precice.org/"; - platforms = lib.platforms.unix; + license = with lib.licenses; [ gpl3 ]; maintainers = with lib.maintainers; [ Scriptkiddi ]; + mainProgram = "binprecice"; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/proj-datumgrid/default.nix b/pkgs/development/libraries/proj-datumgrid/default.nix index 8251a17a83c..2593c04fa15 100644 --- a/pkgs/development/libraries/proj-datumgrid/default.nix +++ b/pkgs/development/libraries/proj-datumgrid/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { description = "Repository for proj datum grids"; homepage = "https://proj4.org"; license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ]; + mainProgram = "nad2bin"; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 6867940d1f2..130f681d849 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -48,9 +48,10 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. ''; + homepage = "https://developers.google.com/protocol-buffers/"; license = lib.licenses.bsd3; + mainProgram = "protoc"; platforms = lib.platforms.unix; - homepage = "https://developers.google.com/protocol-buffers/"; }; passthru.version = version; diff --git a/pkgs/development/libraries/rnnoise/default.nix b/pkgs/development/libraries/rnnoise/default.nix index ad587f0f583..af4fcf30153 100644 --- a/pkgs/development/libraries/rnnoise/default.nix +++ b/pkgs/development/libraries/rnnoise/default.nix @@ -18,10 +18,11 @@ stdenv.mkDerivation (rec { ''; meta = with lib; { - homepage = "https://people.xiph.org/~jm/demo/rnnoise/"; description = "Recurrent neural network for audio noise reduction"; + homepage = "https://people.xiph.org/~jm/demo/rnnoise/"; license = licenses.bsd3; maintainers = [ maintainers.nh2 ]; + mainProgram = "rnnoise_demo"; platforms = platforms.all; }; }) diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix index 0d8bafffb44..fd89ede1efb 100644 --- a/pkgs/development/libraries/science/math/cliquer/default.nix +++ b/pkgs/development/libraries/science/math/cliquer/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://users.aalto.fi/~pat/cliquer.html"; - downloadPage = src.meta.homepage; # autocliquer description = "Routines for clique searching"; longDescription = '' Cliquer is a set of C routines for finding cliques in an arbitrary weighted graph. @@ -31,8 +29,11 @@ stdenv.mkDerivation rec { It is designed with the aim of being efficient while still being flexible and easy to use. ''; + homepage = "https://users.aalto.fi/~pat/cliquer.html"; + downloadPage = src.meta.homepage; # autocliquer license = licenses.gpl2Plus; maintainers = teams.sage.members; + mainProgram = "cl"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/flintqs/default.nix b/pkgs/development/libraries/science/math/flintqs/default.nix index c956eae4f71..c5426ed67fc 100644 --- a/pkgs/development/libraries/science/math/flintqs/default.nix +++ b/pkgs/development/libraries/science/math/flintqs/default.nix @@ -30,10 +30,11 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = "https://github.com/sagemath/FlintQS"; description = "Highly optimized multi-polynomial quadratic sieve for integer factorization"; + homepage = "https://github.com/sagemath/FlintQS"; license = with licenses; [ gpl2 ]; maintainers = teams.sage.members; + mainProgram = "QuadraticSieve"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 82237ef1434..1a1f3475c35 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -14,10 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python3 wafHook ]; meta = with lib; { - homepage = "http://drobilla.net/software/serd"; description = "A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples"; + homepage = "http://drobilla.net/software/serd"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; + mainProgram = "serdi"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index ea1bb493683..9255889c694 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -44,8 +44,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An advanced font engine"; + homepage = "https://graphite.sil.org/"; + license = licenses.lgpl21; maintainers = [ maintainers.raskin ]; + mainProgram = "gr2fonttest"; platforms = platforms.unix; - license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index fe32076858a..53d69a7e549 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation rec { homepage = "http://www.jedsoft.org/slang/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; + mainProgram = "slsh"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix index b29095f7e19..b03a7cc0722 100644 --- a/pkgs/development/libraries/soundtouch/default.nix +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { description = "A program and library for changing the tempo, pitch and playback rate of audio"; homepage = "https://www.surina.net/soundtouch/"; license = licenses.lgpl21Plus; - platforms = platforms.all; maintainers = with maintainers; [ orivej ]; + mainProgram = "soundstretch"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index ebb887ffa01..73ce1c35f50 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -2,7 +2,7 @@ let archiveVersion = import ./archive-version.nix lib; - mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec { + mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; version = "3.38.2"; @@ -20,7 +20,7 @@ let installPhase = "install -Dt $out/bin ${makeTarget}"; meta = with lib; { - inherit description homepage; + inherit description homepage mainProgram; downloadPage = "http://sqlite.org/download.html"; license = licenses.publicDomain; maintainers = with maintainers; [ johnazoidberg ]; @@ -34,11 +34,13 @@ in makeTarget = "sqldiff"; description = "A tool that displays the differences between SQLite databases"; homepage = "https://www.sqlite.org/sqldiff.html"; + mainProgram = "sqldiff"; }; sqlite-analyzer = mkTool { pname = "sqlite-analyzer"; makeTarget = "sqlite3_analyzer"; description = "A tool that shows statistics about SQLite databases"; homepage = "https://www.sqlite.org/sqlanalyze.html"; + mainProgram = "sqlite3_analyzer"; }; } diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index 391424ee2c9..499532092f0 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/stxxl/stxxl"; license = licenses.boost; maintainers = with maintainers; [ ]; + mainProgram = "stxxl_tool"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index 11918d76da6..7163f24815c 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "https://www.astro.caltech.edu/~mcs/tecla/"; description = "Command-line editing library"; + homepage = "https://www.astro.caltech.edu/~mcs/tecla/"; license = "as-is"; - + mainProgram = "enhance"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix index 9ac026ee94b..8cd0faf4867 100644 --- a/pkgs/development/libraries/tre/default.nix +++ b/pkgs/development/libraries/tre/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight and robust POSIX compliant regexp matching library"; homepage = "https://laurikari.net/tre/"; - platforms = lib.platforms.unix; license = lib.licenses.bsd2; + mainProgram = "agrep"; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index 28eea052517..c39fdb03e89 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -20,14 +20,15 @@ stdenv.mkDerivation rec { doCheck = stdenv.buildPlatform == stdenv.hostPlatform; meta = with lib; { - homepage = "https://uriparser.github.io/"; description = "Strictly RFC 3986 compliant URI parsing library"; longDescription = '' uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. API documentation is available on uriparser website. ''; + homepage = "https://uriparser.github.io/"; license = licenses.bsd3; - platforms = platforms.unix; maintainers = with maintainers; [ bosu ]; + mainProgram = "uriparse"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 5f255751480..187e6900aa0 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -68,10 +68,11 @@ stdenv.mkDerivation rec { ''; meta = { + description = "XML Security Library in C based on libxml2"; homepage = "http://www.aleksey.com/xmlsec"; downloadPage = "https://www.aleksey.com/xmlsec/download.html"; - description = "XML Security Library in C based on libxml2"; license = lib.licenses.mit; + mainProgram = "xmlsec1"; platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index b115cf7b675..99163ae5dc6 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { description= "Reliable, high-performance, thread safe, flexible, clear-model, pure C logging library"; homepage = "https://hardysimpson.github.io/zlog/"; license = licenses.lgpl21; - platforms = platforms.unix; maintainers = [ maintainers.matthiasbeyer ]; + mainProgram = "zlog-chk-conf"; + platforms = platforms.unix; }; } From 367b73a422c8267fe6e9bbae05b5fbfde09cbef2 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Thu, 5 May 2022 10:05:06 +0800 Subject: [PATCH 21/42] haskellPackages.hls-rename-plugin: no aarch64-linux tests test suite triggers same RTS issue as other hls plugins --- pkgs/development/haskell-modules/configuration-arm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix index f3b65167ea6..87100404418 100644 --- a/pkgs/development/haskell-modules/configuration-arm.nix +++ b/pkgs/development/haskell-modules/configuration-arm.nix @@ -104,6 +104,7 @@ self: super: { hls-hlint-plugin = dontCheck super.hls-hlint-plugin; hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin; hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin; + hls-rename-plugin = dontCheck super.hls-rename-plugin; # https://github.com/ekmett/half/issues/35 From c9979ff597f8848b4c03d0bb272f527144d89210 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Thu, 5 May 2022 10:12:18 +0800 Subject: [PATCH 22/42] haskellPackages.hls-rename-plugin: disable flaky tests on Darwin --- pkgs/development/haskell-modules/configuration-darwin.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 4b2cddcd526..d40643114e4 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -200,6 +200,8 @@ self: super: ({ hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin; hls-floskell-plugin = dontCheck super.hls-floskell-plugin; hls-call-hierarchy-plugin = dontCheck super.hls-call-hierarchy-plugin; + # 2022-05-05: Tests fail and I have no way to debug them. + hls-rename-plugin = dontCheck super.hls-rename-plugin; # We are lacking pure pgrep at the moment for tests to work tmp-postgres = dontCheck super.tmp-postgres; From e319538a91d946eb38bb6044cf2acf987f5253df Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Thu, 5 May 2022 10:44:14 +0800 Subject: [PATCH 23/42] haskellPackages.hls-fourmolu-plugin: no aarch64-linux tests test suite triggers same RTS issue as other hls plugins --- pkgs/development/haskell-modules/configuration-arm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix index 87100404418..a82a26f8153 100644 --- a/pkgs/development/haskell-modules/configuration-arm.nix +++ b/pkgs/development/haskell-modules/configuration-arm.nix @@ -105,6 +105,7 @@ self: super: { hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin; hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin; hls-rename-plugin = dontCheck super.hls-rename-plugin; + hls-fourmolu-plugin = dontCheck super.hls-fourmolu-plugin; # https://github.com/ekmett/half/issues/35 From b8cc5a1131c79781a91d3c1c194c2284087596ee Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Thu, 5 May 2022 12:04:43 +0900 Subject: [PATCH 24/42] spago: 0.20.8 -> 0.20.9 --- pkgs/development/tools/purescript/spago/spago.nix | 6 +++--- pkgs/development/tools/purescript/spago/update.sh | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix index b5cc43a6724..e3636e16f58 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -14,11 +14,11 @@ }: mkDerivation { pname = "spago"; - version = "0.20.8"; + version = "0.20.9"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "0lakss2pg5kwbxqsmvzgkcc70l6j40cj9rarhkpcf0kxw98bb5x0"; - rev = "744bdbbefc538750d4c36888ee53dc5d336314c4"; + sha256 = "00vdqg7vaw3d9zwh47886lw9fhhlwjagzhaj3aqz4xm92pjavhih"; + rev = "d16d4914200783fbd820ba89dbdf67270454faf5"; fetchSubmodules = true; }; isLibrary = true; diff --git a/pkgs/development/tools/purescript/spago/update.sh b/pkgs/development/tools/purescript/spago/update.sh index 12595885df3..b97b0fe94a9 100755 --- a/pkgs/development/tools/purescript/spago/update.sh +++ b/pkgs/development/tools/purescript/spago/update.sh @@ -33,4 +33,7 @@ cabal2nix --revision "$new_version" "https://github.com/purescript/spago.git" >> # TODO: This should ideally also automatically update the docsSearchVersion # from pkgs/development/haskell/configuration-nix.nix. -echo "Finished." +echo +echo "Finished. Make sure you run the following commands to confirm Spago builds correctly:" +echo ' - `nix build -L -f ./. spago`' +echo ' - `sudo nix build -L -f ./. spago.passthru.tests --option sandbox relaxed`' From 6460087872dbd08b869156c71f1f23b24d0cd431 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Thu, 5 May 2022 15:19:43 +0800 Subject: [PATCH 25/42] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 11 +++++ .../transitive-broken.yaml | 29 ++++++++++- .../haskell-modules/hackage-packages.nix | 49 ++++++++++++++++++- 3 files changed, 86 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 24d92c5d3c9..509da53381d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -455,6 +455,7 @@ broken-packages: - bower-json - bowntz - bpath + - BPS - braid - brain-bleep - Bravo @@ -511,6 +512,7 @@ broken-packages: - bytestring-substring - bytestring-time - bytestring-typenats + - bzlib-conduit-jappie - c10k - c2ats - cab @@ -523,6 +525,7 @@ broken-packages: - cabal-constraints - cabal-db - cabal-dependency-licenses + - cabal-detailed-quickcheck - cabal-dev - cabal-dir - cabal-edit @@ -854,6 +857,7 @@ broken-packages: - CoreDump - CoreErlang - core-haskell + - core-webserver-warp - Coroutine - coroutine-object - CouchDB @@ -1236,6 +1240,7 @@ broken-packages: - ede - edenmodules - edis + - EdisonAPI - EdisonCore - edit - edit-lenses @@ -2100,6 +2105,7 @@ broken-packages: - hdo - hdph-closure - hdr-histogram + - HDRUtils - headergen - heap-console - heapsort @@ -3932,6 +3938,7 @@ broken-packages: - polysemy-mocks - polysemy-readline - polysemy-req + - polysemy-scoped-fs - polysemy-zoo - polytypeable - polyvariadic @@ -4221,6 +4228,7 @@ broken-packages: - Referees - references - refined-http-api-data + - refined-with - reflection-extras - reflex-basic-host - reflex-dom-ace @@ -5268,6 +5276,7 @@ broken-packages: - typalyze - typeable-mock - typeable-th + - typecheck-plugin-nat-simple - type-combinators - typed-digits - typed-encoding @@ -5387,6 +5396,7 @@ broken-packages: - utf8-prelude - utf8-validator - UTFTConverter + - util - util-logict - util-plus - util-primitive @@ -5803,3 +5813,4 @@ broken-packages: - Zwaluw - zxcvbn-hs - zydiskell + - zyre2 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 198572573b8..3828a55fab4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -436,12 +436,14 @@ dont-distribute-packages: - adp-multi-monadiccp - aeson-native - aeson-result + - affine - afv - agda-server - agda-snippets-hakyll - agentx - aip - aivika-distributed + - alg - algebra-checkers - algebra-driven-design - algebra-sql @@ -647,6 +649,7 @@ dont-distribute-packages: - apiary-websockets - apis - apotiki + - appendful-persistent - approx-rand-test - arbor-monad-metric-datadog - archive-tar-bytestring @@ -663,7 +666,7 @@ dont-distribute-packages: - ascii - ascii-cows - ascii-table - - ascii_1_2_0_0 + - ascii_1_2_2_0 - asic - asif - assert4hs-hspec @@ -770,6 +773,7 @@ dont-distribute-packages: - berp - bff - bglib + - bifunctor - billboard-parser - billeksah-forms - billeksah-main @@ -784,6 +788,7 @@ dont-distribute-packages: - bindings-ppdev - bindynamic - binembed-example + - binrep - bioace - bioalign - biofasta @@ -864,6 +869,7 @@ dont-distribute-packages: - bytelog - bytestring-builder-varword - bytestring-read + - ca - cabal-bounds - cabal-cache - cabal-cargs @@ -913,6 +919,7 @@ dont-distribute-packages: - cassy - casui - categorical-algebra + - category - category-extras - cautious-gen - cctools-workqueue @@ -1068,7 +1075,9 @@ dont-distribute-packages: - configifier - configurator-ng - conic-graphs + - constraint - constraint-manip + - constraint-reflection - constructible - consumers - container @@ -1095,6 +1104,7 @@ dont-distribute-packages: - copilot-libraries - copilot-sbv - copilot-theorem + - core-webserver-servant - coroutine-enumerator - coroutine-iteratee - couch-simple @@ -1389,6 +1399,8 @@ dont-distribute-packages: - exinst-deepseq - exinst-hashable - exinst-serialise + - exist + - exist-instances - expand - expat-enumerator - expiring-containers @@ -1404,6 +1416,7 @@ dont-distribute-packages: - extract-dependencies - factual-api - fadno + - fair - fallingblocks - family-tree - fast-arithmetic @@ -1484,6 +1497,7 @@ dont-distribute-packages: - fluent-logger - fluent-logger-conduit - fmt-for-rio + - foldable1 - follower - foo - formal @@ -1565,6 +1579,7 @@ dont-distribute-packages: - geniconvert - geniserver - genvalidity-aeson + - genvalidity-appendful - genvalidity-hspec-aeson - genvalidity-mergeful - genvalidity-mergeless @@ -2379,6 +2394,7 @@ dont-distribute-packages: - iteratee-parsec - iteratee-stm - iterio-server + - ival - ivor - ivory-avr-atmega328p-registers - ivory-backend-c @@ -2391,6 +2407,7 @@ dont-distribute-packages: - ivory-serialize - ivory-stdlib - ivy-web + - ix - ixset - ixset-typed-binary-instance - ixset-typed-cassava @@ -2474,6 +2491,7 @@ dont-distribute-packages: - keid-sound-openal - keid-ui-dearimgui - kevin + - key-vault - keyring - keysafe - keystore @@ -3058,7 +3076,6 @@ dont-distribute-packages: - phonetic-languages-simplified-base - phonetic-languages-simplified-common - phonetic-languages-simplified-examples-array - - phonetic-languages-simplified-examples-common - phonetic-languages-simplified-generalized-examples-array - phonetic-languages-simplified-generalized-examples-common - phonetic-languages-simplified-generalized-properties-array @@ -3154,6 +3171,7 @@ dont-distribute-packages: - process-streaming - procrastinating-structure - producer + - product - product-isomorphic - prof2dot - profiterole @@ -3249,9 +3267,11 @@ dont-distribute-packages: - raketka - rallod - random-access-file + - random-class - random-effin - random-hypergeometric - range-space + - ranged-list - rasa - rasa-example-config - rasa-ext-bufs @@ -3414,6 +3434,7 @@ dont-distribute-packages: - roundtrip-xml - route-generator - route-planning + - row - rpc - rpf - rsagl @@ -3602,6 +3623,7 @@ dont-distribute-packages: - smcdel - smith-cli - smith-client + - smt - smtlib2-debug - smtlib2-pipe - smtlib2-quickcheck @@ -3936,6 +3958,7 @@ dont-distribute-packages: - twitter-conduit - twitter-enumerator - twitter-types-lens + - txt - type-assertions - type-cache - type-cereal @@ -3981,6 +4004,7 @@ dont-distribute-packages: - uniqueness-periods-vector-filters - uniqueness-periods-vector-general - uniqueness-periods-vector-properties + - universal - universe - universe-dependent-sum - universe-th @@ -4021,6 +4045,7 @@ dont-distribute-packages: - vacuum-graphviz - vacuum-opengl - vacuum-ubigraph + - valid - variable-precision - vault-tool-server - vault-trans diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 421da011274..01d73c4a2a3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1355,6 +1355,8 @@ self: { ]; description = "Translations of classic Truth Maintenance Systems"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Baggins" = callPackage @@ -5217,6 +5219,8 @@ self: { libraryHaskellDepends = [ base mtl ]; description = "A library of efficient, purely-functional data structures (API)"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "EdisonCore" = callPackage @@ -8170,6 +8174,8 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) pfstools;}; "HERA" = callPackage @@ -25736,6 +25742,7 @@ self: { libraryHaskellDepends = [ alg base ]; description = "Affine spaces (generalized)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "affine-invariant-ensemble-mcmc" = callPackage @@ -26569,6 +26576,7 @@ self: { libraryHaskellDepends = [ base dual util ]; description = "Algebraic structures"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "alga" = callPackage @@ -32422,6 +32430,7 @@ self: { QuickCheck text validity ]; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "appendmap" = callPackage @@ -41360,6 +41369,7 @@ self: { libraryHaskellDepends = [ base category ]; description = "Bifunctors"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "bifunctors" = callPackage @@ -43130,6 +43140,7 @@ self: { ]; description = "Encode binary representations via types"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "bins" = callPackage @@ -49700,6 +49711,8 @@ self: { ]; description = "Streaming compression/decompression via conduits"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) bzip2;}; "c-dsl" = callPackage @@ -49945,6 +49958,7 @@ self: { libraryHaskellDepends = [ alg base ]; description = "Cellular Automata"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ca-patterns" = callPackage @@ -50284,6 +50298,8 @@ self: { libraryHaskellDepends = [ base Cabal QuickCheck ]; description = "QuickCheck for Cabal tests"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cabal-dev" = callPackage @@ -53850,6 +53866,7 @@ self: { libraryHaskellDepends = [ alg base dual transformers ]; description = "Categorical types and classes"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "category-extras" = callPackage @@ -65014,6 +65031,7 @@ self: { libraryHaskellDepends = [ base category unconstrained ]; description = "Reified constraints"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "constraint-classes" = callPackage @@ -65048,6 +65066,7 @@ self: { libraryHaskellDepends = [ base category constraint reflection ]; description = "Constraint reflection"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "constraint-tuples" = callPackage @@ -66705,6 +66724,7 @@ self: { ]; description = "Interoperability with Servant"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "core-webserver-warp" = callPackage @@ -66722,6 +66742,8 @@ self: { ]; description = "Interoperability with Wai/Warp"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "corebot-bliki" = callPackage @@ -91292,6 +91314,7 @@ self: { libraryHaskellDepends = [ base base-unicode-symbols util ]; description = "Dependent sum type"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "exist-instances" = callPackage @@ -91307,6 +91330,7 @@ self: { ]; description = "Instances for \"exist\" package (requires more language extensions and dependencies)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "existential" = callPackage @@ -92607,6 +92631,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Lists with fair choice"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "fair-predicates" = callPackage @@ -97958,6 +97983,7 @@ self: { libraryHaskellDepends = [ base transformers util ]; description = "Foldable types with at least 1 element"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "foldl" = callPackage @@ -104230,6 +104256,7 @@ self: { appendful base criterion genvalidity-criterion ]; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-bytestring" = callPackage @@ -157790,6 +157817,7 @@ self: { ]; description = "Intervals"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ivar-simple" = callPackage @@ -158083,6 +158111,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Indexed monads"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ix-shapable" = callPackage @@ -163194,6 +163223,7 @@ self: { ]; description = "Store of values of arbitrary types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "keycloak-hs" = callPackage @@ -210659,7 +210689,6 @@ self: { ]; description = "Some commonly used by phonetic-languages-simplified* series functions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-generalized-examples-array" = callPackage @@ -215249,6 +215278,8 @@ self: { ]; description = "Well-typed filesystem operation effects"; license = lib.licenses.agpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polysemy-several" = callPackage @@ -220343,6 +220374,7 @@ self: { libraryHaskellDepends = [ base category ]; description = "Product category"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "product-isomorphic" = callPackage @@ -226480,6 +226512,7 @@ self: { libraryHaskellDepends = [ base primitive transformers util ]; description = "Class of random value generation"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "random-derive" = callPackage @@ -226813,6 +226846,7 @@ self: { testHaskellDepends = [ base doctest typecheck-plugin-nat-simple ]; description = "The list like structure whose length or range of length can be specified"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "rangemin" = callPackage @@ -229603,6 +229637,8 @@ self: { libraryHaskellDepends = [ aeson base deepseq hashable refined ]; description = "Refinement types with an \"refinement applied\" switch"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "refinery" = callPackage @@ -236705,6 +236741,7 @@ self: { doHaddock = false; description = "Row types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "row-types" = callPackage @@ -252622,6 +252659,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Interface to Satisfiability Modulo Theories solvers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "smt-lib" = callPackage @@ -281076,6 +281114,7 @@ self: { testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Text"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "txt-sushi" = callPackage @@ -281948,6 +281987,8 @@ self: { testHaskellDepends = [ base containers ghc ghc-tcplugins-extra ]; description = "Simple type check plugin which calculate addition, subtraction and less-or-equal-than"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "typed-admin" = callPackage @@ -284692,6 +284733,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Universal"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "universal-binary" = callPackage @@ -286778,6 +286820,8 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "Utilities"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "util-exception" = callPackage @@ -287487,6 +287531,7 @@ self: { libraryHaskellDepends = [ base util ]; description = "Type isomorphic to `Either` with `Applicative` instance which combines errors"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "valid-names" = callPackage @@ -306350,6 +306395,8 @@ self: { testHaskellDepends = [ base bytestring containers inline-c text ]; description = "Haskell zyre bindings for reliable group messaging over local area networks"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) czmq; zyre = null;}; } From b93472045a2e732b3fbcfd4044667ec5967b326f Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Thu, 5 May 2022 21:47:47 +0800 Subject: [PATCH 26/42] haskellPackages.haskell-language-server: Run aarch64 plugin tests on ghc > 9.2 --- .../haskell-modules/configuration-arm.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix index a82a26f8153..62aa67efd77 100644 --- a/pkgs/development/haskell-modules/configuration-arm.nix +++ b/pkgs/development/haskell-modules/configuration-arm.nix @@ -99,21 +99,22 @@ self: super: { hls-class-plugin = dontCheck super.hls-class-plugin; hls-selection-range-plugin = dontCheck super.hls-selection-range-plugin; - # Similar RTS issue in test suite: - # rts/linker/elf_reloc_aarch64.c:98: encodeAddendAarch64: Assertion `isInt64(21+12, addend)' failed. - hls-hlint-plugin = dontCheck super.hls-hlint-plugin; - hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin; - hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin; - hls-rename-plugin = dontCheck super.hls-rename-plugin; - hls-fourmolu-plugin = dontCheck super.hls-fourmolu-plugin; - - # https://github.com/ekmett/half/issues/35 half = dontCheck super.half; # We disable profiling on aarch64, so tests naturally fail ghc-prof = dontCheck super.ghc-prof; +} // lib.optionalAttrs (pkgs.stdenv.hostPlatform.isAarch64 && builtins.compareVersions super.ghc.version "9.2" < 0) { + # Some aarch64 issues have been fixed since 9.2 + + # Similar RTS issue in test suite: + # rts/linker/elf_reloc_aarch64.c:98: encodeAddendAarch64: Assertion `isInt64(21+12, addend)' failed. + # Fixed since 9.2 + hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin; + hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin; + hls-rename-plugin = dontCheck super.hls-rename-plugin; + hls-fourmolu-plugin = dontCheck super.hls-fourmolu-plugin; } // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch32 { # AARCH32-SPECIFIC OVERRIDES From 61fc98459ffecb70c2890d35eaa37e28bb08eda5 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 5 May 2022 19:39:50 +0300 Subject: [PATCH 27/42] nixVersions.unstable: pre20220503 -> pre20220505 --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index cf9b26a5603..b7fe55f8b41 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -89,12 +89,12 @@ in lib.makeExtensible (self: { unstable = lib.lowPrio (common rec { version = "2.8"; - suffix = "pre20220503_${lib.substring 0 7 src.rev}"; + suffix = "pre20220505_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "9489b4b7ef73ab20e8f49213d8711ca56b59107e"; - sha256 = "sha256-eTRr2MkP9MMqpmHtsCPMbyLBQLrLPnTh4D8RXT4MKk4="; + rev = "f4102de84ba4dd3b845a3e34fabab5400e066ad0"; + sha256 = "sha256-g3GDM8MSzJ27hJoGWj2QGjINZP/I1KCJpZZn+iPMmfM="; }; }); }) From 27194d6afb0d147cce93feb7bc1edcf3338bcaa7 Mon Sep 17 00:00:00 2001 From: Pawel Kruszewski Date: Thu, 5 May 2022 20:12:40 +0200 Subject: [PATCH 28/42] timeular: 4.7.1 -> 4.8.0 --- pkgs/applications/office/timeular/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index 50298247d5a..aa591c225ad 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -7,31 +7,26 @@ }: let - version = "4.7.1"; + version = "4.8.0"; pname = "timeular"; - name = "${pname}-${version}"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - sha256 = "sha256:0k8ywbdb41imq10ya9y27zks67a6drjb1h0hn8ycd7a6z6703rjz"; + sha256 = "sha256:0y2asw3jf2n4c7y0yr669jfqw4frp5nzzv3lffimfdr78gihma66"; }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 rec { - inherit name src; - - profile = '' - export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS - ''; + inherit pname version src; extraPkgs = pkgs: with pkgs; [ libsecret ]; extraInstallCommands = '' - mv $out/bin/{${name},${pname}} + mv $out/bin/{${pname}-${version},${pname}} install -m 444 -D ${appimageContents}/timeular.desktop $out/share/applications/timeular.desktop install -m 444 -D ${appimageContents}/timeular.png $out/share/icons/hicolor/512x512/apps/timeular.png substituteInPlace $out/share/applications/timeular.desktop \ From f18cc2cf02695c9d21d33beb47f2eac7b7d0d079 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Wed, 4 May 2022 16:34:29 +0000 Subject: [PATCH 29/42] nixos/security/wrappers: chown user:group instead of user.group to fix warnings from coreutils 9.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit activating the configuration... setting up /etc... chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.messagebus’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ chown: warning: '.' should be ':': ‘root.root’ reloading user units for root... --- nixos/modules/security/wrappers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index e63f19010de..169ef744262 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -98,7 +98,7 @@ let # Prevent races chmod 0000 "$wrapperDir/${program}" - chown ${owner}.${group} "$wrapperDir/${program}" + chown ${owner}:${group} "$wrapperDir/${program}" # Set desired capabilities on the file plus cap_setpcap so # the wrapper program can elevate the capabilities set on @@ -126,7 +126,7 @@ let # Prevent races chmod 0000 "$wrapperDir/${program}" - chown ${owner}.${group} "$wrapperDir/${program}" + chown ${owner}:${group} "$wrapperDir/${program}" chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" "$wrapperDir/${program}" ''; From 59a76614f3219348fb44389d19f933ddda4bf12c Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Thu, 5 May 2022 20:09:00 +0000 Subject: [PATCH 30/42] treewide: chown user:group instead of user.group to fix warnings from coreutils 9.1 --- .../installation/installing-from-other-distro.section.xml | 2 +- .../installation/installing-from-other-distro.section.md | 2 +- .../services/continuous-integration/hydra/default.nix | 8 ++++---- nixos/modules/services/networking/gateone.nix | 4 ++-- nixos/modules/services/networking/ircd-hybrid/ircd.conf | 2 +- nixos/modules/services/networking/pptpd.nix | 2 +- nixos/modules/services/networking/prayer.nix | 2 +- nixos/modules/services/networking/tinc.nix | 4 ++-- nixos/modules/services/networking/xl2tpd.nix | 6 +++--- nixos/modules/services/web-apps/restya-board.nix | 8 ++++---- nixos/tests/virtualbox.nix | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml b/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml index 525531a4781..024a24379dd 100644 --- a/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml +++ b/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml @@ -248,7 +248,7 @@ $ nix-env -p /nix/var/nix/profiles/system -f '<nixpkgs/nixos>' -I nixos-co (since your Nix install was probably single user): -$ sudo chown -R 0.0 /nix +$ sudo chown -R 0:0 /nix diff --git a/nixos/doc/manual/installation/installing-from-other-distro.section.md b/nixos/doc/manual/installation/installing-from-other-distro.section.md index d9060eb89c3..fa8806f791d 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.section.md +++ b/nixos/doc/manual/installation/installing-from-other-distro.section.md @@ -177,7 +177,7 @@ The first steps to all these are the same: was probably single user): ```ShellSession - $ sudo chown -R 0.0 /nix + $ sudo chown -R 0:0 /nix ``` 1. Set up the `/etc/NIXOS` and `/etc/NIXOS_LUSTRATE` files: diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index cc5de97d6d1..90adab7fbf2 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -300,17 +300,17 @@ in }; preStart = '' mkdir -p ${baseDir} - chown hydra.hydra ${baseDir} + chown hydra:hydra ${baseDir} chmod 0750 ${baseDir} ln -sf ${hydraConf} ${baseDir}/hydra.conf mkdir -m 0700 -p ${baseDir}/www - chown hydra-www.hydra ${baseDir}/www + chown hydra-www:hydra ${baseDir}/www mkdir -m 0700 -p ${baseDir}/queue-runner mkdir -m 0750 -p ${baseDir}/build-logs - chown hydra-queue-runner.hydra ${baseDir}/queue-runner ${baseDir}/build-logs + chown hydra-queue-runner:hydra ${baseDir}/queue-runner ${baseDir}/build-logs ${optionalString haveLocalDB '' if ! [ -e ${baseDir}/.db-created ]; then @@ -338,7 +338,7 @@ in rmdir /nix/var/nix/gcroots/per-user/hydra-www/hydra-roots fi - chown hydra.hydra ${cfg.gcRootsDir} + chown hydra:hydra ${cfg.gcRootsDir} chmod 2775 ${cfg.gcRootsDir} ''; serviceConfig.ExecStart = "${hydra-package}/bin/hydra-init"; diff --git a/nixos/modules/services/networking/gateone.nix b/nixos/modules/services/networking/gateone.nix index 3e3a3c1aa94..e68f8a47d5c 100644 --- a/nixos/modules/services/networking/gateone.nix +++ b/nixos/modules/services/networking/gateone.nix @@ -36,11 +36,11 @@ config = mkIf cfg.enable { preStart = '' if [ ! -d ${cfg.settingsDir} ] ; then mkdir -m 0750 -p ${cfg.settingsDir} - chown -R gateone.gateone ${cfg.settingsDir} + chown -R gateone:gateone ${cfg.settingsDir} fi if [ ! -d ${cfg.pidDir} ] ; then mkdir -m 0750 -p ${cfg.pidDir} - chown -R gateone.gateone ${cfg.pidDir} + chown -R gateone:gateone ${cfg.pidDir} fi ''; #unitConfig.RequiresMountsFor = "${cfg.settingsDir}"; diff --git a/nixos/modules/services/networking/ircd-hybrid/ircd.conf b/nixos/modules/services/networking/ircd-hybrid/ircd.conf index 17ef203840a..b82094cf5f0 100644 --- a/nixos/modules/services/networking/ircd-hybrid/ircd.conf +++ b/nixos/modules/services/networking/ircd-hybrid/ircd.conf @@ -98,7 +98,7 @@ serverinfo { * * openssl genrsa -out rsa.key 2048 * openssl rsa -in rsa.key -pubout -out rsa.pub - * chown . rsa.key rsa.pub + * chown : rsa.key rsa.pub * chmod 0600 rsa.key * chmod 0644 rsa.pub */ diff --git a/nixos/modules/services/networking/pptpd.nix b/nixos/modules/services/networking/pptpd.nix index 3e7753b9dd3..423e14e998f 100644 --- a/nixos/modules/services/networking/pptpd.nix +++ b/nixos/modules/services/networking/pptpd.nix @@ -108,7 +108,7 @@ with lib; #username pptpd password * EOF - chown root.root "$secrets" + chown root:root "$secrets" chmod 600 "$secrets" ''; diff --git a/nixos/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix index ae9258b2712..513509eaca3 100644 --- a/nixos/modules/services/networking/prayer.nix +++ b/nixos/modules/services/networking/prayer.nix @@ -82,7 +82,7 @@ in serviceConfig.Type = "forking"; preStart = '' mkdir -m 0755 -p ${stateDir} - chown ${prayerUser}.${prayerGroup} ${stateDir} + chown ${prayerUser}:${prayerGroup} ${stateDir} ''; script = "${prayer}/sbin/prayer --config-file=${prayerCfg}"; }; diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 31731b60d48..9bc019039e0 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -383,9 +383,9 @@ in }; preStart = '' mkdir -p /etc/tinc/${network}/hosts - chown tinc.${network} /etc/tinc/${network}/hosts + chown tinc:${network} /etc/tinc/${network}/hosts mkdir -p /etc/tinc/${network}/invitations - chown tinc.${network} /etc/tinc/${network}/invitations + chown tinc:${network} /etc/tinc/${network}/invitations # Determine how we should generate our keys if type tinc >/dev/null 2>&1; then diff --git a/nixos/modules/services/networking/xl2tpd.nix b/nixos/modules/services/networking/xl2tpd.nix index 7dbe51422d9..9418488c1e9 100644 --- a/nixos/modules/services/networking/xl2tpd.nix +++ b/nixos/modules/services/networking/xl2tpd.nix @@ -116,18 +116,18 @@ with lib; #username xl2tpd password * EOF - chown root.root ppp/chap-secrets + chown root:root ppp/chap-secrets chmod 600 ppp/chap-secrets # The documentation says this file should be present but doesn't explain why and things work even if not there: [ -f l2tp-secrets ] || (echo -n "* * "; ${pkgs.apg}/bin/apg -n 1 -m 32 -x 32 -a 1 -M LCN) > l2tp-secrets - chown root.root l2tp-secrets + chown root:root l2tp-secrets chmod 600 l2tp-secrets popd > /dev/null mkdir -p /run/xl2tpd - chown root.root /run/xl2tpd + chown root:root /run/xl2tpd chmod 700 /run/xl2tpd ''; diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index 4b36cc8754c..0bfa2368787 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -294,7 +294,7 @@ in ln -sf "${cfg.dataDir}/client/img" "${runDir}/client/img" chmod g+w "${runDir}/tmp/cache" - chown -R "${cfg.user}"."${cfg.group}" "${runDir}" + chown -R "${cfg.user}":"${cfg.group}" "${runDir}" mkdir -m 0750 -p "${cfg.dataDir}" @@ -302,9 +302,9 @@ in mkdir -m 0750 -p "${cfg.dataDir}/client/img" cp -r "${pkgs.restya-board}/media/"* "${cfg.dataDir}/media" cp -r "${pkgs.restya-board}/client/img/"* "${cfg.dataDir}/client/img" - chown "${cfg.user}"."${cfg.group}" "${cfg.dataDir}" - chown -R "${cfg.user}"."${cfg.group}" "${cfg.dataDir}/media" - chown -R "${cfg.user}"."${cfg.group}" "${cfg.dataDir}/client/img" + chown "${cfg.user}":"${cfg.group}" "${cfg.dataDir}" + chown -R "${cfg.user}":"${cfg.group}" "${cfg.dataDir}/media" + chown -R "${cfg.user}":"${cfg.group}" "${cfg.dataDir}/client/img" ${optionalString (cfg.database.host == null) '' if ! [ -e "${cfg.dataDir}/.db-initialized" ]; then diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 27093aab96e..4eb402a7d36 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -222,7 +222,7 @@ let machine.execute(ru("VBoxManage controlvm ${name} poweroff")) machine.succeed("rm -rf ${sharePath}") machine.succeed("mkdir -p ${sharePath}") - machine.succeed("chown alice.users ${sharePath}") + machine.succeed("chown alice:users ${sharePath}") def create_vm_${name}(): From 69a71a0ec2da81a4213e1f0ceedb95545d9e2414 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 5 May 2022 15:22:25 -0700 Subject: [PATCH 31/42] spirv-llvm-translator: move spirv-tools to nativeBuildInputs --- pkgs/development/compilers/spirv-llvm-translator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index abcc93c62d5..8893f07b8c8 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-/vUyL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg="; }; - nativeBuildInputs = [ pkg-config cmake llvm_11.dev ]; + nativeBuildInputs = [ pkg-config cmake llvm_11.dev spirv-tools ]; - buildInputs = [ spirv-headers spirv-tools llvm_11 ]; + buildInputs = [ spirv-headers llvm_11 ]; checkInputs = [ lit ]; From d14ebd795e9fedd0a03525bf7d0884396d05143a Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 5 May 2022 15:24:09 -0700 Subject: [PATCH 32/42] intel-graphics-compiler: reindent --- .../intel-graphics-compiler/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 75318351de7..9f1f9039227 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -56,17 +56,17 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace ./external/SPIRV-Tools/CMakeLists.txt \ - --replace '$'''{SPIRV-Tools_DIR}../../..' \ - '${spirv-tools}' \ - --replace 'SPIRV-Headers_INCLUDE_DIR "/usr/include"' \ - 'SPIRV-Headers_INCLUDE_DIR "${spirv-headers}/include"' \ - --replace 'set_target_properties(SPIRV-Tools' \ - 'set_target_properties(SPIRV-Tools-shared' \ - --replace 'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools' \ - 'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools-shared' - substituteInPlace ./IGC/AdaptorOCL/igc-opencl.pc.in \ - --replace '/@CMAKE_INSTALL_INCLUDEDIR@' "/include" \ - --replace '/@CMAKE_INSTALL_LIBDIR@' "/lib" + --replace '$'''{SPIRV-Tools_DIR}../../..' \ + '${spirv-tools}' \ + --replace 'SPIRV-Headers_INCLUDE_DIR "/usr/include"' \ + 'SPIRV-Headers_INCLUDE_DIR "${spirv-headers}/include"' \ + --replace 'set_target_properties(SPIRV-Tools' \ + 'set_target_properties(SPIRV-Tools-shared' \ + --replace 'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools' \ + 'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools-shared' + substituteInPlace ./IGC/AdaptorOCL/igc-opencl.pc.in \ + --replace '/@CMAKE_INSTALL_INCLUDEDIR@' "/include" \ + --replace '/@CMAKE_INSTALL_LIBDIR@' "/lib" ''; # Handholding the braindead build script From 37c0bfd127f2797ded4dbaef462ea2dc71df31b6 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 5 May 2022 15:26:20 -0700 Subject: [PATCH 33/42] spirv-llvm-translator: remove prePatch since we don't run tests --- .../development/compilers/spirv-llvm-translator/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index 8893f07b8c8..3ae837ac46b 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -34,12 +34,6 @@ stdenv.mkDerivation rec { "-DLLVM_SPIRV_BUILD_EXTERNAL=YES" ]; - prePatch = '' - substituteInPlace ./test/CMakeLists.txt \ - --replace 'SPIRV-Tools' 'SPIRV-Tools-shared' - ''; - - # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist doCheck = false; From f4f9691c9fef909ee5dd6f14da6f404852bfc3c3 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 5 May 2022 15:26:58 -0700 Subject: [PATCH 34/42] intel-graphics-compiler: remove INSTALL_SPIRVDLL --- pkgs/development/compilers/intel-graphics-compiler/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 9f1f9039227..fb88ebc5282 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -84,7 +84,6 @@ stdenv.mkDerivation rec { "-Wno-dev" "-DVC_INTRINSICS_SRC=${vc_intrinsics_src}" "-DIGC_OPTION__SPIRV_TOOLS_MODE=Prebuilds" - "-DINSTALL_SPIRVDLL=0" "-DCCLANG_BUILD_PREBUILDS=ON" "-DCCLANG_BUILD_PREBUILDS_DIR=${prebuilds}" "-DIGC_PREFERRED_LLVM_VERSION=${getVersion llvm}" From eaaa1160167c9f0832f8c871db875a3d985195a0 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 5 May 2022 15:27:48 -0700 Subject: [PATCH 35/42] intel-graphics-compiler: move substitutes to postPatch --- pkgs/development/compilers/intel-graphics-compiler/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index fb88ebc5282..0eab971fb97 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { # https://github.com/intel/intel-graphics-compiler/issues/98 doCheck = false; - patchPhase = '' + postPatch = '' substituteInPlace ./external/SPIRV-Tools/CMakeLists.txt \ --replace '$'''{SPIRV-Tools_DIR}../../..' \ '${spirv-tools}' \ From 70df2a9dd30f8927bd54a050069713badff4c3a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 May 2022 23:18:51 +0000 Subject: [PATCH 36/42] python3Packages.notify-events: init at 1.1.3 --- .../python-modules/notify-events/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/notify-events/default.nix diff --git a/pkgs/development/python-modules/notify-events/default.nix b/pkgs/development/python-modules/notify-events/default.nix new file mode 100644 index 00000000000..97d888ae23c --- /dev/null +++ b/pkgs/development/python-modules/notify-events/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "notify-events"; + version = "1.1.3"; + + format = "setuptools"; + + src = fetchPypi { + pname = "notify_events"; + inherit version; + sha256 = "e63ba935c3300ff7f48cba115f7cb4474906e83c2e9b60b95a0881eb949701e7"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "notify_events" ]; + + meta = { + description = "Python client for Notify.Events"; + homepage = "https://github.com/notify-events/python"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ebd87e812a..79f802145ab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5740,6 +5740,8 @@ in { notifications-python-client = callPackage ../development/python-modules/notifications-python-client { }; + notify-events = callPackage ../development/python-modules/notify-events { }; + notify-py = callPackage ../development/python-modules/notify-py { }; notify2 = callPackage ../development/python-modules/notify2 { }; From afbca20c70327650df050260f4fbedaec466b4c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 May 2022 23:19:44 +0000 Subject: [PATCH 37/42] home-assistant: support notify_events component --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3ffb7594cd0..fab9ea39dcc 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1791,7 +1791,8 @@ "notify" = ps: with ps; [ ]; "notify_events" = ps: with ps; [ - ]; # missing inputs: notify-events + notify-events + ]; "notion" = ps: with ps; [ aionotion ]; @@ -3505,6 +3506,7 @@ "nina" "no_ip" "notify" + "notify_events" "notion" "nsw_rural_fire_service_feed" "nuki" From 67b1fac192de8d7aa566001f7c7967c340a90a2b Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 5 May 2022 17:09:27 -0700 Subject: [PATCH 38/42] nixos/tailscale: add glibc to PATH. For some features, tailscaled uses getent(1) to get the shell of OS users. getent(1) is in the glibc derivation. Without this derivation in the path, tailscale falls back to /bin/sh for all users. Signed-off-by: David Anderson --- nixos/modules/services/networking/tailscale.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index 1f64113950a..c61af0d18b8 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.tailscale; in { - meta.maintainers = with maintainers; [ danderson mbaillie ]; + meta.maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 ]; options.services.tailscale = { enable = mkEnableOption "Tailscale client daemon"; @@ -40,7 +40,11 @@ in { systemd.packages = [ cfg.package ]; systemd.services.tailscaled = { wantedBy = [ "multi-user.target" ]; - path = [ pkgs.openresolv pkgs.procps ]; + path = [ + pkgs.openresolv # for configuring DNS in some configs + pkgs.procps # for collecting running services (opt-in feature) + pkgs.glibc # for `getent` to look up user shells + ]; serviceConfig.Environment = [ "PORT=${toString cfg.port}" ''"FLAGS=--tun ${lib.escapeShellArg cfg.interfaceName}"'' From d8da6a153b7951f55f4e0243047ad4ae644b4ed5 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 4 May 2022 18:42:39 -0700 Subject: [PATCH 39/42] nimble-unwrapped: add meta --- pkgs/development/compilers/nim/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 4b0e6e618e3..f7250885f14 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -183,6 +183,14 @@ in { install -Dt $out/bin src/nimble runHook postBuild ''; + + meta = with lib; { + description = "Package manager for the Nim programming language"; + homepage = "https://github.com/nim-lang/nimble"; + license = licenses.bsd3; + maintainers = with maintainers; [ ehmry ]; + mainProgram = "nimble"; + }; }; nim = let From 6ad85fcb619e19338a02c68273dc8cd6ec82ef4f Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 5 May 2022 19:48:10 -0400 Subject: [PATCH 40/42] vector: 0.21.1 -> 0.21.2 --- pkgs/tools/misc/vector/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index ec9958ec545..3375f4507bd 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -30,7 +30,7 @@ let pname = "vector"; - version = "0.21.1"; + version = "0.21.2"; in rustPlatform.buildRustPackage { inherit pname version; @@ -39,10 +39,10 @@ rustPlatform.buildRustPackage { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eskm+H0D+SB3PB76T6Z+iL5jjyy51lOXy88QXsn/Azs="; + sha256 = "sha256-2iMD3QpVm1YmiEH17PdjgiNoD2Gt9BRJ5soMDB//b3Y="; }; - cargoSha256 = "sha256-fN6o8Fcqdhs5c3RID+ok1Xo5g6nF9m3f8EWIJ47dn/k="; + cargoSha256 = "sha256-OkK0COSHdZ6fHWUrZ90ltuFSCtVZ14QZiIWVwkHOvq8="; nativeBuildInputs = [ pkg-config cmake perl ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; @@ -62,7 +62,7 @@ rustPlatform.buildRustPackage { buildFeatures = features; # TODO investigate compilation failure for tests - # there are about 100 tests failing (out of 1100) for version 0.21.1 + # there are about 100 tests failing (out of 1100) for version 0.21.2 doCheck = false; checkFlags = [ From 5cdfc935fa8d37297743af925091e5c7555414c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 May 2022 03:21:04 +0000 Subject: [PATCH 41/42] python310Packages.azure-mgmt-msi: 6.0.0 -> 6.0.1 --- pkgs/development/python-modules/azure-mgmt-msi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-msi/default.nix b/pkgs/development/python-modules/azure-mgmt-msi/default.nix index 985c9828974..d36a1b985c7 100644 --- a/pkgs/development/python-modules/azure-mgmt-msi/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-msi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-mgmt-msi"; - version = "6.0.0"; + version = "6.0.1"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-RpmYeF6LRKqu0KrjNAFAaOGxyfPuK+TImOumP+FPX2w="; + sha256 = "sha256-PPkQmUoBkJ8Su7h9G2/t8dVy/PT3uCYZjlf70fnY2vU="; }; propagatedBuildInputs = [ From 8c41f43ef2982c0822106374191c8eac05bde472 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 May 2022 03:15:04 +0000 Subject: [PATCH 42/42] python310Packages.pex: 2.1.84 -> 2.1.85 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index e582ad1a446..2098a1d10cf 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.84"; + version = "2.1.85"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tjPjLzNOO/PUU6EItLYyQw+KPekIwboTBn98T8wHpHw="; + hash = "sha256-ABRidGtJikMIHItT21MJdiIqpA26IUN1aFMNyRVKyDA="; }; nativeBuildInputs = [