From 91e4fa278e3095285fc5cb56681a4aff076ca805 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 5 May 2022 12:01:23 -0500 Subject: [PATCH 001/122] haskell-modules/generic-builder.nix: use mktemp instead of TMPDIR Using $TMPDIR here is problematic because it is not always cleared at the end of each build, for instance when using "nix-shell --run genericBuild". This can cause confusing errors when a nix-shell build is trying to pull in dependencies from a previous build since it tries to use older package conf files. To fix, we can just use mktemp which will guarantee us a clean directory for each build. Should have no effect in nix-build, but will fix a common issue with using generic-builder in nix-shell. --- pkgs/development/haskell-modules/generic-builder.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index bc43c39676c8..e637e446e649 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -338,9 +338,10 @@ stdenv.mkDerivation ({ echo "Build with ${ghc}." ${optionalString (isLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"} - setupPackageConfDir="$TMPDIR/setup-package.conf.d" + builddir="$(mktemp -d)" + setupPackageConfDir="$builddir/setup-package.conf.d" mkdir -p $setupPackageConfDir - packageConfDir="$TMPDIR/package.conf.d" + packageConfDir="$builddir/package.conf.d" mkdir -p $packageConfDir setupCompileFlags="${concatStringsSep " " setupCompileFlags}" @@ -418,7 +419,7 @@ stdenv.mkDerivation ({ done echo setupCompileFlags: $setupCompileFlags - ${nativeGhcCommand} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i + ${nativeGhcCommand} $setupCompileFlags --make -o Setup -odir $builddir -hidir $builddir $i runHook postCompileBuildDriver ''; From 8f5c420450bd431c09d92d009fff5bf0e024c12a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 10 May 2022 12:03:55 +0200 Subject: [PATCH 002/122] haskellPackages.mkDerivation: show test outputs as they happen Currently, the test output is only printed if the test suite fails. If a test suite gets stuck, however, and is hit with a timeout by Hydra, it can help to have the log available when diagnosing the issue. --- pkgs/development/haskell-modules/generic-builder.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index bc43c39676c8..af4d31ab2a89 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -469,7 +469,10 @@ stdenv.mkDerivation ({ # `--test-option`, so Cabal passes it to the underlying test suite binary. checkPhase = '' runHook preCheck - checkFlagsArray+=(${lib.escapeShellArgs (builtins.map (opt: "--test-option=${opt}") testFlags)}) + checkFlagsArray+=( + "--show-details=streaming" + ${lib.escapeShellArgs (builtins.map (opt: "--test-option=${opt}") testFlags)} + ) ${setupCommand} test ${testTarget} $checkFlags ''${checkFlagsArray:+"''${checkFlagsArray[@]}"} runHook postCheck ''; From 6595bdb30e564c8ad97c12333130791509cf0f14 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 14 May 2022 09:10:53 +0100 Subject: [PATCH 003/122] awesome: pull upstream fix for -fno-common toolchains Without the change build fails as: ld: CMakeFiles/awesome.dir/objects/window.c.o:/build/source/build/common/lualib.h:31: multiple definition of `lualib_dofunction_on_error'; CMakeFiles/awesome.dir/awesome.c.o:/build/source/build/common/lualib.h:31: first defined here --- .../window-managers/awesome/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 90b559e7d44c..b19f17275ad6 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, lua, cairo, librsvg, cmake, imagemagick, pkg-config, gdk-pixbuf +{ lib, stdenv, fetchFromGitHub, fetchpatch +, lua, cairo, librsvg, cmake, imagemagick, pkg-config, gdk-pixbuf , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, makeWrapper, pango, gobject-introspection , which, dbus, nettools, git, doxygen @@ -27,6 +28,21 @@ stdenv.mkDerivation rec { sha256 = "1i7ajmgbsax4lzpgnmkyv35x8vxqi0j84a14k6zys4blx94m9yjf"; }; + patches = [ + # Pull upstream fix for -fno-common toolchain support: + # https://github.com/awesomeWM/awesome/pull/3065 + (fetchpatch { + name = "fno-common-prerequisite.patch"; + url = "https://github.com/awesomeWM/awesome/commit/c5202a48708585cc33528065af8d1b1d28b1a6e0.patch"; + sha256 = "0sv36xf0ibjcm63gn9k3bl039sqavb2b5i6d65il4bdclkc0n08b"; + }) + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0.patch"; + sha256 = "1n3y4wnjra8blss7642jgpxnm9n92zhhjj541bb9i60m4b7bgfzz"; + }) + ]; + nativeBuildInputs = [ cmake doxygen From f74dcd2f28054f3151ff3815a1bc51f5f9a19c53 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 14 May 2022 11:31:57 +0100 Subject: [PATCH 004/122] foma: 0.9.18alpha -> 0.10.0alpha Among other things fixes build with -fno-common toolchains. --- pkgs/tools/misc/foma/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/foma/default.nix b/pkgs/tools/misc/foma/default.nix index e75aaca50f6e..ea229b20445f 100644 --- a/pkgs/tools/misc/foma/default.nix +++ b/pkgs/tools/misc/foma/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "foma"; - version = "0.9.18alpha"; + version = "0.10.0alpha"; src = fetchFromGitHub { owner = "mhulden"; repo = "foma"; - rev = "4456a40e81f46e3fe909c5a97a15fcf1d2a3b6c1"; - sha256 = "188yxj8wahlj2yf93rj1vx549j5cq0085d2jmj3vwzbfjq1mi1f0"; + rev = "82f9acdef234eae8b7619ccc3a386cc0d7df62bc"; + sha256 = "1vf01l18j8cksnavbabcckp9gg692w6v5lg81xrzv6f5v14zp4nr"; }; sourceRoot = "source/foma"; From 5f137cf5b70cae5b4bb2185b6439a020b1d47e63 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 14 May 2022 12:59:05 +0100 Subject: [PATCH 005/122] apacheHttpdPackages.mod_tile: pull upstream fix for -fno-common Without che change build on upstream gcc-10 fails as: ld: src/renderd-gen_tile.o:/build/source/includes/daemon.h:48: multiple definition of `render_request_queue'; src/daemon.o:/build/source/includes/daemon.h:48: first defined here --- .../servers/http/apache-modules/mod_tile/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/http/apache-modules/mod_tile/default.nix b/pkgs/servers/http/apache-modules/mod_tile/default.nix index 31ddd1863838..78c5749a616e 100644 --- a/pkgs/servers/http/apache-modules/mod_tile/default.nix +++ b/pkgs/servers/http/apache-modules/mod_tile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, apacheHttpd, apr, cairo, iniparser, mapnik }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, apacheHttpd, apr, cairo, iniparser, mapnik }: stdenv.mkDerivation rec { pname = "mod_tile"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "12c96avka1dfb9wxqmjd57j30w9h8yx4y4w34kyq6xnf6lwnkcxp"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains: + # https://github.com/openstreetmap/mod_tile/pull/202 + (fetchpatch { + name = "fno-common"; + url = "https://github.com/openstreetmap/mod_tile/commit/a22065b8ae3c018820a5ca9bf8e2b2bb0a0bfeb4.patch"; + sha256 = "1ywfa14xn9aa96vx1adn1ndi29qpflca06x986bx9c5pqk761yz3"; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ apacheHttpd apr cairo iniparser mapnik ]; From 0b3eecc56f119d2307da27ffc081af4a714b8c0a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 14 May 2022 13:41:11 +0100 Subject: [PATCH 006/122] gerbv: pull fix pending upstream inclusion for -fno-common toolchains Without the change build fails on upstream gcc-10 as: ld: interface.o:/build/gerbv/src/callbacks.h:50: multiple definition of `toggle_layer'; callbacks.o:/build/gerbv/src/callbacks.h:50: first defined here ld: interface.o:/build/gerbv/src/callbacks.h:44: multiple definition of `CALLBACKS_SAVE_FILE_TYPE'; callbacks.o:/build/gerbv/src/callbacks.h:44: first defined here ld: render.o:/build/gerbv/src/callbacks.h:44: multiple definition of `CALLBACKS_SAVE_FILE_TYPE'; callbacks.o:/build/gerbv/src/callbacks.h:44: first defined here --- .../science/electronics/gerbv/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix index a16d5f32e27a..f83cfa1bf04e 100644 --- a/pkgs/applications/science/electronics/gerbv/default.nix +++ b/pkgs/applications/science/electronics/gerbv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }: +{ lib, stdenv, fetchgit, fetchpatch, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }: stdenv.mkDerivation { pname = "gerbv"; @@ -10,6 +10,16 @@ stdenv.mkDerivation { sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446"; }; + patches = [ + # Pull patch pending upstream inclusion for -fno-common toolchains: + # https://sourceforge.net/p/gerbv/patches/84/ + (fetchpatch { + name = "fnoc-mmon.patch"; + url = "https://sourceforge.net/p/gerbv/patches/84/attachment/0001-gerbv-fix-build-on-gcc-10-fno-common.patch"; + sha256 = "1avfbkqhxl7wxn1z19y30ilkwvdgpdkzhzawrs5y3damxmqq8ggk"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config automake autoconf ]; buildInputs = [ gettext libtool cairo gtk2 ]; From 1cd3351798562b83b9087d4dc936ae01d1f5be29 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 15 May 2022 20:46:43 -0400 Subject: [PATCH 007/122] opentx: 2.3.14 -> 2.3.15 --- pkgs/applications/misc/opentx/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index d220d5fa2fa1..e0a7b8942444 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -6,16 +6,13 @@ mkDerivation rec { pname = "opentx"; - version = "2.3.14"; + version = "2.3.15"; src = fetchFromGitHub { owner = "opentx"; repo = "opentx"; - # 2.3.14 release tag points to the commit before the one that updates the - # version number. - # rev = "release/${version}"; - rev = "1e09791a1e2fe2a0ca9835019d634a4c6a4fa3bf"; - sha256 = "0mhzp1j6nmqvkjxg8lv8xa637m1lavdsak30mdlq0g25dhwg6k92"; + rev = "release/${version}"; + sha256 = "sha256-F3zykJhKuIpLQSTjn7mcdjEmgRAlwCZpkTaKQR9ve3g="; }; nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ]; From d62f3acd4dfbe051a81281d1b1b86f99992ae578 Mon Sep 17 00:00:00 2001 From: omg Date: Mon, 16 May 2022 10:47:02 +0400 Subject: [PATCH 008/122] photoflare: 1.6.7.1 -> 1.6.10 --- pkgs/applications/graphics/photoflare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix index cc4f4342c618..1806d0d7b3ba 100644 --- a/pkgs/applications/graphics/photoflare/default.nix +++ b/pkgs/applications/graphics/photoflare/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "photoflare"; - version = "1.6.7.1"; + version = "1.6.10"; src = fetchFromGitHub { owner = "PhotoFlare"; repo = "photoflare"; rev = "v${version}"; - sha256 = "sha256-7b7ICcHuMjOMtyQDkokoHeZrF4G+bOzgRJP4mkns+Zc="; + sha256 = "sha256-lQIzvI6rjcx8pHni9LN15LWyIkMALvyYx54G9WyqpOo="; }; nativeBuildInputs = [ qmake qttools ]; From 4f0b07f7704521ed4e050002bb8cd977fab447d0 Mon Sep 17 00:00:00 2001 From: eikek Date: Mon, 16 May 2022 10:26:24 +0200 Subject: [PATCH 009/122] guile-json: 4.7.0 -> 4.7.1 --- pkgs/development/guile-modules/guile-json/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/guile-modules/guile-json/default.nix b/pkgs/development/guile-modules/guile-json/default.nix index 1ca6c21c97c8..3407ebf12ae9 100644 --- a/pkgs/development/guile-modules/guile-json/default.nix +++ b/pkgs/development/guile-modules/guile-json/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "guile-json"; - version = "4.7.0"; + version = "4.7.1"; src = fetchurl { url = "mirror://savannah/guile-json/${pname}-${version}.tar.gz"; - sha256 = "sha256-q70TV3qUUULrkZrpDGosqFZ4STO/9VgQ7l+LM7NBU5c="; + sha256 = "sha256-xTSaI4D2fIphOps698mNITJdRDAjNp5vdhs2bpaUaEM="; }; postConfigure = '' From 1d36aafa55bec318896fe9661943e1b081f06217 Mon Sep 17 00:00:00 2001 From: eikek Date: Mon, 16 May 2022 10:34:21 +0200 Subject: [PATCH 010/122] guile-json: allow on all platforms --- pkgs/development/guile-modules/guile-json/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/guile-modules/guile-json/default.nix b/pkgs/development/guile-modules/guile-json/default.nix index 3407ebf12ae9..da15ca2d6ac4 100644 --- a/pkgs/development/guile-modules/guile-json/default.nix +++ b/pkgs/development/guile-modules/guile-json/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://savannah.nongnu.org/projects/guile-json"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ethancedwards8 ]; - platforms = platforms.linux; + platforms = platforms.all; }; } From 0e1c9977e9325f4dec21c46a80badf3b525aed48 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 20 May 2022 07:55:35 +0100 Subject: [PATCH 011/122] tbb: pull fix pending upstream inclusion for gcc-13 support Without the change build fails on upcoming gcc-13 as: ../../include/tbb/task.h:300:20: error: declaration of 'tbb::task& tbb::internal::task_prefix::task()' changes meaning of 'task' [-fpermissive] 300 | tbb::task& task() {return *reinterpret_cast(this+1);} | ^~~~ ../../include/tbb/task.h:252:9: note: used here to mean 'class tbb::task' 252 | task* next_offloaded; | ^~~~ ../../include/tbb/task.h:43:7: note: declared here 43 | class task; | ^~~~ --- pkgs/development/libraries/tbb/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 7913f05354d4..1d739810e9e6 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -28,6 +28,14 @@ stdenv.mkDerivation rec { url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch"; sha256 = "fhorfqO1hHKZ61uq+yTR7eQ8KYdyLwpM3K7WpwJpV74="; }) + + # Fixes build with upcoming gcc-13: + # https://github.com/oneapi-src/oneTBB/pull/833 + (fetchurl { + name = "gcc-13.patch"; + url = "https://github.com/oneapi-src/oneTBB/pull/833/commits/c18342ba667d1f33f5e9a773aa86b091a9694b97.patch"; + sha256 = "ZUExE3nsW80Z5GPWZnDNuDiHHaD1EF7qNl/G5M+Wcxg="; + }) ]; nativeBuildInputs = lib.optionals stdenv.isDarwin [ From 98e84e3c93689b093d1bc21e3d98d9035dfea622 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 20 May 2022 08:12:06 +0100 Subject: [PATCH 012/122] dirb: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: resume.o:/build/dirb222/src/variables.h:15: multiple definition of `curl'; crea_wordlist.o:/build/dirb222/src/variables.h:15: first defined here --- pkgs/tools/networking/dirb/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/networking/dirb/default.nix b/pkgs/tools/networking/dirb/default.nix index 09f1fbc2f9f9..e8826ee6454b 100644 --- a/pkgs/tools/networking/dirb/default.nix +++ b/pkgs/tools/networking/dirb/default.nix @@ -25,6 +25,12 @@ in stdenv.mkDerivation rec { sed -i "s#/usr#$out#" src/dirb.c ''; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: resume.o:/build/dirb222/src/variables.h:15: multiple definition of `curl'; + # crea_wordlist.o:/build/dirb222/src/variables.h:15: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + postInstall = '' mkdir -p $out/share/dirb/ cp -r wordlists/ $out/share/dirb/ From 84fad7bf602a98707f489180f39dce128e3c8bc8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 20 May 2022 09:00:11 +0100 Subject: [PATCH 013/122] dspam: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: .libs/hash_drv.o:/build/dspam-3.10.2/src/util.h:96: multiple definition of `verified_user'; .libs/libdspam.o:/build/dspam-3.10.2/src/util.h:96: first defined here --- pkgs/servers/mail/dspam/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix index 8d73542bec68..e2388e6a9491 100644 --- a/pkgs/servers/mail/dspam/default.nix +++ b/pkgs/servers/mail/dspam/default.nix @@ -53,6 +53,12 @@ in stdenv.mkDerivation rec { ] ++ lib.optional withMySQL "--with-mysql-includes=${mysql57.connector-c}/include/mysql" ++ lib.optional withPgSQL "--with-pgsql-libraries=${postgresql.lib}/lib"; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: .libs/hash_drv.o:/build/dspam-3.10.2/src/util.h:96: multiple definition of `verified_user'; + # .libs/libdspam.o:/build/dspam-3.10.2/src/util.h:96: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + # Lots of things are hardwired to paths like sysconfdir. That's why we install with both "prefix" and "DESTDIR" # and fix directory structure manually after that. installFlags = [ "DESTDIR=$(out)" ]; From ba010e3688be68c8d82668a3b924972b8b81f7a8 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 20 May 2022 22:28:12 +0200 Subject: [PATCH 014/122] haskellPackages: stackage LTS 19.6 -> LTS 19.7 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 100 +++++++++--------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 5009f8689caa..2f5a561ca3e9 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.6 +# Stackage LTS 19.7 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -13,7 +13,7 @@ default-package-overrides: - active ==0.2.0.15 - ad ==4.5 - ad-delcont ==0.3.0.0 - - adjunctions ==4.4 + - adjunctions ==4.4.1 - adler32 ==0.1.2.0 - advent-of-code-api ==0.2.8.1 - aern2-mp ==0.2.8.0 @@ -156,12 +156,12 @@ default-package-overrides: - bech32 ==1.1.2 - bech32-th ==1.1.1 - bench ==1.0.12 - - benchpress ==0.2.2.19 + - benchpress ==0.2.2.20 - bencode ==0.6.1.1 - bencoding ==0.4.5.4 - between ==0.11.0.0 - bibtex ==0.1.0.6 - - bifunctors ==5.5.11 + - bifunctors ==5.5.12 - bimap ==0.4.0 - bimaps ==0.1.0.2 - bimap-server ==0.1.0.1 @@ -174,7 +174,7 @@ default-package-overrides: - binary-instances ==1.0.2 - binary-list ==1.1.1.2 - binary-orphans ==1.0.2 - - binary-parser ==0.5.7.1 + - binary-parser ==0.5.7.2 - binary-parsers ==0.2.4.0 - binary-search ==2.0.0 - binary-shared ==0.8.3 @@ -224,7 +224,7 @@ default-package-overrides: - bordacount ==0.1.0.0 - boring ==0.2 - both ==0.1.1.2 - - bound ==2.0.4 + - bound ==2.0.5 - BoundedChan ==1.0.3.0 - bounded-queue ==1.0.0 - boxes ==0.1.5 @@ -234,7 +234,7 @@ default-package-overrides: - bsb-http-chunked ==0.0.0.4 - bson ==0.4.0.1 - bson-lens ==0.1.1 - - buffer-builder ==0.2.4.7 + - buffer-builder ==0.2.4.8 - buffer-pipe ==0.0 - bugsnag-haskell ==0.0.4.4 - bugsnag-hs ==0.2.0.8 @@ -244,11 +244,11 @@ default-package-overrides: - buttplug-hs-core ==0.1.0.1 - bv ==0.5 - byteable ==0.1.1 - - byte-count-reader ==0.10.1.8 + - byte-count-reader ==0.10.1.9 - bytedump ==1.0 - byte-order ==0.1.3.0 - byteorder ==1.0.4 - - bytes ==0.17.1 + - bytes ==0.17.2 - byteset ==0.1.1.0 - bytestring-builder ==0.10.8.2.0 - bytestring-conversion ==0.3.1 @@ -399,8 +399,8 @@ default-package-overrides: - conduit-combinators ==1.3.0 - conduit-concurrent-map ==0.1.1 - conduit-connection ==0.1.0.5 - - conduit-extra ==1.3.5 - - conduit-parse ==0.2.1.0 + - conduit-extra ==1.3.6 + - conduit-parse ==0.2.1.1 - conduit-zstd ==0.0.2.0 - conferer ==1.1.0.0 - conferer-aeson ==1.1.0.2 @@ -428,7 +428,7 @@ default-package-overrides: - cookie ==0.4.5 - copr-api ==0.1.0 - core-data ==0.3.2.2 - - core-program ==0.4.6.1 + - core-program ==0.4.6.4 - core-text ==0.3.7.1 - countable ==1.0 - covariance ==0.1.0.6 @@ -557,7 +557,7 @@ default-package-overrides: - deriveJsonNoPrefix ==0.1.0.1 - derive-topdown ==0.0.3.0 - deriving-aeson ==0.2.8 - - deriving-compat ==0.6 + - deriving-compat ==0.6.1 - derulo ==2.0.0.1 - detour-via-sci ==1.0.0 - df1 ==0.4 @@ -645,7 +645,7 @@ default-package-overrides: - edit-distance ==0.2.2.1 - edit-distance-vector ==1.0.0.4 - editor-open ==0.6.0.0 - - either ==5.0.1.1 + - either ==5.0.2 - either-both ==0.1.1.1 - either-unwrap ==1.1 - elerea ==2.9.0 @@ -798,7 +798,7 @@ default-package-overrides: - foundation ==0.0.28 - fourmolu ==0.4.0.0 - Frames ==0.7.3 - - free ==5.1.7 + - free ==5.1.8 - free-categories ==0.2.0.2 - freenect ==1.2.1 - freer-simple ==1.2.1.2 @@ -828,7 +828,7 @@ default-package-overrides: - gdp ==0.0.3.0 - general-games ==1.1.1 - generic-aeson ==0.2.0.13 - - generic-arbitrary ==0.2.1 + - generic-arbitrary ==0.2.2 - generic-constraints ==1.1.1.1 - generic-data ==0.9.2.1 - generic-data-surgery ==0.3.0.0 @@ -946,7 +946,7 @@ default-package-overrides: - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 - graphite ==0.10.0.1 - - graphs ==0.7.1 + - graphs ==0.7.2 - graphula ==2.0.1.1 - graphviz ==2999.20.1.0 - graph-wrapper ==0.2.6.0 @@ -1047,7 +1047,7 @@ default-package-overrides: - hgeometry ==0.14 - hgeometry-combinatorial ==0.14 - hid ==0.2.2 - - hidapi ==0.1.7 + - hidapi ==0.1.8 - hie-bios ==0.9.1 - hi-file-parser ==0.1.2.0 - higher-leveldb ==0.6.0.0 @@ -1140,7 +1140,7 @@ default-package-overrides: - hspec-core ==2.8.5 - hspec-discover ==2.8.5 - hspec-expectations ==0.8.2 - - hspec-expectations-json ==1.0.0.6 + - hspec-expectations-json ==1.0.0.7 - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.6 - hspec-golden ==0.2.0.0 @@ -1150,7 +1150,7 @@ default-package-overrides: - hspec-leancheck ==0.0.6 - hspec-megaparsec ==2.2.0 - hspec-meta ==2.7.8 - - hspec-need-env ==0.1.0.8 + - hspec-need-env ==0.1.0.9 - hspec-parsec ==0 - hspec-smallcheck ==0.5.2 - hspec-tmp-proc ==0.5.0.1 @@ -1161,7 +1161,7 @@ default-package-overrides: - hstatistics ==0.3.1 - HStringTemplate ==0.8.8 - HSvm ==0.1.1.3.25 - - HsYAML ==0.2.1.0 + - HsYAML ==0.2.1.1 - HsYAML-aeson ==0.2.0.1 - hsyslog ==5.0.2 - hsyslog-udp ==0.2.5 @@ -1170,7 +1170,7 @@ default-package-overrides: - html ==1.0.1.2 - html-conduit ==1.3.2.2 - html-email-validate ==0.2.0.0 - - html-entities ==1.1.4.5 + - html-entities ==1.1.4.6 - html-entity-map ==0.1.0.0 - http2 ==3.0.3 - HTTP ==4000.3.16 @@ -1189,7 +1189,7 @@ default-package-overrides: - http-link-header ==1.2.1 - http-media ==0.8.0.0 - http-query ==0.1.3 - - http-reverse-proxy ==0.6.0 + - http-reverse-proxy ==0.6.0.1 - http-streams ==0.8.9.6 - http-types ==0.12.3 - human-readable-duration ==0.2.1.4 @@ -1289,7 +1289,7 @@ default-package-overrides: - intervals ==0.9.2 - intro ==0.9.0.0 - intset-imperative ==0.1.0.0 - - invariant ==0.5.5 + - invariant ==0.5.6 - invert ==1.0.0.2 - invertible ==0.2.0.7 - invertible-grammar ==0.1.3.2 @@ -1337,9 +1337,9 @@ default-package-overrides: - junit-xml ==0.1.0.2 - justified-containers ==0.3.0.0 - jwt ==0.11.0 - - kan-extensions ==5.2.3 + - kan-extensions ==5.2.4 - kanji ==3.5.0 - - katip ==0.8.7.0 + - katip ==0.8.7.1 - katip-logstash ==0.1.0.2 - katip-wai ==0.1.1.0 - kazura-queue ==0.1.0.4 @@ -1430,8 +1430,8 @@ default-package-overrides: - list-predicate ==0.1.0.1 - listsafe ==0.1.0.1 - list-singleton ==2.0.0.0 - - list-t ==1.0.5.1 - - list-transformer ==1.0.7 + - list-t ==1.0.5.2 + - list-transformer ==1.0.8 - ListTree ==0.2.3 - ListZipper ==1.2.0.2 - literatex ==0.2.0.2 @@ -1459,7 +1459,7 @@ default-package-overrides: - lsp-types ==1.4.0.1 - lua ==2.1.0 - lua-arbitrary ==1.0.1 - - lucid ==2.11.0 + - lucid ==2.11.1 - lucid-cdn ==0.2.2.0 - lucid-extras ==0.2.2 - lukko ==0.1.1.3 @@ -1501,8 +1501,8 @@ default-package-overrides: - mcmc-types ==1.0.3 - median-stream ==0.7.0.0 - med-module ==0.1.2.2 - - megaparsec ==9.2.0 - - megaparsec-tests ==9.2.0 + - megaparsec ==9.2.1 + - megaparsec-tests ==9.2.1 - mega-sdist ==0.4.2.1 - memory ==0.16.0 - MemoTrie ==0.6.10 @@ -1655,7 +1655,7 @@ default-package-overrides: - network-transport-tcp ==0.8.0 - network-transport-tests ==0.3.0 - network-uri ==2.6.4.1 - - network-wait ==0.1.1.0 + - network-wait ==0.1.2.0 - newtype ==0.2.2.0 - newtype-generics ==0.6.1 - nfc ==0.1.0 @@ -1764,7 +1764,7 @@ default-package-overrides: - ParsecTools ==0.0.2.0 - parser-combinators ==1.3.0 - parser-combinators-tests ==1.3.0 - - parsers ==0.12.10 + - parsers ==0.12.11 - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.3.0 - partial-order ==0.2.0.0 @@ -1846,7 +1846,7 @@ default-package-overrides: - placeholders ==0.1 - plaid ==0.1.0.4 - plotlyhs ==0.2.1 - - pointed ==5.0.3 + - pointed ==5.0.4 - pointedlist ==0.6.1 - pointless-fun ==1.1.0.8 - poll ==0.0.0.2 @@ -1873,7 +1873,7 @@ default-package-overrides: - posix-paths ==0.3.0.0 - possibly ==1.0.0.0 - postgres-options ==0.2.0.0 - - postgresql-binary ==0.12.4.2 + - postgresql-binary ==0.12.4.3 - postgresql-libpq ==0.9.4.3 - postgresql-libpq-notify ==0.2.0.0 - postgresql-migration ==0.2.1.3 @@ -1985,7 +1985,7 @@ default-package-overrides: - rampart ==2.0.0.0 - ramus ==0.1.2 - rando ==0.0.0.4 - - random ==1.2.1 + - random ==1.2.1.1 - random-bytestring ==0.1.4 - random-fu ==0.3.0.0 - random-shuffle ==0.0.4 @@ -2067,7 +2067,7 @@ default-package-overrides: - resistor-cube ==0.0.1.4 - resolv ==0.1.2.0 - resource-pool ==0.2.3.2 - - resourcet ==1.2.4.3 + - resourcet ==1.2.5 - result ==0.2.6.0 - retry ==0.9.2.0 - rev-state ==0.1.2 @@ -2092,7 +2092,7 @@ default-package-overrides: - rosezipper ==0.2 - rot13 ==0.2.0.1 - rpmbuild-order ==0.4.5 - - rpm-nvr ==0.1.1 + - rpm-nvr ==0.1.2 - rp-tree ==0.7.1 - RSA ==2.4.1 - rss-conduit ==0.6.0.1 @@ -2288,7 +2288,7 @@ default-package-overrides: - speedy-slice ==0.3.2 - Spintax ==0.3.6 - splice ==0.6.1.1 - - splint ==1.0.1.4 + - splint ==1.0.1.5 - split ==0.2.3.4 - splitmix ==0.1.0.4 - splitmix-distributions ==0.9.0.0 @@ -2316,7 +2316,7 @@ default-package-overrides: - StateVar ==1.2.2 - stateWriter ==0.3.0 - static-text ==0.2.0.7 - - statistics ==0.16.0.2 + - statistics ==0.16.1.0 - status-notifier-item ==0.3.1.0 - stb-image-redux ==0.2.1.2 - step-function ==0.2 @@ -2352,7 +2352,7 @@ default-package-overrides: - streamt ==0.5.0.0 - strict ==0.4.0.1 - strict-concurrency ==0.2.4.3 - - strict-list ==0.1.6 + - strict-list ==0.1.7 - strict-tuple ==0.1.5 - strict-tuple-lens ==0.2 - strict-wrapper ==0.0.0.0 @@ -2404,7 +2404,7 @@ default-package-overrides: - tagged ==0.8.6.1 - tagged-binary ==0.2.0.1 - tagged-identity ==0.1.3 - - tagged-transformer ==0.8.1 + - tagged-transformer ==0.8.2 - tagshare ==0.0 - tagsoup ==0.14.8 - tagstream-conduit ==0.5.6 @@ -2412,8 +2412,8 @@ default-package-overrides: - tao-example ==1.0.0 - tar ==0.5.1.1 - tar-conduit ==0.3.2 - - tardis ==0.4.3.0 - - tasty ==1.4.2.1 + - tardis ==0.4.4.0 + - tasty ==1.4.2.3 - tasty-ant-xml ==1.1.8 - tasty-bench ==0.3.1 - tasty-dejafu ==2.0.0.8 @@ -2435,7 +2435,7 @@ default-package-overrides: - tasty-program ==1.0.5 - tasty-quickcheck ==0.10.2 - tasty-rerun ==1.1.18 - - tasty-silver ==3.3.1 + - tasty-silver ==3.3.1.1 - tasty-smallcheck ==0.8.2 - tasty-tap ==0.1.0 - tasty-test-reporter ==0.1.1.4 @@ -2469,7 +2469,7 @@ default-package-overrides: - text-binary ==0.2.1.1 - text-builder ==0.6.6.5 - text-builder-dev ==0.2.1 - - text-conversions ==0.3.1 + - text-conversions ==0.3.1.1 - text-icu ==0.7.1.0 - text-latin1 ==0.3.1 - text-ldap ==0.1.1.14 @@ -2573,7 +2573,7 @@ default-package-overrides: - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - - turtle ==1.5.24 + - turtle ==1.5.25 - twitter-conduit ==0.6.1 - twitter-types ==0.11.0 - twitter-types-lens ==0.11.0 @@ -2717,7 +2717,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.10 + - wai-extra ==3.1.12.1 - wai-feature-flags ==0.1.0.3 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.4.0 @@ -2855,7 +2855,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.13 + - yesod-test ==1.6.14 - yesod-websockets ==0.3.0.3 - yes-precure5-command ==5.5.3 - yi-rope ==0.11 @@ -2875,7 +2875,7 @@ default-package-overrides: - zipper-extra ==0.1.3.2 - zippers ==0.3.2 - zip-stream ==0.2.1.0 - - zlib ==0.6.2.3 + - zlib ==0.6.3.0 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 - zot ==0.0.3 From 341d31a36ff78d240029bee53dd364e6c6788aaa Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 20 May 2022 22:28:26 +0200 Subject: [PATCH 015/122] all-cabal-hashes: 2022-05-14T01:13:33Z -> 2022-05-20T19:45:02Z 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 061704e9260c..6b7041d7e674 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "2c56a18f7c408d4fd67a3667d93cab163692fc53", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/2c56a18f7c408d4fd67a3667d93cab163692fc53.tar.gz", - "sha256": "0yvikmygrb6gb0lv4jp00rsqnagvkrc94sgmrn1gfjlmazss77z5", - "msg": "Update from Hackage at 2022-05-14T01:13:33Z" + "commit": "d69efcbdc39d5a7ae25039f9737ad04e34f38f68", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d69efcbdc39d5a7ae25039f9737ad04e34f38f68.tar.gz", + "sha256": "1xlnp36h5r8q3nf1fbq472rkqp0wmgz51rylnd23kl0pba2fypkp", + "msg": "Update from Hackage at 2022-05-20T19:45:02Z" } From 1b8c4d4fd4810116b7ca75c09f24d3bd9a0d7824 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 20 May 2022 22:29:22 +0200 Subject: [PATCH 016/122] 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 | 2655 +++++++++-------- 1 file changed, 1368 insertions(+), 1287 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 75c2417e0f95..e48290efb286 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2073,23 +2073,23 @@ self: { }) {}; "BlogLiterately" = callPackage - ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs - , containers, data-default, directory, filepath, HaXml, haxr - , highlighting-kate, hscolour, HTTP, lens, mtl, pandoc - , pandoc-citeproc, pandoc-types, parsec, process, split, strict - , tagsoup, temporary, text, transformers + ({ mkDerivation, base, blaze-html, bool-extras, bytestring + , citeproc, cmdargs, containers, data-default, directory, filepath + , HaXml, haxr, highlighting-kate, hscolour, HTTP, lens, mtl, pandoc + , pandoc-types, parsec, process, split, strict, tagsoup, temporary + , text, transformers }: mkDerivation { pname = "BlogLiterately"; - version = "0.8.7"; - sha256 = "01x8q04bs0qr2vg434yl2mfnshjd6licyard6pjfvhalk2phxcp2"; + version = "0.8.8"; + sha256 = "1g374dxdvs2mg9y5aq07qkff4srd53rhanav2fdz1g73ssbdjyhl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base blaze-html bool-extras bytestring cmdargs containers + base blaze-html bool-extras bytestring citeproc cmdargs containers data-default directory filepath HaXml haxr highlighting-kate - hscolour HTTP lens mtl pandoc pandoc-citeproc pandoc-types parsec - process split strict tagsoup temporary text transformers + hscolour HTTP lens mtl pandoc pandoc-types parsec process split + strict tagsoup temporary text transformers ]; executableHaskellDepends = [ base cmdargs ]; description = "A tool for posting Haskelly articles to blogs"; @@ -3592,6 +3592,8 @@ self: { pname = "ConfigFile"; version = "1.1.4"; sha256 = "057mw146bip9wzs7j4b5xr1x24d8w0kr4i3inri5m57jkwspn25f"; + revision = "1"; + editedCabalFile = "10qqg7x6pa2nryk3j56im65kvbh1v9psf6ic3nkabfxvigw83d2c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers MissingH mtl parsec ]; @@ -9546,15 +9548,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "HTTP_4000_4_0" = callPackage + "HTTP_4000_4_1" = callPackage ({ mkDerivation, array, base, bytestring, deepseq, httpd-shed , HUnit, mtl, network, network-uri, parsec, pureMD5, split , test-framework, test-framework-hunit, time, transformers }: mkDerivation { pname = "HTTP"; - version = "4000.4.0"; - sha256 = "1m2z6hsla3kf810kcfkljf2j9w6lhjgvxbpqzv5f227wxs8n5s5h"; + version = "4000.4.1"; + sha256 = "0lyl5lpkk51xn3dfndh8ksgvwcdsviyigmsnp3d28lbpxkpxhcfz"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time transformers @@ -10257,8 +10259,8 @@ self: { }: mkDerivation { pname = "HaskellNet"; - version = "0.6"; - sha256 = "0jsnq5sqflw9qjbhcvgxsb0mlac6yl1427xp7nm6fbaa2mmv8jd2"; + version = "0.6.0.1"; + sha256 = "08rwi28q46md2d25l1h6s6hdqf8c2c47is5w5vyydbqx6pmfdc73"; libraryHaskellDepends = [ array base base64 bytestring cryptohash-md5 mime-mail mtl network network-bsd old-time pretty text @@ -11044,29 +11046,6 @@ self: { }) {Controller = null; driver = null;}; "HsYAML" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, mtl, parsec - , QuickCheck, tasty, tasty-quickcheck, text - }: - mkDerivation { - pname = "HsYAML"; - version = "0.2.1.0"; - sha256 = "10qzhsg789h37q22hm9p27dx4rhbykcbxp7p3pvkws8fr7ajgxv0"; - revision = "4"; - editedCabalFile = "1gzfaqnz7wjvdjh8w66rlg8c9vwawb0adh9kahl8fn70mdnp38az"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers deepseq mtl parsec text - ]; - testHaskellDepends = [ - base bytestring containers mtl QuickCheck tasty tasty-quickcheck - text - ]; - description = "Pure Haskell YAML 1.2 processor"; - license = lib.licenses.gpl2Only; - }) {}; - - "HsYAML_0_2_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, mtl, parsec , QuickCheck, tasty, tasty-quickcheck, text, transformers }: @@ -11085,7 +11064,6 @@ self: { ]; description = "Pure Haskell YAML 1.2 processor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "HsYAML-aeson" = callPackage @@ -18417,6 +18395,8 @@ self: { pname = "ShellCheck"; version = "0.7.2"; sha256 = "0wl43njaq95l35y5mvipwp1db9vr551nz9wl0xy83j1x1kc38xgz"; + revision = "1"; + editedCabalFile = "1w65zcr97mghraif6bgcdabzy2dp72gasaad57a9b5yp9i27p2rl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -18445,6 +18425,8 @@ self: { pname = "ShellCheck"; version = "0.8.0"; sha256 = "05jlapp4m997w36h2wszdxz9gvczdczaylypsbn14jqpb650w232"; + revision = "1"; + editedCabalFile = "1c942n7lz59b0acvppg25k01f87rj3icrza9pfp9mlpiwaq1y8qw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -20607,8 +20589,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "TypeNat"; - version = "0.5.0.0"; - sha256 = "1css4pb2x514s396c35brghgn3pgysdps8k09k1wcx5k2qpg90cx"; + version = "0.5.0.1"; + sha256 = "0p22g0ara1wsj9jnnhimxsa5sxd5k0ci2p4371ca2xdc2qmxz05h"; libraryHaskellDepends = [ base ]; description = "Some Nat-indexed types for GHC"; license = lib.licenses.mit; @@ -23401,6 +23383,8 @@ self: { pname = "acid-state"; version = "0.16.1"; sha256 = "1fvcx96y7cin7f39asa130q8j2z39l61ibff98vmkhqwxiys4z4h"; + revision = "1"; + editedCabalFile = "03md28vq6j63h5jxvlzvx106c4xd0c64zvd6ar56icpb14qk52q9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24272,6 +24256,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "ad_4_5_1" = callPackage + ({ mkDerivation, adjunctions, array, base, comonad, containers + , criterion, data-reify, erf, free, nats, reflection, semigroups + , transformers + }: + mkDerivation { + pname = "ad"; + version = "4.5.1"; + sha256 = "08hx8ww93x2hg6qxfypd9hyqqcp7c70w17i6hs03qmk4i433h2b9"; + libraryHaskellDepends = [ + adjunctions array base comonad containers data-reify erf free nats + reflection semigroups transformers + ]; + benchmarkHaskellDepends = [ base criterion erf ]; + description = "Automatic Differentiation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ad-delcont" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -24438,29 +24441,6 @@ self: { }) {}; "adjunctions" = callPackage - ({ mkDerivation, array, base, comonad, containers, contravariant - , distributive, free, generic-deriving, hspec, hspec-discover, mtl - , profunctors, semigroupoids, semigroups, tagged, transformers - , transformers-compat, void - }: - mkDerivation { - pname = "adjunctions"; - version = "4.4"; - sha256 = "1sbal7cbhm12crfnfhkk322jnzgx7lhw3jzq0p463bipagsjwz2h"; - revision = "2"; - editedCabalFile = "1yfsjx7dqikg3hvld7i91xfsg5lawmr5980lvfd794sybmgxsf17"; - libraryHaskellDepends = [ - array base comonad containers contravariant distributive free mtl - profunctors semigroupoids semigroups tagged transformers - transformers-compat void - ]; - testHaskellDepends = [ base distributive generic-deriving hspec ]; - testToolDepends = [ hspec-discover ]; - description = "Adjunctions and representable functors"; - license = lib.licenses.bsd3; - }) {}; - - "adjunctions_4_4_1" = callPackage ({ mkDerivation, array, base, comonad, containers, contravariant , distributive, free, generic-deriving, hspec, hspec-discover, mtl , profunctors, semigroupoids, semigroups, tagged, transformers @@ -24479,7 +24459,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Adjunctions and representable functors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "adler32" = callPackage @@ -33825,6 +33804,8 @@ self: { pname = "array"; version = "0.5.4.0"; sha256 = "1ixqnwxd36l2j3873hwnfip17k2nzncbvsx7pnprqzv9z59mf4rv"; + revision = "1"; + editedCabalFile = "0y6v6mfd0y5jzskp7b6jwg1ybfirpgrppvd4zri9xccd73v1xfaa"; libraryHaskellDepends = [ base ]; description = "Mutable and immutable arrays"; license = lib.licenses.bsd3; @@ -40921,20 +40902,6 @@ self: { }) {}; "benchpress" = callPackage - ({ mkDerivation, base, bytestring, mtl, time }: - mkDerivation { - pname = "benchpress"; - version = "0.2.2.19"; - sha256 = "00yv902qicsyrx2sbx7m2h1wsqfzikl8ffbkcvm1xqkn11p3gcjw"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base mtl time ]; - executableHaskellDepends = [ base bytestring time ]; - description = "Micro-benchmarking with detailed statistics"; - license = lib.licenses.bsd3; - }) {}; - - "benchpress_0_2_2_20" = callPackage ({ mkDerivation, base, bytestring, mtl, time }: mkDerivation { pname = "benchpress"; @@ -40946,7 +40913,6 @@ self: { executableHaskellDepends = [ base bytestring time ]; description = "Micro-benchmarking with detailed statistics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bencode" = callPackage @@ -41457,30 +41423,6 @@ self: { }) {}; "bifunctors" = callPackage - ({ mkDerivation, base, base-orphans, comonad, containers, hspec - , hspec-discover, QuickCheck, tagged, template-haskell - , th-abstraction, transformers, transformers-compat - }: - mkDerivation { - pname = "bifunctors"; - version = "5.5.11"; - sha256 = "070964w7gz578379lyj6xvdbcf367csmz22cryarjr5bz9r9csrb"; - revision = "1"; - editedCabalFile = "1xl5xqr76k7ixq2bjszjh83xkg3szarnzbrv2ahxnmmfbbl5whnc"; - libraryHaskellDepends = [ - base base-orphans comonad containers tagged template-haskell - th-abstraction transformers - ]; - testHaskellDepends = [ - base hspec QuickCheck template-haskell transformers - transformers-compat - ]; - testToolDepends = [ hspec-discover ]; - description = "Bifunctors"; - license = lib.licenses.bsd3; - }) {}; - - "bifunctors_5_5_12" = callPackage ({ mkDerivation, base, base-orphans, comonad, containers, hspec , hspec-discover, QuickCheck, tagged, template-haskell , th-abstraction, transformers, transformers-compat @@ -41500,7 +41442,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Bifunctors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bighugethesaurus" = callPackage @@ -41650,6 +41591,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "bimap_0_5_0" = callPackage + ({ mkDerivation, base, containers, deepseq, exceptions, QuickCheck + , template-haskell + }: + mkDerivation { + pname = "bimap"; + version = "0.5.0"; + sha256 = "158cdwk9jwklcfgbn62dqq255i40w13ifggsdps87sxc5q7lpd5h"; + libraryHaskellDepends = [ base containers deepseq exceptions ]; + testHaskellDepends = [ + base containers deepseq exceptions QuickCheck template-haskell + ]; + description = "Bidirectional mapping between two key types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bimap-server" = callPackage ({ mkDerivation, aeson, base, bimap, binary, directory, http-types , unix, wai, warp @@ -42032,24 +41990,6 @@ self: { }) {}; "binary-parser" = callPackage - ({ mkDerivation, base, bytestring, mtl, QuickCheck - , quickcheck-instances, rerebase, tasty, tasty-hunit - , tasty-quickcheck, text, transformers - }: - mkDerivation { - pname = "binary-parser"; - version = "0.5.7.1"; - sha256 = "1k3rc1szwahc5w2lxddnjpd4zkfi2hmcq398sixf2qx44f2kk6vp"; - libraryHaskellDepends = [ base bytestring mtl text transformers ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "A highly-efficient but limited parser API specialised for bytestrings"; - license = lib.licenses.mit; - }) {}; - - "binary-parser_0_5_7_2" = callPackage ({ mkDerivation, base, bytestring, mtl, QuickCheck , quickcheck-instances, rerebase, tasty, tasty-hunit , tasty-quickcheck, text, transformers @@ -42065,7 +42005,6 @@ self: { ]; description = "A highly-efficient but limited parser API specialised for bytestrings"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "binary-parsers" = callPackage @@ -42691,8 +42630,8 @@ self: { ({ mkDerivation, base, bindings-DSL, gpgme }: mkDerivation { pname = "bindings-gpgme"; - version = "0.1.7"; - sha256 = "0jz6v52alvczvmwlik0qvw3bfilhzpyp9wd1g92214j2iblyjk8i"; + version = "0.1.8"; + sha256 = "1z48bkjxkjvykydhwa543sg18rwmvi7b9yg6wjpl31flaf656g76"; libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ gpgme ]; description = "Project bindings-* raw interface to gpgme"; @@ -45240,6 +45179,8 @@ self: { pname = "blaze-svg"; version = "0.3.6.1"; sha256 = "0q5a4wam0sidng0cfsivwkyph9snyilk7rsdx4vb6wz9l6xz397n"; + revision = "1"; + editedCabalFile = "1vb78d0nvk0909963pm0mnzklcm57w563lhgx1wv7qzdfznpi8f9"; libraryHaskellDepends = [ base blaze-markup mtl ]; description = "SVG combinator library"; license = lib.licenses.bsd3; @@ -46832,30 +46773,6 @@ self: { }) {}; "bound" = callPackage - ({ mkDerivation, base, bifunctors, binary, bytes, cereal, comonad - , deepseq, deriving-compat, hashable, mmorph, profunctors - , template-haskell, th-abstraction, transformers - , transformers-compat, vector, void - }: - mkDerivation { - pname = "bound"; - version = "2.0.4"; - sha256 = "06wyjiswi5fnnw7ndjdln3fkfgab5c8qh9v1d1s0f0s6rzlb85xs"; - revision = "1"; - editedCabalFile = "008i9lm53p0vwahrl61lfpv33yjchi6jyby7j37rlw9shr4h06qg"; - libraryHaskellDepends = [ - base bifunctors binary bytes cereal comonad deepseq hashable mmorph - profunctors template-haskell th-abstraction transformers - transformers-compat - ]; - testHaskellDepends = [ - base deriving-compat transformers transformers-compat vector void - ]; - description = "Making de Bruijn Succ Less"; - license = lib.licenses.bsd3; - }) {}; - - "bound_2_0_5" = callPackage ({ mkDerivation, base, bifunctors, binary, bytes, cereal, comonad , deepseq, deriving-compat, hashable, mmorph, profunctors , template-haskell, th-abstraction, transformers @@ -46875,7 +46792,6 @@ self: { ]; description = "Making de Bruijn Succ Less"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bound-extras" = callPackage @@ -46977,8 +46893,8 @@ self: { }: mkDerivation { pname = "bower-json"; - version = "1.0.0.1"; - sha256 = "0wvygg3rdbxzrmr61a9w6ddv9pfric85ih8hnxyk0ydzn7i59abs"; + version = "1.1.0.0"; + sha256 = "0lnhcgivg38nicncb6czkkk3z2mk3jbifv1b4r51lk3p9blzydfl"; libraryHaskellDepends = [ aeson aeson-better-errors base bytestring deepseq ghc-prim mtl scientific text transformers unordered-containers vector @@ -48051,30 +47967,6 @@ self: { }) {}; "buffer-builder" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion - , deepseq, HTF, http-types, json-builder, mtl, quickcheck-instances - , text, unordered-containers, vector - }: - mkDerivation { - pname = "buffer-builder"; - version = "0.2.4.7"; - sha256 = "0n1zb12zm86rm3jqpdh7j15w6dd1mii0fmaihkdqm0b1rv2zm2dk"; - libraryHaskellDepends = [ - base bytestring mtl text unordered-containers vector - ]; - testHaskellDepends = [ - aeson attoparsec base bytestring criterion deepseq HTF - quickcheck-instances text vector - ]; - benchmarkHaskellDepends = [ - aeson base bytestring criterion deepseq http-types json-builder - text vector - ]; - description = "Library for efficiently building up buffers, one piece at a time"; - license = lib.licenses.bsd3; - }) {}; - - "buffer-builder_0_2_4_8" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , deepseq, HTF, http-types, json-builder, mtl, quickcheck-instances , text, unordered-containers, vector @@ -48096,7 +47988,6 @@ self: { ]; description = "Library for efficiently building up buffers, one piece at a time"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "buffer-builder-aeson" = callPackage @@ -48976,21 +48867,6 @@ self: { }) {}; "byte-count-reader" = callPackage - ({ mkDerivation, base, extra, hspec, parsec, parsec-numbers, text - }: - mkDerivation { - pname = "byte-count-reader"; - version = "0.10.1.8"; - sha256 = "1hnjn160xjvhk7mpi1l5sb5jv39660fhysrz1qg8azjgbykwpcja"; - libraryHaskellDepends = [ base extra parsec parsec-numbers text ]; - testHaskellDepends = [ - base extra hspec parsec parsec-numbers text - ]; - description = "Read strings describing a number of bytes like 2Kb and 0.5 MiB"; - license = lib.licenses.gpl3Only; - }) {}; - - "byte-count-reader_0_10_1_9" = callPackage ({ mkDerivation, base, extra, hspec, parsec, parsec-numbers, text }: mkDerivation { @@ -49003,7 +48879,6 @@ self: { ]; description = "Read strings describing a number of bytes like 2Kb and 0.5 MiB"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "byte-order" = callPackage @@ -49172,26 +49047,6 @@ self: { }) {}; "bytes" = callPackage - ({ mkDerivation, base, binary, binary-orphans, bytestring, cereal - , containers, hashable, mtl, scientific, text, time, transformers - , transformers-compat, unordered-containers, void - }: - mkDerivation { - pname = "bytes"; - version = "0.17.1"; - sha256 = "1qmps8vvg98wfm9xm734hwzi56bsk8r1zc6vx20rlhc79krv5s9s"; - revision = "3"; - editedCabalFile = "1lagk22sacal7dbygp4cgfixq7j8daybn19x0xmrh9d89xgsl7vs"; - libraryHaskellDepends = [ - base binary binary-orphans bytestring cereal containers hashable - mtl scientific text time transformers transformers-compat - unordered-containers void - ]; - description = "Sharing code for serialization between binary and cereal"; - license = lib.licenses.bsd3; - }) {}; - - "bytes_0_17_2" = callPackage ({ mkDerivation, base, binary, binary-orphans, bytestring, cereal , containers, hashable, mtl, scientific, text, time, transformers , transformers-compat, unordered-containers, void @@ -49207,7 +49062,6 @@ self: { ]; description = "Sharing code for serialization between binary and cereal"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "byteset" = callPackage @@ -49391,6 +49245,29 @@ self: { license = lib.licenses.mpl20; }) {}; + "bytestring-conversion_0_3_2" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, case-insensitive + , criterion, double-conversion, QuickCheck, tasty, tasty-quickcheck + , text, transformers + }: + mkDerivation { + pname = "bytestring-conversion"; + version = "0.3.2"; + sha256 = "0ls1jqf4r2hk0mcxmlviw6vgs0cn1db99w2fggsg6x39pi31rk8c"; + libraryHaskellDepends = [ + attoparsec base bytestring case-insensitive double-conversion text + ]; + testHaskellDepends = [ + base bytestring QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring criterion text transformers + ]; + description = "Type-classes to convert values to and from ByteString"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "bytestring-csv" = callPackage ({ mkDerivation, array, base, bytestring, dlist }: mkDerivation { @@ -52105,8 +51982,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.3.0.0"; - sha256 = "0cxcgm6xfwbqvzms8a6im7dl53p9pvhhjfakfjbr6vkg56jwn7a4"; + version = "0.4.0.0"; + sha256 = "1imga81akx5z8f4nyd9minac7bspmjhpymbg9j8zcm2zh8wl7mmx"; libraryHaskellDepends = [ aeson async base bytestring calamity-commands colour concurrent-extra connection containers data-default-class @@ -52130,8 +52007,8 @@ self: { }: mkDerivation { pname = "calamity-commands"; - version = "0.2.0.0"; - sha256 = "1hzaqwgvz6vlbpk8vzq1nyx1b598s91xk0pxmclikm94f1fq98d7"; + version = "0.3.0.0"; + sha256 = "0vngcddhxdd4gzjpjh8iq0qqkkybhs8hrf73kjk21hxr0kldrl4b"; libraryHaskellDepends = [ base generic-lens lens megaparsec polysemy polysemy-plugin text text-show unordered-containers @@ -52336,8 +52213,8 @@ self: { }: mkDerivation { pname = "calligraphy"; - version = "0.1.2"; - sha256 = "08kiqp1z60hbfxm5s2d0hdr516gbq8fqyz0ddlr3vk0g9npm3nj2"; + version = "0.1.3"; + sha256 = "0fkjvvisrnadli5i8l7b8d8n7z3lwhzrihfrl3h9jkgham54f5mp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62995,6 +62872,24 @@ self: { broken = true; }) {}; + "conala-dataset" = callPackage + ({ mkDerivation, aeson, base, bytestring, conala, conduit + , conduit-aeson, hspec, text + }: + mkDerivation { + pname = "conala-dataset"; + version = "0.1.0.0"; + sha256 = "1bzqhnvjwi4g4fqhhxd7260fzlydrhy73xq4yq3hhrav28yl9l34"; + libraryHaskellDepends = [ + aeson base bytestring conduit conduit-aeson text + ]; + testHaskellDepends = [ base conala conduit hspec ]; + description = "bindings to the CoNaLa dataset"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {conala = null;}; + "concatenative" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -63858,36 +63753,6 @@ self: { }) {}; "conduit-extra" = callPackage - ({ mkDerivation, async, attoparsec, base, bytestring - , bytestring-builder, conduit, directory, exceptions, filepath - , gauge, hspec, network, primitive, process, QuickCheck, resourcet - , stm, streaming-commons, text, transformers, transformers-base - , typed-process, unliftio-core - }: - mkDerivation { - pname = "conduit-extra"; - version = "1.3.5"; - sha256 = "1n8js1y1rdswvp0bkjmmz19fag19bdxgwsrqz93yc09w43p8sr4a"; - revision = "1"; - editedCabalFile = "0pkixzcwqfisn5dk44z67k5bwc60fr6d3fwjrlzpx6jdqsvbbbmg"; - libraryHaskellDepends = [ - async attoparsec base bytestring conduit directory filepath network - primitive process resourcet stm streaming-commons text transformers - typed-process unliftio-core - ]; - testHaskellDepends = [ - async attoparsec base bytestring bytestring-builder conduit - directory exceptions filepath hspec process QuickCheck resourcet - stm streaming-commons text transformers transformers-base - ]; - benchmarkHaskellDepends = [ - base bytestring bytestring-builder conduit gauge transformers - ]; - description = "Batteries included conduit: adapters for common libraries"; - license = lib.licenses.mit; - }) {}; - - "conduit-extra_1_3_6" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, conduit , directory, exceptions, filepath, gauge, hspec, hspec-discover , network, primitive, process, QuickCheck, resourcet, stm @@ -63914,7 +63779,6 @@ self: { ]; description = "Batteries included conduit: adapters for common libraries"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "conduit-find" = callPackage @@ -64004,28 +63868,6 @@ self: { }) {}; "conduit-parse" = callPackage - ({ mkDerivation, base, conduit, dlist, mtl, parsers, resourcet - , safe, safe-exceptions, tasty, tasty-hunit, text, transformers - }: - mkDerivation { - pname = "conduit-parse"; - version = "0.2.1.0"; - sha256 = "1qfs61qhbr5gc0ch0mmqcqdm4wvs5pkx2z6rki588fhy1kfdp1dm"; - revision = "2"; - editedCabalFile = "0134k9wi1ladmzd1rmb1gad6ig82pqsyb9d30z301anvb99473kz"; - libraryHaskellDepends = [ - base conduit dlist mtl parsers safe safe-exceptions text - transformers - ]; - testHaskellDepends = [ - base conduit mtl parsers resourcet safe-exceptions tasty - tasty-hunit - ]; - description = "Parsing framework based on conduit"; - license = lib.licenses.publicDomain; - }) {}; - - "conduit-parse_0_2_1_1" = callPackage ({ mkDerivation, base, conduit, dlist, mtl, parsers, resourcet , safe, safe-exceptions, tasty, tasty-hunit, text, transformers }: @@ -64045,7 +63887,6 @@ self: { ]; description = "Parsing framework based on conduit"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "conduit-resumablesink" = callPackage @@ -65343,6 +65184,26 @@ self: { license = lib.licenses.bsd2; }) {}; + "constraints_0_13_4" = callPackage + ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec + , hspec-discover, mtl, transformers, transformers-compat + , type-equality + }: + mkDerivation { + pname = "constraints"; + version = "0.13.4"; + sha256 = "0d248szyp70k1qlivsimk0j5vz9hdx1alhismry5v35qyinr91j1"; + libraryHaskellDepends = [ + base binary deepseq ghc-prim hashable mtl transformers + transformers-compat type-equality + ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Constraint manipulation"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "constraints-deriving" = callPackage ({ mkDerivation, base, bytestring, Cabal, filepath, ghc, ghc-paths , path, path-io @@ -66403,6 +66264,8 @@ self: { pname = "convertible"; version = "1.1.1.0"; sha256 = "0v18ap1mccnndgxmbfgyjdicg8jlss01bd5fq8a576dr0h4sgyg9"; + revision = "1"; + editedCabalFile = "19rz01rlcflyljzkf47g5xs2w1blnji7s8vsh0wimil4c0wahazj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66804,27 +66667,6 @@ self: { }) {}; "core-program" = 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; - }) {}; - - "core-program_0_4_6_4" = callPackage ({ mkDerivation, async, base, bytestring, chronologique, core-data , core-text, directory, exceptions, filepath, fsnotify, hashable , hourglass, mtl, prettyprinter, safe-exceptions, stm @@ -66843,7 +66685,6 @@ self: { ]; description = "Opinionated Haskell Interoperability"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "core-telemetry" = callPackage @@ -69375,28 +69216,29 @@ self: { }) {}; "cryptol" = callPackage - ({ mkDerivation, alex, ansi-terminal, array, async, base + ({ mkDerivation, alex, ansi-terminal, arithmoi, array, async, base , base-compat, blaze-html, bv-sized, bytestring, containers , criterion, cryptohash-sha1, deepseq, directory, exceptions, extra - , filepath, ghc-prim, gitrev, GraphSCC, happy, haskeline, heredoc - , integer-gmp, libBF, MemoTrie, monad-control, monadLib, mtl + , filepath, ghc-bignum, ghc-prim, gitrev, GraphSCC, happy + , haskeline, heredoc, libBF, MemoTrie, monad-control, monadLib, mtl , optparse-applicative, panic, parameterized-utils, prettyprinter , process, sbv, simple-smt, stm, strict, temporary, text, tf-random , time, transformers, transformers-base, what4 }: mkDerivation { pname = "cryptol"; - version = "2.12.0"; - sha256 = "13h5bd6xqh3x6jqdv8a25ffyj10wdyam0flzpdxi4zd23z5b2ihp"; + version = "2.13.0"; + sha256 = "10rbc3sw4r252alz5ql6vn8ddrrwwim8ibdvdn1hdichnb87lnsw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array async base base-compat bv-sized bytestring containers - cryptohash-sha1 deepseq directory exceptions filepath ghc-prim - gitrev GraphSCC heredoc integer-gmp libBF MemoTrie monad-control - monadLib mtl panic parameterized-utils prettyprinter process sbv - simple-smt stm strict text tf-random time transformers-base what4 + arithmoi array async base base-compat bv-sized bytestring + containers cryptohash-sha1 deepseq directory exceptions filepath + ghc-bignum ghc-prim gitrev GraphSCC heredoc libBF MemoTrie + monad-control monadLib mtl panic parameterized-utils prettyprinter + process sbv simple-smt stm strict text tf-random time + transformers-base what4 ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ @@ -69911,6 +69753,8 @@ self: { pname = "csv-conduit"; version = "0.7.3.0"; sha256 = "1xh11h4qibjcv8b0rk5mwdzww183kpjqzl3x22rbfryjvrp0n07w"; + revision = "1"; + editedCabalFile = "18dad4w8i2jma39flmzrjpxjvnkzcb8fnhxm67rl9iv3b6ip86ng"; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring conduit conduit-extra containers data-default exceptions ghc-prim mmorph @@ -70125,6 +69969,8 @@ self: { pname = "cubicbezier"; version = "0.6.0.6"; sha256 = "0s7s1ak0x89jy3q4yxrcvjzsq9w4yh23ycjcja6i7klj5gggqwss"; + revision = "1"; + editedCabalFile = "084inqa0mpm6m958fmjwsnn2fn46mcdpfin482mzs5fk6c9fwywl"; libraryHaskellDepends = [ base containers fast-math integration matrices microlens microlens-mtl microlens-th mtl vector vector-space @@ -74729,8 +74575,8 @@ self: { }: mkDerivation { pname = "dear-imgui"; - version = "1.5.0"; - sha256 = "04h44z24712rfp8pnxa90vx5jh5szan5pz33xj8x5mly1vbqzyd7"; + version = "2.0.0"; + sha256 = "0x1lx34zdgaga6xgq1axdf39wxz6av7h8vna1d702v09n67hpac3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76443,29 +76289,6 @@ self: { }) {}; "deriving-compat" = callPackage - ({ mkDerivation, base, base-compat, base-orphans, containers - , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged - , template-haskell, th-abstraction, transformers - , transformers-compat, void - }: - mkDerivation { - pname = "deriving-compat"; - version = "0.6"; - sha256 = "0yy4gm4wf9ivwfz2hwc7j3kavbya1p01s49fdgnzisgsk3h9xvnp"; - libraryHaskellDepends = [ - base containers ghc-boot-th ghc-prim template-haskell - th-abstraction transformers transformers-compat - ]; - testHaskellDepends = [ - base base-compat base-orphans hspec QuickCheck tagged - template-haskell transformers transformers-compat void - ]; - testToolDepends = [ hspec-discover ]; - description = "Backports of GHC deriving extensions"; - license = lib.licenses.bsd3; - }) {}; - - "deriving-compat_0_6_1" = callPackage ({ mkDerivation, base, base-compat, base-orphans, containers , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged , template-haskell, th-abstraction, transformers @@ -76486,7 +76309,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Backports of GHC deriving extensions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "deriving-show-simple" = callPackage @@ -77476,8 +77298,8 @@ self: { pname = "dhall-lsp-server"; version = "1.1.1"; sha256 = "0z4gc27fpz1pcjbajwpxgn0zhxlp9xp47lyg55p03ghfpqa2mcl6"; - revision = "1"; - editedCabalFile = "0705v99wy1903mhay7csp629gbzgqr902az04lp5hpxr9xvpmlnz"; + revision = "2"; + editedCabalFile = "1618pkfdv887sj9i572db8sgz0jl7lpkmil4fkdc8irh2y45wl6r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79414,8 +79236,8 @@ self: { }: mkDerivation { pname = "diohsc"; - version = "0.1.10"; - sha256 = "1k6027dq5x156xw50pjjr8713ibqbycal653mfa8q59y6h8jvzjf"; + version = "0.1.11"; + sha256 = "0haw5346aziwrv4k1jwji8b8aw4jqskdsx94y818xjgx30hbbg43"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -83001,19 +82823,21 @@ self: { }) {}; "downhill" = callPackage - ({ mkDerivation, base, containers, reflection, tasty, tasty-hunit - , template-haskell, th-abstraction, transformers - , unordered-containers, vector-space + ({ mkDerivation, base, containers, hedgehog, reflection, tasty + , tasty-hedgehog, tasty-hunit, template-haskell, th-abstraction + , transformers, unordered-containers, vector-space }: mkDerivation { pname = "downhill"; - version = "0.1.0.0"; - sha256 = "1q99aviwssd4k5kfmp9ik3lxsdqjjfk3d2mdbd0p5zrw36kcamhl"; + version = "0.2.0.0"; + sha256 = "1n00s3wbip9a1qsfmcxpx8ggkah53jg6dw006q084jyf01klx9ii"; libraryHaskellDepends = [ base containers reflection template-haskell th-abstraction transformers unordered-containers vector-space ]; - testHaskellDepends = [ base tasty tasty-hunit vector-space ]; + testHaskellDepends = [ + base hedgehog tasty tasty-hedgehog tasty-hunit vector-space + ]; description = "Reverse mode automatic differentiation"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -86240,26 +86064,6 @@ self: { }) {}; "either" = callPackage - ({ mkDerivation, base, bifunctors, mtl, profunctors, QuickCheck - , semigroupoids, test-framework, test-framework-quickcheck2 - }: - mkDerivation { - pname = "either"; - version = "5.0.1.1"; - sha256 = "09yzki8ss56xhy9vggdw1rls86b2kf55hjl5wi0vbv02d8fxahq2"; - revision = "1"; - editedCabalFile = "03bgnq55lc6f1nx4p662gidfsyyfm3xm4fi84h77wnsppxrpa5j1"; - libraryHaskellDepends = [ - base bifunctors mtl profunctors semigroupoids - ]; - testHaskellDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 - ]; - description = "Combinators for working with sums"; - license = lib.licenses.bsd3; - }) {}; - - "either_5_0_2" = callPackage ({ mkDerivation, base, bifunctors, mtl, profunctors, QuickCheck , semigroupoids, test-framework, test-framework-quickcheck2 }: @@ -86275,7 +86079,6 @@ self: { ]; description = "Combinators for working with sums"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "either-both" = callPackage @@ -86631,10 +86434,8 @@ self: { }: mkDerivation { pname = "ekg-wai"; - version = "0.1.0.3"; - sha256 = "1sd2fz4l4slizm179x9cskqdvrpf6w4d779kah9hrnk3nqbmklxz"; - revision = "2"; - editedCabalFile = "17kca2wzlcv8nxyq096fv57jfklhz4ibnvf5nqqdszczb03j3dnn"; + version = "0.1.1.0"; + sha256 = "0x6q0zxc1wz5djrnqll26g931m6agfnmrn8z9csgw5wjgl606gp0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring ekg-core ekg-json filepath http-types network @@ -89297,6 +89098,33 @@ self: { broken = true; }) {}; + "ersatz_0_4_11" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, containers + , data-default, fail, lens, mtl, parsec, process, semigroups + , streams, temporary, transformers, unordered-containers + }: + mkDerivation { + pname = "ersatz"; + version = "0.4.11"; + sha256 = "0zaw5a4za77xa1h8msg5v9hk6m215ykl3c258kgk519yvrfavyi3"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array attoparsec base bytestring containers data-default lens mtl + process semigroups streams temporary transformers + unordered-containers + ]; + executableHaskellDepends = [ + array base containers fail lens mtl parsec semigroups + ]; + testHaskellDepends = [ array base ]; + description = "A monad for expressing SAT or QSAT problems using observable sharing"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "ersatz-toysat" = callPackage ({ mkDerivation, array, base, containers, ersatz, toysolver , transformers @@ -90820,8 +90648,8 @@ self: { }: mkDerivation { pname = "evoke"; - version = "0.2022.5.2"; - sha256 = "0fx99vrsc2qsxplj7a1lv1kvfza5ygvz1dcq7f2z3rijslcg4b10"; + version = "0.2022.5.19"; + sha256 = "1kw4jklbr5pjd1rhwm6c89492w7rjc0mv335j5bis6nn53g7psna"; libraryHaskellDepends = [ base ghc text ]; testHaskellDepends = [ aeson base HUnit insert-ordered-containers lens QuickCheck swagger2 @@ -93804,6 +93632,8 @@ self: { pname = "fbrnch"; version = "1.1"; sha256 = "11vhm176dm2i4zy7ipg20rsmp7rdabq8gh29byflqxm5s5wp86y6"; + revision = "1"; + editedCabalFile = "1p0d2nz1xql0nxi23j893x6dr9hy4hy5frfbjrys5b4728vld3y9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -94167,6 +93997,18 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "fedora-dists_2_1_0" = callPackage + ({ mkDerivation, aeson, base, cached-json-file, pdc, text }: + mkDerivation { + pname = "fedora-dists"; + version = "2.1.0"; + sha256 = "040qn1fbc3iss4p5svcsy5crpcs2x38y6ns3wf1zjx05lz40gb07"; + libraryHaskellDepends = [ aeson base cached-json-file pdc text ]; + description = "Library for Fedora distribution versions"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "fedora-haskell-tools" = callPackage ({ mkDerivation, base, bytestring, csv, directory, extra , fedora-dists, filepath, http-conduit, http-types @@ -97619,8 +97461,8 @@ self: { ({ mkDerivation, base, containers, QuickCheck, syb }: mkDerivation { pname = "flowlocks-framework"; - version = "0.1.3.1"; - sha256 = "1v9z302fg2fx6k9k7ci5128gxrrcgdqp40r7axk0yhrzc06b9wa8"; + version = "0.1.4"; + sha256 = "0y5n97jn2pm02w1kp39f4psyzl93nwh0nwla0k2lxkix6d0lnsj4"; libraryHaskellDepends = [ base containers syb ]; testHaskellDepends = [ base QuickCheck ]; description = "Generalized Flow Locks Framework"; @@ -98351,6 +98193,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "folds_0_7_8" = callPackage + ({ mkDerivation, adjunctions, base, bifunctors, comonad + , constraints, contravariant, data-reify, distributive, lens, mtl + , pointed, profunctors, reflection, semigroupoids, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "folds"; + version = "0.7.8"; + sha256 = "11278546mq05rhyjfmhg0iasqjsn898l44dhp5qgaw1zwzywir2i"; + configureFlags = [ "-f-test-hlint" ]; + libraryHaskellDepends = [ + adjunctions base bifunctors comonad constraints contravariant + data-reify distributive lens mtl pointed profunctors reflection + semigroupoids transformers unordered-containers vector + ]; + description = "Beautiful Folding"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "folds-common" = callPackage ({ mkDerivation, base, containers, folds, tasty, tasty-quickcheck }: @@ -99695,26 +99558,6 @@ self: { }) {}; "free" = callPackage - ({ mkDerivation, base, comonad, containers, distributive - , exceptions, indexed-traversable, mtl, profunctors, semigroupoids - , template-haskell, th-abstraction, transformers, transformers-base - }: - mkDerivation { - pname = "free"; - version = "5.1.7"; - sha256 = "121b81wxjk30nc27ivwzxjxi1dcwc30y0gy8l6wac3dxwvkx2c5j"; - revision = "1"; - editedCabalFile = "0x3d7jp17m65f25838ic26kvnpjfb99iw3d60ga57n8505shxywb"; - libraryHaskellDepends = [ - base comonad containers distributive exceptions indexed-traversable - mtl profunctors semigroupoids template-haskell th-abstraction - transformers transformers-base - ]; - description = "Monads for free"; - license = lib.licenses.bsd3; - }) {}; - - "free_5_1_8" = callPackage ({ mkDerivation, base, comonad, containers, distributive , exceptions, indexed-traversable, mtl, profunctors, semigroupoids , template-haskell, th-abstraction, transformers, transformers-base @@ -99730,7 +99573,6 @@ self: { ]; description = "Monads for free"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "free-algebras" = callPackage @@ -101969,8 +101811,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.21.11"; - sha256 = "1n8id7h0qpgifbmkdh3ma72kpv6hn6siyfjd62day3zywrjfxd61"; + version = "0.21.12"; + sha256 = "1pjrq70x4qxgjjx5yy8zk9v6k3d01kk42bq5jrrb5f27id4dyn6v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102039,8 +101881,8 @@ self: { }: mkDerivation { pname = "futhark-server"; - version = "1.1.2.1"; - sha256 = "0hbglw570j09r8f7cxcyn7dr99iykw94p6fglncw8l210jvcffbm"; + version = "1.2.0.0"; + sha256 = "0ahpn2f35jmm4n1dqw58ca4v9ny4hs1fhxih9fdmp5cya9fli0nf"; libraryHaskellDepends = [ base binary bytestring directory futhark-data mtl process temporary text @@ -102274,6 +102116,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "fuzzyset_0_2_3" = callPackage + ({ mkDerivation, base, data-default, hspec, ieee754, text + , text-metrics, unordered-containers, vector + }: + mkDerivation { + pname = "fuzzyset"; + version = "0.2.3"; + sha256 = "02rc846kfrkd0gd3j37gkmf87z09rzfa9bz2f0i2b83mh8ppk1sl"; + libraryHaskellDepends = [ + base data-default text text-metrics unordered-containers vector + ]; + testHaskellDepends = [ + base data-default hspec ieee754 text text-metrics + unordered-containers vector + ]; + description = "Fuzzy set for approximate string matching"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fuzzytime" = callPackage ({ mkDerivation, base, cmdargs, directory, old-time, process }: mkDerivation { @@ -103617,17 +103479,6 @@ self: { }) {}; "generic-arbitrary" = callPackage - ({ mkDerivation, base, QuickCheck }: - mkDerivation { - pname = "generic-arbitrary"; - version = "0.2.1"; - sha256 = "0xg00rlzk6gg4sd0fb15rpgdgpfpy08azgiwgkxrdrjcjfi6cyp9"; - libraryHaskellDepends = [ base QuickCheck ]; - description = "Generic implementation for QuickCheck's Arbitrary"; - license = lib.licenses.mit; - }) {}; - - "generic-arbitrary_0_2_2" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "generic-arbitrary"; @@ -103636,7 +103487,6 @@ self: { libraryHaskellDepends = [ base QuickCheck ]; description = "Generic implementation for QuickCheck's Arbitrary"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "generic-binary" = callPackage @@ -106703,6 +106553,29 @@ self: { broken = true; }) {}; + "ghc-prof_1_4_1_11" = callPackage + ({ mkDerivation, attoparsec, base, containers, directory, filepath + , process, scientific, tasty, tasty-hunit, temporary, text, time + }: + mkDerivation { + pname = "ghc-prof"; + version = "1.4.1.11"; + sha256 = "1i6a3dx9ml8r4q8rvap7rw3qhvksgaws1hzna34ldpkwh6b7kfxy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base containers scientific text time + ]; + testHaskellDepends = [ + attoparsec base containers directory filepath process tasty + tasty-hunit temporary text + ]; + description = "Library for parsing GHC time and allocation profiling reports"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "ghc-prof-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, text, vector }: mkDerivation { @@ -106905,8 +106778,8 @@ self: { }: mkDerivation { pname = "ghc-tags"; - version = "1.4"; - sha256 = "16sdryia97ap99snpzkaf59gxz0g4w100jf4h7lv0pvq460nfjm4"; + version = "1.5"; + sha256 = "0hscl49qq3lx2a5g6g7g1wa4rl52piizqsykicy1kvi4di7qnyqk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -115023,8 +114896,8 @@ self: { }: mkDerivation { pname = "gotta-go-fast"; - version = "0.3.0.6"; - sha256 = "1cv8l54wg2gsbk7wr0zmw47k9v8vs5dzj4k1wp5b17p3wp92s1av"; + version = "0.3.0.8"; + sha256 = "0b056xnhq64knpvwjnkqicgny4g8pa1nbq811miwmkgv9w1g76kc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -115278,6 +115151,25 @@ self: { broken = true; }) {}; + "grafdhall" = callPackage + ({ mkDerivation, aeson, base, bytestring, dhall, dhall-json + , http-client, http-client-tls, http-types, text + , unordered-containers + }: + mkDerivation { + pname = "grafdhall"; + version = "0.1.0.0"; + sha256 = "1bjq9gjdqrx840zkdxcjybw1p25i88blm3bhpjvfng5vk6na1csl"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring dhall dhall-json http-client http-client-tls + http-types text unordered-containers + ]; + description = "Configure grafana dashboards from Dhall expression"; + license = lib.licenses.asl20; + }) {}; + "graflog" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec, mtl , test-fixture, text, text-conversions @@ -116120,23 +116012,6 @@ self: { }) {}; "graphs" = callPackage - ({ mkDerivation, array, base, containers, transformers - , transformers-compat, void - }: - mkDerivation { - pname = "graphs"; - version = "0.7.1"; - sha256 = "02g21jpz8jm8j1kpszk8vglw1733z2jp32dc650z40nxlmxpmlxc"; - revision = "1"; - editedCabalFile = "1cjyxswlkachki6l4mcaffwpjajyx86jzipzlqjg7c080vwvb19g"; - libraryHaskellDepends = [ - array base containers transformers transformers-compat void - ]; - description = "A simple monadic graph library"; - license = lib.licenses.bsd3; - }) {}; - - "graphs_0_7_2" = callPackage ({ mkDerivation, array, base, containers, transformers , transformers-compat, void }: @@ -116149,7 +116024,6 @@ self: { ]; description = "A simple monadic graph library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "graphted" = callPackage @@ -121654,17 +121528,16 @@ self: { }: mkDerivation { pname = "hapistrano"; - version = "0.4.3.0"; - sha256 = "05aphcj0pfqiwg6xxagf9d81qv4qqs8rbk140i9d9xvhyis3fl73"; + version = "0.4.4.0"; + sha256 = "18nf6ssr3ccd4kyh9az5i9yj9771mzckw100d55rybd5hl1dc7kq"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal base filepath gitrev mtl path process stm time transformers typed-process yaml ]; executableHaskellDepends = [ - aeson async base formatting gitrev optparse-applicative path + aeson async base formatting gitrev mtl optparse-applicative path path-io stm yaml ]; testHaskellDepends = [ @@ -131528,7 +131401,7 @@ self: { , binary, binary-conduit, boost, bytestring, Cabal , cabal-pkg-config-version-hook, cachix, cachix-api, conduit , conduit-extra, containers, directory, dlist, exceptions, filepath - , hercules-ci-api-agent, hercules-ci-api-core + , hercules-ci-api, hercules-ci-api-agent, hercules-ci-api-core , hercules-ci-cnix-expr, hercules-ci-cnix-store, hostname, hspec , http-client, http-client-tls, http-conduit, inline-c , inline-c-cpp, katip, lens, lens-aeson, lifted-async, lifted-base @@ -131542,8 +131415,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.9.3"; - sha256 = "0rf00qskifbgxqkjy8fykc9ck4zwsvs08nsprw2447adx8dl9g5h"; + version = "0.9.5"; + sha256 = "121s8x61ya4p921zs38r4grqvpi4jkhinlys394hajlqniz7mh6h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -131561,16 +131434,16 @@ self: { executableHaskellDepends = [ aeson async attoparsec base base64-bytestring binary binary-conduit bytestring cachix cachix-api conduit conduit-extra containers - directory dlist exceptions filepath hercules-ci-api-agent - hercules-ci-api-core hercules-ci-cnix-expr hercules-ci-cnix-store - hostname http-client http-client-tls http-conduit inline-c - inline-c-cpp katip lens lens-aeson lifted-async lifted-base - monad-control mtl network network-uri optparse-applicative process - process-extras protolude safe-exceptions scientific servant - servant-auth-client servant-client servant-client-core stm - temporary text time tomland transformers transformers-base unix - unliftio unliftio-core unordered-containers uuid vector websockets - wuss + directory dlist exceptions filepath hercules-ci-api + hercules-ci-api-agent hercules-ci-api-core hercules-ci-cnix-expr + hercules-ci-cnix-store hostname http-client http-client-tls + http-conduit inline-c inline-c-cpp katip lens lens-aeson + lifted-async lifted-base monad-control mtl network network-uri + optparse-applicative process process-extras protolude + safe-exceptions scientific servant servant-auth-client + servant-client servant-client-core stm temporary text time tomland + transformers transformers-base unix unliftio unliftio-core + unordered-containers uuid vector websockets wuss ]; executableSystemDepends = [ boost ]; executablePkgconfigDepends = [ nix ]; @@ -131579,7 +131452,7 @@ self: { conduit containers exceptions filepath hercules-ci-api-agent hercules-ci-api-core hercules-ci-cnix-store hspec katip lifted-async lifted-base monad-control mtl process protolude - safe-exceptions tagged temporary text transformers-base + safe-exceptions stm tagged temporary text transformers-base unliftio-core ]; description = "Runs Continuous Integration tasks on your machines"; @@ -131628,8 +131501,8 @@ self: { }: mkDerivation { pname = "hercules-ci-api-agent"; - version = "0.4.4.0"; - sha256 = "1p4bclcmjmiy28f2ynjx310v0a7iqx26af5dsnrcd9qcgrzh0q7f"; + version = "0.4.5.0"; + sha256 = "1y6j7qbs1r78kd020j1w31xpl1alkwrgp6isigam86dzyngfw2wv"; libraryHaskellDepends = [ aeson base base64-bytestring-type bytestring containers cookie deepseq exceptions hashable hercules-ci-api-core http-api-data @@ -131686,8 +131559,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cli"; - version = "0.3.0"; - sha256 = "1r9js99zcdzzrql48fd930agmk2ifhwvw94v4fi61va8gi3yn6dr"; + version = "0.3.1"; + sha256 = "1653riw0r3l2lyx69346h19cbrxqw12bmzbpnjmmdkcr9h3g36k6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131725,8 +131598,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-expr"; - version = "0.3.1.2"; - sha256 = "1jj4ksxwvr6rnbqshcrf2i54f2mfvjz84wlzwv99hxj8ycnm2ddh"; + version = "0.3.2.0"; + sha256 = "03zqj51ch9n49p13554mischjv3vz02dlbnswz714bz78rxw7lbv"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ @@ -131755,8 +131628,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-store"; - version = "0.3.1.0"; - sha256 = "0qkwq2w7pybzn9lmw71xj0rfpv1rvjmjlc0nxywwb12rsvmjvllq"; + version = "0.3.2.0"; + sha256 = "1s4vwjsk7sj7627yaq9i1c3ghxk83gdhhvf50p6fl93mji5513k3"; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ base bytestring conduit containers inline-c inline-c-cpp protolude @@ -133567,25 +133440,6 @@ self: { }) {}; "hidapi" = callPackage - ({ mkDerivation, base, bytestring, deepseq, deepseq-generics - , systemd - }: - mkDerivation { - pname = "hidapi"; - version = "0.1.7"; - sha256 = "0mgl2yrx7jgn9zzgbrxa7sa5wflzk1jj932jf0bf7f2vsvas71gf"; - libraryHaskellDepends = [ - base bytestring deepseq deepseq-generics - ]; - librarySystemDepends = [ systemd ]; - description = "Haskell bindings to HIDAPI"; - license = lib.licenses.mit; - platforms = [ - "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" - ]; - }) {inherit (pkgs) systemd;}; - - "hidapi_0_1_8" = callPackage ({ mkDerivation, base, bytestring, deepseq, deepseq-generics , systemd }: @@ -133602,7 +133456,6 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) systemd;}; "hidden-char" = callPackage @@ -140207,6 +140060,37 @@ self: { broken = true; }) {inherit (pkgs) postgresql;}; + "hpqtypes_1_9_4_0" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers + , directory, exceptions, filepath, HUnit, lifted-base + , monad-control, mtl, postgresql, QuickCheck, random, resource-pool + , scientific, semigroups, test-framework, test-framework-hunit + , text, text-show, time, transformers, transformers-base + , unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "hpqtypes"; + version = "1.9.4.0"; + sha256 = "0m0jpv0d2zynhn53gbjb50sb91lxss71qnzhcy30agxvf29qpi0w"; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ + aeson async base bytestring containers exceptions lifted-base + monad-control mtl resource-pool semigroups text text-show time + transformers transformers-base uuid-types vector + ]; + librarySystemDepends = [ postgresql ]; + testHaskellDepends = [ + aeson base bytestring exceptions HUnit lifted-base monad-control + mtl QuickCheck random scientific test-framework + test-framework-hunit text text-show time transformers-base + unordered-containers uuid-types vector + ]; + description = "Haskell bindings to libpqtypes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {inherit (pkgs) postgresql;}; + "hpqtypes-extras" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, containers , cryptohash, deepseq, exceptions, extra, hpqtypes, log-base, mtl @@ -140214,8 +140098,8 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.15.0.0"; - sha256 = "00v1ig0py49xbwifk107284g8lx149x54nkfcfaj7mnyf7k9j214"; + version = "1.16.0.0"; + sha256 = "1yjxgb0kyq5v5dhqxmqv9cihz9ivclx9rcwwdj85k68qcjwwkh0v"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions extra hpqtypes log-base mtl text text-show @@ -143804,6 +143688,8 @@ self: { pname = "hslua"; version = "2.2.0"; sha256 = "1krx9ay31q2rvnjncyirw77h7ljg20qqcix2zin81ws6wy4lwirq"; + revision = "1"; + editedCabalFile = "08zpky44l0hnk8l4xbasv47mn3043i7bn510jnrcldgj99zsaii1"; libraryHaskellDepends = [ base bytestring containers exceptions hslua-aeson hslua-classes hslua-core hslua-marshalling hslua-objectorientation @@ -143853,6 +143739,8 @@ self: { pname = "hslua-aeson"; version = "2.2.0"; sha256 = "0v2wn5y1hqj19qj8rd9py1z18jdnkl7gq26ibxzpcpv4wzdcw8ix"; + revision = "1"; + editedCabalFile = "19gpk14hw0qnb56ib0zqbd9hxn9vjc4814n80mnjswvkgq0jfifk"; libraryHaskellDepends = [ aeson base bytestring containers hashable hslua-core hslua-marshalling mtl scientific text unordered-containers vector @@ -144002,6 +143890,8 @@ self: { pname = "hslua-marshalling"; version = "2.2.0"; sha256 = "0mwj7zqzgzijlx40amwzs4jbldd0vbjqv3x791kdxip3yyvnlyqi"; + revision = "1"; + editedCabalFile = "1k9f13rjivvg18a6l5pcmd844s0yxgg1cl6g4hk05g4bngibnhkh"; libraryHaskellDepends = [ base bytestring containers hslua-core mtl text ]; @@ -144130,7 +144020,7 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-objectorientation_2_2_0" = callPackage + "hslua-objectorientation_2_2_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions , hslua-core, hslua-marshalling, lua-arbitrary, mtl, QuickCheck , quickcheck-instances, tasty, tasty-hslua, tasty-hunit @@ -144138,8 +144028,8 @@ self: { }: mkDerivation { pname = "hslua-objectorientation"; - version = "2.2.0"; - sha256 = "18rzb6a75jivyhmr62qjcl30jhdv2cr4ii1qchknz4d9h3vlgws4"; + version = "2.2.0.1"; + sha256 = "04fm0d3rvb06k7b7jka2prlhnh7dl2j2410jdl5pbbnfkwbaw1q7"; libraryHaskellDepends = [ base bytestring containers exceptions hslua-core hslua-marshalling mtl text @@ -144175,15 +144065,15 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-packaging_2_2_0" = callPackage + "hslua-packaging_2_2_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, hslua-core , hslua-marshalling, hslua-objectorientation, mtl, tasty , tasty-hslua, tasty-hunit, text }: mkDerivation { pname = "hslua-packaging"; - version = "2.2.0"; - sha256 = "1gvvcwifrrdl475bivzdz8ld8lvrja2b1hpl13s0m9wqvc2hhxjl"; + version = "2.2.0.1"; + sha256 = "0kyc50xrfnxnhhx2xic1ajd0p0dkhlv0w88yykl4fncpb0i2wc25"; libraryHaskellDepends = [ base containers hslua-core hslua-marshalling hslua-objectorientation mtl text @@ -144830,23 +144720,6 @@ self: { }) {}; "hspec-expectations-json" = callPackage - ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base, Diff, hspec - , HUnit, scientific, text, unordered-containers, vector - }: - mkDerivation { - pname = "hspec-expectations-json"; - version = "1.0.0.6"; - sha256 = "1gb4i4vc6f59vp120asl6fr20n6d9xnibvnfxjd94knflidhq80n"; - libraryHaskellDepends = [ - aeson aeson-pretty base Diff HUnit scientific text - unordered-containers vector - ]; - testHaskellDepends = [ aeson-qq base hspec ]; - description = "Hspec expectations for JSON Values"; - license = lib.licenses.mit; - }) {}; - - "hspec-expectations-json_1_0_0_7" = callPackage ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base, Diff, hspec , HUnit, scientific, text, unordered-containers, vector }: @@ -144861,7 +144734,6 @@ self: { testHaskellDepends = [ aeson-qq base hspec ]; description = "Hspec expectations for JSON Values"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hspec-expectations-lens" = callPackage @@ -145232,21 +145104,6 @@ self: { }) {}; "hspec-need-env" = callPackage - ({ mkDerivation, base, hspec, hspec-core, hspec-discover - , hspec-expectations, setenv, transformers - }: - mkDerivation { - pname = "hspec-need-env"; - version = "0.1.0.8"; - sha256 = "0bh420y4rcp3pvdccxzlasmcbqpj4zdxfphywfi8q4gqryz32cc9"; - libraryHaskellDepends = [ base hspec-core hspec-expectations ]; - testHaskellDepends = [ base hspec hspec-core setenv transformers ]; - testToolDepends = [ hspec-discover ]; - description = "Read environment variables for hspec tests"; - license = lib.licenses.bsd3; - }) {}; - - "hspec-need-env_0_1_0_9" = callPackage ({ mkDerivation, base, hspec, hspec-core, hspec-discover , hspec-expectations, setenv, transformers }: @@ -145259,7 +145116,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Read environment variables for hspec tests"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hspec-parsec" = callPackage @@ -146581,8 +146437,8 @@ self: { }: mkDerivation { pname = "htalkat"; - version = "0.1.1"; - sha256 = "0hczxal05wy42shmrjqw4mhqscr58b6jfv8vm2ll05smvwnrwxji"; + version = "0.1.2.1"; + sha256 = "0n58c32k661jw0srgfwssx0lwb3myyijbxksa8qpq174whfmmfl1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -146797,19 +146653,6 @@ self: { }) {}; "html-entities" = callPackage - ({ mkDerivation, attoparsec, base, text, unordered-containers }: - mkDerivation { - pname = "html-entities"; - version = "1.1.4.5"; - sha256 = "190yh4ijg0pgy4y0jvkyjf8a0z7qxy1mly7c6589qx6lrx66r3rv"; - libraryHaskellDepends = [ - attoparsec base text unordered-containers - ]; - description = "A codec library for HTML-escaped text and HTML-entities"; - license = lib.licenses.mit; - }) {}; - - "html-entities_1_1_4_6" = callPackage ({ mkDerivation, attoparsec, base, text, unordered-containers }: mkDerivation { pname = "html-entities"; @@ -146820,7 +146663,6 @@ self: { ]; description = "A codec library for HTML-escaped text and HTML-entities"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "html-entity" = callPackage @@ -148150,30 +147992,6 @@ self: { }) {}; "http-reverse-proxy" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive - , conduit, conduit-extra, containers, hspec, http-client - , http-conduit, http-types, network, resourcet, streaming-commons - , text, transformers, unliftio, wai, wai-logger, warp, word8 - }: - mkDerivation { - pname = "http-reverse-proxy"; - version = "0.6.0"; - sha256 = "1a6i5njf85b2lhg8m83njagcf09wih5q2irnyb2890s724qr277v"; - libraryHaskellDepends = [ - base blaze-builder bytestring case-insensitive conduit - conduit-extra containers http-client http-types network resourcet - streaming-commons text transformers unliftio wai wai-logger word8 - ]; - testHaskellDepends = [ - base blaze-builder bytestring conduit conduit-extra hspec - http-conduit http-types network resourcet streaming-commons - transformers unliftio wai warp - ]; - description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; - license = lib.licenses.bsd3; - }) {}; - - "http-reverse-proxy_0_6_0_1" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , conduit, conduit-extra, containers, hspec, http-client , http-conduit, http-types, network, resourcet, streaming-commons @@ -148195,7 +148013,6 @@ self: { ]; description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "http-rfc7807" = callPackage @@ -155037,6 +154854,33 @@ self: { maintainers = with lib.maintainers; [ roberth ]; }) {}; + "inline-c_0_9_1_6" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers + , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq + , regex-posix, split, template-haskell, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "inline-c"; + version = "0.9.1.6"; + sha256 = "06az494fp2nh6fnibq28yw8jsrpj4jq1swyx53a328qv04cbhrym"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base bytestring containers hashable mtl parsec + parsers template-haskell transformers unordered-containers vector + ]; + testHaskellDepends = [ + ansi-wl-pprint base containers hashable hspec parsers QuickCheck + raw-strings-qq regex-posix split template-haskell transformers + unordered-containers vector + ]; + description = "Write Haskell source files including C code inline. No FFI required."; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ roberth ]; + }) {}; + "inline-c-cpp" = callPackage ({ mkDerivation, base, bytestring, containers, hspec, inline-c , safe-exceptions, template-haskell, text, vector @@ -155258,6 +155102,23 @@ self: { license = lib.licenses.mit; }) {}; + "inspection-testing_0_4_6_1" = callPackage + ({ mkDerivation, base, containers, ghc, mtl, template-haskell + , transformers + }: + mkDerivation { + pname = "inspection-testing"; + version = "0.4.6.1"; + sha256 = "0mxff0v3ciccbk4b8kxnh4752fzbwn7213qd8xji0csv6gi2w83y"; + libraryHaskellDepends = [ + base containers ghc mtl template-haskell transformers + ]; + testHaskellDepends = [ base ]; + description = "GHC plugin to do inspection testing"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "inspector-wrecker" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , connection, data-default, http-client, http-client-tls @@ -155529,6 +155390,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "int-like" = callPackage + ({ mkDerivation, algebraic-graphs, base, containers, deepseq + , hashable, tasty, tasty-hunit + }: + mkDerivation { + pname = "int-like"; + version = "0.1.0"; + sha256 = "1v7cv0f6bg8lkr1m8fbfrkysggysrli76q6l04y66cvwcjniz6i6"; + libraryHaskellDepends = [ + algebraic-graphs base containers deepseq hashable + ]; + testHaskellDepends = [ + algebraic-graphs base containers deepseq hashable tasty tasty-hunit + ]; + description = "Newtype wrappers over IntSet and IntMap"; + license = lib.licenses.bsd3; + }) {}; + "int-multimap" = callPackage ({ mkDerivation, base, containers, hashable, tasty, tasty-hunit , tasty-quickcheck, unordered-containers @@ -156152,19 +156031,21 @@ self: { "interval-algebra" = callPackage ({ mkDerivation, base, binary, containers, deepseq, foldl, hspec - , QuickCheck, safe, time, witherable + , hspec-discover, nonempty-containers, prettyprinter, QuickCheck + , safe, text, time, witch, witherable }: mkDerivation { pname = "interval-algebra"; - version = "1.3.0"; - sha256 = "0qb23l8jsam2j58pvmqv3gcmxri1bsb1m8nayspssnrapwis0ig6"; + version = "2.0.0"; + sha256 = "0p6zgshfcf7gh1349hwxg2zfwvzi0w7ldi9p2pmm9xkqs6q4q8dz"; libraryHaskellDepends = [ - base binary containers deepseq foldl QuickCheck safe time - witherable + base binary containers deepseq foldl nonempty-containers + prettyprinter QuickCheck safe text time witch witherable ]; testHaskellDepends = [ base containers hspec QuickCheck safe time witherable ]; + testToolDepends = [ hspec-discover ]; description = "An implementation of Allen's interval algebra for temporal logic"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -156183,6 +156064,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "interval-patterns" = callPackage + ({ mkDerivation, base, containers, groups, hspec, lattices + , QuickCheck, relude, semirings, time, time-compat + }: + mkDerivation { + pname = "interval-patterns"; + version = "0.1.0.0"; + sha256 = "0h31ajkkiv4j15h655rbf7gqjbnddki1vwl6kcbi8y7s9bh63rz8"; + libraryHaskellDepends = [ + base containers groups lattices relude semirings time time-compat + ]; + testHaskellDepends = [ + base containers groups hspec lattices QuickCheck relude semirings + time time-compat + ]; + license = lib.licenses.bsd3; + }) {}; + "intervals" = callPackage ({ mkDerivation, array, base, distributive, ghc-prim, QuickCheck }: mkDerivation { @@ -156361,28 +156260,6 @@ self: { }) {}; "invariant" = callPackage - ({ mkDerivation, array, base, bifunctors, comonad, containers - , contravariant, ghc-prim, hspec, hspec-discover, profunctors - , QuickCheck, StateVar, stm, tagged, template-haskell - , th-abstraction, transformers, transformers-compat - , unordered-containers - }: - mkDerivation { - pname = "invariant"; - version = "0.5.5"; - sha256 = "1xf7w9jadv496g8jdnmnqkbjw2gvc6n7cwszjd62rxiih3zhl596"; - libraryHaskellDepends = [ - array base bifunctors comonad containers contravariant ghc-prim - profunctors StateVar stm tagged template-haskell th-abstraction - transformers transformers-compat unordered-containers - ]; - testHaskellDepends = [ base hspec QuickCheck template-haskell ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell98 invariant functors"; - license = lib.licenses.bsd2; - }) {}; - - "invariant_0_5_6" = callPackage ({ mkDerivation, array, base, bifunctors, comonad, containers , contravariant, ghc-prim, hspec, hspec-discover, profunctors , QuickCheck, StateVar, stm, tagged, template-haskell @@ -156402,7 +156279,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell98 invariant functors"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "inventory" = callPackage @@ -159464,6 +159340,30 @@ self: { license = lib.licenses.mit; }) {}; + "jl" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , conduit, conduit-extra, containers, exceptions, mtl + , optparse-simple, parsec, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "jl"; + version = "0.1.0"; + sha256 = "15vvn3swjpc5qmdng1fcd8m9nif4qnjmpmxc9hdw5cswzl055lkj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers exceptions mtl parsec + scientific text unordered-containers vector + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring conduit conduit-extra containers + mtl optparse-simple text vector + ]; + description = "Functional sed for JSON"; + license = lib.licenses.bsd3; + }) {}; + "jmacro" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , haskell-src-exts, haskell-src-meta, mtl, parseargs, parsec @@ -160723,8 +160623,8 @@ self: { }: mkDerivation { pname = "json-rpc"; - version = "1.0.3"; - sha256 = "0168hk5sqrxily51m0vlwvarmz59h79520y1ivbf6g38hxm8m60g"; + version = "1.0.4"; + sha256 = "195llnb2gz0hm0pmax3mlkyiy4l3bk9d4jjxl4yrgj5hd0pf4g2s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161335,8 +161235,8 @@ self: { }: mkDerivation { pname = "jsonrpc-conduit"; - version = "0.3.9"; - sha256 = "0qj3rlh695nbs3kxix2r7h4np99q6pn7x8x86j4785d6d2gly1ik"; + version = "0.3.10"; + sha256 = "1p2rbk0x998jvzhxb52w1vmjzjkvr1z3cw90apb2c2xpvn4z0ks7"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit conduit-extra mtl text transformers unordered-containers @@ -162129,24 +162029,6 @@ self: { }) {}; "kan-extensions" = callPackage - ({ mkDerivation, adjunctions, array, base, comonad, containers - , contravariant, distributive, free, invariant, mtl, profunctors - , semigroupoids, tagged, transformers, transformers-compat - }: - mkDerivation { - pname = "kan-extensions"; - version = "5.2.3"; - sha256 = "1rkjxwc2k2425d2shdra6wzd4f4dpj76hxmq8mish4f0lz9gxxml"; - libraryHaskellDepends = [ - adjunctions array base comonad containers contravariant - distributive free invariant mtl profunctors semigroupoids tagged - transformers transformers-compat - ]; - description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"; - license = lib.licenses.bsd3; - }) {}; - - "kan-extensions_5_2_4" = callPackage ({ mkDerivation, adjunctions, array, base, comonad, containers , contravariant, distributive, free, invariant, mtl, profunctors , semigroupoids, tagged, transformers, transformers-compat @@ -162162,7 +162044,6 @@ self: { ]; description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "kangaroo" = callPackage @@ -162379,43 +162260,6 @@ self: { }) {}; "katip" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , bytestring, containers, criterion, deepseq, directory, either - , filepath, hostname, microlens, microlens-th, monad-control, mtl - , old-locale, quickcheck-instances, regex-tdfa, resourcet - , safe-exceptions, scientific, semigroups, stm, string-conv, tasty - , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell - , text, time, time-locale-compat, transformers, transformers-base - , transformers-compat, unix, unliftio-core, unordered-containers - }: - mkDerivation { - pname = "katip"; - version = "0.8.7.0"; - sha256 = "1m74n6fyxczfgg3swkkgr6864mzji1l0dpwpxk5zd93488zrij9v"; - revision = "1"; - editedCabalFile = "14a0j9i7vn81qwsd343pswcamldhpyiic2nld57xw2lg50rdshfj"; - libraryHaskellDepends = [ - aeson async auto-update base bytestring containers either hostname - microlens microlens-th monad-control mtl old-locale resourcet - safe-exceptions scientific semigroups stm string-conv - template-haskell text time transformers transformers-base - transformers-compat unix unliftio-core unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring containers directory microlens - quickcheck-instances regex-tdfa safe-exceptions stm tasty - tasty-golden tasty-hunit tasty-quickcheck template-haskell text - time time-locale-compat unordered-containers - ]; - benchmarkHaskellDepends = [ - aeson async base blaze-builder criterion deepseq directory filepath - safe-exceptions text time transformers unix - ]; - description = "A structured logging framework"; - license = lib.licenses.bsd3; - }) {}; - - "katip_0_8_7_1" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , bytestring, containers, criterion, deepseq, directory, either , filepath, hostname, microlens, microlens-th, monad-control, mtl @@ -162429,6 +162273,8 @@ self: { pname = "katip"; version = "0.8.7.1"; sha256 = "157mc5w05j82020g0f65bdjz839fs6cd263xz5z7p00h0y576vg6"; + revision = "1"; + editedCabalFile = "0snkks2ng5bwnbm5zr615c5nlagh0vv46xfz5gb5vlx1gkgawd1r"; libraryHaskellDepends = [ aeson async auto-update base bytestring containers either hostname microlens microlens-th monad-control mtl old-locale resourcet @@ -162448,7 +162294,6 @@ self: { ]; description = "A structured logging framework"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "katip-datadog" = callPackage @@ -163604,17 +163449,17 @@ self: { , blaze-builder, bytestring, case-insensitive, conduit , conduit-extra, containers, directory, filepath, fsnotify , http-client, http-conduit, http-reverse-proxy, http-types, HUnit - , indexed-traversable, lifted-base, mtl, network + , indexed-traversable, lens, lifted-base, mtl, network , optparse-applicative, process, random, regex-tdfa, stm, tar , tasty, tasty-hunit, template-haskell, text, time, tls , tls-session-manager, transformers, unix, unix-compat , unordered-containers, vector, wai, wai-app-static, wai-extra - , warp, warp-tls, yaml, zlib + , warp, warp-tls, wreq, yaml, zlib }: mkDerivation { pname = "keter"; - version = "2.0"; - sha256 = "0njwkpcsg450ix8h5ciygigphddkx6axnkiilsgwj3b70khxj68i"; + version = "2.0.1"; + sha256 = "1vi1vilc7j34rk5bsgixh7gx7cd3grc7ykl2yrkvzswrx2s3c3fg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163629,7 +163474,8 @@ self: { ]; executableHaskellDepends = [ base filepath ]; testHaskellDepends = [ - base bytestring conduit HUnit tasty tasty-hunit transformers unix + base bytestring conduit http-client http-conduit http-types HUnit + lens stm tasty tasty-hunit transformers unix wai warp wreq ]; description = "Web application deployment manager, focusing on Haskell web frameworks"; license = lib.licenses.mit; @@ -164425,8 +164271,8 @@ self: { }: mkDerivation { pname = "koji-tool"; - version = "0.8.6"; - sha256 = "0743a9badhw1r8sk15b85li3kdksa53njmz39sdd19dfh4hmk8rc"; + version = "0.9"; + sha256 = "0clj5nsjpjx5z2g7gbr8qmvajicrahy42b41d582zrq1117l9gmi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -167947,8 +167793,8 @@ self: { pname = "lattices"; version = "2.0.3"; sha256 = "1mn78xqwsksybggnsnx8xkmzlc9his1si14dy5v6vmlchkjym9qg"; - revision = "2"; - editedCabalFile = "0dnfpgvrq7qkza4k82siayy0rpwj0gcdd2nybzp0m25dq7lign3r"; + revision = "3"; + editedCabalFile = "0zjrrchi6bi7jkcj6id8bhc2hd0v6c7n8bxli1fb71k0zmpxhbw1"; libraryHaskellDepends = [ base base-compat containers deepseq ghc-prim hashable integer-logarithms QuickCheck semigroupoids tagged transformers @@ -168348,8 +168194,8 @@ self: { ({ mkDerivation, base, size-based }: mkDerivation { pname = "lazy-search"; - version = "0.1.2.1"; - sha256 = "1vicd1yzcz3kw3r0widfx04j4qbzz4912j5v8c2bhd0z9hvc22vp"; + version = "0.1.3.0"; + sha256 = "1a4s2gp898h518lipvk4inzlx76xgjdm2apl773x6r824qafr9sn"; libraryHaskellDepends = [ base size-based ]; description = "Finds values satisfying a lazy predicate"; license = lib.licenses.bsd3; @@ -169157,7 +169003,7 @@ self: { license = lib.licenses.bsd2; }) {}; - "lens_5_1" = callPackage + "lens_5_1_1" = callPackage ({ mkDerivation, array, assoc, base, base-compat, base-orphans , bifunctors, bytestring, call-stack, comonad, containers , contravariant, criterion, deepseq, distributive, exceptions @@ -169171,10 +169017,8 @@ self: { }: mkDerivation { pname = "lens"; - version = "5.1"; - sha256 = "1g9mwfs0vs0kq6affrdl07z2zkl39pd2362vn9iycpwr3bg2284j"; - revision = "1"; - editedCabalFile = "1gr096bpap1v2s08fz91plampxgx3ka8ylacnrp7xcwz7dhnpm1c"; + version = "5.1.1"; + sha256 = "08mkm2mjvhmwg9hc4kd4cd6dgmcszs1p2mzp1nmri7lqbpy9jknc"; libraryHaskellDepends = [ array assoc base base-orphans bifunctors bytestring call-stack comonad containers contravariant distributive exceptions filepath @@ -169218,6 +169062,8 @@ self: { pname = "lens-action"; version = "0.2.6"; sha256 = "0cdprc5j6r976dmrga2zwvcr7qsv7nqy3nvncp66yyy0dk2qlwm3"; + revision = "1"; + editedCabalFile = "1nj5a48vpwdaq2vg0c5sniwnyw7ansvhvkvg163damg9cjzysji7"; libraryHaskellDepends = [ base comonad contravariant lens mtl profunctors semigroupoids transformers @@ -169445,8 +169291,8 @@ self: { pname = "lens-properties"; version = "4.11.1"; sha256 = "1caciyn75na3f25q9qxjl7ibjam22xlhl5k2pqfiak10lxsmnz2g"; - revision = "5"; - editedCabalFile = "0zv5r50xz8msrcwrvqym88pwihqcpmlk3vi493jdhik4n70cs0c6"; + revision = "6"; + editedCabalFile = "10c8phmf4znr6a9gkzvi2b9q9b9qc8cmslaxlx2hv59j62216h0f"; libraryHaskellDepends = [ base lens QuickCheck transformers ]; description = "QuickCheck properties for lens"; license = lib.licenses.bsd3; @@ -170282,10 +170128,8 @@ self: { }: mkDerivation { pname = "libfuse3"; - version = "0.1.2.0"; - sha256 = "0a59b4xag5vzisrnvf4v1zkdsdzky96h8w2mdj6cip3vgr196frb"; - revision = "4"; - editedCabalFile = "1ra0c9yaihppggv1qy66iy8lhswlyd58qql49v3gwmzb81cccmjp"; + version = "0.1.2.1"; + sha256 = "19ilyb431siymp5iis15r5ab7al48yy28i5sgxaz8363dpbx9ml0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171918,6 +171762,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "linear_1_21_9" = callPackage + ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes + , bytestring, cereal, containers, deepseq, distributive, ghc-prim + , hashable, HUnit, indexed-traversable, lens, random, reflection + , semigroupoids, semigroups, simple-reflect, tagged + , template-haskell, test-framework, test-framework-hunit + , transformers, transformers-compat, unordered-containers, vector + , void + }: + mkDerivation { + pname = "linear"; + version = "1.21.9"; + sha256 = "1lc2kgszbqgxxypprk68x305cqpr7y88if955mqd7c07vx7ci9ba"; + libraryHaskellDepends = [ + adjunctions base base-orphans binary bytes cereal containers + deepseq distributive ghc-prim hashable indexed-traversable lens + random reflection semigroupoids semigroups tagged template-haskell + transformers transformers-compat unordered-containers vector void + ]; + testHaskellDepends = [ + base binary bytestring deepseq HUnit reflection simple-reflect + test-framework test-framework-hunit vector + ]; + description = "Linear Algebra"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "linear-accelerate" = callPackage ({ mkDerivation, accelerate, base, Cabal, cabal-doctest , distributive, doctest, lens, linear @@ -173312,24 +173184,6 @@ self: { }) {}; "list-t" = callPackage - ({ mkDerivation, base, base-prelude, foldl, HTF, logict, mmorph - , monad-control, mtl, mtl-prelude, semigroups, transformers - , transformers-base - }: - mkDerivation { - pname = "list-t"; - version = "1.0.5.1"; - sha256 = "0apcqxz5i0swwfkszwh5rdrda641n4jzkdc5kp3q78ja932vavwy"; - libraryHaskellDepends = [ - base foldl logict mmorph monad-control mtl semigroups transformers - transformers-base - ]; - testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; - description = "ListT done right"; - license = lib.licenses.mit; - }) {}; - - "list-t_1_0_5_2" = callPackage ({ mkDerivation, base, base-prelude, foldl, HTF, logict, mmorph , monad-control, mtl, mtl-prelude, semigroups, transformers , transformers-base @@ -173345,7 +173199,6 @@ self: { testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; description = "ListT done right"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "list-t-attoparsec" = callPackage @@ -173446,19 +173299,6 @@ self: { }) {}; "list-transformer" = callPackage - ({ mkDerivation, base, doctest, mtl }: - mkDerivation { - pname = "list-transformer"; - version = "1.0.7"; - sha256 = "1i8zmds67fyglbw1ygcyffly5ykq62p2hcm23vxrxvj3ryq9iih8"; - libraryHaskellDepends = [ base mtl ]; - testHaskellDepends = [ base doctest ]; - description = "List monad transformer"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ Gabriel439 ]; - }) {}; - - "list-transformer_1_0_8" = callPackage ({ mkDerivation, base, doctest, mtl }: mkDerivation { pname = "list-transformer"; @@ -173468,7 +173308,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "List monad transformer"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; @@ -173745,18 +173584,18 @@ self: { }) {}; "little-logger" = callPackage - ({ mkDerivation, base, co-log, co-log-core, directory, microlens - , mtl, tasty, tasty-hunit, temporary, text, unliftio-core + ({ mkDerivation, base, directory, microlens, monad-logger, mtl + , tasty, tasty-hunit, temporary, text, unliftio-core }: mkDerivation { pname = "little-logger"; - version = "0.3.2"; - sha256 = "0pwywpxdladsaprdzw856njcn42js7l73f361m0w3gd86xprwm8y"; + version = "1.0.0"; + sha256 = "1llf4x5yq1d4kn07qp3ay0lbr1sskw79ck69biwxwyv4l8d132lp"; libraryHaskellDepends = [ - base co-log co-log-core microlens mtl text unliftio-core + base microlens monad-logger mtl text unliftio-core ]; testHaskellDepends = [ - base co-log co-log-core directory microlens mtl tasty tasty-hunit + base directory microlens monad-logger mtl tasty tasty-hunit temporary text unliftio-core ]; description = "Basic logging based on co-log"; @@ -173781,6 +173620,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "little-rio_1_0_0" = callPackage + ({ mkDerivation, base, deepseq, exceptions, little-logger + , microlens, microlens-mtl, mtl, primitive, resourcet + , unliftio-core + }: + mkDerivation { + pname = "little-rio"; + version = "1.0.0"; + sha256 = "179b5v53g55ihq84r5hka6bxivxj8hmqbg02spgddp5jmqaqbaw9"; + libraryHaskellDepends = [ + base deepseq exceptions little-logger microlens microlens-mtl mtl + primitive resourcet unliftio-core + ]; + description = "When you need just the RIO monad"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "live-sequencer" = callPackage ({ mkDerivation, alsa-core, alsa-seq, base, bytestring, cgi , concurrent-split, containers, data-accessor @@ -176672,31 +176529,6 @@ self: { }) {}; "lucid" = callPackage - ({ mkDerivation, base, bifunctors, blaze-builder, bytestring - , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph - , mtl, parsec, text, transformers, unordered-containers - }: - mkDerivation { - pname = "lucid"; - version = "2.11.0"; - sha256 = "1m1f13vxn3pwc7wvhx0czzxlx2ws8lzdgxlxd1707cx79jyib5sl"; - revision = "2"; - editedCabalFile = "01vqjqpng0wkf8955vrdwd499y9h2mlh4jqbnmzp5598iswgq15c"; - libraryHaskellDepends = [ - base blaze-builder bytestring containers hashable mmorph mtl text - transformers unordered-containers - ]; - testHaskellDepends = [ - base bifunctors hspec HUnit mtl parsec text - ]; - benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion deepseq text transformers - ]; - description = "Clear to write, read and edit DSL for HTML"; - license = lib.licenses.bsd3; - }) {}; - - "lucid_2_11_1" = callPackage ({ mkDerivation, base, bifunctors, blaze-builder, bytestring , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph , mtl, parsec, text, transformers @@ -176717,7 +176549,6 @@ self: { ]; description = "Clear to write, read and edit DSL for HTML"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "lucid-alpine" = callPackage @@ -177647,6 +177478,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "machines_0_7_3" = callPackage + ({ mkDerivation, adjunctions, base, comonad, conduit, containers + , criterion, distributive, mtl, pipes, pointed, profunctors + , semigroupoids, semigroups, streaming, transformers + , transformers-compat, void + }: + mkDerivation { + pname = "machines"; + version = "0.7.3"; + sha256 = "1cmflvd0xphs15ip61347ph9w4hnhmsa4nlp425i53x1ld99l23c"; + libraryHaskellDepends = [ + adjunctions base comonad containers distributive mtl pointed + profunctors semigroupoids semigroups transformers + transformers-compat void + ]; + benchmarkHaskellDepends = [ + base conduit criterion mtl pipes streaming + ]; + description = "Networked stream transducers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "machines-amazonka" = callPackage ({ mkDerivation, amazonka, amazonka-autoscaling, amazonka-core , amazonka-ec2, amazonka-s3, amazonka-sts, base @@ -181386,28 +181240,6 @@ self: { }) {}; "megaparsec" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , criterion, deepseq, mtl, parser-combinators, scientific, text - , transformers, weigh - }: - mkDerivation { - pname = "megaparsec"; - version = "9.2.0"; - sha256 = "1whjn3n14h2q3ja1v7zllzmj28ai7lqwfbif22c08rl00wpwmwhd"; - revision = "2"; - editedCabalFile = "1f82q0v5iaqnl6f3pjgrwin2lg7w5zykgn6vpds08pjgwfg39va1"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers deepseq mtl - parser-combinators scientific text transformers - ]; - benchmarkHaskellDepends = [ - base bytestring containers criterion deepseq text weigh - ]; - description = "Monadic parser combinators"; - license = lib.licenses.bsd2; - }) {}; - - "megaparsec_9_2_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, mtl, parser-combinators, scientific, text , transformers, weigh @@ -181425,34 +181257,9 @@ self: { ]; description = "Monadic parser combinators"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "megaparsec-tests" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , hspec, hspec-discover, hspec-expectations, hspec-megaparsec - , megaparsec, mtl, parser-combinators, QuickCheck, scientific, text - , transformers - }: - mkDerivation { - pname = "megaparsec-tests"; - version = "9.2.0"; - sha256 = "09vcdywyy3h79fwq7l6aig3b52ygwv55d61maxdw06d1jw04fxr3"; - libraryHaskellDepends = [ - base bytestring containers hspec hspec-expectations - hspec-megaparsec megaparsec mtl QuickCheck text transformers - ]; - testHaskellDepends = [ - base bytestring case-insensitive containers hspec - hspec-expectations hspec-megaparsec megaparsec mtl - parser-combinators QuickCheck scientific text transformers - ]; - testToolDepends = [ hspec-discover ]; - description = "Test utilities and the test suite of Megaparsec"; - license = lib.licenses.bsd2; - }) {}; - - "megaparsec-tests_9_2_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , hspec, hspec-discover, hspec-expectations, hspec-megaparsec , megaparsec, mtl, parser-combinators, QuickCheck, scientific, text @@ -181474,7 +181281,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Test utilities and the test suite of Megaparsec"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "meldable-heap" = callPackage @@ -182964,6 +182770,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "microlens_0_4_13_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "microlens"; + version = "0.4.13.0"; + sha256 = "18qhnan4l8wd5g7ks93m627ymsyvjd82yahwd0ycg8rhxbqd08gw"; + libraryHaskellDepends = [ base ]; + description = "A tiny lens library with no dependencies"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "microlens-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq , hashable, microlens, scientific, tasty, tasty-hunit, text @@ -183045,6 +182863,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "microlens-ghc_0_4_14_0" = callPackage + ({ mkDerivation, array, base, bytestring, containers, microlens + , transformers + }: + mkDerivation { + pname = "microlens-ghc"; + version = "0.4.14.0"; + sha256 = "1iwj2ngkd69il0rncjl84ackphc6jj48skiqgpi27b18l5nwi3v1"; + libraryHaskellDepends = [ + array base bytestring containers microlens transformers + ]; + description = "microlens + array, bytestring, containers, transformers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "microlens-mtl" = callPackage ({ mkDerivation, base, microlens, mtl, transformers , transformers-compat @@ -183060,6 +182894,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "microlens-mtl_0_2_0_2" = callPackage + ({ mkDerivation, base, microlens, mtl, transformers + , transformers-compat + }: + mkDerivation { + pname = "microlens-mtl"; + version = "0.2.0.2"; + sha256 = "0y1jli9379l8sgv5a4xl8v3qkz9fkp4qlfsywzdpywbnydl1d5v6"; + libraryHaskellDepends = [ + base microlens mtl transformers transformers-compat + ]; + description = "microlens support for Reader/Writer/State from mtl"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "microlens-platform" = callPackage ({ mkDerivation, base, hashable, microlens, microlens-ghc , microlens-mtl, microlens-th, text, unordered-containers, vector @@ -183076,6 +182926,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "microlens-platform_0_4_3_0" = callPackage + ({ mkDerivation, base, hashable, microlens, microlens-ghc + , microlens-mtl, microlens-th, text, unordered-containers, vector + }: + mkDerivation { + pname = "microlens-platform"; + version = "0.4.3.0"; + sha256 = "113xq10cr32mbbjy57zdafk5nww75c442fm5bz3h4vckawkc8n3p"; + libraryHaskellDepends = [ + base hashable microlens microlens-ghc microlens-mtl microlens-th + text unordered-containers vector + ]; + description = "microlens + all batteries included (best for apps)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "microlens-process" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, doctest, filepath , microlens, process @@ -183180,6 +183047,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "microstache_1_0_2_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , directory, filepath, hspec, parsec, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "microstache"; + version = "1.0.2.1"; + sha256 = "12i2sx2rv2ai77m95gvfm93jcjk6q5i4cgfyxjrhyx3ll94z775v"; + libraryHaskellDepends = [ + aeson base containers deepseq directory filepath parsec text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec parsec text + ]; + description = "Mustache templates for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "microtimer" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -183244,6 +183132,8 @@ self: { pname = "midi"; version = "0.2.2.2"; sha256 = "0fv9980k35qv9qk73g2mp88xvhchyq0lq37cl7i26gx4f64vaz6y"; + revision = "1"; + editedCabalFile = "0sa17aphsnk0lc42k1niisbd4jck7j4xij95mjjc5nlrcx1zd123"; libraryHaskellDepends = [ base binary bytestring event-list explicit-exception monoid-transformer non-negative QuickCheck random semigroups @@ -183257,6 +183147,29 @@ self: { license = "GPL"; }) {}; + "midi_0_2_2_3" = callPackage + ({ mkDerivation, base, binary, bytestring, event-list + , explicit-exception, monoid-transformer, non-negative, QuickCheck + , random, semigroups, transformers, utility-ht + }: + mkDerivation { + pname = "midi"; + version = "0.2.2.3"; + sha256 = "12vj9h7vdklzn5dglypjsw1bs9rdacdg9fmxhnbd89jv89dyn4km"; + libraryHaskellDepends = [ + base binary bytestring event-list explicit-exception + monoid-transformer non-negative QuickCheck random semigroups + transformers utility-ht + ]; + testHaskellDepends = [ + base bytestring event-list explicit-exception non-negative + QuickCheck transformers utility-ht + ]; + description = "Handling of MIDI messages and files"; + license = "GPL"; + hydraPlatforms = lib.platforms.none; + }) {}; + "midi-alsa" = callPackage ({ mkDerivation, alsa-seq, base, data-accessor, midi, utility-ht }: mkDerivation { @@ -185861,6 +185774,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "monad-chronicle_1_0_1" = callPackage + ({ mkDerivation, base, data-default-class, mtl, semigroupoids + , these, transformers, transformers-compat + }: + mkDerivation { + pname = "monad-chronicle"; + version = "1.0.1"; + sha256 = "13f1qwylpj7wss2h5g69zlmn6k6qg5r3aqd9zhvjspg1a85m91kq"; + libraryHaskellDepends = [ + base data-default-class mtl semigroupoids these transformers + transformers-compat + ]; + description = "These as a transformer, ChronicleT"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "monad-classes" = callPackage ({ mkDerivation, base, conduit, data-lens-light, ghc-prim, mmorph , monad-control, peano, reflection, tasty, tasty-hunit @@ -186247,8 +186177,8 @@ self: { pname = "monad-logger"; version = "0.3.36"; sha256 = "12rw0k01gkhiqjm2fhxgkmribksmizhj14xphfn8fkd86wzl0vbh"; - revision = "1"; - editedCabalFile = "04andpzbq8dlffhqwdy1a70r7g2gx1nahq67c06gcydldybb3l6i"; + revision = "2"; + editedCabalFile = "14p5wkww771x0apby0bdgzdzwy9kjsm4zbbhi24xazlncy31cqqq"; libraryHaskellDepends = [ base bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm stm-chans @@ -186259,6 +186189,30 @@ self: { license = lib.licenses.mit; }) {}; + "monad-logger-aeson" = callPackage + ({ mkDerivation, aeson, aeson-diff, base, bytestring, context + , directory, exceptions, fast-logger, hspec, hspec-discover + , monad-logger, text, time, unordered-containers + }: + mkDerivation { + pname = "monad-logger-aeson"; + version = "0.2.0.0"; + sha256 = "09f4f3x5sba9i72y89sfiq0281b1vhy2lm75wk9031ayn9hhg4fb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring context exceptions fast-logger monad-logger + text time unordered-containers + ]; + executableHaskellDepends = [ aeson base monad-logger text ]; + testHaskellDepends = [ + aeson aeson-diff base bytestring directory hspec monad-logger time + ]; + testToolDepends = [ hspec-discover ]; + description = "JSON logging using monad-logger interface"; + license = lib.licenses.mit; + }) {}; + "monad-logger-extras" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, hsyslog , monad-logger, mtl @@ -186447,6 +186401,8 @@ self: { pname = "monad-metrics"; version = "0.2.2.0"; sha256 = "13wsz9c02jsh5sh2kka1v7kna1aij51794n7g52ib27qmxgg9qvq"; + revision = "1"; + editedCabalFile = "1y5733zs49jyi2qyx8nk2p2ddzkkih1nw33qjrc9ppk05m3030hi"; libraryHaskellDepends = [ base clock ekg-core exceptions hashable microlens mtl text transformers unordered-containers @@ -187834,7 +187790,7 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) glew;}; - "monomer_1_4_0_0" = callPackage + "monomer_1_4_1_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , bytestring-to-vector, c2hs, containers, data-default, exceptions , extra, formatting, glew, hspec, http-client, JuicyPixels, lens @@ -187843,8 +187799,8 @@ self: { }: mkDerivation { pname = "monomer"; - version = "1.4.0.0"; - sha256 = "104j89l1c39yl9sqfv1nsq7c3p00v0h28kvrmym46b5w1hd86xxr"; + version = "1.4.1.0"; + sha256 = "00xj1vwc4pgwrmhb88yfzar2iwcyncd0g26052irv1qk731skkld"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188736,6 +188692,23 @@ self: { license = lib.licenses.mit; }) {}; + "moss_0_2_0_1" = callPackage + ({ mkDerivation, base, bytestring, conduit-extra, mtl, network + , network-simple, unix-compat + }: + mkDerivation { + pname = "moss"; + version = "0.2.0.1"; + sha256 = "1az701j6gx6ra9j6yz4qib7g5irmd5pjcaj9xqmsc4pwljx8yrzs"; + libraryHaskellDepends = [ + base bytestring conduit-extra mtl network network-simple + unix-compat + ]; + description = "Haskell client for Moss"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "moto" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , cryptohash-sha1, df1, di, di-core, di-df1, directory, filepath @@ -189775,14 +189748,14 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "mtl_2_3" = callPackage + "mtl_2_2_2" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "mtl"; - version = "2.3"; - sha256 = "0krx6bl7xd5n2v9775igv4p8723w6ilshmpljryzfsv4gp74dsy7"; + version = "2.2.2"; + sha256 = "1xmy5741h8cyy0d91ahvqdz2hykkk20l8br7lg1rccnkis5g80w8"; libraryHaskellDepends = [ base transformers ]; - description = "Monad classes for transformers, using functional dependencies"; + description = "Monad classes, using functional dependencies"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -195660,8 +195633,8 @@ self: { }: mkDerivation { pname = "network-wait"; - version = "0.1.1.0"; - sha256 = "03gkmk7nasj48ld0gdq8j4mvn1ja94ljsfdcc0nsgkd89jcd4ng4"; + version = "0.1.2.0"; + sha256 = "1fgcp2didz7zp4jpkc9zap94sbd6ny8nyrx6nwnfai2ssw5rxpfq"; libraryHaskellDepends = [ base exceptions network retry ]; testHaskellDepends = [ base exceptions network network-simple retry tasty tasty-hunit @@ -196057,6 +196030,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "newtype-generics_0_6_2" = callPackage + ({ mkDerivation, base, gauge, hspec, hspec-discover, semigroups }: + mkDerivation { + pname = "newtype-generics"; + version = "0.6.2"; + sha256 = "0km7cp041bgdgrxrbrawz611mcylxp943880a2yg228a09961b51"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base gauge semigroups ]; + description = "A typeclass and set of functions for working with newtypes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "newtype-th" = callPackage ({ mkDerivation, base, haskell-src-meta, newtype, syb , template-haskell @@ -197479,6 +197467,19 @@ self: { license = "LGPL"; }) {}; + "nondeterminism_1_5" = callPackage + ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }: + mkDerivation { + pname = "nondeterminism"; + version = "1.5"; + sha256 = "0avbdmzz2p402hniz2kgnz3gjizwa4b2157v8wcf6vzxkbsrjspr"; + libraryHaskellDepends = [ base containers mtl ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "A monad and monad transformer for nondeterministic computations"; + license = "LGPL"; + hydraPlatforms = lib.platforms.none; + }) {}; + "nonempty-alternative" = callPackage ({ mkDerivation, base, comonad, semigroups }: mkDerivation { @@ -198049,6 +198050,27 @@ self: { license = lib.licenses.mit; }) {}; + "nqe_0_6_4" = callPackage + ({ mkDerivation, async, base, bytestring, conduit, conduit-extra + , containers, exceptions, hashable, hspec, mtl, stm, stm-conduit + , text, unique, unliftio + }: + mkDerivation { + pname = "nqe"; + version = "0.6.4"; + sha256 = "17ymmb0sy95yf5abdgq60j9bi9pdr746ap7x0byakd3gi7kciijg"; + libraryHaskellDepends = [ + base conduit containers hashable mtl stm unique unliftio + ]; + testHaskellDepends = [ + async base bytestring conduit conduit-extra exceptions hspec stm + stm-conduit text unliftio + ]; + description = "Concurrency library in the style of Erlang/OTP"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "nri-env-parser" = callPackage ({ mkDerivation, base, modern-uri, network-uri, nri-prelude, text }: @@ -200988,6 +201010,8 @@ self: { pname = "openapi3"; version = "3.2.2"; sha256 = "0d31ilv2ivwswzbpfibqwnld8697vk63wyr6yl80brjx60g4jp9j"; + revision = "1"; + editedCabalFile = "01cqwjmv4y4d4d3v7rn2jm7l0vmqha2xfph9c6jq2ia0xl90z7a1"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -202301,6 +202325,36 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; + "optics_0_4_2" = callPackage + ({ mkDerivation, array, base, bytestring, containers + , indexed-profunctors, inspection-testing, lens, mtl, optics-core + , optics-extra, optics-th, QuickCheck, random, tasty, tasty-bench + , tasty-hunit, tasty-quickcheck, template-haskell, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "optics"; + version = "0.4.2"; + sha256 = "1irk0m3194vmrqwm29p5gjwd8w7i5hmg1ikxfw11yjfk0hvmbrzb"; + libraryHaskellDepends = [ + array base containers mtl optics-core optics-extra optics-th + transformers + ]; + testHaskellDepends = [ + base containers indexed-profunctors inspection-testing mtl + optics-core QuickCheck random tasty tasty-hunit tasty-quickcheck + template-haskell + ]; + benchmarkHaskellDepends = [ + base bytestring containers lens tasty-bench transformers + unordered-containers vector + ]; + description = "Optics as an abstract interface"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; + }) {}; + "optics-core" = callPackage ({ mkDerivation, array, base, containers, indexed-profunctors , indexed-traversable, transformers @@ -202309,6 +202363,8 @@ self: { pname = "optics-core"; version = "0.4.1"; sha256 = "16ll8829g8v5g6gqdcfj77k6g4sqpmpxbda9jhm4h68pycay4r6a"; + revision = "1"; + editedCabalFile = "0sqwlbl6x0197bpkq7jvn9j5iwyr54z8qwmxbij6qlwjyfld2qxi"; libraryHaskellDepends = [ array base containers indexed-profunctors indexed-traversable transformers @@ -202335,6 +202391,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "optics-extra_0_4_2_1" = callPackage + ({ mkDerivation, array, base, bytestring, containers, hashable + , indexed-profunctors, indexed-traversable-instances, mtl + , optics-core, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "optics-extra"; + version = "0.4.2.1"; + sha256 = "0hfa5yb7l3l310lfxkii13fjzb69g619agadc5a86i734nisf8vy"; + libraryHaskellDepends = [ + array base bytestring containers hashable indexed-profunctors + indexed-traversable-instances mtl optics-core text transformers + unordered-containers vector + ]; + description = "Extra utilities and instances for optics-core"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "optics-th" = callPackage ({ mkDerivation, base, containers, mtl, optics-core, tagged , template-haskell, th-abstraction, transformers @@ -202343,6 +202418,8 @@ self: { pname = "optics-th"; version = "0.4.1"; sha256 = "05zxljfqmhr5if7l8gld5s864nql6kqjfizsf1z7r3ydknvmff6p"; + revision = "1"; + editedCabalFile = "0q58020ql4ggv50y64chg57czczg27f8ysbp4a265zxi5i0kfvvq"; libraryHaskellDepends = [ base containers mtl optics-core template-haskell th-abstraction transformers @@ -206846,29 +206923,6 @@ self: { }) {}; "parsers" = callPackage - ({ mkDerivation, attoparsec, base, base-orphans, binary, bytestring - , charset, containers, mtl, parsec, QuickCheck - , quickcheck-instances, scientific, semigroups, text, transformers - , unordered-containers - }: - mkDerivation { - pname = "parsers"; - version = "0.12.10"; - sha256 = "0v0smxbzk1qpdfkfqqmrzd2dngv3vxba10mkjn9nfm6a309izf8p"; - revision = "2"; - editedCabalFile = "0m6nnr3hif3iwvl7d0ikh04l6varkqzwkd6vqgycvvvsjgdl1gcs"; - libraryHaskellDepends = [ - attoparsec base base-orphans binary charset containers mtl parsec - scientific semigroups text transformers unordered-containers - ]; - testHaskellDepends = [ - attoparsec base bytestring parsec QuickCheck quickcheck-instances - ]; - description = "Parsing combinators"; - license = lib.licenses.bsd3; - }) {}; - - "parsers_0_12_11" = callPackage ({ mkDerivation, attoparsec, base, base-orphans, binary, bytestring , charset, containers, mtl, parsec, QuickCheck , quickcheck-instances, scientific, text, transformers @@ -206887,7 +206941,6 @@ self: { ]; description = "Parsing combinators"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "parsers-megaparsec" = callPackage @@ -209651,6 +209704,8 @@ self: { pname = "persistent"; version = "2.13.3.5"; sha256 = "0z69yvk0rd29dp5qdhi4p587b891y90azrzzpa3g10cxp3gyywvm"; + revision = "1"; + editedCabalFile = "1g9rf4kddz5xp4jrfc3kkzq0n29mrmhq7r22ilcalksyammsng3p"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data lift-type monad-logger @@ -209674,7 +209729,7 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {}; - "persistent_2_14_0_0" = callPackage + "persistent_2_14_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, criterion, deepseq , fast-logger, file-embed, hspec, http-api-data, lift-type @@ -209685,8 +209740,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.14.0.0"; - sha256 = "16b3920zdp3cjvwkmp8yqm1p1gwzl4m4afr4kp567na5iczfih71"; + version = "2.14.0.1"; + sha256 = "1yv6z6jmn6q0ikrrcmh2k9gs4i5473ssf4flx3acsv5zl9czia5f"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data lift-type monad-logger @@ -212426,8 +212481,8 @@ self: { pname = "pipes"; version = "4.3.16"; sha256 = "163lx5sf68zx5kik5h1fjsyckwr9shdsn5k2dsjq3mhg077nxqgl"; - revision = "2"; - editedCabalFile = "1djfzrqq5dz9gpljyf3kbrz7vhp4rvbrk5z7r3x9n3yhw00dwiwp"; + revision = "3"; + editedCabalFile = "1gk0b71m10rnwglqvngw2wv3zm9k1c8hsynlqxmskb5qbmnnnnd8"; libraryHaskellDepends = [ base exceptions mmorph mtl transformers void ]; @@ -214820,26 +214875,6 @@ self: { }) {}; "pointed" = callPackage - ({ mkDerivation, base, comonad, containers, data-default-class - , hashable, kan-extensions, semigroupoids, semigroups, stm, tagged - , transformers, transformers-compat, unordered-containers - }: - mkDerivation { - pname = "pointed"; - version = "5.0.3"; - sha256 = "0999bba0gbb2qhk1ydaslmdf7ca17ip751psi4phi1lhb250fl8b"; - revision = "1"; - editedCabalFile = "00x5chjb3l43n35g7amaj3x32ahlwffp7v5khc1qmzxfqz6z50mv"; - libraryHaskellDepends = [ - base comonad containers data-default-class hashable kan-extensions - semigroupoids semigroups stm tagged transformers - transformers-compat unordered-containers - ]; - description = "Pointed and copointed data"; - license = lib.licenses.bsd3; - }) {}; - - "pointed_5_0_4" = callPackage ({ mkDerivation, base, comonad, containers, data-default-class , hashable, kan-extensions, semigroupoids, semigroups, stm, tagged , transformers, transformers-compat, unordered-containers @@ -214855,7 +214890,6 @@ self: { ]; description = "Pointed and copointed data"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pointedalternative" = callPackage @@ -217392,33 +217426,6 @@ self: { }) {}; "postgresql-binary" = callPackage - ({ mkDerivation, aeson, base, binary-parser, bytestring - , bytestring-strict-builder, containers, conversion - , conversion-bytestring, conversion-text, criterion, json-ast - , network-ip, postgresql-libpq, QuickCheck, quickcheck-instances - , rerebase, scientific, tasty, tasty-hunit, tasty-quickcheck, text - , time, transformers, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "postgresql-binary"; - version = "0.12.4.2"; - sha256 = "1bklkkf0r5dimdxgmgcviircv87ahv0g4nmkl34kc13pwn6l7xjm"; - libraryHaskellDepends = [ - aeson base binary-parser bytestring bytestring-strict-builder - containers network-ip scientific text time transformers - unordered-containers uuid vector - ]; - testHaskellDepends = [ - aeson conversion conversion-bytestring conversion-text json-ast - network-ip postgresql-libpq QuickCheck quickcheck-instances - rerebase tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "Encoders and decoders for the PostgreSQL's binary format"; - license = lib.licenses.mit; - }) {}; - - "postgresql-binary_0_12_4_3" = callPackage ({ mkDerivation, aeson, base, binary-parser, bytestring , bytestring-strict-builder, containers, conversion , conversion-bytestring, conversion-text, criterion, json-ast @@ -217443,7 +217450,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "Encoders and decoders for the PostgreSQL's binary format"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "postgresql-common" = callPackage @@ -220156,6 +220162,8 @@ self: { pname = "primitive"; version = "0.7.3.0"; sha256 = "1p01fmw8yi578rvwicrlpbfkbfsv7fbnzb88a7vggrhygykgs31w"; + revision = "2"; + editedCabalFile = "0xh1m8nybz760c71gm1w9fga25y2rys1211q77v6wagdsas634yf"; libraryHaskellDepends = [ base deepseq transformers ]; testHaskellDepends = [ base base-orphans ghc-prim QuickCheck quickcheck-classes-base @@ -220168,6 +220176,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "primitive_0_7_4_0" = callPackage + ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, QuickCheck + , quickcheck-classes-base, tagged, tasty, tasty-bench + , tasty-quickcheck, template-haskell, transformers + , transformers-compat + }: + mkDerivation { + pname = "primitive"; + version = "0.7.4.0"; + sha256 = "1mddh42i6xg02z315c4lg3zsxlr3wziwnpzh2nhzdcifh716sbav"; + libraryHaskellDepends = [ + base deepseq template-haskell transformers + ]; + testHaskellDepends = [ + base base-orphans ghc-prim QuickCheck quickcheck-classes-base + tagged tasty tasty-quickcheck transformers transformers-compat + ]; + benchmarkHaskellDepends = [ + base deepseq tasty-bench transformers + ]; + description = "Primitive memory-related operations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "primitive-addr" = callPackage ({ mkDerivation, base, primitive }: mkDerivation { @@ -221319,8 +221352,8 @@ self: { }: mkDerivation { pname = "profunctor-monad"; - version = "0.1.0.0"; - sha256 = "15lz4mbf7jcg19gn0hh9q58713p26hvbm5q0sa4baxrwk9n3rghs"; + version = "0.2.0.0"; + sha256 = "0kvjaqlq36nnmc5c59yjrq3xz6wn1vkzkzn6cvp2kqivsbzg4aav"; libraryHaskellDepends = [ base constraints profunctors ]; testHaskellDepends = [ base hashable mtl transformers unordered-containers @@ -223092,8 +223125,8 @@ self: { }: mkDerivation { pname = "ptera-th"; - version = "0.5.0.0"; - sha256 = "13hhiykr2rbnb2qcxrr7wwb6if7szprq4pvbihp6riwfvh1p9y9r"; + version = "0.6.1.0"; + sha256 = "19hw98iz0crdyl3yiv3v39mn7j8nz0vx7vfyw6qky62rp8njrnc9"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base containers enummapset-th ghc-prim membership ptera @@ -223758,21 +223791,20 @@ self: { , blaze-html, bower-json, boxes, bytestring, Cabal, cborg , cheapskate, clock, containers, cryptonite, data-ordlist, deepseq , directory, dlist, edit-distance, exceptions, file-embed, filepath - , 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, 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 + , fsnotify, generic-random, gitrev, Glob, happy, haskeline, hspec + , hspec-discover, http-types, HUnit, language-javascript, lens + , lifted-async, lifted-base, memory, monad-control, monad-logger + , monoidal-containers, mtl, network, newtype, 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.15.0"; - sha256 = "0md1rkm7w6yn45i4igwqpvb82p491ai1w1z2yiym1qyi8p08798g"; + version = "0.15.2"; + sha256 = "11ym7ix8nwx96mxq53kgfwqr2cwx5b537di14zr2bk4dp5kr7nd4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223780,13 +223812,12 @@ self: { base-compat blaze-html bower-json boxes bytestring Cabal cborg 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 - 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 + haskeline language-javascript lens lifted-async lifted-base memory + 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 ]; libraryToolDepends = [ happy ]; executableHaskellDepends = [ @@ -223794,25 +223825,24 @@ self: { array base base-compat blaze-html bower-json boxes bytestring Cabal cborg cheapskate clock containers cryptonite data-ordlist deepseq 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 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 + fsnotify gitrev Glob haskeline http-types language-javascript lens + lifted-async lifted-base memory 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 ]; executableToolDepends = [ happy ]; testHaskellDepends = [ aeson aeson-better-errors aeson-pretty ansi-terminal array base base-compat blaze-html bower-json boxes bytestring Cabal cborg 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 - monoidal-containers mtl parallel parsec pattern-arrows process - protolude QuickCheck regex-base regex-tdfa safe scientific + directory dlist edit-distance file-embed filepath fsnotify + generic-random Glob haskeline hspec HUnit language-javascript lens + lifted-async lifted-base memory monad-control monad-logger + monoidal-containers mtl newtype 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 @@ -227213,28 +227243,6 @@ self: { }) {}; "random" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, doctest - , mtl, primitive, rdtsc, smallcheck, split, splitmix, stm, tasty - , tasty-bench, tasty-hunit, tasty-inspection-testing - , tasty-smallcheck, time, transformers - }: - mkDerivation { - pname = "random"; - version = "1.2.1"; - sha256 = "0mqlcr9l9wh3q4rykv6yqdsd9jj88imp0zm8wv6m7jpjqn7pcp16"; - libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ]; - testHaskellDepends = [ - base bytestring containers doctest smallcheck stm tasty tasty-hunit - tasty-inspection-testing tasty-smallcheck transformers - ]; - benchmarkHaskellDepends = [ - base mtl primitive rdtsc split splitmix tasty-bench time - ]; - description = "Pseudo-random number generation"; - license = lib.licenses.bsd3; - }) {}; - - "random_1_2_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , mtl, primitive, rdtsc, smallcheck, split, splitmix, stm, tasty , tasty-bench, tasty-hunit, tasty-inspection-testing @@ -227254,7 +227262,6 @@ self: { ]; description = "Pseudo-random number generation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "random-access-file" = callPackage @@ -228219,14 +228226,14 @@ self: { broken = true; }) {}; - "rattletrap_11_2_7" = callPackage + "rattletrap_11_2_9" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , containers, filepath, http-client, http-client-tls, text }: mkDerivation { pname = "rattletrap"; - version = "11.2.7"; - sha256 = "19vgqkyxvv9y3yyb42p075nmdm7338f9ln6g0d7sgy9w9zd2vy0d"; + version = "11.2.9"; + sha256 = "15afr7ncg7niwis44sr8pjlga08052gqz0bwg29zyy26kh8fll1l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -228518,6 +228525,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "rcu_0_2_6" = callPackage + ({ mkDerivation, atomic-primops, base, containers, criterion + , deepseq, fail, ghc-prim, optparse-applicative, parallel + , primitive, rdtsc, time, transformers + }: + mkDerivation { + pname = "rcu"; + version = "0.2.6"; + sha256 = "14kg45ycx5wa3k9xn7glp4kdy8xz119m4gs91114qx0rkbix2f5h"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + atomic-primops base fail ghc-prim parallel primitive transformers + ]; + executableHaskellDepends = [ base transformers ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq ghc-prim optparse-applicative + primitive rdtsc time transformers + ]; + description = "Read-Copy-Update for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "rdf" = callPackage ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq , dlist, fgl, text, transformers @@ -232298,8 +232329,8 @@ self: { }: mkDerivation { pname = "registry"; - version = "0.2.1.0"; - sha256 = "1qsw33fysnq5lxb48ckcwja7ws99fji5w2hkq7y3nly8yj6mdna3"; + version = "0.3.0.3"; + sha256 = "0bbpjy5rjlmgn2jpg4fdrl15p3149y2wp5ydzpi21mzp3w0clkrp"; libraryHaskellDepends = [ base containers exceptions hashable mmorph mtl protolude resourcet semigroupoids semigroups template-haskell text transformers-base @@ -233683,6 +233714,23 @@ self: { license = lib.licenses.mit; }) {}; + "repline_0_4_2_0" = callPackage + ({ mkDerivation, base, containers, exceptions, haskeline, mtl + , process + }: + mkDerivation { + pname = "repline"; + version = "0.4.2.0"; + sha256 = "0nldn02yqqmrxkzwzrx3v6hkb4y2hch48jkcr2qrw1dl0vqv70b1"; + libraryHaskellDepends = [ + base containers exceptions haskeline mtl process + ]; + testHaskellDepends = [ base containers mtl process ]; + description = "Haskeline wrapper for GHCi-like REPL interfaces"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "repo-based-blog" = callPackage ({ mkDerivation, base, blaze-html, containers, data-default , directory, dyre, filepath, filestore, hspec, hspec-discover @@ -234391,24 +234439,6 @@ self: { }) {}; "resourcet" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec, mtl - , primitive, transformers, unliftio-core - }: - mkDerivation { - pname = "resourcet"; - version = "1.2.4.3"; - sha256 = "0zrvnikw1a0r2j59k12fxikyrg0ki5a7xhqhjgfl9h6dqpz54h85"; - revision = "1"; - editedCabalFile = "0jyk62f533papdf5ipp7nj20aw54ay7s824x1pybfii5lijcbd5d"; - libraryHaskellDepends = [ - base containers exceptions mtl primitive transformers unliftio-core - ]; - testHaskellDepends = [ base exceptions hspec transformers ]; - description = "Deterministic allocation and freeing of scarce resources"; - license = lib.licenses.bsd3; - }) {}; - - "resourcet_1_2_5" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, mtl , primitive, transformers, unliftio-core }: @@ -234422,7 +234452,6 @@ self: { testHaskellDepends = [ base exceptions hspec transformers ]; description = "Deterministic allocation and freeing of scarce resources"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "resourcet-pool" = callPackage @@ -235000,6 +235029,8 @@ self: { pname = "retry"; version = "0.9.2.0"; sha256 = "1w0mlv62hrx2bi25szycg180k3mz8r9rhy53ycq0kadb8h1sw5hy"; + revision = "1"; + editedCabalFile = "1ry3r4h7xfp9r0hc5wbxz4sy9vx46gyhfqpd0lnlsa8r2c4pvb79"; libraryHaskellDepends = [ base exceptions ghc-prim mtl mtl-compat random transformers ]; @@ -237723,18 +237754,6 @@ self: { }) {}; "rpm-nvr" = callPackage - ({ mkDerivation, base, extra, filepath, hspec }: - mkDerivation { - pname = "rpm-nvr"; - version = "0.1.1"; - sha256 = "1lv1siz93bjgbyqfsl8c0f9j7scx2fj5dvim9mhanw7madsk6ijs"; - libraryHaskellDepends = [ base extra filepath ]; - testHaskellDepends = [ base filepath hspec ]; - description = "RPM package name-version-release data types"; - license = lib.licenses.gpl2Only; - }) {}; - - "rpm-nvr_0_1_2" = callPackage ({ mkDerivation, base, extra, filepath, hspec }: mkDerivation { pname = "rpm-nvr"; @@ -237744,7 +237763,6 @@ self: { testHaskellDepends = [ base filepath hspec ]; description = "RPM package name-version-release data types"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "rpmbuild-order" = callPackage @@ -241219,6 +241237,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "scientist" = callPackage + ({ mkDerivation, base, clock, hspec, markdown-unlit, MonadRandom + , random-shuffle, text, unliftio, unliftio-core + }: + mkDerivation { + pname = "scientist"; + version = "0.0.0.0"; + sha256 = "1ni55fm2132js1zbqw6sl47asv50xp24a463zhw093p4m5x4yydz"; + libraryHaskellDepends = [ + base clock MonadRandom random-shuffle text unliftio unliftio-core + ]; + testHaskellDepends = [ + base hspec markdown-unlit text unliftio unliftio-core + ]; + testToolDepends = [ markdown-unlit ]; + description = "A Haskell library for carefully refactoring critical paths"; + license = lib.licenses.mit; + }) {}; + "scion" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, ghc, ghc-paths, ghc-syb, hslogger, json, multiset @@ -245827,6 +245864,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-openapi3_2_0_1_5" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring + , Cabal, cabal-doctest, directory, doctest, filepath, hspec + , hspec-discover, http-media, insert-ordered-containers, lens + , lens-aeson, openapi3, QuickCheck, servant, singleton-bool + , template-haskell, text, time, unordered-containers, utf8-string + , vector + }: + mkDerivation { + pname = "servant-openapi3"; + version = "2.0.1.5"; + sha256 = "0zcyqga4hbdyk34368108vv9vavzdhv26xphas7yppada2sshfay"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat bytestring hspec http-media + insert-ordered-containers lens openapi3 QuickCheck servant + singleton-bool text unordered-containers + ]; + testHaskellDepends = [ + aeson base base-compat directory doctest filepath hspec lens + lens-aeson openapi3 QuickCheck servant template-haskell text time + utf8-string vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API."; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-options" = callPackage ({ mkDerivation, base, bytestring, http-types, servant-foreign , servant-server, text, wai @@ -246821,40 +246887,42 @@ self: { ({ mkDerivation, aeson, base, constraints, containers, data-default , fmt, hspec, hspec-discover, hspec-expectations, http-client , http-types, insert-ordered-containers, lens, megaparsec, mtl - , pretty-terminal, QuickCheck, reflection, regex-posix + , openapi3, pretty-terminal, QuickCheck, reflection, regex-posix , safe-exceptions, servant, servant-client, servant-client-core - , servant-server, servant-swagger, servant-swagger-ui - , servant-swagger-ui-core, swagger2, text, text-format, time - , universum, wai, wai-extra, warp + , servant-openapi3, servant-server, servant-swagger + , servant-swagger-ui, servant-swagger-ui-core, swagger2, text + , text-format, time, universum, wai, wai-extra, warp }: mkDerivation { pname = "servant-util"; - version = "0.2"; - sha256 = "0c4zfch99rsjfljy990q2f7icxcn0h16v37j6h8fbwbg5cwdn702"; + version = "0.3"; + sha256 = "1zhx8j7w5c41z6kgs2pdpv3ig8mvra5zq14kycpbznqpjcy21fma"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base constraints containers data-default fmt http-types - insert-ordered-containers lens megaparsec mtl pretty-terminal - QuickCheck reflection regex-posix safe-exceptions servant - servant-client servant-client-core servant-server servant-swagger - servant-swagger-ui servant-swagger-ui-core swagger2 text - text-format time universum wai + insert-ordered-containers lens megaparsec mtl openapi3 + pretty-terminal QuickCheck reflection regex-posix safe-exceptions + servant servant-client servant-client-core servant-openapi3 + servant-server servant-swagger servant-swagger-ui + servant-swagger-ui-core swagger2 text text-format time universum + wai ]; executableHaskellDepends = [ aeson base constraints containers data-default fmt http-types - insert-ordered-containers lens megaparsec mtl pretty-terminal - QuickCheck reflection regex-posix safe-exceptions servant - servant-client servant-client-core servant-server servant-swagger - servant-swagger-ui servant-swagger-ui-core swagger2 text - text-format time universum wai wai-extra warp + insert-ordered-containers lens megaparsec mtl openapi3 + pretty-terminal QuickCheck reflection regex-posix safe-exceptions + servant servant-client servant-client-core servant-openapi3 + servant-server servant-swagger servant-swagger-ui + servant-swagger-ui-core swagger2 text text-format time universum + wai wai-extra warp ]; testHaskellDepends = [ aeson base constraints containers data-default fmt hspec hspec-expectations http-client http-types insert-ordered-containers - lens megaparsec mtl pretty-terminal QuickCheck reflection + lens megaparsec mtl openapi3 pretty-terminal QuickCheck reflection regex-posix safe-exceptions servant servant-client - servant-client-core servant-server servant-swagger + servant-client-core servant-openapi3 servant-server servant-swagger servant-swagger-ui servant-swagger-ui-core swagger2 text text-format time universum wai warp ]; @@ -246872,8 +246940,8 @@ self: { }: mkDerivation { pname = "servant-util-beam-pg"; - version = "0.2"; - sha256 = "0g3vv4hyylnzflhx70dcr3k023xf04a8c07v2jf1v4bf6c21f8dh"; + version = "0.3"; + sha256 = "1f3s1af4nh6dzppxgri23jihd79zyn22c0vw4xi7frjnikmfiwvl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -250293,6 +250361,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "simple-cmd_0_2_6" = callPackage + ({ mkDerivation, base, directory, extra, filepath, hspec, process + , time, unix + }: + mkDerivation { + pname = "simple-cmd"; + version = "0.2.6"; + sha256 = "0x5r4i1ckswrs0060blr6zx1n8zbdqc977nq9n5gmwcfznsrhc67"; + 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 { @@ -251887,10 +251972,10 @@ self: { }: mkDerivation { pname = "size-based"; - version = "0.1.2.0"; - sha256 = "06hmlic0n73ncwlkpx49xlv09bzsrr27ncnp5byhzlknak2gd7vp"; + version = "0.1.3.0"; + sha256 = "17ph05bd3knx1bymbzxqziq86qpch66il7g2ipcybrbaaggy0cm7"; revision = "1"; - editedCabalFile = "0kax1ypjyglkn6iff1x4yz12y7f2n249m95xvdhrc63hsa4xlcqv"; + editedCabalFile = "12scmfwyj1r92w3mdxvg28fxksizrv9f7g7qwqdg64bqpb1lwljd"; libraryHaskellDepends = [ base dictionary-sharing template-haskell testing-type-modifiers ]; @@ -252264,6 +252349,28 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "skylighting_0_12_3_1" = callPackage + ({ mkDerivation, base, binary, blaze-html, bytestring, containers + , pretty-show, skylighting-core, text + }: + mkDerivation { + pname = "skylighting"; + version = "0.12.3.1"; + sha256 = "08wml20cphj5idv5f20cz0jx7n8f037gy7x5axak83sbd98k71nw"; + configureFlags = [ "-fexecutable" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary containers skylighting-core + ]; + executableHaskellDepends = [ + base blaze-html bytestring containers pretty-show text + ]; + description = "syntax highlighting library"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "skylighting-core" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring @@ -252276,6 +252383,8 @@ self: { pname = "skylighting-core"; version = "0.12.3"; sha256 = "0pv84asvpvanxxalqsxij6hymd0nv5zcpdysj35880api5k28l0w"; + revision = "1"; + editedCabalFile = "0hc6w1bi9s4gxh5ypqhh6lgrcwv3c8xcmjsg8k9p47mmrdsa0ski"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -252295,6 +252404,38 @@ self: { license = lib.licenses.bsd3; }) {}; + "skylighting-core_0_12_3_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base + , base64-bytestring, binary, blaze-html, bytestring + , case-insensitive, colour, containers, criterion, Diff, directory + , filepath, mtl, pretty-show, QuickCheck, safe, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, text, transformers, utf8-string + , xml-conduit + }: + mkDerivation { + pname = "skylighting-core"; + version = "0.12.3.1"; + sha256 = "08svbbfw27zhlblglagxqvsppkdfibqjnx331jdbfrlj0a9pi5h8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal attoparsec base base64-bytestring binary + blaze-html bytestring case-insensitive colour containers directory + filepath mtl safe text transformers utf8-string xml-conduit + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath + pretty-show QuickCheck tasty tasty-golden tasty-hunit + tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + base containers criterion filepath text + ]; + description = "syntax highlighting library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "skylighting-extensions" = callPackage ({ mkDerivation, base, containers, skylighting, skylighting-modding , text @@ -256078,31 +256219,24 @@ self: { }) {}; "souffle-haskell" = callPackage - ({ mkDerivation, array, base, bytestring, containers, criterion - , deepseq, directory, filepath, hedgehog, hspec, hspec-hedgehog - , mtl, neat-interpolation, process, profunctors, template-haskell - , temporary, text, text-short, type-errors-pretty, vector + ({ mkDerivation, array, base, bytestring, criterion, deepseq + , directory, filepath, hedgehog, hspec, hspec-hedgehog, mtl + , process, profunctors, temporary, text, text-short + , type-errors-pretty, vector }: mkDerivation { pname = "souffle-haskell"; - version = "3.3.0"; - sha256 = "1v6c9c0ff63rhh49fq3cbvgciiwd9xamdxf58hz7jwhcgxcip3jj"; + version = "3.4.0"; + sha256 = "1vyssicyj2pcnl9jg3gq4ha17wh3shy9yjbzhq3lv332vh1qy00z"; libraryHaskellDepends = [ - array base bytestring containers deepseq directory filepath mtl - process profunctors template-haskell temporary text text-short - type-errors-pretty vector + array base bytestring deepseq directory filepath mtl process + profunctors temporary text text-short type-errors-pretty vector ]; testHaskellDepends = [ - array base bytestring containers deepseq directory filepath - hedgehog hspec hspec-hedgehog mtl neat-interpolation process - profunctors template-haskell temporary text text-short - type-errors-pretty vector - ]; - benchmarkHaskellDepends = [ - array base bytestring containers criterion deepseq directory - filepath mtl process profunctors template-haskell temporary text - text-short type-errors-pretty vector + array base directory hedgehog hspec hspec-hedgehog profunctors + temporary text text-short vector ]; + benchmarkHaskellDepends = [ base criterion deepseq text vector ]; description = "Souffle Datalog bindings for Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -256808,8 +256942,8 @@ self: { }: mkDerivation { pname = "spdx"; - version = "1.0.0.2"; - sha256 = "0aydw4gwhvy45jgk038jnzhzgq8ijg16fk48appn67jn1c3yi0xj"; + version = "1.0.0.3"; + sha256 = "1xrar0mzr7y02gw1hfabd6jyz31p3qz0jxp2mcs5kbhv0a3rc91m"; libraryHaskellDepends = [ base Cabal containers transformers ]; testHaskellDepends = [ base base-compat Cabal tasty tasty-quickcheck @@ -257357,17 +257491,6 @@ self: { }) {}; "splint" = callPackage - ({ mkDerivation, base, containers, ghc, hlint, stm }: - mkDerivation { - pname = "splint"; - version = "1.0.1.4"; - sha256 = "1s7m43y4m074wk73scakb7ynf8na0fx1bnggj8v4l59bxa5mqsmm"; - libraryHaskellDepends = [ base containers ghc hlint stm ]; - description = "HLint as a GHC source plugin"; - license = lib.licenses.isc; - }) {}; - - "splint_1_0_1_5" = callPackage ({ mkDerivation, base, containers, ghc, hlint, stm }: mkDerivation { pname = "splint"; @@ -257376,7 +257499,6 @@ self: { libraryHaskellDepends = [ base containers ghc hlint stm ]; description = "HLint as a GHC source plugin"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; }) {}; "split" = callPackage @@ -260074,32 +260196,6 @@ self: { }) {}; "statistics" = callPackage - ({ mkDerivation, aeson, async, base, binary, data-default-class - , deepseq, dense-linear-algebra, erf, ieee754, math-functions - , monad-par, mwc-random, primitive, QuickCheck, random, tasty - , tasty-expected-failure, tasty-hunit, tasty-quickcheck, vector - , vector-algorithms, vector-binary-instances, vector-th-unbox - }: - mkDerivation { - pname = "statistics"; - version = "0.16.0.2"; - sha256 = "0xywmlwzknfiwph3w00zzwya1mgf4qfsyp2pnvdmp806s5da6plg"; - libraryHaskellDepends = [ - aeson async base binary data-default-class deepseq - dense-linear-algebra math-functions monad-par mwc-random primitive - random vector vector-algorithms vector-binary-instances - vector-th-unbox - ]; - testHaskellDepends = [ - aeson base binary dense-linear-algebra erf ieee754 math-functions - primitive QuickCheck tasty tasty-expected-failure tasty-hunit - tasty-quickcheck vector vector-algorithms - ]; - description = "A library of statistical types, data, and functions"; - license = lib.licenses.bsd2; - }) {}; - - "statistics_0_16_1_0" = callPackage ({ mkDerivation, aeson, async, base, binary, data-default-class , deepseq, dense-linear-algebra, erf, ieee754, math-functions , mwc-random, parallel, primitive, QuickCheck, random, tasty @@ -260123,7 +260219,6 @@ self: { ]; description = "A library of statistical types, data, and functions"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "statistics-dirichlet" = callPackage @@ -261829,6 +261924,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "streaming-bytestring_0_2_2" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim + , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit + , tasty-smallcheck, transformers, transformers-base + }: + mkDerivation { + pname = "streaming-bytestring"; + version = "0.2.2"; + sha256 = "01iw8d3lxb72cv6gp6k8w966g9q485zmd5akri2x1n5xdd26lv9h"; + libraryHaskellDepends = [ + base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet + streaming transformers transformers-base + ]; + testHaskellDepends = [ + base bytestring resourcet smallcheck streaming tasty tasty-hunit + tasty-smallcheck transformers + ]; + description = "Fast, effectful byte streams"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "streaming-cassava" = callPackage ({ mkDerivation, base, bytestring, cassava, hspec, mtl, QuickCheck , quickcheck-instances, streaming, streaming-bytestring, text @@ -262510,6 +262627,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "streamt_0_5_0_1" = callPackage + ({ mkDerivation, async, base, criterion, hspec, logict, mtl, tasty + , tasty-hunit + }: + mkDerivation { + pname = "streamt"; + version = "0.5.0.1"; + sha256 = "0adbn5kh2wqgvwzjgrhcd94abch7if6qz26ihpbm4igwbmwirzgw"; + libraryHaskellDepends = [ base logict mtl ]; + testHaskellDepends = [ + async base criterion hspec mtl tasty tasty-hunit + ]; + description = "Simple, Fair and Terminating Backtracking Monad Transformer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "strelka" = callPackage ({ mkDerivation, attoparsec, attoparsec-data, base, base-prelude , base64-bytestring, bifunctors, bytestring @@ -262753,24 +262887,6 @@ self: { }) {}; "strict-list" = callPackage - ({ mkDerivation, base, deepseq, hashable, QuickCheck - , quickcheck-instances, rerebase, semigroupoids, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "strict-list"; - version = "0.1.6"; - sha256 = "0cbf3my7fghifplk7l2m77cc0x7xkh1pyv5k36h7dl6m2ddhmdc1"; - libraryHaskellDepends = [ base deepseq hashable semigroupoids ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "Strict linked list"; - license = lib.licenses.mit; - }) {}; - - "strict-list_0_1_7" = callPackage ({ mkDerivation, base, deepseq, hashable, QuickCheck , quickcheck-instances, rerebase, semigroupoids, tasty, tasty-hunit , tasty-quickcheck @@ -262786,7 +262902,6 @@ self: { ]; description = "Strict linked list"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "strict-optics" = callPackage @@ -263042,6 +263157,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "string-interpolate_0_3_1_2" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, formatting + , haskell-src-exts, haskell-src-meta, hspec, hspec-core + , interpolate, neat-interpolation, QuickCheck, quickcheck-instances + , quickcheck-text, quickcheck-unicode, split, template-haskell + , text, text-conversions, unordered-containers, utf8-string + }: + mkDerivation { + pname = "string-interpolate"; + version = "0.3.1.2"; + sha256 = "0gmph9mikqq8hch9wjyyx6dxfxwhmdfrwsrxkvbk7i24lvi19hhp"; + libraryHaskellDepends = [ + base bytestring haskell-src-exts haskell-src-meta split + template-haskell text text-conversions utf8-string + ]; + testHaskellDepends = [ + base bytestring hspec hspec-core QuickCheck quickcheck-instances + quickcheck-text quickcheck-unicode template-haskell text + unordered-containers + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq formatting interpolate + neat-interpolation QuickCheck text + ]; + description = "Haskell string/text/bytestring interpolation that just works"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "string-interpreter" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -263617,6 +263761,21 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "strongweak" = callPackage + ({ mkDerivation, base, prettyprinter, refined, validation + , vector-sized + }: + mkDerivation { + pname = "strongweak"; + version = "0.1.0"; + sha256 = "1vr7kb410455mli4iy8dpdvbk2lr1ss4khdkhpnxpi626lbr7khf"; + libraryHaskellDepends = [ + base prettyprinter refined validation vector-sized + ]; + description = "Convert between strong and weak representations of types"; + license = lib.licenses.mit; + }) {}; + "strptime" = callPackage ({ mkDerivation, base, bytestring, text, time }: mkDerivation { @@ -268059,22 +268218,6 @@ self: { }) {}; "tagged-transformer" = callPackage - ({ mkDerivation, base, comonad, contravariant, distributive - , exceptions, mtl, reflection, semigroupoids, tagged - }: - mkDerivation { - pname = "tagged-transformer"; - version = "0.8.1"; - sha256 = "1ffwxr312vi3fqhgnad5b6gqkgz3j27c30z551j8zisjx0hn3zx0"; - libraryHaskellDepends = [ - base comonad contravariant distributive exceptions mtl reflection - semigroupoids tagged - ]; - description = "Monad transformer carrying an extra phantom type tag"; - license = lib.licenses.bsd3; - }) {}; - - "tagged-transformer_0_8_2" = callPackage ({ mkDerivation, base, comonad, contravariant, distributive , exceptions, mtl, reflection, semigroupoids, tagged }: @@ -268088,7 +268231,6 @@ self: { ]; description = "Monad transformer carrying an extra phantom type tag"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "tagging" = callPackage @@ -268808,20 +268950,6 @@ self: { }) {}; "tardis" = callPackage - ({ mkDerivation, base, mmorph, mtl }: - mkDerivation { - pname = "tardis"; - version = "0.4.3.0"; - sha256 = "1ffmpdvnmr1s3rh3kpqqscsbz2rq4s7k8nfc93zw9m4mchg37waw"; - revision = "1"; - editedCabalFile = "1krk42qgdg10s6pxp805zv7z4c7mlhbhk15l07v9i750im1k73v3"; - libraryHaskellDepends = [ base mmorph mtl ]; - testHaskellDepends = [ base ]; - description = "Bidirectional state monad transformer"; - license = lib.licenses.bsd3; - }) {}; - - "tardis_0_4_4_0" = callPackage ({ mkDerivation, base, mmorph, mtl }: mkDerivation { pname = "tardis"; @@ -268831,7 +268959,6 @@ self: { testHaskellDepends = [ base ]; description = "Bidirectional state monad transformer"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "target" = callPackage @@ -269022,25 +269149,6 @@ self: { }) {}; "tasty" = callPackage - ({ mkDerivation, ansi-terminal, base, clock, containers, mtl - , optparse-applicative, stm, tagged, unbounded-delays, unix - , wcwidth - }: - mkDerivation { - pname = "tasty"; - version = "1.4.2.1"; - sha256 = "0ki3gdzfsqvk9mwzzvgj18ck1sbkwac06gcc128wpwh9g8c4bzqr"; - revision = "2"; - editedCabalFile = "134sp1sjyx5hh1vwraxdfs98yx9gf19zp9kpfzqvvajfgy9i37jv"; - libraryHaskellDepends = [ - ansi-terminal base clock containers mtl optparse-applicative stm - tagged unbounded-delays unix wcwidth - ]; - description = "Modern and extensible testing framework"; - license = lib.licenses.mit; - }) {}; - - "tasty_1_4_2_3" = callPackage ({ mkDerivation, ansi-terminal, base, clock, containers , optparse-applicative, stm, tagged, transformers, unbounded-delays , unix, wcwidth @@ -269055,7 +269163,6 @@ self: { ]; description = "Modern and extensible testing framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-ant-xml" = callPackage @@ -269414,6 +269521,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "tasty-hspec_1_2_0_1" = callPackage + ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty + , tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "tasty-hspec"; + version = "1.2.0.1"; + sha256 = "0ibl2xi6mmqad2mriz67nb7pjwwvjik385amp24j9kc7a7zkx091"; + libraryHaskellDepends = [ + base hspec hspec-core QuickCheck tasty tasty-quickcheck + tasty-smallcheck + ]; + description = "Hspec support for the Tasty test framework"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-html" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers, filepath , generic-deriving, mtl, semigroups, stm, tagged, tasty, text @@ -269737,31 +269861,6 @@ self: { }) {}; "tasty-silver" = callPackage - ({ mkDerivation, ansi-terminal, async, base, bytestring, containers - , deepseq, directory, filepath, mtl, optparse-applicative, process - , process-extras, regex-tdfa, silently, stm, tagged, tasty - , tasty-hunit, temporary, text, transformers - }: - mkDerivation { - pname = "tasty-silver"; - version = "3.3.1"; - sha256 = "1pd83mzx0iv3f396m09rxmgcpcfaya0a9818dl3h4vgw0hnqkmav"; - revision = "1"; - editedCabalFile = "1gsjspgy9li9lsk7sqikm44mr3cjsxkrhvql6rabk5x9nb5ajrnr"; - libraryHaskellDepends = [ - ansi-terminal async base bytestring containers deepseq directory - filepath mtl optparse-applicative process process-extras regex-tdfa - silently stm tagged tasty temporary text - ]; - testHaskellDepends = [ - base directory filepath process silently tasty tasty-hunit - temporary transformers - ]; - description = "A fancy test runner, including support for golden tests"; - license = lib.licenses.mit; - }) {}; - - "tasty-silver_3_3_1_1" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process , process-extras, regex-tdfa, silently, stm, tagged, tasty @@ -269782,7 +269881,6 @@ self: { ]; description = "A fancy test runner, including support for golden tests"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-smallcheck" = callPackage @@ -269821,17 +269919,17 @@ self: { "tasty-sugar" = callPackage ({ mkDerivation, base, directory, filemanip, filepath, hedgehog - , kvitable, logict, microlens, optparse-applicative, pretty-show - , prettyprinter, raw-strings-qq, tagged, tasty, tasty-hedgehog + , kvitable, logict, microlens, mtl, optparse-applicative + , pretty-show, prettyprinter, raw-strings-qq, tasty, tasty-hedgehog , tasty-hunit, text }: mkDerivation { pname = "tasty-sugar"; - version = "1.1.1.0"; - sha256 = "1x06s47k2rw7a78djzf0i2zxplbazah5c5mjmnmd9nr5yafw0fqv"; + version = "1.2.0.0"; + sha256 = "0hw0aanmhxq59r577d1ypd10m08kprhqpdb5w6x4na9pll5sc0gb"; libraryHaskellDepends = [ - base directory filemanip filepath kvitable logict microlens - optparse-applicative prettyprinter tagged tasty text + base directory filemanip filepath kvitable logict microlens mtl + optparse-applicative prettyprinter tasty text ]; testHaskellDepends = [ base filepath hedgehog logict pretty-show prettyprinter @@ -272440,8 +272538,10 @@ self: { }: mkDerivation { pname = "testing-feat"; - version = "1.1.0.0"; - sha256 = "1v2qzzpf1s008g7q6q67glf7vbm1pkpq4rc3ii74f4g6vhfx610r"; + version = "1.1.1.0"; + sha256 = "092m24z25anl70s1zq72z4rw7jwach9wdcgrs1qf749cdw9d89z5"; + revision = "1"; + editedCabalFile = "06cw21m4c22bix2xz726mkg6ic1kmrd8bhfbh4j8rv4f5g5k5skf"; libraryHaskellDepends = [ base QuickCheck size-based testing-type-modifiers ]; @@ -272884,25 +272984,6 @@ self: { }) {}; "text-conversions" = callPackage - ({ mkDerivation, base, base16-bytestring, base64-bytestring - , bytestring, errors, hspec, hspec-discover, text - }: - mkDerivation { - pname = "text-conversions"; - version = "0.3.1"; - sha256 = "0kbxin1q8xj9sgdl185gncrdjwcfzndp8sl5qll8y93l60yq8dxi"; - revision = "1"; - editedCabalFile = "1gra9mdsqxy2gr43cagqwn6dnc0l4pzaf4lq80y1ly5xnm1nb456"; - libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring errors text - ]; - testHaskellDepends = [ base bytestring hspec text ]; - testToolDepends = [ hspec-discover ]; - description = "Safe conversions between textual types"; - license = lib.licenses.isc; - }) {}; - - "text-conversions_0_3_1_1" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, hspec, hspec-discover, text }: @@ -272917,7 +272998,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Safe conversions between textual types"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; }) {}; "text-cp437" = callPackage @@ -274051,6 +274131,8 @@ self: { pname = "th-desugar"; version = "1.12"; sha256 = "1bp47jpif299kbm27zhjaw1nhl12daa09vsc8f0jracq0jhxi3iv"; + revision = "1"; + editedCabalFile = "1dh5j70f5gxfj6kyw7zc9hxv21ilpj408r9chixngxf82b30ic69"; libraryHaskellDepends = [ base containers ghc-prim mtl ordered-containers syb template-haskell th-abstraction th-lift th-orphans @@ -274073,6 +274155,8 @@ self: { pname = "th-desugar"; version = "1.13"; sha256 = "03jmvlgb7h7dn5dvlb0ryy7zjvdmyp5280cbkyrvfpjw0g5c9k24"; + revision = "1"; + editedCabalFile = "1xizqmh5zj85493bnfbd2m9vd6n5cp7hlcyddwap4h0jf2r06qk5"; libraryHaskellDepends = [ base containers ghc-prim mtl ordered-containers syb template-haskell th-abstraction th-lift th-orphans @@ -274361,6 +274445,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-orphans_0_13_13" = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover + , mtl, template-haskell, th-compat, th-lift, th-lift-instances + , th-reify-many + }: + mkDerivation { + pname = "th-orphans"; + version = "0.13.13"; + sha256 = "0crbhh0wkkjy5jynqbg6lsblhgaaz327avnzcwg3ddx1q3gb522p"; + libraryHaskellDepends = [ + base mtl template-haskell th-compat th-lift th-lift-instances + th-reify-many + ]; + testHaskellDepends = [ + base bytestring ghc-prim hspec template-haskell th-lift + ]; + testToolDepends = [ hspec-discover ]; + description = "Orphan instances for TH datatypes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-pprint" = callPackage ({ mkDerivation, base, lens, pretty, template-haskell }: mkDerivation { @@ -280369,6 +280475,8 @@ self: { pname = "trifecta"; version = "2.1.2"; sha256 = "1akx8m6mgskwsbhsf90cxlqjq23jk4pwaxagvm923dpncwrlwfla"; + revision = "1"; + editedCabalFile = "0a7cfbd04w3zbm234mmpib9mxar46ra5xvb62gcnbmixr7b343j9"; libraryHaskellDepends = [ ansi-terminal array base blaze-builder blaze-html blaze-markup bytestring charset comonad containers deepseq fingertree ghc-prim @@ -281351,30 +281459,6 @@ self: { }) {}; "turtle" = callPackage - ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock - , containers, directory, doctest, exceptions, foldl, hostname - , managed, optional-args, optparse-applicative, process, stm - , streaming-commons, system-fileio, system-filepath, tasty-bench - , temporary, text, time, transformers, unix, unix-compat - }: - mkDerivation { - pname = "turtle"; - version = "1.5.24"; - sha256 = "06n9k8cchmy090k6azl6ld8ygkljw8wrpw3cigsgz48hqchq8c2p"; - libraryHaskellDepends = [ - ansi-wl-pprint async base bytestring clock containers directory - exceptions foldl hostname managed optional-args - optparse-applicative process stm streaming-commons system-fileio - system-filepath temporary text time transformers unix unix-compat - ]; - testHaskellDepends = [ base doctest system-filepath temporary ]; - benchmarkHaskellDepends = [ base tasty-bench text ]; - description = "Shell programming, Haskell-style"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ Gabriel439 ]; - }) {}; - - "turtle_1_5_25" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock , containers, directory, doctest, exceptions, foldl, hostname , managed, optional-args, optparse-applicative, process, stm @@ -281395,7 +281479,6 @@ self: { benchmarkHaskellDepends = [ base tasty-bench text ]; description = "Shell programming, Haskell-style"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; @@ -284362,6 +284445,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "unbound-generics_0_4_2" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, containers, contravariant + , criterion, deepseq, exceptions, mtl, profunctors, QuickCheck + , tasty, tasty-hunit, tasty-quickcheck, template-haskell + , transformers, transformers-compat + }: + mkDerivation { + pname = "unbound-generics"; + version = "0.4.2"; + sha256 = "1pbpcvkkn360l0f5m7q5piyagvxznghknzjpxc7znb35i3xqywl1"; + libraryHaskellDepends = [ + ansi-wl-pprint base containers contravariant deepseq exceptions mtl + profunctors template-haskell transformers transformers-compat + ]; + testHaskellDepends = [ + base mtl QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + description = "Support for programming with names and binders using GHC Generics"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "unbound-kind-generics" = callPackage ({ mkDerivation, base, kind-generics, kind-generics-th , unbound-generics @@ -284796,6 +284902,34 @@ self: { license = lib.licenses.bsd2; }) {}; + "unicode-collation_0_1_3_2" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, parsec + , QuickCheck, quickcheck-instances, tasty, tasty-bench, tasty-hunit + , tasty-quickcheck, template-haskell, text, text-icu + , th-lift-instances, unicode-transforms + }: + mkDerivation { + pname = "unicode-collation"; + version = "0.1.3.2"; + sha256 = "0rnb22h8w42c74l0jl5ygzh4pkpw3x8d9ayrvgapkfx844i9am7c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers parsec template-haskell text + th-lift-instances + ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit tasty-quickcheck text + unicode-transforms + ]; + benchmarkHaskellDepends = [ + base QuickCheck quickcheck-instances tasty-bench text text-icu + ]; + description = "Haskell implementation of the Unicode Collation Algorithm"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "unicode-data" = callPackage ({ mkDerivation, base, deepseq, hspec, hspec-discover, tasty , tasty-bench @@ -285583,6 +285717,8 @@ self: { pname = "units-parser"; version = "0.1.1.4"; sha256 = "1sdf8jqq03x20gj91faqir9vrdjq7cxpnypx7bi953vjg8fh2jfm"; + revision = "1"; + editedCabalFile = "14g8a4azsdxp86c0yddkws5yzszjmkw1y78x1i7pj20cgbfjnnn7"; libraryHaskellDepends = [ base containers mtl multimap parsec ]; testHaskellDepends = [ base containers mtl multimap parsec syb tasty tasty-hunit @@ -291989,36 +292125,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.10"; - sha256 = "0ldzwcjgj0k3ma25y4jaywv4g4bjjnn75ixlk1h4r4f3iapxm6kr"; - 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_12" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring , bytestring, call-stack, case-insensitive, containers, cookie , data-default-class, directory, fast-logger, hspec, http-types @@ -292028,8 +292134,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.1.12"; - sha256 = "1i6gh02sprdbkwg92pzm6rwxcm3k8286vazziwjq05xln3vckd1n"; + version = "3.1.12.1"; + sha256 = "1ya4m0c2p3wxzjlmk3yasc3pm61z309hzry9d39lj5wqv93a4wn6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -292046,7 +292152,6 @@ self: { ]; description = "Provides some basic WAI handlers and middleware"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "wai-feature-flags" = callPackage @@ -299779,10 +299884,8 @@ self: { }: mkDerivation { pname = "xml-lens"; - version = "0.3"; - sha256 = "1i3b22sz7fkh9vjlfpwzz6fg57br8xq6q7zz76f66h6hymc284dz"; - revision = "1"; - editedCabalFile = "0is48y2k6lsdwd2cqwvhxfjs7q5qccis8vcmw7cws18cb7vjks1x"; + version = "0.3.1"; + sha256 = "0i6c4xqacinhxnyszzna7s9x79rrcs1c7jq6zimcwh4302l5d6cm"; libraryHaskellDepends = [ base case-insensitive containers lens text xml-conduit ]; @@ -303885,6 +303988,31 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-page-cursor_2_0_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , hspec-expectations-lifted, http-link-header, http-types, lens + , lens-aeson, monad-logger, mtl, network-uri, persistent + , persistent-sqlite, persistent-template, scientific, text, time + , unliftio, unliftio-core, wai-extra, yesod, yesod-core, yesod-test + }: + mkDerivation { + pname = "yesod-page-cursor"; + version = "2.0.1.0"; + sha256 = "1isgw7299nc656aqdk4blraz9kh1raki2nngz1jaddjbd6x56b40"; + libraryHaskellDepends = [ + aeson base bytestring containers http-link-header network-uri text + unliftio yesod-core + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-expectations-lifted + http-link-header http-types lens lens-aeson monad-logger mtl + persistent persistent-sqlite persistent-template scientific text + time unliftio unliftio-core wai-extra yesod yesod-core yesod-test + ]; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-paginate" = callPackage ({ mkDerivation, base, template-haskell, yesod }: mkDerivation { @@ -304480,32 +304608,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.13"; - sha256 = "1r5ip85x0shv00dvznd201fbl9gi90nkk33szmh0cz77x8960v19"; - 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_14" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, case-insensitive, conduit, containers , cookie, hspec, hspec-core, html-conduit, http-types, HUnit @@ -304530,7 +304632,6 @@ self: { ]; description = "integration testing for WAI/Yesod Applications"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-test-json" = callPackage @@ -306416,8 +306517,8 @@ self: { pname = "zinza"; version = "0.2"; sha256 = "1sy4chm8zan0ixgvvq4vm3fzvhqykn315l333al84768nly9rjv8"; - revision = "3"; - editedCabalFile = "04xvwbwxg18hgfy67nlcvwa5j7wknf616f83jwdxrj8q51ii3gq5"; + revision = "4"; + editedCabalFile = "0w4hy234rbgyc0lsaj3sm11vi13hy1aiqqdbq3dgaq6xkmcb4yal"; libraryHaskellDepends = [ base containers parsec text transformers ]; @@ -306686,25 +306787,6 @@ self: { }) {}; "zlib" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, zlib - }: - mkDerivation { - pname = "zlib"; - version = "0.6.2.3"; - sha256 = "125wbayk8ifp0gp8cb52afck2ziwvqfrjzbmwmy52g6bz7fnnzw0"; - revision = "1"; - editedCabalFile = "1r6sc6p648jgq4vslzbr171w52rk3fjv3wspxvs5kgkhygdr6ai6"; - libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ zlib ]; - testHaskellDepends = [ - base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - description = "Compression and decompression in the gzip and zlib formats"; - license = lib.licenses.bsd3; - }) {inherit (pkgs) zlib;}; - - "zlib_0_6_3_0" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, tasty , tasty-quickcheck, zlib }: @@ -306719,7 +306801,6 @@ self: { ]; description = "Compression and decompression in the gzip and zlib formats"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) zlib;}; "zlib-bindings" = callPackage From 9b6f7450b2b0f2d46b7ae6321e1a3ce88f0fd1a0 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 20 May 2022 22:41:38 +0200 Subject: [PATCH 017/122] haskellPackages: fix eval errors --- .../haskell-modules/configuration-common.nix | 14 ++------------ .../haskell-modules/configuration-ghc-9.2.x.nix | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 349931a22c92..d7b295fb7e2a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1003,10 +1003,6 @@ self: super: { # https://github.com/haskell-hvr/resolv/pull/6 resolv_0_1_1_2 = dontCheck super.resolv_0_1_1_2; - # Too strict bounds on base and Cabal, fixed on master - # Occasional test failures: https://github.com/phadej/spdx/issues/27 - spdx = assert super.spdx.version == "1.0.0.2"; doJailbreak (dontCheck super.spdx); - # The test suite does not know how to find the 'alex' binary. alex = overrideCabal (drv: { testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which]; @@ -2351,22 +2347,16 @@ self: super: { "--skip" "/Data.List.UniqueUnsorted.repeatedBy,repeated,unique/repeatedBy: simple test/" ] ++ drv.testFlags or []; }) super.Unique; + # https://github.com/AndrewRademacher/aeson-casing/issues/8 aeson-casing = assert super.aeson-casing.version == "0.2.0.0"; overrideCabal (drv: { testFlags = [ "-p" "! /encode train/" ] ++ drv.testFlags or []; }) super.aeson-casing; - # https://github.com/Soostone/katip/issues/134 - katip = assert super.katip.version == "0.8.7.0"; overrideCabal (drv: { - testFlags = [ - "-p" "!/Text-golden/&&!/respects payloadKeys for each constituent payload/" - ] ++ drv.testFlags or []; - }) super.katip; + # 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124 # 2021-12-22: https://github.com/snapframework/heist/issues/131 - - heist = assert super.heist.version == "1.1.0.1"; # aeson 2.0 compat https://github.com/snapframework/heist/pull/132 # not merged in master yet 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 f8180106499d..eedb69da8e90 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -173,7 +173,7 @@ self: super: { ]; # lens >= 5.1 supports 9.2.1 - lens = doDistribute self.lens_5_1; + lens = doDistribute self.lens_5_1_1; # Syntax error in tests fixed in https://github.com/simonmar/alex/commit/84b29475e057ef744f32a94bc0d3954b84160760 alex = dontCheck super.alex; From 7bbe4df45ad7beac2fd662125b51770e2830e689 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Fri, 20 May 2022 13:55:54 -0700 Subject: [PATCH 018/122] haskellPackages.friendly: jailbreak for ghc-9.0.2/optparse-applicative 0.16 --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d7b295fb7e2a..3842907cdfc1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -165,6 +165,9 @@ self: super: { }) ] super.flat; + # Too strict bounds on base, optparse-applicative: https://github.com/edsko/friendly/issues/5 + friendly = doJailbreak super.friendly; + # Too strict bound on hspec: https://github.com/ivan-m/graphviz/issues/55 graphviz = doJailbreak super.graphviz; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 5d0b0dafaff2..b46cd05a2f28 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1552,7 +1552,6 @@ broken-packages: - fresh - friday-devil - friday-scale-dct - - friendly - frown - frp-arduino - frpnow diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e48290efb286..e159529e1d97 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -100365,7 +100365,6 @@ self: { description = "Attempt to pretty-print any input"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "friendly-time" = callPackage From be02f1b12adee732695d975251ef6fdc675fc9bf Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 21 May 2022 10:04:31 +0100 Subject: [PATCH 019/122] foremost: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: api.o:(.bss+0xbdba0): multiple definition of `wildcard'; main.o:(.bss+0xbd760): first defined here --- pkgs/tools/system/foremost/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix index 24f207e95f14..1d0a2fa3188f 100644 --- a/pkgs/tools/system/foremost/default.nix +++ b/pkgs/tools/system/foremost/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { patches = [ ./makefile.patch ]; + # -fcommon: Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: api.o:(.bss+0xbdba0): multiple definition of `wildcard'; main.o:(.bss+0xbd760): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + makeFlags = [ "PREFIX=$(out)" ]; enableParallelBuilding = true; From 4fc2a31536f4ee18b0540abc4435cbcc5dc9baed Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 21 May 2022 10:38:52 +0100 Subject: [PATCH 020/122] glabels: pull fix pending upstream inclusion for -fno-common toolchain support Without the change builds fails on upstream gcc-10 as: ld: label.o:src/template-history.h:31: multiple definition of `gl_template_history'; glabels-batch.o:src/template-history.h:31: first defined here ld: label-text.o:src/font-history.h:31: multiple definition of `gl_font_history'; glabels-batch.o:src/font-history.h:31: first defined here ld: font-history.o:src/font-history.h:31: multiple definition of `gl_font_history'; glabels-batch.o:src/font-history.h:31: first defined here ld: template-history.o:src/template-history.h:31: multiple definition of `gl_template_history'; glabels-batch.o:src/template-history.h:31: first defined here --- pkgs/applications/graphics/glabels/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index fdf6831b974e..97fc3d1f8ff9 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, barcode, gnome, autoreconfHook +{ lib, stdenv, fetchurl, fetchpatch, barcode, gnome, autoreconfHook , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas , intltool, itstool, makeWrapper, pkg-config, yelp-tools }: @@ -12,6 +12,16 @@ stdenv.mkDerivation rec { sha256 = "0f2rki8i27pkd9r0gz03cdl1g4vnmvp0j49nhxqn275vi8lmgr0q"; }; + patches = [ + # Pull patch pending upstream inclusion for -fno-common toolchain support: + # https://github.com/jimevins/glabels/pull/76 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/jimevins/glabels/commit/f64e3f34e3631330fff2fb48ab271ff9c6160229.patch"; + sha256 = "13q6g4bxzvzwjnvzkvijds2b6yvc4xqbdwgqnwmj65ln6ngxz8sa"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper intltool ]; buildInputs = [ barcode gtk3 gtk-doc yelp-tools From a2a2be0ca75d97e8cf108c51edc666a47c50a0e9 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 21 May 2022 12:28:39 +0200 Subject: [PATCH 021/122] haskellPackages.spago: pin bower-json --- .../configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/configuration-nix.nix | 6 ++--- .../haskell-modules/hackage-packages.nix | 24 ++++++++++++++++--- 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index b46cd05a2f28..c3fbe8733371 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -453,7 +453,6 @@ broken-packages: - botpp - bottom - boundingboxes - - bower-json - bowntz - bpath - BPS diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index f27f89e873f6..8daff3ad4058 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -131,6 +131,7 @@ extra-packages: - hspec < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 + - bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 9ed09e6f81d0..87d50eb5f379 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -620,10 +620,10 @@ self: super: builtins.intersectAttrs super { }) super.spago; spagoOldAeson = spagoDocs.overrideScope (hfinal: hprev: { - # spago (and its dependency, bower-json) is not yet updated for aeson-2.0 + # spago is not yet updated for aeson 2.0 aeson = hfinal.aeson_1_5_6_0; - # bower-json needs aeson_1_5_6_0 and is marked broken without it. - bower-json = doDistribute (markUnbroken hprev.bower-json); + # bower-json 1.1.0.0 only supports aeson 2.0, so we pull in the older version here. + bower-json = hprev.bower-json_1_0_0_1; }); # Tests require network access. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e159529e1d97..c1faac64ce64 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -46886,6 +46886,27 @@ self: { broken = true; }) {}; + "bower-json_1_0_0_1" = callPackage + ({ mkDerivation, aeson, aeson-better-errors, base, bytestring + , deepseq, ghc-prim, mtl, scientific, tasty, tasty-hunit, text + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "bower-json"; + version = "1.0.0.1"; + sha256 = "0wvygg3rdbxzrmr61a9w6ddv9pfric85ih8hnxyk0ydzn7i59abs"; + libraryHaskellDepends = [ + aeson aeson-better-errors base bytestring deepseq ghc-prim mtl + scientific text transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring tasty tasty-hunit text unordered-containers + ]; + description = "Read bower.json from Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "bower-json" = callPackage ({ mkDerivation, aeson, aeson-better-errors, base, bytestring , deepseq, ghc-prim, mtl, scientific, tasty, tasty-hunit, text @@ -46904,8 +46925,6 @@ self: { ]; description = "Read bower.json from Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bowntz" = callPackage @@ -100364,7 +100383,6 @@ self: { ]; description = "Attempt to pretty-print any input"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "friendly-time" = callPackage From 47c1c35f7e762d38a2afa24180d1e207441997b1 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 21 May 2022 12:32:16 +0200 Subject: [PATCH 022/122] haskellPackages.genric-arbitrary: remove obsolete patch --- .../haskell-modules/configuration-common.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3842907cdfc1..09270fee6b70 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1165,16 +1165,6 @@ self: super: { # https://github.com/danfran/cabal-macosx/issues/13 cabal-macosx = dontCheck super.cabal-macosx; - # Causes Test.QuickCheck.resize: negative size crashes e.g. in test suites - # https://github.com/typeable/generic-arbitrary/issues/14 - generic-arbitrary = appendPatches [ - (pkgs.fetchpatch { - name = "generic-arbitrary-no-negative-resize.patch"; - url = "https://github.com/typeable/generic-arbitrary/commit/c13d119d8ad0d43860ecdb93b357b0239e366a6c.patch"; - sha256 = "1jgbd2jn575icqw9nfdzh57nacm3pn8n53ka52129pnfjqfzyhsi"; - }) - ] super.generic-arbitrary; - # https://github.com/DanielG/cabal-helper/pull/123 cabal-helper = doJailbreak super.cabal-helper; From 9da0f836bf96e52ca73c48bd34ebc60ba552b34c Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 21 May 2022 12:33:39 +0200 Subject: [PATCH 023/122] haskellPackages.size-based: remove obsolete patch --- .../haskell-modules/configuration-common.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 09270fee6b70..1c874bb52f63 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -782,22 +782,6 @@ self: super: { # The tests spuriously fail libmpd = dontCheck super.libmpd; - # For template-haskell 2.16 and 2.17 support: https://github.com/JonasDuregard/sized-functors/pull/10 - size-based = overrideCabal - (drv: { - # make all line endings unix, otherwise patching fails - prePatch = '' - find . -type f -print0 | xargs -0 ${pkgs.buildPackages.dos2unix}/bin/dos2unix - '' + (drv.prePatch or ""); - patches = [ - (fetchpatch { - url = "https://github.com/JonasDuregard/sized-functors/pull/10/commits/fe6bf78a1b97ff7429630d0e8974c9bc40945dcf.patch"; - sha256 = "sha256-mMsXOqLqSbGl9Q0txiZiciPtGT7f12lnhlpFsnCwamk="; - }) - ]; - }) - super.size-based; - # https://github.com/diagrams/diagrams-braille/issues/1 diagrams-braille = doJailbreak super.diagrams-braille; From 04dccdf5f5af38db0af8f720416a01157cc77f9a Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sun, 22 May 2022 13:15:44 -0700 Subject: [PATCH 024/122] pandoc: Add bash completions --- pkgs/development/tools/pandoc/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/development/tools/pandoc/default.nix index 515c7dc4c37d..c64e47686cf5 100644 --- a/pkgs/development/tools/pandoc/default.nix +++ b/pkgs/development/tools/pandoc/default.nix @@ -1,4 +1,4 @@ -{ haskellPackages, fetchpatch, haskell, removeReferencesTo }: +{ stdenv, lib, haskellPackages, fetchpatch, haskell, removeReferencesTo }: let static = haskell.lib.compose.justStaticExecutables haskellPackages.pandoc; @@ -13,6 +13,9 @@ in remove-references-to \ -t ${haskellPackages.pandoc-types} \ $out/bin/pandoc + '' + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' + mkdir -p $out/share/bash-completion/completions + $out/bin/pandoc --bash-completion > $out/share/bash-completion/completions/pandoc ''; }) static).overrideAttrs (drv: { # These libraries are still referenced, because they generate From 366420b0d29b2adae8008031cf9f18594d6a9532 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 23 May 2022 22:46:41 +0200 Subject: [PATCH 025/122] hercules-ci-agent: Work around missing file from sdist --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1c874bb52f63..cc20e35b753c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1740,7 +1740,11 @@ self: super: { # waiting for aeson bump servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core; - hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent; + hercules-ci-agent = + assert super.hercules-ci-agent.version == "0.9.5"; # >0.9.5: remove source override as sdist will be fixed + overrideSrc + { src = pkgs.fetchFromGitHub { owner = "hercules-ci"; repo = "hercules-ci-agent"; rev = "hercules-ci-agent-0.9.5"; sha256 = "sha256-7d8lf4g8CWHTzIOmma8UKvFIi1Og6RqPH9Lt+6iA4pw="; } + "/hercules-ci-agent"; } + (generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent); # Test suite doesn't compile with aeson 2.0 # https://github.com/hercules-ci/hercules-ci-agent/pull/387 From a3fd4a26ce947a8c1b812ebcc728da218806ca4b Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 26 May 2022 11:55:58 +0200 Subject: [PATCH 026/122] haskellPackages.hls-rename-plugin: disable flaky test --- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 87d50eb5f379..b7d0911472de 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -994,7 +994,6 @@ self: super: builtins.intersectAttrs super { hls-module-name-plugin hls-ormolu-plugin hls-pragmas-plugin - hls-rename-plugin hls-splice-plugin; # Tests have file permissions expections that don‘t work with the nix store. hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin; @@ -1002,6 +1001,7 @@ self: super: builtins.intersectAttrs super { # Flaky tests hls-hlint-plugin = dontCheck super.hls-hlint-plugin; hls-class-plugin = dontCheck super.hls-class-plugin; + hls-rename-plugin = dontCheck super.hls-rename-plugin; hls-alternate-number-format-plugin = dontCheck super.hls-alternate-number-format-plugin; hls-qualify-imported-names-plugin = dontCheck super.hls-qualify-imported-names-plugin; hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin; From d8ecc4d9497581d33623e7b96e35ee56fa586548 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 02:42:41 +0000 Subject: [PATCH 027/122] azure-storage-azcopy: 10.14.1 -> 10.15.0 --- pkgs/development/tools/azcopy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index 47a7bf723f02..1f543d95ba25 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.14.1"; + version = "10.15.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "sha256-UPn6pBttes5wq1RByE89QfE2OSUixYW4LOnFgfuAY3w="; + sha256 = "sha256-iXMkvrBANuOIyyVyQ11YQ1DWRQf4JAtu+1Ou3aQrhlc="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-9ThsJySzsyS0eX/0BlAAvtaeJpPYCP0cN1YgIShYrKw="; + vendorSha256 = "sha256-OlsNFhduilo8fJs/mynrAiwuXcfCZERdaJk3VcAUCJw="; doCheck = false; From 51e7b88dd30233ae516ff715af9dbbf3f728d3d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 10:15:42 +0000 Subject: [PATCH 028/122] ergo: 4.0.23 -> 4.0.30 --- pkgs/applications/blockchains/ergo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index cb39e26789b3..620cbd020b20 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "4.0.23"; + version = "4.0.30"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-ZpBTfL8ghLOo8C9yDUfKelblpIlwdVAOgYVvqmxJQXo="; + sha256 = "sha256-Jeufmt2Dso13Z/TQnSA8IPNxTfha+wcklKZb+BF/dNE="; }; nativeBuildInputs = [ makeWrapper ]; From ddaaad11c7a9807e017808b8906afc6c860235d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 11:07:47 +0000 Subject: [PATCH 029/122] faustlive: 2.5.8 -> 2.5.10 --- pkgs/applications/audio/faust/faustlive.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 38d3bafdea6a..67ff0a828573 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { pname = "faustlive"; - version = "2.5.8"; + version = "2.5.10"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; rev = version; - sha256 = "sha256-dt5YlvaCZ6JiNGPwVXPrKzVGWxnhdyP4lnKgck7ZSF8="; + sha256 = "sha256-yLpIJr6A+NIX9RSGfQXT0O0USuRr0Ni9aUA+mbk31/o="; fetchSubmodules = true; }; From 8c364a8cae27b87ab192b609c3156847f5aed06b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 11:29:45 +0000 Subject: [PATCH 030/122] fits-cloudctl: 0.10.13 -> 0.10.17 --- pkgs/tools/admin/fits-cloudctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index fe0670f36aa0..c09f5114cb55 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.10.13"; + version = "0.10.17"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - sha256 = "sha256-8MSX8A/3FY95rrWuYfGYFynSi76JPcHX+N8VF9BWktM="; + sha256 = "sha256-cC6qPPRrMUMpwQ/FH+H6LuwC35dfgcZyB2yqz7tvSIg="; }; - vendorSha256 = "sha256-K6HI7aSDbrhqm2XVor7sRwHnqQPQlpZYGLgaf3SFNrU="; + vendorSha256 = "sha256-nNzmecvTAIno6+OkpmlQ0eHfNfQGUH+ICLumvLswlWA="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; From 6269ca3e43f8263da4ce4f25e41f269b5b719f41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 11:49:13 +0000 Subject: [PATCH 031/122] flannel: 0.17.0 -> 0.18.0 --- pkgs/tools/networking/flannel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 324b220857e9..36623c021f6d 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -4,7 +4,7 @@ with lib; buildGoModule rec { pname = "flannel"; - version = "0.17.0"; + version = "0.18.0"; rev = "v${version}"; vendorSha256 = null; @@ -13,7 +13,7 @@ buildGoModule rec { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "sha256-YM/cGmtHDTzgu6Bfy52oP8E1HmLNuBHNgEpz/qTj7rg="; + sha256 = "sha256-cxdbXhj79xp5jT5xY3cIzt5XYndPC+TWIrxBjAvbP0g="; }; ldflags = [ "-X github.com/flannel-io/flannel/version.Version=${rev}" ]; From 9ba82576945ab2153f78d980cf3238f8824c5a2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 12:50:18 +0000 Subject: [PATCH 032/122] python310Packages.python-telegram-bot: 13.11 -> 13.12 --- .../python-modules/python-telegram-bot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 8d6ab3aeecd3..ffa1425e274b 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "13.11"; + version = "13.12"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uu/3BLqirD3BepRMAtqIgiitJY6Jvi5by9E6ilEC1XM="; + sha256 = "sha256-2vVftvQYuHUjF/0S34JN1xfjIpqH2DgQpM3W5EL2beU="; }; propagatedBuildInputs = [ From c1ce3a13338d6a6eeca2898b5adbf6d2f26b2cef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 13:38:21 +0000 Subject: [PATCH 033/122] frugal: 3.15.0 -> 3.15.1 --- pkgs/development/tools/frugal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index ae0db9da3074..db83912af638 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.15.0"; + version = "3.15.1"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EIHaCkqwCyRV1sX+9f39FbByRvhms4rJA9nQoKxxkm8="; + sha256 = "sha256-pRWTjlPTVwFzamq67hzb+ElqZuqP9aEAVz581DNMUBM="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-vWqj2fRtaDextDstIb5GrdRn4nxQpCfjegYiVbPILuM="; + vendorSha256 = "sha256-ljZ3tpIJ+tg4UDBDzbse4M6ksb8AgPJLJCZeusMtQ0Q="; meta = with lib; { description = "Thrift improved"; From 44f64d32d71940349e28a209575caae6aff3fc9d Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 28 May 2022 00:27:26 +0000 Subject: [PATCH 034/122] shopify-themekit: 1.0.3 -> 1.3.0 --- .../web/shopify-themekit/default.nix | 21 +- .../shopify-themekit_deps.nix | 300 ------------------ 2 files changed, 13 insertions(+), 308 deletions(-) delete mode 100644 pkgs/development/web/shopify-themekit/shopify-themekit_deps.nix diff --git a/pkgs/development/web/shopify-themekit/default.nix b/pkgs/development/web/shopify-themekit/default.nix index bf0a8c6d8161..3d7fbbda4b18 100644 --- a/pkgs/development/web/shopify-themekit/default.nix +++ b/pkgs/development/web/shopify-themekit/default.nix @@ -1,20 +1,25 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "shopify-themekit"; - version = "1.0.3"; - - goPackagePath = "github.com/Shopify/themekit/"; - - goDeps = ./shopify-themekit_deps.nix; + version = "1.3.0"; src = fetchFromGitHub { owner = "Shopify"; repo = "themekit"; rev = "v${version}"; - sha256 = "1780h33mf2h2lv6mr4xx3shfvsabr7w138yb59vvdgvjng9wjkg0"; + sha256 = "sha256-7uUKyaLzeiioW0TsEu82lJU0DoM1suwVcmacY1X0SEM="; }; + vendorSha256 = "sha256-8QpkYj0fQb4plzvk6yCrZho8rq9VBiLft/EO3cczciI="; + + ldflags = [ "-s" "-w" ]; + + postInstall = '' + # Keep `theme` only + rm -f $out/bin/{cmd,tkrelease} + ''; + meta = with lib; { description = "A command line tool for shopify themes"; homepage = "https://shopify.github.io/themekit/"; diff --git a/pkgs/development/web/shopify-themekit/shopify-themekit_deps.nix b/pkgs/development/web/shopify-themekit/shopify-themekit_deps.nix deleted file mode 100644 index 8a70c7cecd92..000000000000 --- a/pkgs/development/web/shopify-themekit/shopify-themekit_deps.nix +++ /dev/null @@ -1,300 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/VividCortex/ewma"; - fetch = { - type = "git"; - url = "https://github.com/VividCortex/ewma"; - rev = "v1.1.1"; - sha256 = "14v2dy5gqchjn7k0sd6cx59ms42v681r6xz7cb1kspp4b28a74rw"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "1c16cd01d785"; - sha256 = "129iizv2rny2frg36057hayynpsdav53nhj41dia3mi2r6zyalny"; - }; - } - { - goPackagePath = "github.com/caarlos0/env"; - fetch = { - type = "git"; - url = "https://github.com/caarlos0/env"; - rev = "d0de832ed2fb"; - sha256 = "013shh38rs2jv4a2hsbix0hlanjr2a539akmkqkwwg0il9h3qmq2"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "v1.25.4"; - sha256 = "0b6cql5ripbiyrm18d6bfd1rfjnwcbskppw3d0vb80l0wy72d0c6"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-version"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-version"; - rev = "270f2f71b1ee"; - sha256 = "1d43wlp932nqbwkca4bhw8l4x6cg25jyh8l1s3814vddscfpfz2v"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "v0.3.6"; - sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7"; - }; - } - { - goPackagePath = "github.com/inconshreveable/go-update"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/go-update"; - rev = "8152e7eb6ccf"; - sha256 = "07czhspakpi7al004rm669cmf4h5l0vnygsm11280nkfn2zxqdi3"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "0b12d6b521d8"; - sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; - }; - } - { - goPackagePath = "github.com/joho/godotenv"; - fetch = { - type = "git"; - url = "https://github.com/joho/godotenv"; - rev = "v1.3.0"; - sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "efa589957cd0"; - sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.4"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/radovskyb/watcher"; - fetch = { - type = "git"; - url = "https://github.com/radovskyb/watcher"; - rev = "v1.0.6"; - sha256 = "1xlbrfgm6ha161szdjq2rab53plkdhmh5h86lpbk5g7fmq881945"; - }; - } - { - goPackagePath = "github.com/ryanuber/go-glob"; - fetch = { - type = "git"; - url = "https://github.com/ryanuber/go-glob"; - rev = "572520ed46db"; - sha256 = "0dzbpqp1h7gjmlm4irnh6lpbfz5zjc721jidibyvmxj7xcx3wp5d"; - }; - } - { - goPackagePath = "github.com/shibukawa/configdir"; - fetch = { - type = "git"; - url = "https://github.com/shibukawa/configdir"; - rev = "e180dbdc8da0"; - sha256 = "0vbma9jkwh0ifz8dk2ssgmy7aiaify63lpa0lah7i4dkkxr94c9z"; - }; - } - { - goPackagePath = "github.com/skratchdot/open-golang"; - fetch = { - type = "git"; - url = "https://github.com/skratchdot/open-golang"; - rev = "75fb7ed4208c"; - sha256 = "1b67imqbsdvg19vif1q1dfmapxy3v2anagacbql95fwnnw0v8jga"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "7c4570c3ebeb"; - sha256 = "16amh0prlzqrrbg5j629sg0f688nfzfgn9sair8jyybqampr3wc7"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.2"; - sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "github.com/vbauerster/mpb"; - fetch = { - type = "git"; - url = "https://github.com/vbauerster/mpb"; - rev = "v3.3.2"; - sha256 = "18m66b80iv9z768c15dqsx5mnjq6iaa6b5lckpdqnynqzkkvw8kk"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "a1f597ede03a"; - sha256 = "0yiczljll72ip2vkxgd6052rhpaba37a68vf6si3v8s8s3g870lc"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "d0100b6bd8b3"; - sha256 = "0b0amr9x4ji66iv9ayfx7zrfx52k1m5g66qfcxkgj80qrb1y2yn7"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "1272bf9dcd53"; - sha256 = "1500gryd7jli7yjn4c927ppyllry8lxcmnsmpn7zxfd1k14q7nyv"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6f"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "6c81ef8f67ca"; - sha256 = "1iqrral339vxb635ip5jjzn84aa86kb629kbp1w29qwyfzbs0yqi"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "3f1ed9edd1b4"; - sha256 = "00d2h0df03gv57valad4wr3g2rc8dcn8w3ci783x9wzzc86y4giw"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v1"; - rev = "9f9df34309c0"; - sha256 = "1r8d346szqa9x8q03wiycik5qy3d6w8qq4hs99z1p64q5lm0g7gm"; - }; - } -] From 96faefe436d35a575524ab81f60324997e203e05 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 28 May 2022 04:20:00 +0000 Subject: [PATCH 035/122] contour: 0.1.1 -> 0.3.1.200 --- .../terminal-emulators/contour/default.nix | 101 +++++++++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 86 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/terminal-emulators/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix index d0def97e46f3..0794e7f2fcf8 100644 --- a/pkgs/applications/terminal-emulators/contour/default.nix +++ b/pkgs/applications/terminal-emulators/contour/default.nix @@ -1,30 +1,99 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, freetype, libGL, pcre, nixosTests }: +{ lib +, stdenv +, mkDerivation +, fetchFromGitHub +, cmake +, pkg-config +, freetype +, fontconfig +, libGL +, pcre +, boost +, catch2 +, fmt +, microsoft_gsl +, range-v3 +, libyamlcpp +, ncurses +, file +, darwin +, nixosTests +}: -mkDerivation rec { - pname = "contour"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "christianparpart"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-P7t+M75ZWjFcGWngcbaurdit6e+pb0ILljimhYqW0NI="; - fetchSubmodules = true; +let + # Commits refs come from https://github.com/contour-terminal/contour/blob/master/scripts/install-deps.sh + libunicode-src = fetchFromGitHub { + owner = "contour-terminal"; + repo = "libunicode"; + rev = "c2369b6380df1197476b08d3e2d0e96b6446f776"; + sha256 = "sha256-kq7GpFCkrJG7F9/YEGz3gMTgYzhp/QB8D5b9wwMaLvQ="; }; - nativeBuildInputs = [ cmake pkg-config ]; + termbench-pro-src = fetchFromGitHub { + owner = "contour-terminal"; + repo = "termbench-pro"; + rev = "cd571e3cebb7c00de9168126b28852f32fb204ed"; + sha256 = "sha256-dNtOmBu63LFYfiGjXf34C2tiG8pMmsFT4yK3nBnK9WI="; + }; +in +mkDerivation rec { + pname = "contour"; + version = "0.3.1.200"; - buildInputs = [ freetype libGL pcre ]; + src = fetchFromGitHub { + owner = "contour-terminal"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-TpxVC0GFZD3jGISnDWHKEetgVVpznm5k/Vc2dwVfSG4="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ncurses + file + ]; + + buildInputs = [ + fontconfig + freetype + libGL + pcre + boost + catch2 + fmt + microsoft_gsl + range-v3 + libyamlcpp + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.libs.utmp ]; + + preConfigure = '' + mkdir -p _deps/sources + + cat > _deps/sources/CMakeLists.txt < Date: Sat, 28 May 2022 14:48:53 +0300 Subject: [PATCH 036/122] smlnj,smlnjBootstrap: set meta.mainProgram --- pkgs/development/compilers/smlnj/bootstrap.nix | 1 + pkgs/development/compilers/smlnj/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix index aacebd48e9e3..6aba529a8fce 100644 --- a/pkgs/development/compilers/smlnj/bootstrap.nix +++ b/pkgs/development/compilers/smlnj/bootstrap.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { license = lib.licenses.free; platforms = lib.platforms.darwin; maintainers = [ lib.maintainers.jwiegley ]; + mainProgram = "sml"; }; } diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index d6d50f0303f6..7f1311579892 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -87,5 +87,6 @@ in stdenv.mkDerivation { license = licenses.bsd3; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ thoughtpolice ]; + mainProgram = "sml"; }; } From 8ece1240d36048a773d13ec2ef0c00efb82541aa Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 28 May 2022 20:37:42 +0800 Subject: [PATCH 037/122] mdbook-mermaid: 0.10.0 -> 0.11.0 --- pkgs/tools/text/mdbook-mermaid/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-mermaid/default.nix b/pkgs/tools/text/mdbook-mermaid/default.nix index 05bf89e30189..6525b82bf867 100644 --- a/pkgs/tools/text/mdbook-mermaid/default.nix +++ b/pkgs/tools/text/mdbook-mermaid/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-mermaid"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "badboy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dXeu/e92lafurA/bqKoszIjK/3qw/ZvVKnDxYALRpTk="; + sha256 = "sha256-1neEuDsPMI4f1HaAP+Kx62RBW8hqqNThHpUNa5DzlnY="; }; - cargoSha256 = "sha256-LVfeQPRpwv1l3Brm8HJYoYvv26fJhsfR4I9Ds4NuWQM="; + cargoSha256 = "sha256-Sk0cOLknS1UK3OcLHVSnA/H3BeMe7bpo2HgHEErQSAQ="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From 67e47c115061f90237d3d328fb2a6328c19333fb Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 28 May 2022 15:12:24 +0200 Subject: [PATCH 038/122] haskellPackages.distribution-nixpkgs: constrain to < 1.7 cabal2nix doesn't support the new version (in any release) yet. --- .../haskell-modules/configuration-hackage2nix/main.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 8daff3ad4058..d295ad3d63df 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -85,6 +85,8 @@ default-package-overrides: - http-client-restricted < 0.0.5 # Needs dhall 1.41.*, Stackage LTS 19 has 1.40 - dhall-nix < 1.1.24 + # Temporarily forbid distribution-nixpkgs updates until cabal2nix supports the new version + - distribution-nixpkgs < 1.7.0 extra-packages: - aeson < 2 # required by pantry-0.5.2 From aea37b0a99dcbf00cb25d93ac1d559e7506ef2c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 28 May 2022 17:01:07 +0200 Subject: [PATCH 039/122] bottles: 2022.5.14-trento-1 -> 2022.5.28-trento --- pkgs/applications/misc/bottles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index bff4e724f61e..ee7dde134bbd 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -20,13 +20,13 @@ let in python3Packages.buildPythonApplication rec { pname = "bottles"; - version = "2022.5.14-trento-1"; + version = "2022.5.28-trento"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = pname; rev = version; - sha256 = "sha256-w5nSMJnt4WO1KOJvdjM1TYSOvPnogERgQWp1JVr3TZY="; + sha256 = "sha256-kStg/Ou/Eb7fQonyc3z+TCGpOBgZqfi2cEyu6lnuI7w="; }; postPatch = '' From 457d492c95ad64b14336f6cefea3f357ee6a34e8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 May 2022 21:27:24 +0200 Subject: [PATCH 040/122] atop: 2.6.0 -> 2.7.1 --- pkgs/os-specific/linux/atop/default.nix | 33 ++++++++++++++++++------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index b082c594acbf..47f76649dea9 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -12,16 +12,27 @@ stdenv.mkDerivation rec { pname = "atop"; - version = "2.6.0"; + version = "2.7.1"; src = fetchurl { url = "https://www.atoptool.nl/download/atop-${version}.tar.gz"; - sha256 = "nsLKOlcWkvfvqglfmaUQZDK8txzCLNbElZfvBIEFj3I="; + sha256 = "sha256-ykjS8X4HHe6tXm6cyeOIv2oycNaV5hl2s3lNTZJ7XE4="; }; - nativeBuildInputs = lib.optionals withAtopgpu [ python3.pkgs.wrapPython ]; - buildInputs = [ zlib ncurses ] ++ lib.optionals withAtopgpu [ python3 ]; - pythonPath = lib.optionals withAtopgpu [ python3.pkgs.pynvml ]; + nativeBuildInputs = lib.optionals withAtopgpu [ + python3.pkgs.wrapPython + ]; + + buildInputs = [ + zlib + ncurses + ] ++ lib.optionals withAtopgpu [ + python3 + ]; + + pythonPath = lib.optionals withAtopgpu [ + python3.pkgs.pynvml + ]; makeFlags = [ "DESTDIR=$(out)" @@ -53,12 +64,12 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace 'chmod 04711' 'chmod 0711' ''; - installTargets = [ "systemdinstall" ]; preInstall = '' mkdir -p $out/bin ''; + postInstall = '' - # remove extra files we don't need + # Remove extra files we don't need rm -r $out/{var,etc} $out/bin/atop{sar,}-${version} '' + (if withAtopgpu then '' wrapPythonPrograms @@ -70,9 +81,13 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ raskin ]; description = "Console system performance monitor"; - longDescription = '' - Atop is an ASCII full-screen performance monitor that is capable of reporting the activity of all processes (even if processes have finished during the interval), daily logging of system and process activity for long-term analysis, highlighting overloaded system resources by using colors, etc. At regular intervals, it shows system-level activity related to the CPU, memory, swap, disks and network layers, and for every active process it shows the CPU utilization, memory growth, disk utilization, priority, username, state, and exit code. + Atop is an ASCII full-screen performance monitor that is capable of reporting the activity of + all processes (even if processes have finished during the interval), daily logging of system + and process activity for long-term analysis, highlighting overloaded system resources by using + colors, etc. At regular intervals, it shows system-level activity related to the CPU, memory, + swap, disks and network layers, and for every active process it shows the CPU utilization, + memory growth, disk utilization, priority, username, state, and exit code. ''; license = licenses.gpl2Plus; downloadPage = "http://atoptool.nl/downloadatop.php"; From a0a5f90ef209f058ee19d7cb5693faec2bfe56a4 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 27 May 2022 14:56:30 +0200 Subject: [PATCH 041/122] zlog: fixes CVE-2021-43521 --- pkgs/development/libraries/zlog/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index 99163ae5dc6c..82c08b46bc8b 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { version = "1.2.15"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "10hzifgpml7jm43y6v8c8q0cr9ziyx9qxznafxyw6glhnlqnb7pb"; }; + patches = [ + (fetchpatch { + name = "CVE-2021-43521.patch"; + url = "https://github.com/HardySimpson/zlog/commit/a5be8b3a8ddc498de4ad041757285136a55d97e3.patch"; + sha256 = "sha256-igHXUHN2Ke8Gb5AeDrDwG2aUNRpispgqVlGuASute+8="; + }) + ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { From 1428745f914fc5df3c72a50e72868cd28a25e993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 28 May 2022 21:42:28 +0200 Subject: [PATCH 042/122] bottles: 2022.5.28-trento -> 2022.5.28-trento-1 --- pkgs/applications/misc/bottles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index ee7dde134bbd..7b5fde8a646f 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -20,13 +20,13 @@ let in python3Packages.buildPythonApplication rec { pname = "bottles"; - version = "2022.5.28-trento"; + version = "2022.5.28-trento-1"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = pname; rev = version; - sha256 = "sha256-kStg/Ou/Eb7fQonyc3z+TCGpOBgZqfi2cEyu6lnuI7w="; + sha256 = "sha256-7uOnZWuKI6ZQeb1UcSUjrZ4vC1JiNwSbEIPDRsJYzNo="; }; postPatch = '' From 7530fc79a2b1615828cadda6612598136fec0e14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 28 May 2022 22:10:29 +0200 Subject: [PATCH 043/122] bottles: 2022.5.28-trento-1 -> 2022.5.28-trento-2 --- pkgs/applications/misc/bottles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 7b5fde8a646f..e85af7806506 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -20,13 +20,13 @@ let in python3Packages.buildPythonApplication rec { pname = "bottles"; - version = "2022.5.28-trento-1"; + version = "2022.5.28-trento-2"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = pname; rev = version; - sha256 = "sha256-7uOnZWuKI6ZQeb1UcSUjrZ4vC1JiNwSbEIPDRsJYzNo="; + sha256 = "sha256-q4arUiHcAvkytcxnbLbMRzFVOgWqEXNIZt9Y8l3dAig="; }; postPatch = '' From f91dab1ecbb914bd8387b33e1d1ce27b9471f6f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 28 May 2022 22:49:10 +0200 Subject: [PATCH 044/122] topgrade: 9.0.0 -> 9.0.1 --- pkgs/tools/misc/topgrade/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 8cc15590391d..98f13bc7524a 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "9.0.0"; + version = "9.0.1"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D3yd5Xc+7VNBrRkkKW7BGxEXcZHmmESy2YOEKBf/k9M="; + sha256 = "sha256-9zP+rWhaK4fC2Qhd0oq9WVvCkvryooYo09k7016Rbxw="; }; - cargoSha256 = "sha256-g3Efw8HQ/fvrACyM0sW0bNAVQDdGPLnARe8Uug3szj0="; + cargoSha256 = "sha256-otn0XvZ0wufD+4mCGSM0hevKM+wWSvFVCKtTu/5m1uA="; buildInputs = lib.optionals stdenv.isDarwin [ Cocoa Foundation ]; From ae7e4c0ef54b63a76bda4dbfefd15127674170fc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 29 May 2022 07:52:16 +0100 Subject: [PATCH 045/122] sniproxy: pull upstream fix for -fno-common toolchain support Without the change build fails against upstream gcc-10 as: ld: tls.o:/build/source/src/tls.h:31: multiple definition of `tls_protocol'; listener.o:/build/source/src/tls.h:31: first defined here --- pkgs/applications/networking/sniproxy/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sniproxy/default.nix b/pkgs/applications/networking/sniproxy/default.nix index 6652e7c986c3..7c8e3dfd93dc 100644 --- a/pkgs/applications/networking/sniproxy/default.nix +++ b/pkgs/applications/networking/sniproxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkg-config, udns }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext, libev, pcre, pkg-config, udns }: stdenv.mkDerivation rec { pname = "sniproxy"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0isgl2lyq8vz5kkxpgyh1sgjlb6sqqybakr64w2mfh29k5ls8xzm"; }; + patches = [ + # Pull upstream fix for -fno-common toolchain support: + # https://github.com/dlundquist/sniproxy/pull/349 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/dlundquist/sniproxy/commit/711dd14affd5d0d918cd5fd245328450e60c7111.patch"; + sha256 = "1vlszib2gzxnkl9zbbrf2jz632j1nhs4aanpw7qqnx826zmli0a6"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gettext libev pcre udns ]; From c9a2833a575b682d97e1f3e2be483414fcd0b787 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 29 May 2022 08:28:05 +0100 Subject: [PATCH 046/122] syslinux: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: acpi/xsdt.o:/build/syslinux-b404870/com32/gpllib/../gplinclude/memory.h:40: multiple definition of `e820_types'; memory.o:/build/syslinux-b404870/com32/gpllib/../gplinclude/memory.h:40: first defined here --- pkgs/os-specific/linux/syslinux/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 4ca7f50b7d1a..03c1f0602728 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -71,6 +71,12 @@ stdenv.mkDerivation { stripDebugList = [ "bin" "sbin" "share/syslinux/com32" ]; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: acpi/xsdt.o:/build/syslinux-b404870/com32/gpllib/../gplinclude/memory.h:40: multiple definition of + # `e820_types'; memory.o:/build/syslinux-b404870/com32/gpllib/../gplinclude/memory.h:40: first defined here + NIX_CFLAGS_COMPILE="-fcommon"; + makeFlags = [ "BINDIR=$(out)/bin" "SBINDIR=$(out)/sbin" From a8f20c82f5bb183e10eca2414c0072b150558afa Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 29 May 2022 19:35:43 +1000 Subject: [PATCH 047/122] fd: 8.3.2 -> 8.4.0 https://github.com/sharkdp/fd/releases/tag/v8.4.0 --- pkgs/tools/misc/fd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index e8d77f0e612c..554eb5aad3ce 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fd"; - version = "8.3.2"; + version = "8.4.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "sha256-aNAV0FVZEqtTdgvnLiS1ixtsPU48rUOZdmj07MiMVKg="; + sha256 = "sha256-Vy5ERc4GZVEjNP0z2zZJeNwfhoL0nnOeii+TjRszrFw="; }; - cargoSha256 = "sha256-A8MAgV7/6Vf+PaND+gaZz8IEq4Cw9ETEY+lF8R77lA4="; + cargoSha256 = "sha256-Iz8QP9NdjbBL8j/iUV6iS3U1ErPHuC5NYFHUMtR8MZg="; nativeBuildInputs = [ installShellFiles ]; From cf5da0313beef476d5536fe21e483bed7f393934 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 29 May 2022 13:11:06 +0200 Subject: [PATCH 048/122] ipinfo: 2.8.0 -> 2.8.1 --- pkgs/tools/networking/ipinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ipinfo/default.nix b/pkgs/tools/networking/ipinfo/default.nix index 940c7d58904c..26f4f68c778f 100644 --- a/pkgs/tools/networking/ipinfo/default.nix +++ b/pkgs/tools/networking/ipinfo/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ipinfo"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = pname; repo = "cli"; rev = "${pname}-${version}"; - sha256 = "sha256-hvn50sn1UHkC2K0U5beRAYkAe8y/5sYH7Xed3atXzDo="; + hash = "sha256-j+ASyNWfYh4/u7OX3iZx8DZZg1XAwuy6fpC9TJKI+18="; }; vendorSha256 = null; From 3f0dea3f05e6b085fa63a1f06595ece9b8d94b07 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 29 May 2022 13:16:11 +0200 Subject: [PATCH 049/122] sad: 0.4.20 -> 0.4.21 --- pkgs/tools/text/sad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/sad/default.nix b/pkgs/tools/text/sad/default.nix index 0de0f745a233..8ddf15041f32 100644 --- a/pkgs/tools/text/sad/default.nix +++ b/pkgs/tools/text/sad/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "sad"; - version = "0.4.20"; + version = "0.4.21"; src = fetchFromGitHub { owner = "ms-jpq"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BhkSqXiQPOSYnCXqjAqenKx3DextxPluqsTAMI4Xs7g="; + sha256 = "sha256-kM5jeoFmDOwgnzdSwfPJfZhpBS8RPMNt143S5iYYrF4="; }; - cargoSha256 = "sha256-aKTF0DH8Lf/H6OfQPuQ6yGOmUEUguYcHMCuYKIjNR9k="; + cargoSha256 = "sha256-JwYUM4o4I3dC1HgG4bkUS1PH4MsxcvwdefjefnEZQFs="; meta = with lib; { description = "CLI tool to search and replace"; From 8bdc1401a2a22602c182f698ecf22a42a3c0fcbf Mon Sep 17 00:00:00 2001 From: cab Date: Sat, 28 May 2022 23:11:54 +0400 Subject: [PATCH 050/122] pkgs: added gcc10StdenvCompat Many packages got broken by gcc10 -> 11 switch. This makes overriding broken libraries a bit easier. --- pkgs/top-level/all-packages.nix | 37 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdfcf5ff5266..cb8874ba14ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -992,7 +992,7 @@ with pkgs; arc_unpacker = callPackage ../tools/archivers/arc_unpacker { boost = boost16x; # checkPhase fails with Boost 1.77 - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; adminer = callPackage ../servers/adminer { }; @@ -2021,7 +2021,7 @@ with pkgs; bonnmotion = callPackage ../development/tools/misc/bonnmotion { }; bonnie = callPackage ../tools/filesystems/bonnie { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; botamusique = callPackage ../tools/audio/botamusique { }; @@ -4967,7 +4967,7 @@ with pkgs; createrepo_c = callPackage ../tools/package-management/createrepo_c { }; cromfs = callPackage ../tools/archivers/cromfs { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; cron = callPackage ../tools/system/cron { }; @@ -12568,6 +12568,8 @@ with pkgs; gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11; gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12; + gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "11" then gcc10Stdenv else stdenv; + # This is not intended for use in nixpkgs but for providing a faster-running # compiler to nixpkgs users by building gcc with reproducibility-breaking # profile-guided optimizations @@ -14944,10 +14946,7 @@ with pkgs; buildJdk = jdk11_headless; buildJdkName = "java11"; runJdk = jdk11_headless; - stdenv = - if stdenv.cc.isClang then llvmPackages.stdenv - else if stdenv.cc.isGNU then gcc10Stdenv - else stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else gcc10StdenvCompat; bazel_self = bazel_4; }; @@ -16848,7 +16847,7 @@ with pkgs; classads = callPackage ../development/libraries/classads { }; clfft = callPackage ../development/libraries/clfft { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; clipp = callPackage ../development/libraries/clipp { }; @@ -25890,7 +25889,7 @@ with pkgs; droopy = python3Packages.callPackage ../applications/networking/droopy { }; drumgizmo = callPackage ../applications/audio/drumgizmo { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; dsf2flac = callPackage ../applications/audio/dsf2flac { }; @@ -31613,16 +31612,16 @@ with pkgs; cuyo = callPackage ../games/cuyo { }; deliantra-server = callPackage ../games/deliantra/server.nix { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; deliantra-arch = callPackage ../games/deliantra/arch.nix { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; deliantra-maps = callPackage ../games/deliantra/maps.nix { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; deliantra-data = callPackage ../games/deliantra/data.nix { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; ddnet = callPackage ../games/ddnet { }; @@ -32739,23 +32738,23 @@ with pkgs; }; bpp-core = callPackage ../development/libraries/science/biology/bpp-core { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; bpp-phyl = callPackage ../development/libraries/science/biology/bpp-phyl { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; bpp-popgen = callPackage ../development/libraries/science/biology/bpp-popgen { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; bpp-seq = callPackage ../development/libraries/science/biology/bpp-seq { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; bppsuite = callPackage ../applications/science/biology/bppsuite { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; cd-hit = callPackage ../applications/science/biology/cd-hit { @@ -33232,7 +33231,7 @@ with pkgs; alt-ergo = callPackage ../applications/science/logic/alt-ergo {}; aspino = callPackage ../applications/science/logic/aspino { - stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + stdenv = gcc10StdenvCompat; }; beluga = callPackage ../applications/science/logic/beluga {}; From 485734c2c5af88174ca78b5fa5773195f8484040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Reynier?= Date: Mon, 9 May 2022 10:11:11 +0200 Subject: [PATCH 051/122] gh-cal: init at 0.1.3 --- pkgs/tools/misc/gh-cal/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/gh-cal/default.nix diff --git a/pkgs/tools/misc/gh-cal/default.nix b/pkgs/tools/misc/gh-cal/default.nix new file mode 100644 index 000000000000..f4f4a66a4969 --- /dev/null +++ b/pkgs/tools/misc/gh-cal/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchCrate +, rustPlatform +, pkgconfig +, openssl +, Security +}: +rustPlatform.buildRustPackage rec { + pname = "gh-cal"; + version = "0.1.3"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-x9DekflZoXxH964isWCi6YuV3v/iIyYOuRYVgKaUBx0="; + }; + + cargoSha256 = "sha256-73gqk0DjhaLGIEP5VQQlubPomxHQyg4RnY5XTgE7msQ="; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + description = "GitHub contributions calender terminal viewer"; + homepage = "https://github.com/mrshmllow/gh-cal"; + license = licenses.mit; + maintainers = with maintainers; [ loicreynier ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c22e4143d22..a4ee5aeb2190 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1145,6 +1145,10 @@ with pkgs; gfshare = callPackage ../tools/security/gfshare { }; + gh-cal = callPackage ../tools/misc/gh-cal { + inherit (darwin.apple_sdk.frameworks) Security; + }; + glooctl = callPackage ../applications/networking/cluster/glooctl { }; gobgp = callPackage ../tools/networking/gobgp { }; From 5ae182a06f4bcc2687eb95df6296e2366d8b78bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 May 2022 12:52:16 +0000 Subject: [PATCH 052/122] python310Packages.brother: 1.2.1 -> 1.2.2 --- pkgs/development/python-modules/brother/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index 45889d3f1594..8cfe7624676e 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "brother"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9SC4q2iZN0/fEYS4Ii7Ndcx5UpLryGCe9ytIVDdjg0M="; + hash = "sha256-pxFp/CSoskAx6DdZlkBRvocUJ5Kt5ymPwxpLhT743uE="; }; propagatedBuildInputs = [ From f2be2aa1d5813720c568509a85e4d04eb533c8fc Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 23 May 2022 22:05:46 +0200 Subject: [PATCH 053/122] ocamlPackages.bwd: init at 2.0.0 --- .../development/ocaml-modules/bwd/default.nix | 25 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/ocaml-modules/bwd/default.nix diff --git a/pkgs/development/ocaml-modules/bwd/default.nix b/pkgs/development/ocaml-modules/bwd/default.nix new file mode 100644 index 000000000000..aa762502a598 --- /dev/null +++ b/pkgs/development/ocaml-modules/bwd/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, buildDunePackage, qcheck-core }: + +buildDunePackage rec { + pname = "bwd"; + version = "2.0.0"; + + minimalOCamlVersion = "4.12"; + + src = fetchFromGitHub { + owner = "RedPRL"; + repo = "ocaml-bwd"; + rev = version; + sha256 = "sha256:0zgi8an53z6wr6nzz0zlmhx19zhqy1w2vfy1sq3sikjwh74jjq60"; + }; + + doCheck = true; + checkInputs = [ qcheck-core ]; + + meta = { + description = "Backward Lists"; + inherit (src.meta) homepage; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index cc8fc806324a..e61eedf151ec 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -93,6 +93,8 @@ let brisk-reconciler = callPackage ../development/ocaml-modules/brisk-reconciler { }; + bwd = callPackage ../development/ocaml-modules/bwd { }; + bz2 = callPackage ../development/ocaml-modules/bz2 { }; ca-certs = callPackage ../development/ocaml-modules/ca-certs { }; From a1e9a866e1cfa5ae02fdf52b2799c185ce24b0f8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 23 May 2022 22:05:50 +0200 Subject: [PATCH 054/122] ocamlPackages.yuujinchou: init at 2.0.0 --- .../ocaml-modules/yuujinchou/default.nix | 26 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/ocaml-modules/yuujinchou/default.nix diff --git a/pkgs/development/ocaml-modules/yuujinchou/default.nix b/pkgs/development/ocaml-modules/yuujinchou/default.nix new file mode 100644 index 000000000000..5a78809d9099 --- /dev/null +++ b/pkgs/development/ocaml-modules/yuujinchou/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, buildDunePackage, qcheck-alcotest }: + +buildDunePackage rec { + pname = "yuujinchou"; + version = "2.0.0"; + + minimalOCamlVersion = "4.12"; + + src = fetchFromGitHub { + owner = "RedPRL"; + repo = pname; + rev = version; + sha256 = "sha256:1nhz44cyipy922anzml856532m73nn0g7iwkg79yzhq6yb87109w"; + }; + + doCheck = true; + checkInputs = [ qcheck-alcotest ]; + + meta = { + description = "Name pattern combinators"; + inherit (src.meta) homepage; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.vbgl ]; + }; +} + diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e61eedf151ec..546c37149f70 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1457,6 +1457,8 @@ let yuscii = callPackage ../development/ocaml-modules/yuscii { }; + yuujinchou = callPackage ../development/ocaml-modules/yuujinchou { }; + z3 = callPackage ../development/ocaml-modules/z3 { inherit (pkgs) z3; }; From ff74ad6db307c1045c98eb5b183e9348c68cd42a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 23 May 2022 22:05:53 +0200 Subject: [PATCH 055/122] =?UTF-8?q?ocamlPackages.cooltt:=20unstable-2021-0?= =?UTF-8?q?5-25=20=E2=86=92=20unstable-2022-04-28?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/cooltt/default.nix | 67 ++++++++++++++++--- 1 file changed, 59 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/cooltt/default.nix b/pkgs/development/ocaml-modules/cooltt/default.nix index 2ece4543c2a7..2dca1a05a214 100644 --- a/pkgs/development/ocaml-modules/cooltt/default.nix +++ b/pkgs/development/ocaml-modules/cooltt/default.nix @@ -1,41 +1,92 @@ { lib , fetchFromGitHub +, fetchurl , buildDunePackage -, cmdliner +, bwd +, cmdliner_1_1 +, containers +, ezjsonm , menhir , menhirLib , ppx_deriving , ppxlib , uuseg , uutf +, yuujinchou }: +let + bantorra = buildDunePackage rec { + pname = "bantorra"; + version = "unstable-2022-04-20"; + src = fetchFromGitHub { + owner = "RedPRL"; + repo = "bantorra"; + rev = "1e78633d9a2ef7104552a24585bb8bea36d4117b"; + sha256 = "sha256:15v1cggm7awp11iwl3lzpaar91jzivhdxggp5mr48gd28kfipzk2"; + }; + + propagatedBuildInputs = [ ezjsonm ]; + + meta = { + description = "Extensible Library Management and Path Resolution"; + homepage = "https://github.com/RedPRL/bantorra"; + license = lib.licenses.asl20; + }; + }; + kado = buildDunePackage rec { + pname = "kado"; + version = "unstable-2022-04-30"; + src = fetchFromGitHub { + owner = "RedPRL"; + repo = "kado"; + rev = "8dce50e7d759d482b82565090e550d3860d64729"; + sha256 = "sha256:1xb754fha4s0bgjfqjxzqljvalmkfdwdn5y4ycsp51wiah235bsy"; + }; + + propagatedBuildInputs = [ bwd ]; + + doCheck = true; + + meta = { + description = "Cofibrations in Cartecian Cubical Type Theory"; + homepage = "https://github.com/RedPRL/kado"; + license = lib.licenses.asl20; + }; + }; +in + buildDunePackage { pname = "cooltt"; - version = "unstable-2021-05-25"; + version = "unstable-2022-04-28"; - minimumOCamlVersion = "4.10"; - - useDune2 = true; + minimalOCamlVersion = "4.13"; src = fetchFromGitHub { owner = "RedPRL"; repo = "cooltt"; - rev = "8ac06cbf7e05417d777f3ac6a471fe3576249f79"; - sha256 = "sha256-JBLNJaRuP/gwlg8RS3cpOpzxChOVKfmFulf5HKhhHh4="; + rev = "88511e10cb9e17286f585882dee334f3d8ace47c"; + sha256 = "sha256:1n9bh86r2n9s3mm7ayfzwjbnjqcphpsf8yqnf4whd3yi930sqisw"; }; nativeBuildInputs = [ - cmdliner + cmdliner_1_1 menhir ppxlib ]; + buildInputs = [ containers ]; + propagatedBuildInputs = [ + bantorra + bwd + ezjsonm + kado menhirLib ppx_deriving uuseg uutf + yuujinchou ]; meta = with lib; { From c6af26acfc7e15420c288dcc488a79afc816036d Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:18:37 +0400 Subject: [PATCH 056/122] clingcon: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb8874ba14ed..f447de4786d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3006,7 +3006,7 @@ with pkgs; clingo = callPackage ../applications/science/logic/potassco/clingo.nix { }; - clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { }; + clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { stdenv = gcc10StdenvCompat; }; clprover = callPackage ../applications/science/logic/clprover/clprover.nix { }; From e46b811478874c17d6041ce70b1e7d00c5970ab4 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:19:35 +0400 Subject: [PATCH 057/122] cxxtools: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f447de4786d2..cde83239ffa4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16953,7 +16953,7 @@ with pkgs; cutelyst = libsForQt5.callPackage ../development/libraries/cutelyst { }; - cxxtools = callPackage ../development/libraries/cxxtools { }; + cxxtools = callPackage ../development/libraries/cxxtools { stdenv = gcc10StdenvCompat; }; cwiid = callPackage ../development/libraries/cwiid { }; From 30d46169971537ff99134bb758abc3d7156fc845 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:20:31 +0400 Subject: [PATCH 058/122] diopser: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cde83239ffa4..29c7e967eb2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2142,7 +2142,7 @@ with pkgs; dfmt = callPackage ../tools/text/dfmt { }; - diopser = callPackage ../applications/audio/diopser { }; + diopser = callPackage ../applications/audio/diopser { stdenv = gcc10StdenvCompat; }; diskonaut = callPackage ../tools/misc/diskonaut { }; From a484f4f331e658b55776ad8577048c19be7427d5 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:21:27 +0400 Subject: [PATCH 059/122] djv: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29c7e967eb2a..ba02feac2b75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3335,7 +3335,7 @@ with pkgs; gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; }; - djv = callPackage ../applications/graphics/djv { }; + djv = callPackage ../applications/graphics/djv { stdenv = gcc10StdenvCompat; }; dnschef = python3Packages.callPackage ../tools/networking/dnschef { }; From f111882b8d155a2d40be82dd052044f940667c4f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 May 2022 13:22:22 +0000 Subject: [PATCH 060/122] python310Packages.celery: 5.2.6 -> 5.2.7 --- pkgs/development/python-modules/celery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 4c7e2d8d62f5..dd08fda6b1cc 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "celery"; - version = "5.2.6"; + version = "5.2.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0TmMrfMPV2Jms0Nw4o6IAwbsVfektjB1SbCunBVmNIE="; + hash = "sha256-+vvYKTTTD4oAT4Ho96Bi4xQToj1ES+juMyZVORWVjG0="; }; propagatedBuildInputs = [ From 9882ffead490cfe93a6a41f22ebc01850b384073 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:22:23 +0400 Subject: [PATCH 061/122] dl-poly-classic-mpi: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba02feac2b75..7e36e22c85ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33135,7 +33135,7 @@ with pkgs; ### SCIENCE/MOLECULAR-DYNAMICS - dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { }; + dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { stdenv = gcc10StdenvCompat; }; lammps = callPackage ../applications/science/molecular-dynamics/lammps { fftw = fftw; From fd26c9493b7b5312ed2db0925d3750e3ec72b7ed Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:23:19 +0400 Subject: [PATCH 062/122] dxx-rebirth: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e36e22c85ef..51b1c68810f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31644,9 +31644,8 @@ with pkgs; dwarf-therapist = dwarf-fortress-packages.dwarf-therapist; - dxx-rebirth = callPackage ../games/dxx-rebirth { - physfs = physfs_2; - }; + dxx-rebirth = callPackage ../games/dxx-rebirth + { stdenv = gcc10StdenvCompat; physfs = physfs_2; }; inherit (callPackages ../games/dxx-rebirth/assets.nix { }) descent1-assets From 5b12d3a80728c018fa4d1fa5b858be8979e244b4 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:24:15 +0400 Subject: [PATCH 063/122] ericw-tools: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51b1c68810f5..57eb77c84584 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5619,7 +5619,7 @@ with pkgs; endlessh-go = callPackage ../servers/endlessh-go { }; - ericw-tools = callPackage ../applications/misc/ericw-tools { }; + ericw-tools = callPackage ../applications/misc/ericw-tools { stdenv = gcc10StdenvCompat; }; cryfs = callPackage ../tools/filesystems/cryfs { }; From 5e081aeaa14f7fabc85f3adad8c941695a7b2770 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:25:11 +0400 Subject: [PATCH 064/122] fluxus: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57eb77c84584..810e361d74a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26211,7 +26211,7 @@ with pkgs; flrig = callPackage ../applications/radio/flrig { }; - fluxus = callPackage ../applications/graphics/fluxus { }; + fluxus = callPackage ../applications/graphics/fluxus { stdenv = gcc10StdenvCompat; }; flwrap = callPackage ../applications/radio/flwrap { }; From 77aab56ca46e69328d0c261398ade4f344fb5af4 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:26:07 +0400 Subject: [PATCH 065/122] flwrap: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 810e361d74a0..2ab81b3482bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26213,7 +26213,7 @@ with pkgs; fluxus = callPackage ../applications/graphics/fluxus { stdenv = gcc10StdenvCompat; }; - flwrap = callPackage ../applications/radio/flwrap { }; + flwrap = callPackage ../applications/radio/flwrap { stdenv = gcc10StdenvCompat; }; fluidsynth = callPackage ../applications/audio/fluidsynth { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices; From 5d8e2a71f170fc73c834c05d188dfaae59e284e9 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:27:03 +0400 Subject: [PATCH 066/122] gammy: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ab81b3482bb..10a0c1e6cb65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2242,7 +2242,7 @@ with pkgs; gamecube-tools = callPackage ../development/tools/gamecube-tools { }; - gammy = qt5.callPackage ../tools/misc/gammy { }; + gammy = qt5.callPackage ../tools/misc/gammy { stdenv = gcc10StdenvCompat; }; gams = callPackage ../tools/misc/gams (config.gams or {}); From feb6162f839c511d633f8f7363d4a7dc61026888 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:27:58 +0400 Subject: [PATCH 067/122] gebaar-libinput: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10a0c1e6cb65..7fc907fad394 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4736,7 +4736,7 @@ with pkgs; evscript = callPackage ../tools/inputmethods/evscript { }; - gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { }; + gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { stdenv = gcc10StdenvCompat; }; kime = callPackage ../tools/inputmethods/kime { }; From 9f22d631ebe66f4c5daf0b48c1966211309117ff Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:28:53 +0400 Subject: [PATCH 068/122] getdp: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fc907fad394..82975b1fc015 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32980,7 +32980,7 @@ with pkgs; flintqs = callPackage ../development/libraries/science/math/flintqs { }; - getdp = callPackage ../applications/science/math/getdp { }; + getdp = callPackage ../applications/science/math/getdp { stdenv = gcc10StdenvCompat; }; gurobi = callPackage ../applications/science/math/gurobi { }; From 0e05668dc3bcae625e9b781cb519923bcd25175b Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:29:48 +0400 Subject: [PATCH 069/122] gosmore: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82975b1fc015..c78de6f140b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26905,7 +26905,7 @@ with pkgs; inherit (gnome2) GConf; }; - gosmore = callPackage ../applications/misc/gosmore { }; + gosmore = callPackage ../applications/misc/gosmore { stdenv = gcc10StdenvCompat; }; gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { inherit (darwin) IOKit; From 8dc4d7347789bf10e80ff200f898953b15554c50 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:30:48 +0400 Subject: [PATCH 070/122] gsmlib: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c78de6f140b0..2c77b84a0db8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6732,9 +6732,8 @@ with pkgs; gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { }; - gsmlib = callPackage ../development/libraries/gsmlib { - autoreconfHook = buildPackages.autoreconfHook269; - }; + gsmlib = callPackage ../development/libraries/gsmlib + { stdenv = gcc10StdenvCompat; autoreconfHook = buildPackages.autoreconfHook269; }; gssdp = callPackage ../development/libraries/gssdp { }; From 591dc2fdd20604c260d4a83fdf46d238ff7c0e63 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:32:42 +0400 Subject: [PATCH 071/122] hobbes: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c77b84a0db8..6cd79f42e094 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -389,7 +389,7 @@ with pkgs; gpick = callPackage ../tools/misc/gpick { }; - hobbes = callPackage ../development/tools/hobbes { }; + hobbes = callPackage ../development/tools/hobbes { stdenv = gcc10StdenvCompat; }; html5validator = python3Packages.callPackage ../applications/misc/html5validator { }; From 0590c39ffac4a76facd3c177c16c62677017e6f7 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:33:38 +0400 Subject: [PATCH 072/122] idsk: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cd79f42e094..d9b4c6163bb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34070,7 +34070,7 @@ with pkgs; utsushi-networkscan = callPackage ../misc/drivers/utsushi/networkscan.nix { }; - idsk = callPackage ../tools/filesystems/idsk { }; + idsk = callPackage ../tools/filesystems/idsk { stdenv = gcc10StdenvCompat; }; colima = callPackage ../applications/virtualization/colima { }; From daa692e42c78791505b2cb9f04df2721be490021 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:34:34 +0400 Subject: [PATCH 073/122] iqueue: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9b4c6163bb3..ed652e4624ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1628,7 +1628,7 @@ with pkgs; writefreely = callPackage ../applications/misc/writefreely { }; - iqueue = callPackage ../development/libraries/iqueue { }; + iqueue = callPackage ../development/libraries/iqueue { stdenv = gcc10StdenvCompat; }; lifecycled = callPackage ../tools/misc/lifecycled { }; From fcb1fbf5fcfb9112f0d97e0522c7d7575c98a7d2 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:35:29 +0400 Subject: [PATCH 074/122] isrcsubmit: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed652e4624ee..13b9c4d15399 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7222,7 +7222,7 @@ with pkgs; boost = boost16x; }; - isrcsubmit = callPackage ../tools/audio/isrcsubmit { }; + isrcsubmit = callPackage ../tools/audio/isrcsubmit { stdenv = gcc10StdenvCompat; }; isync = callPackage ../tools/networking/isync { inherit (darwin.apple_sdk.frameworks) Security; From 872f42247b166b06bc163ab113fff475cf48e44a Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:36:24 +0400 Subject: [PATCH 075/122] jigdo: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13b9c4d15399..de3e543a8d8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27482,7 +27482,7 @@ with pkgs; jgmenu = callPackage ../applications/misc/jgmenu { }; - jigdo = callPackage ../applications/misc/jigdo { }; + jigdo = callPackage ../applications/misc/jigdo { stdenv = gcc10StdenvCompat; }; jitsi = callPackage ../applications/networking/instant-messengers/jitsi { }; From 14a2dec50d54bcd6db2c346098e5e2d7d94d5912 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 17:37:27 +0400 Subject: [PATCH 076/122] libdynd: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de3e543a8d8a..a5223a3a6601 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21270,7 +21270,7 @@ with pkgs; zlib-ng = callPackage ../development/libraries/zlib-ng { }; - libdynd = callPackage ../development/libraries/libdynd { }; + libdynd = callPackage ../development/libraries/libdynd { stdenv = gcc10StdenvCompat; }; zlog = callPackage ../development/libraries/zlog { }; From ffaa0a94e989ddd279d50953adcb79e31e7b98ff Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 29 May 2022 21:45:50 +0800 Subject: [PATCH 077/122] v2ray-domain-list-community: 20220324104603 -> 20220528180904 --- pkgs/data/misc/v2ray-domain-list-community/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index d6fe1a100e7f..5e84f479d21b 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,14 +3,14 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20220324104603"; + version = "20220528180904"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-Bd/jwHZ+6cg/cgVggyFI+Nc0FZ9qxI5Rk+y7SmGB08M="; + sha256 = "sha256-j1Q7B/U0OADOcgJRJ269Jx9Z5dmmT4T2eaOHeGmUjmc="; }; - vendorSha256 = "sha256-QUbnUnxG1tsNbR49HTl55aiLkBM/ae9mCtzWeN4Ju78="; + vendorSha256 = "sha256-Igx8yGWWVmVEogvbrosaK13LVs+ZZuYLBNji7iSfzdo="; meta = with lib; { description = "community managed domain list"; homepage = "https://github.com/v2fly/domain-list-community"; From 565851ab191548c160f23f2af7a902a938770f6d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 29 May 2022 21:51:06 +0800 Subject: [PATCH 078/122] v2ray-geoip: 202203310042 -> 202205260055 --- pkgs/data/misc/v2ray-geoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 49f8fc746d67..a6954100d547 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202203310042"; + version = "202205260055"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "eb0fc69f57bdceef077e38d4f4f57c114411bd76"; - sha256 = "sha256-CSABX+329/WgaXy144JgYsr3OesI69vCfew5qxz5jMY="; + rev = "96f4639373709f7560ccaf374d1ff008781aa324"; + sha256 = "sha256-aFTLeYr+JishhJ2AhGMrD02fKxci2rREkh8HN9HtXLs="; }; installPhase = '' From e374625845656b36e7601c7fbf7eeee9c019696f Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:10:58 +0400 Subject: [PATCH 079/122] loki: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5223a3a6601..0e3aae97d0c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8127,7 +8127,7 @@ with pkgs; lokalise2-cli = callPackage ../tools/misc/lokalise2-cli { }; - loki = callPackage ../development/libraries/loki { }; + loki = callPackage ../development/libraries/loki { stdenv = gcc10StdenvCompat; }; longview = callPackage ../servers/monitoring/longview { }; From b31af490cdc25a70c431810c659c2c00b8dc364c Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:11:48 +0400 Subject: [PATCH 080/122] mars: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e3aae97d0c6..75bd44447af1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31910,7 +31910,7 @@ with pkgs; manaplus = callPackage ../games/manaplus { }; - mars = callPackage ../games/mars { }; + mars = callPackage ../games/mars { stdenv = gcc10StdenvCompat; }; megaglest = callPackage ../games/megaglest { }; From 43494af5eb40c7cde1e9aa99c0a74de05df0dcf0 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:12:39 +0400 Subject: [PATCH 081/122] miniaudicle: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75bd44447af1..3978d2040cd8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28096,7 +28096,7 @@ with pkgs; mikmod = callPackage ../applications/audio/mikmod { }; - miniaudicle = callPackage ../applications/audio/miniaudicle { }; + miniaudicle = callPackage ../applications/audio/miniaudicle { stdenv = gcc10StdenvCompat; }; minicom = callPackage ../tools/misc/minicom { }; From 7976cdf59e6ab91cbab01c8c560847ff19e3772d Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:13:30 +0400 Subject: [PATCH 082/122] mitscheme: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3978d2040cd8..3b39514ecfce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13503,9 +13503,8 @@ with pkgs; mint = callPackage ../development/compilers/mint { }; - mitscheme = callPackage ../development/compilers/mit-scheme { - texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; }; - }; + mitscheme = callPackage ../development/compilers/mit-scheme + { stdenv = gcc10StdenvCompat; texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; }; }; mitschemeX11 = mitscheme.override { enableX11 = true; From 33851c466f24548a12d90759fcbc3ab7138c4eb6 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:14:20 +0400 Subject: [PATCH 083/122] mkcue: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b39514ecfce..3c0ed8dbcdac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8365,7 +8365,7 @@ with pkgs; mkclean = callPackage ../applications/video/mkclean {}; - mkcue = callPackage ../tools/cd-dvd/mkcue { }; + mkcue = callPackage ../tools/cd-dvd/mkcue { stdenv = gcc10StdenvCompat; }; mkp224o = callPackage ../tools/security/mkp224o { }; From c27f7b1b0088a7cfee9e3287bc3abcf6ebc04672 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:15:14 +0400 Subject: [PATCH 084/122] mps: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c0ed8dbcdac..f4923c1b8f9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19654,7 +19654,7 @@ with pkgs; mosquitto = callPackage ../servers/mqtt/mosquitto { }; - mps = callPackage ../development/libraries/mps { }; + mps = callPackage ../development/libraries/mps { stdenv = gcc10StdenvCompat; }; libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; From 41e537a5851b4c9d707118172cb88b0ce1d095e1 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:16:06 +0400 Subject: [PATCH 085/122] mrustc-bootstrap: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4923c1b8f9e..be12c506776a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13695,7 +13695,7 @@ with pkgs; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; - mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { }; + mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { stdenv = gcc10StdenvCompat; }; rustPackages_1_60 = rust_1_60.packages.stable; rustPackages = rustPackages_1_60; From 3eac0002ecaf7ff6964aae36e1148c084199f3c6 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:17:05 +0400 Subject: [PATCH 086/122] nano-wallet: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be12c506776a..bae713b9c288 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31241,9 +31241,8 @@ with pkgs; napari = with python3Packages; toPythonApplication napari; - nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { - boost = boost172; - }; + nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet + { stdenv = gcc10StdenvCompat; boost = boost172; }; namecoin = callPackage ../applications/blockchains/namecoin { withGui = true; }; namecoind = callPackage ../applications/blockchains/namecoin { withGui = false; }; From 15b44bab797525e200b4fbfc480e25dcb64636b5 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:18:00 +0400 Subject: [PATCH 087/122] non: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bae713b9c288..ce1464986792 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19776,7 +19776,7 @@ with pkgs; nntp-proxy = callPackage ../applications/networking/nntp-proxy { }; - non = callPackage ../applications/audio/non { }; + non = callPackage ../applications/audio/non { stdenv = gcc10StdenvCompat; }; ntl = callPackage ../development/libraries/ntl { }; From 2be028e9433ebad3fd74ee2a19e13c02e7f870cb Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:18:52 +0400 Subject: [PATCH 088/122] obliv-c: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce1464986792..1bb7d7437a56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13581,9 +13581,8 @@ with pkgs; nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { }; - obliv-c = callPackage ../development/compilers/obliv-c { - ocamlPackages = ocaml-ng.ocamlPackages_4_05; - }; + obliv-c = callPackage ../development/compilers/obliv-c + { stdenv = gcc10StdenvCompat; ocamlPackages = ocaml-ng.ocamlPackages_4_05; }; ocaml-ng = callPackage ./ocaml-packages.nix { }; ocaml = ocamlPackages.ocaml; From 4330af7dd81e73cd9cbcf4578f979df4e336f87e Mon Sep 17 00:00:00 2001 From: AtilaSaraiva Date: Sun, 29 May 2022 11:19:12 -0300 Subject: [PATCH 089/122] distrobox: 1.2.15 -> 1.3.0 --- pkgs/applications/virtualization/distrobox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix index e29de7a52fdd..d8b106c75764 100644 --- a/pkgs/applications/virtualization/distrobox/default.nix +++ b/pkgs/applications/virtualization/distrobox/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "distrobox"; - version = "1.2.15"; + version = "1.3.0"; src = fetchFromGitHub { owner = "89luca89"; repo = pname; rev = version; - sha256 = "sha256-9rivXnHyEE1MoGY+CwUeDStLGPVq+4FvwPjV7Nblk60="; + sha256 = "sha256-31SDi9B6Ug6lRDMgaMp6lwdSsmQ7ywEwjG1Ez/jXjBc="; }; dontConfigure = true; From 5ec76e1cd6d8b447b845e21025053e2e329c0612 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:19:42 +0400 Subject: [PATCH 090/122] olive-editor: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bb7d7437a56..d0eb5dbceec7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8919,9 +8919,8 @@ with pkgs; ola = callPackage ../applications/misc/ola { }; - olive-editor = libsForQt514.callPackage ../applications/video/olive-editor { - inherit (darwin.apple_sdk.frameworks) CoreFoundation; - }; + olive-editor = libsForQt514.callPackage ../applications/video/olive-editor + { stdenv = gcc10StdenvCompat; inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; ombi = callPackage ../servers/ombi { }; From e86878e1b1b502e6ae73d91c615f5b87921edfa9 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:20:37 +0400 Subject: [PATCH 091/122] openclonk: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0eb5dbceec7..913dee5cef65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32005,7 +32005,7 @@ with pkgs; openlierox = callPackage ../games/openlierox { }; - openclonk = callPackage ../games/openclonk { }; + openclonk = callPackage ../games/openclonk { stdenv = gcc10StdenvCompat; }; openjk = callPackage ../games/openjk { }; From 28bcbe1ac8341fec2f52e2d8e85b293af213bc33 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:21:27 +0400 Subject: [PATCH 092/122] opendbx: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 913dee5cef65..ea4192b7b22a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8952,7 +8952,7 @@ with pkgs; opencryptoki = callPackage ../tools/security/opencryptoki { }; - opendbx = callPackage ../development/libraries/opendbx { }; + opendbx = callPackage ../development/libraries/opendbx { stdenv = gcc10StdenvCompat; }; opendht = callPackage ../development/libraries/opendht { inherit (darwin.apple_sdk.frameworks) Security; From edd13b5528f280e8d49f1d6acc1b764a18f32d7d Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:22:17 +0400 Subject: [PATCH 093/122] openvino: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea4192b7b22a..6ad1acde9692 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35172,9 +35172,8 @@ with pkgs; openring = callPackage ../applications/misc/openring { }; - openvino = callPackage ../development/libraries/openvino { - python = python3; - }; + openvino = callPackage ../development/libraries/openvino + { stdenv = gcc10StdenvCompat; python = python3; }; phonetisaurus = callPackage ../development/libraries/phonetisaurus { # https://github.com/AdolfVonKleist/Phonetisaurus/issues/70 From 32e76212c5d3b08fafbd85cc4c1621f3e5997d90 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:23:07 +0400 Subject: [PATCH 094/122] oxen: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ad1acde9692..7f4e4706c82a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31231,9 +31231,8 @@ with pkgs; boost = boost17x; }; - oxen = callPackage ../applications/blockchains/oxen { - boost = boost17x; - }; + oxen = callPackage ../applications/blockchains/oxen + { stdenv = gcc10StdenvCompat; boost = boost17x; }; masari = callPackage ../applications/blockchains/masari { boost = boost165; }; From cbdb85b7431e42bd6cbbf7ade24595f586cb1354 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:23:59 +0400 Subject: [PATCH 095/122] percona-server56: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f4e4706c82a..2f828e793b62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22261,7 +22261,7 @@ with pkgs; nginx-sso = callPackage ../servers/nginx-sso { }; - percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { }; + percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { stdenv = gcc10StdenvCompat; }; percona-server = percona-server56; riak = callPackage ../servers/nosql/riak/2.2.0.nix { From 5785f8321c360e2b287476a033950f3e758cfdc0 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:24:50 +0400 Subject: [PATCH 096/122] percona-xtrabackup_2_4: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f828e793b62..3337d3ee3b06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9218,9 +9218,8 @@ with pkgs; perceptualdiff = callPackage ../tools/graphics/perceptualdiff { }; percona-xtrabackup = percona-xtrabackup_8_0; - percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix { - boost = boost159; - }; + percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix + { stdenv = gcc10StdenvCompat; boost = boost159; }; percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix { boost = boost170; }; From 0655723b231e348eebd5f276daf0c9f787de419e Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:25:39 +0400 Subject: [PATCH 097/122] percona-xtrabackup_8_0: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3337d3ee3b06..a743dadc2bdb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9220,9 +9220,8 @@ with pkgs; percona-xtrabackup = percona-xtrabackup_8_0; percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix { stdenv = gcc10StdenvCompat; boost = boost159; }; - percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix { - boost = boost170; - }; + percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix + { stdenv = gcc10StdenvCompat; boost = boost170; }; pick = callPackage ../tools/misc/pick { }; From 533171bfff38d4d3bf6b5cbb1808441d6802f4ea Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:26:32 +0400 Subject: [PATCH 098/122] pianobooster: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a743dadc2bdb..b082b4117c58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28937,7 +28937,7 @@ with pkgs; pianobar = callPackage ../applications/audio/pianobar { }; - pianobooster = qt5.callPackage ../applications/audio/pianobooster { }; + pianobooster = qt5.callPackage ../applications/audio/pianobooster { stdenv = gcc10StdenvCompat; }; pianoteq = callPackage ../applications/audio/pianoteq { }; From 8297eeacdacbfe51a757b758da2d2e86cac52380 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:27:23 +0400 Subject: [PATCH 099/122] pktgen: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b082b4117c58..c9004a45a700 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23627,7 +23627,7 @@ with pkgs; pipework = callPackage ../os-specific/linux/pipework { }; - pktgen = callPackage ../os-specific/linux/pktgen { }; + pktgen = callPackage ../os-specific/linux/pktgen { stdenv = gcc10StdenvCompat; }; plymouth = callPackage ../os-specific/linux/plymouth { }; From 57404f470a1e26a941560fb5cee60c46e804a3f3 Mon Sep 17 00:00:00 2001 From: emmabastas Date: Thu, 26 May 2022 23:48:24 +0200 Subject: [PATCH 100/122] maintainers: add emmabastas --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6647f94f8f83..63ee5f88582d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3759,6 +3759,13 @@ githubId = 11006031; name = "Leo Maroni"; }; + emmabastas = { + email = "emma.bastas@protonmail.com"; + matrix = "@emmabastas:matrix.org"; + github = "emmabastas"; + githubId = 22533224; + name = "Emma Bastås"; + }; emmanuelrosa = { email = "emmanuelrosa@protonmail.com"; matrix = "@emmanuelrosa:matrix.org"; From 74e4125f1805c9c420160e56ce20de3ffa41d085 Mon Sep 17 00:00:00 2001 From: emmabastas Date: Fri, 27 May 2022 00:02:41 +0200 Subject: [PATCH 101/122] spectre-cli: init at unstable-2021-02-05 Co-authored-by: FliegendeWurst <2012gdwu+github@posteo.de> Co-authored-by: SuperSandro2000 --- pkgs/tools/security/spectre-cli/default.nix | 73 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 75 insertions(+) create mode 100644 pkgs/tools/security/spectre-cli/default.nix diff --git a/pkgs/tools/security/spectre-cli/default.nix b/pkgs/tools/security/spectre-cli/default.nix new file mode 100644 index 000000000000..f06365de90b5 --- /dev/null +++ b/pkgs/tools/security/spectre-cli/default.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, fetchFromGitLab +, cmake +, libsodium +, json_c +, ncurses +, libxml2 +, jq +}: + +stdenv.mkDerivation rec { + pname = "spectre-cli"; + version = "unstable-2022-02-05"; + + src = fetchFromGitLab { + owner = "spectre.app"; + repo = "cli"; + rev = "a5e7aab28f44b90e5bd1204126339a81f64942d2"; + sha256 = "1hp4l1rhg7bzgx0hcai08rvcy6l9645sfngy2cr96l1bpypcld5i"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + libxml2 + jq + ]; + + buildInputs = [ + libsodium + json_c + ncurses + ]; + + cmakeFlags = [ + "-DBUILD_SPECTRE_TESTS=ON" + ]; + + preConfigure = '' + echo "${version}" > VERSION + + # The default buildPhase wants to create a ´build´ dir so we rename the build script to stop conflicts. + mv build build.sh + ''; + + # Some tests are expected to fail on ARM64 + # See: https://gitlab.com/spectre.app/cli/-/issues/27#note_962950844 + doCheck = !(stdenv.isLinux && stdenv.isAarch64); + + checkPhase = '' + mv ../spectre-cli-tests ../spectre_tests.xml ./ + patchShebangs spectre-cli-tests + export HOME=$(mktemp -d) + + ./spectre-tests + ./spectre-cli-tests + ''; + + installPhase = '' + mkdir -p $out/bin + mv spectre $out/bin + ''; + + meta = with lib; { + description = "A stateless cryptographic identity algorithm"; + homepage = "https://spectre.app"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ emmabastas ]; + mainProgram = "spectre"; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 187b6fedb479..3f130a9ff64a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1179,6 +1179,8 @@ with pkgs; sdlookup = callPackage ../tools/security/sdlookup { }; + spectre-cli = callPackage ../tools/security/spectre-cli { }; + sx-go = callPackage ../tools/security/sx-go { }; systeroid = callPackage ../tools/system/systeroid { }; From 91ef8a2d4e980be9bb4b6d2598b985fadb951655 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:46:16 +0400 Subject: [PATCH 102/122] rss-glx: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9004a45a700..897afa6c5826 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34526,7 +34526,7 @@ with pkgs; stdenv = gccStdenv; }; - rss-glx = callPackage ../misc/screensavers/rss-glx { }; + rss-glx = callPackage ../misc/screensavers/rss-glx { stdenv = gcc10StdenvCompat; }; run-scaled = callPackage ../tools/X11/run-scaled { }; From b9af2b5afded6f97f1c77e988fd759337e6935b0 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:47:07 +0400 Subject: [PATCH 103/122] sonic-lineup: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 897afa6c5826..8ca162b866bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29686,7 +29686,7 @@ with pkgs; socialscan = with python3.pkgs; toPythonApplication socialscan; - sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { }; + sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { stdenv = gcc10StdenvCompat; }; sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { }; From c526e73ea2e2b985a7d6a6f24f59fe1ebfd95223 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:47:58 +0400 Subject: [PATCH 104/122] spring: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ca162b866bd..8c17ae1dcff3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32231,10 +32231,8 @@ with pkgs; # You still can override by passing more arguments. space-orbit = callPackage ../games/space-orbit { }; - spring = callPackage ../games/spring { - asciidoc = asciidoc-full; - boost = boost155; - }; + spring = callPackage ../games/spring + { stdenv = gcc10StdenvCompat; asciidoc = asciidoc-full; boost = boost155; }; springLobby = callPackage ../games/spring/springlobby.nix { }; From 38a3766228d556e4effa03b12a4cefe07ea0eb50 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:48:49 +0400 Subject: [PATCH 105/122] strelka: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c17ae1dcff3..d2c4c1116d76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32901,7 +32901,7 @@ with pkgs; star = callPackage ../applications/science/biology/star { }; - strelka = callPackage ../applications/science/biology/strelka { }; + strelka = callPackage ../applications/science/biology/strelka { stdenv = gcc10StdenvCompat; }; inherit (callPackages ../applications/science/biology/sumatools {}) sumalibs From 70e3e0d8392e72d58418bbe987bc9797b2207bde Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:49:40 +0400 Subject: [PATCH 106/122] stuntrally: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2c4c1116d76..0f13d7c7f08f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32272,12 +32272,8 @@ with pkgs; stt = callPackage ../tools/audio/stt { }; - stuntrally = callPackage ../games/stuntrally { - ogre = ogre1_9; - mygui = mygui.override { - withOgre = true; - }; - }; + stuntrally = callPackage ../games/stuntrally + { stdenv = gcc10StdenvCompat; ogre = ogre1_9; mygui = mygui.override { withOgre = true; }; }; superTux = callPackage ../games/supertux { }; From 8c379ef34fd7e9cf64377f0b0a89ad2fee25dd6a Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:50:31 +0400 Subject: [PATCH 107/122] swfmill: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f13d7c7f08f..214fa3eb780a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16295,7 +16295,7 @@ with pkgs; c3c = callPackage ../development/compilers/c3c { }; - swfmill = callPackage ../tools/video/swfmill { }; + swfmill = callPackage ../tools/video/swfmill { stdenv = gcc10StdenvCompat; }; swftools = callPackage ../tools/video/swftools { stdenv = gccStdenv; From fe9163bac70fced8dd9a8c94789229630e3b684c Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:51:21 +0400 Subject: [PATCH 108/122] swiftshader: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 214fa3eb780a..43142e7ca0cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16280,7 +16280,7 @@ with pkgs; symfony-cli = callPackage ../development/tools/symfony-cli { }; - swiftshader = callPackage ../development/libraries/swiftshader { }; + swiftshader = callPackage ../development/libraries/swiftshader { stdenv = gcc10StdenvCompat; }; systemfd = callPackage ../development/tools/systemfd { }; From 7bd4ef283545b3c7a9c190be3bb797ec1f46ee52 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:52:20 +0400 Subject: [PATCH 109/122] textadept11: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43142e7ca0cc..c55076fbbb9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10843,7 +10843,7 @@ with pkgs; textadept = callPackage ../applications/editors/textadept/10 { }; - textadept11 = callPackage ../applications/editors/textadept/11 { }; + textadept11 = callPackage ../applications/editors/textadept/11 { stdenv = gcc10StdenvCompat; }; texworks = libsForQt5.callPackage ../applications/editors/texworks { }; From bb1a8a87a6f430d26462cdce1bdd72779b217f36 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:53:11 +0400 Subject: [PATCH 110/122] tiscamera: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c55076fbbb9d..0a349b2997e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20881,7 +20881,7 @@ with pkgs; tinyxml-2 = callPackage ../development/libraries/tinyxml-2 { }; - tiscamera = callPackage ../os-specific/linux/tiscamera { }; + tiscamera = callPackage ../os-specific/linux/tiscamera { stdenv = gcc10StdenvCompat; }; tivodecode = callPackage ../applications/video/tivodecode { }; From 17cca50520f19e793ff1a9cb962193c21f4d277b Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:54:03 +0400 Subject: [PATCH 111/122] tracebox: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a349b2997e9..95ca27df027b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11035,7 +11035,7 @@ with pkgs; traceroute = callPackage ../tools/networking/traceroute { }; - tracebox = callPackage ../tools/networking/tracebox { }; + tracebox = callPackage ../tools/networking/tracebox { stdenv = gcc10StdenvCompat; }; tracee = callPackage ../tools/security/tracee { }; From 101927cc4608314b9d1f9af465d9ac0a78b2246e Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:54:53 +0400 Subject: [PATCH 112/122] ucg: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95ca27df027b..0e5f217daa03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6651,7 +6651,7 @@ with pkgs; robodoc = callPackage ../tools/text/robodoc { }; - ucg = callPackage ../tools/text/ucg { }; + ucg = callPackage ../tools/text/ucg { stdenv = gcc10StdenvCompat; }; grive2 = callPackage ../tools/filesystems/grive2 { }; From 4281581f32b5c8133532e5640607571241b57da9 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:55:44 +0400 Subject: [PATCH 113/122] uri: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e5f217daa03..1b423325cf60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16917,7 +16917,7 @@ with pkgs; uci = callPackage ../development/libraries/uci { }; - uri = callPackage ../development/libraries/uri { }; + uri = callPackage ../development/libraries/uri { stdenv = gcc10StdenvCompat; }; cppcms = callPackage ../development/libraries/cppcms { }; From 1affead2e664e4e98ee2fd8eaa4dcf7e516ed6f8 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:56:35 +0400 Subject: [PATCH 114/122] webrtc-audio-processing_1: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b423325cf60..984247b5f58c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21095,7 +21095,7 @@ with pkgs; websocketpp = callPackage ../development/libraries/websocket++ { }; - webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { }; + webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { stdenv = gcc10StdenvCompat; }; webrtc-audio-processing_0_3 = callPackage ../development/libraries/webrtc-audio-processing/0.3.nix { }; # bump when majoring of packages have updated webrtc-audio-processing = webrtc-audio-processing_0_3; From 1461ead834295d5d49e0d29473ee8dfe8fbc29c9 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:57:26 +0400 Subject: [PATCH 115/122] wxcam: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 984247b5f58c..27de08757660 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30641,11 +30641,8 @@ with pkgs; wxGTK = wxGTK31; }; - wxcam = callPackage ../applications/video/wxcam { - inherit (gnome2) libglade; - wxGTK = wxGTK28; - gtk = gtk2; - }; + wxcam = callPackage ../applications/video/wxcam + { stdenv = gcc10StdenvCompat; inherit (gnome2) libglade; wxGTK = wxGTK28; gtk = gtk2; }; xa = callPackage ../development/compilers/xa/xa.nix { }; dxa = callPackage ../development/compilers/xa/dxa.nix { }; From a5739070a074aaca5177ef3392e3f421300dc544 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 18:58:17 +0400 Subject: [PATCH 116/122] xc3sprog: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27de08757660..08839a0f9ddf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16444,7 +16444,7 @@ with pkgs; webdis = callPackage ../development/tools/database/webdis { }; - xc3sprog = callPackage ../development/embedded/xc3sprog { }; + xc3sprog = callPackage ../development/embedded/xc3sprog { stdenv = gcc10StdenvCompat; }; xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { }; From da31172e101780456194a922e6304afb4251f1bb Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 19:03:21 +0400 Subject: [PATCH 117/122] xqilla: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08839a0f9ddf..a5e292d4fd53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22721,7 +22721,7 @@ with pkgs; zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { }; - xqilla = callPackage ../development/tools/xqilla { }; + xqilla = callPackage ../development/tools/xqilla { stdenv = gcc10StdenvCompat; }; xquartz = callPackage ../servers/x11/xquartz { }; From 8a6dbc8b7d4ea08956e651b02a824520fda7aed2 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 29 May 2022 19:04:13 +0400 Subject: [PATCH 118/122] yafaray-core: stdenv -> gcc10Stdenv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5e292d4fd53..ff8b997d58f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11889,7 +11889,7 @@ with pkgs; xwinwrap = callPackage ../tools/X11/xwinwrap {}; - yafaray-core = callPackage ../tools/graphics/yafaray-core { }; + yafaray-core = callPackage ../tools/graphics/yafaray-core { stdenv = gcc10StdenvCompat; }; yajsv = callPackage ../tools/misc/yajsv { }; From 513b7f1010e737dcac47645c8af3d7483ddc29d4 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 29 May 2022 19:25:54 +0300 Subject: [PATCH 119/122] glibc_multi: match output ordering of glibc glibc has an exception in that 'out' is the default output instead of 'bin' it should be matched here for consistency --- pkgs/development/libraries/glibc/common.nix | 1 + pkgs/development/libraries/glibc/multi.nix | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 91c3d55926a3..4b58da1539d5 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -201,6 +201,7 @@ stdenv.mkDerivation ({ installFlags = [ "sysconfdir=$(out)/etc" ]; + # out as the first output is an exception exclusive to glibc outputs = [ "out" "bin" "dev" "static" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/libraries/glibc/multi.nix b/pkgs/development/libraries/glibc/multi.nix index 5d3626b95cc0..be190d77c736 100644 --- a/pkgs/development/libraries/glibc/multi.nix +++ b/pkgs/development/libraries/glibc/multi.nix @@ -6,7 +6,8 @@ let glibc64 = glibc; in runCommand "${nameVersion.name}-multi-${nameVersion.version}" - { outputs = [ "bin" "dev" "out"]; } # TODO: no static version here (yet) + # out as the first output is an exception exclusive to glibc + { outputs = [ "out" "bin" "dev" ]; } # TODO: no static version here (yet) '' mkdir -p "$out/lib" ln -s '${glibc64.out}'/lib/* "$out/lib" From 1563974b3648ffd418c47a772b3d2e6884d28569 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 29 May 2022 18:58:20 +0200 Subject: [PATCH 120/122] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 + .../configuration-hackage2nix/transitive-broken.yaml | 6 +----- pkgs/development/haskell-modules/hackage-packages.nix | 7 ++----- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index c3fbe8733371..2ecf14912009 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4901,6 +4901,7 @@ broken-packages: - stripeapi - stripe-core - stripe-servant + - strongweak - structural-traversal - structures - stt diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 051df85f4b21..a764c828fb23 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -47,7 +47,6 @@ dont-distribute-packages: - Bitly - BlastHTTP - Blobs - - BlogLiterately - BlogLiterately-diagrams - Bookshelf - CBOR @@ -2621,6 +2620,7 @@ dont-distribute-packages: - list-witnesses - listenbrainz-client - liszt + - little-rio_1_0_0 - live-sequencer - llvm - llvm-analysis @@ -3189,7 +3189,6 @@ dont-distribute-packages: - protobuf-native - protocol-buffers-descriptor-fork - proton - - psc-ide - psql - ptera - ptera-core @@ -3202,9 +3201,7 @@ dont-distribute-packages: - pure-cdb - pure-priority-queue-tests - purenix - - purescript - purescript-iso - - purescript-tsd-gen - pursuit-client - push-notify - push-notify-apn @@ -4236,7 +4233,6 @@ dont-distribute-packages: - yuuko - z85 - zasni-gerna - - zephyr - zephyr-copilot - zeromq3-conduit - zeromq3-haskell diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c1faac64ce64..cfccf3c8a4e4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2094,7 +2094,6 @@ self: { executableHaskellDepends = [ base cmdargs ]; description = "A tool for posting Haskelly articles to blogs"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "BlogLiterately-diagrams" = callPackage @@ -222931,7 +222930,6 @@ self: { ]; description = "Language support for the PureScript programming language"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "pseudo-boolean" = callPackage @@ -223868,7 +223866,6 @@ self: { doCheck = false; description = "PureScript Programming Language Compiler"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "purescript-ast" = callPackage @@ -223998,7 +223995,6 @@ self: { ]; description = "TypeScript Declaration File (.d.ts) generator for PureScript"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pursuit-client" = callPackage @@ -263791,6 +263787,8 @@ self: { ]; description = "Convert between strong and weak representations of types"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "strptime" = callPackage @@ -306086,7 +306084,6 @@ self: { testToolDepends = [ purescript ]; description = "Zephyr, tree-shaking for the PureScript language"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "zephyr-copilot" = callPackage From bc6116b23f35120b352659fafe1ece9916b92ecf Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 29 May 2022 12:19:51 -0500 Subject: [PATCH 121/122] firrtl: init at 1.5.3 (#171065) --- pkgs/development/compilers/firrtl/default.nix | 60 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/compilers/firrtl/default.nix diff --git a/pkgs/development/compilers/firrtl/default.nix b/pkgs/development/compilers/firrtl/default.nix new file mode 100644 index 000000000000..5a59060b6f21 --- /dev/null +++ b/pkgs/development/compilers/firrtl/default.nix @@ -0,0 +1,60 @@ +{ lib, stdenv, jre, setJavaClassPath, coursier, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "firrtl"; + version = "1.5.3"; + scalaVersion = "2.13"; # pin, for determinism + + deps = stdenv.mkDerivation { + pname = "${pname}-deps"; + inherit version; + nativeBuildInputs = [ coursier ]; + buildCommand = '' + export COURSIER_CACHE=$(pwd) + cs fetch edu.berkeley.cs:${pname}_${scalaVersion}:${version} > deps + mkdir -p $out/share/java + cp $(< deps) $out/share/java + ''; + outputHashMode = "recursive"; + outputHash = "sha256-xy3zdJZk6Q2HbEn5tRQ9Z0AjyXEteXepoWDaATjiUUw="; + }; + + nativeBuildInputs = [ makeWrapper setJavaClassPath ]; + buildInputs = [ deps ]; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + makeWrapper ${jre}/bin/java $out/bin/${pname} \ + --add-flags "-cp $CLASSPATH firrtl.stage.FirrtlMain" + + runHook postInstall + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/firrtl --firrtl-source "${'' + circuit test: + module test: + input a: UInt<8> + input b: UInt<8> + output o: UInt + o <= add(a, not(b)) + ''}" -o test.v + cat test.v + grep -qFe "module test" -e "endmodule" test.v + ''; + + meta = with lib; { + description = "Flexible Intermediate Representation for RTL"; + longDescription = '' + Firrtl is an intermediate representation (IR) for digital circuits + designed as a platform for writing circuit-level transformations. + ''; + homepage = "https://www.chisel-lang.org/firrtl/"; + license = licenses.asl20; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1137f8489601..5fb42d1321f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12496,6 +12496,8 @@ with pkgs; fennel = callPackage ../development/compilers/fennel { }; + firrtl = callPackage ../development/compilers/firrtl { }; + flasm = callPackage ../development/compilers/flasm { }; flyctl = callPackage ../development/web/flyctl { }; From e37248668b483ea8076390df42b01b766a43a57f Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Sun, 29 May 2022 13:49:26 -0400 Subject: [PATCH 122/122] open-vm-tools: 12.0.0 -> 12.0.5 (#174744) * open-vm-tools: 12.0.0 -> 12.0.5 * remove unused fetchpatch --- .../virtualization/open-vm-tools/default.nix | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 6018608a3f16..79dad692e988 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, autoreconfHook +{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook , bash, fuse3, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto , libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst , pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "12.0.0"; + version = "12.0.5"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "sha256-agWTGf8x6bxZ7S5bU2scHt8IdLLe/hZdaEMfHIK9d8U="; + sha256 = "sha256-rjYYRh4ZWAd9iELW2/4PZvMOfQfgwtGcrI2icaed2Eg="; }; sourceRoot = "${src.name}/open-vm-tools"; @@ -25,21 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse3 glib icu libdnet libdrm libmspack libtirpc openssl pam procps rpcsvc-proto udev xercesc ] ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; - patches = [ - # glibc 2.35 and GCC 11 & 12 reporting possible array bounds overflow - # Will be fixed in the release after 12.0.0 - (fetchpatch { - url = "https://github.com/vmware/open-vm-tools/commit/de6d129476724668b8903e2a87654f50ba21b1b2.patch"; - sha256 = "1cqhm868g40kcp8qzzwq10zd4bah9ypaw1qawnli5d240mlkpfhh"; - }) - ]; - - prePatch = '' - cd .. - ''; - postPatch = '' - cd open-vm-tools sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' Makefile.am sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am sed -i 's,usr/bin,''${prefix}/usr/bin,' scripts/Makefile.am